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/09/09 16:21:19 UTC
svn commit: r693468 [2/2] - in /felix/trunk/ipojo: arch/src/main/resources/
composite/src/main/resources/ core/src/main/resources/
examples/junit4osgi/junit4osgi/ handler/eventadmin/src/main/resources/
handler/extender/src/main/resources/ handler/jmx/s...
Modified: felix/trunk/ipojo/tests/core/service-dependency-filter/src/main/resources/metadata.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/service-dependency-filter/src/main/resources/metadata.xml?rev=693468&r1=693467&r2=693468&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/service-dependency-filter/src/main/resources/metadata.xml (original)
+++ felix/trunk/ipojo/tests/core/service-dependency-filter/src/main/resources/metadata.xml Tue Sep 9 07:21:15 2008
@@ -1,7 +1,11 @@
-<ipojo>
+<ipojo
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="org.apache.felix.ipojo http://people.apache.org/~clement/ipojo/schemas/core.xsd"
+ xmlns="org.apache.felix.ipojo">
+
<!-- Simple Filter Dependencies -->
<component
- className="org.apache.felix.ipojo.test.scenarios.service.dependency.filter.component.FilterCheckProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.service.dependency.filter.component.FilterCheckProvider"
name="SimpleFilterCheckServiceProvider" architecture="true">
<provides>
<property field="m_toto" name="toto" value="A" />
@@ -9,7 +13,7 @@
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.service.dependency.filter.component.FilterCheckSubscriber"
+ classname="org.apache.felix.ipojo.test.scenarios.service.dependency.filter.component.FilterCheckSubscriber"
name="SimpleFilterCheckServiceSubscriber" architecture="true">
<requires field="m_foo" filter="(toto=B)" id="id1">
<callback type="bind" method="Bind" />
@@ -19,7 +23,7 @@
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.service.dependency.filter.component.FilterCheckSubscriber"
+ classname="org.apache.felix.ipojo.test.scenarios.service.dependency.filter.component.FilterCheckSubscriber"
name="SimpleFromCheckServiceSubscriber" architecture="true">
<requires field="m_foo" from="A" id="id1">
<callback type="bind" method="Bind" />
@@ -29,7 +33,7 @@
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.service.dependency.filter.component.FilterCheckProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.service.dependency.filter.component.FilterCheckProvider"
name="SimplePIDCheckServiceProvider" architecture="true">
<provides>
<property type="String" name="service.pid" />
@@ -37,7 +41,7 @@
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.service.dependency.filter.component.FilterCheckSubscriber"
+ classname="org.apache.felix.ipojo.test.scenarios.service.dependency.filter.component.FilterCheckSubscriber"
name="SimpleFilterCheckServiceSubscriber2" architecture="true">
<requires field="m_foo" id="id2">
<callback type="bind" method="Bind" />
@@ -48,7 +52,7 @@
<!-- Optional Simple Filter Dependencies -->
<component
- className="org.apache.felix.ipojo.test.scenarios.service.dependency.filter.component.FilterCheckSubscriber"
+ classname="org.apache.felix.ipojo.test.scenarios.service.dependency.filter.component.FilterCheckSubscriber"
name="OptionalSimpleFilterCheckServiceSubscriber"
architecture="true">
<requires field="m_foo" filter="(toto=B)" id="id1"
@@ -60,7 +64,7 @@
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.service.dependency.filter.component.FilterCheckSubscriber"
+ classname="org.apache.felix.ipojo.test.scenarios.service.dependency.filter.component.FilterCheckSubscriber"
name="OptionalSimpleFilterCheckServiceSubscriber2"
architecture="true">
<requires field="m_foo" id="id2" optional="true">
@@ -72,7 +76,7 @@
<!-- Aggregate filter Dependencies-->
<component
- className="org.apache.felix.ipojo.test.scenarios.service.dependency.filter.component.MultipleFilterCheckSubscriber"
+ classname="org.apache.felix.ipojo.test.scenarios.service.dependency.filter.component.MultipleFilterCheckSubscriber"
name="MultipleFilterCheckServiceSubscriber" architecture="true">
<requires field="m_foo" filter="(toto=B)" id="id1">
<callback type="bind" method="Bind" />
@@ -82,7 +86,7 @@
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.service.dependency.filter.component.MultipleFilterCheckSubscriber"
+ classname="org.apache.felix.ipojo.test.scenarios.service.dependency.filter.component.MultipleFilterCheckSubscriber"
name="MultipleFilterCheckServiceSubscriber2" architecture="true">
<requires field="m_foo" id="id2">
<callback type="bind" method="Bind" />
@@ -93,7 +97,7 @@
<!-- Optional Aggregate Filter Dependencies -->
<component
- className="org.apache.felix.ipojo.test.scenarios.service.dependency.filter.component.MultipleFilterCheckSubscriber"
+ classname="org.apache.felix.ipojo.test.scenarios.service.dependency.filter.component.MultipleFilterCheckSubscriber"
name="OptionalMultipleFilterCheckServiceSubscriber"
architecture="true">
<requires field="m_foo" filter="(toto=B)" id="id1"
@@ -105,7 +109,7 @@
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.service.dependency.filter.component.MultipleFilterCheckSubscriber"
+ classname="org.apache.felix.ipojo.test.scenarios.service.dependency.filter.component.MultipleFilterCheckSubscriber"
name="OptionalMultipleFilterCheckServiceSubscriber2"
architecture="true">
<requires field="m_foo" id="id2" optional="true">
Modified: felix/trunk/ipojo/tests/core/service-dependency/src/main/resources/metadata.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/service-dependency/src/main/resources/metadata.xml?rev=693468&r1=693467&r2=693468&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/service-dependency/src/main/resources/metadata.xml (original)
+++ felix/trunk/ipojo/tests/core/service-dependency/src/main/resources/metadata.xml Tue Sep 9 07:21:15 2008
@@ -1,19 +1,21 @@
-<ipojo>
+<ipojo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="org.apache.felix.ipojo http://people.apache.org/~clement/ipojo/schemas/core.xsd"
+ xmlns="org.apache.felix.ipojo">
<component
- className="org.apache.felix.ipojo.test.scenarios.component.FooProviderType1"
+ classname="org.apache.felix.ipojo.test.scenarios.component.FooProviderType1"
name="FooProviderType-1" architecture="true">
<provides />
</component>
<!-- Simple Dependencies -->
<component
- className="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider"
name="SimpleCheckServiceProvider" architecture="true">
<requires field="fs" />
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider"
name="VoidCheckServiceProvider" architecture="true">
<requires field="fs">
<callback type="bind" method="voidBind" />
@@ -22,7 +24,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider"
name="ObjectCheckServiceProvider" architecture="true">
<requires field="fs">
<callback type="bind" method="objectBind" />
@@ -31,7 +33,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider"
name="RefCheckServiceProvider" architecture="true">
<requires field="fs">
<callback type="bind" method="refBind" />
@@ -40,7 +42,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider"
name="BothCheckServiceProvider" architecture="true">
<requires field="fs">
<callback type="bind" method="bothBind" />
@@ -49,7 +51,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider"
name="DoubleCheckServiceProvider" architecture="true">
<requires>
<callback type="bind" method="objectBind" />
@@ -60,7 +62,7 @@
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.MethodCheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.component.MethodCheckServiceProvider"
name="MObjectCheckServiceProvider" architecture="true">
<requires>
<callback type="bind" method="objectBind" />
@@ -69,7 +71,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.MethodCheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.component.MethodCheckServiceProvider"
name="MRefCheckServiceProvider" architecture="true">
<requires
interface="org.apache.felix.ipojo.test.scenarios.service.dependency.service.FooService">
@@ -79,7 +81,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.MethodCheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.component.MethodCheckServiceProvider"
name="MBothCheckServiceProvider" architecture="true">
<requires>
<callback type="bind" method="bothBind" />
@@ -90,19 +92,19 @@
<!-- Simple & Optional Dependencies -->
<component
- className="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider"
name="SimpleOptionalCheckServiceProvider" architecture="true">
<requires field="fs" optional="true" />
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider"
name="SimpleOptionalNoNullableCheckServiceProvider" architecture="true">
<requires field="fs" optional="true" nullable="false" />
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider"
name="VoidOptionalCheckServiceProvider" architecture="true">
<requires field="fs" optional="true">
<callback type="bind" method="voidBind" />
@@ -111,7 +113,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider"
name="VoidOptionalNoNullableCheckServiceProvider" architecture="true">
<requires field="fs" optional="true" nullable="false">
<callback type="bind" method="voidBind" />
@@ -120,7 +122,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider"
name="ObjectOptionalCheckServiceProvider" architecture="true">
<requires field="fs" optional="true">
<callback type="bind" method="objectBind" />
@@ -129,7 +131,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider"
name="ObjectOptionalNoNullableCheckServiceProvider" architecture="true">
<requires field="fs" optional="true" nullable="false">
<callback type="bind" method="objectBind" />
@@ -138,7 +140,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider"
name="RefOptionalCheckServiceProvider" architecture="true">
<requires field="fs" optional="true">
<callback type="bind" method="refBind" />
@@ -147,7 +149,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider"
name="RefOptionalNoNullableCheckServiceProvider" architecture="true">
<requires field="fs" optional="true" nullable="false">
<callback type="bind" method="refBind" />
@@ -156,7 +158,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider"
name="BothOptionalCheckServiceProvider" architecture="true">
<requires field="fs" optional="true">
<callback type="bind" method="bothBind" />
@@ -165,7 +167,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider"
name="BothOptionalNoNullableCheckServiceProvider" architecture="true">
<requires field="fs" optional="true" nullable="false">
<callback type="bind" method="bothBind" />
@@ -175,7 +177,7 @@
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.MethodCheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.component.MethodCheckServiceProvider"
name="MObjectOptionalCheckServiceProvider" architecture="true">
<requires optional="true">
<callback type="bind" method="objectBind" />
@@ -184,7 +186,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.MethodCheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.component.MethodCheckServiceProvider"
name="MRefOptionalCheckServiceProvider" architecture="true">
<requires
interface="org.apache.felix.ipojo.test.scenarios.service.dependency.service.FooService"
@@ -195,7 +197,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.MethodCheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.component.MethodCheckServiceProvider"
name="MBothOptionalCheckServiceProvider" architecture="true">
<requires
interface="org.apache.felix.ipojo.test.scenarios.service.dependency.service.FooService"
@@ -208,14 +210,14 @@
<!-- Simple & Optional Dependencies with default-implementation -->
<component
- className="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider"
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"
+ classname="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider"
name="DIVoidOptionalCheckServiceProvider" architecture="true">
<requires field="fs" optional="true"
default-implementation="org.apache.felix.ipojo.test.scenarios.component.FooServiceDefaultImpl">
@@ -225,7 +227,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider"
name="DIObjectOptionalCheckServiceProvider" architecture="true">
<requires field="fs" optional="true"
default-implementation="org.apache.felix.ipojo.test.scenarios.component.FooServiceDefaultImpl">
@@ -235,7 +237,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider"
name="DIRefOptionalCheckServiceProvider" architecture="true">
<requires field="fs" optional="true"
default-implementation="org.apache.felix.ipojo.test.scenarios.component.FooServiceDefaultImpl">
@@ -245,7 +247,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider"
name="DIBothOptionalCheckServiceProvider" architecture="true">
<requires field="fs" optional="true"
default-implementation="org.apache.felix.ipojo.test.scenarios.component.FooServiceDefaultImpl">
@@ -256,7 +258,7 @@
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.MethodCheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.component.MethodCheckServiceProvider"
name="DIMObjectOptionalCheckServiceProvider" architecture="true">
<requires optional="true"
default-implementation="org.apache.felix.ipojo.test.scenarios.component.FooServiceDefaultImpl">
@@ -266,7 +268,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.MethodCheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.component.MethodCheckServiceProvider"
name="DIMRefOptionalCheckServiceProvider" architecture="true">
<requires
interface="org.apache.felix.ipojo.test.scenarios.service.dependency.service.FooService"
@@ -278,7 +280,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.MethodCheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.component.MethodCheckServiceProvider"
name="DIMBothOptionalCheckServiceProvider" architecture="true">
<requires
interface="org.apache.felix.ipojo.test.scenarios.service.dependency.service.FooService"
@@ -292,13 +294,13 @@
<!-- Multiple Dependencies -->
<component
- className="org.apache.felix.ipojo.test.scenarios.component.MultipleCheckService"
+ classname="org.apache.felix.ipojo.test.scenarios.component.MultipleCheckService"
name="SimpleMultipleCheckServiceProvider" architecture="true">
<requires field="fs" />
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.MultipleCheckService"
+ classname="org.apache.felix.ipojo.test.scenarios.component.MultipleCheckService"
name="VoidMultipleCheckServiceProvider" architecture="true">
<requires field="fs">
<callback type="bind" method="voidBind" />
@@ -307,7 +309,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.MultipleCheckService"
+ classname="org.apache.felix.ipojo.test.scenarios.component.MultipleCheckService"
name="ObjectMultipleCheckServiceProvider" architecture="true">
<requires field="fs">
<callback type="bind" method="objectBind" />
@@ -316,7 +318,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.MultipleCheckService"
+ classname="org.apache.felix.ipojo.test.scenarios.component.MultipleCheckService"
name="RefMultipleCheckServiceProvider" architecture="true">
<requires field="fs">
<callback type="bind" method="refBind" />
@@ -325,7 +327,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.MultipleCheckService"
+ classname="org.apache.felix.ipojo.test.scenarios.component.MultipleCheckService"
name="BothMultipleCheckServiceProvider" architecture="true">
<requires field="fs">
<callback type="bind" method="bothBind" />
@@ -334,7 +336,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.MethodMultipleCheckService"
+ classname="org.apache.felix.ipojo.test.scenarios.component.MethodMultipleCheckService"
name="MObjectMultipleCheckServiceProvider" architecture="true">
<requires aggregate="true">
<callback type="bind" method="objectBind" />
@@ -343,7 +345,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.MethodMultipleCheckService"
+ classname="org.apache.felix.ipojo.test.scenarios.component.MethodMultipleCheckService"
name="MRefMultipleCheckServiceProvider" architecture="true">
<requires
interface="org.apache.felix.ipojo.test.scenarios.service.dependency.service.FooService"
@@ -354,7 +356,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.MethodMultipleCheckService"
+ classname="org.apache.felix.ipojo.test.scenarios.component.MethodMultipleCheckService"
name="MBothMultipleCheckServiceProvider" architecture="true">
<requires aggregate="true">
<callback type="bind" method="bothBind" />
@@ -365,14 +367,14 @@
<!-- Multiple & Optional Dependencies -->
<component
- className="org.apache.felix.ipojo.test.scenarios.component.MultipleCheckService"
+ classname="org.apache.felix.ipojo.test.scenarios.component.MultipleCheckService"
name="SimpleOptionalMultipleCheckServiceProvider"
architecture="true">
<requires field="fs" optional="true" />
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.MultipleCheckService"
+ classname="org.apache.felix.ipojo.test.scenarios.component.MultipleCheckService"
name="VoidOptionalMultipleCheckServiceProvider"
architecture="true">
<requires field="fs" optional="true">
@@ -382,7 +384,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.MultipleCheckService"
+ classname="org.apache.felix.ipojo.test.scenarios.component.MultipleCheckService"
name="ObjectOptionalMultipleCheckServiceProvider"
architecture="true">
<requires field="fs" optional="true">
@@ -392,7 +394,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.MultipleCheckService"
+ classname="org.apache.felix.ipojo.test.scenarios.component.MultipleCheckService"
name="RefOptionalMultipleCheckServiceProvider"
architecture="true">
<requires field="fs" optional="true">
@@ -402,7 +404,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.MethodMultipleCheckService"
+ classname="org.apache.felix.ipojo.test.scenarios.component.MethodMultipleCheckService"
name="MObjectOptionalMultipleCheckServiceProvider"
architecture="true">
<requires aggregate="true" optional="true">
@@ -412,7 +414,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.MethodMultipleCheckService"
+ classname="org.apache.felix.ipojo.test.scenarios.component.MethodMultipleCheckService"
name="MRefOptionalMultipleCheckServiceProvider"
architecture="true">
<requires
@@ -426,13 +428,13 @@
<!-- Aggregate dependency as List -->
<component
- className="org.apache.felix.ipojo.test.scenarios.component.ListCheckService"
+ classname="org.apache.felix.ipojo.test.scenarios.component.ListCheckService"
name="SimpleListCheckServiceProvider" architecture="true">
<requires field="fs" interface="org.apache.felix.ipojo.test.scenarios.service.dependency.service.FooService"/>
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.ListCheckService"
+ classname="org.apache.felix.ipojo.test.scenarios.component.ListCheckService"
name="OptionalListCheckServiceProvider"
architecture="true">
<requires interface="org.apache.felix.ipojo.test.scenarios.service.dependency.service.FooService" field="fs" optional="true" />
@@ -441,7 +443,7 @@
<!-- Aggregate dependency as Vector -->
<component
- className="org.apache.felix.ipojo.test.scenarios.component.VectorCheckService"
+ classname="org.apache.felix.ipojo.test.scenarios.component.VectorCheckService"
name="SimpleVectorCheckServiceProvider" architecture="true">
<requires field="fs">
<callback type="bind" method="objectBind"/>
@@ -450,7 +452,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.VectorCheckService"
+ classname="org.apache.felix.ipojo.test.scenarios.component.VectorCheckService"
name="OptionalVectorCheckServiceProvider"
architecture="true">
<requires interface="org.apache.felix.ipojo.test.scenarios.service.dependency.service.FooService" field="fs" optional="true" />
@@ -459,13 +461,13 @@
<!-- Aggregate dependency as Set -->
<component
- className="org.apache.felix.ipojo.test.scenarios.component.SetCheckService"
+ classname="org.apache.felix.ipojo.test.scenarios.component.SetCheckService"
name="SimpleSetCheckServiceProvider" architecture="true">
<requires field="fs" interface="org.apache.felix.ipojo.test.scenarios.service.dependency.service.FooService"/>
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.SetCheckService"
+ classname="org.apache.felix.ipojo.test.scenarios.component.SetCheckService"
name="OptionalSetCheckServiceProvider"
architecture="true">
<requires interface="org.apache.felix.ipojo.test.scenarios.service.dependency.service.FooService" field="fs" optional="true" />
@@ -474,13 +476,13 @@
<!-- Aggregate dependency as Collection -->
<component
- className="org.apache.felix.ipojo.test.scenarios.component.CollectionCheckService"
+ classname="org.apache.felix.ipojo.test.scenarios.component.CollectionCheckService"
name="SimpleCollectionCheckServiceProvider" architecture="true">
<requires field="fs" interface="org.apache.felix.ipojo.test.scenarios.service.dependency.service.FooService"/>
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.CollectionCheckService"
+ classname="org.apache.felix.ipojo.test.scenarios.component.CollectionCheckService"
name="OptionalCollectionCheckServiceProvider"
architecture="true">
<requires interface="org.apache.felix.ipojo.test.scenarios.service.dependency.service.FooService" field="fs" optional="true" />
Modified: felix/trunk/ipojo/tests/core/service-providing/src/main/resources/metadata.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/service-providing/src/main/resources/metadata.xml?rev=693468&r1=693467&r2=693468&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/service-providing/src/main/resources/metadata.xml (original)
+++ felix/trunk/ipojo/tests/core/service-providing/src/main/resources/metadata.xml Tue Sep 9 07:21:15 2008
@@ -1,20 +1,24 @@
-<ipojo>
+<ipojo
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="org.apache.felix.ipojo http://people.apache.org/~clement/ipojo/schemas/core.xsd"
+ xmlns="org.apache.felix.ipojo"
+>
<!-- Simple provider -->
<component
- className="org.apache.felix.ipojo.test.scenarios.component.FooProviderType1"
+ classname="org.apache.felix.ipojo.test.scenarios.component.FooProviderType1"
name="PS-FooProviderType-1" architecture="true">
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.FooProviderType1"
+ classname="org.apache.felix.ipojo.test.scenarios.component.FooProviderType1"
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"
+ classname="org.apache.felix.ipojo.test.scenarios.component.FooProviderType1"
name="PS-FooProviderType-3" architecture="true">
<provides>
<property name="foo" field="m_foo" />
@@ -29,18 +33,18 @@
<!-- Providers providing 2 services -->
<component
- className="org.apache.felix.ipojo.test.scenarios.component.FooBarProviderType1"
+ classname="org.apache.felix.ipojo.test.scenarios.component.FooBarProviderType1"
name="PS-FooBarProviderType-1" architecture="true">
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.FooBarProviderType1"
+ classname="org.apache.felix.ipojo.test.scenarios.component.FooBarProviderType1"
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"
+ classname="org.apache.felix.ipojo.test.scenarios.component.FooBarProviderType1"
name="PS-FooBarProviderType-3" architecture="true">
<provides
interface="{org.apache.felix.ipojo.test.scenarios.ps.service.FooService}">
@@ -55,7 +59,7 @@
<!-- Provider with dynamic property -->
<component
- className="org.apache.felix.ipojo.test.scenarios.component.FooProviderTypeDyn"
+ classname="org.apache.felix.ipojo.test.scenarios.component.FooProviderTypeDyn"
name="PS-FooProviderType-Dyn" architecture="true">
<provides>
<property name="int" field="intProp" value="2" />
@@ -68,7 +72,7 @@
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.FooProviderType1"
+ classname="org.apache.felix.ipojo.test.scenarios.component.FooProviderType1"
name="PS-FooProviderType-2" architecture="true">
<provides>
<property name="int" type="int" value="2" />
@@ -81,7 +85,7 @@
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.FooProviderTypeDyn2"
+ classname="org.apache.felix.ipojo.test.scenarios.component.FooProviderTypeDyn2"
name="PS-FooProviderType-Dyn2" architecture="true">
<provides>
<property name="int" field="intProp" value="4" />
Modified: felix/trunk/ipojo/tests/handler/eventadmin/src/main/resources/metadata.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/handler/eventadmin/src/main/resources/metadata.xml?rev=693468&r1=693467&r2=693468&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/handler/eventadmin/src/main/resources/metadata.xml (original)
+++ felix/trunk/ipojo/tests/handler/eventadmin/src/main/resources/metadata.xml Tue Sep 9 07:21:15 2008
@@ -1,8 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ipojo xmlns:ev="org.apache.felix.ipojo.handlers.event.EventAdminHandler">
+<ipojo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="org.apache.felix.ipojo http://people.apache.org/~clement/ipojo/schemas/core.xsd
+ org.apache.felix.ipojo.handlers.event.EventAdminHandler http://people.apache.org/~clement/ipojo/schemas/event-admin.xsd"
+ xmlns="org.apache.felix.ipojo"
+ xmlns:ev="org.apache.felix.ipojo.handlers.event.EventAdminHandler">
<!-- The (asynchronous) donut provider -->
- <component className="org.apache.felix.ipojo.test.donut.DonutProviderImpl"
+ <component classname="org.apache.felix.ipojo.test.donut.DonutProviderImpl"
name="donut-provider">
<!-- Expose the donut provider service -->
<provides interface="org.apache.felix.ipojo.test.donut.DonutProvider">
@@ -14,7 +18,7 @@
</component>
<!-- The synchronous donut provider -->
- <component className="org.apache.felix.ipojo.test.donut.DonutProviderImpl"
+ <component classname="org.apache.felix.ipojo.test.donut.DonutProviderImpl"
name="synchronous-donut-provider">
<!-- Expose the donut provider service -->
<provides interface="org.apache.felix.ipojo.test.donut.DonutProvider">
@@ -27,7 +31,7 @@
<!-- The (asynchronous) donut event provider -->
<component
- className="org.apache.felix.ipojo.test.donut.DonutEventProviderImpl"
+ classname="org.apache.felix.ipojo.test.donut.DonutEventProviderImpl"
name="donut-event-provider">
<!-- Expose the donut provider service -->
<provides interface="org.apache.felix.ipojo.test.donut.DonutProvider">
@@ -40,7 +44,7 @@
<!-- The synchronous donut event provider -->
<component
- className="org.apache.felix.ipojo.test.donut.DonutEventProviderImpl"
+ classname="org.apache.felix.ipojo.test.donut.DonutEventProviderImpl"
name="synchronous-donut-event-provider">
<!-- Expose the donut provider service -->
<provides interface="org.apache.felix.ipojo.test.donut.DonutProvider">
@@ -53,7 +57,7 @@
<!-- The (asynchronous) event provider -->
<component
- className="org.apache.felix.ipojo.test.donut.AsyncEventProviderImpl"
+ classname="org.apache.felix.ipojo.test.donut.AsyncEventProviderImpl"
name="event-provider">
<!-- Expose the donut provider service -->
<provides interface="org.apache.felix.ipojo.test.donut.DonutProvider">
@@ -65,7 +69,7 @@
<!-- The synchronous event provider -->
<component
- className="org.apache.felix.ipojo.test.donut.SyncEventProviderImpl"
+ classname="org.apache.felix.ipojo.test.donut.SyncEventProviderImpl"
name="synchronous-event-provider">
<!-- Expose the donut provider service -->
<provides interface="org.apache.felix.ipojo.test.donut.DonutProvider">
@@ -76,7 +80,7 @@
</component>
<!-- The donut consumer -->
- <component className="org.apache.felix.ipojo.test.donut.DonutConsumerImpl"
+ <component classname="org.apache.felix.ipojo.test.donut.DonutConsumerImpl"
name="donut-consumer">
<!-- Expose the donut consumer service -->
<provides interface="org.apache.felix.ipojo.test.donut.DonutConsumer">
@@ -90,7 +94,7 @@
</component>
<!-- The donut event consumer -->
- <component className="org.apache.felix.ipojo.test.donut.DonutConsumerImpl"
+ <component classname="org.apache.felix.ipojo.test.donut.DonutConsumerImpl"
name="donut-event-consumer">
<!-- Expose the donut consumer service -->
<provides interface="org.apache.felix.ipojo.test.donut.DonutConsumer">
@@ -103,7 +107,7 @@
</component>
<!-- The event consumer -->
- <component className="org.apache.felix.ipojo.test.donut.EventConsumerImpl"
+ <component classname="org.apache.felix.ipojo.test.donut.EventConsumerImpl"
name="event-consumer">
<!-- Expose the donut consumer service -->
<provides
@@ -115,7 +119,7 @@
</component>
<!-- The event tracker -->
- <component className="org.apache.felix.ipojo.test.donut.EventTrackerImpl"
+ <component classname="org.apache.felix.ipojo.test.donut.EventTrackerImpl"
name="event-tracker">
<!-- Expose the donut consumer service -->
<provides
Modified: felix/trunk/ipojo/tests/handler/temporal/src/main/resources/metadata.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/handler/temporal/src/main/resources/metadata.xml?rev=693468&r1=693467&r2=693468&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/handler/temporal/src/main/resources/metadata.xml (original)
+++ felix/trunk/ipojo/tests/handler/temporal/src/main/resources/metadata.xml Tue Sep 9 07:21:15 2008
@@ -1,4 +1,9 @@
-<ipojo xmlns:temp="org.apache.felix.ipojo.handler.temporal">
+<ipojo
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="org.apache.felix.ipojo http://people.apache.org/~clement/ipojo/schemas/core.xsd
+ org.apache.felix.ipojo.handler.temporal http://people.apache.org/~clement/ipojo/schemas/temporal.xsd"
+ xmlns="org.apache.felix.ipojo"
+ xmlns:temp="org.apache.felix.ipojo.handler.temporal">
<component classname="org.apache.felix.ipojo.test.scenarios.component.CheckServiceProvider" name="TEMPORAL-CheckServiceProvider">
<temp:requires field="fs"/>
<provides/>
@@ -10,7 +15,7 @@
</component>
<component classname="org.apache.felix.ipojo.test.scenarios.component.MultipleCheckServiceProvider" name="TEMPORAL-MultipleCheckServiceProvider">
- <temp:requires field="fs" aggregate="true"/>
+ <temp:requires field="fs"/>
<provides/>
</component>
Modified: felix/trunk/ipojo/tests/handler/whiteboard/src/main/resources/metadata.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/handler/whiteboard/src/main/resources/metadata.xml?rev=693468&r1=693467&r2=693468&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/handler/whiteboard/src/main/resources/metadata.xml (original)
+++ felix/trunk/ipojo/tests/handler/whiteboard/src/main/resources/metadata.xml Tue Sep 9 07:21:15 2008
@@ -1,16 +1,21 @@
-<ipojo xmlns:wbp="org.apache.felix.ipojo.white-board-pattern">
- <component className="org.apache.felix.ipojo.test.FooProvider" name="fooprovider">
+<ipojo
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="org.apache.felix.ipojo http://people.apache.org/~clement/ipojo/schemas/core.xsd
+ org.apache.felix.ipojo.white-board-pattern http://people.apache.org/~clement/ipojo/schemas/whiteboard-pattern.xsd"
+ xmlns="org.apache.felix.ipojo"
+ xmlns:wbp="org.apache.felix.ipojo.white-board-pattern">
+ <component classname="org.apache.felix.ipojo.test.FooProvider" name="fooprovider">
<provides>
<property field="foo" value="foo"/>
</provides>
</component>
- <component className="org.apache.felix.ipojo.test.FooWhiteBoardPattern" name="under-providers">
+ <component classname="org.apache.felix.ipojo.test.FooWhiteBoardPattern" name="under-providers">
<wbp:wbp filter="(objectclass=org.apache.felix.ipojo.test.FooService)" onArrival="onArrival" onDeparture="onDeparture" onModification="onModification"/>
<provides/>
</component>
- <component className="org.apache.felix.ipojo.test.FooWhiteBoardPattern" name="under-properties">
+ <component classname="org.apache.felix.ipojo.test.FooWhiteBoardPattern" name="under-properties">
<wbp:wbp filter="(foo=foo)" onArrival="onArrival" onDeparture="onDeparture" onModification="onModification"/>
<provides/>
</component>
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=693468&r1=693467&r2=693468&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 Tue Sep 9 07:21:15 2008
@@ -1,14 +1,18 @@
-<ipojo>
+<ipojo
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="org.apache.felix.ipojo http://people.apache.org/~clement/ipojo/schemas/core.xsd"
+ xmlns="org.apache.felix.ipojo"
+>
<!-- Simple provider used for manipulation analysis -->
<component
- className="org.apache.felix.ipojo.test.scenarios.component.FooProviderType1"
+ classname="org.apache.felix.ipojo.test.scenarios.component.FooProviderType1"
name="Manipulation-FooProviderType-1" architecture="true">
<provides />
</component>
<!-- Non lazzy service provider, to check instantiation -->
<component
- className="org.apache.felix.ipojo.test.scenarios.component.FooProviderType1"
+ classname="org.apache.felix.ipojo.test.scenarios.component.FooProviderType1"
name="Manipulation-ImmediateFooProviderType" immediate="true"
architecture="true">
<provides />
@@ -16,14 +20,14 @@
<!-- Provider providing 2 services -->
<component
- className="org.apache.felix.ipojo.test.scenarios.component.FooBarProviderType1"
+ classname="org.apache.felix.ipojo.test.scenarios.component.FooBarProviderType1"
name="Manipulation-FooBarProviderType-1" architecture="true">
<provides />
</component>
<!-- Provider with dynamic property -->
<component
- className="org.apache.felix.ipojo.test.scenarios.component.FooProviderTypeDyn"
+ classname="org.apache.felix.ipojo.test.scenarios.component.FooProviderTypeDyn"
name="Manipulation-FooProviderType-Dyn" architecture="true">
<provides>
<property name="int" field="intProp" value="2" />
@@ -37,20 +41,20 @@
<!-- Manipulation -->
<component
- className="org.apache.felix.ipojo.test.scenarios.component.Manipulation23Tester"
+ classname="org.apache.felix.ipojo.test.scenarios.component.Manipulation23Tester"
name="Manipulation-PrimitiveManipulationTester" architecture="true">
<provides />
</component>
<!-- Manipulation with numbers -->
<component
- className="org.apache.felix.ipojo.test.scenarios.component.A123.Manipulation23Tester"
+ classname="org.apache.felix.ipojo.test.scenarios.component.A123.Manipulation23Tester"
name="Manipulation-PrimitiveManipulationTesterA" architecture="true">
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.MultipleCheckService"
+ classname="org.apache.felix.ipojo.test.scenarios.component.MultipleCheckService"
name="Manipulation-SimpleMultipleCheckServiceProvider" architecture="true">
<requires field="fs" />
<provides />
@@ -58,42 +62,42 @@
<!-- Type checking different creation policy -->
<component
- className="org.apache.felix.ipojo.test.scenarios.component.FooProviderType1"
+ classname="org.apache.felix.ipojo.test.scenarios.component.FooProviderType1"
name="Manipulation-FooProviderType-1-Sing" factory-method="singleton"
architecture="true">
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.FooProviderType1"
+ classname="org.apache.felix.ipojo.test.scenarios.component.FooProviderType1"
name="Manipulation-FooProviderType-1-Sev" factory-method="several"
architecture="true">
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.FooProviderType1"
+ classname="org.apache.felix.ipojo.test.scenarios.component.FooProviderType1"
name="Manipulation-FooProviderType-1-SingM" factory-method="singleton"
architecture="true">
<provides/>
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.FooProviderType1"
+ classname="org.apache.felix.ipojo.test.scenarios.component.FooProviderType1"
name="Manipulation-FooProviderType-1-SevM" factory-method="several"
architecture="true">
<provides/>
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.FooProviderType1"
+ classname="org.apache.felix.ipojo.test.scenarios.component.FooProviderType1"
name="Manipulation-ImmediateFooProviderTypeSingleton" immediate="true"
factory-method="singleton" architecture="true">
<provides />
</component>
<!-- Try calling super constructors -->
- <component className="org.apache.felix.ipojo.test.scenarios.component.CallSuperConstructor" immediate="true"/>
+ <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">