Fix issue Felix-716
Provides XML-Schemas for core features (core handler, component, handler, instance), compositions, external handlers.
Modifies the manipulator in order to check schema when specified in the XML descriptor.
Tests suites now use schemas.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@693468 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/tests/core/configuration/src/main/resources/metadata.xml b/ipojo/tests/core/configuration/src/main/resources/metadata.xml
index 8447c8c..0826a26 100644
--- a/ipojo/tests/core/configuration/src/main/resources/metadata.xml
+++ b/ipojo/tests/core/configuration/src/main/resources/metadata.xml
@@ -1,6 +1,7 @@
-<ipojo>
- <component
- className="org.apache.felix.ipojo.test.scenarios.component.FooProviderTypeDyn"
+<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.FooProviderTypeDyn"
name="CONFIG-FooProviderType-Conf" architecture="true">
<provides />
<properties propagation="false">
@@ -13,7 +14,7 @@
</properties>
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.FooProviderType1"
+ classname="org.apache.felix.ipojo.test.scenarios.component.FooProviderType1"
name="CONFIG-FooProviderType-3" architecture="true">
<provides>
<property name="foo" field="m_foo" />
@@ -27,7 +28,7 @@
</component>
<!-- Configuration Management Test -->
<component name="CONFIG-FieldConfigurableCheckService"
- className="org.apache.felix.ipojo.test.scenarios.component.ConfigurableCheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.component.ConfigurableCheckServiceProvider"
architecture="true">
<provides />
<properties propagation="true">
@@ -53,7 +54,7 @@
</component>
<component name="CONFIG-BothConfigurableCheckService"
- className="org.apache.felix.ipojo.test.scenarios.component.ConfigurableCheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.component.ConfigurableCheckServiceProvider"
architecture="true">
<provides />
<properties propagation="true">
@@ -79,7 +80,7 @@
</component>
<component name="CONFIG-MethodConfigurableCheckService"
- className="org.apache.felix.ipojo.test.scenarios.component.ConfigurableCheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.component.ConfigurableCheckServiceProvider"
architecture="true">
<provides />
<properties propagation="true">
@@ -105,7 +106,7 @@
</component>
<component name="CONFIG-ParentMethodConfigurableCheckService"
- className="org.apache.felix.ipojo.test.scenarios.component.ParentConfigurableCheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.component.ParentConfigurableCheckServiceProvider"
architecture="true">
<provides />
<properties propagation="true">
@@ -132,7 +133,7 @@
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.FooProviderType1"
+ classname="org.apache.felix.ipojo.test.scenarios.component.FooProviderType1"
name="CONFIG-FooProviderType-4" architecture="true">
<provides>
<property name="foo" field="m_foo" />
diff --git a/ipojo/tests/core/external-handlers/src/main/resources/metadata.xml b/ipojo/tests/core/external-handlers/src/main/resources/metadata.xml
index 9491a34..12cdd14 100644
--- a/ipojo/tests/core/external-handlers/src/main/resources/metadata.xml
+++ b/ipojo/tests/core/external-handlers/src/main/resources/metadata.xml
@@ -1,4 +1,7 @@
<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"
xmlns:cs="org.apache.felix.ipojo.test.handler.checkservice">
<handler
classname="org.apache.felix.ipojo.test.scenarios.component.CheckServiceHandler"
@@ -8,7 +11,7 @@
<controller field="isValid" />
</handler>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.FooProviderType1"
+ classname="org.apache.felix.ipojo.test.scenarios.component.FooProviderType1"
name="HANDLER-HandlerTester" architecture="true">
<cs:check />
</component>
diff --git a/ipojo/tests/core/factories/src/main/resources/metadata.xml b/ipojo/tests/core/factories/src/main/resources/metadata.xml
index 026b95e..93b3431 100644
--- a/ipojo/tests/core/factories/src/main/resources/metadata.xml
+++ b/ipojo/tests/core/factories/src/main/resources/metadata.xml
@@ -1,21 +1,25 @@
-<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="Factories-FooProviderType-1" architecture="true">
<provides />
</component>
<!-- Provider providing 2 services -->
<component
- className="org.apache.felix.ipojo.test.scenarios.component.FooBarProviderType1"
+ classname="org.apache.felix.ipojo.test.scenarios.component.FooBarProviderType1"
name="Factories-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="Factories-FooProviderType-Dyn" architecture="true">
<provides>
<property name="int" field="intProp" value="2" />
@@ -28,7 +32,7 @@
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.FooProviderType1"
+ classname="org.apache.felix.ipojo.test.scenarios.component.FooProviderType1"
name="Factories-FooProviderType-2" architecture="true">
<provides>
<property name="int" type="int" value="2" />
@@ -41,7 +45,7 @@
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.FooProviderTypeDyn2"
+ classname="org.apache.felix.ipojo.test.scenarios.component.FooProviderTypeDyn2"
name="Factories-FooProviderType-Dyn2" architecture="true">
<provides>
<property name="int" field="intProp" value="4" />
@@ -54,7 +58,7 @@
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.FooProviderType1"
+ classname="org.apache.felix.ipojo.test.scenarios.component.FooProviderType1"
name="Factories-FooProviderType-3" architecture="true">
<provides>
<property name="foo" field="m_foo" />
diff --git a/ipojo/tests/core/lifecycle-callback/src/main/resources/metadata.xml b/ipojo/tests/core/lifecycle-callback/src/main/resources/metadata.xml
index cddab70..fde369c 100644
--- a/ipojo/tests/core/lifecycle-callback/src/main/resources/metadata.xml
+++ b/ipojo/tests/core/lifecycle-callback/src/main/resources/metadata.xml
@@ -1,13 +1,17 @@
-<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="LFCB-FooProviderType-1" architecture="true">
<provides />
</component>
<!-- Lifecycle Callback -->
<component
- className="org.apache.felix.ipojo.test.scenarios.component.CallbackCheckService"
+ classname="org.apache.felix.ipojo.test.scenarios.component.CallbackCheckService"
name="LFCB-CallbackCheckService" architecture="true">
<requires field="fs" />
<provides />
@@ -15,7 +19,7 @@
<callback transition="invalidate" method="stop" />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.CallbackCheckService"
+ classname="org.apache.felix.ipojo.test.scenarios.component.CallbackCheckService"
name="LFCB-ParentCallbackCheckService" architecture="true">
<requires field="fs" />
<provides />
@@ -23,7 +27,7 @@
<callback transition="invalidate" method="parentStop" />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.CallbackCheckService"
+ classname="org.apache.felix.ipojo.test.scenarios.component.CallbackCheckService"
immediate="true" name="LFCB-ImmediateCallbackCheckService"
architecture="true">
<requires field="fs" />
@@ -32,7 +36,7 @@
<callback transition="invalidate" method="stop" />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.CallbackCheckService"
+ classname="org.apache.felix.ipojo.test.scenarios.component.CallbackCheckService"
immediate="true" name="LFCB-ImmediateCallbackCheckServiceSingleton"
factory-method="singleton" architecture="true">
<requires field="fs" />
@@ -41,7 +45,7 @@
<callback transition="invalidate" method="stop" />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.component.CallbackCheckService"
+ classname="org.apache.felix.ipojo.test.scenarios.component.CallbackCheckService"
immediate="true" name="LFCB-ImmediateCallbackCheckServiceSeveral"
factory-method="several" architecture="true">
<requires field="fs" />
diff --git a/ipojo/tests/core/lifecycle-controller/src/main/resources/metadata.xml b/ipojo/tests/core/lifecycle-controller/src/main/resources/metadata.xml
index e7ffacb..60867f3 100644
--- a/ipojo/tests/core/lifecycle-controller/src/main/resources/metadata.xml
+++ b/ipojo/tests/core/lifecycle-controller/src/main/resources/metadata.xml
@@ -1,4 +1,7 @@
-<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.LifecycleControllerTest"
name="LFC-Test">
diff --git a/ipojo/tests/core/service-dependency-bindingpolicy/src/main/resources/metadata.xml b/ipojo/tests/core/service-dependency-bindingpolicy/src/main/resources/metadata.xml
index 1a116b1..e4c0460 100644
--- a/ipojo/tests/core/service-dependency-bindingpolicy/src/main/resources/metadata.xml
+++ b/ipojo/tests/core/service-dependency-bindingpolicy/src/main/resources/metadata.xml
@@ -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"
+>
<!-- Static Dependencies -->
<component
- className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.CheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.CheckServiceProvider"
name="StaticSimpleCheckServiceProvider" architecture="true">
<requires field="fs" policy="static" />
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.CheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.CheckServiceProvider"
name="StaticVoidCheckServiceProvider" architecture="true">
<requires field="fs" policy="static">
<callback type="bind" method="voidBind" />
@@ -17,7 +21,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.CheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.CheckServiceProvider"
name="StaticObjectCheckServiceProvider" architecture="true">
<requires field="fs" policy="static">
<callback type="bind" method="objectBind" />
@@ -26,7 +30,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.CheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.CheckServiceProvider"
name="StaticRefCheckServiceProvider" architecture="true">
<requires field="fs" policy="static">
<callback type="bind" method="refBind" />
@@ -35,7 +39,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.CheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.CheckServiceProvider"
name="StaticBothCheckServiceProvider" architecture="true">
<requires field="fs" policy="static">
<callback type="bind" method="bothBind" />
@@ -44,7 +48,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.MethodCheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.MethodCheckServiceProvider"
name="StaticMObjectCheckServiceProvider" architecture="true">
<requires policy="static">
<callback type="bind" method="objectBind" />
@@ -53,7 +57,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.MethodCheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.MethodCheckServiceProvider"
name="StaticMRefCheckServiceProvider" architecture="true">
<requires
interface="org.apache.felix.ipojo.test.scenarios.service.dependency.service.FooService"
@@ -64,7 +68,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.MethodCheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.MethodCheckServiceProvider"
name="StaticMBothCheckServiceProvider" architecture="true">
<requires policy="static">
<callback type="bind" method="bothBind" />
@@ -75,14 +79,14 @@
<!-- Static Simple & Optional Dependencies -->
<component
- className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.CheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.CheckServiceProvider"
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"
+ classname="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.CheckServiceProvider"
name="StaticVoidOptionalCheckServiceProvider"
architecture="true">
<requires field="fs" optional="true" policy="static">
@@ -92,7 +96,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.CheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.CheckServiceProvider"
name="StaticObjectOptionalCheckServiceProvider"
architecture="true">
<requires field="fs" optional="true" policy="static">
@@ -102,7 +106,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.CheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.CheckServiceProvider"
name="StaticRefOptionalCheckServiceProvider" architecture="true">
<requires field="fs" optional="true" policy="static">
<callback type="bind" method="refBind" />
@@ -111,7 +115,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.CheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.CheckServiceProvider"
name="StaticBothOptionalCheckServiceProvider"
architecture="true">
<requires field="fs" optional="true" policy="static">
@@ -121,7 +125,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.MethodCheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.MethodCheckServiceProvider"
name="StaticMObjectOptionalCheckServiceProvider"
architecture="true">
<requires optional="true" policy="static">
@@ -131,7 +135,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.MethodCheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.MethodCheckServiceProvider"
name="StaticMRefOptionalCheckServiceProvider"
architecture="true">
<requires
@@ -143,7 +147,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.MethodCheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.MethodCheckServiceProvider"
name="StaticMBothOptionalCheckServiceProvider"
architecture="true">
<requires
@@ -156,14 +160,14 @@
</component>
<!-- Static Multiple Dependencies -->
<component
- className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.MultipleCheckService"
+ classname="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.MultipleCheckService"
name="StaticSimpleMultipleCheckServiceProvider"
architecture="true">
<requires field="fs" policy="static" />
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.MultipleCheckService"
+ classname="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.MultipleCheckService"
name="StaticVoidMultipleCheckServiceProvider"
architecture="true">
<requires field="fs" policy="static">
@@ -173,7 +177,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.MultipleCheckService"
+ classname="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.MultipleCheckService"
name="StaticObjectMultipleCheckServiceProvider"
architecture="true">
<requires field="fs" policy="static">
@@ -183,7 +187,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.MultipleCheckService"
+ classname="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.MultipleCheckService"
name="StaticRefMultipleCheckServiceProvider" architecture="true">
<requires field="fs" policy="static">
<callback type="bind" method="refBind" />
@@ -192,7 +196,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.MultipleCheckService"
+ classname="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.MultipleCheckService"
name="StaticBothMultipleCheckServiceProvider"
architecture="true">
<requires field="fs" policy="static">
@@ -202,7 +206,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.MethodMultipleCheckService"
+ classname="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.MethodMultipleCheckService"
name="StaticMObjectMultipleCheckServiceProvider"
architecture="true">
<requires aggregate="true" policy="static">
@@ -212,7 +216,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.MethodMultipleCheckService"
+ classname="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.MethodMultipleCheckService"
name="StaticMRefMultipleCheckServiceProvider"
architecture="true">
<requires
@@ -224,7 +228,7 @@
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.MethodMultipleCheckService"
+ classname="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.MethodMultipleCheckService"
name="StaticMBothMultipleCheckServiceProvider"
architecture="true">
<requires aggregate="true" policy="static">
@@ -236,20 +240,20 @@
<!-- Dynamic-Priority -->
<component
- className="org.apache.felix.ipojo.test.scenarios.service.dependency.dynamic.priority.RankedFooProviderType1"
+ classname="org.apache.felix.ipojo.test.scenarios.service.dependency.dynamic.priority.RankedFooProviderType1"
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"
+ classname="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.DynCheckServiceProvider"
name="DPSimpleCheckServiceProvider" architecture="true">
<requires field="fs" policy="dynamic-priority" />
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.DynCheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.scenarios.service.dependency.policies.DynCheckServiceProvider"
name="DPObjectCheckServiceProvider" architecture="true">
<requires field="fs" policy="dynamic-priority">
<callback type="bind" method="objectBind" />
diff --git a/ipojo/tests/core/service-dependency-filter/src/main/resources/metadata.xml b/ipojo/tests/core/service-dependency-filter/src/main/resources/metadata.xml
index 217e4c8..dc79bac 100644
--- a/ipojo/tests/core/service-dependency-filter/src/main/resources/metadata.xml
+++ b/ipojo/tests/core/service-dependency-filter/src/main/resources/metadata.xml
@@ -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">
diff --git a/ipojo/tests/core/service-dependency/src/main/resources/metadata.xml b/ipojo/tests/core/service-dependency/src/main/resources/metadata.xml
index 9433bb2..0ce8f51 100644
--- a/ipojo/tests/core/service-dependency/src/main/resources/metadata.xml
+++ b/ipojo/tests/core/service-dependency/src/main/resources/metadata.xml
@@ -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" />
diff --git a/ipojo/tests/core/service-providing/src/main/resources/metadata.xml b/ipojo/tests/core/service-providing/src/main/resources/metadata.xml
index fc2787f..9309517 100644
--- a/ipojo/tests/core/service-providing/src/main/resources/metadata.xml
+++ b/ipojo/tests/core/service-providing/src/main/resources/metadata.xml
@@ -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" />