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/arch/src/main/resources/metadata.xml b/ipojo/arch/src/main/resources/metadata.xml
index 761b8d9..06e13ed 100644
--- a/ipojo/arch/src/main/resources/metadata.xml
+++ b/ipojo/arch/src/main/resources/metadata.xml
@@ -17,14 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<iPOJO>
- <Component className="org.apache.felix.ipojo.arch.ArchCommandImpl"
- factory="false">
+<ipojo>
+ <component classname="org.apache.felix.ipojo.arch.ArchCommandImpl"
+ public="false">
<Provides />
- <Requires field="m_archs" optional="true" />
- <Requires field="m_factories" optional="true"/>
- <Requires field="m_handlers" optional="true"/>
- </Component>
+ <requires field="m_archs" optional="true" />
+ <requires field="m_factories" optional="true"/>
+ <requires field="m_handlers" optional="true"/>
+ </component>
<instance component="org.apache.felix.ipojo.arch.ArchCommandImpl"
name="ArchCommand" />
-</iPOJO>
\ No newline at end of file
+</ipojo>
\ No newline at end of file
diff --git a/ipojo/composite/src/main/resources/composite.xsd b/ipojo/composite/src/main/resources/composite.xsd
new file mode 100644
index 0000000..0b824f3
--- /dev/null
+++ b/ipojo/composite/src/main/resources/composite.xsd
@@ -0,0 +1,130 @@
+<?xml version="1.0"?>
+<xs:schema elementFormDefault="qualified"
+ targetNamespace="org.apache.felix.ipojo.composite"
+ xmlns="org.apache.felix.ipojo.composite"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ipojo="org.apache.felix.ipojo">
+
+ <xs:import namespace="org.apache.felix.ipojo" schemaLocation="http://people.apache.org/~clement/ipojo/schemas/core.xsd"></xs:import>
+ <xs:complexType name="CompositeType">
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="subservice" minOccurs="0"
+ maxOccurs="unbounded">
+ </xs:element>
+ <xs:element ref="provides" minOccurs="0"
+ maxOccurs="unbounded">
+ </xs:element>
+ <xs:element ref="instance" minOccurs="0"
+ maxOccurs="unbounded">
+ </xs:element>
+ <xs:any namespace="##other" processContents="lax"
+ minOccurs="0" maxOccurs="unbounded">
+ </xs:any>
+ </xs:choice>
+ <xs:attribute name="name" type="xs:string" use="optional"></xs:attribute>
+ <xs:attribute name="public" type="xs:boolean" use="optional"></xs:attribute>
+ <xs:attribute name="architecture" type="xs:boolean"
+ use="optional">
+ </xs:attribute>
+ </xs:complexType>
+
+ <xs:element name="subservice" type="SubserviceType" />
+ <xs:element name="provides" type="CompositeProvidesType" />
+
+ <xs:complexType name="CompositeProvidesType">
+ <xs:complexContent>
+ <xs:extension base="ipojo:ServiceDependencyType">
+ <xs:sequence>
+ <xs:element name="delegation" type="DelegationType"></xs:element>
+ </xs:sequence>
+ <xs:attribute name="specification" type="xs:string"
+ use="required">
+ </xs:attribute>
+
+ <xs:attribute name="action">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="implement"></xs:enumeration>
+ <xs:enumeration value="export"></xs:enumeration>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+
+
+
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="SubserviceType">
+ <xs:complexContent>
+ <xs:extension base="ipojo:ServiceDependencyType">
+
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="property" type="CompositePropertyType"></xs:element>
+ </xs:sequence>
+ <xs:attribute name="action" use="required">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="import"></xs:enumeration>
+ <xs:enumeration value="instantiate"></xs:enumeration>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+
+ <xs:attribute name="specification" type="xs:string"
+ use="required">
+ </xs:attribute>
+ <xs:attribute name="context-source" type="xs:string"
+ use="optional">
+ </xs:attribute>
+ <xs:attribute name="scope">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="global"></xs:enumeration>
+ <xs:enumeration value="composite"></xs:enumeration>
+ <xs:enumeration value="composite+global"></xs:enumeration>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:simpleType name="actionType">
+ <xs:restriction base="xs:string"></xs:restriction>
+ </xs:simpleType>
+
+ <xs:complexType name="CompositePropertyType">
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="property" type="CompositePropertyType" minOccurs="0" maxOccurs="unbounded"></xs:element>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:string" use="required"></xs:attribute>
+ <xs:attribute name="value" type="xs:string" use="optional"></xs:attribute>
+ </xs:complexType>
+
+ <xs:complexType name="CompositeInstanceType">
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="property" type="CompositePropertyType"></xs:element>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:string" use="optional"></xs:attribute>
+ <xs:attribute name="component" type="xs:string"
+ use="required">
+ </xs:attribute>
+ </xs:complexType>
+
+ <xs:element name="instance" type="CompositeInstanceType"></xs:element>
+
+ <xs:element name="composite" type="CompositeType"></xs:element>
+
+ <xs:complexType name="DelegationType">
+ <xs:attribute name="method" type="xs:string" use="required"></xs:attribute>
+ <xs:attribute name="policy" use="required">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="all"></xs:enumeration>
+ <xs:enumeration value="one"></xs:enumeration>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:complexType>
+</xs:schema>
\ No newline at end of file
diff --git a/ipojo/core/src/main/resources/core.xsd b/ipojo/core/src/main/resources/core.xsd
new file mode 100644
index 0000000..fd3c636
--- /dev/null
+++ b/ipojo/core/src/main/resources/core.xsd
@@ -0,0 +1,275 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<xs:schema elementFormDefault="qualified" targetNamespace="org.apache.felix.ipojo"
+ xmlns="org.apache.felix.ipojo" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:annotation>
+ <xs:documentation>iPOJO Core XML-Schema.
This grammars models iPOJO descriptor using core features. It provides several extensibility mechanism in order to compose this schema with external handlers and other component implementation type such as compositions.</xs:documentation></xs:annotation>
+ <xs:element name="ipojo">
+ <xs:complexType>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="handler" minOccurs="0" maxOccurs="unbounded">
+ </xs:element>
+ <xs:element ref="instance" minOccurs="0" maxOccurs="unbounded">
+ </xs:element>
+ <xs:element ref="component" minOccurs="0" maxOccurs="unbounded">
+ </xs:element>
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
+ </xs:any>
+ </xs:choice>
+ </xs:complexType>
+ </xs:element>
+ <xs:complexType name="HandlerType">
+ <xs:complexContent>
+ <xs:extension base="RootElementType">
+ <xs:sequence maxOccurs="unbounded" minOccurs="0">
+ <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##any"
+ processContents="skip">
+ </xs:any>
+ </xs:sequence>
+ <xs:attribute name="classname" type="xs:string" use="required">
+ </xs:attribute>
+ <xs:attribute name="name" type="xs:string" use="required">
+ </xs:attribute>
+ <xs:attribute name="namespace" type="xs:string" use="optional">
+ </xs:attribute>
+ <xs:attribute name="architecture" type="xs:boolean"
+ use="optional" fixed="false">
+ </xs:attribute>
+ <xs:attribute name="level" type="xs:int" use="optional">
+ </xs:attribute>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="InstanceType">
+ <xs:complexContent>
+ <xs:extension base="RootElementType">
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="property" type="InstancePropertyType"></xs:element>
+ </xs:sequence>
+ <xs:attribute name="component" type="xs:string"></xs:attribute>
+ <xs:attribute name="name" type="xs:string" use="optional">
+ </xs:attribute>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="InstancePropertyType">
+ <xs:sequence>
+ <xs:element name="property" type="InstancePropertyType" minOccurs="0" maxOccurs="unbounded"></xs:element>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:string" use="optional"></xs:attribute>
+ <xs:attribute name="value" type="xs:string" use="optional"></xs:attribute>
+ <xs:attribute name="type" type="xs:string" use="optional"></xs:attribute>
+ </xs:complexType>
+ <xs:complexType name="RootElementType"></xs:complexType>
+ <xs:complexType name="ComponentType">
+ <xs:annotation>
+ <xs:documentation>
+ Declares an atomic (i.e. primitive) component type
+ </xs:documentation>
+ </xs:annotation>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element ref="callback" minOccurs="0"
+ maxOccurs="unbounded">
+ </xs:element>
+ <xs:element ref="provides" minOccurs="0"
+ maxOccurs="unbounded">
+ </xs:element>
+ <xs:element ref="requires" minOccurs="0"
+ maxOccurs="unbounded">
+ </xs:element>
+ <xs:element ref="properties" minOccurs="0"
+ maxOccurs="unbounded">
+ </xs:element>
+ <xs:element ref="controller" minOccurs="0" maxOccurs="1"></xs:element>
+ <xs:any namespace="##other" processContents="lax"
+ minOccurs="0" maxOccurs="unbounded">
+ </xs:any>
+ </xs:choice>
+ <xs:attribute name="name" type="xs:string" use="optional">
+ <xs:annotation>
+ <xs:documentation>
+ Specifies the name of the component type. This name
+ is used to identify the factory attached to this
+ type. If not specified, the factory name is the
+ implementation class name.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="public" type="xs:boolean" use="optional">
+ <xs:annotation>
+ <xs:documentation>
+ Determines if the component type is public or
+ private. A public factory (default) can be used from
+ any bundles.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="classname" type="xs:string"
+ use="required">
+ <xs:annotation>
+ <xs:documentation>
+ Specifies the implementation class of the component
+ type.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="architecture" type="xs:boolean"
+ use="optional">
+ <xs:annotation>
+ <xs:documentation>
+ Enable or disable the architecture exposition. By
+ default, the architecture is exposed. This allows
+ instance introspection.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute name="immediate" type="xs:boolean"
+ use="optional">
+ </xs:attribute>
+ <xs:attribute name="factory-method" type="xs:string" use="optional"></xs:attribute>
+ </xs:complexType>
+ <xs:complexType name="RequiresType">
+ <xs:complexContent>
+ <xs:extension base="ServiceDependencyType">
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="callback"
+ type="DependencyCallbackType">
+ </xs:element>
+ </xs:sequence>
+
+ <xs:attribute name="interface" type="xs:string"
+ use="optional">
+ </xs:attribute>
+
+ <xs:attribute name="field" type="xs:string"
+ use="optional">
+ </xs:attribute>
+
+ <xs:attribute name="nullable" type="xs:boolean"
+ use="optional">
+ </xs:attribute>
+
+ <xs:attribute name="default-implementation"
+ type="xs:string" use="optional">
+ </xs:attribute>
+
+ <xs:attribute name="from" type="xs:string"
+ use="optional">
+ </xs:attribute>
+
+ <xs:attribute name="scope" use="optional">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="global"></xs:enumeration>
+ <xs:enumeration value="composite"></xs:enumeration>
+ <xs:enumeration value="composite+global"></xs:enumeration>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="DependencyCallbackType">
+ <xs:attribute name="method" type="xs:string" use="required"></xs:attribute>
+ <xs:attribute name="type" use="required">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="bind"></xs:enumeration>
+ <xs:enumeration value="unbind"></xs:enumeration>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:complexType>
+ <xs:complexType name="CallbackType">
+ <xs:annotation>
+ <xs:documentation>Lifecycle Callback.
Allows a POJO to be notified when the instance becomes valid or invalid.</xs:documentation>
+ </xs:annotation>
+ <xs:attribute name="method" type="xs:string" use="required">
+ <xs:annotation>
+ <xs:documentation>Specifies the method to call on the transition</xs:documentation>
+ </xs:annotation></xs:attribute>
+ <xs:attribute name="transition" use="required">
+ <xs:annotation>
+ <xs:documentation>Specifies the transition when the callback needs to be invoked.</xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="validate"></xs:enumeration>
+ <xs:enumeration value="invalidate"></xs:enumeration>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:complexType>
+ <xs:element name="provides" type="ProvidesType" id="provides"></xs:element>
+ <xs:complexType name="ProvidesType">
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="property" type="PropertyType"></xs:element>
+ </xs:sequence>
+ <xs:attribute name="interface" type="xs:string" use="optional"></xs:attribute>
+ <xs:attribute name="factory" type="xs:string" use="optional"></xs:attribute>
+ </xs:complexType>
+ <xs:complexType name="PropertyType">
+ <xs:attribute name="field" type="xs:string" use="optional"></xs:attribute>
+ <xs:attribute name="method" type="xs:string" use="optional"></xs:attribute>
+ <xs:attribute name="name" type="xs:string" use="optional"></xs:attribute>
+ <xs:attribute name="value" type="xs:string" use="optional"></xs:attribute>
+ <xs:attribute name="type" type="xs:string" use="optional"></xs:attribute>
+ </xs:complexType>
+ <xs:element name="callback" type="CallbackType" id="callback"></xs:element>
+ <xs:element name="controller" type="ControllerType" id="controller"></xs:element>
+ <xs:element name="requires" type="RequiresType" id="requires"></xs:element>
+ <xs:element name="component" type="ComponentType" id="component"></xs:element>
+ <xs:element name="handler" type="HandlerType" id="handler"></xs:element>
+ <xs:element name="instance" type="InstanceType" id="instance"></xs:element>
+
+ <xs:element name="properties" type="PropertiesType" id="properties"></xs:element>
+ <xs:complexType name="PropertiesType">
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="property" type="PropertyType"></xs:element>
+ </xs:sequence>
+ <xs:attribute name="propagation" type="xs:boolean" use="optional"></xs:attribute>
+ <xs:attribute name="pid" type="xs:string" use="optional"></xs:attribute>
+ </xs:complexType>
+
+ <xs:complexType name="ServiceDependencyType">
+ <xs:attribute name="optional" type="xs:boolean" use="optional">
+ </xs:attribute>
+ <xs:attribute name="aggregate" type="xs:boolean" use="optional">
+ </xs:attribute>
+ <xs:attribute name="policy" use="optional">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="dynamic"></xs:enumeration>
+ <xs:enumeration value="static"></xs:enumeration>
+ <xs:enumeration value="dynamic-priority"></xs:enumeration>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="comparator" type="xs:string" use="optional">
+ </xs:attribute>
+ <xs:attribute name="filter" type="xs:string" use="optional"></xs:attribute>
+ <xs:attribute name="id" type="xs:string" use="optional"></xs:attribute>
+ </xs:complexType>
+
+ <xs:complexType name="ControllerType">
+ <xs:attribute name="field" type="xs:string" use="required">
+ </xs:attribute>
+ </xs:complexType>
+</xs:schema>
\ No newline at end of file
diff --git a/ipojo/core/src/main/resources/metadata.xml b/ipojo/core/src/main/resources/metadata.xml
index 682549a..354dca3 100644
--- a/ipojo/core/src/main/resources/metadata.xml
+++ b/ipojo/core/src/main/resources/metadata.xml
@@ -16,11 +16,13 @@
specific language governing permissions and limitations
under the License.
-->
-<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">
<!-- Primitives handler -->
<handler
classname="org.apache.felix.ipojo.handlers.lifecycle.controller.ControllerHandler"
- name="controller" architecture="false" />
+ name="controller" architecture="false"/>
<handler
classname="org.apache.felix.ipojo.handlers.lifecycle.callback.LifecycleCallbackHandler"
name="callback" level="1" architecture="false" />
diff --git a/ipojo/examples/junit4osgi/junit4osgi/metadata.xml b/ipojo/examples/junit4osgi/junit4osgi/metadata.xml
index 83d84d3..74c7f08 100644
--- a/ipojo/examples/junit4osgi/junit4osgi/metadata.xml
+++ b/ipojo/examples/junit4osgi/junit4osgi/metadata.xml
@@ -1,13 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
-<iPOJO xmlns:extender="org.apache.felix.ipojo.extender">
- <Component
- className="org.apache.felix.ipojo.junit4osgi.impl.JunitExtender">
+<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.extender http://people.apache.org/~clement/ipojo/schemas/extender-pattern.xsd"
+ xmlns="org.apache.felix.ipojo"
+ xmlns:extender="org.apache.felix.ipojo.extender">
+ <component
+ classname="org.apache.felix.ipojo.junit4osgi.impl.JunitExtender">
<extender:extender extension="Test-Suite"
onArrival="onBundleArrival" onDeparture="onBundleDeparture" />
<callback transition="invalidate" method="stopping" />
<callback transition="validate" method="starting" />
<provides />
- </Component>
+ </component>
<instance
component="org.apache.felix.ipojo.junit4osgi.impl.JunitExtender" />
-</iPOJO>
\ No newline at end of file
+</ipojo>
\ No newline at end of file
diff --git a/ipojo/handler/eventadmin/src/main/resources/event-admin.xsd b/ipojo/handler/eventadmin/src/main/resources/event-admin.xsd
new file mode 100644
index 0000000..943608e
--- /dev/null
+++ b/ipojo/handler/eventadmin/src/main/resources/event-admin.xsd
@@ -0,0 +1,44 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<xs:schema targetNamespace="org.apache.felix.ipojo.handlers.event.EventAdminHandler"
+ xmlns="org.apache.felix.ipojo.handlers.event.EventAdminHandler"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified">
+
+ <xs:complexType name="PublisherType">
+ <xs:attribute name="name" type="xs:string" use="required"></xs:attribute>
+ <xs:attribute name="field" type="xs:string" use="required"></xs:attribute>
+ <xs:attribute name="topics" type="xs:string" use="optional"></xs:attribute>
+ <xs:attribute name="synchronous" type="xs:boolean" use="optional"></xs:attribute>
+ <xs:attribute name="data-key" type="xs:string" use="optional"></xs:attribute>
+ </xs:complexType>
+
+ <xs:complexType name="SubscriberType">
+ <xs:attribute name="name" type="xs:string" use="required"></xs:attribute>
+ <xs:attribute name="callback" type="xs:string" use="required"></xs:attribute>
+ <xs:attribute name="topics" type="xs:string" use="optional"></xs:attribute>
+ <xs:attribute name="filter" type="xs:string" use="optional"></xs:attribute>
+ <xs:attribute name="data-key" type="xs:string" use="optional"></xs:attribute>
+ <xs:attribute name="data-type" type="xs:string" use="optional"></xs:attribute>
+ </xs:complexType>
+
+ <xs:element name="publisher" type="PublisherType"></xs:element>
+ <xs:element name="subscriber" type="SubscriberType"></xs:element>
+
+</xs:schema>
\ No newline at end of file
diff --git a/ipojo/handler/extender/src/main/resources/extender-pattern.xsd b/ipojo/handler/extender/src/main/resources/extender-pattern.xsd
new file mode 100644
index 0000000..96f4063
--- /dev/null
+++ b/ipojo/handler/extender/src/main/resources/extender-pattern.xsd
@@ -0,0 +1,29 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<xs:schema targetNamespace="org.apache.felix.ipojo.extender"
+ xmlns="org.apache.felix.ipojo.extender"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified">
+ <xs:element name="extender" type="ExtenderType"></xs:element>
+ <xs:complexType name="ExtenderType">
+ <xs:attribute name="onArrival" type="xs:string" use="required"></xs:attribute>
+ <xs:attribute name="onDeparture" type="xs:string" use="required"></xs:attribute>
+ <xs:attribute name="extension" type="xs:string" use="required"></xs:attribute>
+ </xs:complexType>
+</xs:schema>
\ No newline at end of file
diff --git a/ipojo/handler/jmx/src/main/resources/jmx.xsd b/ipojo/handler/jmx/src/main/resources/jmx.xsd
new file mode 100644
index 0000000..e31ea2e
--- /dev/null
+++ b/ipojo/handler/jmx/src/main/resources/jmx.xsd
@@ -0,0 +1,60 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<xs:schema targetNamespace="org.apache.felix.ipojo.handlers.jmx"
+ xmlns="org.apache.felix.ipojo.handlers.jmx"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified">
+ <xs:element name="config" type="JMXType"></xs:element>
+
+ <xs:complexType name="JMXType">
+
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="method" type="JMXMethod"></xs:element>
+ <xs:element name="property" type="JMXProperty"></xs:element>
+ </xs:choice>
+ <xs:attribute name="usesMOSGi" type="xs:boolean"
+ use="optional">
+ </xs:attribute>
+ <xs:attribute name="objectName" type="xs:string"
+ use="optional">
+ </xs:attribute>
+ <xs:attribute name="domain" type="xs:string" use="optional"></xs:attribute>
+ <xs:attribute name="name" type="xs:string" use="optional"></xs:attribute>
+
+ </xs:complexType>
+
+ <xs:complexType name="JMXProperty">
+ <xs:attribute name="field" type="xs:string" use="required"></xs:attribute>
+ <xs:attribute name="name" type="xs:string" use="optional"></xs:attribute>
+ <xs:attribute name="rights" use="optional">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="r"></xs:enumeration>
+ <xs:enumeration value="w"></xs:enumeration>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="notification" type="xs:boolean" use="optional"></xs:attribute>
+ </xs:complexType>
+
+ <xs:complexType name="JMXMethod">
+ <xs:attribute name="name" type="xs:string" use="required"></xs:attribute>
+ <xs:attribute name="description" type="xs:string" use="optional"></xs:attribute>
+ </xs:complexType>
+</xs:schema>
\ No newline at end of file
diff --git a/ipojo/handler/temporal/src/main/resources/temporal.xsd b/ipojo/handler/temporal/src/main/resources/temporal.xsd
new file mode 100644
index 0000000..e4d7778
--- /dev/null
+++ b/ipojo/handler/temporal/src/main/resources/temporal.xsd
@@ -0,0 +1,39 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<xs:schema targetNamespace="org.apache.felix.ipojo.handler.temporal"
+ xmlns="org.apache.felix.ipojo.handler.temporal"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified">
+ <xs:element name="requires" type="TemporalServiceDependencyType"></xs:element>
+
+ <xs:complexType name="TemporalServiceDependencyType">
+
+ <xs:attribute name="field" type="xs:string" use="required"></xs:attribute>
+ <xs:attribute name="filter" type="xs:string" use="optional"></xs:attribute>
+ <xs:attribute name="timeout" type="xs:int" use="optional">
+ <xs:annotation>
+ <xs:documentation>Specifies the timeout after which the onTimeout policy is executed.
The value is the time in ms to wait. -1 is used to indicate an infinite wait. </xs:documentation>
+ </xs:annotation></xs:attribute>
+ <xs:attribute name="onTimeout" use="optional" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>Specifies the onTimeout policy. This determines the object to inject when the service stills unavailable when the timeout expires.
Several values are supported:
- 'nullable' means that a Nullable object will be injected
- 'empty-array' injects an empty array (only for aggregate dependency)
- 'null' injects Null
- any other value are interpreted as the default implementation class to use.
If the onTimetout attribute is not specified, a RuntimeException is thrown when the timeout is reached.</xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+</xs:schema>
\ No newline at end of file
diff --git a/ipojo/handler/whiteboard/src/main/resources/whiteboard-pattern.xsd b/ipojo/handler/whiteboard/src/main/resources/whiteboard-pattern.xsd
new file mode 100644
index 0000000..5feb590
--- /dev/null
+++ b/ipojo/handler/whiteboard/src/main/resources/whiteboard-pattern.xsd
@@ -0,0 +1,30 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<xs:schema targetNamespace="org.apache.felix.ipojo.white-board-pattern"
+ xmlns="org.apache.felix.ipojo.white-board-pattern"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified">
+ <xs:element name="wbp" type="WBPType"></xs:element>
+ <xs:complexType name="WBPType">
+ <xs:attribute name="onArrival" type="xs:string" use="required"></xs:attribute>
+ <xs:attribute name="onDeparture" type="xs:string" use="required"></xs:attribute>
+ <xs:attribute name="onModification" type="xs:string" use="optional"></xs:attribute>
+ <xs:attribute name="filter" type="xs:string" use="required"></xs:attribute>
+ </xs:complexType>
+</xs:schema>
\ No newline at end of file
diff --git a/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulator/Pojoization.java b/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulator/Pojoization.java
index 5f05455..15c2b93 100644
--- a/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulator/Pojoization.java
+++ b/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulator/Pojoization.java
@@ -49,8 +49,11 @@
import org.objectweb.asm.ClassReader;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
import org.xml.sax.XMLReader;
+import com.sun.org.apache.xerces.internal.impl.xs.XMLSchemaValidator;
+
/**
* Pojoization allows creating an iPOJO bundle from a "normal" bundle.
* @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
@@ -655,6 +658,13 @@
XMLReader parser = (XMLReader) Class.forName("org.apache.xerces.parsers.SAXParser").newInstance();
XMLMetadataParser handler = new XMLMetadataParser();
parser.setContentHandler(handler);
+ parser.setFeature("http://xml.org/sax/features/validation",
+ true);
+ parser.setFeature("http://apache.org/xml/features/validation/schema",
+ true);
+
+ parser.setErrorHandler(handler);
+
InputSource is = new InputSource(stream);
parser.parse(is);
meta = handler.getMetadata();
@@ -669,6 +679,9 @@
} catch (ParseException e) {
error("Parsing Error when parsing the XML file " + path + " : " + e.getMessage());
return null;
+ } catch (SAXParseException e) {
+ error("Error during metadata parsing at line " + e.getLineNumber() + " : " + e.getMessage());
+ return null;
} catch (SAXException e) {
error("Parsing Error when parsing (Sax Error) the XML file " + path + " : " + e.getMessage());
return null;
diff --git a/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/xml/parser/XMLMetadataParser.java b/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/xml/parser/XMLMetadataParser.java
index e10e762..c583f8c 100644
--- a/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/xml/parser/XMLMetadataParser.java
+++ b/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/xml/parser/XMLMetadataParser.java
@@ -22,15 +22,17 @@
import org.apache.felix.ipojo.metadata.Element;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
+import org.xml.sax.ErrorHandler;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
/**
* XML Metadata parser.
*
* @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
*/
-public class XMLMetadataParser implements ContentHandler {
+public class XMLMetadataParser implements ContentHandler, ErrorHandler {
/**
* Element of the metadata.
@@ -83,11 +85,6 @@
// Get the last element of the list
Element lastElement = removeLastElement();
- // Check if the name is consistent with the name of this end tag
- if (!lastElement.getName().equalsIgnoreCase(qName) && !lastElement.getNameSpace().equalsIgnoreCase(namespaceURI)) {
- throw new SAXException("Parse error when ending an element : " + qName + " [" + namespaceURI + "]");
- }
-
// The name is consistent
// Add this element last element with if it is not the root
if (m_elements.length != 0) {
@@ -174,7 +171,13 @@
* @see org.xml.sax.ContentHandler#startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes)
*/
public void startElement(String namespaceURI, String localName, String qName, Attributes atts) throws SAXException {
- Element elem = new Element(localName, namespaceURI);
+ String namespace = namespaceURI;
+ if (namespaceURI != null
+ && (namespaceURI.equalsIgnoreCase("org.apache.felix.ipojo") || namespaceURI.equalsIgnoreCase("org.apache.felix.ipojo.composite"))) {
+ namespace = null; // Remove the 'org.apache.felix.ipojo' namespace
+ }
+
+ Element elem = new Element(localName, namespace);
for (int i = 0; i < atts.getLength(); i++) {
String name = (String) atts.getLocalName(i);
String ns = (String) atts.getURI(i);
@@ -241,4 +244,26 @@
}
return last;
}
+
+
+ public void error(SAXParseException saxparseexception) throws SAXException {
+ if (saxparseexception.getMessage().contains("cvc-elt.1")) {
+ return; // Do not throw an exception when no schema defined.
+ }
+ throw saxparseexception;
+ }
+
+
+ public void fatalError(SAXParseException saxparseexception)
+ throws SAXException {
+ System.err.println("Fatal error during XML-Schema parsing : " + saxparseexception);
+ throw saxparseexception;
+ }
+
+
+ public void warning(SAXParseException saxparseexception)
+ throws SAXException {
+ System.err.println("Warning : an error was detected in the metadata file : " + saxparseexception);
+
+ }
}
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">