Update the test suite to refer to the 'name' => 'instance.name' change
Add tests checking inner classes.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@687318 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/EmptyCompositeTest.java b/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/EmptyCompositeTest.java
index a729b33..4ae87c5 100644
--- a/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/EmptyCompositeTest.java
+++ b/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/EmptyCompositeTest.java
@@ -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);
diff --git a/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/FactoryManagementTest.java b/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/FactoryManagementTest.java
index 43433a9..1137f92 100644
--- a/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/FactoryManagementTest.java
+++ b/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/FactoryManagementTest.java
@@ -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);
diff --git a/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/ServiceRangeTest.java b/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/ServiceRangeTest.java
index a2d9f3c..5b7b895 100644
--- a/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/ServiceRangeTest.java
+++ b/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/ServiceRangeTest.java
@@ -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);
diff --git a/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/util/Utils.java b/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/util/Utils.java
index deb96ef..89f094f 100644
--- a/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/util/Utils.java
+++ b/ipojo/tests/composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/util/Utils.java
@@ -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());
diff --git a/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/FilteredExport.java b/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/FilteredExport.java
index 8353c03..95cda20 100644
--- a/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/FilteredExport.java
+++ b/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/FilteredExport.java
@@ -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) {
diff --git a/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/MultipleExport.java b/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/MultipleExport.java
index fed07ba..355f02a 100644
--- a/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/MultipleExport.java
+++ b/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/MultipleExport.java
@@ -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) {
diff --git a/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/OptionalExport.java b/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/OptionalExport.java
index 4f78f49..be0babb 100644
--- a/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/OptionalExport.java
+++ b/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/OptionalExport.java
@@ -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) {
diff --git a/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/OptionalMultipleExport.java b/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/OptionalMultipleExport.java
index a285ef0..38538be 100644
--- a/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/OptionalMultipleExport.java
+++ b/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/OptionalMultipleExport.java
@@ -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) {
diff --git a/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/SimpleExport.java b/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/SimpleExport.java
index b0bf922..22f51c9 100644
--- a/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/SimpleExport.java
+++ b/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/exporter/SimpleExport.java
@@ -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) {
diff --git a/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedFilteredImport.java b/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedFilteredImport.java
index 1466677..653ccb2 100644
--- a/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedFilteredImport.java
+++ b/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedFilteredImport.java
@@ -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);
diff --git a/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedMultipleImport.java b/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedMultipleImport.java
index 47688ee..72c08f7 100644
--- a/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedMultipleImport.java
+++ b/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedMultipleImport.java
@@ -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);
diff --git a/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedOptionalImport.java b/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedOptionalImport.java
index 6e36797..06dad59 100644
--- a/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedOptionalImport.java
+++ b/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedOptionalImport.java
@@ -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);
diff --git a/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedOptionalMultipleImport.java b/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedOptionalMultipleImport.java
index 0dac390..06018f5 100644
--- a/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedOptionalMultipleImport.java
+++ b/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedOptionalMultipleImport.java
@@ -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);
diff --git a/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedSimpleImport.java b/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedSimpleImport.java
index 2d89ee8..b416663 100644
--- a/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedSimpleImport.java
+++ b/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/DelayedSimpleImport.java
@@ -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);
diff --git a/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/FilteredImport.java b/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/FilteredImport.java
index 221ecda..d50be8d 100644
--- a/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/FilteredImport.java
+++ b/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/FilteredImport.java
@@ -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);
diff --git a/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/MultipleImport.java b/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/MultipleImport.java
index c8eedce..eb54bac 100644
--- a/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/MultipleImport.java
+++ b/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/MultipleImport.java
@@ -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) {
diff --git a/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/OptionalImport.java b/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/OptionalImport.java
index 0fb3f89..f24a46c 100644
--- a/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/OptionalImport.java
+++ b/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/OptionalImport.java
@@ -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) {
diff --git a/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/OptionalMultipleImport.java b/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/OptionalMultipleImport.java
index a7c71b0..e00d1ec 100644
--- a/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/OptionalMultipleImport.java
+++ b/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/OptionalMultipleImport.java
@@ -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) {
diff --git a/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/SimpleImport.java b/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/SimpleImport.java
index 31f2b5a..429bac0 100644
--- a/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/SimpleImport.java
+++ b/ipojo/tests/composite/import-export/src/main/java/org/apache/felix/ipojo/test/composite/importer/SimpleImport.java
@@ -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) {
diff --git a/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instance/SimpleInstance.java b/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instance/SimpleInstance.java
index 1f39ab2..b194b36 100644
--- a/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instance/SimpleInstance.java
+++ b/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instance/SimpleInstance.java
@@ -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);
diff --git a/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/ConfigurableInstantiation.java b/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/ConfigurableInstantiation.java
index 2c851ea..00f48b5 100644
--- a/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/ConfigurableInstantiation.java
+++ b/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/ConfigurableInstantiation.java
@@ -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);
diff --git a/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/MultipleInstantiation.java b/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/MultipleInstantiation.java
index f155add..6974e4f 100644
--- a/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/MultipleInstantiation.java
+++ b/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/MultipleInstantiation.java
@@ -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);
diff --git a/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/OptionalInstantiation.java b/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/OptionalInstantiation.java
index e617d64..c6480b4 100644
--- a/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/OptionalInstantiation.java
+++ b/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/OptionalInstantiation.java
@@ -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);
diff --git a/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/OptionalMultipleInstantiation.java b/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/OptionalMultipleInstantiation.java
index 777784c..db7ecce 100644
--- a/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/OptionalMultipleInstantiation.java
+++ b/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/OptionalMultipleInstantiation.java
@@ -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);
diff --git a/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/SimpleInstantiation.java b/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/SimpleInstantiation.java
index 4430c19..0b2414f 100644
--- a/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/SimpleInstantiation.java
+++ b/ipojo/tests/composite/service-instance/src/main/java/org/apache/felix/ipojo/test/composite/instantiator/SimpleInstantiation.java
@@ -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);
diff --git a/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp0.java b/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp0.java
index d3e26a8..8e96fc7 100644
--- a/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp0.java
+++ b/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp0.java
@@ -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) {
diff --git a/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp1.java b/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp1.java
index 95d64be..f59961a 100644
--- a/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp1.java
+++ b/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp1.java
@@ -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) {
diff --git a/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp2.java b/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp2.java
index 763080f..3628c7a 100644
--- a/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp2.java
+++ b/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp2.java
@@ -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) {
diff --git a/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp3.java b/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp3.java
index 07ac5d3..9d8445a 100644
--- a/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp3.java
+++ b/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp3.java
@@ -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) {
diff --git a/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp4.java b/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp4.java
index 0d0f36c..ea821a7 100644
--- a/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp4.java
+++ b/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp4.java
@@ -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) {
diff --git a/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp5.java b/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp5.java
index 7dd11f7..33c3e3f 100644
--- a/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp5.java
+++ b/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp5.java
@@ -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) {
diff --git a/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp6.java b/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp6.java
index 609c23c..08384d6 100644
--- a/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp6.java
+++ b/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp6.java
@@ -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) {
diff --git a/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp7.java b/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp7.java
index 67a6c19..3df2b55 100644
--- a/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp7.java
+++ b/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp7.java
@@ -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) {
diff --git a/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp8.java b/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp8.java
index f9ceb09..d09cd89 100644
--- a/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp8.java
+++ b/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/provides/TestComp8.java
@@ -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) {
diff --git a/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/test/CompositeTest.java b/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/test/CompositeTest.java
index e7f73bb..7ee1868 100644
--- a/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/test/CompositeTest.java
+++ b/ipojo/tests/composite/service-providing/src/main/java/org/apache/felix/ipojo/test/composite/test/CompositeTest.java
@@ -36,7 +36,7 @@
public void testAPI() {
Factory fact1 = Utils.getFactoryByName(context, "composite.empty");
Properties p = new Properties();
- p.put("name", "empty-1");
+ p.put("instance.name","empty-1");
ComponentInstance empty = null;
try {
empty = fact1.createComponentInstance(p);
@@ -49,10 +49,10 @@
Factory fact2 = Utils.getFactoryByName(context, "composite.test.2");
Properties props2 = new Properties();
- props2.put("name", "2"); // 2
+ props2.put("instance.name","2"); // 2
Factory fact3 = Utils.getFactoryByName(context, "composite.test.3");
Properties props3 = new Properties();
- props3.put("name", "3");
+ props3.put("instance.name","3");
ComponentInstance comp2 = null;
ComponentInstance comp3 = null;
try {
@@ -84,7 +84,7 @@
Factory fact = Utils.getFactoryByName(context, type);
ComponentInstance ci = null;
Properties p = new Properties();
- p.put("name", "mon_coeur");
+ p.put("instance.name","mon_coeur");
try {
ci = fact.createComponentInstance(p);
} catch(Exception e) {
@@ -108,7 +108,7 @@
public void testAPI2() {
Factory fact1 = Utils.getFactoryByName(context, "composite.empty");
Properties p = new Properties();
- p.put("name", "empty-2");
+ p.put("instance.name","empty-2");
ComponentInstance empty = null;
try {
empty = fact1.createComponentInstance(p);
@@ -120,10 +120,10 @@
Factory fact2 = Utils.getFactoryByName(sc, "composite.test.2");
Properties props2 = new Properties();
- props2.put("name", "4");
+ props2.put("instance.name","4");
Factory fact3 = Utils.getFactoryByName(sc, "composite.test.3");
Properties props3 = new Properties();
- props3.put("name", "5");
+ props3.put("instance.name","5");
ComponentInstance comp2 = null;
ComponentInstance comp3 = null;
try {
@@ -154,7 +154,7 @@
Factory factory = Utils.getFactoryByName(context, "composite.test.1");
ComponentInstance ci = null;
Properties props = new Properties();
- props.put("name", "Test");
+ props.put("instance.name","Test");
try {
ci = factory.createComponentInstance(props);
} catch(Exception e) {
diff --git a/ipojo/tests/core/annotations/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java b/ipojo/tests/core/annotations/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
index fcfe99b..f64adb7 100644
--- a/ipojo/tests/core/annotations/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
+++ b/ipojo/tests/core/annotations/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
@@ -126,7 +126,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());
diff --git a/ipojo/tests/core/bad-configurations/src/main/java/org/apache/felix/ipojo/test/scenarios/bad/BadLFCCallback.java b/ipojo/tests/core/bad-configurations/src/main/java/org/apache/felix/ipojo/test/scenarios/bad/BadLFCCallback.java
index cca4fe5..54fd891 100644
--- a/ipojo/tests/core/bad-configurations/src/main/java/org/apache/felix/ipojo/test/scenarios/bad/BadLFCCallback.java
+++ b/ipojo/tests/core/bad-configurations/src/main/java/org/apache/felix/ipojo/test/scenarios/bad/BadLFCCallback.java
@@ -41,7 +41,7 @@
public void setUp() {
manipulation = getManipulationForComponent();
props = new Properties();
- props.put("name", "BAD");
+ props.put("instance.name","BAD");
}
diff --git a/ipojo/tests/core/bad-configurations/src/main/java/org/apache/felix/ipojo/test/scenarios/bad/BadServiceDependencies.java b/ipojo/tests/core/bad-configurations/src/main/java/org/apache/felix/ipojo/test/scenarios/bad/BadServiceDependencies.java
index bd76143..e0f6333 100644
--- a/ipojo/tests/core/bad-configurations/src/main/java/org/apache/felix/ipojo/test/scenarios/bad/BadServiceDependencies.java
+++ b/ipojo/tests/core/bad-configurations/src/main/java/org/apache/felix/ipojo/test/scenarios/bad/BadServiceDependencies.java
@@ -42,7 +42,7 @@
public void setUp() {
manipulation = getManipulationForComponent();
props = new Properties();
- props.put("name", "BAD");
+ props.put("instance.name","BAD");
}
diff --git a/ipojo/tests/core/bad-configurations/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java b/ipojo/tests/core/bad-configurations/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
index 34e7eb5..5d33264 100644
--- a/ipojo/tests/core/bad-configurations/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
+++ b/ipojo/tests/core/bad-configurations/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
@@ -100,7 +100,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());
diff --git a/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/DynamicallyConfigurableProperties.java b/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/DynamicallyConfigurableProperties.java
index b7fbb6c..74e270a 100644
--- a/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/DynamicallyConfigurableProperties.java
+++ b/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/DynamicallyConfigurableProperties.java
@@ -36,7 +36,7 @@
String type = "CONFIG-FooProviderType-3";
Properties p1 = new Properties();
- p1.put("name", "instance");
+ p1.put("instance.name","instance");
p1.put("foo", "foo");
p1.put("bar", "2");
p1.put("baz", "baz");
diff --git a/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/ManagedServiceConfigurableProperties.java b/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/ManagedServiceConfigurableProperties.java
index 0859ac1..1344ddf 100644
--- a/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/ManagedServiceConfigurableProperties.java
+++ b/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/ManagedServiceConfigurableProperties.java
@@ -43,7 +43,7 @@
public void setUp() {
String type = "CONFIG-FooProviderType-4";
Properties p = new Properties();
- p.put("name", "instance");
+ p.put("instance.name","instance");
p.put("foo", "foo");
p.put("bar", "2");
p.put("baz", "baz");
@@ -52,7 +52,7 @@
type = "CONFIG-FooProviderType-3";
Properties p1 = new Properties();
- p1.put("name", "instance-2");
+ p1.put("instance.name","instance-2");
p1.put("foo", "foo");
p1.put("bar", "2");
p1.put("baz", "baz");
diff --git a/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/SimpleProperties.java b/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/SimpleProperties.java
index 33f47a7..13a559b 100644
--- a/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/SimpleProperties.java
+++ b/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/SimpleProperties.java
@@ -35,11 +35,11 @@
String type = "CONFIG-FooProviderType-Conf";
Properties p1 = new Properties();
- p1.put("name", "FooProvider-1");
+ p1.put("instance.name","FooProvider-1");
fooProvider1 = Utils.getComponentInstance(context, type, p1);
Properties p2 = new Properties();
- p2.put("name", "FooProvider-2");
+ p2.put("instance.name","FooProvider-2");
p2.put("int", new Integer(4));
p2.put("boolean", new Boolean(false));
p2.put("string", new String("bar"));
diff --git a/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/TestBothProperties.java b/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/TestBothProperties.java
index 7cfce8a..0d982a8 100644
--- a/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/TestBothProperties.java
+++ b/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/TestBothProperties.java
@@ -35,7 +35,7 @@
public void setUp() {
Factory fact = Utils.getFactoryByName(context, "CONFIG-BothConfigurableCheckService");
Properties props = new Properties();
- props.put("name", "under-test");
+ props.put("instance.name","under-test");
props.put("b", "1");
props.put("s", "1");
props.put("i", "1");
@@ -567,7 +567,7 @@
private void reconfigure() {
Properties props2 = new Properties();
- props2.put("name", "under-test");
+ props2.put("instance.name","under-test");
props2.put("b", new Byte("2"));
props2.put("s", new Short("2"));
props2.put("i", new Integer("2"));
@@ -592,7 +592,7 @@
private void reconfigureString() {
Properties props2 = new Properties();
- props2.put("name", "under-test");
+ props2.put("instance.name","under-test");
props2.put("b", "2");
props2.put("s", "2");
props2.put("i", "2");
diff --git a/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/TestFieldProperties.java b/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/TestFieldProperties.java
index a34051a..9edb241 100644
--- a/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/TestFieldProperties.java
+++ b/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/TestFieldProperties.java
@@ -34,7 +34,7 @@
public void setUp() {
Factory fact = Utils.getFactoryByName(context, "CONFIG-FieldConfigurableCheckService");
Properties props = new Properties();
- props.put("name", "under-test");
+ props.put("instance.name","under-test");
props.put("b", "1");
props.put("s", "1");
props.put("i", "1");
@@ -398,7 +398,7 @@
private void reconfigure() {
Properties props2 = new Properties();
- props2.put("name", "under-test");
+ props2.put("instance.name","under-test");
props2.put("b", new Byte("2"));
props2.put("s", new Short("2"));
props2.put("i", new Integer("2"));
@@ -423,7 +423,7 @@
private void reconfigureString() {
Properties props2 = new Properties();
- props2.put("name", "under-test");
+ props2.put("instance.name","under-test");
props2.put("b", "2");
props2.put("s", "2");
props2.put("i", "2");
diff --git a/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/TestMethodProperties.java b/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/TestMethodProperties.java
index b4e9afc..fc2018c 100644
--- a/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/TestMethodProperties.java
+++ b/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/TestMethodProperties.java
@@ -36,7 +36,7 @@
public void setUp() {
Factory fact = Utils.getFactoryByName(context, "CONFIG-MethodConfigurableCheckService");
Properties props = new Properties();
- props.put("name", "under-test");
+ props.put("instance.name","under-test");
props.put("b", "1");
props.put("s", "1");
props.put("i", "1");
@@ -63,7 +63,7 @@
}
Properties props2 = new Properties();
- props2.put("name", "under-test-2");
+ props2.put("instance.name","under-test-2");
props2.put("b", new Byte("1"));
props2.put("s", new Short("1"));
props2.put("i", new Integer("1"));
@@ -1094,7 +1094,6 @@
private void reconfigure(ComponentInstance ci) {
Properties props2 = new Properties();
- props2.put("name", "under-test");
props2.put("b", new Byte("2"));
props2.put("s", new Short("2"));
props2.put("i", new Integer("2"));
@@ -1119,7 +1118,6 @@
private void reconfigureString(ComponentInstance ci) {
Properties props2 = new Properties();
- props2.put("name", "under-test");
props2.put("b", "2");
props2.put("s", "2");
props2.put("i", "2");
diff --git a/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/TestSuperMethodProperties.java b/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/TestSuperMethodProperties.java
index 99c477a..c458ec5 100644
--- a/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/TestSuperMethodProperties.java
+++ b/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/configuration/TestSuperMethodProperties.java
@@ -34,7 +34,7 @@
public void setUp() {
Factory fact = Utils.getFactoryByName(context, "CONFIG-ParentMethodConfigurableCheckService");
Properties props = new Properties();
- props.put("name", "under-test");
+ props.put("instance.name","under-test");
props.put("b", "1");
props.put("s", "1");
props.put("i", "1");
@@ -566,7 +566,7 @@
private void reconfigure() {
Properties props2 = new Properties();
- props2.put("name", "under-test");
+ props2.put("instance.name","under-test");
props2.put("b", new Byte("2"));
props2.put("s", new Short("2"));
props2.put("i", new Integer("2"));
@@ -591,7 +591,7 @@
private void reconfigureString() {
Properties props2 = new Properties();
- props2.put("name", "under-test");
+ props2.put("instance.name","under-test");
props2.put("b", "2");
props2.put("s", "2");
props2.put("i", "2");
diff --git a/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java b/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
index a684a6b..055b9bd 100644
--- a/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
+++ b/ipojo/tests/core/configuration/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
@@ -99,7 +99,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());
diff --git a/ipojo/tests/core/external-handlers/src/main/java/org/apache/felix/ipojo/test/scenarios/component/CheckServiceHandler.java b/ipojo/tests/core/external-handlers/src/main/java/org/apache/felix/ipojo/test/scenarios/component/CheckServiceHandler.java
index a4a921a..cd43545 100644
--- a/ipojo/tests/core/external-handlers/src/main/java/org/apache/felix/ipojo/test/scenarios/component/CheckServiceHandler.java
+++ b/ipojo/tests/core/external-handlers/src/main/java/org/apache/felix/ipojo/test/scenarios/component/CheckServiceHandler.java
@@ -42,7 +42,7 @@
Element[] meta = metadata.getElements("check", NAMESPACE);
if(meta == null) { return; }
// Get handler props
- props.put("instance.name", configuration.get("name"));
+ props.put("instance.name", configuration.get("instance.name"));
if(configuration.get("csh.simple") != null) { props.put("Simple", configuration.get("csh.simple")); }
if(configuration.get("csh.map") != null) {
Dictionary m = (Dictionary) configuration.get("csh.map");
diff --git a/ipojo/tests/core/external-handlers/src/main/java/org/apache/felix/ipojo/test/scenarios/eh/HandlerTest.java b/ipojo/tests/core/external-handlers/src/main/java/org/apache/felix/ipojo/test/scenarios/eh/HandlerTest.java
index c028efb..b1e0a03 100644
--- a/ipojo/tests/core/external-handlers/src/main/java/org/apache/felix/ipojo/test/scenarios/eh/HandlerTest.java
+++ b/ipojo/tests/core/external-handlers/src/main/java/org/apache/felix/ipojo/test/scenarios/eh/HandlerTest.java
@@ -36,7 +36,7 @@
public void setUp() {
Properties props = new Properties();
- props.put("name", "HandlerTest-1");
+ props.put("instance.name","HandlerTest-1");
props.put("csh.simple", "simple");
Properties p = new Properties();
p.put("a", "a");
@@ -194,7 +194,7 @@
f.start();
Properties props = new Properties();
- props.put("name", "HandlerTest-1");
+ props.put("instance.name","HandlerTest-1");
props.put("csh.simple", "simple");
Properties p = new Properties();
p.put("a", "a");
diff --git a/ipojo/tests/core/external-handlers/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java b/ipojo/tests/core/external-handlers/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
index 3fca5d1..0e2375f 100644
--- a/ipojo/tests/core/external-handlers/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
+++ b/ipojo/tests/core/external-handlers/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
@@ -99,7 +99,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());
diff --git a/ipojo/tests/core/factories/src/main/java/org/apache/felix/ipojo/test/scenarios/factories/ObedienceTest.java b/ipojo/tests/core/factories/src/main/java/org/apache/felix/ipojo/test/scenarios/factories/ObedienceTest.java
index b2b29ea..e2f4af2 100644
--- a/ipojo/tests/core/factories/src/main/java/org/apache/felix/ipojo/test/scenarios/factories/ObedienceTest.java
+++ b/ipojo/tests/core/factories/src/main/java/org/apache/felix/ipojo/test/scenarios/factories/ObedienceTest.java
@@ -41,9 +41,9 @@
assertNotNull("Check factory existing", factory);
Properties props1 = new Properties();
- props1.put("name", "foo1");
+ props1.put("instance.name","foo1");
Properties props2 = new Properties();
- props2.put("name", "foo2");
+ props2.put("instance.name","foo2");
ComponentInstance ci1 = null, ci2 = null;
try {
diff --git a/ipojo/tests/core/factories/src/main/java/org/apache/felix/ipojo/test/scenarios/factories/UnacceptableConfigurationTest.java b/ipojo/tests/core/factories/src/main/java/org/apache/felix/ipojo/test/scenarios/factories/UnacceptableConfigurationTest.java
index b4f7aa0..841efe0 100644
--- a/ipojo/tests/core/factories/src/main/java/org/apache/felix/ipojo/test/scenarios/factories/UnacceptableConfigurationTest.java
+++ b/ipojo/tests/core/factories/src/main/java/org/apache/felix/ipojo/test/scenarios/factories/UnacceptableConfigurationTest.java
@@ -71,7 +71,7 @@
public void testEmptyConfiguration2() {
Factory f = Utils.getFactoryByName(context, "Factories-FooProviderType-Dyn2");
Properties p = new Properties();
- p.put("name", "ko");
+ p.put("instance.name","ko");
ComponentInstance ci = null;
try {
ci = f.createComponentInstance(p);
@@ -116,7 +116,7 @@
Factory f = Utils.getFactoryByName(context, "Factories-FooProviderType-2");
Properties p = new Properties();
- p.put("name", "ok");
+ p.put("instance.name","ok");
p.put("int", new Integer(3));
p.put("long", new Long(42));
p.put("string", "absdir");
@@ -139,7 +139,7 @@
Factory f = Utils.getFactoryByName(context, "Factories-FooProviderType-Dyn");
Properties p = new Properties();
- p.put("name", "ok");
+ p.put("instance.name","ok");
p.put("int", new Integer(3));
p.put("boolean", new Boolean(true));
p.put("string", "absdir");
@@ -163,7 +163,7 @@
Factory f = Utils.getFactoryByName(context, "Factories-FooProviderType-Dyn");
Properties p = new Properties();
- p.put("name", "ok");
+ p.put("instance.name","ok");
p.put("int", new Integer(3));
p.put("long", new Long(42));
p.put("string", "absdir");
@@ -186,7 +186,7 @@
Factory f = Utils.getFactoryByName(context, "Factories-FooProviderType-Dyn2");
Properties p = new Properties();
- p.put("name", "ok");
+ p.put("instance.name","ok");
p.put("int", new Integer(3));
p.put("boolean", new Boolean(true));
p.put("string", "absdir");
@@ -209,7 +209,7 @@
Factory f = Utils.getFactoryByName(context, "Factories-FooProviderType-Dyn2");
Properties p = new Properties();
- p.put("name", "ok");
+ p.put("instance.name","ok");
p.put("boolean", new Boolean(true));
p.put("string", "absdir");
p.put("strAProp", new String[] {"a"});
@@ -230,7 +230,7 @@
Factory f = Utils.getFactoryByName(context, "Factories-FooProviderType-Dyn2");
Properties p = new Properties();
- p.put("name", "ok");
+ p.put("instance.name","ok");
p.put("boolean", new Boolean(true));
p.put("string", "absdir");
p.put("strAProp", new String[] {"a"});
@@ -252,7 +252,7 @@
Factory f = Utils.getFactoryByName(context, "Factories-FooProviderType-Dyn2");
Properties p = new Properties();
- p.put("name", "ok");
+ p.put("instance.name","ok");
p.put("string", "absdir");
p.put("strAProp", new String[] {"a"});
p.put("intAProp", new int[] {1,2});
@@ -273,7 +273,7 @@
Factory f = Utils.getFactoryByName(context, "Factories-FooProviderType-Dyn2");
Properties p = new Properties();
- p.put("name", "ok");
+ p.put("instance.name","ok");
p.put("int", new Integer(3));
p.put("boolean", new Boolean(true));
p.put("string", "absdir");
@@ -297,7 +297,7 @@
Factory f = Utils.getFactoryByName(context, "Factories-FooProviderType-Dyn2");
Properties p = new Properties();
- p.put("name", "ok");
+ p.put("instance.name","ok");
p.put("int", new Integer(3));
p.put("boolean", new Boolean(true));
p.put("string", "absdir");
@@ -344,13 +344,13 @@
ComponentInstance ci1,ci2, ci3 = null;
try {
Properties p1 = new Properties();
- p1.put("name", "name1");
+ p1.put("instance.name","name1");
ci1 = f.createComponentInstance(p1);
Properties p2 = new Properties();
- p2.put("name", "name2");
+ p2.put("instance.name","name2");
ci2 = f.createComponentInstance(p2);
Properties p3 = new Properties();
- p3.put("name", "name3");
+ p3.put("instance.name","name3");
ci3 = f.createComponentInstance(p3);
assertNotEquals("Check name ci1, ci2", ci1.getInstanceName(), ci2.getInstanceName());
assertNotEquals("Check name ci1, ci3", ci1.getInstanceName(), ci3.getInstanceName());
@@ -370,10 +370,10 @@
ComponentInstance ci1 = null,ci2 = null, ci3 = null;
try {
Properties p1 = new Properties();
- p1.put("name", "name1");
+ p1.put("instance.name","name1");
ci1 = f.createComponentInstance(p1);
Properties p2 = new Properties();
- p2.put("name", "name1");
+ p2.put("instance.name","name1");
ci2 = f.createComponentInstance(p2);
assertNotEquals("Check name ci1, ci2", ci1.getInstanceName(), ci2.getInstanceName());
assertNotEquals("Check name ci1, ci3", ci1.getInstanceName(), ci3.getInstanceName());
@@ -398,10 +398,10 @@
ComponentInstance ci1 = null,ci2 = null, ci3 = null;
try {
Properties p1 = new Properties();
- p1.put("name", "name1");
+ p1.put("instance.name","name1");
ci1 = f.createComponentInstance(p1);
Properties p2 = new Properties();
- p2.put("name", "name1");
+ p2.put("instance.name","name1");
ci2 = f2.createComponentInstance(p2);
System.err.println("==== " + ci1.getInstanceName() + " === " + ci2.getInstanceName());
assertNotEquals("Check name ci1, ci2", ci1.getInstanceName(), ci2.getInstanceName());
diff --git a/ipojo/tests/core/factories/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java b/ipojo/tests/core/factories/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
index e4754a0..25d599e 100644
--- a/ipojo/tests/core/factories/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
+++ b/ipojo/tests/core/factories/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
@@ -100,7 +100,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());
diff --git a/ipojo/tests/core/lifecycle-callback/src/main/java/org/apache/felix/ipojo/test/scenarios/lifecycle/callback/CallbackTestCase.java b/ipojo/tests/core/lifecycle-callback/src/main/java/org/apache/felix/ipojo/test/scenarios/lifecycle/callback/CallbackTestCase.java
index 6f229e7..be1d266 100644
--- a/ipojo/tests/core/lifecycle-callback/src/main/java/org/apache/felix/ipojo/test/scenarios/lifecycle/callback/CallbackTestCase.java
+++ b/ipojo/tests/core/lifecycle-callback/src/main/java/org/apache/felix/ipojo/test/scenarios/lifecycle/callback/CallbackTestCase.java
@@ -35,12 +35,12 @@
public void setUp() {
Properties p2 = new Properties();
- p2.put("name", "fooProvider");
+ p2.put("instance.name","fooProvider");
fooProvider = Utils.getComponentInstance(context, "LFCB-FooProviderType-1", p2);
fooProvider.stop();
Properties p1 = new Properties();
- p1.put("name", "callback");
+ p1.put("instance.name","callback");
instance = Utils.getComponentInstance(context, "LFCB-CallbackCheckService", p1);
}
diff --git a/ipojo/tests/core/lifecycle-callback/src/main/java/org/apache/felix/ipojo/test/scenarios/lifecycle/callback/ImmediateCallbackSeveralFactoryTest.java b/ipojo/tests/core/lifecycle-callback/src/main/java/org/apache/felix/ipojo/test/scenarios/lifecycle/callback/ImmediateCallbackSeveralFactoryTest.java
index 0cfd554..93d40ac 100644
--- a/ipojo/tests/core/lifecycle-callback/src/main/java/org/apache/felix/ipojo/test/scenarios/lifecycle/callback/ImmediateCallbackSeveralFactoryTest.java
+++ b/ipojo/tests/core/lifecycle-callback/src/main/java/org/apache/felix/ipojo/test/scenarios/lifecycle/callback/ImmediateCallbackSeveralFactoryTest.java
@@ -36,12 +36,12 @@
public void setUp() {
Properties p2 = new Properties();
- p2.put("name", "fooProvider");
+ p2.put("instance.name","fooProvider");
fooProvider = Utils.getComponentInstance(context, "LFCB-FooProviderType-1", p2);
fooProvider.stop();
Properties p1 = new Properties();
- p1.put("name", "callback");
+ p1.put("instance.name","callback");
instance = Utils.getComponentInstance(context, "LFCB-ImmediateCallbackCheckServiceSeveral", p1);
}
diff --git a/ipojo/tests/core/lifecycle-callback/src/main/java/org/apache/felix/ipojo/test/scenarios/lifecycle/callback/ImmediateCallbackSingletonFactoryTest.java b/ipojo/tests/core/lifecycle-callback/src/main/java/org/apache/felix/ipojo/test/scenarios/lifecycle/callback/ImmediateCallbackSingletonFactoryTest.java
index 310d7ce..5119622 100644
--- a/ipojo/tests/core/lifecycle-callback/src/main/java/org/apache/felix/ipojo/test/scenarios/lifecycle/callback/ImmediateCallbackSingletonFactoryTest.java
+++ b/ipojo/tests/core/lifecycle-callback/src/main/java/org/apache/felix/ipojo/test/scenarios/lifecycle/callback/ImmediateCallbackSingletonFactoryTest.java
@@ -36,12 +36,12 @@
public void setUp() {
Properties p2 = new Properties();
- p2.put("name", "fooProvider");
+ p2.put("instance.name","fooProvider");
fooProvider = Utils.getComponentInstance(context, "LFCB-FooProviderType-1", p2);
fooProvider.stop();
Properties p1 = new Properties();
- p1.put("name", "callback");
+ p1.put("instance.name","callback");
instance = Utils.getComponentInstance(context, "LFCB-ImmediateCallbackCheckServiceSingleton", p1);
}
diff --git a/ipojo/tests/core/lifecycle-callback/src/main/java/org/apache/felix/ipojo/test/scenarios/lifecycle/callback/ImmediateCallbackTest.java b/ipojo/tests/core/lifecycle-callback/src/main/java/org/apache/felix/ipojo/test/scenarios/lifecycle/callback/ImmediateCallbackTest.java
index a8e1795..ea67fc1 100644
--- a/ipojo/tests/core/lifecycle-callback/src/main/java/org/apache/felix/ipojo/test/scenarios/lifecycle/callback/ImmediateCallbackTest.java
+++ b/ipojo/tests/core/lifecycle-callback/src/main/java/org/apache/felix/ipojo/test/scenarios/lifecycle/callback/ImmediateCallbackTest.java
@@ -35,12 +35,12 @@
public void setUp() {
Properties p2 = new Properties();
- p2.put("name", "fooProvider");
+ p2.put("instance.name","fooProvider");
fooProvider = Utils.getComponentInstance(context, "LFCB-FooProviderType-1", p2);
fooProvider.stop();
Properties p1 = new Properties();
- p1.put("name", "callback");
+ p1.put("instance.name","callback");
instance = Utils.getComponentInstance(context, "LFCB-ImmediateCallbackCheckService", p1);
}
diff --git a/ipojo/tests/core/lifecycle-callback/src/main/java/org/apache/felix/ipojo/test/scenarios/lifecycle/callback/ImmediateLifeCycleControllerTest.java b/ipojo/tests/core/lifecycle-callback/src/main/java/org/apache/felix/ipojo/test/scenarios/lifecycle/callback/ImmediateLifeCycleControllerTest.java
index fe53fb4..bd6d336 100644
--- a/ipojo/tests/core/lifecycle-callback/src/main/java/org/apache/felix/ipojo/test/scenarios/lifecycle/callback/ImmediateLifeCycleControllerTest.java
+++ b/ipojo/tests/core/lifecycle-callback/src/main/java/org/apache/felix/ipojo/test/scenarios/lifecycle/callback/ImmediateLifeCycleControllerTest.java
@@ -39,7 +39,7 @@
public void testOne() {
Properties props = new Properties();
props.put("conf", "foo");
- props.put("name", "under");
+ props.put("instance.name","under");
under = Utils.getComponentInstance(context, "LFC-Test-Immediate", props);
// The conf is correct, the PS must be provided
@@ -83,7 +83,7 @@
public void testTwo() {
Properties props = new Properties();
props.put("conf", "bar");
- props.put("name", "under");
+ props.put("instance.name","under");
under = Utils.getComponentInstance(context, "LFC-Test-Immediate", props);
assertEquals("check under state", under.getState(), ComponentInstance.INVALID);
diff --git a/ipojo/tests/core/lifecycle-callback/src/main/java/org/apache/felix/ipojo/test/scenarios/lifecycle/callback/ParentCallbackTestCase.java b/ipojo/tests/core/lifecycle-callback/src/main/java/org/apache/felix/ipojo/test/scenarios/lifecycle/callback/ParentCallbackTestCase.java
index fef421b..8a00224 100644
--- a/ipojo/tests/core/lifecycle-callback/src/main/java/org/apache/felix/ipojo/test/scenarios/lifecycle/callback/ParentCallbackTestCase.java
+++ b/ipojo/tests/core/lifecycle-callback/src/main/java/org/apache/felix/ipojo/test/scenarios/lifecycle/callback/ParentCallbackTestCase.java
@@ -35,12 +35,12 @@
public void setUp() {
Properties p2 = new Properties();
- p2.put("name", "fooProvider");
+ p2.put("instance.name","fooProvider");
fooProvider = Utils.getComponentInstance(context, "LFCB-FooProviderType-1", p2);
fooProvider.stop();
Properties p1 = new Properties();
- p1.put("name", "callback");
+ p1.put("instance.name","callback");
instance = Utils.getComponentInstance(context, "LFCB-ParentCallbackCheckService", p1);
}
diff --git a/ipojo/tests/core/lifecycle-callback/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java b/ipojo/tests/core/lifecycle-callback/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
index bb2019a..1196bc2 100644
--- a/ipojo/tests/core/lifecycle-callback/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
+++ b/ipojo/tests/core/lifecycle-callback/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
@@ -99,7 +99,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());
diff --git a/ipojo/tests/core/lifecycle-controller/src/main/java/org/apache/felix/ipojo/test/scenarios/lfc/ImmediateLifeCycleControllerTest.java b/ipojo/tests/core/lifecycle-controller/src/main/java/org/apache/felix/ipojo/test/scenarios/lfc/ImmediateLifeCycleControllerTest.java
index 9a27445..25b3054 100644
--- a/ipojo/tests/core/lifecycle-controller/src/main/java/org/apache/felix/ipojo/test/scenarios/lfc/ImmediateLifeCycleControllerTest.java
+++ b/ipojo/tests/core/lifecycle-controller/src/main/java/org/apache/felix/ipojo/test/scenarios/lfc/ImmediateLifeCycleControllerTest.java
@@ -39,7 +39,7 @@
public void testOne() {
Properties props = new Properties();
props.put("conf", "foo");
- props.put("name", "under");
+ props.put("instance.name","under");
under = Utils.getComponentInstance(context, "LFC-Test-Immediate", props);
// The conf is correct, the PS must be provided
@@ -83,7 +83,7 @@
public void testTwo() {
Properties props = new Properties();
props.put("conf", "bar");
- props.put("name", "under");
+ props.put("instance.name","under");
under = Utils.getComponentInstance(context, "LFC-Test-Immediate", props);
assertEquals("check under state", under.getState(), ComponentInstance.INVALID);
diff --git a/ipojo/tests/core/lifecycle-controller/src/main/java/org/apache/felix/ipojo/test/scenarios/lfc/LifeCycleControllerTest.java b/ipojo/tests/core/lifecycle-controller/src/main/java/org/apache/felix/ipojo/test/scenarios/lfc/LifeCycleControllerTest.java
index d9cc88f..407200d 100644
--- a/ipojo/tests/core/lifecycle-controller/src/main/java/org/apache/felix/ipojo/test/scenarios/lfc/LifeCycleControllerTest.java
+++ b/ipojo/tests/core/lifecycle-controller/src/main/java/org/apache/felix/ipojo/test/scenarios/lfc/LifeCycleControllerTest.java
@@ -44,7 +44,7 @@
public void testOne() {
Properties props = new Properties();
props.put("conf", "foo");
- props.put("name", "under");
+ props.put("instance.name","under");
under = Utils.getComponentInstance(context, "LFC-Test", props);
// The conf is correct, the PS must be provided
@@ -92,7 +92,7 @@
public void notestTwo() {
Properties props = new Properties();
props.put("conf", "bar");
- props.put("name", "under");
+ props.put("instance.name","under");
under = Utils.getComponentInstance(context, "LFC-Test", props);
// The conf is incorrect, but the test can appears only when the object is created : the PS must be provided
diff --git a/ipojo/tests/core/lifecycle-controller/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java b/ipojo/tests/core/lifecycle-controller/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
index a684a6b..055b9bd 100644
--- a/ipojo/tests/core/lifecycle-controller/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
+++ b/ipojo/tests/core/lifecycle-controller/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
@@ -99,7 +99,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());
diff --git a/ipojo/tests/core/service-dependency-bindingpolicy/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/dynamic/priority/SimpleDPDependencies.java b/ipojo/tests/core/service-dependency-bindingpolicy/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/dynamic/priority/SimpleDPDependencies.java
index 67d8292..2ae40ec 100644
--- a/ipojo/tests/core/service-dependency-bindingpolicy/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/dynamic/priority/SimpleDPDependencies.java
+++ b/ipojo/tests/core/service-dependency-bindingpolicy/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/dynamic/priority/SimpleDPDependencies.java
@@ -39,23 +39,23 @@
public void setUp() {
try {
Properties prov = new Properties();
- prov.put("name", "FooProvider-1");
+ prov.put("instance.name","FooProvider-1");
prov.put("service.ranking", "1");
fooProvider = Utils.getFactoryByName(context, "RankedFooProviderType").createComponentInstance(prov);
fooProvider.stop();
Properties prov2 = new Properties();
- prov2.put("name", "FooProvider-2");
+ prov2.put("instance.name","FooProvider-2");
prov2.put("service.ranking", "0");
fooProvider2 = Utils.getFactoryByName(context, "RankedFooProviderType").createComponentInstance(prov2);
fooProvider2.stop();
Properties i1 = new Properties();
- i1.put("name", "Simple");
+ i1.put("instance.name","Simple");
instance1 = Utils.getFactoryByName(context, "DPSimpleCheckServiceProvider").createComponentInstance(i1);
Properties i3 = new Properties();
- i3.put("name", "Object");
+ i3.put("instance.name","Object");
instance3 = Utils.getFactoryByName(context, "DPObjectCheckServiceProvider").createComponentInstance(i3);
} catch(Exception e) {
diff --git a/ipojo/tests/core/service-dependency-bindingpolicy/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/statics/MethodOptionalDependencies.java b/ipojo/tests/core/service-dependency-bindingpolicy/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/statics/MethodOptionalDependencies.java
index a2c4cd5..23ccf55 100644
--- a/ipojo/tests/core/service-dependency-bindingpolicy/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/statics/MethodOptionalDependencies.java
+++ b/ipojo/tests/core/service-dependency-bindingpolicy/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/statics/MethodOptionalDependencies.java
@@ -38,20 +38,20 @@
public void setUp() {
try {
Properties prov = new Properties();
- prov.put("name", "FooProvider");
+ prov.put("instance.name","FooProvider");
fooProvider = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov);
fooProvider.stop();
Properties i3 = new Properties();
- i3.put("name", "Object");
+ i3.put("instance.name","Object");
instance3 = Utils.getFactoryByName(context, "StaticMObjectOptionalCheckServiceProvider").createComponentInstance(i3);
Properties i4 = new Properties();
- i4.put("name", "Ref");
+ i4.put("instance.name","Ref");
instance4 = Utils.getFactoryByName(context, "StaticMRefOptionalCheckServiceProvider").createComponentInstance(i4);
Properties i5 = new Properties();
- i5.put("name", "Both");
+ i5.put("instance.name","Both");
instance5 = Utils.getFactoryByName(context, "StaticMBothOptionalCheckServiceProvider").createComponentInstance(i5);
} catch (Exception e) {
fail(e.getMessage());
diff --git a/ipojo/tests/core/service-dependency-bindingpolicy/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/statics/MethodSimpleDependencies.java b/ipojo/tests/core/service-dependency-bindingpolicy/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/statics/MethodSimpleDependencies.java
index 4fa5043..adb4c4f 100644
--- a/ipojo/tests/core/service-dependency-bindingpolicy/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/statics/MethodSimpleDependencies.java
+++ b/ipojo/tests/core/service-dependency-bindingpolicy/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/statics/MethodSimpleDependencies.java
@@ -37,22 +37,22 @@
public void setUp() {
try {
Properties prov = new Properties();
- prov.put("name", "FooProvider");
+ prov.put("instance.name","FooProvider");
fooProvider = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov);
fooProvider.stop();
Properties i3 = new Properties();
- i3.put("name", "Object");
+ i3.put("instance.name","Object");
instance3 = Utils.getFactoryByName(context, "StaticMObjectCheckServiceProvider").createComponentInstance(i3);
assertNotNull("check instance 3", instance3);
Properties i4 = new Properties();
- i4.put("name", "Ref");
+ i4.put("instance.name","Ref");
instance4 = Utils.getFactoryByName(context, "StaticMRefCheckServiceProvider").createComponentInstance(i4);
assertNotNull("check instance 4", instance4);
Properties i5 = new Properties();
- i5.put("name", "Both");
+ i5.put("instance.name","Both");
instance5 = Utils.getFactoryByName(context, "StaticMBothCheckServiceProvider").createComponentInstance(i5);
assertNotNull("check instance 5", instance5);
} catch(Exception e) { fail(e.getMessage()); }
diff --git a/ipojo/tests/core/service-dependency-bindingpolicy/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/statics/MultipleDependencies.java b/ipojo/tests/core/service-dependency-bindingpolicy/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/statics/MultipleDependencies.java
index e533fb0..8352ec6 100644
--- a/ipojo/tests/core/service-dependency-bindingpolicy/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/statics/MultipleDependencies.java
+++ b/ipojo/tests/core/service-dependency-bindingpolicy/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/statics/MultipleDependencies.java
@@ -37,29 +37,29 @@
public void setUp() {
try {
Properties prov = new Properties();
- prov.put("name", "FooProvider1");
+ prov.put("instance.name","FooProvider1");
fooProvider1 = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov);
fooProvider1.stop();
Properties prov2 = new Properties();
- prov2.put("name", "FooProvider2");
+ prov2.put("instance.name","FooProvider2");
fooProvider2 = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov2);
fooProvider2.stop();
Properties i1 = new Properties();
- i1.put("name", "Simple");
+ i1.put("instance.name","Simple");
instance1 = Utils.getFactoryByName(context, "StaticSimpleMultipleCheckServiceProvider").createComponentInstance(i1);
Properties i2 = new Properties();
- i2.put("name", "Void");
+ i2.put("instance.name","Void");
instance2 = Utils.getFactoryByName(context, "StaticVoidMultipleCheckServiceProvider").createComponentInstance(i2);
Properties i3 = new Properties();
- i3.put("name", "Object");
+ i3.put("instance.name","Object");
instance3 = Utils.getFactoryByName(context, "StaticObjectMultipleCheckServiceProvider").createComponentInstance(i3);
Properties i4 = new Properties();
- i4.put("name", "Ref");
+ i4.put("instance.name","Ref");
instance4 = Utils.getFactoryByName(context, "StaticRefMultipleCheckServiceProvider").createComponentInstance(i4);
} catch(Exception e) { fail(e.getMessage()); }
diff --git a/ipojo/tests/core/service-dependency-bindingpolicy/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/statics/OptionalDependencies.java b/ipojo/tests/core/service-dependency-bindingpolicy/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/statics/OptionalDependencies.java
index c90f161..ca51add 100644
--- a/ipojo/tests/core/service-dependency-bindingpolicy/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/statics/OptionalDependencies.java
+++ b/ipojo/tests/core/service-dependency-bindingpolicy/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/statics/OptionalDependencies.java
@@ -40,28 +40,28 @@
public void setUp() {
try {
Properties prov = new Properties();
- prov.put("name", "FooProvider");
+ prov.put("instance.name","FooProvider");
fooProvider = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov);
fooProvider.stop();
Properties i1 = new Properties();
- i1.put("name", "Simple");
+ i1.put("instance.name","Simple");
instance1 = Utils.getFactoryByName(context, "StaticSimpleOptionalCheckServiceProvider").createComponentInstance(i1);
Properties i2 = new Properties();
- i2.put("name", "Void");
+ i2.put("instance.name","Void");
instance2 = Utils.getFactoryByName(context, "StaticVoidOptionalCheckServiceProvider").createComponentInstance(i2);
Properties i3 = new Properties();
- i3.put("name", "Object");
+ i3.put("instance.name","Object");
instance3 = Utils.getFactoryByName(context, "StaticObjectOptionalCheckServiceProvider").createComponentInstance(i3);
Properties i4 = new Properties();
- i4.put("name", "Ref");
+ i4.put("instance.name","Ref");
instance4 = Utils.getFactoryByName(context, "StaticRefOptionalCheckServiceProvider").createComponentInstance(i4);
Properties i5 = new Properties();
- i5.put("name", "Both");
+ i5.put("instance.name","Both");
instance5 = Utils.getFactoryByName(context, "StaticBothOptionalCheckServiceProvider").createComponentInstance(i5);
} catch(Exception e) { fail(e.getMessage()); }
}
diff --git a/ipojo/tests/core/service-dependency-bindingpolicy/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/statics/SimpleDependencies.java b/ipojo/tests/core/service-dependency-bindingpolicy/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/statics/SimpleDependencies.java
index cb089ae..800f445 100644
--- a/ipojo/tests/core/service-dependency-bindingpolicy/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/statics/SimpleDependencies.java
+++ b/ipojo/tests/core/service-dependency-bindingpolicy/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/statics/SimpleDependencies.java
@@ -37,28 +37,28 @@
public void setUp() {
try {
Properties prov = new Properties();
- prov.put("name", "FooProvider");
+ prov.put("instance.name","FooProvider");
fooProvider = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov);
fooProvider.stop();
Properties i1 = new Properties();
- i1.put("name", "Simple");
+ i1.put("instance.name","Simple");
instance1 = Utils.getFactoryByName(context, "StaticSimpleCheckServiceProvider").createComponentInstance(i1);
Properties i2 = new Properties();
- i2.put("name", "Void");
+ i2.put("instance.name","Void");
instance2 = Utils.getFactoryByName(context, "StaticVoidCheckServiceProvider").createComponentInstance(i2);
Properties i3 = new Properties();
- i3.put("name", "Object");
+ i3.put("instance.name","Object");
instance3 = Utils.getFactoryByName(context, "StaticObjectCheckServiceProvider").createComponentInstance(i3);
Properties i4 = new Properties();
- i4.put("name", "Ref");
+ i4.put("instance.name","Ref");
instance4 = Utils.getFactoryByName(context, "StaticRefCheckServiceProvider").createComponentInstance(i4);
Properties i5 = new Properties();
- i5.put("name", "Both");
+ i5.put("instance.name","Both");
instance5 = Utils.getFactoryByName(context, "StaticBothCheckServiceProvider").createComponentInstance(i5);
} catch(Exception e) {
e.printStackTrace();
diff --git a/ipojo/tests/core/service-dependency-filter/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/filter/FromDependencies.java b/ipojo/tests/core/service-dependency-filter/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/filter/FromDependencies.java
index 7e383c4..2d36193 100644
--- a/ipojo/tests/core/service-dependency-filter/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/filter/FromDependencies.java
+++ b/ipojo/tests/core/service-dependency-filter/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/filter/FromDependencies.java
@@ -35,12 +35,12 @@
public void setUp() {
try {
Properties prov = new Properties();
- prov.put("name", "A");
+ prov.put("instance.name","A");
providerA = Utils.getFactoryByName(context, "SimpleFilterCheckServiceProvider").createComponentInstance(prov);
providerA.stop();
Properties prov2 = new Properties();
- prov2.put("name", "B");
+ prov2.put("instance.name","B");
providerB = Utils.getFactoryByName(context, "SimpleFilterCheckServiceProvider").createComponentInstance(prov2);
providerB.stop();
@@ -51,18 +51,18 @@
Properties prov4 = new Properties();
prov4.put("service.pid", "D");
- prov4.put("name", "D");
+ prov4.put("instance.name","D");
providerD = Utils.getFactoryByName(context, "SimplePIDCheckServiceProvider").createComponentInstance(prov4);
providerD.stop();
// Uses the component type from value
Properties i1 = new Properties();
- i1.put("name", "Subscriber1");
+ i1.put("instance.name","Subscriber1");
instance1 = Utils.getFactoryByName(context, "SimpleFromCheckServiceSubscriber").createComponentInstance(i1);
// Uses the instance configuration from value
Properties i2 = new Properties();
- i2.put("name", "Subscriber2");
+ i2.put("instance.name","Subscriber2");
Properties ii2 = new Properties();
ii2.put("id1", "B");
i2.put("requires.from", ii2);
@@ -70,7 +70,7 @@
// Uses the instance configuration from value (*)
Properties i3 = new Properties();
- i3.put("name", "Subscriber3");
+ i3.put("instance.name","Subscriber3");
Properties ii3 = new Properties();
ii3.put("id1", "*");
i3.put("requires.from", ii3);
@@ -78,7 +78,7 @@
// Uses the instance configuration from value, merge filter and from
Properties i4 = new Properties();
- i4.put("name", "Subscriber4");
+ i4.put("instance.name","Subscriber4");
Properties ii4 = new Properties();
ii4.put("id1", "D");
i4.put("requires.from", ii4);
diff --git a/ipojo/tests/core/service-dependency-filter/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/filter/MultipleFilterDependencies.java b/ipojo/tests/core/service-dependency-filter/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/filter/MultipleFilterDependencies.java
index c784e0c..499b3f8 100644
--- a/ipojo/tests/core/service-dependency-filter/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/filter/MultipleFilterDependencies.java
+++ b/ipojo/tests/core/service-dependency-filter/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/filter/MultipleFilterDependencies.java
@@ -37,28 +37,28 @@
public void setUp() {
try {
Properties prov = new Properties();
- prov.put("name", "FooProvider1");
+ prov.put("instance.name","FooProvider1");
fooProvider1 = Utils.getFactoryByName(context, "SimpleFilterCheckServiceProvider").createComponentInstance(prov);
fooProvider1.stop();
prov = new Properties();
- prov.put("name", "FooProvider2");
+ prov.put("instance.name","FooProvider2");
fooProvider2 = Utils.getFactoryByName(context, "SimpleFilterCheckServiceProvider").createComponentInstance(prov);
fooProvider2.stop();
Properties i1 = new Properties();
- i1.put("name", "Subscriber1");
+ i1.put("instance.name","Subscriber1");
instance1 = Utils.getFactoryByName(context, "MultipleFilterCheckServiceSubscriber").createComponentInstance(i1);
Properties i2 = new Properties();
- i2.put("name", "Subscriber2");
+ i2.put("instance.name","Subscriber2");
Properties ii2 = new Properties();
ii2.put("id2", "(toto=A)");
i2.put("requires.filters", ii2);
instance2 = Utils.getFactoryByName(context, "MultipleFilterCheckServiceSubscriber2").createComponentInstance(i2);
Properties i3 = new Properties();
- i3.put("name", "Subscriber3");
+ i3.put("instance.name","Subscriber3");
Properties ii3 = new Properties();
ii3.put("id1", "(toto=A)");
i3.put("requires.filters", ii3);
diff --git a/ipojo/tests/core/service-dependency-filter/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/filter/OptionalMultipleFilterDependencies.java b/ipojo/tests/core/service-dependency-filter/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/filter/OptionalMultipleFilterDependencies.java
index 5616931..445dc45 100644
--- a/ipojo/tests/core/service-dependency-filter/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/filter/OptionalMultipleFilterDependencies.java
+++ b/ipojo/tests/core/service-dependency-filter/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/filter/OptionalMultipleFilterDependencies.java
@@ -37,28 +37,28 @@
public void setUp() {
try {
Properties prov = new Properties();
- prov.put("name", "FooProvider1");
+ prov.put("instance.name","FooProvider1");
fooProvider1 = Utils.getFactoryByName(context, "SimpleFilterCheckServiceProvider").createComponentInstance(prov);
fooProvider1.stop();
prov = new Properties();
- prov.put("name", "FooProvider2");
+ prov.put("instance.name","FooProvider2");
fooProvider2 = Utils.getFactoryByName(context, "SimpleFilterCheckServiceProvider").createComponentInstance(prov);
fooProvider2.stop();
Properties i1 = new Properties();
- i1.put("name", "Subscriber1");
+ i1.put("instance.name","Subscriber1");
instance1 = Utils.getFactoryByName(context, "OptionalMultipleFilterCheckServiceSubscriber").createComponentInstance(i1);
Properties i2 = new Properties();
- i2.put("name", "Subscriber2");
+ i2.put("instance.name","Subscriber2");
Properties ii2 = new Properties();
ii2.put("id2", "(toto=A)");
i2.put("requires.filters", ii2);
instance2 = Utils.getFactoryByName(context, "OptionalMultipleFilterCheckServiceSubscriber2").createComponentInstance(i2);
Properties i3 = new Properties();
- i3.put("name", "Subscriber3");
+ i3.put("instance.name","Subscriber3");
Properties ii3 = new Properties();
ii3.put("id1", "(toto=A)");
i3.put("requires.filters", ii3);
diff --git a/ipojo/tests/core/service-dependency-filter/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/filter/OptionalSimpleFilterDependencies.java b/ipojo/tests/core/service-dependency-filter/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/filter/OptionalSimpleFilterDependencies.java
index 57db4ec..fe08278 100644
--- a/ipojo/tests/core/service-dependency-filter/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/filter/OptionalSimpleFilterDependencies.java
+++ b/ipojo/tests/core/service-dependency-filter/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/filter/OptionalSimpleFilterDependencies.java
@@ -37,28 +37,28 @@
public void setUp() {
try {
Properties prov = new Properties();
- prov.put("name", "FooProvider1");
+ prov.put("instance.name","FooProvider1");
fooProvider1 = Utils.getFactoryByName(context, "SimpleFilterCheckServiceProvider").createComponentInstance(prov);
fooProvider1.stop();
prov = new Properties();
- prov.put("name", "FooProvider2");
+ prov.put("instance.name","FooProvider2");
fooProvider2 = Utils.getFactoryByName(context, "SimpleFilterCheckServiceProvider").createComponentInstance(prov);
fooProvider2.stop();
Properties i1 = new Properties();
- i1.put("name", "Subscriber1");
+ i1.put("instance.name","Subscriber1");
instance1 = Utils.getFactoryByName(context, "OptionalSimpleFilterCheckServiceSubscriber").createComponentInstance(i1);
Properties i2 = new Properties();
- i2.put("name", "Subscriber2");
+ i2.put("instance.name","Subscriber2");
Properties ii2 = new Properties();
ii2.put("id2", "(toto=A)");
i2.put("requires.filters", ii2);
instance2 = Utils.getFactoryByName(context, "OptionalSimpleFilterCheckServiceSubscriber2").createComponentInstance(i2);
Properties i3 = new Properties();
- i3.put("name", "Subscriber3");
+ i3.put("instance.name","Subscriber3");
Properties ii3 = new Properties();
ii3.put("id1", "(toto=A)");
i3.put("requires.filters", ii3);
diff --git a/ipojo/tests/core/service-dependency-filter/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/filter/SimpleFilterDependencies.java b/ipojo/tests/core/service-dependency-filter/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/filter/SimpleFilterDependencies.java
index d836312..a20c955 100644
--- a/ipojo/tests/core/service-dependency-filter/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/filter/SimpleFilterDependencies.java
+++ b/ipojo/tests/core/service-dependency-filter/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/filter/SimpleFilterDependencies.java
@@ -37,28 +37,28 @@
public void setUp() {
try {
Properties prov = new Properties();
- prov.put("name", "FooProvider1");
+ prov.put("instance.name","FooProvider1");
fooProvider1 = Utils.getFactoryByName(context, "SimpleFilterCheckServiceProvider").createComponentInstance(prov);
fooProvider1.stop();
prov = new Properties();
- prov.put("name", "FooProvider2");
+ prov.put("instance.name","FooProvider2");
fooProvider2 = Utils.getFactoryByName(context, "SimpleFilterCheckServiceProvider").createComponentInstance(prov);
fooProvider2.stop();
Properties i1 = new Properties();
- i1.put("name", "Subscriber1");
+ i1.put("instance.name","Subscriber1");
instance1 = Utils.getFactoryByName(context, "SimpleFilterCheckServiceSubscriber").createComponentInstance(i1);
Properties i2 = new Properties();
- i2.put("name", "Subscriber2");
+ i2.put("instance.name","Subscriber2");
Properties ii2 = new Properties();
ii2.put("id2", "(toto=A)");
i2.put("requires.filters", ii2);
instance2 = Utils.getFactoryByName(context, "SimpleFilterCheckServiceSubscriber2").createComponentInstance(i2);
Properties i3 = new Properties();
- i3.put("name", "Subscriber3");
+ i3.put("instance.name","Subscriber3");
Properties ii3 = new Properties();
ii3.put("id1", "(toto=A)");
i3.put("requires.filters", ii3);
diff --git a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/CollectionMultipleDependencies.java b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/CollectionMultipleDependencies.java
index 1271576..00ff782 100644
--- a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/CollectionMultipleDependencies.java
+++ b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/CollectionMultipleDependencies.java
@@ -36,21 +36,21 @@
public void setUp() {
try {
Properties prov = new Properties();
- prov.put("name", "FooProvider1");
+ prov.put("instance.name","FooProvider1");
fooProvider1 = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov);
fooProvider1.stop();
Properties prov2 = new Properties();
- prov2.put("name", "FooProvider2");
+ prov2.put("instance.name","FooProvider2");
fooProvider2 = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov2);
fooProvider2.stop();
Properties i1 = new Properties();
- i1.put("name", "Simple");
+ i1.put("instance.name","Simple");
instance1 = Utils.getFactoryByName(context, "SimpleCollectionCheckServiceProvider").createComponentInstance(i1);
Properties i2 = new Properties();
- i2.put("name", "Optional");
+ i2.put("instance.name","Optional");
instance2 = Utils.getFactoryByName(context, "OptionalCollectionCheckServiceProvider").createComponentInstance(i2);
} catch(Exception e) { fail(e.getMessage()); }
diff --git a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/DelayedMultipleDependencies.java b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/DelayedMultipleDependencies.java
index 18092df..31b4965 100644
--- a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/DelayedMultipleDependencies.java
+++ b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/DelayedMultipleDependencies.java
@@ -37,36 +37,36 @@
public void setUp() {
try {
Properties i1 = new Properties();
- i1.put("name", "Simple");
+ i1.put("instance.name","Simple");
instance1 = Utils.getFactoryByName(context, "SimpleMultipleCheckServiceProvider").createComponentInstance(i1);
instance1.stop();
Properties i2 = new Properties();
- i2.put("name", "Void");
+ i2.put("instance.name","Void");
instance2 = Utils.getFactoryByName(context, "VoidMultipleCheckServiceProvider").createComponentInstance(i2);
instance2.stop();
Properties i3 = new Properties();
- i3.put("name", "Object");
+ i3.put("instance.name","Object");
instance3 = Utils.getFactoryByName(context, "ObjectMultipleCheckServiceProvider").createComponentInstance(i3);
instance3.stop();
Properties i4 = new Properties();
- i4.put("name", "Ref");
+ i4.put("instance.name","Ref");
instance4 = Utils.getFactoryByName(context, "RefMultipleCheckServiceProvider").createComponentInstance(i4);
instance4.stop();
Properties i5 = new Properties();
- i5.put("name", "Both");
+ i5.put("instance.name","Both");
instance5 = Utils.getFactoryByName(context, "BothMultipleCheckServiceProvider").createComponentInstance(i5);
instance5.stop();
Properties prov = new Properties();
- prov.put("name", "FooProvider1");
+ prov.put("instance.name","FooProvider1");
fooProvider1 = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov);
Properties prov2 = new Properties();
- prov2.put("name", "FooProvider2");
+ prov2.put("instance.name","FooProvider2");
fooProvider2 = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov2);
} catch(Exception e) { fail(e.getMessage()); }
}
diff --git a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/DelayedOptionalDependencies.java b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/DelayedOptionalDependencies.java
index e9f3948..78c9521 100644
--- a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/DelayedOptionalDependencies.java
+++ b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/DelayedOptionalDependencies.java
@@ -38,31 +38,31 @@
public void setUp() {
try {
Properties prov = new Properties();
- prov.put("name", "FooProvider");
+ prov.put("instance.name","FooProvider");
fooProvider = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov);
Properties i1 = new Properties();
- i1.put("name", "Simple");
+ i1.put("instance.name","Simple");
instance1 = Utils.getFactoryByName(context, "SimpleOptionalCheckServiceProvider").createComponentInstance(i1);
instance1.stop();
Properties i2 = new Properties();
- i2.put("name", "Void");
+ i2.put("instance.name","Void");
instance2 = Utils.getFactoryByName(context, "VoidOptionalCheckServiceProvider").createComponentInstance(i2);
instance2.stop();
Properties i3 = new Properties();
- i3.put("name", "Object");
+ i3.put("instance.name","Object");
instance3 = Utils.getFactoryByName(context, "ObjectOptionalCheckServiceProvider").createComponentInstance(i3);
instance3.stop();
Properties i4 = new Properties();
- i4.put("name", "Ref");
+ i4.put("instance.name","Ref");
instance4 = Utils.getFactoryByName(context, "RefOptionalCheckServiceProvider").createComponentInstance(i4);
instance4.stop();
Properties i5 = new Properties();
- i5.put("name", "Both");
+ i5.put("instance.name","Both");
instance5 = Utils.getFactoryByName(context, "BothOptionalCheckServiceProvider").createComponentInstance(i5);
instance5.stop();
} catch (Exception e) {
diff --git a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/DelayedOptionalMultipleDependencies.java b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/DelayedOptionalMultipleDependencies.java
index bd48b88..b458d9d 100644
--- a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/DelayedOptionalMultipleDependencies.java
+++ b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/DelayedOptionalMultipleDependencies.java
@@ -36,31 +36,31 @@
public void setUp() {
try {
Properties i1 = new Properties();
- i1.put("name", "Simple");
+ i1.put("instance.name","Simple");
instance1 = Utils.getFactoryByName(context, "SimpleOptionalMultipleCheckServiceProvider").createComponentInstance(i1);
instance1.stop();
Properties i2 = new Properties();
- i2.put("name", "Void");
+ i2.put("instance.name","Void");
instance2 = Utils.getFactoryByName(context, "VoidOptionalMultipleCheckServiceProvider").createComponentInstance(i2);
instance2.stop();
Properties i3 = new Properties();
- i3.put("name", "Object");
+ i3.put("instance.name","Object");
instance3 = Utils.getFactoryByName(context, "ObjectOptionalMultipleCheckServiceProvider").createComponentInstance(i3);
instance3.stop();
Properties i4 = new Properties();
- i4.put("name", "Ref");
+ i4.put("instance.name","Ref");
instance4 = Utils.getFactoryByName(context, "RefOptionalMultipleCheckServiceProvider").createComponentInstance(i4);
instance4.stop();
Properties prov = new Properties();
- prov.put("name", "FooProvider1");
+ prov.put("instance.name","FooProvider1");
fooProvider1 = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov);
Properties prov2 = new Properties();
- prov2.put("name", "FooProvider2");
+ prov2.put("instance.name","FooProvider2");
fooProvider2 = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov2);
} catch(Exception e) { fail(e.getMessage()); }
}
diff --git a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/DelayedSimpleDependencies.java b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/DelayedSimpleDependencies.java
index b0fde79..d26bb5c 100644
--- a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/DelayedSimpleDependencies.java
+++ b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/DelayedSimpleDependencies.java
@@ -36,31 +36,31 @@
public void setUp() {
try {
Properties prov = new Properties();
- prov.put("name", "FooProvider");
+ prov.put("instance.name","FooProvider");
fooProvider = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov);
Properties i1 = new Properties();
- i1.put("name", "Simple");
+ i1.put("instance.name","Simple");
instance1 = Utils.getFactoryByName(context, "SimpleCheckServiceProvider").createComponentInstance(i1);
instance1.stop();
Properties i2 = new Properties();
- i2.put("name", "Void");
+ i2.put("instance.name","Void");
instance2 = Utils.getFactoryByName(context, "VoidCheckServiceProvider").createComponentInstance(i2);
instance2.stop();
Properties i3 = new Properties();
- i3.put("name", "Object");
+ i3.put("instance.name","Object");
instance3 = Utils.getFactoryByName(context, "ObjectCheckServiceProvider").createComponentInstance(i3);
instance3.stop();
Properties i4 = new Properties();
- i4.put("name", "Ref");
+ i4.put("instance.name","Ref");
instance4 = Utils.getFactoryByName(context, "RefCheckServiceProvider").createComponentInstance(i4);
instance4.stop();
Properties i5 = new Properties();
- i5.put("name", "Both");
+ i5.put("instance.name","Both");
instance5 = Utils.getFactoryByName(context, "BothCheckServiceProvider").createComponentInstance(i5);
instance5.stop();
} catch(Exception e) { fail(e.getMessage()); }
diff --git a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/DependencyArchitectureTest.java b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/DependencyArchitectureTest.java
index 6d2d907..60e079f 100644
--- a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/DependencyArchitectureTest.java
+++ b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/DependencyArchitectureTest.java
@@ -41,29 +41,29 @@
public void setUp() {
try {
Properties prov = new Properties();
- prov.put("name", "FooProvider");
+ prov.put("instance.name","FooProvider");
fooProvider1 = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov);
fooProvider1.stop();
Properties prov2 = new Properties();
- prov2.put("name", "FooProvider2");
+ prov2.put("instance.name","FooProvider2");
fooProvider2 = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov2);
fooProvider2.stop();
Properties i1 = new Properties();
- i1.put("name", "Simple");
+ i1.put("instance.name","Simple");
instance1 = Utils.getFactoryByName(context, "SimpleCheckServiceProvider").createComponentInstance(i1);
Properties i2 = new Properties();
- i2.put("name", "Optional");
+ i2.put("instance.name","Optional");
instance2 = Utils.getFactoryByName(context, "SimpleOptionalCheckServiceProvider").createComponentInstance(i2);
Properties i3 = new Properties();
- i3.put("name", "Multiple");
+ i3.put("instance.name","Multiple");
instance3 = Utils.getFactoryByName(context, "SimpleMultipleCheckServiceProvider").createComponentInstance(i3);
Properties i4 = new Properties();
- i4.put("name", "OptionalMultiple");
+ i4.put("instance.name","OptionalMultiple");
instance4 = Utils.getFactoryByName(context, "SimpleOptionalMultipleCheckServiceProvider").createComponentInstance(i4);
} catch(Exception e) {
throw new RuntimeException(e.getMessage());
diff --git a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/ListMultipleDependencies.java b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/ListMultipleDependencies.java
index 47b11ff..8c34214 100644
--- a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/ListMultipleDependencies.java
+++ b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/ListMultipleDependencies.java
@@ -36,21 +36,21 @@
public void setUp() {
try {
Properties prov = new Properties();
- prov.put("name", "FooProvider1");
+ prov.put("instance.name","FooProvider1");
fooProvider1 = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov);
fooProvider1.stop();
Properties prov2 = new Properties();
- prov2.put("name", "FooProvider2");
+ prov2.put("instance.name","FooProvider2");
fooProvider2 = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov2);
fooProvider2.stop();
Properties i1 = new Properties();
- i1.put("name", "Simple");
+ i1.put("instance.name","Simple");
instance1 = Utils.getFactoryByName(context, "SimpleListCheckServiceProvider").createComponentInstance(i1);
Properties i2 = new Properties();
- i2.put("name", "Optional");
+ i2.put("instance.name","Optional");
instance2 = Utils.getFactoryByName(context, "OptionalListCheckServiceProvider").createComponentInstance(i2);
} catch(Exception e) { fail(e.getMessage()); }
diff --git a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodDelayedMultipleDependencies.java b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodDelayedMultipleDependencies.java
index 8e373ff..da71ba9 100644
--- a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodDelayedMultipleDependencies.java
+++ b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodDelayedMultipleDependencies.java
@@ -37,26 +37,26 @@
try {
Properties i3 = new Properties();
- i3.put("name", "Object");
+ i3.put("instance.name","Object");
instance3 = Utils.getFactoryByName(context, "MObjectMultipleCheckServiceProvider").createComponentInstance(i3);
instance3.stop();
Properties i4 = new Properties();
- i4.put("name", "Ref");
+ i4.put("instance.name","Ref");
instance4 = Utils.getFactoryByName(context, "MRefMultipleCheckServiceProvider").createComponentInstance(i4);
instance4.stop();
Properties i5 = new Properties();
- i5.put("name", "Both");
+ i5.put("instance.name","Both");
instance5 = Utils.getFactoryByName(context, "MBothMultipleCheckServiceProvider").createComponentInstance(i5);
instance5.stop();
Properties prov = new Properties();
- prov.put("name", "FooProvider1");
+ prov.put("instance.name","FooProvider1");
fooProvider1 = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov);
Properties prov2 = new Properties();
- prov2.put("name", "FooProvider2");
+ prov2.put("instance.name","FooProvider2");
fooProvider2 = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov2);
} catch(Exception e) { fail(e.getMessage()); }
}
diff --git a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodDelayedOptionalDependencies.java b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodDelayedOptionalDependencies.java
index 5c7d0d1..aa24292 100644
--- a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodDelayedOptionalDependencies.java
+++ b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodDelayedOptionalDependencies.java
@@ -37,21 +37,21 @@
public void setUp() {
try {
Properties prov = new Properties();
- prov.put("name", "FooProvider");
+ prov.put("instance.name","FooProvider");
fooProvider = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov);
Properties i3 = new Properties();
- i3.put("name", "Object");
+ i3.put("instance.name","Object");
instance3 = Utils.getFactoryByName(context, "MObjectOptionalCheckServiceProvider").createComponentInstance(i3);
instance3.stop();
Properties i4 = new Properties();
- i4.put("name", "Ref");
+ i4.put("instance.name","Ref");
instance4 = Utils.getFactoryByName(context, "MRefOptionalCheckServiceProvider").createComponentInstance(i4);
instance4.stop();
Properties i5 = new Properties();
- i5.put("name", "Both");
+ i5.put("instance.name","Both");
instance5 = Utils.getFactoryByName(context, "MBothOptionalCheckServiceProvider").createComponentInstance(i5);
instance5.stop();
} catch (Exception e) {
diff --git a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodDelayedOptionalMultipleDependencies.java b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodDelayedOptionalMultipleDependencies.java
index e1c7931..36ef22d 100644
--- a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodDelayedOptionalMultipleDependencies.java
+++ b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodDelayedOptionalMultipleDependencies.java
@@ -37,21 +37,21 @@
public void setUp() {
try {
Properties i3 = new Properties();
- i3.put("name", "Object");
+ i3.put("instance.name","Object");
instance3 = Utils.getFactoryByName(context, "MObjectOptionalMultipleCheckServiceProvider").createComponentInstance(i3);
instance3.stop();
Properties i4 = new Properties();
- i4.put("name", "Ref");
+ i4.put("instance.name","Ref");
instance4 = Utils.getFactoryByName(context, "MRefOptionalMultipleCheckServiceProvider").createComponentInstance(i4);
instance4.stop();
Properties prov = new Properties();
- prov.put("name", "FooProvider1");
+ prov.put("instance.name","FooProvider1");
fooProvider1 = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov);
Properties prov2 = new Properties();
- prov2.put("name", "FooProvider2");
+ prov2.put("instance.name","FooProvider2");
fooProvider2 = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov2);
} catch(Exception e) { fail(e.getMessage()); }
}
diff --git a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodDelayedSimpleDependencies.java b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodDelayedSimpleDependencies.java
index d564958..45a388d 100644
--- a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodDelayedSimpleDependencies.java
+++ b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodDelayedSimpleDependencies.java
@@ -37,21 +37,21 @@
public void setUp() {
try {
Properties prov = new Properties();
- prov.put("name", "FooProvider");
+ prov.put("instance.name","FooProvider");
fooProvider = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov);
Properties i3 = new Properties();
- i3.put("name", "Object");
+ i3.put("instance.name","Object");
instance3 = Utils.getFactoryByName(context, "MObjectCheckServiceProvider").createComponentInstance(i3);
instance3.stop();
Properties i4 = new Properties();
- i4.put("name", "Ref");
+ i4.put("instance.name","Ref");
instance4 = Utils.getFactoryByName(context, "MRefCheckServiceProvider").createComponentInstance(i4);
instance4.stop();
Properties i5 = new Properties();
- i5.put("name", "Both");
+ i5.put("instance.name","Both");
instance5 = Utils.getFactoryByName(context, "MBothCheckServiceProvider").createComponentInstance(i5);
instance5.stop();
} catch(Exception e) { fail(e.getMessage()); }
diff --git a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodMultipleDependencies.java b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodMultipleDependencies.java
index 92eb42c..9a15f11 100644
--- a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodMultipleDependencies.java
+++ b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodMultipleDependencies.java
@@ -36,25 +36,25 @@
public void setUp() {
try {
Properties prov = new Properties();
- prov.put("name", "FooProvider1");
+ prov.put("instance.name","FooProvider1");
fooProvider1 = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov);
fooProvider1.stop();
Properties prov2 = new Properties();
- prov2.put("name", "FooProvider2");
+ prov2.put("instance.name","FooProvider2");
fooProvider2 = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov2);
fooProvider2.stop();
Properties i3 = new Properties();
- i3.put("name", "Object");
+ i3.put("instance.name","Object");
instance3 = Utils.getFactoryByName(context, "MObjectMultipleCheckServiceProvider").createComponentInstance(i3);
Properties i4 = new Properties();
- i4.put("name", "Ref");
+ i4.put("instance.name","Ref");
instance4 = Utils.getFactoryByName(context, "MRefMultipleCheckServiceProvider").createComponentInstance(i4);
Properties i5 = new Properties();
- i5.put("name", "Both");
+ i5.put("instance.name","Both");
instance5 = Utils.getFactoryByName(context, "MBothMultipleCheckServiceProvider").createComponentInstance(i5);
} catch(Exception e) { fail(e.getMessage()); }
diff --git a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodOptionalDependencies.java b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodOptionalDependencies.java
index c104188..f5c6f79 100644
--- a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodOptionalDependencies.java
+++ b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodOptionalDependencies.java
@@ -37,20 +37,20 @@
public void setUp() {
try {
Properties prov = new Properties();
- prov.put("name", "FooProvider");
+ prov.put("instance.name","FooProvider");
fooProvider = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov);
fooProvider.stop();
Properties i3 = new Properties();
- i3.put("name", "Object");
+ i3.put("instance.name","Object");
instance3 = Utils.getFactoryByName(context, "MObjectOptionalCheckServiceProvider").createComponentInstance(i3);
Properties i4 = new Properties();
- i4.put("name", "Ref");
+ i4.put("instance.name","Ref");
instance4 = Utils.getFactoryByName(context, "MRefOptionalCheckServiceProvider").createComponentInstance(i4);
Properties i5 = new Properties();
- i5.put("name", "Both");
+ i5.put("instance.name","Both");
instance5 = Utils.getFactoryByName(context, "MBothOptionalCheckServiceProvider").createComponentInstance(i5);
} catch (Exception e) {
fail(e.getMessage());
diff --git a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodOptionalMultipleDependencies.java b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodOptionalMultipleDependencies.java
index ef5f20c..29ca739 100644
--- a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodOptionalMultipleDependencies.java
+++ b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodOptionalMultipleDependencies.java
@@ -36,21 +36,21 @@
public void setUp() {
try {
Properties prov = new Properties();
- prov.put("name", "FooProvider1");
+ prov.put("instance.name","FooProvider1");
fooProvider1 = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov);
fooProvider1.stop();
Properties prov2 = new Properties();
- prov2.put("name", "FooProvider2");
+ prov2.put("instance.name","FooProvider2");
fooProvider2 = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov2);
fooProvider2.stop();
Properties i3 = new Properties();
- i3.put("name", "Object");
+ i3.put("instance.name","Object");
instance3 = Utils.getFactoryByName(context, "MObjectOptionalMultipleCheckServiceProvider").createComponentInstance(i3);
Properties i4 = new Properties();
- i4.put("name", "Ref");
+ i4.put("instance.name","Ref");
instance4 = Utils.getFactoryByName(context, "MRefOptionalMultipleCheckServiceProvider").createComponentInstance(i4);
} catch(Exception e) { fail(e.getMessage()); }
diff --git a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodSimpleDependencies.java b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodSimpleDependencies.java
index 71ebfe6..395952e 100644
--- a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodSimpleDependencies.java
+++ b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MethodSimpleDependencies.java
@@ -36,22 +36,22 @@
public void setUp() {
try {
Properties prov = new Properties();
- prov.put("name", "FooProvider");
+ prov.put("instance.name","FooProvider");
fooProvider = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov);
fooProvider.stop();
Properties i3 = new Properties();
- i3.put("name", "Object");
+ i3.put("instance.name","Object");
instance3 = Utils.getFactoryByName(context, "MObjectCheckServiceProvider").createComponentInstance(i3);
assertNotNull("check instance 3", instance3);
Properties i4 = new Properties();
- i4.put("name", "Ref");
+ i4.put("instance.name","Ref");
instance4 = Utils.getFactoryByName(context, "MRefCheckServiceProvider").createComponentInstance(i4);
assertNotNull("check instance 4", instance4);
Properties i5 = new Properties();
- i5.put("name", "Both");
+ i5.put("instance.name","Both");
instance5 = Utils.getFactoryByName(context, "MBothCheckServiceProvider").createComponentInstance(i5);
assertNotNull("check instance 5", instance5);
} catch(Exception e) { fail(e.getMessage()); }
diff --git a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MultipleDependencies.java b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MultipleDependencies.java
index d539d32..f749e4f 100644
--- a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MultipleDependencies.java
+++ b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/MultipleDependencies.java
@@ -36,29 +36,29 @@
public void setUp() {
try {
Properties prov = new Properties();
- prov.put("name", "FooProvider1");
+ prov.put("instance.name","FooProvider1");
fooProvider1 = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov);
fooProvider1.stop();
Properties prov2 = new Properties();
- prov2.put("name", "FooProvider2");
+ prov2.put("instance.name","FooProvider2");
fooProvider2 = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov2);
fooProvider2.stop();
Properties i1 = new Properties();
- i1.put("name", "Simple");
+ i1.put("instance.name","Simple");
instance1 = Utils.getFactoryByName(context, "SimpleMultipleCheckServiceProvider").createComponentInstance(i1);
Properties i2 = new Properties();
- i2.put("name", "Void");
+ i2.put("instance.name","Void");
instance2 = Utils.getFactoryByName(context, "VoidMultipleCheckServiceProvider").createComponentInstance(i2);
Properties i3 = new Properties();
- i3.put("name", "Object");
+ i3.put("instance.name","Object");
instance3 = Utils.getFactoryByName(context, "ObjectMultipleCheckServiceProvider").createComponentInstance(i3);
Properties i4 = new Properties();
- i4.put("name", "Ref");
+ i4.put("instance.name","Ref");
instance4 = Utils.getFactoryByName(context, "RefMultipleCheckServiceProvider").createComponentInstance(i4);
} catch(Exception e) { fail(e.getMessage()); }
diff --git a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/OptionalDependencies.java b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/OptionalDependencies.java
index 1357c65..d4d2785 100644
--- a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/OptionalDependencies.java
+++ b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/OptionalDependencies.java
@@ -37,28 +37,28 @@
public void setUp() {
try {
Properties prov = new Properties();
- prov.put("name", "FooProvider");
+ prov.put("instance.name","FooProvider");
fooProvider = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov);
fooProvider.stop();
Properties i1 = new Properties();
- i1.put("name", "Simple");
+ i1.put("instance.name","Simple");
instance1 = Utils.getFactoryByName(context, "SimpleOptionalCheckServiceProvider").createComponentInstance(i1);
Properties i2 = new Properties();
- i2.put("name", "Void");
+ i2.put("instance.name","Void");
instance2 = Utils.getFactoryByName(context, "VoidOptionalCheckServiceProvider").createComponentInstance(i2);
Properties i3 = new Properties();
- i3.put("name", "Object");
+ i3.put("instance.name","Object");
instance3 = Utils.getFactoryByName(context, "ObjectOptionalCheckServiceProvider").createComponentInstance(i3);
Properties i4 = new Properties();
- i4.put("name", "Ref");
+ i4.put("instance.name","Ref");
instance4 = Utils.getFactoryByName(context, "RefOptionalCheckServiceProvider").createComponentInstance(i4);
Properties i5 = new Properties();
- i5.put("name", "Both");
+ i5.put("instance.name","Both");
instance5 = Utils.getFactoryByName(context, "BothOptionalCheckServiceProvider").createComponentInstance(i5);
} catch(Exception e) { fail(e.getMessage()); }
}
diff --git a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/OptionalMultipleDependencies.java b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/OptionalMultipleDependencies.java
index 07520d6..077546f 100644
--- a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/OptionalMultipleDependencies.java
+++ b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/OptionalMultipleDependencies.java
@@ -37,29 +37,29 @@
public void setUp() {
try {
Properties prov = new Properties();
- prov.put("name", "FooProvider1");
+ prov.put("instance.name","FooProvider1");
fooProvider1 = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov);
fooProvider1.stop();
Properties prov2 = new Properties();
- prov2.put("name", "FooProvider2");
+ prov2.put("instance.name","FooProvider2");
fooProvider2 = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov2);
fooProvider2.stop();
Properties i1 = new Properties();
- i1.put("name", "Simple");
+ i1.put("instance.name","Simple");
instance1 = Utils.getFactoryByName(context, "SimpleOptionalMultipleCheckServiceProvider").createComponentInstance(i1);
Properties i2 = new Properties();
- i2.put("name", "Void");
+ i2.put("instance.name","Void");
instance2 = Utils.getFactoryByName(context, "VoidOptionalMultipleCheckServiceProvider").createComponentInstance(i2);
Properties i3 = new Properties();
- i3.put("name", "Object");
+ i3.put("instance.name","Object");
instance3 = Utils.getFactoryByName(context, "ObjectOptionalMultipleCheckServiceProvider").createComponentInstance(i3);
Properties i4 = new Properties();
- i4.put("name", "Ref");
+ i4.put("instance.name","Ref");
instance4 = Utils.getFactoryByName(context, "RefOptionalMultipleCheckServiceProvider").createComponentInstance(i4);
} catch(Exception e) { fail(e.getMessage()); }
diff --git a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/OptionalNoNullableDependencies.java b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/OptionalNoNullableDependencies.java
index 894f987..e19a086 100644
--- a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/OptionalNoNullableDependencies.java
+++ b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/OptionalNoNullableDependencies.java
@@ -37,28 +37,28 @@
public void setUp() {
try {
Properties prov = new Properties();
- prov.put("name", "FooProvider");
+ prov.put("instance.name","FooProvider");
fooProvider = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov);
fooProvider.stop();
Properties i1 = new Properties();
- i1.put("name", "Simple");
+ i1.put("instance.name","Simple");
instance1 = Utils.getFactoryByName(context, "SimpleOptionalNoNullableCheckServiceProvider").createComponentInstance(i1);
Properties i2 = new Properties();
- i2.put("name", "Void");
+ i2.put("instance.name","Void");
instance2 = Utils.getFactoryByName(context, "VoidOptionalNoNullableCheckServiceProvider").createComponentInstance(i2);
Properties i3 = new Properties();
- i3.put("name", "Object");
+ i3.put("instance.name","Object");
instance3 = Utils.getFactoryByName(context, "ObjectOptionalNoNullableCheckServiceProvider").createComponentInstance(i3);
Properties i4 = new Properties();
- i4.put("name", "Ref");
+ i4.put("instance.name","Ref");
instance4 = Utils.getFactoryByName(context, "RefOptionalNoNullableCheckServiceProvider").createComponentInstance(i4);
Properties i5 = new Properties();
- i5.put("name", "Both");
+ i5.put("instance.name","Both");
instance5 = Utils.getFactoryByName(context, "BothOptionalNoNullableCheckServiceProvider").createComponentInstance(i5);
} catch(Exception e) {
e.getMessage();
diff --git a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/SetMultipleDependencies.java b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/SetMultipleDependencies.java
index a32f477..db097d4 100644
--- a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/SetMultipleDependencies.java
+++ b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/SetMultipleDependencies.java
@@ -36,21 +36,21 @@
public void setUp() {
try {
Properties prov = new Properties();
- prov.put("name", "FooProvider1");
+ prov.put("instance.name","FooProvider1");
fooProvider1 = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov);
fooProvider1.stop();
Properties prov2 = new Properties();
- prov2.put("name", "FooProvider2");
+ prov2.put("instance.name","FooProvider2");
fooProvider2 = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov2);
fooProvider2.stop();
Properties i1 = new Properties();
- i1.put("name", "Simple");
+ i1.put("instance.name","Simple");
instance1 = Utils.getFactoryByName(context, "SimpleSetCheckServiceProvider").createComponentInstance(i1);
Properties i2 = new Properties();
- i2.put("name", "Optional");
+ i2.put("instance.name","Optional");
instance2 = Utils.getFactoryByName(context, "OptionalSetCheckServiceProvider").createComponentInstance(i2);
} catch(Exception e) { fail(e.getMessage()); }
diff --git a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/SimpleDependencies.java b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/SimpleDependencies.java
index ea3a29b..b800380 100644
--- a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/SimpleDependencies.java
+++ b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/SimpleDependencies.java
@@ -37,32 +37,32 @@
public void setUp() {
try {
Properties prov = new Properties();
- prov.put("name", "FooProvider");
+ prov.put("instance.name","FooProvider");
fooProvider = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov);
fooProvider.stop();
Properties i1 = new Properties();
- i1.put("name", "Simple");
+ i1.put("instance.name","Simple");
instance1 = Utils.getFactoryByName(context, "SimpleCheckServiceProvider").createComponentInstance(i1);
Properties i2 = new Properties();
- i2.put("name", "Void");
+ i2.put("instance.name","Void");
instance2 = Utils.getFactoryByName(context, "VoidCheckServiceProvider").createComponentInstance(i2);
Properties i3 = new Properties();
- i3.put("name", "Object");
+ i3.put("instance.name","Object");
instance3 = Utils.getFactoryByName(context, "ObjectCheckServiceProvider").createComponentInstance(i3);
Properties i4 = new Properties();
- i4.put("name", "Ref");
+ i4.put("instance.name","Ref");
instance4 = Utils.getFactoryByName(context, "RefCheckServiceProvider").createComponentInstance(i4);
Properties i5 = new Properties();
- i5.put("name", "Both");
+ i5.put("instance.name","Both");
instance5 = Utils.getFactoryByName(context, "BothCheckServiceProvider").createComponentInstance(i5);
Properties i6 = new Properties();
- i6.put("name", "Double");
+ i6.put("instance.name","Double");
instance6 = Utils.getFactoryByName(context, "DoubleCheckServiceProvider").createComponentInstance(i6);
} catch(Exception e) {
e.printStackTrace();
diff --git a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/VectorMultipleDependencies.java b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/VectorMultipleDependencies.java
index e83c480..77f7329 100644
--- a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/VectorMultipleDependencies.java
+++ b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/VectorMultipleDependencies.java
@@ -36,21 +36,21 @@
public void setUp() {
try {
Properties prov = new Properties();
- prov.put("name", "FooProvider1");
+ prov.put("instance.name","FooProvider1");
fooProvider1 = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov);
fooProvider1.stop();
Properties prov2 = new Properties();
- prov2.put("name", "FooProvider2");
+ prov2.put("instance.name","FooProvider2");
fooProvider2 = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov2);
fooProvider2.stop();
Properties i1 = new Properties();
- i1.put("name", "Simple");
+ i1.put("instance.name","Simple");
instance1 = Utils.getFactoryByName(context, "SimpleVectorCheckServiceProvider").createComponentInstance(i1);
Properties i2 = new Properties();
- i2.put("name", "Optional");
+ i2.put("instance.name","Optional");
instance2 = Utils.getFactoryByName(context, "OptionalVectorCheckServiceProvider").createComponentInstance(i2);
} catch(Exception e) { fail(e.getMessage()); }
diff --git a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/di/DelayedOptionalDependencies.java b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/di/DelayedOptionalDependencies.java
index 996fbfd..611225b 100644
--- a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/di/DelayedOptionalDependencies.java
+++ b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/di/DelayedOptionalDependencies.java
@@ -38,31 +38,31 @@
public void setUp() {
try {
Properties prov = new Properties();
- prov.put("name", "FooProvider");
+ prov.put("instance.name","FooProvider");
fooProvider = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov);
Properties i1 = new Properties();
- i1.put("name", "Simple");
+ i1.put("instance.name","Simple");
instance1 = Utils.getFactoryByName(context, "DISimpleOptionalCheckServiceProvider").createComponentInstance(i1);
instance1.stop();
Properties i2 = new Properties();
- i2.put("name", "Void");
+ i2.put("instance.name","Void");
instance2 = Utils.getFactoryByName(context, "DIVoidOptionalCheckServiceProvider").createComponentInstance(i2);
instance2.stop();
Properties i3 = new Properties();
- i3.put("name", "Object");
+ i3.put("instance.name","Object");
instance3 = Utils.getFactoryByName(context, "DIObjectOptionalCheckServiceProvider").createComponentInstance(i3);
instance3.stop();
Properties i4 = new Properties();
- i4.put("name", "Ref");
+ i4.put("instance.name","Ref");
instance4 = Utils.getFactoryByName(context, "DIRefOptionalCheckServiceProvider").createComponentInstance(i4);
instance4.stop();
Properties i5 = new Properties();
- i5.put("name", "Both");
+ i5.put("instance.name","Both");
instance5 = Utils.getFactoryByName(context, "DIBothOptionalCheckServiceProvider").createComponentInstance(i5);
instance5.stop();
} catch (Exception e) {
diff --git a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/di/MethodDelayedOptionalDependencies.java b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/di/MethodDelayedOptionalDependencies.java
index fa71482..f87540a 100644
--- a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/di/MethodDelayedOptionalDependencies.java
+++ b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/di/MethodDelayedOptionalDependencies.java
@@ -38,21 +38,21 @@
public void setUp() {
try {
Properties prov = new Properties();
- prov.put("name", "FooProvider");
+ prov.put("instance.name","FooProvider");
fooProvider = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov);
Properties i3 = new Properties();
- i3.put("name", "Object");
+ i3.put("instance.name","Object");
instance3 = Utils.getFactoryByName(context, "DIMObjectOptionalCheckServiceProvider").createComponentInstance(i3);
instance3.stop();
Properties i4 = new Properties();
- i4.put("name", "Ref");
+ i4.put("instance.name","Ref");
instance4 = Utils.getFactoryByName(context, "DIMRefOptionalCheckServiceProvider").createComponentInstance(i4);
instance4.stop();
Properties i5 = new Properties();
- i5.put("name", "Both");
+ i5.put("instance.name","Both");
instance5 = Utils.getFactoryByName(context, "DIMBothOptionalCheckServiceProvider").createComponentInstance(i5);
instance5.stop();
} catch (Exception e) {
diff --git a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/di/MethodOptionalDependencies.java b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/di/MethodOptionalDependencies.java
index 00600ff..82f58b5 100644
--- a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/di/MethodOptionalDependencies.java
+++ b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/di/MethodOptionalDependencies.java
@@ -38,20 +38,20 @@
public void setUp() {
try {
Properties prov = new Properties();
- prov.put("name", "FooProvider");
+ prov.put("instance.name","FooProvider");
fooProvider = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov);
fooProvider.stop();
Properties i3 = new Properties();
- i3.put("name", "Object");
+ i3.put("instance.name","Object");
instance3 = Utils.getFactoryByName(context, "DIMObjectOptionalCheckServiceProvider").createComponentInstance(i3);
Properties i4 = new Properties();
- i4.put("name", "Ref");
+ i4.put("instance.name","Ref");
instance4 = Utils.getFactoryByName(context, "DIMRefOptionalCheckServiceProvider").createComponentInstance(i4);
Properties i5 = new Properties();
- i5.put("name", "Both");
+ i5.put("instance.name","Both");
instance5 = Utils.getFactoryByName(context, "DIMBothOptionalCheckServiceProvider").createComponentInstance(i5);
} catch (Exception e) {
fail(e.getMessage());
diff --git a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/di/OptionalDependencies.java b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/di/OptionalDependencies.java
index 033b0f9..aed8630 100644
--- a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/di/OptionalDependencies.java
+++ b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/service/dependency/di/OptionalDependencies.java
@@ -37,28 +37,28 @@
public void setUp() {
try {
Properties prov = new Properties();
- prov.put("name", "FooProvider");
+ prov.put("instance.name","FooProvider");
fooProvider = Utils.getFactoryByName(context, "FooProviderType-1").createComponentInstance(prov);
fooProvider.stop();
Properties i1 = new Properties();
- i1.put("name", "Simple");
+ i1.put("instance.name","Simple");
instance1 = Utils.getFactoryByName(context, "DISimpleOptionalCheckServiceProvider").createComponentInstance(i1);
Properties i2 = new Properties();
- i2.put("name", "Void");
+ i2.put("instance.name","Void");
instance2 = Utils.getFactoryByName(context, "DIVoidOptionalCheckServiceProvider").createComponentInstance(i2);
Properties i3 = new Properties();
- i3.put("name", "Object");
+ i3.put("instance.name","Object");
instance3 = Utils.getFactoryByName(context, "DIObjectOptionalCheckServiceProvider").createComponentInstance(i3);
Properties i4 = new Properties();
- i4.put("name", "Ref");
+ i4.put("instance.name","Ref");
instance4 = Utils.getFactoryByName(context, "DIRefOptionalCheckServiceProvider").createComponentInstance(i4);
Properties i5 = new Properties();
- i5.put("name", "Both");
+ i5.put("instance.name","Both");
instance5 = Utils.getFactoryByName(context, "DIBothOptionalCheckServiceProvider").createComponentInstance(i5);
} catch(Exception e) { fail(e.getMessage()); }
}
diff --git a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
index bb2019a..1196bc2 100644
--- a/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
+++ b/ipojo/tests/core/service-dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
@@ -99,7 +99,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());
diff --git a/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/ps/DynamicProps.java b/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/ps/DynamicProps.java
index 4437f1b..e4631f9 100644
--- a/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/ps/DynamicProps.java
+++ b/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/ps/DynamicProps.java
@@ -36,11 +36,11 @@
String type = "PS-FooProviderType-Dyn";
Properties p1 = new Properties();
- p1.put("name", "FooProvider-1");
+ p1.put("instance.name","FooProvider-1");
fooProvider1 = Utils.getComponentInstance(context, type, p1);
Properties p2 = new Properties();
- p2.put("name", "FooProvider-2");
+ p2.put("instance.name","FooProvider-2");
p2.put("int", new Integer(4));
p2.put("boolean", new Boolean(false));
p2.put("string", new String("bar"));
@@ -50,7 +50,7 @@
String type2 = "PS-FooProviderType-Dyn2";
Properties p3 = new Properties();
- p3.put("name", "FooProvider-3");
+ p3.put("instance.name","FooProvider-3");
p3.put("int", new Integer(0));
p3.put("boolean", new Boolean(true));
p3.put("string", new String(""));
diff --git a/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/ps/DynamicPropsReconfiguration.java b/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/ps/DynamicPropsReconfiguration.java
index 4384b23..6ed2ace 100644
--- a/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/ps/DynamicPropsReconfiguration.java
+++ b/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/ps/DynamicPropsReconfiguration.java
@@ -35,7 +35,7 @@
public void setUp() {
String type2 = "PS-FooProviderType-Dyn2";
Properties p3 = new Properties();
- p3.put("name", "FooProvider-3");
+ p3.put("instance.name","FooProvider-3");
p3.put("int", new Integer(0));
p3.put("boolean", new Boolean(true));
p3.put("string", new String(""));
@@ -78,7 +78,7 @@
ServiceReference fact_ref = Utils.getServiceReferenceByName(context, Factory.class.getName() , "PS-FooProviderType-Dyn2");
Factory fact = (Factory) context.getService(fact_ref);
Properties p3 = new Properties();
- p3.put("name", "FooProvider-3");
+ p3.put("instance.name","FooProvider-3");
p3.put("int", new Integer(1));
p3.put("boolean", new Boolean(true));
p3.put("string", new String("foo"));
@@ -139,7 +139,7 @@
fact_ref = Utils.getServiceReferenceByName(context, Factory.class.getName() , "PS-FooProviderType-Dyn2");
fact = (Factory) context.getService(fact_ref);
p3 = new Properties();
- p3.put("name", "FooProvider-3");
+ p3.put("instance.name","FooProvider-3");
p3.put("int", new Integer(1));
p3.put("boolean", new Boolean(true));
p3.put("string", new String("foo"));
@@ -210,7 +210,7 @@
ServiceReference fact_ref = Utils.getServiceReferenceByName(context, Factory.class.getName() , "PS-FooProviderType-Dyn2");
Factory fact = (Factory) context.getService(fact_ref);
Properties p3 = new Properties();
- p3.put("name", "FooProvider-3");
+ p3.put("instance.name","FooProvider-3");
p3.put("int", "1");
p3.put("boolean", "true");
p3.put("string", "foo");
@@ -271,7 +271,7 @@
fact_ref = Utils.getServiceReferenceByName(context, Factory.class.getName() , "PS-FooProviderType-Dyn2");
fact = (Factory) context.getService(fact_ref);
p3 = new Properties();
- p3.put("name", "FooProvider-3");
+ p3.put("instance.name","FooProvider-3");
p3.put("int", "1");
p3.put("boolean", "true");
p3.put("string", "foo");
diff --git a/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/ps/Exposition.java b/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/ps/Exposition.java
index 69dca5d..6228d4c 100644
--- a/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/ps/Exposition.java
+++ b/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/ps/Exposition.java
@@ -37,23 +37,23 @@
public void setUp(){
Properties p1 = new Properties();
- p1.put("name", "fooProviderSimple");
+ p1.put("instance.name","fooProviderSimple");
fooProviderSimple = Utils.getComponentInstance(context, "PS-FooProviderType-1", p1);
Properties p2 = new Properties();
- p2.put("name", "fooProviderItf");
+ p2.put("instance.name","fooProviderItf");
fooProviderItf = Utils.getComponentInstance(context, "PS-FooProviderType-itf", p2);
Properties p3 = new Properties();
- p3.put("name", "fooProviderItfs");
+ p3.put("instance.name","fooProviderItfs");
fooBarProvider = Utils.getComponentInstance(context, "PS-FooBarProviderType-1", p3);
Properties p4 = new Properties();
- p4.put("name", "fooProviderItfs2");
+ p4.put("instance.name","fooProviderItfs2");
fooBarProvider2 = Utils.getComponentInstance(context, "PS-FooBarProviderType-2", p4);
Properties p5 = new Properties();
- p5.put("name", "fooProviderItfs3");
+ p5.put("instance.name","fooProviderItfs3");
fooBarProvider3 = Utils.getComponentInstance(context, "PS-FooBarProviderType-3", p5);
assertNotNull("Check the instance creation of fooProviderSimple", fooProviderSimple);
diff --git a/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/ps/ProvidedServiceArchitectureTest.java b/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/ps/ProvidedServiceArchitectureTest.java
index 21627d3..f7316fa 100644
--- a/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/ps/ProvidedServiceArchitectureTest.java
+++ b/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/ps/ProvidedServiceArchitectureTest.java
@@ -45,7 +45,7 @@
assertNotNull("Cannot find the factory FooProvider-1", fact);
Properties props = new Properties();
- props.put("name", compName);
+ props.put("instance.name",compName);
ComponentInstance ci = null;
try {
ci = fact.createComponentInstance(props);
@@ -98,7 +98,7 @@
assertNotNull("Cannot find the factory FooProvider", fact);
Properties props = new Properties();
- props.put("name", compName);
+ props.put("instance.name",compName);
props.put("foo", "foo");
props.put("bar", "2");
props.put("baz", "baz");
@@ -156,7 +156,7 @@
assertNotNull("Cannot find the factory FooProvider", fact);
Properties props = new Properties();
- props.put("name", compName);
+ props.put("instance.name",compName);
ComponentInstance ci = null;
try {
ci = fact.createComponentInstance(props);
diff --git a/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/ps/SimplePS.java b/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/ps/SimplePS.java
index 6f1f8c2..8d9ba33 100644
--- a/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/ps/SimplePS.java
+++ b/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/ps/SimplePS.java
@@ -47,7 +47,7 @@
assertNotNull("Cannot find the factory FooProvider-1", fact);
Properties props = new Properties();
- props.put("name", compName);
+ props.put("instance.name",compName);
ComponentInstance ci = null;
try {
ci = fact.createComponentInstance(props);
diff --git a/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/ps/StaticProps.java b/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/ps/StaticProps.java
index afcfe08..484bacb 100644
--- a/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/ps/StaticProps.java
+++ b/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/ps/StaticProps.java
@@ -35,11 +35,11 @@
String type = "PS-FooProviderType-2";
Properties p1 = new Properties();
- p1.put("name", "FooProvider-1");
+ p1.put("instance.name","FooProvider-1");
fooProvider1 = Utils.getComponentInstance(context, type, p1);
Properties p2 = new Properties();
- p2.put("name", "FooProvider-2");
+ p2.put("instance.name","FooProvider-2");
p2.put("int", new Integer(4));
p2.put("long", new Long(42));
p2.put("string", new String("bar"));
diff --git a/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/ps/StaticPropsReconfiguration.java b/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/ps/StaticPropsReconfiguration.java
index 5f9baf9..203d4a3 100644
--- a/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/ps/StaticPropsReconfiguration.java
+++ b/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/ps/StaticPropsReconfiguration.java
@@ -39,11 +39,11 @@
String type = "PS-FooProviderType-2";
Properties p1 = new Properties();
- p1.put("name", "FooProvider-1");
+ p1.put("instance.name","FooProvider-1");
fooProvider1 = Utils.getComponentInstance(context, type, p1);
Properties p2 = new Properties();
- p2.put("name", "FooProvider-2");
+ p2.put("instance.name","FooProvider-2");
p2.put("int", new Integer(4));
p2.put("long", new Long(42));
p2.put("string", new String("bar"));
@@ -88,7 +88,7 @@
// Reconfiguration
ServiceReference fact_ref = Utils.getServiceReferenceByName(context, Factory.class.getName(), "PS-FooProviderType-2");
Dictionary reconf = new Properties();
- reconf.put("name", "FooProvider-1");
+ reconf.put("instance.name","FooProvider-1");
reconf.put("int", new Integer(5));
reconf.put("long", new Long(43));
reconf.put("string", new String("toto"));
@@ -159,7 +159,7 @@
// Reconfiguration
ServiceReference fact_ref = Utils.getServiceReferenceByName(context, Factory.class.getName(), "PS-FooProviderType-2");
Dictionary reconf = new Properties();
- reconf.put("name", "FooProvider-2");
+ reconf.put("instance.name","FooProvider-2");
reconf.put("int", new Integer(5));
reconf.put("long", new Long(43));
reconf.put("string", new String("toto"));
diff --git a/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java b/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
index 85ef670..bcec3d5 100644
--- a/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
+++ b/ipojo/tests/core/service-providing/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
@@ -100,7 +100,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());
diff --git a/ipojo/tests/handler/eventadmin/src/main/java/org/apache/felix/ipojo/test/BadTests.java b/ipojo/tests/handler/eventadmin/src/main/java/org/apache/felix/ipojo/test/BadTests.java
index 797398e..ba0d1d0 100644
--- a/ipojo/tests/handler/eventadmin/src/main/java/org/apache/felix/ipojo/test/BadTests.java
+++ b/ipojo/tests/handler/eventadmin/src/main/java/org/apache/felix/ipojo/test/BadTests.java
@@ -276,7 +276,7 @@
ComponentFactory providerFactory = new ComponentFactory(context,
m_provider);
providerFactory.start();
- properties.put("name", "Emperor of donuts");
+ properties.put("instance.name","Emperor of donuts");
ComponentInstance providerInstance = providerFactory
.createComponentInstance(properties);
ServiceReference providerService = IPojoTestUtils
@@ -286,10 +286,11 @@
.getService(providerService);
// The consumer
+ properties = new Hashtable();
ComponentFactory consumerFactory = new ComponentFactory(context,
m_consumer);
consumerFactory.start();
- properties.put("name", "Homer Simpson");
+ properties.put("instance.name","Homer Simpson");
properties.put("slow", "false");
ComponentInstance consumerInstance = consumerFactory
.createComponentInstance(properties);
@@ -476,7 +477,7 @@
// Try to create an instance without specified topics
Dictionary conf = new Hashtable();
- conf.put("name", "provider without topics");
+ conf.put("instance.name","provider without topics");
ComponentInstance instance;
try {
@@ -552,7 +553,7 @@
// Try to create an instance with malformed specified topics
Dictionary conf = new Hashtable();
- conf.put("name", "provider with malformed topics");
+ conf.put("instance.name","provider with malformed topics");
Dictionary topics = new Hashtable();
topics.put("donut-publisher", "| |\\| \\/ /-\\ |_ | |)");
conf.put("event.topics", topics);
@@ -657,7 +658,7 @@
// Try to create an instance without specified topics
Dictionary conf = new Hashtable();
- conf.put("name", "consumer without topics");
+ conf.put("instance.name","consumer without topics");
conf.put("slow", "false");
ComponentInstance instance;
@@ -734,7 +735,7 @@
// Try to create an instance with malformed specified topics
Dictionary conf = new Hashtable();
- conf.put("name", "consumer with malformed topics");
+ conf.put("instance.name","consumer with malformed topics");
Dictionary topics = new Hashtable();
topics.put("donut-subscriber", "| |\\| \\/ /-\\ |_ | |)");
conf.put("event.topics", topics);
diff --git a/ipojo/tests/handler/eventadmin/src/main/java/org/apache/felix/ipojo/test/GoodTests.java b/ipojo/tests/handler/eventadmin/src/main/java/org/apache/felix/ipojo/test/GoodTests.java
index 0d0af1d..2b944e7 100644
--- a/ipojo/tests/handler/eventadmin/src/main/java/org/apache/felix/ipojo/test/GoodTests.java
+++ b/ipojo/tests/handler/eventadmin/src/main/java/org/apache/felix/ipojo/test/GoodTests.java
@@ -298,33 +298,38 @@
m_topicsProviders = new DonutProvider[TOPICS_LIST.length];
// Create the (asynchronous) donut provider
- properties.put("name", "asynchronous donut provider");
+ properties.put("instance.name","asynchronous donut provider");
m_providersInstances[0] = m_utils.getDonutProviderFactory()
.createComponentInstance(properties);
// Create the synchronous donut provider
- properties.put("name", "synchronous donut provider");
+ properties = new Hashtable();
+ properties.put("instance.name","synchronous donut provider");
m_providersInstances[1] = m_utils.getSynchronousDonutProviderFactory()
.createComponentInstance(properties);
// Create the (asynchronous) donut event provider
- properties.put("name", "asynchronous donut event provider");
+ properties = new Hashtable();
+ properties.put("instance.name","asynchronous donut event provider");
m_providersInstances[2] = m_utils.getDonutEventProviderFactory()
.createComponentInstance(properties);
// Create the synchronous donut event provider
- properties.put("name", "synchronous donut event provider");
+ properties = new Hashtable();
+ properties.put("instance.name","synchronous donut event provider");
m_providersInstances[3] = m_utils
.getSynchronousDonutEventProviderFactory()
.createComponentInstance(properties);
// Create the (asynchronous) event provider
- properties.put("name", "asynchronous event provider");
+ properties = new Hashtable();
+ properties.put("instance.name","asynchronous event provider");
m_providersInstances[4] = m_utils.getEventProviderFactory()
.createComponentInstance(properties);
// Create the synchronous event provider
- properties.put("name", "synchronous event provider");
+ properties = new Hashtable();
+ properties.put("instance.name","synchronous event provider");
m_providersInstances[5] = m_utils.getSynchronousEventProviderFactory()
.createComponentInstance(properties);
@@ -362,39 +367,44 @@
m_topicsConsumers = new DonutConsumer[TOPICS_LIST.length];
// Create the (quick) donut consumer
- properties.put("name", "quick donut consumer");
+ properties = new Hashtable();
+ properties.put("instance.name","quick donut consumer");
m_consumersInstances[0] = m_utils.getDonutConsumerFactory()
.createComponentInstance(properties);
// Create the (quick) donut event consumer
- properties.put("name", "quick donut event consumer");
+ properties = new Hashtable();
+ properties.put("instance.name","quick donut event consumer");
m_consumersInstances[1] = m_utils.getDonutEventConsumerFactory()
.createComponentInstance(properties);
// Create the (quick) event consumer
- properties.put("name", "quick event consumer");
+ properties = new Hashtable();
+ properties.put("instance.name","quick event consumer");
m_consumersInstances[2] = m_utils.getEventConsumerFactory()
.createComponentInstance(properties);
- properties.put("slow", Boolean.TRUE);
-
// Create the slow donut consumer
- properties.put("name", "slow donut consumer");
+ properties = new Hashtable();
+ properties.put("slow", Boolean.TRUE);
+ properties.put("instance.name","slow donut consumer");
m_consumersInstances[3] = m_utils.getDonutConsumerFactory()
.createComponentInstance(properties);
// Create the slow donut event consumer
- properties.put("name", "slow donut event consumer");
+ properties = new Hashtable();
+ properties.put("instance.name","slow donut event consumer");
+ properties.put("slow", Boolean.TRUE);
m_consumersInstances[4] = m_utils.getDonutEventConsumerFactory()
.createComponentInstance(properties);
// Create the slow event consumer
- properties.put("name", "slow event consumer");
+ properties = new Hashtable();
+ properties.put("instance.name","slow event consumer");
+ properties.put("slow", Boolean.TRUE);
m_consumersInstances[5] = m_utils.getEventConsumerFactory()
.createComponentInstance(properties);
- properties.remove("slow");
-
// Get all the services references
for (int i = 0; i < NUMBER_OF_CONSUMERS; i++) {
m_consumersServices[i] = IPojoTestUtils.getServiceReferenceByName(
@@ -408,7 +418,8 @@
m_quickConsumers[2] = m_consumers[2];
// Create the event tracker
- properties.put("name", "event tracker");
+ properties = new Hashtable();
+ properties.put("instance.name","event tracker");
m_eventTrackerInstance = m_utils.getEventTrackerFactory()
.createComponentInstance(properties);
m_eventTrackerService = IPojoTestUtils.getServiceReferenceByName(
@@ -421,8 +432,9 @@
Dictionary filter = new Hashtable();
for (int i = 0; i < Donut.FLAVOURS.length; i++) {
String flavour = Donut.FLAVOURS[i];
+ properties = new Hashtable();
filter.put("donut-event-subscriber", "(flavour=" + flavour + ")");
- properties.put("name", flavour + " donut consumer");
+ properties.put("instance.name",flavour + " donut consumer");
properties.put("event.filter", filter);
m_filteredConsumersInstances[i] = m_utils
.getDonutEventConsumerFactory().createComponentInstance(
@@ -434,18 +446,17 @@
m_filteredConsumers[i] = (DonutConsumer) context
.getService(m_filteredConsumersServices[i]);
}
- properties.remove("event.filter");
// Create the providers and consumers selling and receiving donuts on
// specific topics
Dictionary topics = new Hashtable();
for (int i = 0; i < TOPICS_LIST.length; i++) {
String topicsString = TOPICS_LIST[i];
-
+ properties = new Hashtable();
// Create provider
topics.put("donut-publisher", topicsString);
properties.put("event.topics", topics);
- properties.put("name", topicsString + " donut provider");
+ properties.put("instance.name",topicsString + " donut provider");
m_topicsProvidersInstances[i] = m_utils
.getSynchronousDonutProviderFactory()
.createComponentInstance(properties);
@@ -455,12 +466,12 @@
.getInstanceName());
m_topicsProviders[i] = (DonutProvider) context
.getService(m_topicsProvidersServices[i]);
- topics.remove("donut-publisher");
// Create consumer
+ properties = new Hashtable();
topics.put("donut-subscriber", topicsString);
properties.put("event.topics", topics);
- properties.put("name", topicsString + " donut consumer");
+ properties.put("instance.name",topicsString + " donut consumer");
m_topicsConsumersInstances[i] = m_utils.getDonutConsumerFactory()
.createComponentInstance(properties);
@@ -472,7 +483,7 @@
.getService(m_topicsConsumersServices[i]);
topics.remove("donut-subscriber");
}
- properties.remove("event.topics");
+
m_fooProvider = m_topicsProviders[0];
m_barProvider = m_topicsProviders[1];
m_nutProvider = m_topicsProviders[2];
diff --git a/ipojo/tests/handler/eventadmin/src/main/java/org/apache/felix/ipojo/test/util/IPojoTestUtils.java b/ipojo/tests/handler/eventadmin/src/main/java/org/apache/felix/ipojo/test/util/IPojoTestUtils.java
index 14a4a96..bd53b96 100644
--- a/ipojo/tests/handler/eventadmin/src/main/java/org/apache/felix/ipojo/test/util/IPojoTestUtils.java
+++ b/ipojo/tests/handler/eventadmin/src/main/java/org/apache/felix/ipojo/test/util/IPojoTestUtils.java
@@ -91,7 +91,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
diff --git a/ipojo/tests/handler/temporal/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java b/ipojo/tests/handler/temporal/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
index 35d034c..0af896b 100644
--- a/ipojo/tests/handler/temporal/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
+++ b/ipojo/tests/handler/temporal/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
@@ -126,7 +126,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());
diff --git a/ipojo/tests/handler/whiteboard/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java b/ipojo/tests/handler/whiteboard/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
index e453bed..d2239d9 100644
--- a/ipojo/tests/handler/whiteboard/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
+++ b/ipojo/tests/handler/whiteboard/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
@@ -78,7 +78,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());
diff --git a/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/component/InnerClasses.java b/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/component/InnerClasses.java
new file mode 100644
index 0000000..1c8efc5
--- /dev/null
+++ b/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/component/InnerClasses.java
@@ -0,0 +1,133 @@
+package org.apache.felix.ipojo.test.scenarios.component;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import org.apache.felix.ipojo.test.scenarios.manipulation.service.CheckService;
+
+public class InnerClasses implements CheckService {
+
+ private String privateObject;
+ private int privateInt;
+
+ protected String protectedObject;
+ protected int protectedInt;
+
+ String packageObject;
+ int packageInt;
+
+ public String publicObject;
+ public int publicInt;
+
+ private String nonObject = "not-managed";
+ private int nonInt = 5;
+
+ public boolean check() {
+ return true;
+ }
+
+ public Properties getProps() {
+ Properties props = new Properties();
+ props.put("publicInner", new PublicNested().doSomething());
+ props.put("packageInner", new PackageNested().doSomething());
+ props.put("protectedInner", new ProtectedNested().doSomething());
+ props.put("privateInner", new PrivateNested().doSomething());
+
+ Job anonymous = new Job() {
+ public Map doSomething() {
+ Map map = new HashMap();
+ map.put("publicObject", publicObject);
+ map.put("publicInt", new Integer(publicInt));
+ map.put("packageObject", packageObject);
+ map.put("packageInt", new Integer(packageInt));
+ map.put("protectedObject", protectedObject);
+ map.put("protectedInt", new Integer(protectedInt));
+ map.put("privateObject", privateObject);
+ map.put("privateInt", new Integer(privateInt));
+ map.put("nonObject", nonObject);
+ map.put("nonInt", new Integer(nonInt));
+ return map;
+ }
+ };
+
+ props.put("anonymous", anonymous.doSomething());
+
+
+ return props;
+ }
+
+ private class PrivateNested implements Job {
+ public Map doSomething() {
+ Map map = new HashMap();
+ map.put("publicObject", publicObject);
+ map.put("publicInt", new Integer(publicInt));
+ map.put("packageObject", packageObject);
+ map.put("packageInt", new Integer(packageInt));
+ map.put("protectedObject", protectedObject);
+ map.put("protectedInt", new Integer(protectedInt));
+ map.put("privateObject", privateObject);
+ map.put("privateInt", new Integer(privateInt));
+ map.put("nonObject", nonObject);
+ map.put("nonInt", new Integer(nonInt));
+ return map;
+ }
+ }
+
+ public class PublicNested implements Job {
+ public Map doSomething() {
+ Map map = new HashMap();
+ map.put("publicObject", publicObject);
+ map.put("publicInt", new Integer(publicInt));
+ map.put("packageObject", packageObject);
+ map.put("packageInt", new Integer(packageInt));
+ map.put("protectedObject", protectedObject);
+ map.put("protectedInt", new Integer(protectedInt));
+ map.put("privateObject", privateObject);
+ map.put("privateInt", new Integer(privateInt));
+ map.put("nonObject", nonObject);
+ map.put("nonInt", new Integer(nonInt));
+ return map;
+ }
+ }
+
+ class PackageNested implements Job {
+ public Map doSomething() {
+ Map map = new HashMap();
+ map.put("publicObject", publicObject);
+ map.put("publicInt", new Integer(publicInt));
+ map.put("packageObject", packageObject);
+ map.put("packageInt", new Integer(packageInt));
+ map.put("protectedObject", protectedObject);
+ map.put("protectedInt", new Integer(protectedInt));
+ map.put("privateObject", privateObject);
+ map.put("privateInt", new Integer(privateInt));
+ map.put("nonObject", nonObject);
+ map.put("nonInt", new Integer(nonInt));
+ return map;
+ }
+ }
+
+ protected class ProtectedNested implements Job {
+ public Map doSomething() {
+ Map map = new HashMap();
+ map.put("publicObject", publicObject);
+ map.put("publicInt", new Integer(publicInt));
+ map.put("packageObject", packageObject);
+ map.put("packageInt", new Integer(packageInt));
+ map.put("protectedObject", protectedObject);
+ map.put("protectedInt", new Integer(protectedInt));
+ map.put("privateObject", privateObject);
+ map.put("privateInt", new Integer(privateInt));
+ map.put("nonObject", nonObject);
+ map.put("nonInt", new Integer(nonInt));
+ return map;
+ }
+ }
+
+
+}
+
+interface Job {
+ public Map doSomething();
+}
diff --git a/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/ExceptionTest.java b/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/ExceptionTest.java
index af2d7ed..085f357 100644
--- a/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/ExceptionTest.java
+++ b/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/ExceptionTest.java
@@ -45,14 +45,14 @@
String compName = "FooProvider-1";
Properties p = new Properties();
- p.put("name", compName);
+ p.put("instance.name",compName);
ci_lazzy = Utils.getComponentInstance(context, factName, p);
String factName2 = "Manipulation-ImmediateFooProviderType";
String compName2 = "FooProvider-2";
Properties p2 = new Properties();
- p2.put("name", compName2);
+ p2.put("instance.name",compName2);
ci_immediate = Utils.getComponentInstance(context, factName2, p2);
lazzyRef = Utils.getServiceReference(context, Architecture.class.getName(), "(architecture.instance="+compName+")");
diff --git a/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/GetComponentInstanceTest.java b/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/GetComponentInstanceTest.java
index 6567fad..2554cb0 100644
--- a/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/GetComponentInstanceTest.java
+++ b/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/GetComponentInstanceTest.java
@@ -49,11 +49,13 @@
assertNotNull("Cannot find the factory FooProvider-1", fact);
Properties props = new Properties();
- props.put("name", compName);
+ props.put("instance.name",compName);
ComponentInstance ci = null;
try {
ci = fact.createComponentInstance(props);
- } catch (Exception e1) { fail(e1.getMessage()); }
+ } catch (Exception e1) { fail(e1.getMessage()); }
+
+ assertEquals("Check instance name", compName, ci.getInstanceName());
// Get a FooService provider
try {
diff --git a/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/ManipulationTestSuite.java b/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/ManipulationTestSuite.java
index ef634e0..5258e1b 100644
--- a/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/ManipulationTestSuite.java
+++ b/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/ManipulationTestSuite.java
@@ -34,6 +34,7 @@
ots.addTestSuite(ManipulationMetadataAPI.class);
ots.addTestSuite(ExceptionTest.class);
ots.addTestSuite(POJOCreation.class);
+ ots.addTestSuite(NestedClassesTests.class);
return ots;
}
diff --git a/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/NestedClassesTests.java b/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/NestedClassesTests.java
new file mode 100644
index 0000000..40d5fe1
--- /dev/null
+++ b/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/NestedClassesTests.java
@@ -0,0 +1,135 @@
+package org.apache.felix.ipojo.test.scenarios.manipulation;
+
+import java.util.Map;
+import java.util.Properties;
+
+import org.apache.felix.ipojo.ComponentInstance;
+import org.apache.felix.ipojo.Factory;
+import org.apache.felix.ipojo.junit4osgi.OSGiTestCase;
+import org.apache.felix.ipojo.test.scenarios.manipulation.service.CheckService;
+import org.apache.felix.ipojo.test.scenarios.util.Utils;
+import org.osgi.framework.ServiceReference;
+
+public class NestedClassesTests extends OSGiTestCase {
+
+ private ComponentInstance instance;
+ private CheckService service;
+
+ public void setUp() {
+ Factory factory = Utils.getFactoryByName(context, "inners");
+ Properties map = new Properties();
+ map.put("publicObject", "publicObject");
+ map.put("publicInt", new Integer(0));
+ map.put("packageObject", "packageObject");
+ map.put("packageInt", new Integer(1));
+ map.put("protectedObject", "protectedObject");
+ map.put("protectedInt", new Integer(2));
+ map.put("privateObject", "privateObject");
+ map.put("privateInt", new Integer(3));
+ map.put("nonObject", "nonObject");
+ map.put("nonInt", new Integer(4));
+ try {
+ instance = factory.createComponentInstance(map);
+ } catch (Exception e) {
+ fail(e.getMessage());
+ }
+
+ ServiceReference ref =Utils.getServiceReferenceByName(context, CheckService.class.getName(), instance.getInstanceName());
+ assertNotNull("Check service availability", ref);
+ service = (CheckService) context.getService(ref);
+ }
+
+ public void tearDown() {
+ instance.dispose();
+ instance = null;
+ service = null;
+ }
+
+ public void testPrivateInnerClass() {
+ Map data = (Map) service.getProps().get("privateInner");
+ assertNotNull("Check data existency", data);
+
+ assertEquals("Check public object", "publicObject", data.get("publicObject"));
+ assertEquals("Check public int", new Integer(0), data.get("publicInt"));
+ assertEquals("Check protected object", "protectedObject", data.get("protectedObject"));
+ assertEquals("Check protected int", new Integer(2), data.get("protectedInt"));
+ assertEquals("Check package object", "packageObject", data.get("packageObject"));
+ assertEquals("Check package int", new Integer(1), data.get("packageInt"));
+ assertEquals("Check private object", "privateObject", data.get("privateObject"));
+ assertEquals("Check private int", new Integer(3), data.get("privateInt"));
+ assertEquals("Check non-managed object", "not-managed", data.get("nonObject"));
+ assertEquals("Check non-managed int", new Integer(5), data.get("nonInt"));
+
+ }
+
+ public void testProtectedInnerClass() {
+ Map data = (Map) service.getProps().get("protectedInner");
+ assertNotNull("Check data existency", data);
+
+ assertEquals("Check public object", "publicObject", data.get("publicObject"));
+ assertEquals("Check public int", new Integer(0), data.get("publicInt"));
+ assertEquals("Check protected object", "protectedObject", data.get("protectedObject"));
+ assertEquals("Check protected int", new Integer(2), data.get("protectedInt"));
+ assertEquals("Check package object", "packageObject", data.get("packageObject"));
+ assertEquals("Check package int", new Integer(1), data.get("packageInt"));
+ assertEquals("Check private object", "privateObject", data.get("privateObject"));
+ assertEquals("Check private int", new Integer(3), data.get("privateInt"));
+ assertEquals("Check non-managed object", "not-managed", data.get("nonObject"));
+ assertEquals("Check non-managed int", new Integer(5), data.get("nonInt"));
+
+ }
+
+ public void testPackageInnerClass() {
+ Map data = (Map) service.getProps().get("packageInner");
+ assertNotNull("Check data existency", data);
+
+ assertEquals("Check public object", "publicObject", data.get("publicObject"));
+ assertEquals("Check public int", new Integer(0), data.get("publicInt"));
+ assertEquals("Check protected object", "protectedObject", data.get("protectedObject"));
+ assertEquals("Check protected int", new Integer(2), data.get("protectedInt"));
+ assertEquals("Check package object", "packageObject", data.get("packageObject"));
+ assertEquals("Check package int", new Integer(1), data.get("packageInt"));
+ assertEquals("Check private object", "privateObject", data.get("privateObject"));
+ assertEquals("Check private int", new Integer(3), data.get("privateInt"));
+ assertEquals("Check non-managed object", "not-managed", data.get("nonObject"));
+ assertEquals("Check non-managed int", new Integer(5), data.get("nonInt"));
+
+ }
+
+ public void testPublicInnerClass() {
+ Map data = (Map) service.getProps().get("publicInner");
+ assertNotNull("Check data existency", data);
+
+ assertEquals("Check public object", "publicObject", data.get("publicObject"));
+ assertEquals("Check public int", new Integer(0), data.get("publicInt"));
+ assertEquals("Check protected object", "protectedObject", data.get("protectedObject"));
+ assertEquals("Check protected int", new Integer(2), data.get("protectedInt"));
+ assertEquals("Check package object", "packageObject", data.get("packageObject"));
+ assertEquals("Check package int", new Integer(1), data.get("packageInt"));
+ assertEquals("Check private object", "privateObject", data.get("privateObject"));
+ assertEquals("Check private int", new Integer(3), data.get("privateInt"));
+ assertEquals("Check non-managed object", "not-managed", data.get("nonObject"));
+ assertEquals("Check non-managed int", new Integer(5), data.get("nonInt"));
+
+ }
+
+ public void testAnonymousInnerClass() {
+ Map data = (Map) service.getProps().get("anonymous");
+ assertNotNull("Check data existency", data);
+
+ assertEquals("Check public object", "publicObject", data.get("publicObject"));
+ assertEquals("Check public int", new Integer(0), data.get("publicInt"));
+ assertEquals("Check protected object", "protectedObject", data.get("protectedObject"));
+ assertEquals("Check protected int", new Integer(2), data.get("protectedInt"));
+ assertEquals("Check package object", "packageObject", data.get("packageObject"));
+ assertEquals("Check package int", new Integer(1), data.get("packageInt"));
+ assertEquals("Check private object", "privateObject", data.get("privateObject"));
+ assertEquals("Check private int", new Integer(3), data.get("privateInt"));
+ assertEquals("Check non-managed object", "not-managed", data.get("nonObject"));
+ assertEquals("Check non-managed int", new Integer(5), data.get("nonInt"));
+
+ }
+
+
+
+}
diff --git a/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/POJOCreation.java b/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/POJOCreation.java
index fef6dc7..6765dc5 100644
--- a/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/POJOCreation.java
+++ b/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/POJOCreation.java
@@ -63,43 +63,43 @@
String factName = "Manipulation-FooProviderType-1";
String compName = "FooProvider-1";
Properties p = new Properties();
- p.put("name", compName);
+ p.put("instance.name",compName);
ci_lazzy = Utils.getComponentInstance(context, factName ,p);
String factName2 = "Manipulation-ImmediateFooProviderType";
String compName2 = "FooProvider-2";
Properties p2 = new Properties();
- p2.put("name", compName2);
+ p2.put("instance.name",compName2);
ci_immediate = Utils.getComponentInstance(context, factName2, p2);
String factName3 = "Manipulation-ImmediateFooProviderTypeSingleton";
String compName3 = "FooProvider-3";
Properties p3 = new Properties();
- p3.put("name", compName3);
+ p3.put("instance.name",compName3);
ci_immediate_singleton = Utils.getComponentInstance(context, factName3, p3);
String factName4 = "Manipulation-FooProviderType-1-Sing";
String compName4 = "FooProvider-1-Sing";
Properties p4 = new Properties();
- p4.put("name", compName4);
+ p4.put("instance.name",compName4);
ci_lazzy_sing = Utils.getComponentInstance(context, factName4 ,p4);
String factName5 = "Manipulation-FooProviderType-1-Sev";
String compName5 = "FooProvider-1-Sev";
Properties p5 = new Properties();
- p5.put("name", compName5);
+ p5.put("instance.name",compName5);
ci_lazzy_sev = Utils.getComponentInstance(context, factName5 ,p5);
String factName6 = "Manipulation-FooProviderType-1-SingM";
String compName6 = "FooProvider-1-SingM";
Properties p6 = new Properties();
- p6.put("name", compName6);
+ p6.put("instance.name",compName6);
ci_lazzy_singM = Utils.getComponentInstance(context, factName6 ,p6);
String factName7 = "Manipulation-FooProviderType-1-SevM";
String compName7 = "FooProvider-1-SevM";
Properties p7 = new Properties();
- p7.put("name", compName7);
+ p7.put("instance.name",compName7);
ci_lazzy_sevM = Utils.getComponentInstance(context, factName7 ,p7);
lazzyRef = Utils.getServiceReference(context, Architecture.class.getName(), "(architecture.instance="+compName+")");
diff --git a/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/PrimitiveTypeTest.java b/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/PrimitiveTypeTest.java
index b1c22ee..6736b4e 100644
--- a/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/PrimitiveTypeTest.java
+++ b/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/PrimitiveTypeTest.java
@@ -37,7 +37,7 @@
public void setUp() {
Properties p1 = new Properties();
- p1.put("name", "primitives");
+ p1.put("instance.name","primitives");
instance = Utils.getComponentInstance(context, "Manipulation-PrimitiveManipulationTester", p1);
assertTrue("check instance state", instance.getState() == ComponentInstance.VALID);
prim_ref = Utils.getServiceReferenceByName(context, PrimitiveManipulationTestService.class.getName(), instance.getInstanceName());
diff --git a/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/PrimitiveTypeTest2.java b/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/PrimitiveTypeTest2.java
index d69a1fc..3fc45d5 100644
--- a/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/PrimitiveTypeTest2.java
+++ b/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/PrimitiveTypeTest2.java
@@ -40,7 +40,7 @@
public void setUp() {
Properties p1 = new Properties();
- p1.put("name", "primitives");
+ p1.put("instance.name","primitives");
instance = Utils.getComponentInstance(context, "Manipulation-PrimitiveManipulationTesterA", p1);
assertTrue("check instance state", instance.getState() == ComponentInstance.VALID);
prim_ref = Utils.getServiceReferenceByName(context, PrimitiveManipulationTestService.class.getName(), instance.getInstanceName());
diff --git a/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java b/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
index 85ef670..bcec3d5 100644
--- a/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
+++ b/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
@@ -100,7 +100,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());
diff --git a/ipojo/tests/manipulator/manipulation/src/main/resources/metadata.xml b/ipojo/tests/manipulator/manipulation/src/main/resources/metadata.xml
index 6482f7d..dee460f 100644
--- a/ipojo/tests/manipulator/manipulation/src/main/resources/metadata.xml
+++ b/ipojo/tests/manipulator/manipulation/src/main/resources/metadata.xml
@@ -94,4 +94,21 @@
<!-- Try calling super constructors -->
<component className="org.apache.felix.ipojo.test.scenarios.component.CallSuperConstructor" immediate="true"/>
+
+ <!-- Nested & Inner classes -->
+ <component name="inners" classname="org.apache.felix.ipojo.test.scenarios.component.InnerClasses">
+ <provides>
+ <property field="privateObject"/>
+ <property field="privateInt"/>
+
+ <property field="protectedObject"/>
+ <property field="protectedInt"/>
+
+ <property field="packageObject"/>
+ <property field="packageInt"/>
+
+ <property field="publicObject"/>
+ <property field="publicInt"/>
+ </provides>
+ </component>
</ipojo>