felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clem...@apache.org
Subject svn commit: r687318 [1/4] - in /felix/trunk/ipojo/tests: composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/ composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/util/ composite/imp...
Date Wed, 20 Aug 2008 13:15:14 GMT
Author: clement
Date: Wed Aug 20 06:15:11 2008
New Revision: 687318

URL: http://svn.apache.org/viewvc?rev=687318&view=rev
Log:
Update the test suite to refer to the 'name' => 'instance.name' change
Add tests checking inner classes.

Added:
    felix/trunk/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/component/InnerClasses.java
    felix/trunk/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/NestedClassesTests.java
Modified:
    felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/EmptyCompositeTest.java
    felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/FactoryManagementTest.java
    felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/ServiceRangeTest.java
    felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/util/Utils.java
    felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/FilteredExport.java
    felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/MultipleExport.java
    felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/OptionalExport.java
    felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/OptionalMultipleExport.java
    felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/SimpleExport.java
    felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedFilteredImport.java
    felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedMultipleImport.java
    felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedOptionalImport.java
    felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedOptionalMultipleImport.java
    felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedSimpleImport.java
    felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/FilteredImport.java
    felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/MultipleImport.java
    felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/OptionalImport.java
    felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/OptionalMultipleImport.java
    felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/SimpleImport.java
    felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instance/SimpleInstance.java
    felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/ConfigurableInstantiation.java
    felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/MultipleInstantiation.java
    felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/OptionalInstantiation.java
    felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/OptionalMultipleInstantiation.java
    felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/SimpleInstantiation.java
    felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp0.java
    felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp1.java
    felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp2.java
    felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp3.java
    felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp4.java
    felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp5.java
    felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp6.java
    felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp7.java
    felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp8.java
    felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/test/CompositeTest.java
    felix/trunk/ipojo/tests/core/annotations/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
    felix/trunk/ipojo/tests/core/bad-configurations/src/main/java/org/apache/felix/ipojo/test/scenarios/bad/BadLFCCallback.java
    felix/trunk/ipojo/tests/core/bad-configurations/src/main/java/org/apache/felix/ipojo/test/scenarios/bad/BadServiceDependencies.java
    felix/trunk/ipojo/tests/core/bad-configurations/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
    felix/trunk/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/DynamicallyConfigurableProperties.java
    felix/trunk/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/ManagedServiceConfigurableProperties.java
    felix/trunk/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/SimpleProperties.java
    felix/trunk/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/TestBothProperties.java
    felix/trunk/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/TestFieldProperties.java
    felix/trunk/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/TestMethodProperties.java
    felix/trunk/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/TestSuperMethodProperties.java
    felix/trunk/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
    felix/trunk/ipojo/tests/core/external-handlers/src/main/java/org/apache/felix/ipojo/test/scenarios/component/CheckServiceHandler.java
    felix/trunk/ipojo/tests/core/external-handlers/src/main/java/org/apache/felix/ipojo/test/scenarios/eh/HandlerTest.java
    felix/trunk/ipojo/tests/core/external-handlers/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
    felix/trunk/ipojo/tests/core/factories/src/main/java/org/apache/felix/ipojo/test/scenarios/factories/ObedienceTest.java
    felix/trunk/ipojo/tests/core/factories/src/main/java/org/apache/felix/ipojo/test/scenarios/factories/UnacceptableConfigurationTest.java
    felix/trunk/ipojo/tests/core/factories/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
    felix/trunk/ipojo/tests/core/lifecycle-callback/src/main/java/org/apache/felix/ipojo/test/scenarios/lifecycle/callback/CallbackTestCase.java
    felix/trunk/ipojo/tests/core/lifecycle-callback/src/main/java/org/apache/felix/ipojo/test/scenarios/lifecycle/callback/ImmediateCallbackSeveralFactoryTest.java
    felix/trunk/ipojo/tests/core/lifecycle-callback/src/main/java/org/apache/felix/ipojo/test/scenarios/lifecycle/callback/ImmediateCallbackSingletonFactoryTest.java
    felix/trunk/ipojo/tests/core/lifecycle-callback/src/main/java/org/apache/felix/ipojo/test/scenarios/lifecycle/callback/ImmediateCallbackTest.java
    felix/trunk/ipojo/tests/core/lifecycle-callback/src/main/java/org/apache/felix/ipojo/test/scenarios/lifecycle/callback/ImmediateLifeCycleControllerTest.java
    felix/trunk/ipojo/tests/core/lifecycle-callback/src/main/java/org/apache/felix/ipojo/test/scenarios/lifecycle/callback/ParentCallbackTestCase.java
    felix/trunk/ipojo/tests/core/lifecycle-callback/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
    felix/trunk/ipojo/tests/core/lifecycle-controller/src/main/java/org/apache/felix/ipojo/test/scenarios/lfc/ImmediateLifeCycleControllerTest.java
    felix/trunk/ipojo/tests/core/lifecycle-controller/src/main/java/org/apache/felix/ipojo/test/scenarios/lfc/LifeCycleControllerTest.java
    felix/trunk/ipojo/tests/core/lifecycle-controller/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
    felix/trunk/ipojo/tests/core/service-dependency-bindingpolicy/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/dynamic/priority/SimpleDPDependencies.java
    felix/trunk/ipojo/tests/core/service-dependency-bindingpolicy/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/statics/MethodOptionalDependencies.java
    felix/trunk/ipojo/tests/core/service-dependency-bindingpolicy/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/statics/MethodSimpleDependencies.java
    felix/trunk/ipojo/tests/core/service-dependency-bindingpolicy/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/statics/MultipleDependencies.java
    felix/trunk/ipojo/tests/core/service-dependency-bindingpolicy/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/statics/OptionalDependencies.java
    felix/trunk/ipojo/tests/core/service-dependency-bindingpolicy/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/statics/SimpleDependencies.java
    felix/trunk/ipojo/tests/core/service-dependency-filter/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/filter/FromDependencies.java
    felix/trunk/ipojo/tests/core/service-dependency-filter/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/filter/MultipleFilterDependencies.java
    felix/trunk/ipojo/tests/core/service-dependency-filter/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/filter/OptionalMultipleFilterDependencies.java
    felix/trunk/ipojo/tests/core/service-dependency-filter/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/filter/OptionalSimpleFilterDependencies.java
    felix/trunk/ipojo/tests/core/service-dependency-filter/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/filter/SimpleFilterDependencies.java
    felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/CollectionMultipleDependencies.java
    felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/DelayedMultipleDependencies.java
    felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/DelayedOptionalDependencies.java
    felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/DelayedOptionalMultipleDependencies.java
    felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/DelayedSimpleDependencies.java
    felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/DependencyArchitectureTest.java
    felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/ListMultipleDependencies.java
    felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodDelayedMultipleDependencies.java
    felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodDelayedOptionalDependencies.java
    felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodDelayedOptionalMultipleDependencies.java
    felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodDelayedSimpleDependencies.java
    felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodMultipleDependencies.java
    felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodOptionalDependencies.java
    felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodOptionalMultipleDependencies.java
    felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodSimpleDependencies.java
    felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MultipleDependencies.java
    felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/OptionalDependencies.java
    felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/OptionalMultipleDependencies.java
    felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/OptionalNoNullableDependencies.java
    felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/SetMultipleDependencies.java
    felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/SimpleDependencies.java
    felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/VectorMultipleDependencies.java
    felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/di/DelayedOptionalDependencies.java
    felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/di/MethodDelayedOptionalDependencies.java
    felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/di/MethodOptionalDependencies.java
    felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/di/OptionalDependencies.java
    felix/trunk/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
    felix/trunk/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/ps/DynamicProps.java
    felix/trunk/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/ps/DynamicPropsReconfiguration.java
    felix/trunk/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/ps/Exposition.java
    felix/trunk/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/ps/ProvidedServiceArchitectureTest.java
    felix/trunk/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/ps/SimplePS.java
    felix/trunk/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/ps/StaticProps.java
    felix/trunk/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/ps/StaticPropsReconfiguration.java
    felix/trunk/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
    felix/trunk/ipojo/tests/handler/eventadmin/src/main/java/org/apache/felix/ipojo/test/BadTests.java
    felix/trunk/ipojo/tests/handler/eventadmin/src/main/java/org/apache/felix/ipojo/test/GoodTests.java
    felix/trunk/ipojo/tests/handler/eventadmin/src/main/java/org/apache/felix/ipojo/test/util/IPojoTestUtils.java
    felix/trunk/ipojo/tests/handler/temporal/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
    felix/trunk/ipojo/tests/handler/whiteboard/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
    felix/trunk/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/ExceptionTest.java
    felix/trunk/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/GetComponentInstanceTest.java
    felix/trunk/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/ManipulationTestSuite.java
    felix/trunk/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/POJOCreation.java
    felix/trunk/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/PrimitiveTypeTest.java
    felix/trunk/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/PrimitiveTypeTest2.java
    felix/trunk/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
    felix/trunk/ipojo/tests/manipulator/manipulation/src/main/resources/metadata.xml

