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/composite/composite-runtime/src/main/resources/metadata.xml b/ipojo/tests/composite/composite-runtime/src/main/resources/metadata.xml
index eecf974..5f65200 100644
--- a/ipojo/tests/composite/composite-runtime/src/main/resources/metadata.xml
+++ b/ipojo/tests/composite/composite-runtime/src/main/resources/metadata.xml
@@ -1,12 +1,18 @@
-<ipojo xmlns:cs="org.apache.felix.ipojo.test.composite.handler.CheckServiceHandler">
+<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.composite http://people.apache.org/~clement/ipojo/schemas/composite.xsd"
+ xmlns="org.apache.felix.ipojo"
+ xmlns:comp="org.apache.felix.ipojo.composite"
+ xmlns:cs="org.apache.felix.ipojo.test.composite.handler.CheckServiceHandler">
<!-- Used component type -->
<component
- className="org.apache.felix.ipojo.test.composite.component.FooProviderType1"
+ classname="org.apache.felix.ipojo.test.composite.component.FooProviderType1"
name="COMPO-FooProviderType-1" architecture="true">
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.composite.component.FooProviderType1"
+ classname="org.apache.felix.ipojo.test.composite.component.FooProviderType1"
name="COMPO-FooProviderType-2" architecture="true">
<provides>
<property name="int" type="int" value="2" />
@@ -18,7 +24,7 @@
</provides>
</component>
<component
- className="org.apache.felix.ipojo.test.composite.component.FooProviderTypeDyn"
+ classname="org.apache.felix.ipojo.test.composite.component.FooProviderTypeDyn"
name="COMPO-FooProviderType-Dyn" architecture="true">
<provides>
<property name="int" field="intProp" value="2" />
@@ -30,7 +36,7 @@
</provides>
</component>
<component
- className="org.apache.felix.ipojo.test.composite.component.FooProviderTypeDyn2"
+ classname="org.apache.felix.ipojo.test.composite.component.FooProviderTypeDyn2"
name="COMPO-FooProviderType-Dyn2" architecture="true">
<provides>
<property name="int" field="intProp" value="4" />
@@ -42,24 +48,24 @@
</provides>
</component>
<component
- className="org.apache.felix.ipojo.test.composite.component.CheckServiceProvider"
+ classname="org.apache.felix.ipojo.test.composite.component.CheckServiceProvider"
name="COMPO-SimpleCheckServiceProvider" architecture="true">
<requires field="fs" />
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.composite.component.FooBarProviderType1"
+ classname="org.apache.felix.ipojo.test.composite.component.FooBarProviderType1"
name="COMPO-FooBarProviderType-1" architecture="true">
<provides />
</component>
<component
- className="org.apache.felix.ipojo.test.composite.component.FooBarProviderType1"
+ classname="org.apache.felix.ipojo.test.composite.component.FooBarProviderType1"
name="COMPO-FooBarProviderType-2" architecture="true">
<provides
interface="{org.apache.felix.ipojo.test.composite.service.FooService, org.apache.felix.ipojo.test.composite.service.BarService }" />
</component>
<component
- className="org.apache.felix.ipojo.test.composite.component.FooBarProviderType1"
+ classname="org.apache.felix.ipojo.test.composite.component.FooBarProviderType1"
name="COMPO-FooBarProviderType-3" architecture="true">
<provides
interface="{org.apache.felix.ipojo.test.composite.service.FooService}">
@@ -72,8 +78,8 @@
</component>
<component
- className="org.apache.felix.ipojo.test.composite.component.BazProviderType1"
- name="BazProviderType" scope="composite">
+ classname="org.apache.felix.ipojo.test.composite.component.BazProviderType1"
+ name="BazProviderType">
<provides />
</component>
@@ -96,10 +102,10 @@
</component>
<!-- Composite -->
- <composite name="composite.empty" architecture="true">
- </composite>
+ <comp:composite name="composite.empty" architecture="true">
+ </comp:composite>
- <component className="org.apache.felix.ipojo.test.composite.component.Baz2CheckProvider" name="Baz2CheckProvider" architecture="true">
+ <component classname="org.apache.felix.ipojo.test.composite.component.Baz2CheckProvider" name="Baz2CheckProvider" architecture="true">
<requires field="fs" scope="composite"/>
<provides/>
</component>
diff --git a/ipojo/tests/composite/import-export/src/main/resources/metadata.xml b/ipojo/tests/composite/import-export/src/main/resources/metadata.xml
index cb1e07f..2cce16c 100644
--- a/ipojo/tests/composite/import-export/src/main/resources/metadata.xml
+++ b/ipojo/tests/composite/import-export/src/main/resources/metadata.xml
@@ -1,82 +1,87 @@
<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.composite http://people.apache.org/~clement/ipojo/schemas/composite.xsd"
+ xmlns="org.apache.felix.ipojo"
+ xmlns:comp="org.apache.felix.ipojo.composite"
xmlns:cs="org.apache.felix.ipojo.test.composite.handler.CheckServiceHandler">
- <composite name="composite.requires.1" architecture="true">
+ <comp:composite name="composite.requires.1" architecture="true">
<subservice action="import"
specification="org.apache.felix.ipojo.test.composite.service.FooService"
- scope="composite" />
- </composite>
+ scope="comp:composite" />
+ </comp:composite>
- <composite name="composite.requires.2" architecture="true">
+ <comp:composite name="composite.requires.2" architecture="true">
<subservice action="import"
specification="org.apache.felix.ipojo.test.composite.service.FooService"
- aggregate="true" scope="composite" />
- </composite>
+ aggregate="true" scope="comp:composite" />
+ </comp:composite>
- <composite name="composite.requires.3" architecture="true">
+ <comp:composite name="composite.requires.3" architecture="true">
<subservice action="import"
specification="org.apache.felix.ipojo.test.composite.service.FooService"
- optional="true" scope="composite" />
- </composite>
+ optional="true" scope="comp:composite" />
+ </comp:composite>
- <composite name="composite.requires.4" architecture="true">
+ <comp:composite name="composite.requires.4" architecture="true">
<subservice action="import"
specification="org.apache.felix.ipojo.test.composite.service.FooService"
- optional="true" aggregate="true" scope="composite" />
- </composite>
+ optional="true" aggregate="true" scope="comp:composite" />
+ </comp:composite>
- <composite name="composite.requires.5" architecture="true">
+ <comp:composite name="composite.requires.5" architecture="true">
<subservice action="import"
specification="org.apache.felix.ipojo.test.composite.service.FooService"
- filter="(&(int=2)(long=40))" scope="composite" />
- </composite>
+ filter="(&(int=2)(long=40))" scope="comp:composite" />
+ </comp:composite>
- <composite name="composite.export.1" architecture="true">
+ <comp:composite name="composite.export.1" architecture="true">
<subservice action="import"
specification="org.apache.felix.ipojo.test.composite.service.BazService"
aggregate="true" optional="true" filter="(!(instance.name=export))"
- scope="composite" />
- <provides action="export"
+ scope="comp:composite" />
+ <comp:provides action="export"
specification="org.apache.felix.ipojo.test.composite.service.BazService" />
- </composite>
+ </comp:composite>
- <composite name="composite.export.2" architecture="true">
+ <comp:composite name="composite.export.2" architecture="true">
<subservice action="import"
specification="org.apache.felix.ipojo.test.composite.service.BazService"
- scope="composite" aggregate="true" optional="true"
+ scope="comp:composite" aggregate="true" optional="true"
filter="(!(instance.name=export))" />
- <provides action="export"
+ <comp:provides action="export"
specification="org.apache.felix.ipojo.test.composite.service.BazService"
optional="true" />
- </composite>
+ </comp:composite>
- <composite name="composite.export.3" architecture="true">
+ <comp:composite name="composite.export.3" architecture="true">
<subservice action="import"
specification="org.apache.felix.ipojo.test.composite.service.BazService"
- scope="composite" aggregate="true" optional="true"
+ scope="comp:composite" aggregate="true" optional="true"
filter="(!(instance.name=export))" />
- <provides action="export"
+ <comp:provides action="export"
specification="org.apache.felix.ipojo.test.composite.service.BazService"
aggregate="true" />
- </composite>
+ </comp:composite>
- <composite name="composite.export.4" architecture="true">
+ <comp:composite name="composite.export.4" architecture="true">
<subservice action="import"
specification="org.apache.felix.ipojo.test.composite.service.BazService"
aggregate="true" optional="true" filter="(!(instance.name=export))"
scope="composite" />
- <provides action="export"
+ <comp:provides action="export"
specification="org.apache.felix.ipojo.test.composite.service.BazService"
aggregate="true" optional="true" />
- </composite>
+ </comp:composite>
- <composite name="composite.export.5" architecture="true">
+ <comp:composite name="composite.export.5" architecture="true">
<subservice action="import"
specification="org.apache.felix.ipojo.test.composite.service.BazService"
aggregate="true" optional="true" filter="(!(instance.name=export))"
scope="composite" />
- <provides action="export"
+ <comp:provides action="export"
specification="org.apache.felix.ipojo.test.composite.service.BazService"
filter="(instance.name=foo1)" />
- </composite>
+ </comp:composite>
</ipojo>
diff --git a/ipojo/tests/composite/service-instance/src/main/resources/metadata.xml b/ipojo/tests/composite/service-instance/src/main/resources/metadata.xml
index 4e383dc..ff00ef1 100644
--- a/ipojo/tests/composite/service-instance/src/main/resources/metadata.xml
+++ b/ipojo/tests/composite/service-instance/src/main/resources/metadata.xml
@@ -1,30 +1,36 @@
-<ipojo xmlns:cs="org.apache.felix.ipojo.test.composite.handler.CheckServiceHandler">
- <composite name="composite.bar.1" architecture="true">
+<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.composite http://people.apache.org/~clement/ipojo/schemas/composite.xsd"
+ xmlns="org.apache.felix.ipojo"
+ xmlns:comp="org.apache.felix.ipojo.composite"
+ xmlns:cs="org.apache.felix.ipojo.test.composite.handler.CheckServiceHandler">
+ <comp:composite name="composite.bar.1" architecture="true">
<subservice action="instantiate" specification="org.apache.felix.ipojo.test.composite.service.BarService"/>
- </composite>
+ </comp:composite>
- <composite name="composite.bar.2" architecture="true">
+ <comp:composite name="composite.bar.2" architecture="true">
<subservice action="instantiate" specification="org.apache.felix.ipojo.test.composite.service.BarService" aggregate="true"/>
- </composite>
+ </comp:composite>
- <composite name="composite.bar.3" architecture="true">
+ <comp:composite name="composite.bar.3" architecture="true">
<subservice action="instantiate" specification="org.apache.felix.ipojo.test.composite.service.BarService" optional="true"/>
- </composite>
+ </comp:composite>
- <composite name="composite.bar.4" architecture="true">
+ <comp:composite name="composite.bar.4" architecture="true">
<subservice action="instantiate" specification="org.apache.felix.ipojo.test.composite.service.FooService" aggregate="true" optional="true"/>
- </composite>
+ </comp:composite>
- <composite name="composite.bar.5-accept" architecture="true">
+ <comp:composite name="composite.bar.5-accept" architecture="true">
<subservice action="instantiate" specification="org.apache.felix.ipojo.test.composite.service.FooService">
<property name="boolean" value="true"/>
<property name="string" value="foo"/>
<property name="strAprop" value="{foo, bar, baz}"/>
<property name="int" value="5"/>
</subservice>
- </composite>
+ </comp:composite>
- <composite name="composite.bar.5-refuse1" architecture="true">
+ <comp:composite name="composite.bar.5-refuse1" architecture="true">
<subservice action="instantiate" specification="org.apache.felix.ipojo.test.composite.service.BarService">
<property name="foo" value="bar"/>
<property name="boolean" value="true"/>
@@ -32,23 +38,23 @@
<property name="strAprop" value="{foo, bar, baz}"/>
<property name="int" value="5"/>
</subservice>
- </composite>
+ </comp:composite>
- <composite name="composite.bar.5-refuse2" architecture="true">
+ <comp:composite name="composite.bar.5-refuse2" architecture="true">
<subservice action="instantiate" specification="org.apache.felix.ipojo.test.composite.service.BarService">
<property name="string" value="foo"/>
<property name="strAprop" value="{foo, bar, baz}"/>
</subservice>
- </composite>
+ </comp:composite>
<!-- Instance of a specified component -->
- <composite name="composite.inst.1" architecture="true">
+ <comp:composite name="composite.inst.1" architecture="true">
<instance component="COMPO-FooProviderType-1" /> <!-- name="FooProv" -->
<instance component="COMPO-FooProviderType-Dyn2">
<property name="boolean" value="true"/>
<property name="string" value="foo"/>
<property name="strAProp" value="{a,b,c}"/>
</instance>
- </composite>
+ </comp:composite>
</ipojo>
diff --git a/ipojo/tests/composite/service-providing/src/main/resources/metadata.xml b/ipojo/tests/composite/service-providing/src/main/resources/metadata.xml
index e544b1c..05d4154 100644
--- a/ipojo/tests/composite/service-providing/src/main/resources/metadata.xml
+++ b/ipojo/tests/composite/service-providing/src/main/resources/metadata.xml
@@ -1,150 +1,155 @@
-<ipojo>
- <composite name="composite.test.3" architecture="true">
+<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.composite http://people.apache.org/~clement/ipojo/schemas/composite.xsd"
+ xmlns="org.apache.felix.ipojo"
+ xmlns:comp="org.apache.felix.ipojo.composite">
+ <comp:composite name="composite.test.3" architecture="true">
<subservice action="instantiate"
specification="org.apache.felix.ipojo.test.composite.service.BazService"
aggregate="true" filter="(factory.name=BazProviderType)" />
- <provides action="export"
+ <comp:provides action="export"
specification="org.apache.felix.ipojo.test.composite.service.BazService" />
- </composite>
+ </comp:composite>
- <composite name="composite.test.2" architecture="true">
+ <comp:composite name="composite.test.2" architecture="true">
<subservice action="instantiate"
specification="org.apache.felix.ipojo.test.composite.service.CheckService"
filter="(factory.name=Baz2CheckProvider)" />
- <provides action="export"
+ <comp:provides action="export"
specification="org.apache.felix.ipojo.test.composite.service.CheckService" />
<subservice action="import"
specification="org.apache.felix.ipojo.test.composite.service.BazService"
scope="composite" />
- </composite>
+ </comp:composite>
- <composite name="composite.test.1" architecture="true">
+ <comp:composite name="composite.test.1" architecture="true">
<subservice action="instantiate"
specification="org.apache.felix.ipojo.test.composite.service.BazService"
filter="(factory.name=composite.test.3)" />
<subservice action="instantiate"
specification="org.apache.felix.ipojo.test.composite.service.CheckService"
filter="(factory.name=composite.test.2)" />
- <provides action="export"
+ <comp:provides action="export"
specification="org.apache.felix.ipojo.test.composite.service.CheckService" />
- </composite>
+ </comp:composite>
- <composite name="composite.instantiator" architecture="true">
+ <comp:composite name="composite.instantiator" architecture="true">
<subservice action="instantiate"
specification="org.apache.felix.ipojo.test.composite.service.BazService"
filter="(factory.name=composite.test.3)" />
<subservice action="instantiate"
specification="org.apache.felix.ipojo.test.composite.service.FooService" />
- <provides action="export"
+ <comp:provides action="export"
specification="org.apache.felix.ipojo.test.composite.service.BazService" />
- <provides action="export"
+ <comp:provides action="export"
specification="org.apache.felix.ipojo.test.composite.service.FooService" />
- </composite>
+ </comp:composite>
<!-- Test composition provides -->
- <composite name="comp-0" architecture="true">
+ <comp:composite name="comp-0" architecture="true">
<subservice action="instantiate"
specification="org.apache.felix.ipojo.test.composite.service.Tata" />
<subservice action="import"
specification="org.apache.felix.ipojo.test.composite.service.Toto" />
- <provides action="implement"
+ <comp:provides action="implement"
specification="org.apache.felix.ipojo.test.composite.service.Tota" />
- </composite>
+ </comp:composite>
- <composite name="comp-1" architecture="true">
+ <comp:composite name="comp-1" architecture="true">
<subservice action="instantiate"
specification="org.apache.felix.ipojo.test.composite.service.Tata" />
<subservice action="import"
specification="org.apache.felix.ipojo.test.composite.service.Toto" />
- <provides action="implement"
+ <comp:provides action="implement"
specification="org.apache.felix.ipojo.test.composite.service.Tota">
<delegation method="tataInt" policy="One" />
<delegation method="toto1" policy="All" />
- </provides>
- </composite>
+ </comp:provides>
+ </comp:composite>
- <composite name="comp-2" architecture="true">
+ <comp:composite name="comp-2" architecture="true">
<subservice action="instantiate"
specification="org.apache.felix.ipojo.test.composite.service.Tata"
aggregate="true" />
<subservice action="import"
specification="org.apache.felix.ipojo.test.composite.service.Toto"
aggregate="true" />
- <provides action="implement"
+ <comp:provides action="implement"
specification="org.apache.felix.ipojo.test.composite.service.Tota">
<delegation method="tataInt" policy="One" />
<delegation method="toto1" policy="All" />
- </provides>
- </composite>
+ </comp:provides>
+ </comp:composite>
- <composite name="comp-3" architecture="true">
+ <comp:composite name="comp-3" architecture="true">
<subservice action="instantiate"
specification="org.apache.felix.ipojo.test.composite.service.Tata" />
<subservice action="import"
specification="org.apache.felix.ipojo.test.composite.service.Toto"
optional="true" />
- <provides action="implement"
+ <comp:provides action="implement"
specification="org.apache.felix.ipojo.test.composite.service.Tota">
- </provides>
- </composite>
+ </comp:provides>
+ </comp:composite>
- <composite name="comp-4" architecture="true">
+ <comp:composite name="comp-4" architecture="true">
<subservice action="instantiate"
specification="org.apache.felix.ipojo.test.composite.service.Tata" />
<subservice action="import"
specification="org.apache.felix.ipojo.test.composite.service.Toto"
optional="true" />
- <provides action="implement"
+ <comp:provides action="implement"
specification="org.apache.felix.ipojo.test.composite.service.Tota">
<delegation method="tataInt" policy="One" />
<delegation method="toto1" policy="All" />
- </provides>
- </composite>
+ </comp:provides>
+ </comp:composite>
- <composite name="comp-5" architecture="true">
+ <comp:composite name="comp-5" architecture="true">
<subservice action="instantiate"
specification="org.apache.felix.ipojo.test.composite.service.Tata"
aggregate="true" />
- <!-- <subservice action="import" specification="org.apache.felix.ipojo.test.composite.service.Toto" aggregate ="true" optional="true"/> -->
- <provides action="implement"
+ <!-- <subservice action="import" specification="org.apache.felix.ipojo.test.comp:composite.service.Toto" aggregate ="true" optional="true"/> -->
+ <comp:provides action="implement"
specification="org.apache.felix.ipojo.test.composite.service.Tota">
<delegation method="tataInt" policy="One" />
<delegation method="toto1" policy="All" />
- </provides>
- </composite>
+ </comp:provides>
+ </comp:composite>
- <composite name="comp-6" architecture="true">
+ <comp:composite name="comp-6" architecture="true">
<subservice action="instantiate"
specification="org.apache.felix.ipojo.test.composite.service.Tata"
aggregate="true" />
<subservice action="import"
specification="org.apache.felix.ipojo.test.composite.service.Toto"
aggregate="true" optional="true" />
- <provides action="implement"
+ <comp:provides action="implement"
specification="org.apache.felix.ipojo.test.composite.service.Toto">
<delegation method="toto1" policy="All" />
- </provides>
- <provides action="implement"
+ </comp:provides>
+ <comp:provides action="implement"
specification="org.apache.felix.ipojo.test.composite.service.Tata">
<delegation method="tataInt" policy="One" />
- </provides>
- </composite>
+ </comp:provides>
+ </comp:composite>
- <composite name="comp-7" architecture="true">
+ <comp:composite name="comp-7" architecture="true">
<instance component="tata" />
<subservice action="import"
specification="org.apache.felix.ipojo.test.composite.service.Toto" />
- <provides action="implement"
+ <comp:provides action="implement"
specification="org.apache.felix.ipojo.test.composite.service.Tota" />
- </composite>
+ </comp:composite>
- <composite name="comp-8" architecture="true">
+ <comp:composite name="comp-8" architecture="true">
<instance component="tata" />
<instance component="totoglue" />
<subservice action="import"
specification="org.apache.felix.ipojo.test.composite.service.Toto" />
- <provides action="implement"
+ <comp:provides action="implement"
specification="org.apache.felix.ipojo.test.composite.service.Tota" />
- </composite>
+ </comp:composite>
</ipojo>
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" />
diff --git a/ipojo/tests/handler/eventadmin/src/main/resources/metadata.xml b/ipojo/tests/handler/eventadmin/src/main/resources/metadata.xml
index 977cb3f..bfe82b3 100644
--- a/ipojo/tests/handler/eventadmin/src/main/resources/metadata.xml
+++ b/ipojo/tests/handler/eventadmin/src/main/resources/metadata.xml
@@ -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
diff --git a/ipojo/tests/handler/temporal/src/main/resources/metadata.xml b/ipojo/tests/handler/temporal/src/main/resources/metadata.xml
index 2bbf047..9613248 100644
--- a/ipojo/tests/handler/temporal/src/main/resources/metadata.xml
+++ b/ipojo/tests/handler/temporal/src/main/resources/metadata.xml
@@ -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>
diff --git a/ipojo/tests/handler/whiteboard/src/main/resources/metadata.xml b/ipojo/tests/handler/whiteboard/src/main/resources/metadata.xml
index 0f1da91..2e4666d 100644
--- a/ipojo/tests/handler/whiteboard/src/main/resources/metadata.xml
+++ b/ipojo/tests/handler/whiteboard/src/main/resources/metadata.xml
@@ -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>
diff --git a/ipojo/tests/manipulator/manipulation/src/main/resources/metadata.xml b/ipojo/tests/manipulator/manipulation/src/main/resources/metadata.xml
index dee460f..81053f8 100644
--- a/ipojo/tests/manipulator/manipulation/src/main/resources/metadata.xml
+++ b/ipojo/tests/manipulator/manipulation/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"
+>
<!-- 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">