summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorAaron Whiteside2012-04-14 19:13:13 (EDT)
committer Glyn Normington2012-05-21 09:19:18 (EDT)
commit3d26514fcc9680417aac8427b83f8d26c888d09f (patch)
tree87ce848e8e6c9b15669a954c6c558eb3d0067afe
parentb665daf96fdf16114c68754d4b474fad80aa69e4 (diff)
downloadorg.eclipse.gemini.blueprint-3d26514fcc9680417aac8427b83f8d26c888d09f.zip
org.eclipse.gemini.blueprint-3d26514fcc9680417aac8427b83f8d26c888d09f.tar.gz
org.eclipse.gemini.blueprint-3d26514fcc9680417aac8427b83f8d26c888d09f.tar.bz2
- removed Backup* files from integration-tests/bundles/cardinality.0to1.bundle looks like someone accidentally committed them.
- removed another bunch of .bak files, looks like they were committed by accident too
-rw-r--r--integration-tests/bundles/cardinality.0to1.bundle/src/main/resources/META-INF/Backup 1 of MANIFEST.MF9
-rw-r--r--integration-tests/bundles/cardinality.0to1.bundle/src/main/resources/META-INF/spring/Backup 1 of cardinality0to1.xml20
-rw-r--r--integration-tests/bundles/dependency.factory.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/dependencies/factory/MyServiceFactory.java.bak62
-rw-r--r--integration-tests/bundles/dependency.factory.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/simpleservice/MyService.java.bak27
-rw-r--r--integration-tests/bundles/dependency.factory.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/simpleservice2/MyService2.java.bak29
-rw-r--r--integration-tests/bundles/dependency.factory.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/simpleservice2/impl/MyService2Impl.java.bak34
-rw-r--r--integration-tests/bundles/dependency.factory.bundle/src/main/resources/META-INF/MANIFEST.MF.bak11
-rw-r--r--integration-tests/bundles/dependency.factory.bundle/src/main/resources/META-INF/spring/factory-dependency.xml.bak13
-rw-r--r--integration-tests/bundles/dependency.test.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/dependencies/Dependent.java.bak25
-rw-r--r--integration-tests/bundles/dependency.test.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/dependencies/DependentImpl.java.bak49
-rw-r--r--integration-tests/bundles/dependency.test.bundle/src/main/resources/META-INF/MANIFEST.MF.bak9
-rw-r--r--integration-tests/bundles/dependency.test.bundle/src/main/resources/META-INF/spring/dependencies.xml.bak29
-rw-r--r--integration-tests/bundles/error.bundle/src/main/java/org/springframework/osgi/iandt/error/TestService.java.bak24
-rw-r--r--integration-tests/bundles/error.bundle/src/main/resources/META-INF/MANIFEST.MF.bak6
-rw-r--r--integration-tests/bundles/error.bundle/src/main/resources/META-INF/spring/error.xml.bak8
-rw-r--r--integration-tests/bundles/error.bundle/src/main/resources/META-INF/spring/osgi.xml.bak11
-rw-r--r--integration-tests/bundles/export.import.dependency.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/dependency/SimpleComponent.java.bak42
-rw-r--r--integration-tests/bundles/export.import.dependency.bundle/src/main/resources/META-INF/MANIFEST.MF.bak5
-rw-r--r--integration-tests/bundles/export.import.dependency.bundle/src/main/resources/META-INF/spring/config.xml.bak36
-rw-r--r--integration-tests/bundles/extender.version.bundle/META-INF/MANIFEST.MF.bak9
-rw-r--r--integration-tests/bundles/extender.version.bundle/src/main/resources/META-INF/MANIFEST.MF.bak9
-rw-r--r--integration-tests/bundles/jdk5/component.scan.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/io/component/Bean.java.bak27
-rw-r--r--integration-tests/bundles/jdk5/component.scan.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/io/component/ComponentBean.java.bak34
-rw-r--r--integration-tests/bundles/jdk5/component.scan.bundle/src/main/resources/META-INF/MANIFEST.MF.bak7
-rw-r--r--integration-tests/bundles/proxy.creator.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/proxycreator/SomeImplementation.java.bak35
-rw-r--r--integration-tests/bundles/proxy.creator.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/proxycreator/SomeInterface.java.bak27
-rw-r--r--integration-tests/bundles/proxy.creator.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/proxycreator/Test.java.bak73
-rw-r--r--integration-tests/bundles/proxy.creator.bundle/src/main/resources/META-INF/MANIFEST.MF.bak9
-rw-r--r--integration-tests/bundles/proxy.creator.bundle/src/main/resources/META-INF/spring/context.xml.bak35
-rw-r--r--integration-tests/bundles/proxy.destruction.test.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/reference/proxy/ServiceReferer.java.bak31
-rw-r--r--integration-tests/bundles/proxy.destruction.test.bundle/src/main/resources/META-INF/MANIFEST.MF.bak7
-rw-r--r--integration-tests/bundles/proxy.destruction.test.bundle/src/main/resources/META-INF/spring/reference.xml.bak14
-rw-r--r--integration-tests/bundles/proxy.listener/src/main/java/org/eclipse/gemini/blueprint/iandt/proxy/listener/Listener.java.bak27
-rw-r--r--integration-tests/bundles/proxy.listener/src/main/java/org/eclipse/gemini/blueprint/iandt/proxy/listener/internal/ListenerClass.java.bak33
-rw-r--r--integration-tests/bundles/proxy.listener/src/main/resources/META-INF/MANIFEST.MF.bak5
-rw-r--r--integration-tests/bundles/proxy.listener/src/main/resources/META-INF/spring/config.xml.bak12
-rw-r--r--integration-tests/bundles/reference.test.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/reference/proxy/ServiceReferer.java.bak31
-rw-r--r--integration-tests/bundles/reference.test.bundle/src/main/resources/META-INF/MANIFEST.MF.bak7
-rw-r--r--integration-tests/bundles/reference.test.bundle/src/main/resources/META-INF/spring/reference.xml.bak14
-rw-r--r--integration-tests/bundles/scoped.b.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/scope/b/BeanReference.java.bak29
-rw-r--r--integration-tests/bundles/service.listener.bundle/src/main/java/org/springframework/osgi/iandt/service/listener/MyListener.java.bak45
-rw-r--r--integration-tests/bundles/service.listener.bundle/src/main/resources/META-INF/MANIFEST.MF.bak8
-rw-r--r--integration-tests/bundles/service.listener.bundle/src/main/resources/META-INF/spring/service-listener.xml.bak16
-rw-r--r--integration-tests/bundles/tccl.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/tccl/internal/PrivateTCCLServiceImplementation.java.bak33
-rw-r--r--integration-tests/bundles/tccl.bundle/src/main/resources/META-INF/MANIFEST.MF.bak5
-rw-r--r--integration-tests/bundles/tccl.bundle/src/main/resources/META-INF/spring/context.xml.bak26
-rw-r--r--integration-tests/bundles/tccl.intf.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/tccl/TCCLService.java.bak32
-rw-r--r--integration-tests/bundles/tccl.intf.bundle/src/main/resources/META-INF/MANIFEST.MF.bak5
48 files changed, 0 insertions, 1094 deletions
diff --git a/integration-tests/bundles/cardinality.0to1.bundle/src/main/resources/META-INF/Backup 1 of MANIFEST.MF b/integration-tests/bundles/cardinality.0to1.bundle/src/main/resources/META-INF/Backup 1 of MANIFEST.MF
deleted file mode 100644
index 818f85e..0000000
--- a/integration-tests/bundles/cardinality.0to1.bundle/src/main/resources/META-INF/Backup 1 of MANIFEST.MF
+++ /dev/null
@@ -1,9 +0,0 @@
-Bundle-Version: 1.0
-Bundle-SymbolicName: org.springframework.osgi.iandt.cardinality.0to1
-Bundle-Name: cardinality_0__1
-Bundle-Vendor: Spring Framework
-Bundle-ManifestVersion: 2
-Import-Package: org.springframework.osgi.iandt.simpleservice2
-Export-Package: org.springframework.osgi.iandt.cardinality0to1.test
-Bundle-ClassPath: .,
- target/classes/
diff --git a/integration-tests/bundles/cardinality.0to1.bundle/src/main/resources/META-INF/spring/Backup 1 of cardinality0to1.xml b/integration-tests/bundles/cardinality.0to1.bundle/src/main/resources/META-INF/spring/Backup 1 of cardinality0to1.xml
deleted file mode 100644
index 3566a0c..0000000
--- a/integration-tests/bundles/cardinality.0to1.bundle/src/main/resources/META-INF/spring/Backup 1 of cardinality0to1.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:osgi="http://www.springframework.org/schema/osgi"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
-
- <bean id="listener" class="org.springframework.osgi.iandt.cardinality0to1.test.MyListener"/>
- <bean id="my-container" class="org.springframework.osgi.iandt.cardinality0to1.test.ReferenceContainer">
- <property name="simpleService" ref="simpleServiceOsgi"/>
- </bean>
-
- <osgi:reference id="simpleServiceOsgi"
- interface="org.springframework.osgi.iandt.simpleservice2.MyService2"
- cardinality="0..1"
- timeout="10">
- <osgi:reference-listener bind-method="serviceAvailable" unbind-method="serviceUnavailable" ref="listener"/>
- </osgi:reference>
-
-</beans> \ No newline at end of file
diff --git a/integration-tests/bundles/dependency.factory.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/dependencies/factory/MyServiceFactory.java.bak b/integration-tests/bundles/dependency.factory.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/dependencies/factory/MyServiceFactory.java.bak
deleted file mode 100644
index 5d7645b..0000000
--- a/integration-tests/bundles/dependency.factory.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/dependencies/factory/MyServiceFactory.java.bak
+++ /dev/null
@@ -1,62 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2010 VMware Inc., Oracle Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * and Apache License v2.0 which accompanies this distribution.
- * The Eclipse Public License is available at
- * http://www.eclipse.org/legal/epl-v10.html and the Apache License v2.0
- * is available at http://www.opensource.org/licenses/apache2.0.php.
- * You may elect to redistribute this code under either of these licenses.
- *
- * Contributors:
- * VMware Inc.
- * Oracle Inc.
- *****************************************************************************/
-
-package org.springframework.osgi.iandt.dependencies.factory;
-
-import org.springframework.beans.factory.SmartFactoryBean;
-import org.springframework.osgi.iandt.simpleservice.MyService;
-
-/**
- * @author Hal Hildebrand
- * Date: Aug 27, 2007
- * Time: 8:41:19 AM
- */
-public class MyServiceFactory implements SmartFactoryBean {
-
- protected MyService service = new MyService() {
- public String stringValue() {
- return "Hello World";
- }
- };
- private static final String DELAY_PROP = "org.springframework.osgi.iandt.dependencies.factory.delay";
-
- public Object getObject() throws Exception {
- Integer delay = Integer.getInteger(DELAY_PROP, new Integer(0));
- System.getProperties().remove(DELAY_PROP);
- System.out.println("Delaying for:" + delay);
- Thread.sleep(delay.intValue());
- return service;
- }
-
-
- public Class<?> getObjectType() {
- return MyService.class;
- }
-
-
- public boolean isSingleton() {
- return true;
- }
-
-
- public boolean isPrototype() {
- return false;
- }
-
-
- public boolean isEagerInit() {
- return true;
- }
-}
diff --git a/integration-tests/bundles/dependency.factory.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/simpleservice/MyService.java.bak b/integration-tests/bundles/dependency.factory.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/simpleservice/MyService.java.bak
deleted file mode 100644
index 4484b1b..0000000
--- a/integration-tests/bundles/dependency.factory.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/simpleservice/MyService.java.bak
+++ /dev/null
@@ -1,27 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2010 VMware Inc., Oracle Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * and Apache License v2.0 which accompanies this distribution.
- * The Eclipse Public License is available at
- * http://www.eclipse.org/legal/epl-v10.html and the Apache License v2.0
- * is available at http://www.opensource.org/licenses/apache2.0.php.
- * You may elect to redistribute this code under either of these licenses.
- *
- * Contributors:
- * VMware Inc.
- * Oracle Inc.
- *****************************************************************************/
-
-package org.springframework.osgi.iandt.simpleservice;
-
-/**
- * @author Hal Hildebrand
- * Date: Aug 27, 2007
- * Time: 9:43:02 AM
- */
-public interface MyService {
-
- String stringValue();
-
-} \ No newline at end of file
diff --git a/integration-tests/bundles/dependency.factory.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/simpleservice2/MyService2.java.bak b/integration-tests/bundles/dependency.factory.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/simpleservice2/MyService2.java.bak
deleted file mode 100644
index 7c3165c..0000000
--- a/integration-tests/bundles/dependency.factory.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/simpleservice2/MyService2.java.bak
+++ /dev/null
@@ -1,29 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2010 VMware Inc., Oracle Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * and Apache License v2.0 which accompanies this distribution.
- * The Eclipse Public License is available at
- * http://www.eclipse.org/legal/epl-v10.html and the Apache License v2.0
- * is available at http://www.opensource.org/licenses/apache2.0.php.
- * You may elect to redistribute this code under either of these licenses.
- *
- * Contributors:
- * VMware Inc.
- * Oracle Inc.
- *****************************************************************************/
-
-package org.springframework.osgi.iandt.simpleservice2;
-
-/**
- * @author Hal Hildebrand
- * Date: Aug 27, 2007
- * Time: 9:43:47 AM
- */
-public interface MyService2 {
-
- String stringValue();
-
- void voidMethod();
-
-}
diff --git a/integration-tests/bundles/dependency.factory.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/simpleservice2/impl/MyService2Impl.java.bak b/integration-tests/bundles/dependency.factory.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/simpleservice2/impl/MyService2Impl.java.bak
deleted file mode 100644
index 32b13ad..0000000
--- a/integration-tests/bundles/dependency.factory.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/simpleservice2/impl/MyService2Impl.java.bak
+++ /dev/null
@@ -1,34 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2010 VMware Inc., Oracle Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * and Apache License v2.0 which accompanies this distribution.
- * The Eclipse Public License is available at
- * http://www.eclipse.org/legal/epl-v10.html and the Apache License v2.0
- * is available at http://www.opensource.org/licenses/apache2.0.php.
- * You may elect to redistribute this code under either of these licenses.
- *
- * Contributors:
- * VMware Inc.
- * Oracle Inc.
- *****************************************************************************/
-
-package org.springframework.osgi.iandt.simpleservice2.impl;
-
-import org.springframework.osgi.iandt.simpleservice2.MyService2;
-
-/**
- * @author Hal Hildebrand
- * Date: Aug 27, 2007
- * Time: 9:48:04 AM
- */
-public class MyService2Impl implements MyService2 {
- public String stringValue() {
- return "Finklestein. Bartholomew Finklestein";
- }
-
- public void voidMethod() {
- System.out.println("void method called");
- }
-
-}
diff --git a/integration-tests/bundles/dependency.factory.bundle/src/main/resources/META-INF/MANIFEST.MF.bak b/integration-tests/bundles/dependency.factory.bundle/src/main/resources/META-INF/MANIFEST.MF.bak
deleted file mode 100644
index c7ff347..0000000
--- a/integration-tests/bundles/dependency.factory.bundle/src/main/resources/META-INF/MANIFEST.MF.bak
+++ /dev/null
@@ -1,11 +0,0 @@
-Bundle-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.springframework.osgi.iandt.dependencies.factory
-Bundle-Name: Simple-Service created by factory
-Bundle-Vendor: Spring Framework
-Spring-Context: *;
-Import-Package: org.springframework.beans.factory
-Export-Package: org.springframework.osgi.iandt.simpleservice, org.springframework.osgi.iandt.simpleservice2,
- org.springframework.osgi.iandt.simpleservice2.impl
-Bundle-ClassPath: .,
- target/classes/
diff --git a/integration-tests/bundles/dependency.factory.bundle/src/main/resources/META-INF/spring/factory-dependency.xml.bak b/integration-tests/bundles/dependency.factory.bundle/src/main/resources/META-INF/spring/factory-dependency.xml.bak
deleted file mode 100644
index 8b7335e..0000000
--- a/integration-tests/bundles/dependency.factory.bundle/src/main/resources/META-INF/spring/factory-dependency.xml.bak
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:osgi="http://www.springframework.org/schema/osgi"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
-
- <bean name="factory" class="org.springframework.osgi.iandt.dependencies.factory.MyServiceFactory"/>
-
- <osgi:service id="factoryCreatedObjectExportedToOSGi" ref="factory"
- interface="org.springframework.osgi.iandt.simpleservice.MyService"/>
-
-</beans> \ No newline at end of file
diff --git a/integration-tests/bundles/dependency.test.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/dependencies/Dependent.java.bak b/integration-tests/bundles/dependency.test.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/dependencies/Dependent.java.bak
deleted file mode 100644
index 4a6ecb5..0000000
--- a/integration-tests/bundles/dependency.test.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/dependencies/Dependent.java.bak
+++ /dev/null
@@ -1,25 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2010 VMware Inc., Oracle Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * and Apache License v2.0 which accompanies this distribution.
- * The Eclipse Public License is available at
- * http://www.eclipse.org/legal/epl-v10.html and the Apache License v2.0
- * is available at http://www.opensource.org/licenses/apache2.0.php.
- * You may elect to redistribute this code under either of these licenses.
- *
- * Contributors:
- * VMware Inc.
- * Oracle Inc.
- *****************************************************************************/
-
-package org.springframework.osgi.iandt.dependencies;
-
-/**
- * @author Hal Hildebrand
- * Date: Dec 1, 2006
- * Time: 3:46:34 PM
- */
-public interface Dependent {
- boolean isResolved();
-}
diff --git a/integration-tests/bundles/dependency.test.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/dependencies/DependentImpl.java.bak b/integration-tests/bundles/dependency.test.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/dependencies/DependentImpl.java.bak
deleted file mode 100644
index 8beff45..0000000
--- a/integration-tests/bundles/dependency.test.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/dependencies/DependentImpl.java.bak
+++ /dev/null
@@ -1,49 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2010 VMware Inc., Oracle Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * and Apache License v2.0 which accompanies this distribution.
- * The Eclipse Public License is available at
- * http://www.eclipse.org/legal/epl-v10.html and the Apache License v2.0
- * is available at http://www.opensource.org/licenses/apache2.0.php.
- * You may elect to redistribute this code under either of these licenses.
- *
- * Contributors:
- * VMware Inc.
- * Oracle Inc.
- *****************************************************************************/
-
-package org.springframework.osgi.iandt.dependencies;
-
-import org.springframework.osgi.iandt.simpleservice2.MyService2;
-import org.springframework.osgi.iandt.simpleservice.MyService;
-
-/**
- * @author Hal Hildebrand
- * Date: Dec 1, 2006
- * Time: 3:39:40 PM
- */
-public class DependentImpl implements Dependent {
- private MyService service1;
- private MyService2 service2;
- private MyService2 service3;
-
-
- public void setService1(MyService service1) {
- this.service1 = service1;
- }
-
- public void setService2(MyService2 service2) {
- this.service2 = service2;
- }
-
-
- public void setService3(MyService2 service3) {
- this.service3 = service3;
- }
-
-
- public boolean isResolved() {
- return service2 != null && service3 != null && service1 != null;
- }
-}
diff --git a/integration-tests/bundles/dependency.test.bundle/src/main/resources/META-INF/MANIFEST.MF.bak b/integration-tests/bundles/dependency.test.bundle/src/main/resources/META-INF/MANIFEST.MF.bak
deleted file mode 100644
index 61419b1..0000000
--- a/integration-tests/bundles/dependency.test.bundle/src/main/resources/META-INF/MANIFEST.MF.bak
+++ /dev/null
@@ -1,9 +0,0 @@
-Bundle-Name: org-springframework-osgi-iandt-dependencies
-Bundle-SymbolicName: org.springframework.osgi.iandt.dependencies
-Bundle-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-ClassPath: .
-Spring-Context: *; eagerly-init-importers:=true
-Import-Package: org.springframework.osgi.iandt.simpleservice,
- org.springframework.osgi.iandt.simpleservice2
-Export-Package: org.springframework.osgi.iandt.dependencies
diff --git a/integration-tests/bundles/dependency.test.bundle/src/main/resources/META-INF/spring/dependencies.xml.bak b/integration-tests/bundles/dependency.test.bundle/src/main/resources/META-INF/spring/dependencies.xml.bak
deleted file mode 100644
index b298a59..0000000
--- a/integration-tests/bundles/dependency.test.bundle/src/main/resources/META-INF/spring/dependencies.xml.bak
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:osgi="http://www.springframework.org/schema/osgi"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
-
- <osgi:service ref="dependent" interface="org.springframework.osgi.iandt.dependencies.Dependent"/>
-
-
- <osgi:reference id="simpleService3"
- interface="org.springframework.osgi.iandt.simpleservice2.MyService2"
- filter="(service=3)"/>
-
- <osgi:reference id="simpleService2"
- interface="org.springframework.osgi.iandt.simpleservice2.MyService2"
- filter="(service=2)"/>
-
- <osgi:reference interface="org.springframework.osgi.iandt.simpleservice.MyService" id="nested"/>
-
- <bean id="dependent" class="org.springframework.osgi.iandt.dependencies.DependentImpl" lazy-init="false">
- <property name="service2" ref="simpleService2"/>
- <property name="service3" ref="simpleService3"/>
- <property name="service1">
- <ref bean="nested"/>
- </property>
- </bean>
-
-</beans> \ No newline at end of file
diff --git a/integration-tests/bundles/error.bundle/src/main/java/org/springframework/osgi/iandt/error/TestService.java.bak b/integration-tests/bundles/error.bundle/src/main/java/org/springframework/osgi/iandt/error/TestService.java.bak
deleted file mode 100644
index ca6ed98..0000000
--- a/integration-tests/bundles/error.bundle/src/main/java/org/springframework/osgi/iandt/error/TestService.java.bak
+++ /dev/null
@@ -1,24 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2010 VMware Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * and Apache License v2.0 which accompanies this distribution.
- * The Eclipse Public License is available at
- * http://www.eclipse.org/legal/epl-v10.html and the Apache License v2.0
- * is available at http://www.opensource.org/licenses/apache2.0.php.
- * You may elect to redistribute this code under either of these licenses.
- *
- * Contributors:
- * VMware Inc.
- *****************************************************************************/
-
-package org.springframework.osgi.iandt.error;
-
-import org.springframework.osgi.iandt.simpleservice.MyService;
-
-public class TestService implements MyService {
- public String stringValue() {
- return "Bond. James Bond.";
- }
-
-}
diff --git a/integration-tests/bundles/error.bundle/src/main/resources/META-INF/MANIFEST.MF.bak b/integration-tests/bundles/error.bundle/src/main/resources/META-INF/MANIFEST.MF.bak
deleted file mode 100644
index 0a44b5d..0000000
--- a/integration-tests/bundles/error.bundle/src/main/resources/META-INF/MANIFEST.MF.bak
+++ /dev/null
@@ -1,6 +0,0 @@
-Bundle-Name: org-springframework-osgi-iandt-error
-Bundle-SymbolicName: org.springframework.osgi.iandt.error
-Bundle-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-ClassPath: .
-Spring-Context: *; eagerly-init-importers:=true
diff --git a/integration-tests/bundles/error.bundle/src/main/resources/META-INF/spring/error.xml.bak b/integration-tests/bundles/error.bundle/src/main/resources/META-INF/spring/error.xml.bak
deleted file mode 100644
index c32109c..0000000
--- a/integration-tests/bundles/error.bundle/src/main/resources/META-INF/spring/error.xml.bak
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <bean name="simpleService" class="org.springframework.osgi.iandt.error.TestService"/>
-
-</beans> \ No newline at end of file
diff --git a/integration-tests/bundles/error.bundle/src/main/resources/META-INF/spring/osgi.xml.bak b/integration-tests/bundles/error.bundle/src/main/resources/META-INF/spring/osgi.xml.bak
deleted file mode 100644
index 387d9b6..0000000
--- a/integration-tests/bundles/error.bundle/src/main/resources/META-INF/spring/osgi.xml.bak
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:osgi="http://www.springframework.org/schema/osgi"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
-
- <osgi:service id="simpleServiceOsgi" ref="simpleService"
- interface="org.springframework.osgi.iandt.simpleservice.MyService"/>
-
-</beans> \ No newline at end of file
diff --git a/integration-tests/bundles/export.import.dependency.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/dependency/SimpleComponent.java.bak b/integration-tests/bundles/export.import.dependency.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/dependency/SimpleComponent.java.bak
deleted file mode 100644
index d174e4d..0000000
--- a/integration-tests/bundles/export.import.dependency.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/dependency/SimpleComponent.java.bak
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2010 VMware Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * and Apache License v2.0 which accompanies this distribution.
- * The Eclipse Public License is available at
- * http://www.eclipse.org/legal/epl-v10.html and the Apache License v2.0
- * is available at http://www.opensource.org/licenses/apache2.0.php.
- * You may elect to redistribute this code under either of these licenses.
- *
- * Contributors:
- * VMware Inc.
- *****************************************************************************/
-
-package org.springframework.osgi.iandt.dependency;
-
-import java.io.Serializable;
-
-/**
- * @author Costin Leau
- */
-public class SimpleComponent implements Cloneable, Serializable {
-
- private Object optionalDependency;
- private Object mandatoryDependency;
-
- public Object getOptionalDependency() {
- return optionalDependency;
- }
-
- public void setOptionalDependency(Object optionalDependency) {
- this.optionalDependency = optionalDependency;
- }
-
- public Object getMandatoryDependency() {
- return mandatoryDependency;
- }
-
- public void setMandatoryDependency(Object mandatoryDependency) {
- this.mandatoryDependency = mandatoryDependency;
- }
-}
diff --git a/integration-tests/bundles/export.import.dependency.bundle/src/main/resources/META-INF/MANIFEST.MF.bak b/integration-tests/bundles/export.import.dependency.bundle/src/main/resources/META-INF/MANIFEST.MF.bak
deleted file mode 100644
index edebb8b..0000000
--- a/integration-tests/bundles/export.import.dependency.bundle/src/main/resources/META-INF/MANIFEST.MF.bak
+++ /dev/null
@@ -1,5 +0,0 @@
-Bundle-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.springframework.osgi.iandt.dependency.exporter.importer
-Bundle-Name: ExporterImporterDependency
-Bundle-Vendor: Spring Framework \ No newline at end of file
diff --git a/integration-tests/bundles/export.import.dependency.bundle/src/main/resources/META-INF/spring/config.xml.bak b/integration-tests/bundles/export.import.dependency.bundle/src/main/resources/META-INF/spring/config.xml.bak
deleted file mode 100644
index 468e0e5..0000000
--- a/integration-tests/bundles/export.import.dependency.bundle/src/main/resources/META-INF/spring/config.xml.bak
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:osgi="http://www.springframework.org/schema/osgi"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
-
- <osgi:service ref="injected-export">
- <osgi:interfaces>
- <value>java.io.Serializable</value>
- <value>java.lang.Cloneable</value>
- </osgi:interfaces>
- <osgi:service-properties>
- <entry key="type" value="injected-deps"/>
- </osgi:service-properties>
- </osgi:service>
-
-
- <bean id="injected-export" class="org.springframework.osgi.iandt.dependency.SimpleComponent">
- <property name="optionalDependency" ref="optional"/>
- <property name="mandatoryDependency" ref="mandatory"/>
- </bean>
-
- <osgi:service depends-on="optional mandatory" ref="depends-on-export">
- <osgi:interfaces>
- <value>java.io.Serializable</value>
- <value>java.lang.Cloneable</value>
- </osgi:interfaces>
- </osgi:service>
-
- <bean id="depends-on-export" class="org.springframework.osgi.iandt.dependency.SimpleComponent"/>
-
-
- <osgi:reference id="optional" interface="java.util.SortedSet" cardinality="0..1"/>
- <osgi:reference id="mandatory" interface="java.util.SortedMap" cardinality="1..1"/>
-</beans> \ No newline at end of file
diff --git a/integration-tests/bundles/extender.version.bundle/META-INF/MANIFEST.MF.bak b/integration-tests/bundles/extender.version.bundle/META-INF/MANIFEST.MF.bak
deleted file mode 100644
index 644f928..0000000
--- a/integration-tests/bundles/extender.version.bundle/META-INF/MANIFEST.MF.bak
+++ /dev/null
@@ -1,9 +0,0 @@
-Bundle-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.springframework.osgi.iandt.extenderversion
-Bundle-Name: Extender Version
-Bundle-Vendor: Spring Framework
-SpringExtender-Version: 19.99.98.not-existing
-Spring-Context: *;
-Bundle-ClassPath: .,
- target/classes/
diff --git a/integration-tests/bundles/extender.version.bundle/src/main/resources/META-INF/MANIFEST.MF.bak b/integration-tests/bundles/extender.version.bundle/src/main/resources/META-INF/MANIFEST.MF.bak
deleted file mode 100644
index 644f928..0000000
--- a/integration-tests/bundles/extender.version.bundle/src/main/resources/META-INF/MANIFEST.MF.bak
+++ /dev/null
@@ -1,9 +0,0 @@
-Bundle-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.springframework.osgi.iandt.extenderversion
-Bundle-Name: Extender Version
-Bundle-Vendor: Spring Framework
-SpringExtender-Version: 19.99.98.not-existing
-Spring-Context: *;
-Bundle-ClassPath: .,
- target/classes/
diff --git a/integration-tests/bundles/jdk5/component.scan.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/io/component/Bean.java.bak b/integration-tests/bundles/jdk5/component.scan.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/io/component/Bean.java.bak
deleted file mode 100644
index 5c50833..0000000
--- a/integration-tests/bundles/jdk5/component.scan.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/io/component/Bean.java.bak
+++ /dev/null
@@ -1,27 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2010 VMware Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * and Apache License v2.0 which accompanies this distribution.
- * The Eclipse Public License is available at
- * http://www.eclipse.org/legal/epl-v10.html and the Apache License v2.0
- * is available at http://www.opensource.org/licenses/apache2.0.php.
- * You may elect to redistribute this code under either of these licenses.
- *
- * Contributors:
- * VMware Inc.
- *****************************************************************************/
-
-package org.springframework.osgi.iandt.io.component;
-
-import org.springframework.stereotype.Component;
-
-
-/**
- * @author Costin Leau
- *
- */
-@Component
-public class Bean {
-
-}
diff --git a/integration-tests/bundles/jdk5/component.scan.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/io/component/ComponentBean.java.bak b/integration-tests/bundles/jdk5/component.scan.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/io/component/ComponentBean.java.bak
deleted file mode 100644
index a6b37ae..0000000
--- a/integration-tests/bundles/jdk5/component.scan.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/io/component/ComponentBean.java.bak
+++ /dev/null
@@ -1,34 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2010 VMware Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * and Apache License v2.0 which accompanies this distribution.
- * The Eclipse Public License is available at
- * http://www.eclipse.org/legal/epl-v10.html and the Apache License v2.0
- * is available at http://www.opensource.org/licenses/apache2.0.php.
- * You may elect to redistribute this code under either of these licenses.
- *
- * Contributors:
- * VMware Inc.
- *****************************************************************************/
-
-package org.springframework.osgi.iandt.io.component;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-
-/**
- * @author Costin Leau
- *
- */
-@Component
-public class ComponentBean{
-
- @Autowired
- private Bean bean;
-
- public Bean getBean() {
- return bean;
- }
-}
diff --git a/integration-tests/bundles/jdk5/component.scan.bundle/src/main/resources/META-INF/MANIFEST.MF.bak b/integration-tests/bundles/jdk5/component.scan.bundle/src/main/resources/META-INF/MANIFEST.MF.bak
deleted file mode 100644
index bd100b8..0000000
--- a/integration-tests/bundles/jdk5/component.scan.bundle/src/main/resources/META-INF/MANIFEST.MF.bak
+++ /dev/null
@@ -1,7 +0,0 @@
-Bundle-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.springframework.osgi.iandt.io.component
-Bundle-Name: Component Bundle
-Bundle-Vendor: Spring Framework
-Export-Package: org.springframework.osgi.iandt.io.component
-Import-Package: org.springframework.stereotype,org.springframework.beans.factory.annotation
diff --git a/integration-tests/bundles/proxy.creator.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/proxycreator/SomeImplementation.java.bak b/integration-tests/bundles/proxy.creator.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/proxycreator/SomeImplementation.java.bak
deleted file mode 100644
index 9508c65..0000000
--- a/integration-tests/bundles/proxy.creator.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/proxycreator/SomeImplementation.java.bak
+++ /dev/null
@@ -1,35 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2010 VMware Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * and Apache License v2.0 which accompanies this distribution.
- * The Eclipse Public License is available at
- * http://www.eclipse.org/legal/epl-v10.html and the Apache License v2.0
- * is available at http://www.opensource.org/licenses/apache2.0.php.
- * You may elect to redistribute this code under either of these licenses.
- *
- * Contributors:
- * VMware Inc.
- *****************************************************************************/
-
-package org.springframework.osgi.iandt.proxycreator;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * @author Costin Leau
- *
- */
-public class SomeImplementation implements SomeInterface {
-
- /** logger */
- private static final Log log = LogFactory.getLog(SomeImplementation.class);
-
-
- public boolean doSmth(Object argument) {
- log.info("received " + argument);
- return true;
- }
-
-}
diff --git a/integration-tests/bundles/proxy.creator.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/proxycreator/SomeInterface.java.bak b/integration-tests/bundles/proxy.creator.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/proxycreator/SomeInterface.java.bak
deleted file mode 100644
index 4a38eb2..0000000
--- a/integration-tests/bundles/proxy.creator.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/proxycreator/SomeInterface.java.bak
+++ /dev/null
@@ -1,27 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2010 VMware Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * and Apache License v2.0 which accompanies this distribution.
- * The Eclipse Public License is available at
- * http://www.eclipse.org/legal/epl-v10.html and the Apache License v2.0
- * is available at http://www.opensource.org/licenses/apache2.0.php.
- * You may elect to redistribute this code under either of these licenses.
- *
- * Contributors:
- * VMware Inc.
- *****************************************************************************/
-
-package org.springframework.osgi.iandt.proxycreator;
-
-/**
- * Interface. We cannot used one from outside the bundle since we want to expose
- * the CL problems.
- *
- * @author Costin Leau
- *
- */
-public interface SomeInterface {
-
- boolean doSmth(Object argument);
-}
diff --git a/integration-tests/bundles/proxy.creator.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/proxycreator/Test.java.bak b/integration-tests/bundles/proxy.creator.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/proxycreator/Test.java.bak
deleted file mode 100644
index 1b6d82b..0000000
--- a/integration-tests/bundles/proxy.creator.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/proxycreator/Test.java.bak
+++ /dev/null
@@ -1,73 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2010 VMware Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * and Apache License v2.0 which accompanies this distribution.
- * The Eclipse Public License is available at
- * http://www.eclipse.org/legal/epl-v10.html and the Apache License v2.0
- * is available at http://www.opensource.org/licenses/apache2.0.php.
- * You may elect to redistribute this code under either of these licenses.
- *
- * Contributors:
- * VMware Inc.
- *****************************************************************************/
-
-package org.springframework.osgi.iandt.proxycreator;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * Simple test that touches proxies created through spring. While this test
- * doesn't do much by itself, it should always work even when the bundle it runs
- * in, is updated. Failure to do so implies incorrect usage of the appropriate
- * class loader.
- *
- * Thanks to Alexei Akimov for the proof of concept.
- *
- * @author Costin Leau
- *
- */
-public class Test {
-
- /** logger */
- private static final Log log = LogFactory.getLog(Test.class);
-
- private SomeInterface jdkProxy;
- private SomeInterface cglibProxy;
-
-
- /**
- * Sets echo JDK proxy
- *
- * @param echoJdkProxy
- */
- public void setJdkProxy(SomeInterface echoJdkProxy) {
- this.jdkProxy = echoJdkProxy;
- }
-
- /**
- * Sets echo CGLIB proxy
- *
- * @param echoCglibProxy
- */
- public void setCglibProxy(SomeInterface echoCglibProxy) {
- this.cglibProxy = echoCglibProxy;
- }
-
- public void test() {
- testInterface(jdkProxy);
- testInterface(cglibProxy);
- }
-
- // interact with the proxy to make sure the weaving process is successful
- private void testInterface(SomeInterface intfs) {
- try {
- log.info("testing proxy interception...");
- intfs.doSmth("hangar 18");
- }
- catch (Throwable th) {
- log.error("caught exception", th);
- }
- }
-}
diff --git a/integration-tests/bundles/proxy.creator.bundle/src/main/resources/META-INF/MANIFEST.MF.bak b/integration-tests/bundles/proxy.creator.bundle/src/main/resources/META-INF/MANIFEST.MF.bak
deleted file mode 100644
index d9593ce..0000000
--- a/integration-tests/bundles/proxy.creator.bundle/src/main/resources/META-INF/MANIFEST.MF.bak
+++ /dev/null
@@ -1,9 +0,0 @@
-Bundle-Name: org-springframework-osgi-iandt-proxy-creator
-Bundle-SymbolicName: org.springframework.osgi.iandt.proxy.creator
-Bundle-ManifestVersion: 2
-Bundle-Version: 1.0
-Import-Package: org.apache.commons.logging,org.springframework.aop.interceptor,
- org.springframework.aop.framework,org.springframework.aop,org.aopalliance.aop,
- net.sf.cglib.proxy,net.sf.cglib.core,net.sf.cglib.reflect
-Export-Package: org.springframework.osgi.iandt.service.listener
-Spring-Context: *; eagerly-init-importers:=true
diff --git a/integration-tests/bundles/proxy.creator.bundle/src/main/resources/META-INF/spring/context.xml.bak b/integration-tests/bundles/proxy.creator.bundle/src/main/resources/META-INF/spring/context.xml.bak
deleted file mode 100644
index 652dc77..0000000
--- a/integration-tests/bundles/proxy.creator.bundle/src/main/resources/META-INF/spring/context.xml.bak
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <bean name="bean" class="org.springframework.osgi.iandt.proxycreator.SomeImplementation" />
-
- <bean name="loggerInterceptor"
- class="org.springframework.aop.interceptor.SimpleTraceInterceptor" />
-
- <bean name="jdkProxy"
- class="org.springframework.aop.framework.ProxyFactoryBean">
- <property name="target" ref="bean" />
- <property name="proxyInterfaces">
- <value>org.springframework.osgi.iandt.proxycreator.SomeInterface</value>
- </property>
- <property name="interceptorNames">
- <value>loggerInterceptor</value>
- </property>
- </bean>
-
- <bean name="cglibProxy"
- class="org.springframework.aop.framework.ProxyFactoryBean">
- <property name="target" ref="bean" />
- <property name="interceptorNames">
- <value>loggerInterceptor</value>
- </property>
- <property name="proxyTargetClass" value="true" />
- </bean>
-
- <bean name="test" class="org.springframework.osgi.iandt.proxycreator.Test" init-method="test">
- <property name="jdkProxy" ref="jdkProxy" />
- <property name="cglibProxy" ref="cglibProxy" />
- </bean>
-</beans>
diff --git a/integration-tests/bundles/proxy.destruction.test.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/reference/proxy/ServiceReferer.java.bak b/integration-tests/bundles/proxy.destruction.test.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/reference/proxy/ServiceReferer.java.bak
deleted file mode 100644
index d7f254d..0000000
--- a/integration-tests/bundles/proxy.destruction.test.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/reference/proxy/ServiceReferer.java.bak
+++ /dev/null
@@ -1,31 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2010 VMware Inc., Oracle Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * and Apache License v2.0 which accompanies this distribution.
- * The Eclipse Public License is available at
- * http://www.eclipse.org/legal/epl-v10.html and the Apache License v2.0
- * is available at http://www.opensource.org/licenses/apache2.0.php.
- * You may elect to redistribute this code under either of these licenses.
- *
- * Contributors:
- * VMware Inc.
- * Oracle Inc.
- *****************************************************************************/
-
-package org.eclipse.gemini.blueprint.iandt.reference.proxy;
-
-import org.springframework.osgi.iandt.simpleservice.MyService;
-
-/**
- * @author Hal Hildebrand
- * Date: Nov 25, 2006
- * Time: 12:50:20 PM
- */
-public class ServiceReferer {
- public static MyService serviceReference;
-
- public void setReference(MyService reference) {
- serviceReference = reference;
- }
-}
diff --git a/integration-tests/bundles/proxy.destruction.test.bundle/src/main/resources/META-INF/MANIFEST.MF.bak b/integration-tests/bundles/proxy.destruction.test.bundle/src/main/resources/META-INF/MANIFEST.MF.bak
deleted file mode 100644
index 723dfa1..0000000
--- a/integration-tests/bundles/proxy.destruction.test.bundle/src/main/resources/META-INF/MANIFEST.MF.bak
+++ /dev/null
@@ -1,7 +0,0 @@
-Bundle-Name: org-springframework-osgi-iandt-proxy-destruction
-Bundle-SymbolicName: org.springframework.osgi.iandt.proxy.destruction
-Bundle-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-ClassPath: .
-Import-Package: org.springframework.osgi.iandt.simpleservice
-Export-Package: org.eclipse.gemini.blueprint.iandt.reference.proxy
diff --git a/integration-tests/bundles/proxy.destruction.test.bundle/src/main/resources/META-INF/spring/reference.xml.bak b/integration-tests/bundles/proxy.destruction.test.bundle/src/main/resources/META-INF/spring/reference.xml.bak
deleted file mode 100644
index af0fc71..0000000
--- a/integration-tests/bundles/proxy.destruction.test.bundle/src/main/resources/META-INF/spring/reference.xml.bak
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:osgi="http://www.springframework.org/schema/osgi"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
-
- <bean id="referer" class="org.eclipse.gemini.blueprint.iandt.reference.proxy.ServiceReferer" lazy-init="false">
- <property name="reference" ref="simpleServiceOsgi"/>
- </bean>
-
- <osgi:reference id="simpleServiceOsgi" interface="org.springframework.osgi.iandt.simpleservice.MyService"/>
-
-</beans> \ No newline at end of file
diff --git a/integration-tests/bundles/proxy.listener/src/main/java/org/eclipse/gemini/blueprint/iandt/proxy/listener/Listener.java.bak b/integration-tests/bundles/proxy.listener/src/main/java/org/eclipse/gemini/blueprint/iandt/proxy/listener/Listener.java.bak
deleted file mode 100644
index 35abb7c..0000000
--- a/integration-tests/bundles/proxy.listener/src/main/java/org/eclipse/gemini/blueprint/iandt/proxy/listener/Listener.java.bak
+++ /dev/null
@@ -1,27 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2010 VMware Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * and Apache License v2.0 which accompanies this distribution.
- * The Eclipse Public License is available at
- * http://www.eclipse.org/legal/epl-v10.html and the Apache License v2.0
- * is available at http://www.opensource.org/licenses/apache2.0.php.
- * You may elect to redistribute this code under either of these licenses.
- *
- * Contributors:
- * VMware Inc.
- *****************************************************************************/
-
-package org.springframework.osgi.iandt.proxy.listener;
-
-import java.util.Map;
-
-/**
- * @author Costin Leau
- */
-public interface Listener {
-
- void bind(Object service, Map props);
-
- void unbind(Object service, Map props);
-}
diff --git a/integration-tests/bundles/proxy.listener/src/main/java/org/eclipse/gemini/blueprint/iandt/proxy/listener/internal/ListenerClass.java.bak b/integration-tests/bundles/proxy.listener/src/main/java/org/eclipse/gemini/blueprint/iandt/proxy/listener/internal/ListenerClass.java.bak
deleted file mode 100644
index a225b46..0000000
--- a/integration-tests/bundles/proxy.listener/src/main/java/org/eclipse/gemini/blueprint/iandt/proxy/listener/internal/ListenerClass.java.bak
+++ /dev/null
@@ -1,33 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2010 VMware Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * and Apache License v2.0 which accompanies this distribution.
- * The Eclipse Public License is available at
- * http://www.eclipse.org/legal/epl-v10.html and the Apache License v2.0
- * is available at http://www.opensource.org/licenses/apache2.0.php.
- * You may elect to redistribute this code under either of these licenses.
- *
- * Contributors:
- * VMware Inc.
- *****************************************************************************/
-
-package org.springframework.osgi.iandt.proxy.listener.internal;
-
-import java.util.Map;
-
-import org.springframework.osgi.iandt.proxy.listener.Listener;
-
-/**
- * @author Costin Leau
- */
-public class ListenerClass implements Listener {
-
- public void bind(Object service, Map props) {
- System.out.println("Bind service " + service + " w/ props "+ props);
- }
-
- public void unbind(Object service, Map props) {
- System.out.println("Unbind service " + service + " w/ props "+ props);
- }
-}
diff --git a/integration-tests/bundles/proxy.listener/src/main/resources/META-INF/MANIFEST.MF.bak b/integration-tests/bundles/proxy.listener/src/main/resources/META-INF/MANIFEST.MF.bak
deleted file mode 100644
index 65d7481..0000000
--- a/integration-tests/bundles/proxy.listener/src/main/resources/META-INF/MANIFEST.MF.bak
+++ /dev/null
@@ -1,5 +0,0 @@
-Bundle-Name: org-springframework-osgi-iandt-proxy-listener
-Bundle-SymbolicName: org.springframework.osgi.iandt.proxy.listener
-Bundle-ManifestVersion: 2
-Bundle-Version: 1.0
-Export-Package: org.springframework.osgi.iandt.proxy.listener
diff --git a/integration-tests/bundles/proxy.listener/src/main/resources/META-INF/spring/config.xml.bak b/integration-tests/bundles/proxy.listener/src/main/resources/META-INF/spring/config.xml.bak
deleted file mode 100644
index ed7c55c..0000000
--- a/integration-tests/bundles/proxy.listener/src/main/resources/META-INF/spring/config.xml.bak
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:osgi="http://www.springframework.org/schema/osgi"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
-
- <bean id="listener" class="org.springframework.osgi.iandt.proxy.listener.internal.ListenerClass"/>
-
- <osgi:service id="export" ref="listener" interface="org.springframework.osgi.iandt.proxy.listener.Listener"/>
-
-</beans> \ No newline at end of file
diff --git a/integration-tests/bundles/reference.test.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/reference/proxy/ServiceReferer.java.bak b/integration-tests/bundles/reference.test.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/reference/proxy/ServiceReferer.java.bak
deleted file mode 100644
index 009fc05..0000000
--- a/integration-tests/bundles/reference.test.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/reference/proxy/ServiceReferer.java.bak
+++ /dev/null
@@ -1,31 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2010 VMware Inc., Oracle Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * and Apache License v2.0 which accompanies this distribution.
- * The Eclipse Public License is available at
- * http://www.eclipse.org/legal/epl-v10.html and the Apache License v2.0
- * is available at http://www.opensource.org/licenses/apache2.0.php.
- * You may elect to redistribute this code under either of these licenses.
- *
- * Contributors:
- * VMware Inc.
- * Oracle Inc.
- *****************************************************************************/
-
-package org.springframework.osgi.iandt.reference.proxy;
-
-import org.springframework.osgi.iandt.simpleservice.MyService;
-
-/**
- * @author Hal Hildebrand
- * Date: Nov 25, 2006
- * Time: 12:50:20 PM
- */
-public class ServiceReferer {
- public static MyService serviceReference;
-
- public void setReference(MyService reference) {
- serviceReference = reference;
- }
-}
diff --git a/integration-tests/bundles/reference.test.bundle/src/main/resources/META-INF/MANIFEST.MF.bak b/integration-tests/bundles/reference.test.bundle/src/main/resources/META-INF/MANIFEST.MF.bak
deleted file mode 100644
index bd493cc..0000000
--- a/integration-tests/bundles/reference.test.bundle/src/main/resources/META-INF/MANIFEST.MF.bak
+++ /dev/null
@@ -1,7 +0,0 @@
-Bundle-Name: org-springframework-osgi-iandt-reference-proxy
-Bundle-SymbolicName: org.springframework.osgi.iandt.reference.proxy
-Bundle-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-ClassPath: .
-Import-Package: org.springframework.osgi.iandt.simpleservice
-Export-Package: org.springframework.osgi.iandt.reference.proxy
diff --git a/integration-tests/bundles/reference.test.bundle/src/main/resources/META-INF/spring/reference.xml.bak b/integration-tests/bundles/reference.test.bundle/src/main/resources/META-INF/spring/reference.xml.bak
deleted file mode 100644
index c0c4fa2..0000000
--- a/integration-tests/bundles/reference.test.bundle/src/main/resources/META-INF/spring/reference.xml.bak
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:osgi="http://www.springframework.org/schema/osgi"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
-
- <bean id="referer" class="org.springframework.osgi.iandt.reference.proxy.ServiceReferer" lazy-init="false">
- <property name="reference" ref="simpleServiceOsgi"/>
- </bean>
-
- <osgi:reference id="simpleServiceOsgi" timeout="3000" interface="org.springframework.osgi.iandt.simpleservice.MyService"/>
-
-</beans> \ No newline at end of file
diff --git a/integration-tests/bundles/scoped.b.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/scope/b/BeanReference.java.bak b/integration-tests/bundles/scoped.b.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/scope/b/BeanReference.java.bak
deleted file mode 100644
index 6f80eb2..0000000
--- a/integration-tests/bundles/scoped.b.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/scope/b/BeanReference.java.bak
+++ /dev/null
@@ -1,29 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2010 VMware Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * and Apache License v2.0 which accompanies this distribution.
- * The Eclipse Public License is available at
- * http://www.eclipse.org/legal/epl-v10.html and the Apache License v2.0
- * is available at http://www.opensource.org/licenses/apache2.0.php.
- * You may elect to redistribute this code under either of these licenses.
- *
- * Contributors:
- * VMware Inc.
- *****************************************************************************/
-
-package org.springframework.osgi.iandt.scope.b;
-
-/**
- * @author Costin Leau
- *
- */
-public class BeanReference {
- public static Object BEAN = null;
-
- public void setBean(Object bean) {
- BEAN = bean;
- }
-
-
-}
diff --git a/integration-tests/bundles/service.listener.bundle/src/main/java/org/springframework/osgi/iandt/service/listener/MyListener.java.bak b/integration-tests/bundles/service.listener.bundle/src/main/java/org/springframework/osgi/iandt/service/listener/MyListener.java.bak
deleted file mode 100644
index 5cb215e..0000000
--- a/integration-tests/bundles/service.listener.bundle/src/main/java/org/springframework/osgi/iandt/service/listener/MyListener.java.bak
+++ /dev/null
@@ -1,45 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2010 VMware Inc., Oracle Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * and Apache License v2.0 which accompanies this distribution.
- * The Eclipse Public License is available at
- * http://www.eclipse.org/legal/epl-v10.html and the Apache License v2.0
- * is available at http://www.opensource.org/licenses/apache2.0.php.
- * You may elect to redistribute this code under either of these licenses.
- *
- * Contributors:
- * VMware Inc.
- * Oracle Inc.
- *****************************************************************************/
-
-package org.springframework.osgi.iandt.service.listener;
-
-import org.springframework.osgi.iandt.simpleservice.MyService;
-import java.util.Dictionary;
-
-
-/**
- * @author Hal Hildebrand
- * Date: Nov 14, 2006
- * Time: 8:07:27 AM
- */
-public class MyListener {
- public static int BOUND_COUNT = 0;
- public static int UNBOUND_COUNT = 0;
-
-
- public void serviceAvailable(MyService simpleService, Dictionary props) {
- BOUND_COUNT++;
- }
-
-
- public void serviceUnavailable(MyService simpleService, Dictionary props) {
- UNBOUND_COUNT++;
- }
-
-
- public void setSimpleService(MyService simpleService) {
- // Dummy used to force initialization of osgi service reference to simple service
- }
-}
diff --git a/integration-tests/bundles/service.listener.bundle/src/main/resources/META-INF/MANIFEST.MF.bak b/integration-tests/bundles/service.listener.bundle/src/main/resources/META-INF/MANIFEST.MF.bak
deleted file mode 100644
index 2aaf297..0000000
--- a/integration-tests/bundles/service.listener.bundle/src/main/resources/META-INF/MANIFEST.MF.bak
+++ /dev/null
@@ -1,8 +0,0 @@
-Bundle-Name: org-springframework-osgi-iandt-service-listener
-Bundle-SymbolicName: org.springframework.osgi.iandt.service.listener
-Bundle-ManifestVersion: 2
-Bundle-Version: 1.0
-Bundle-ClassPath: .
-Import-Package: org.springframework.osgi.iandt.simpleservice
-Export-Package: org.springframework.osgi.iandt.service.listener
-Spring-Context: *; eagerly-init-importers:=true
diff --git a/integration-tests/bundles/service.listener.bundle/src/main/resources/META-INF/spring/service-listener.xml.bak b/integration-tests/bundles/service.listener.bundle/src/main/resources/META-INF/spring/service-listener.xml.bak
deleted file mode 100644
index 8e08d52..0000000
--- a/integration-tests/bundles/service.listener.bundle/src/main/resources/META-INF/spring/service-listener.xml.bak
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:osgi="http://www.springframework.org/schema/osgi"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
-
- <bean id="listener" class="org.springframework.osgi.iandt.service.listener.MyListener">
- <property name="simpleService" ref="simpleServiceOsgi"/>
- </bean>
-
-
- <osgi:reference id="simpleServiceOsgi" interface="org.springframework.osgi.iandt.simpleservice.MyService">
- <osgi:reference-listener bind-method="serviceAvailable" unbind-method="serviceUnavailable" ref="listener"/>
- </osgi:reference>
-</beans> \ No newline at end of file
diff --git a/integration-tests/bundles/tccl.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/tccl/internal/PrivateTCCLServiceImplementation.java.bak b/integration-tests/bundles/tccl.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/tccl/internal/PrivateTCCLServiceImplementation.java.bak
deleted file mode 100644
index 39e1e9b..0000000
--- a/integration-tests/bundles/tccl.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/tccl/internal/PrivateTCCLServiceImplementation.java.bak
+++ /dev/null
@@ -1,33 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2010 VMware Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * and Apache License v2.0 which accompanies this distribution.
- * The Eclipse Public License is available at
- * http://www.eclipse.org/legal/epl-v10.html and the Apache License v2.0
- * is available at http://www.opensource.org/licenses/apache2.0.php.
- * You may elect to redistribute this code under either of these licenses.
- *
- * Contributors:
- * VMware Inc.
- *****************************************************************************/
-
-package org.springframework.osgi.iandt.tccl.internal;
-
-import org.springframework.osgi.iandt.tccl.TCCLService;
-
-/**
- * Private class that should not be exposed.
- *
- * @author Costin Leau
- */
-public class PrivateTCCLServiceImplementation implements TCCLService {
-
- public ClassLoader getTCCL() {
- return Thread.currentThread().getContextClassLoader();
- }
-
- public String toString() {
- return PrivateTCCLServiceImplementation.class.getName() + "#" + System.identityHashCode(this);
- }
-}
diff --git a/integration-tests/bundles/tccl.bundle/src/main/resources/META-INF/MANIFEST.MF.bak b/integration-tests/bundles/tccl.bundle/src/main/resources/META-INF/MANIFEST.MF.bak
deleted file mode 100644
index 0057514..0000000
--- a/integration-tests/bundles/tccl.bundle/src/main/resources/META-INF/MANIFEST.MF.bak
+++ /dev/null
@@ -1,5 +0,0 @@
-Bundle-Name: org-springframework-osgi-iandt-tccl
-Bundle-SymbolicName: org.springframework.osgi.iandt.tccl
-Bundle-Version: 1.0
-Bundle-ManifestVersion: 2
-Import-Package: org.springframework.osgi.iandt.tccl
diff --git a/integration-tests/bundles/tccl.bundle/src/main/resources/META-INF/spring/context.xml.bak b/integration-tests/bundles/tccl.bundle/src/main/resources/META-INF/spring/context.xml.bak
deleted file mode 100644
index d63cfa0..0000000
--- a/integration-tests/bundles/tccl.bundle/src/main/resources/META-INF/spring/context.xml.bak
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:osgi="http://www.springframework.org/schema/osgi"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
-
- <bean id="service"
- class="org.springframework.osgi.iandt.tccl.internal.PrivateTCCLServiceImplementation"
- lazy-init="false" />
-
- <!-- export service with unmanaged tccl -->
- <osgi:service ref="service" auto-export="interfaces" context-class-loader="unmanaged">
- <osgi:service-properties>
- <entry key="tccl" value="unmanaged"/>
- </osgi:service-properties>
- </osgi:service>
-
- <!-- export service with managed tccl -->
- <osgi:service ref="service" auto-export="interfaces" context-class-loader="service-provider">
- <osgi:service-properties>
- <entry key="tccl" value="service-provider"/>
- </osgi:service-properties>
- </osgi:service>
-
-</beans> \ No newline at end of file
diff --git a/integration-tests/bundles/tccl.intf.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/tccl/TCCLService.java.bak b/integration-tests/bundles/tccl.intf.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/tccl/TCCLService.java.bak
deleted file mode 100644
index 3dd5795..0000000
--- a/integration-tests/bundles/tccl.intf.bundle/src/main/java/org/eclipse/gemini/blueprint/iandt/tccl/TCCLService.java.bak
+++ /dev/null
@@ -1,32 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2010 VMware Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * and Apache License v2.0 which accompanies this distribution.
- * The Eclipse Public License is available at
- * http://www.eclipse.org/legal/epl-v10.html and the Apache License v2.0
- * is available at http://www.opensource.org/licenses/apache2.0.php.
- * You may elect to redistribute this code under either of these licenses.
- *
- * Contributors:
- * VMware Inc.
- *****************************************************************************/
-
-package org.springframework.osgi.iandt.tccl;
-
-/**
- * Simple service that loads classes and resources using the context
- * classloader.
- *
- * @author Costin Leau
- */
-public interface TCCLService {
-
- /**
- * Return the TCCL class loader used during the service invocation.
- *
- * @return TCCL Class<?> Loader
- */
- public ClassLoader getTCCL();
-
-}
diff --git a/integration-tests/bundles/tccl.intf.bundle/src/main/resources/META-INF/MANIFEST.MF.bak b/integration-tests/bundles/tccl.intf.bundle/src/main/resources/META-INF/MANIFEST.MF.bak
deleted file mode 100644
index 8cda38b..0000000
--- a/integration-tests/bundles/tccl.intf.bundle/src/main/resources/META-INF/MANIFEST.MF.bak
+++ /dev/null
@@ -1,5 +0,0 @@
-Bundle-Name: org-springframework-osgi-iandt-tccl-intf
-Bundle-SymbolicName: org.springframework.osgi.iandt.tccl.intf
-Bundle-Version: 1.0
-Bundle-ManifestVersion: 2
-Export-Package: org.springframework.osgi.iandt.tccl