Modified: felix/trunk/ipojo/tests/tests.core.service.dependency.bindingpolicy/src/main/resources/metadata.xml URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/tests.core.service.dependency.bindingpolicy/src/main/resources/metadata.xml?rev=677545&r1=677544&r2=677545&view=diff ============================================================================== --- felix/trunk/ipojo/tests/tests.core.service.dependency.bindingpolicy/src/main/resources/metadata.xml (original) +++ felix/trunk/ipojo/tests/tests.core.service.dependency.bindingpolicy/src/main/resources/metadata.xml Thu Jul 17 02:17:59 2008 @@ -3,13 +3,13 @@ <!-- Static Dependencies --> <component className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.CheckServiceProvider" - factory="StaticSimpleCheckServiceProvider" architecture="true"> + name="StaticSimpleCheckServiceProvider" architecture="true"> <requires field="fs" policy="static" /> <provides /> </component> <component className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.CheckServiceProvider" - factory="StaticVoidCheckServiceProvider" architecture="true"> + name="StaticVoidCheckServiceProvider" architecture="true"> <requires field="fs" policy="static"> <callback type="bind" method="voidBind" /> <callback type="unbind" method="voidUnbind" /> @@ -18,7 +18,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.CheckServiceProvider" - factory="StaticObjectCheckServiceProvider" architecture="true"> + name="StaticObjectCheckServiceProvider" architecture="true"> <requires field="fs" policy="static"> <callback type="bind" method="objectBind" /> <callback type="unbind" method="objectUnbind" /> @@ -27,7 +27,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.CheckServiceProvider" - factory="StaticRefCheckServiceProvider" architecture="true"> + name="StaticRefCheckServiceProvider" architecture="true"> <requires field="fs" policy="static"> <callback type="bind" method="refBind" /> <callback type="unbind" method="refUnbind" /> @@ -36,7 +36,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.CheckServiceProvider" - factory="StaticBothCheckServiceProvider" architecture="true"> + name="StaticBothCheckServiceProvider" architecture="true"> <requires field="fs" policy="static"> <callback type="bind" method="bothBind" /> <callback type="unbind" method="bothUnbind" /> @@ -45,7 +45,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.MethodCheckServiceProvider" - factory="StaticMObjectCheckServiceProvider" architecture="true"> + name="StaticMObjectCheckServiceProvider" architecture="true"> <requires policy="static"> <callback type="bind" method="objectBind" /> <callback type="unbind" method="objectUnbind" /> @@ -54,7 +54,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.MethodCheckServiceProvider" - factory="StaticMRefCheckServiceProvider" architecture="true"> + name="StaticMRefCheckServiceProvider" architecture="true"> <requires interface="org.apache.felix.ipojo.test.scenarios.service.dependency.service.FooService" policy="static"> @@ -65,7 +65,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.MethodCheckServiceProvider" - factory="StaticMBothCheckServiceProvider" architecture="true"> + name="StaticMBothCheckServiceProvider" architecture="true"> <requires policy="static"> <callback type="bind" method="bothBind" /> <callback type="unbind" method="bothUnbind" /> @@ -76,14 +76,14 @@ <!-- Static Simple & Optional Dependencies --> <component className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.CheckServiceProvider" - factory="StaticSimpleOptionalCheckServiceProvider" + name="StaticSimpleOptionalCheckServiceProvider" architecture="true"> <requires field="fs" optional="true" policy="static" /> <provides /> </component> <component className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.CheckServiceProvider" - factory="StaticVoidOptionalCheckServiceProvider" + name="StaticVoidOptionalCheckServiceProvider" architecture="true"> <requires field="fs" optional="true" policy="static"> <callback type="bind" method="voidBind" /> @@ -93,7 +93,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.CheckServiceProvider" - factory="StaticObjectOptionalCheckServiceProvider" + name="StaticObjectOptionalCheckServiceProvider" architecture="true"> <requires field="fs" optional="true" policy="static"> <callback type="bind" method="objectBind" /> @@ -103,7 +103,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.CheckServiceProvider" - factory="StaticRefOptionalCheckServiceProvider" architecture="true"> + name="StaticRefOptionalCheckServiceProvider" architecture="true"> <requires field="fs" optional="true" policy="static"> <callback type="bind" method="refBind" /> <callback type="unbind" method="refUnbind" /> @@ -112,7 +112,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.CheckServiceProvider" - factory="StaticBothOptionalCheckServiceProvider" + name="StaticBothOptionalCheckServiceProvider" architecture="true"> <requires field="fs" optional="true" policy="static"> <callback type="bind" method="bothBind" /> @@ -122,7 +122,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.MethodCheckServiceProvider" - factory="StaticMObjectOptionalCheckServiceProvider" + name="StaticMObjectOptionalCheckServiceProvider" architecture="true"> <requires optional="true" policy="static"> <callback type="bind" method="objectBind" /> @@ -132,7 +132,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.MethodCheckServiceProvider" - factory="StaticMRefOptionalCheckServiceProvider" + name="StaticMRefOptionalCheckServiceProvider" architecture="true"> <requires interface="org.apache.felix.ipojo.test.scenarios.service.dependency.service.FooService" @@ -144,7 +144,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.MethodCheckServiceProvider" - factory="StaticMBothOptionalCheckServiceProvider" + name="StaticMBothOptionalCheckServiceProvider" architecture="true"> <requires interface="org.apache.felix.ipojo.test.scenarios.service.dependency.service.FooService" @@ -157,14 +157,14 @@ <!-- Static Multiple Dependencies --> <component className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.MultipleCheckService" - factory="StaticSimpleMultipleCheckServiceProvider" + name="StaticSimpleMultipleCheckServiceProvider" architecture="true"> <requires field="fs" policy="static" /> <provides /> </component> <component className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.MultipleCheckService" - factory="StaticVoidMultipleCheckServiceProvider" + name="StaticVoidMultipleCheckServiceProvider" architecture="true"> <requires field="fs" policy="static"> <callback type="bind" method="voidBind" /> @@ -174,7 +174,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.MultipleCheckService" - factory="StaticObjectMultipleCheckServiceProvider" + name="StaticObjectMultipleCheckServiceProvider" architecture="true"> <requires field="fs" policy="static"> <callback type="bind" method="objectBind" /> @@ -184,7 +184,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.MultipleCheckService" - factory="StaticRefMultipleCheckServiceProvider" architecture="true"> + name="StaticRefMultipleCheckServiceProvider" architecture="true"> <requires field="fs" policy="static"> <callback type="bind" method="refBind" /> <callback type="unbind" method="refUnbind" /> @@ -193,7 +193,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.MultipleCheckService" - factory="StaticBothMultipleCheckServiceProvider" + name="StaticBothMultipleCheckServiceProvider" architecture="true"> <requires field="fs" policy="static"> <callback type="bind" method="bothBind" /> @@ -203,7 +203,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.MethodMultipleCheckService" - factory="StaticMObjectMultipleCheckServiceProvider" + name="StaticMObjectMultipleCheckServiceProvider" architecture="true"> <requires aggregate="true" policy="static"> <callback type="bind" method="objectBind" /> @@ -213,7 +213,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.MethodMultipleCheckService" - factory="StaticMRefMultipleCheckServiceProvider" + name="StaticMRefMultipleCheckServiceProvider" architecture="true"> <requires interface="org.apache.felix.ipojo.test.scenarios.service.dependency.service.FooService" @@ -225,7 +225,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.MethodMultipleCheckService" - factory="StaticMBothMultipleCheckServiceProvider" + name="StaticMBothMultipleCheckServiceProvider" architecture="true"> <requires aggregate="true" policy="static"> <callback type="bind" method="bothBind" /> @@ -237,20 +237,20 @@ <!-- Dynamic-Priority --> <component className="org.apache.felix.ipojo.test.scenarios.service.dependency.dynamic.priority.RankedFooProviderType1" - factory="RankedFooProviderType" architecture="true"> + name="RankedFooProviderType" architecture="true"> <provides> <property field="m_grade" name="service.ranking"/> </provides> </component> <component className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.DynCheckServiceProvider" - factory="DPSimpleCheckServiceProvider" architecture="true"> + name="DPSimpleCheckServiceProvider" architecture="true"> <requires field="fs" policy="dynamic-priority" /> <provides /> </component> <component className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.DynCheckServiceProvider" - factory="DPObjectCheckServiceProvider" architecture="true"> + name="DPObjectCheckServiceProvider" architecture="true"> <requires field="fs" policy="dynamic-priority"> <callback type="bind" method="objectBind" /> <callback type="unbind" method="objectUnbind" />
Modified: felix/trunk/ipojo/tests/tests.core.service.dependency.filter/src/main/resources/metadata.xml URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/tests.core.service.dependency.filter/src/main/resources/metadata.xml?rev=677545&r1=677544&r2=677545&view=diff ============================================================================== --- felix/trunk/ipojo/tests/tests.core.service.dependency.filter/src/main/resources/metadata.xml (original) +++ felix/trunk/ipojo/tests/tests.core.service.dependency.filter/src/main/resources/metadata.xml Thu Jul 17 02:17:59 2008 @@ -2,7 +2,7 @@ <!-- Simple Filter Dependencies --> <component className="org.apache.felix.ipojo.test.scenarios.service.dependency.filter.component.FilterCheckProvider" - factory="SimpleFilterCheckServiceProvider" architecture="true"> + name="SimpleFilterCheckServiceProvider" architecture="true"> <provides> <property field="m_toto" name="toto" value="A" /> </provides> @@ -10,7 +10,7 @@ <component className="org.apache.felix.ipojo.test.scenarios.service.dependency.filter.component.FilterCheckSubscriber" - factory="SimpleFilterCheckServiceSubscriber" architecture="true"> + name="SimpleFilterCheckServiceSubscriber" architecture="true"> <requires field="m_foo" filter="(toto=B)" id="id1"> <callback type="bind" method="Bind" /> <callback type="unbind" method="Unbind" /> @@ -20,7 +20,7 @@ <component className="org.apache.felix.ipojo.test.scenarios.service.dependency.filter.component.FilterCheckSubscriber" - factory="SimpleFilterCheckServiceSubscriber2" architecture="true"> + name="SimpleFilterCheckServiceSubscriber2" architecture="true"> <requires field="m_foo" id="id2"> <callback type="bind" method="Bind" /> <callback type="unbind" method="Unbind" /> @@ -31,7 +31,7 @@ <!-- Optional Simple Filter Dependencies --> <component className="org.apache.felix.ipojo.test.scenarios.service.dependency.filter.component.FilterCheckSubscriber" - factory="OptionalSimpleFilterCheckServiceSubscriber" + name="OptionalSimpleFilterCheckServiceSubscriber" architecture="true"> <requires field="m_foo" filter="(toto=B)" id="id1" optional="true"> @@ -43,7 +43,7 @@ <component className="org.apache.felix.ipojo.test.scenarios.service.dependency.filter.component.FilterCheckSubscriber" - factory="OptionalSimpleFilterCheckServiceSubscriber2" + name="OptionalSimpleFilterCheckServiceSubscriber2" architecture="true"> <requires field="m_foo" id="id2" optional="true"> <callback type="bind" method="Bind" /> @@ -55,7 +55,7 @@ <!-- Aggregate filter Dependencies--> <component className="org.apache.felix.ipojo.test.scenarios.service.dependency.filter.component.MultipleFilterCheckSubscriber" - factory="MultipleFilterCheckServiceSubscriber" architecture="true"> + name="MultipleFilterCheckServiceSubscriber" architecture="true"> <requires field="m_foo" filter="(toto=B)" id="id1"> <callback type="bind" method="Bind" /> <callback type="unbind" method="Unbind" /> @@ -65,7 +65,7 @@ <component className="org.apache.felix.ipojo.test.scenarios.service.dependency.filter.component.MultipleFilterCheckSubscriber" - factory="MultipleFilterCheckServiceSubscriber2" architecture="true"> + name="MultipleFilterCheckServiceSubscriber2" architecture="true"> <requires field="m_foo" id="id2"> <callback type="bind" method="Bind" /> <callback type="unbind" method="Unbind" /> @@ -76,7 +76,7 @@ <!-- Optional Aggregate Filter Dependencies --> <component className="org.apache.felix.ipojo.test.scenarios.service.dependency.filter.component.MultipleFilterCheckSubscriber" - factory="OptionalMultipleFilterCheckServiceSubscriber" + name="OptionalMultipleFilterCheckServiceSubscriber" architecture="true"> <requires field="m_foo" filter="(toto=B)" id="id1" optional="true"> @@ -88,7 +88,7 @@ <component className="org.apache.felix.ipojo.test.scenarios.service.dependency.filter.component.MultipleFilterCheckSubscriber" - factory="OptionalMultipleFilterCheckServiceSubscriber2" + name="OptionalMultipleFilterCheckServiceSubscriber2" architecture="true"> <requires field="m_foo" id="id2" optional="true"> <callback type="bind" method="Bind" /> Modified: felix/trunk/ipojo/tests/tests.core.service.dependency/src/main/resources/metadata.xml URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/tests.core.service.dependency/src/main/resources/metadata.xml?rev=677545&r1=677544&r2=677545&view=diff ============================================================================== --- felix/trunk/ipojo/tests/tests.core.service.dependency/src/main/resources/metadata.xml (original) +++ felix/trunk/ipojo/tests/tests.core.service.dependency/src/main/resources/metadata.xml Thu Jul 17 02:17:59 2008 @@ -1,20 +1,20 @@ <ipojo> <component className="org.apache.felix.ipojo.test.scenarios.component.FooProviderType1" - factory="FooProviderType-1" architecture="true"> + name="FooProviderType-1" architecture="true"> <provides /> </component> <!-- Simple Dependencies --> <component className="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider" - factory="SimpleCheckServiceProvider" architecture="true"> + name="SimpleCheckServiceProvider" architecture="true"> <requires field="fs" /> <provides /> </component> <component className="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider" - factory="VoidCheckServiceProvider" architecture="true"> + name="VoidCheckServiceProvider" architecture="true"> <requires field="fs"> <callback type="bind" method="voidBind" /> <callback type="unbind" method="voidUnbind" /> @@ -23,7 +23,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider" - factory="ObjectCheckServiceProvider" architecture="true"> + name="ObjectCheckServiceProvider" architecture="true"> <requires field="fs"> <callback type="bind" method="objectBind" /> <callback type="unbind" method="objectUnbind" /> @@ -32,7 +32,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider" - factory="RefCheckServiceProvider" architecture="true"> + name="RefCheckServiceProvider" architecture="true"> <requires field="fs"> <callback type="bind" method="refBind" /> <callback type="unbind" method="refUnbind" /> @@ -41,7 +41,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider" - factory="BothCheckServiceProvider" architecture="true"> + name="BothCheckServiceProvider" architecture="true"> <requires field="fs"> <callback type="bind" method="bothBind" /> <callback type="unbind" method="bothUnbind" /> @@ -50,7 +50,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider" - factory="DoubleCheckServiceProvider" architecture="true"> + name="DoubleCheckServiceProvider" architecture="true"> <requires> <callback type="bind" method="objectBind" /> <callback type="unbind" method="objectUnbind" /> @@ -61,7 +61,7 @@ <component className="org.apache.felix.ipojo.test.scenarios.component.MethodCheckServiceProvider" - factory="MObjectCheckServiceProvider" architecture="true"> + name="MObjectCheckServiceProvider" architecture="true"> <requires> <callback type="bind" method="objectBind" /> <callback type="unbind" method="objectUnbind" /> @@ -70,7 +70,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.component.MethodCheckServiceProvider" - factory="MRefCheckServiceProvider" architecture="true"> + name="MRefCheckServiceProvider" architecture="true"> <requires interface="org.apache.felix.ipojo.test.scenarios.service.dependency.service.FooService"> <callback type="bind" method="refBind" /> @@ -80,7 +80,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.component.MethodCheckServiceProvider" - factory="MBothCheckServiceProvider" architecture="true"> + name="MBothCheckServiceProvider" architecture="true"> <requires> <callback type="bind" method="bothBind" /> <callback type="unbind" method="bothUnbind" /> @@ -91,19 +91,19 @@ <!-- Simple & Optional Dependencies --> <component className="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider" - factory="SimpleOptionalCheckServiceProvider" architecture="true"> + name="SimpleOptionalCheckServiceProvider" architecture="true"> <requires field="fs" optional="true" /> <provides /> </component> <component className="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider" - factory="SimpleOptionalNoNullableCheckServiceProvider" architecture="true"> + name="SimpleOptionalNoNullableCheckServiceProvider" architecture="true"> <requires field="fs" optional="true" nullable="false" /> <provides /> </component> <component className="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider" - factory="VoidOptionalCheckServiceProvider" architecture="true"> + name="VoidOptionalCheckServiceProvider" architecture="true"> <requires field="fs" optional="true"> <callback type="bind" method="voidBind" /> <callback type="unbind" method="voidUnbind" /> @@ -112,7 +112,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider" - factory="VoidOptionalNoNullableCheckServiceProvider" architecture="true"> + name="VoidOptionalNoNullableCheckServiceProvider" architecture="true"> <requires field="fs" optional="true" nullable="false"> <callback type="bind" method="voidBind" /> <callback type="unbind" method="voidUnbind" /> @@ -121,7 +121,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider" - factory="ObjectOptionalCheckServiceProvider" architecture="true"> + name="ObjectOptionalCheckServiceProvider" architecture="true"> <requires field="fs" optional="true"> <callback type="bind" method="objectBind" /> <callback type="unbind" method="objectUnbind" /> @@ -130,7 +130,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider" - factory="ObjectOptionalNoNullableCheckServiceProvider" architecture="true"> + name="ObjectOptionalNoNullableCheckServiceProvider" architecture="true"> <requires field="fs" optional="true" nullable="false"> <callback type="bind" method="objectBind" /> <callback type="unbind" method="objectUnbind" /> @@ -139,7 +139,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider" - factory="RefOptionalCheckServiceProvider" architecture="true"> + name="RefOptionalCheckServiceProvider" architecture="true"> <requires field="fs" optional="true"> <callback type="bind" method="refBind" /> <callback type="unbind" method="refUnbind" /> @@ -148,7 +148,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider" - factory="RefOptionalNoNullableCheckServiceProvider" architecture="true"> + name="RefOptionalNoNullableCheckServiceProvider" architecture="true"> <requires field="fs" optional="true" nullable="false"> <callback type="bind" method="refBind" /> <callback type="unbind" method="refUnbind" /> @@ -157,7 +157,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider" - factory="BothOptionalCheckServiceProvider" architecture="true"> + name="BothOptionalCheckServiceProvider" architecture="true"> <requires field="fs" optional="true"> <callback type="bind" method="bothBind" /> <callback type="unbind" method="bothUnbind" /> @@ -166,7 +166,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider" - factory="BothOptionalNoNullableCheckServiceProvider" architecture="true"> + name="BothOptionalNoNullableCheckServiceProvider" architecture="true"> <requires field="fs" optional="true" nullable="false"> <callback type="bind" method="bothBind" /> <callback type="unbind" method="bothUnbind" /> @@ -176,7 +176,7 @@ <component className="org.apache.felix.ipojo.test.scenarios.component.MethodCheckServiceProvider" - factory="MObjectOptionalCheckServiceProvider" architecture="true"> + name="MObjectOptionalCheckServiceProvider" architecture="true"> <requires optional="true"> <callback type="bind" method="objectBind" /> <callback type="unbind" method="objectUnbind" /> @@ -185,7 +185,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.component.MethodCheckServiceProvider" - factory="MRefOptionalCheckServiceProvider" architecture="true"> + name="MRefOptionalCheckServiceProvider" architecture="true"> <requires interface="org.apache.felix.ipojo.test.scenarios.service.dependency.service.FooService" optional="true"> @@ -196,7 +196,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.component.MethodCheckServiceProvider" - factory="MBothOptionalCheckServiceProvider" architecture="true"> + name="MBothOptionalCheckServiceProvider" architecture="true"> <requires interface="org.apache.felix.ipojo.test.scenarios.service.dependency.service.FooService" optional="true"> @@ -209,14 +209,14 @@ <!-- Simple & Optional Dependencies with default-implementation --> <component className="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider" - factory="DISimpleOptionalCheckServiceProvider" architecture="true"> + name="DISimpleOptionalCheckServiceProvider" architecture="true"> <requires field="fs" optional="true" default-implementation="org.apache.felix.ipojo.test.scenarios.component.FooServiceDefaultImpl" /> <provides /> </component> <component className="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider" - factory="DIVoidOptionalCheckServiceProvider" architecture="true"> + name="DIVoidOptionalCheckServiceProvider" architecture="true"> <requires field="fs" optional="true" default-implementation="org.apache.felix.ipojo.test.scenarios.component.FooServiceDefaultImpl"> <callback type="bind" method="voidBind" /> @@ -226,7 +226,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider" - factory="DIObjectOptionalCheckServiceProvider" architecture="true"> + name="DIObjectOptionalCheckServiceProvider" architecture="true"> <requires field="fs" optional="true" default-implementation="org.apache.felix.ipojo.test.scenarios.component.FooServiceDefaultImpl"> <callback type="bind" method="objectBind" /> @@ -236,7 +236,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider" - factory="DIRefOptionalCheckServiceProvider" architecture="true"> + name="DIRefOptionalCheckServiceProvider" architecture="true"> <requires field="fs" optional="true" default-implementation="org.apache.felix.ipojo.test.scenarios.component.FooServiceDefaultImpl"> <callback type="bind" method="refBind" /> @@ -246,7 +246,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider" - factory="DIBothOptionalCheckServiceProvider" architecture="true"> + name="DIBothOptionalCheckServiceProvider" architecture="true"> <requires field="fs" optional="true" default-implementation="org.apache.felix.ipojo.test.scenarios.component.FooServiceDefaultImpl"> <callback type="bind" method="bothBind" /> @@ -257,7 +257,7 @@ <component className="org.apache.felix.ipojo.test.scenarios.component.MethodCheckServiceProvider" - factory="DIMObjectOptionalCheckServiceProvider" architecture="true"> + name="DIMObjectOptionalCheckServiceProvider" architecture="true"> <requires optional="true" default-implementation="org.apache.felix.ipojo.test.scenarios.component.FooServiceDefaultImpl"> <callback type="bind" method="objectBind" /> @@ -267,7 +267,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.component.MethodCheckServiceProvider" - factory="DIMRefOptionalCheckServiceProvider" architecture="true"> + name="DIMRefOptionalCheckServiceProvider" architecture="true"> <requires interface="org.apache.felix.ipojo.test.scenarios.service.dependency.service.FooService" optional="true" @@ -279,7 +279,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.component.MethodCheckServiceProvider" - factory="DIMBothOptionalCheckServiceProvider" architecture="true"> + name="DIMBothOptionalCheckServiceProvider" architecture="true"> <requires interface="org.apache.felix.ipojo.test.scenarios.service.dependency.service.FooService" optional="true" @@ -293,13 +293,13 @@ <!-- Multiple Dependencies --> <component className="org.apache.felix.ipojo.test.scenarios.component.MultipleCheckService" - factory="SimpleMultipleCheckServiceProvider" architecture="true"> + name="SimpleMultipleCheckServiceProvider" architecture="true"> <requires field="fs" /> <provides /> </component> <component className="org.apache.felix.ipojo.test.scenarios.component.MultipleCheckService" - factory="VoidMultipleCheckServiceProvider" architecture="true"> + name="VoidMultipleCheckServiceProvider" architecture="true"> <requires field="fs"> <callback type="bind" method="voidBind" /> <callback type="unbind" method="voidUnbind" /> @@ -308,7 +308,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.component.MultipleCheckService" - factory="ObjectMultipleCheckServiceProvider" architecture="true"> + name="ObjectMultipleCheckServiceProvider" architecture="true"> <requires field="fs"> <callback type="bind" method="objectBind" /> <callback type="unbind" method="objectUnbind" /> @@ -317,7 +317,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.component.MultipleCheckService" - factory="RefMultipleCheckServiceProvider" architecture="true"> + name="RefMultipleCheckServiceProvider" architecture="true"> <requires field="fs"> <callback type="bind" method="refBind" /> <callback type="unbind" method="refUnbind" /> @@ -326,7 +326,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.component.MultipleCheckService" - factory="BothMultipleCheckServiceProvider" architecture="true"> + name="BothMultipleCheckServiceProvider" architecture="true"> <requires field="fs"> <callback type="bind" method="bothBind" /> <callback type="unbind" method="bothUnbind" /> @@ -335,7 +335,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.component.MethodMultipleCheckService" - factory="MObjectMultipleCheckServiceProvider" architecture="true"> + name="MObjectMultipleCheckServiceProvider" architecture="true"> <requires aggregate="true"> <callback type="bind" method="objectBind" /> <callback type="unbind" method="objectUnbind" /> @@ -344,7 +344,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.component.MethodMultipleCheckService" - factory="MRefMultipleCheckServiceProvider" architecture="true"> + name="MRefMultipleCheckServiceProvider" architecture="true"> <requires interface="org.apache.felix.ipojo.test.scenarios.service.dependency.service.FooService" aggregate="true"> @@ -355,7 +355,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.component.MethodMultipleCheckService" - factory="MBothMultipleCheckServiceProvider" architecture="true"> + name="MBothMultipleCheckServiceProvider" architecture="true"> <requires aggregate="true"> <callback type="bind" method="bothBind" /> <callback type="unbind" method="bothUnbind" /> @@ -366,14 +366,14 @@ <!-- Multiple & Optional Dependencies --> <component className="org.apache.felix.ipojo.test.scenarios.component.MultipleCheckService" - factory="SimpleOptionalMultipleCheckServiceProvider" + name="SimpleOptionalMultipleCheckServiceProvider" architecture="true"> <requires field="fs" optional="true" /> <provides /> </component> <component className="org.apache.felix.ipojo.test.scenarios.component.MultipleCheckService" - factory="VoidOptionalMultipleCheckServiceProvider" + name="VoidOptionalMultipleCheckServiceProvider" architecture="true"> <requires field="fs" optional="true"> <callback type="bind" method="voidBind" /> @@ -383,7 +383,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.component.MultipleCheckService" - factory="ObjectOptionalMultipleCheckServiceProvider" + name="ObjectOptionalMultipleCheckServiceProvider" architecture="true"> <requires field="fs" optional="true"> <callback type="bind" method="objectBind" /> @@ -393,7 +393,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.component.MultipleCheckService" - factory="RefOptionalMultipleCheckServiceProvider" + name="RefOptionalMultipleCheckServiceProvider" architecture="true"> <requires field="fs" optional="true"> <callback type="bind" method="refBind" /> @@ -403,7 +403,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.component.MethodMultipleCheckService" - factory="MObjectOptionalMultipleCheckServiceProvider" + name="MObjectOptionalMultipleCheckServiceProvider" architecture="true"> <requires aggregate="true" optional="true"> <callback type="bind" method="objectBind" /> @@ -413,7 +413,7 @@ </component> <component className="org.apache.felix.ipojo.test.scenarios.component.MethodMultipleCheckService" - factory="MRefOptionalMultipleCheckServiceProvider" + name="MRefOptionalMultipleCheckServiceProvider" architecture="true"> <requires interface="org.apache.felix.ipojo.test.scenarios.service.dependency.service.FooService" Modified: felix/trunk/ipojo/tests/tests.core.service.providing/src/main/resources/metadata.xml URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/tests.core.service.providing/src/main/resources/metadata.xml?rev=677545&r1=677544&r2=677545&view=diff ============================================================================== --- felix/trunk/ipojo/tests/tests.core.service.providing/src/main/resources/metadata.xml (original) +++ felix/trunk/ipojo/tests/tests.core.service.providing/src/main/resources/metadata.xml Thu Jul 17 02:17:59 2008 @@ -2,20 +2,20 @@ <!-- Simple provider --> <component className="org.apache.felix.ipojo.test.scenarios.component.FooProviderType1" - factory="PS-FooProviderType-1" architecture="true"> + name="PS-FooProviderType-1" architecture="true"> <provides /> </component> <component className="org.apache.felix.ipojo.test.scenarios.component.FooProviderType1" - factory="PS-FooProviderType-itf" architecture="true"> + name="PS-FooProviderType-itf" architecture="true"> <provides interface="org.apache.felix.ipojo.test.scenarios.ps.service.FooService" /> </component> <component className="org.apache.felix.ipojo.test.scenarios.component.FooProviderType1" - factory="PS-FooProviderType-3" architecture="true"> + name="PS-FooProviderType-3" architecture="true"> <provides> <property name="foo" field="m_foo" /> <property name="bar" field="m_bar" /> @@ -30,18 +30,18 @@ <!-- Providers providing 2 services --> <component className="org.apache.felix.ipojo.test.scenarios.component.FooBarProviderType1" - factory="PS-FooBarProviderType-1" architecture="true"> + name="PS-FooBarProviderType-1" architecture="true"> <provides /> </component> <component className="org.apache.felix.ipojo.test.scenarios.component.FooBarProviderType1" - factory="PS-FooBarProviderType-2" architecture="true"> + name="PS-FooBarProviderType-2" architecture="true"> <provides interface="{org.apache.felix.ipojo.test.scenarios.ps.service.FooService, org.apache.felix.ipojo.test.scenarios.ps.service.BarService }" /> </component> <component className="org.apache.felix.ipojo.test.scenarios.component.FooBarProviderType1" - factory="PS-FooBarProviderType-3" architecture="true"> + name="PS-FooBarProviderType-3" architecture="true"> <provides interface="{org.apache.felix.ipojo.test.scenarios.ps.service.FooService}"> <property name="baz" type="java.lang.String" value="foo" /> @@ -82,7 +82,7 @@ <component className="org.apache.felix.ipojo.test.scenarios.component.FooProviderTypeDyn2" - name="PS-FooProviderType-Dyn2" factory="true" architecture="true"> + name="PS-FooProviderType-Dyn2" architecture="true"> <provides> <property name="int" field="intProp" value="4" /> <property name="boolean" field="boolProp" /> Modified: felix/trunk/ipojo/tests/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/component/MultipleCheckServiceProvider.java URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/component/MultipleCheckServiceProvider.java?rev=677545&r1=677544&r2=677545&view=diff ============================================================================== --- felix/trunk/ipojo/tests/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/component/MultipleCheckServiceProvider.java (original) +++ felix/trunk/ipojo/tests/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/component/MultipleCheckServiceProvider.java Thu Jul 17 02:17:59 2008 @@ -32,9 +32,11 @@ public boolean check() { boolean result = true; - - for (int i = 0; fs != null && i < fs.length; i++) { - result = result && fs[i].foo(); + //Use a local variable to avoid to wait at each access. + FooService[] array = fs; + for (int i = 0; array != null && i < array.length; i++) { + result = result && array[i].foo(); + System.out.println("Result : " + result); } return result; } Modified: felix/trunk/ipojo/tests/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/temporal/DefaultImplementationTest.java URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/temporal/DefaultImplementationTest.java?rev=677545&r1=677544&r2=677545&view=diff ============================================================================== --- felix/trunk/ipojo/tests/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/temporal/DefaultImplementationTest.java (original) +++ felix/trunk/ipojo/tests/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/temporal/DefaultImplementationTest.java Thu Jul 17 02:17:59 2008 @@ -168,7 +168,7 @@ } catch(RuntimeException e) { fail("A nullable was expected ..."); } - assertTrue("Check nullable", res); + assertFalse("Check nullable", res); dp.stop(); provider.stop(); @@ -184,7 +184,7 @@ String prov2 = "provider2"; ComponentInstance provider2 = Utils.getComponentInstanceByName(context, "TEMPORAL-FooProvider", prov2); String un = "under-1"; - ComponentInstance under = Utils.getComponentInstanceByName(context, "TEMPORAL-NullableMultipleCheckServiceProvider", un); + ComponentInstance under = Utils.getComponentInstanceByName(context, "TEMPORAL-NullableMultipleCheckServiceProviderTimeout", un); ServiceReference ref_fs = Utils.getServiceReferenceByName(context, FooService.class.getName(), prov); assertNotNull("Check foo availability", ref_fs); Modified: felix/trunk/ipojo/tests/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/temporal/NullTest.java URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/temporal/NullTest.java?rev=677545&r1=677544&r2=677545&view=diff ============================================================================== --- felix/trunk/ipojo/tests/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/temporal/NullTest.java (original) +++ felix/trunk/ipojo/tests/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/temporal/NullTest.java Thu Jul 17 02:17:59 2008 @@ -184,7 +184,7 @@ String prov2 = "provider2"; ComponentInstance provider2 = Utils.getComponentInstanceByName(context, "TEMPORAL-FooProvider", prov2); String un = "under-1"; - ComponentInstance under = Utils.getComponentInstanceByName(context, "TEMPORAL-NullableMultipleCheckServiceProvider", un); + ComponentInstance under = Utils.getComponentInstanceByName(context, "TEMPORAL-NullableMultipleCheckServiceProviderTimeout", un); ServiceReference ref_fs = Utils.getServiceReferenceByName(context, FooService.class.getName(), prov); assertNotNull("Check foo availability", ref_fs); Modified: felix/trunk/ipojo/tests/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/temporal/NullableTest.java URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/temporal/NullableTest.java?rev=677545&r1=677544&r2=677545&view=diff ============================================================================== --- felix/trunk/ipojo/tests/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/temporal/NullableTest.java (original) +++ felix/trunk/ipojo/tests/tests.temporal.dependency/src/main/java/org/apache/felix/ipojo/test/scenarios/temporal/NullableTest.java Thu Jul 17 02:17:59 2008 @@ -168,7 +168,7 @@ } catch(RuntimeException e) { fail("A nullable was expected ..."); } - assertTrue("Check nullable", res); + assertFalse("Check nullable", res); dp.stop(); provider.stop(); @@ -184,7 +184,7 @@ String prov2 = "provider2"; ComponentInstance provider2 = Utils.getComponentInstanceByName(context, "TEMPORAL-FooProvider", prov2); String un = "under-1"; - ComponentInstance under = Utils.getComponentInstanceByName(context, "TEMPORAL-NullableMultipleCheckServiceProvider", un); + ComponentInstance under = Utils.getComponentInstanceByName(context, "TEMPORAL-NullableMultipleCheckServiceProviderTimeout", un); ServiceReference ref_fs = Utils.getServiceReferenceByName(context, FooService.class.getName(), prov); assertNotNull("Check foo availability", ref_fs); @@ -214,7 +214,7 @@ provider1.stop(); provider2.stop(); - + ref_cs = Utils.getServiceReferenceByName(context, CheckService.class.getName(), un); assertNotNull("Check cs availability - 3", ref_cs); cs = (CheckService) context.getService(ref_cs);
