You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cl...@apache.org on 2008/08/20 15:15:14 UTC

svn commit: r687318 [4/4] - in /felix/trunk/ipojo/tests: composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/infrastructure/ composite/composite-runtime/src/main/java/org/apache/felix/ipojo/test/composite/util/ composite/imp...

Modified: felix/trunk/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/PrimitiveTypeTest2.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/PrimitiveTypeTest2.java?rev=687318&r1=687317&r2=687318&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/PrimitiveTypeTest2.java (original)
+++ felix/trunk/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/manipulation/PrimitiveTypeTest2.java Wed Aug 20 06:15:11 2008
@@ -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());

Modified: felix/trunk/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java?rev=687318&r1=687317&r2=687318&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java (original)
+++ felix/trunk/ipojo/tests/manipulator/manipulation/src/main/java/org/apache/felix/ipojo/test/scenarios/util/Utils.java Wed Aug 20 06:15:11 2008
@@ -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());

Modified: felix/trunk/ipojo/tests/manipulator/manipulation/src/main/resources/metadata.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/manipulator/manipulation/src/main/resources/metadata.xml?rev=687318&r1=687317&r2=687318&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/manipulator/manipulation/src/main/resources/metadata.xml (original)
+++ felix/trunk/ipojo/tests/manipulator/manipulation/src/main/resources/metadata.xml Wed Aug 20 06:15:11 2008
@@ -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>