Modified: felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/EmptyCompositeTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/EmptyCompositeTest.java?rev=687318&r1=687317&r2=687318&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/EmptyCompositeTest.java (original)
+++ felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/EmptyCompositeTest.java Wed Aug 20 06:15:11 2008
@@ -35,7 +35,7 @@
 	public void testEmptyCompositeCreation() {
 		Factory factory = Utils.getFactoryByName(context, "composite.empty");
 		Properties props = new Properties();
-		props.put("name", "empty");
+		props.put("instance.name","empty");
 		
 		ComponentInstance ci = null;
 		try {
@@ -71,7 +71,7 @@
 	public void testInstanceCreation1() {
 		Factory factory = Utils.getFactoryByName(context, "composite.empty");
 		Properties props = new Properties();
-		props.put("name", "empty");
+		props.put("instance.name","empty");
 		
 		ComponentInstance ci = null;
 		try {
@@ -91,7 +91,7 @@
 		}
 		
 		Properties props2 = new Properties();
-		props2.put("name", "empty2");
+		props2.put("instance.name","empty2");
 		ComponentInstance ci2 = null;
 		try {
 			ci2 = factory.createComponentInstance(props2, sc);
@@ -121,7 +121,7 @@
 	public void testInstanceCreation2() {
 		Factory factory = Utils.getFactoryByName(context, "composite.empty");
 		Properties props = new Properties();
-		props.put("name", "empty");
+		props.put("instance.name","empty");
 		
 		ComponentInstance ci = null;
 		try {
@@ -142,7 +142,7 @@
 		Factory factory2 = Utils.getFactoryByName(sc, "composite.empty");
 		assertNotNull("Check factory2 not null", factory2);
 		Properties props2 = new Properties();
-		props2.put("name", "empty2");
+		props2.put("instance.name","empty2");
 		ComponentInstance ci2 = null;
 		try {
 			ci2 = factory2.createComponentInstance(props2);
@@ -171,7 +171,7 @@
 	public void testInstanceCreation3() {
 		Factory factory = Utils.getFactoryByName(context, "composite.empty");
 		Properties props = new Properties();
-		props.put("name", "empty");
+		props.put("instance.name","empty");
 		
 		ComponentInstance ci = null;
 		try {
@@ -192,7 +192,7 @@
 		Factory factory2 = Utils.getFactoryByName(sc, "composite.empty");
 		assertNotNull("Check factory2 not null", factory2);
 		Properties props2 = new Properties();
-		props2.put("name", "empty2");
+		props2.put("instance.name","empty2");
 		ComponentInstance ci2 = null;
 		try {
 			ci2 = factory2.createComponentInstance(props2, sc);

Modified: felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/FactoryManagementTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/FactoryManagementTest.java?rev=687318&r1=687317&r2=687318&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/FactoryManagementTest.java (original)
+++ felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/FactoryManagementTest.java Wed Aug 20 06:15:11 2008
@@ -69,7 +69,7 @@
 	public void setUp() {
 		emptyFactory = Utils.getFactoryByName(context, "composite.empty");
 		Properties props = new Properties();
-		props.put("name", "empty-1");
+		props.put("instance.name","empty-1");
 		try {
 			empty = emptyFactory.createComponentInstance(props);
 		} catch (Exception e) { fail("Cannot create empty instance " + e.getMessage()); }
@@ -100,7 +100,7 @@
 		
 		Factory fact = Utils.getFactoryByName(sc1, "composite.empty");
 		Properties p = new Properties();
-		p.put("name", "empty2");
+		p.put("instance.name","empty2");
 		ComponentInstance empty2 = null;
 		try {
 			empty2 = fact.createComponentInstance(p);
@@ -130,7 +130,7 @@
 		
 		Factory fact = Utils.getFactoryByName(sc1, "composite.empty");
 		Properties p = new Properties();
-		p.put("name", "empty2");
+		p.put("instance.name","empty2");
 		ComponentInstance empty2 = null;
 		try {
 			empty2 = fact.createComponentInstance(p);
@@ -207,7 +207,7 @@
 		ServiceContext sc1 = Utils.getServiceContext(empty);		
 		Factory fact = Utils.getFactoryByName(sc1, "composite.empty");
 		Properties p = new Properties();
-		p.put("name", "empty2");
+		p.put("instance.name","empty2");
 		ComponentInstance empty2 = null;
 		try {
 			empty2 = fact.createComponentInstance(p);
@@ -219,7 +219,7 @@
 		
 		Factory fact1 = Utils.getFactoryByName(sc2, "COMPO-SimpleCheckServiceProvider");
 		Properties props = new Properties();
-		props.put("name", "client");
+		props.put("instance.name","client");
 		ComponentInstance client = null;
 		try {
 			client = fact1.createComponentInstance(props);
@@ -227,7 +227,7 @@
 		
 		Factory fact2 = Utils.getFactoryByName(sc2, "COMPO-FooProviderType-1");
 		Properties props2 = new Properties();
-		props2.put("name", "provider");
+		props2.put("instance.name","provider");
 		ComponentInstance provider = null;
 		try {
 			provider = fact2.createComponentInstance(props2);

Modified: felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/ServiceRangeTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/ServiceRangeTest.java?rev=687318&r1=687317&r2=687318&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/ServiceRangeTest.java (original)
+++ felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/ServiceRangeTest.java Wed Aug 20 06:15:11 2008
@@ -39,7 +39,7 @@
 	public void setUp() {
 		emptyFactory = Utils.getFactoryByName(context, "composite.empty");
 		Properties props = new Properties();
-		props.put("name", "empty-1");
+		props.put("instance.name","empty-1");
 		try {
 			empty = emptyFactory.createComponentInstance(props);
 		} catch(Exception e) { fail("Cannot create empty instance " + e.getMessage()); }
@@ -55,7 +55,7 @@
 		
 		Factory fact1 = Utils.getFactoryByName(sc2, "COMPO-SimpleCheckServiceProvider");
 		Properties props = new Properties();
-		props.put("name", "client");
+		props.put("instance.name","client");
 		ComponentInstance client = null;
 		try {
 			client = fact1.createComponentInstance(props);
@@ -63,7 +63,7 @@
 		
 		Factory fact2 = Utils.getFactoryByName(sc2, "COMPO-FooProviderType-1");
 		Properties props2 = new Properties();
-		props2.put("name", "provider");
+		props2.put("instance.name","provider");
 		ComponentInstance provider = null;
 		try {
 			provider = fact2.createComponentInstance(props2);
@@ -107,7 +107,7 @@
 		
 		Factory fact1 = Utils.getFactoryByName(sc2, "COMPO-SimpleCheckServiceProvider");
 		Properties props = new Properties();
-		props.put("name", "client");
+		props.put("instance.name","client");
 		ComponentInstance client = null;
 		try {
 			client = fact1.createComponentInstance(props, sc2);
@@ -115,7 +115,7 @@
 		
 		Factory fact2 = Utils.getFactoryByName(sc2, "COMPO-FooProviderType-1");
 		Properties props2 = new Properties();
-		props2.put("name", "provider");
+		props2.put("instance.name","provider");
 		ComponentInstance provider = null;
 		try {
 			provider = fact2.createComponentInstance(props2, sc2);
@@ -159,7 +159,7 @@
 		
 		Factory fact1 = Utils.getFactoryByName(context, "COMPO-SimpleCheckServiceProvider");
 		Properties props = new Properties();
-		props.put("name", "client");
+		props.put("instance.name","client");
 		ComponentInstance client = null;
 		try {
 			client = fact1.createComponentInstance(props, sc2);
@@ -167,7 +167,7 @@
 		
 		Factory fact2 = Utils.getFactoryByName(context, "COMPO-FooProviderType-1");
 		Properties props2 = new Properties();
-		props2.put("name", "provider");
+		props2.put("instance.name","provider");
 		ComponentInstance provider = null;
 		try {
 			provider = fact2.createComponentInstance(props2, sc2);
@@ -210,7 +210,7 @@
 		ServiceContext sc1 = Utils.getServiceContext(empty);		
 		Factory fact = Utils.getFactoryByName(sc1, "composite.empty");
 		Properties p = new Properties();
-		p.put("name", "empty2");
+		p.put("instance.name","empty2");
 		ComponentInstance empty2 = null;
 		try {
 			empty2 = fact.createComponentInstance(p);
@@ -222,7 +222,7 @@
 		
 		Factory fact1 = Utils.getFactoryByName(sc2, "COMPO-SimpleCheckServiceProvider");
 		Properties props = new Properties();
-		props.put("name", "client");
+		props.put("instance.name","client");
 		ComponentInstance client = null;
 		try {
 			client = fact1.createComponentInstance(props);
@@ -230,7 +230,7 @@
 		
 		Factory fact2 = Utils.getFactoryByName(sc2, "COMPO-FooProviderType-1");
 		Properties props2 = new Properties();
-		props2.put("name", "provider");
+		props2.put("instance.name","provider");
 		ComponentInstance provider = null;
 		try {
 			provider = fact2.createComponentInstance(props2);
@@ -278,7 +278,7 @@
 		ServiceContext sc1 = Utils.getServiceContext(empty);		
 		Factory fact = Utils.getFactoryByName(sc1, "composite.empty");
 		Properties p = new Properties();
-		p.put("name", "empty2");
+		p.put("instance.name","empty2");
 		ComponentInstance empty2 = null;
 		try {
 			empty2 = fact.createComponentInstance(p);
@@ -290,7 +290,7 @@
 		
 		Factory fact1 = Utils.getFactoryByName(sc1, "COMPO-SimpleCheckServiceProvider");
 		Properties props = new Properties();
-		props.put("name", "client");
+		props.put("instance.name","client");
 		ComponentInstance client = null;
 		try {
 			client = fact1.createComponentInstance(props, sc2);
@@ -298,7 +298,7 @@
 		
 		Factory fact2 = Utils.getFactoryByName(sc1, "COMPO-FooProviderType-1");
 		Properties props2 = new Properties();
-		props2.put("name", "provider");
+		props2.put("instance.name","provider");
 		ComponentInstance provider = null;
 		try {
 			provider = fact2.createComponentInstance(props2, sc2);
@@ -346,7 +346,7 @@
 		ServiceContext sc1 = Utils.getServiceContext(empty);		
 		Factory fact = Utils.getFactoryByName(sc1, "composite.empty");
 		Properties p = new Properties();
-		p.put("name", "empty2");
+		p.put("instance.name","empty2");
 		ComponentInstance empty2 = null;
 		try {
 			empty2 = fact.createComponentInstance(p);
@@ -358,7 +358,7 @@
 		
 		Factory fact1 = Utils.getFactoryByName(context, "COMPO-SimpleCheckServiceProvider");
 		Properties props = new Properties();
-		props.put("name", "client");
+		props.put("instance.name","client");
 		ComponentInstance client = null;
 		try {
 			client = fact1.createComponentInstance(props, sc2);
@@ -366,7 +366,7 @@
 		
 		Factory fact2 = Utils.getFactoryByName(context, "COMPO-FooProviderType-1");
 		Properties props2 = new Properties();
-		props2.put("name", "provider");
+		props2.put("instance.name","provider");
 		ComponentInstance provider = null;
 		try {
 			provider = fact2.createComponentInstance(props2, sc2);
@@ -414,7 +414,7 @@
 		ServiceContext sc1 = Utils.getServiceContext(empty);		
 		Factory fact = Utils.getFactoryByName(sc1, "composite.empty");
 		Properties p = new Properties();
-		p.put("name", "empty2");
+		p.put("instance.name","empty2");
 		ComponentInstance empty2 = null;
 		try {
 			empty2 = fact.createComponentInstance(p);
@@ -426,7 +426,7 @@
 		
 		Factory fact1 = Utils.getFactoryByName(sc2, "COMPO-SimpleCheckServiceProvider");
 		Properties props = new Properties();
-		props.put("name", "client");
+		props.put("instance.name","client");
 		ComponentInstance client = null;
 		try {
 			client = fact1.createComponentInstance(props, sc2);
@@ -434,7 +434,7 @@
 		
 		Factory fact2 = Utils.getFactoryByName(sc2, "COMPO-FooProviderType-1");
 		Properties props2 = new Properties();
-		props2.put("name", "provider");
+		props2.put("instance.name","provider");
 		ComponentInstance provider = null;
 		try {
 			provider = fact2.createComponentInstance(props2, sc2);

Modified: felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/util/Utils.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/util/Utils.java?rev=687318&r1=687317&r2=687318&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/util/Utils.java (original)
+++ felix/trunk/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/util/Utils.java Wed Aug 20 06:15:11 2008
@@ -98,7 +98,7 @@
 
         try {
             Properties props = new Properties();
-            props.put("name", name);
+            props.put("instance.name",name);
             return fact.createComponentInstance(props);
         } catch (Exception e) {
             System.err.println("Cannot create the instance from " + factoryName + " : " + e.getMessage());

Modified: felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/FilteredExport.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/FilteredExport.java?rev=687318&r1=687317&r2=687318&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/FilteredExport.java (original)
+++ felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/FilteredExport.java Wed Aug 20 06:15:11 2008
@@ -39,9 +39,9 @@
 		assertNotNull("Check fooProvider availability", fooProvider);
 		
 		Properties p1 = new Properties();
-		p1.put("name", "foo1");
+		p1.put("instance.name","foo1");
 		Properties p2 = new Properties();
-		p2.put("name", "foo2");
+		p2.put("instance.name","foo2");
 		
 		try {
 			foo1 = fooProvider.createComponentInstance(p1);
@@ -55,7 +55,7 @@
 		
 		Factory factory = Utils.getFactoryByName(context, "composite.export.5");
 		Properties props = new Properties();
-		props.put("name", "export");
+		props.put("instance.name","export");
 		try {
 			export1 = factory.createComponentInstance(props);
 		} catch(Exception e) {

Modified: felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/MultipleExport.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/MultipleExport.java?rev=687318&r1=687317&r2=687318&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/MultipleExport.java (original)
+++ felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/MultipleExport.java Wed Aug 20 06:15:11 2008
@@ -39,9 +39,9 @@
 		assertNotNull("Check fooProvider availability", fooProvider);
 		
 		Properties p1 = new Properties();
-		p1.put("name", "foo1");
+		p1.put("instance.name","foo1");
 		Properties p2 = new Properties();
-		p2.put("name", "foo2");
+		p2.put("instance.name","foo2");
 		
 		try {
 			foo1 = fooProvider.createComponentInstance(p1);
@@ -55,7 +55,7 @@
 		
 		Factory factory = Utils.getFactoryByName(context, "composite.export.3");
 		Properties props = new Properties();
-		props.put("name", "export");
+		props.put("instance.name","export");
 		try {
 			export3 = factory.createComponentInstance(props);
 		} catch(Exception e) {

Modified: felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/OptionalExport.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/OptionalExport.java?rev=687318&r1=687317&r2=687318&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/OptionalExport.java (original)
+++ felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/OptionalExport.java Wed Aug 20 06:15:11 2008
@@ -39,9 +39,9 @@
 		assertNotNull("Check fooProvider availability", fooProvider);
 		
 		Properties p1 = new Properties();
-		p1.put("name", "foo1");
+		p1.put("instance.name","foo1");
 		Properties p2 = new Properties();
-		p2.put("name", "foo2");
+		p2.put("instance.name","foo2");
 		
 		try {
 			foo1 = fooProvider.createComponentInstance(p1);
@@ -55,7 +55,7 @@
 		
 		Factory factory = Utils.getFactoryByName(context, "composite.export.2");
 		Properties props = new Properties();
-		props.put("name", "export");
+		props.put("instance.name","export");
 		try {
 			export2 = factory.createComponentInstance(props);
 		} catch(Exception e) {

Modified: felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/OptionalMultipleExport.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/OptionalMultipleExport.java?rev=687318&r1=687317&r2=687318&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/OptionalMultipleExport.java (original)
+++ felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/OptionalMultipleExport.java Wed Aug 20 06:15:11 2008
@@ -39,9 +39,9 @@
 		assertNotNull("Check fooProvider availability", fooProvider);
 		
 		Properties p1 = new Properties();
-		p1.put("name", "foo1");
+		p1.put("instance.name","foo1");
 		Properties p2 = new Properties();
-		p2.put("name", "foo2");
+		p2.put("instance.name","foo2");
 		
 		try {
 			foo1 = fooProvider.createComponentInstance(p1);
@@ -55,7 +55,7 @@
 		
 		Factory factory = Utils.getFactoryByName(context, "composite.export.4");
 		Properties props = new Properties();
-		props.put("name", "export");
+		props.put("instance.name","export");
 		try {
 			export3 = factory.createComponentInstance(props);
 		} catch(Exception e) {

Modified: felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/SimpleExport.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/SimpleExport.java?rev=687318&r1=687317&r2=687318&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/SimpleExport.java (original)
+++ felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/SimpleExport.java Wed Aug 20 06:15:11 2008
@@ -39,9 +39,9 @@
 		assertNotNull("Check fooProvider availability", fooProvider);
 		
 		Properties p1 = new Properties();
-		p1.put("name", "foo1");
+		p1.put("instance.name","foo1");
 		Properties p2 = new Properties();
-		p2.put("name", "foo2");
+		p2.put("instance.name","foo2");
 		
 		try {
 			foo1 = fooProvider.createComponentInstance(p1);
@@ -55,7 +55,7 @@
 		
 		Factory factory = Utils.getFactoryByName(context, "composite.export.1");
 		Properties props = new Properties();
-		props.put("name", "export");
+		props.put("instance.name","export");
 		try {
 			export1 = factory.createComponentInstance(props);
 		} catch(Exception e) {

Modified: felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedFilteredImport.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedFilteredImport.java?rev=687318&r1=687317&r2=687318&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedFilteredImport.java (original)
+++ felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedFilteredImport.java Wed Aug 20 06:15:11 2008
@@ -37,7 +37,7 @@
 	public void setUp() {
 		
 		Properties p = new Properties();
-		p.put("name", "importer");
+		p.put("instance.name","importer");
 		Factory compFact = Utils.getFactoryByName(context, "composite.requires.1");
 		try {
 			import1 = compFact.createComponentInstance(p);
@@ -51,9 +51,9 @@
 		assertNotNull("Check fooProvider availability", fooProvider);
 		
 		Properties p1 = new Properties();
-		p1.put("name", "foo1");
+		p1.put("instance.name","foo1");
 		Properties p2 = new Properties();
-		p2.put("name", "foo2");
+		p2.put("instance.name","foo2");
 		try {
 			foo1 = fooProvider.createComponentInstance(p1);
 			foo2 = fooProvider.createComponentInstance(p2);

Modified: felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedMultipleImport.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedMultipleImport.java?rev=687318&r1=687317&r2=687318&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedMultipleImport.java (original)
+++ felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedMultipleImport.java Wed Aug 20 06:15:11 2008
@@ -37,7 +37,7 @@
 	public void setUp() {
 		
 		Properties p = new Properties();
-		p.put("name", "importer");
+		p.put("instance.name","importer");
 		Factory compFact = Utils.getFactoryByName(context, "composite.requires.2");
 		try {
 			import2 = compFact.createComponentInstance(p);
@@ -51,9 +51,9 @@
 		assertNotNull("Check fooProvider availability", fooProvider);
 		
 		Properties p1 = new Properties();
-		p1.put("name", "foo1");
+		p1.put("instance.name","foo1");
 		Properties p2 = new Properties();
-		p2.put("name", "foo2");
+		p2.put("instance.name","foo2");
 		try {
 			foo1 = fooProvider.createComponentInstance(p1);
 			foo2 = fooProvider.createComponentInstance(p2);

Modified: felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedOptionalImport.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedOptionalImport.java?rev=687318&r1=687317&r2=687318&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedOptionalImport.java (original)
+++ felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedOptionalImport.java Wed Aug 20 06:15:11 2008
@@ -37,7 +37,7 @@
 	public void setUp() {
 		
 		Properties p = new Properties();
-		p.put("name", "importer");
+		p.put("instance.name","importer");
 		Factory compFact = Utils.getFactoryByName(context, "composite.requires.3");
 		try {
 			import3 = compFact.createComponentInstance(p);
@@ -51,9 +51,9 @@
 		assertNotNull("Check fooProvider availability", fooProvider);
 		
 		Properties p1 = new Properties();
-		p1.put("name", "foo1");
+		p1.put("instance.name","foo1");
 		Properties p2 = new Properties();
-		p2.put("name", "foo2");
+		p2.put("instance.name","foo2");
 		try {
 			foo1 = fooProvider.createComponentInstance(p1);
 			foo2 = fooProvider.createComponentInstance(p2);

Modified: felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedOptionalMultipleImport.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedOptionalMultipleImport.java?rev=687318&r1=687317&r2=687318&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedOptionalMultipleImport.java (original)
+++ felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedOptionalMultipleImport.java Wed Aug 20 06:15:11 2008
@@ -37,7 +37,7 @@
 	public void setUp() {
 		
 		Properties p = new Properties();
-		p.put("name", "importer");
+		p.put("instance.name","importer");
 		Factory compFact = Utils.getFactoryByName(context, "composite.requires.4");
 		try {
 			import4 = compFact.createComponentInstance(p);
@@ -51,9 +51,9 @@
 		assertNotNull("Check fooProvider availability", fooProvider);
 		
 		Properties p1 = new Properties();
-		p1.put("name", "foo1");
+		p1.put("instance.name","foo1");
 		Properties p2 = new Properties();
-		p2.put("name", "foo2");
+		p2.put("instance.name","foo2");
 		try {
 			foo1 = fooProvider.createComponentInstance(p1);
 			foo2 = fooProvider.createComponentInstance(p2);

Modified: felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedSimpleImport.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedSimpleImport.java?rev=687318&r1=687317&r2=687318&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedSimpleImport.java (original)
+++ felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedSimpleImport.java Wed Aug 20 06:15:11 2008
@@ -37,7 +37,7 @@
 	public void setUp() {
 		
 		Properties p = new Properties();
-		p.put("name", "importer");
+		p.put("instance.name","importer");
 		Factory compFact = Utils.getFactoryByName(context, "composite.requires.1");
 		try {
 			import1 = compFact.createComponentInstance(p);
@@ -51,9 +51,9 @@
 		assertNotNull("Check fooProvider availability", fooProvider);
 		
 		Properties p1 = new Properties();
-		p1.put("name", "foo1");
+		p1.put("instance.name","foo1");
 		Properties p2 = new Properties();
-		p2.put("name", "foo2");
+		p2.put("instance.name","foo2");
 		try {
 			foo1 = fooProvider.createComponentInstance(p1);
 			foo2 = fooProvider.createComponentInstance(p2);

Modified: felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/FilteredImport.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/FilteredImport.java?rev=687318&r1=687317&r2=687318&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/FilteredImport.java (original)
+++ felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/FilteredImport.java Wed Aug 20 06:15:11 2008
@@ -38,7 +38,7 @@
 
 	public void setUp() {
 		Properties p = new Properties();
-		p.put("name", "importer");
+		p.put("instance.name","importer");
 		Factory compFact = Utils.getFactoryByName(context, "composite.requires.5");
 		try {
 			import1 = compFact.createComponentInstance(p);
@@ -54,9 +54,9 @@
 		assertNotNull("Check fooProvider availability", fooProvider2);
 		
 		Properties p1 = new Properties();
-		p1.put("name", "foo1");
+		p1.put("instance.name","foo1");
 		Properties p2 = new Properties();
-		p2.put("name", "foo2");
+		p2.put("instance.name","foo2");
 		try {
 			foo1 = fooProvider.createComponentInstance(p1);
 			foo2 = fooProvider2.createComponentInstance(p2);

Modified: felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/MultipleImport.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/MultipleImport.java?rev=687318&r1=687317&r2=687318&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/MultipleImport.java (original)
+++ felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/MultipleImport.java Wed Aug 20 06:15:11 2008
@@ -38,7 +38,7 @@
 		assertNotNull("Check fooProvider availability", fooProvider);
 		
 		Properties p = new Properties();
-		p.put("name", "importer");
+		p.put("instance.name","importer");
 		Factory compFact = Utils.getFactoryByName(context, "composite.requires.2");
 		try {
 			import2 = compFact.createComponentInstance(p);
@@ -58,7 +58,7 @@
 		
 		ComponentInstance foo = null;
 		Properties p = new Properties();
-		p.put("name", "foo");
+		p.put("instance.name","foo");
 		try {
 			foo = fooProvider.createComponentInstance(p);
 		} catch(Exception e) {
@@ -67,7 +67,7 @@
 		
 		ComponentInstance foo2 = null;
 		Properties p2 = new Properties();
-		p2.put("name", "foo2");
+		p2.put("instance.name","foo2");
 		try {
 			foo2 = fooProvider.createComponentInstance(p2);
 		} catch(Exception e) {
@@ -125,7 +125,7 @@
 		
 		ComponentInstance foo1 = null;
 		Properties p = new Properties();
-		p.put("name", "foo");
+		p.put("instance.name","foo");
 		try {
 			foo1 = fooProvider.createComponentInstance(p);
 		} catch(Exception e) {
@@ -134,7 +134,7 @@
 		
 		ComponentInstance foo2 = null;
 		Properties p2 = new Properties();
-		p2.put("name", "foo2");
+		p2.put("instance.name","foo2");
 		try {
 			foo2 = fooProvider.createComponentInstance(p2);
 		} catch(Exception e) {

Modified: felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/OptionalImport.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/OptionalImport.java?rev=687318&r1=687317&r2=687318&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/OptionalImport.java (original)
+++ felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/OptionalImport.java Wed Aug 20 06:15:11 2008
@@ -38,7 +38,7 @@
 		assertNotNull("Check fooProvider availability", fooProvider);
 		
 		Properties p = new Properties();
-		p.put("name", "importer");
+		p.put("instance.name","importer");
 		Factory compFact = Utils.getFactoryByName(context, "composite.requires.3");
 		try {
 			import3 = compFact.createComponentInstance(p);
@@ -58,7 +58,7 @@
 		
 		ComponentInstance foo = null;
 		Properties p = new Properties();
-		p.put("name", "foo");
+		p.put("instance.name","foo");
 		try {
 			foo = fooProvider.createComponentInstance(p);
 		} catch(Exception e) {
@@ -67,7 +67,7 @@
 		
 		ComponentInstance foo2 = null;
 		Properties p2 = new Properties();
-		p2.put("name", "foo2");
+		p2.put("instance.name","foo2");
 		try {
 			foo2 = fooProvider.createComponentInstance(p2);
 		} catch(Exception e) {
@@ -122,7 +122,7 @@
 		
 		ComponentInstance foo1 = null;
 		Properties p = new Properties();
-		p.put("name", "foo");
+		p.put("instance.name","foo");
 		try {
 			foo1 = fooProvider.createComponentInstance(p);
 		} catch(Exception e) {
@@ -131,7 +131,7 @@
 		
 		ComponentInstance foo2 = null;
 		Properties p2 = new Properties();
-		p2.put("name", "foo2");
+		p2.put("instance.name","foo2");
 		try {
 			foo2 = fooProvider.createComponentInstance(p2);
 		} catch(Exception e) {

Modified: felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/OptionalMultipleImport.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/OptionalMultipleImport.java?rev=687318&r1=687317&r2=687318&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/OptionalMultipleImport.java (original)
+++ felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/OptionalMultipleImport.java Wed Aug 20 06:15:11 2008
@@ -38,7 +38,7 @@
 		assertNotNull("Check fooProvider availability", fooProvider);
 		
 		Properties p = new Properties();
-		p.put("name", "importer");
+		p.put("instance.name","importer");
 		Factory compFact = Utils.getFactoryByName(context, "composite.requires.4");
 		try {
 			import2 = compFact.createComponentInstance(p);
@@ -58,7 +58,7 @@
 		
 		ComponentInstance foo = null;
 		Properties p = new Properties();
-		p.put("name", "foo");
+		p.put("instance.name","foo");
 		try {
 			foo = fooProvider.createComponentInstance(p);
 		} catch(Exception e) {
@@ -67,7 +67,7 @@
 		
 		ComponentInstance foo2 = null;
 		Properties p2 = new Properties();
-		p2.put("name", "foo2");
+		p2.put("instance.name","foo2");
 		try {
 			foo2 = fooProvider.createComponentInstance(p2);
 		} catch(Exception e) {
@@ -130,7 +130,7 @@
 		
 		ComponentInstance foo1 = null;
 		Properties p = new Properties();
-		p.put("name", "foo");
+		p.put("instance.name","foo");
 		try {
 			foo1 = fooProvider.createComponentInstance(p);
 		} catch(Exception e) {
@@ -139,7 +139,7 @@
 		
 		ComponentInstance foo2 = null;
 		Properties p2 = new Properties();
-		p2.put("name", "foo2");
+		p2.put("instance.name","foo2");
 		try {
 			foo2 = fooProvider.createComponentInstance(p2);
 		} catch(Exception e) {

Modified: felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/SimpleImport.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/SimpleImport.java?rev=687318&r1=687317&r2=687318&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/SimpleImport.java (original)
+++ felix/trunk/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/SimpleImport.java Wed Aug 20 06:15:11 2008
@@ -38,7 +38,7 @@
 		assertNotNull("Check fooProvider availability", fooProvider);
 		
 		Properties p = new Properties();
-		p.put("name", "importer");
+		p.put("instance.name","importer");
 		Factory compFact = Utils.getFactoryByName(context, "composite.requires.1");
 		try {
 			import1 = compFact.createComponentInstance(p);
@@ -59,7 +59,7 @@
 		
 		ComponentInstance foo = null;
 		Properties p = new Properties();
-		p.put("name", "foo");
+		p.put("instance.name","foo");
 		try {
 			foo = fooProvider.createComponentInstance(p);
 		} catch(Exception e) {
@@ -68,7 +68,7 @@
 		
 		ComponentInstance foo2 = null;
 		Properties p2 = new Properties();
-		p2.put("name", "foo2");
+		p2.put("instance.name","foo2");
 		try {
 			foo2 = fooProvider.createComponentInstance(p2);
 		} catch(Exception e) {
@@ -123,7 +123,7 @@
 		
 		ComponentInstance foo1 = null;
 		Properties p = new Properties();
-		p.put("name", "foo");
+		p.put("instance.name","foo");
 		try {
 			foo1 = fooProvider.createComponentInstance(p);
 		} catch(Exception e) {
@@ -132,7 +132,7 @@
 		
 		ComponentInstance foo2 = null;
 		Properties p2 = new Properties();
-		p2.put("name", "foo2");
+		p2.put("instance.name","foo2");
 		try {
 			foo2 = fooProvider.createComponentInstance(p2);
 		} catch(Exception e) {

Modified: felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instance/SimpleInstance.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instance/SimpleInstance.java?rev=687318&r1=687317&r2=687318&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instance/SimpleInstance.java (original)
+++ felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instance/SimpleInstance.java Wed Aug 20 06:15:11 2008
@@ -44,7 +44,7 @@
         compoFactory = (ComponentFactory) Utils.getFactoryByName(context, "composite.inst.1");
 		Factory fact = Utils.getFactoryByName(context, "composite.empty");
 		Properties props = new Properties();
-		props.put("name", "empty-X");
+		props.put("instance.name","empty-X");
 		try {
 			empty = fact.createComponentInstance(props);
 		} catch(Exception e) {
@@ -59,7 +59,7 @@
 	
 	public void testCreation() {
 		Properties props = new Properties();
-		props.put("name", "under-A");
+		props.put("instance.name","under-A");
 		ComponentInstance under = null;
 		try {
 			under = compoFactory.createComponentInstance(props);
@@ -74,7 +74,7 @@
 	
 	public void testServiceAvailability() {
 		Properties props = new Properties();
-		props.put("name", "under");
+		props.put("instance.name","under");
 		ComponentInstance under = null;
 		try {
 			under = compoFactory.createComponentInstance(props);
@@ -93,7 +93,7 @@
 	public void testCreationLevel2() {
 		ServiceContext sc = Utils.getServiceContext(empty);
 		Properties props = new Properties();
-		props.put("name", "under");
+		props.put("instance.name","under");
 		ComponentInstance under = null;
 		try {
 			under = compoFactory.createComponentInstance(props, sc);
@@ -108,7 +108,7 @@
 	public void testServiceAvailabilityLevel2() {
 		ServiceContext sc = Utils.getServiceContext(empty);
 		Properties props = new Properties();
-		props.put("name", "under-X");
+		props.put("instance.name","under-X");
 		ComponentInstance under = null;
 		try {
 			under = compoFactory.createComponentInstance(props, sc);
@@ -126,7 +126,7 @@
 	
 	public void testFactoryManagement() {
 		Properties props = new Properties();
-		props.put("name", "under");
+		props.put("instance.name","under");
 		ComponentInstance under = null;
 		try {
 			under = compoFactory.createComponentInstance(props);
@@ -155,7 +155,7 @@
 	public void testFactoryManagementLevel2() {
 		ServiceContext sc = Utils.getServiceContext(empty);
 		Properties props = new Properties();
-		props.put("name", "under");
+		props.put("instance.name","under");
 		ComponentInstance under = null;
 		try {
 			under = compoFactory.createComponentInstance(props, sc);
@@ -185,7 +185,7 @@
 	
 	public void atestArchitecture() { // TODO fix and reactivate the method.
 		Properties props = new Properties();
-		props.put("name", "under");
+		props.put("instance.name","under");
 		ComponentInstance under = null;
 		try {
 			under = compoFactory.createComponentInstance(props);

Modified: felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/ConfigurableInstantiation.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/ConfigurableInstantiation.java?rev=687318&r1=687317&r2=687318&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/ConfigurableInstantiation.java (original)
+++ felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/ConfigurableInstantiation.java Wed Aug 20 06:15:11 2008
@@ -46,7 +46,7 @@
 	
 	public void testAccept() {
 		Properties props = new Properties();
-		props.put("name", "under-A");
+		props.put("instance.name","under-A");
 		ComponentInstance under = null;
 		try {
 			under = acceptF.createComponentInstance(props);
@@ -72,7 +72,7 @@
 	
 	public void testRefuse1() {
 		Properties props = new Properties();
-		props.put("name", "under-ref1");
+		props.put("instance.name","under-ref1");
 		ComponentInstance under = null;
 		try {
 			under = refuse1F.createComponentInstance(props);
@@ -87,7 +87,7 @@
 	
 	public void testRefuse2() {
 		Properties props = new Properties();
-		props.put("name", "under-ref2");
+		props.put("instance.name","under-ref2");
 		ComponentInstance under = null;
 		try {
 			under = refuse2F.createComponentInstance(props);

Modified: felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/MultipleInstantiation.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/MultipleInstantiation.java?rev=687318&r1=687317&r2=687318&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/MultipleInstantiation.java (original)
+++ felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/MultipleInstantiation.java Wed Aug 20 06:15:11 2008
@@ -40,7 +40,7 @@
 		bar2Factory = (ComponentFactory) Utils.getFactoryByName(context, "composite.bar.2");
 		Factory fact = Utils.getFactoryByName(context, "composite.empty");
 		Properties props = new Properties();
-		props.put("name", "empty");
+		props.put("instance.name","empty");
 		try {
 			empty = fact.createComponentInstance(props);
 		} catch(Exception e) {
@@ -55,7 +55,7 @@
 	
 	public void testCreation() {
 		Properties props = new Properties();
-		props.put("name", "under");
+		props.put("instance.name","under");
 		ComponentInstance under = null;
 		try {
 			under = bar2Factory.createComponentInstance(props);
@@ -68,7 +68,7 @@
 	
 	public void testServiceAvailability() {
 		Properties props = new Properties();
-		props.put("name", "under");
+		props.put("instance.name","under");
 		ComponentInstance under = null;
 		try {
 			under = bar2Factory.createComponentInstance(props);
@@ -87,7 +87,7 @@
 	public void testCreationLevel2() {
 		ServiceContext sc = Utils.getServiceContext(empty);
 		Properties props = new Properties();
-		props.put("name", "under");
+		props.put("instance.name","under");
 		ComponentInstance under = null;
 		try {
 			under = bar2Factory.createComponentInstance(props, sc);
@@ -101,7 +101,7 @@
 	public void testServiceAvailabilityLevel2() {
 		ServiceContext sc = Utils.getServiceContext(empty);
 		Properties props = new Properties();
-		props.put("name", "under");
+		props.put("instance.name","under");
 		ComponentInstance under = null;
 		try {
 			under = bar2Factory.createComponentInstance(props, sc);
@@ -118,7 +118,7 @@
 	
 	public void testFactoryManagement() {
 		Properties props = new Properties();
-		props.put("name", "under");
+		props.put("instance.name","under");
 		ComponentInstance under = null;
 		try {
 			under = bar2Factory.createComponentInstance(props);
@@ -156,7 +156,7 @@
 	public void testFactoryManagementLevel2() {
 		ServiceContext sc = Utils.getServiceContext(empty);
 		Properties props = new Properties();
-		props.put("name", "under");
+		props.put("instance.name","under");
 		ComponentInstance under = null;
 		try {
 			under = bar2Factory.createComponentInstance(props, sc);
@@ -192,7 +192,7 @@
 	}
 	public void testArchitecture() {
 		Properties props = new Properties();
-		props.put("name", "under");
+		props.put("instance.name","under");
 		ComponentInstance under = null;
 		try {
 			under = bar2Factory.createComponentInstance(props);

Modified: felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/OptionalInstantiation.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/OptionalInstantiation.java?rev=687318&r1=687317&r2=687318&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/OptionalInstantiation.java (original)
+++ felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/OptionalInstantiation.java Wed Aug 20 06:15:11 2008
@@ -40,7 +40,7 @@
 		bar1Factory = (ComponentFactory) Utils.getFactoryByName(context, "composite.bar.3");
 		Factory fact = Utils.getFactoryByName(context, "composite.empty");
 		Properties props = new Properties();
-		props.put("name", "empty");
+		props.put("instance.name","empty");
 		try {
 			empty = fact.createComponentInstance(props);
 		} catch(Exception e) {
@@ -55,7 +55,7 @@
 	
 	public void testCreation() {
 		Properties props = new Properties();
-		props.put("name", "under");
+		props.put("instance.name","under");
 		ComponentInstance under = null;
 		try {
 			under = bar1Factory.createComponentInstance(props);
@@ -68,7 +68,7 @@
 	
 	public void testServiceAvailability() {
 		Properties props = new Properties();
-		props.put("name", "under");
+		props.put("instance.name","under");
 		ComponentInstance under = null;
 		try {
 			under = bar1Factory.createComponentInstance(props);
@@ -85,7 +85,7 @@
 	public void testCreationLevel2() {
 		ServiceContext sc = Utils.getServiceContext(empty);
 		Properties props = new Properties();
-		props.put("name", "under");
+		props.put("instance.name","under");
 		ComponentInstance under = null;
 		try {
 			under = bar1Factory.createComponentInstance(props, sc);
@@ -99,7 +99,7 @@
 	public void testServiceAvailabilityLevel2() {
 		ServiceContext sc = Utils.getServiceContext(empty);
 		Properties props = new Properties();
-		props.put("name", "under");
+		props.put("instance.name","under");
 		ComponentInstance under = null;
 		try {
 			under = bar1Factory.createComponentInstance(props, sc);
@@ -115,7 +115,7 @@
 	
 	public void testFactoryManagement() {
 		Properties props = new Properties();
-		props.put("name", "under");
+		props.put("instance.name","under");
 		ComponentInstance under = null;
 		try {
 			under = bar1Factory.createComponentInstance(props);
@@ -150,7 +150,7 @@
 	public void testFactoryManagementLevel2() {
 		ServiceContext sc = Utils.getServiceContext(empty);
 		Properties props = new Properties();
-		props.put("name", "under");
+		props.put("instance.name","under");
 		ComponentInstance under = null;
 		try {
 			under = bar1Factory.createComponentInstance(props, sc);
@@ -182,7 +182,7 @@
 	
 	public void testArchitecture() {
 		Properties props = new Properties();
-		props.put("name", "under");
+		props.put("instance.name","under");
 		ComponentInstance under = null;
 		try {
 			under = bar1Factory.createComponentInstance(props);

Modified: felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/OptionalMultipleInstantiation.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/OptionalMultipleInstantiation.java?rev=687318&r1=687317&r2=687318&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/OptionalMultipleInstantiation.java (original)
+++ felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/OptionalMultipleInstantiation.java Wed Aug 20 06:15:11 2008
@@ -39,7 +39,7 @@
 		
 		Factory fact = Utils.getFactoryByName(context, "composite.empty");
 		Properties props = new Properties();
-		props.put("name", "empty");
+		props.put("instance.name","empty");
 		try {
 			empty = fact.createComponentInstance(props);
 		} catch(Exception e) {
@@ -54,7 +54,7 @@
 	
 	public void testCreation() {
 		Properties props = new Properties();
-		props.put("name", "under");
+		props.put("instance.name","under");
 		ComponentInstance under = null;
 		try {
 			under = bar2Factory.createComponentInstance(props);
@@ -67,7 +67,7 @@
 	
 	public void testServiceAvailability() {
 		Properties props = new Properties();
-		props.put("name", "under");
+		props.put("instance.name","under");
 		ComponentInstance under = null;
 		try {
 			under = bar2Factory.createComponentInstance(props);
@@ -86,7 +86,7 @@
 	public void testCreationLevel2() {
 		ServiceContext sc = Utils.getServiceContext(empty);
 		Properties props = new Properties();
-		props.put("name", "under");
+		props.put("instance.name","under");
 		ComponentInstance under = null;
 		try {
 			under = bar2Factory.createComponentInstance(props, sc);
@@ -100,7 +100,7 @@
 	public void testServiceAvailabilityLevel2() {
 		ServiceContext sc = Utils.getServiceContext(empty);
 		Properties props = new Properties();
-		props.put("name", "under");
+		props.put("instance.name","under");
 		ComponentInstance under = null;
 		try {
 			under = bar2Factory.createComponentInstance(props, sc);
@@ -117,7 +117,7 @@
 	
 	public void testFactoryManagement() {
 		Properties props = new Properties();
-		props.put("name", "under");
+		props.put("instance.name","under");
 		ComponentInstance under = null;
 		try {
 			under = bar2Factory.createComponentInstance(props);
@@ -155,7 +155,7 @@
 	public void testFactoryManagementLevel2() {
 		ServiceContext sc = Utils.getServiceContext(empty);
 		Properties props = new Properties();
-		props.put("name", "under");
+		props.put("instance.name","under");
 		ComponentInstance under = null;
 		try {
 			under = bar2Factory.createComponentInstance(props, sc);

Modified: felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/SimpleInstantiation.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/SimpleInstantiation.java?rev=687318&r1=687317&r2=687318&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/SimpleInstantiation.java (original)
+++ felix/trunk/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/SimpleInstantiation.java Wed Aug 20 06:15:11 2008
@@ -40,7 +40,7 @@
 		bar1Factory = (ComponentFactory) Utils.getFactoryByName(context, "composite.bar.1");
 		Factory fact = Utils.getFactoryByName(context, "composite.empty");
 		Properties props = new Properties();
-		props.put("name", "empty-X");
+		props.put("instance.name","empty-X");
 		try {
 			empty = fact.createComponentInstance(props);
 		} catch(Exception e) {
@@ -55,7 +55,7 @@
 	
 	public void testCreation() {
 		Properties props = new Properties();
-		props.put("name", "under");
+		props.put("instance.name","under");
 		ComponentInstance under = null;
 		try {
 			under = bar1Factory.createComponentInstance(props);
@@ -69,7 +69,7 @@
 	
 	public void testServiceAvailability() {
 		Properties props = new Properties();
-		props.put("name", "under");
+		props.put("instance.name","under");
 		ComponentInstance under = null;
 		try {
 			under = bar1Factory.createComponentInstance(props);
@@ -86,7 +86,7 @@
 	public void testCreationLevel2() {
 		ServiceContext sc = Utils.getServiceContext(empty);
 		Properties props = new Properties();
-		props.put("name", "under");
+		props.put("instance.name","under");
 		ComponentInstance under = null;
 		try {
 			under = bar1Factory.createComponentInstance(props, sc);
@@ -100,7 +100,7 @@
 	public void testServiceAvailabilityLevel2() {
 		ServiceContext sc = Utils.getServiceContext(empty);
 		Properties props = new Properties();
-		props.put("name", "under-X");
+		props.put("instance.name","under-X");
 		ComponentInstance under = null;
 		try {
 			under = bar1Factory.createComponentInstance(props, sc);
@@ -116,7 +116,7 @@
 	
 	public void testFactoryManagement() {
 		Properties props = new Properties();
-		props.put("name", "under");
+		props.put("instance.name","under");
 		ComponentInstance under = null;
 		try {
 			under = bar1Factory.createComponentInstance(props);
@@ -150,7 +150,7 @@
 	public void testFactoryManagementLevel2() {
 		ServiceContext sc = Utils.getServiceContext(empty);
 		Properties props = new Properties();
-		props.put("name", "under");
+		props.put("instance.name","under");
 		ComponentInstance under = null;
 		try {
 			under = bar1Factory.createComponentInstance(props, sc);
@@ -182,7 +182,7 @@
 	
 	public void testArchitecture() {
 		Properties props = new Properties();
-		props.put("name", "under");
+		props.put("instance.name","under");
 		ComponentInstance under = null;
 		try {
 			under = bar1Factory.createComponentInstance(props);

Modified: felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp0.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp0.java?rev=687318&r1=687317&r2=687318&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp0.java (original)
+++ felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp0.java Wed Aug 20 06:15:11 2008
@@ -48,7 +48,7 @@
         tataFactory.stop();
         
         Properties props = new Properties();
-        props.put("name", "toto provider");
+        props.put("instance.name","toto provider");
         try {
             totoProv = totoFactory.createComponentInstance(props);
         } catch(Exception e) {
@@ -56,7 +56,7 @@
         }
         
         Properties props3 = new Properties();
-        props3.put("name", "toto provider 2");
+        props3.put("instance.name","toto provider 2");
         try {
             totoProv2 = totoFactory.createComponentInstance(props3);
         } catch(Exception e) {
@@ -68,7 +68,7 @@
         
         Factory factory = Utils.getFactoryByName(context, "comp-0");
         Properties props2 = new Properties();
-        props2.put("name", "ff");
+        props2.put("instance.name","ff");
         try {
             under = factory.createComponentInstance(props2);
         } catch(Exception e) {

Modified: felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp1.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp1.java?rev=687318&r1=687317&r2=687318&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp1.java (original)
+++ felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp1.java Wed Aug 20 06:15:11 2008
@@ -48,7 +48,7 @@
         tataFactory.stop();
         
         Properties props = new Properties();
-        props.put("name", "toto provider");
+        props.put("instance.name","toto provider");
         try {
             totoProv = totoFactory.createComponentInstance(props);
         } catch(Exception e) {
@@ -56,7 +56,7 @@
         }
         
         Properties props3 = new Properties();
-        props3.put("name", "toto provider 2");
+        props3.put("instance.name","toto provider 2");
         try {
             totoProv2 = totoFactory.createComponentInstance(props3);
         } catch(Exception e) {

Modified: felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp2.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp2.java?rev=687318&r1=687317&r2=687318&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp2.java (original)
+++ felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp2.java Wed Aug 20 06:15:11 2008
@@ -47,7 +47,7 @@
         tataFactory.stop();
         
         Properties props = new Properties();
-        props.put("name", "toto provider");
+        props.put("instance.name","toto provider");
         try {
             totoProv = totoFactory.createComponentInstance(props);
         } catch(Exception e) {
@@ -55,7 +55,7 @@
         }
         
         Properties props3 = new Properties();
-        props3.put("name", "toto provider 2");
+        props3.put("instance.name","toto provider 2");
         try {
             totoProv2 = totoFactory.createComponentInstance(props3);
         } catch(Exception e) {
@@ -67,7 +67,7 @@
         
         Factory factory = Utils.getFactoryByName(context, "comp-2");
         Properties props2 = new Properties();
-        props2.put("name", "ff");
+        props2.put("instance.name","ff");
         try {
             under = factory.createComponentInstance(props2);
         } catch(Exception e) {

Modified: felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp3.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp3.java?rev=687318&r1=687317&r2=687318&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp3.java (original)
+++ felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp3.java Wed Aug 20 06:15:11 2008
@@ -47,7 +47,7 @@
         tataFactory.stop();
         
         Properties props = new Properties();
-        props.put("name", "toto provider");
+        props.put("instance.name","toto provider");
         try {
             totoProv = totoFactory.createComponentInstance(props);
         } catch(Exception e) {
@@ -55,7 +55,7 @@
         }
         
         Properties props3 = new Properties();
-        props3.put("name", "toto provider 2");
+        props3.put("instance.name","toto provider 2");
         try {
             totoProv2 = totoFactory.createComponentInstance(props3);
         } catch(Exception e) {
@@ -67,7 +67,7 @@
         
         Factory factory = Utils.getFactoryByName(context, "comp-3");
         Properties props2 = new Properties();
-        props2.put("name", "ff");
+        props2.put("instance.name","ff");
         try {
             under = factory.createComponentInstance(props2);
         } catch(Exception e) {

Modified: felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp4.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp4.java?rev=687318&r1=687317&r2=687318&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp4.java (original)
+++ felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp4.java Wed Aug 20 06:15:11 2008
@@ -47,7 +47,7 @@
         tataFactory.stop();
         
         Properties props = new Properties();
-        props.put("name", "toto provider");
+        props.put("instance.name","toto provider");
         try {
             totoProv = totoFactory.createComponentInstance(props);
         } catch(Exception e) {
@@ -55,7 +55,7 @@
         }
         
         Properties props3 = new Properties();
-        props3.put("name", "toto provider 2");
+        props3.put("instance.name","toto provider 2");
         try {
             totoProv2 = totoFactory.createComponentInstance(props3);
         } catch(Exception e) {
@@ -67,7 +67,7 @@
         
         Factory factory = Utils.getFactoryByName(context, "comp-4");
         Properties props2 = new Properties();
-        props2.put("name", "ff");
+        props2.put("instance.name","ff");
         try {
             under = factory.createComponentInstance(props2);
         } catch(Exception e) {

Modified: felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp5.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp5.java?rev=687318&r1=687317&r2=687318&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp5.java (original)
+++ felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp5.java Wed Aug 20 06:15:11 2008
@@ -47,7 +47,7 @@
         tataFactory.stop();
         
         Properties props = new Properties();
-        props.put("name", "toto provider");
+        props.put("instance.name","toto provider");
         try {
             totoProv = totoFactory.createComponentInstance(props);
         } catch(Exception e) {
@@ -55,7 +55,7 @@
         }
         
         Properties props3 = new Properties();
-        props3.put("name", "toto provider 2");
+        props3.put("instance.name","toto provider 2");
         try {
             totoProv2 = totoFactory.createComponentInstance(props3);
         } catch(Exception e) {
@@ -67,7 +67,7 @@
         
         Factory factory = Utils.getFactoryByName(context, "comp-5");
         Properties props2 = new Properties();
-        props2.put("name", "ff");
+        props2.put("instance.name","ff");
         try {
             under = factory.createComponentInstance(props2);
         } catch(Exception e) {

Modified: felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp6.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp6.java?rev=687318&r1=687317&r2=687318&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp6.java (original)
+++ felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp6.java Wed Aug 20 06:15:11 2008
@@ -46,7 +46,7 @@
         tataFactory.stop();
         
         Properties props = new Properties();
-        props.put("name", "toto provider");
+        props.put("instance.name","toto provider");
         try {
             totoProv = totoFactory.createComponentInstance(props);
         } catch(Exception e) {
@@ -54,7 +54,7 @@
         }
         
         Properties props3 = new Properties();
-        props3.put("name", "toto provider 2");
+        props3.put("instance.name","toto provider 2");
         try {
             totoProv2 = totoFactory.createComponentInstance(props3);
         } catch(Exception e) {
@@ -66,7 +66,7 @@
         
         Factory factory = Utils.getFactoryByName(context, "comp-6");
         Properties props2 = new Properties();
-        props2.put("name", "ff");
+        props2.put("instance.name","ff");
         try {
             under = factory.createComponentInstance(props2);
         } catch(Exception e) {

Modified: felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp7.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp7.java?rev=687318&r1=687317&r2=687318&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp7.java (original)
+++ felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp7.java Wed Aug 20 06:15:11 2008
@@ -46,7 +46,7 @@
         tataFactory2.stop();
         
         Properties props = new Properties();
-        props.put("name", "toto provider");
+        props.put("instance.name","toto provider");
         try {
             totoProv = totoFactory.createComponentInstance(props);
         } catch(Exception e) {
@@ -54,7 +54,7 @@
         }
         
         Properties props3 = new Properties();
-        props3.put("name", "toto provider 2");
+        props3.put("instance.name","toto provider 2");
         try {
             totoProv2 = totoFactory.createComponentInstance(props3);
         } catch(Exception e) {
@@ -66,7 +66,7 @@
         
         Factory factory = Utils.getFactoryByName(context, "comp-7");
         Properties props2 = new Properties();
-        props2.put("name", "ff");
+        props2.put("instance.name","ff");
         try {
             under = factory.createComponentInstance(props2);
         } catch(Exception e) {

Modified: felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp8.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp8.java?rev=687318&r1=687317&r2=687318&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp8.java (original)
+++ felix/trunk/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp8.java Wed Aug 20 06:15:11 2008
@@ -47,7 +47,7 @@
         tataFactory2.stop();
         
         Properties props = new Properties();
-        props.put("name", "toto provider");
+        props.put("instance.name","toto provider");
         try {
             totoProv = totoFactory.createComponentInstance(props);
         } catch(Exception e) {
@@ -55,7 +55,7 @@
         }
         
         Properties props3 = new Properties();
-        props3.put("name", "toto provider 2");
+        props3.put("instance.name","toto provider 2");
         try {
             totoProv2 = totoFactory.createComponentInstance(props3);
         } catch(Exception e) {
@@ -67,7 +67,7 @@
         
         Factory factory = Utils.getFactoryByName(context, "comp-8");
         Properties props2 = new Properties();
-        props2.put("name", "ff");
+        props2.put("instance.name","ff");
         try {
             under = factory.createComponentInstance(props2);
         } catch(Exception e) {



Mime
View raw message