felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clem...@apache.org
Subject svn commit: r1466071 - in /felix/trunk/ipojo: junit4osgi/junit4osgi/ manipulator/manipulator/src/main/resources/xsd/ runtime/composite/src/main/resources/ runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/ tests/core/configurati...
Date Tue, 09 Apr 2013 15:07:32 GMT
Author: clement
Date: Tue Apr  9 15:07:32 2013
New Revision: 1466071

URL: http://svn.apache.org/r1466071
Log:
Fix XSD locations (due to the CMS change)

Modified:
    felix/trunk/ipojo/junit4osgi/junit4osgi/metadata.xml
    felix/trunk/ipojo/manipulator/manipulator/src/main/resources/xsd/composite.xsd
    felix/trunk/ipojo/runtime/composite/src/main/resources/composite.xsd
    felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/instances.xml
    felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/provider-v1.1.xml
    felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/provider-v1.xml
    felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/vprovider-v1.xml
    felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/vprovider-v2.xml
    felix/trunk/ipojo/tests/core/configuration/src/main/ipojo/metadata.xml
    felix/trunk/ipojo/tests/core/configuration/src/main/ipojo/updated.xml
    felix/trunk/ipojo/tests/core/factory-version/instances.xml
    felix/trunk/ipojo/tests/core/factory-version/provider-v1.1.xml
    felix/trunk/ipojo/tests/core/factory-version/provider-v1.xml
    felix/trunk/ipojo/tests/core/factory-version/vprovider-v1.xml
    felix/trunk/ipojo/tests/core/factory-version/vprovider-v2.xml

Modified: felix/trunk/ipojo/junit4osgi/junit4osgi/metadata.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/junit4osgi/junit4osgi/metadata.xml?rev=1466071&r1=1466070&r2=1466071&view=diff
==============================================================================
--- felix/trunk/ipojo/junit4osgi/junit4osgi/metadata.xml (original)
+++ felix/trunk/ipojo/junit4osgi/junit4osgi/metadata.xml Tue Apr  9 15:07:32 2013
@@ -17,8 +17,8 @@
   under the License.
 -->
 <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"
+  xsi:schemaLocation="org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/CURRENT/core.xsd
+      org.apache.felix.ipojo.extender http://felix.apache.org/ipojo/schemas/CURRENT/extender-pattern.xsd"
   xmlns="org.apache.felix.ipojo"
   xmlns:extender="org.apache.felix.ipojo.extender">
   <component

Modified: felix/trunk/ipojo/manipulator/manipulator/src/main/resources/xsd/composite.xsd
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator/src/main/resources/xsd/composite.xsd?rev=1466071&r1=1466070&r2=1466071&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/manipulator/src/main/resources/xsd/composite.xsd (original)
+++ felix/trunk/ipojo/manipulator/manipulator/src/main/resources/xsd/composite.xsd Tue Apr
 9 15:07:32 2013
@@ -21,7 +21,7 @@
 	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:import namespace="org.apache.felix.ipojo" schemaLocation="http://felix.apache.org/ipojo/schemas/SNAPSHOT/core.xsd"></xs:import>
 	<xs:complexType name="CompositeType">
 		<xs:choice minOccurs="0" maxOccurs="unbounded">
 			<xs:element ref="subservice" minOccurs="0"

Modified: felix/trunk/ipojo/runtime/composite/src/main/resources/composite.xsd
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/composite/src/main/resources/composite.xsd?rev=1466071&r1=1466070&r2=1466071&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/composite/src/main/resources/composite.xsd (original)
+++ felix/trunk/ipojo/runtime/composite/src/main/resources/composite.xsd Tue Apr  9 15:07:32
2013
@@ -21,7 +21,7 @@
 	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:import namespace="org.apache.felix.ipojo" schemaLocation="http://felix.apache.org/ipojo/schemas/SNAPSHOT/core.xsd"></xs:import>
 	<xs:complexType name="CompositeType">
 		<xs:choice minOccurs="0" maxOccurs="unbounded">
 			<xs:element ref="subservice" minOccurs="0"

Modified: felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/instances.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/instances.xml?rev=1466071&r1=1466070&r2=1466071&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/instances.xml
(original)
+++ felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/instances.xml
Tue Apr  9 15:07:32 2013
@@ -18,7 +18,7 @@
   -->
 
 <ipojo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="org.apache.felix.ipojo http://people.apache.org/~clement/ipojo/SCHEMA-DEV/core.xsd"
+	xsi:schemaLocation="org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/SNAPSHOT/core.xsd"
 	xmlns="org.apache.felix.ipojo">
 
 	<instance component="org.apache.felix.ipojo.core.tests.components.MyComponent"

Modified: felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/provider-v1.1.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/provider-v1.1.xml?rev=1466071&r1=1466070&r2=1466071&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/provider-v1.1.xml
(original)
+++ felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/provider-v1.1.xml
Tue Apr  9 15:07:32 2013
@@ -18,7 +18,7 @@
   -->
 
 <ipojo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="org.apache.felix.ipojo http://people.apache.org/~clement/ipojo/SCHEMA-DEV/core.xsd"
+	xsi:schemaLocation="org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/SNAPSHOT/"
 	xmlns="org.apache.felix.ipojo">
 	<component classname="org.apache.felix.ipojo.core.tests.components.MyComponent" version="1.1">
 		<provides/>

Modified: felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/provider-v1.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/provider-v1.xml?rev=1466071&r1=1466070&r2=1466071&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/provider-v1.xml
(original)
+++ felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/provider-v1.xml
Tue Apr  9 15:07:32 2013
@@ -18,7 +18,7 @@
   -->
 
 <ipojo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="org.apache.felix.ipojo http://people.apache.org/~clement/ipojo/SCHEMA-DEV/core.xsd"
+	xsi:schemaLocation="org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/SNAPSHOT/core.xsd"
 	xmlns="org.apache.felix.ipojo">
 	<component classname="org.apache.felix.ipojo.core.tests.components.MyComponent" version="1.0">
 		<provides/>

Modified: felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/vprovider-v1.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/vprovider-v1.xml?rev=1466071&r1=1466070&r2=1466071&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/vprovider-v1.xml
(original)
+++ felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/vprovider-v1.xml
Tue Apr  9 15:07:32 2013
@@ -18,7 +18,7 @@
   -->
 
 <ipojo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="org.apache.felix.ipojo http://people.apache.org/~clement/ipojo/SCHEMA-DEV/core.xsd"
+	xsi:schemaLocation="org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/SNAPSHOT/core.xsd"
 	xmlns="org.apache.felix.ipojo">
 	<component name="provider" classname="org.apache.felix.ipojo.core.tests.components.MyComponent"
version="1.0">
 		<provides/>

Modified: felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/vprovider-v2.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/vprovider-v2.xml?rev=1466071&r1=1466070&r2=1466071&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/vprovider-v2.xml
(original)
+++ felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/main/resources/vprovider-v2.xml
Tue Apr  9 15:07:32 2013
@@ -18,7 +18,7 @@
   -->
 
 <ipojo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="org.apache.felix.ipojo http://people.apache.org/~clement/ipojo/SCHEMA-DEV/core.xsd"
+	xsi:schemaLocation="org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/SNAPSHOT/core.xsd"
 	xmlns="org.apache.felix.ipojo">
 	<component name="provider" classname="org.apache.felix.ipojo.core.tests.components.MyComponent"
version="2.0">
 		<provides/>

Modified: felix/trunk/ipojo/tests/core/configuration/src/main/ipojo/metadata.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/configuration/src/main/ipojo/metadata.xml?rev=1466071&r1=1466070&r2=1466071&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/configuration/src/main/ipojo/metadata.xml (original)
+++ felix/trunk/ipojo/tests/core/configuration/src/main/ipojo/metadata.xml Tue Apr  9 15:07:32
2013
@@ -1,5 +1,5 @@
 <ipojo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="org.apache.felix.ipojo http://people.apache.org/~clement/ipojo/SCHEMA-DEV/core.xsd"
+	xsi:schemaLocation="org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/SNAPSHOT/core.xsd"
 	xmlns="org.apache.felix.ipojo">
 		<component
 		classname="org.apache.felix.ipojo.test.scenarios.component.FooProviderTypeDyn"

Modified: felix/trunk/ipojo/tests/core/configuration/src/main/ipojo/updated.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/configuration/src/main/ipojo/updated.xml?rev=1466071&r1=1466070&r2=1466071&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/configuration/src/main/ipojo/updated.xml (original)
+++ felix/trunk/ipojo/tests/core/configuration/src/main/ipojo/updated.xml Tue Apr  9 15:07:32
2013
@@ -1,5 +1,5 @@
 <ipojo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="org.apache.felix.ipojo http://people.apache.org/~clement/ipojo/SCHEMA-DEV/core.xsd"
+	xsi:schemaLocation="org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/SNAPSHOT/core.xsd"
 	xmlns="org.apache.felix.ipojo">
 	<!--  updated -->
 	 <component

Modified: felix/trunk/ipojo/tests/core/factory-version/instances.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/factory-version/instances.xml?rev=1466071&r1=1466070&r2=1466071&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/factory-version/instances.xml (original)
+++ felix/trunk/ipojo/tests/core/factory-version/instances.xml Tue Apr  9 15:07:32 2013
@@ -1,5 +1,5 @@
 <ipojo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="org.apache.felix.ipojo http://people.apache.org/~clement/ipojo/SCHEMA-DEV/core.xsd"
+	xsi:schemaLocation="org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/SNAPSHOT/core.xsd"
 	xmlns="org.apache.felix.ipojo">
 
 	<instance component="org.apache.felix.ipojo.tests.core.component.MyComponent"

Modified: felix/trunk/ipojo/tests/core/factory-version/provider-v1.1.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/factory-version/provider-v1.1.xml?rev=1466071&r1=1466070&r2=1466071&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/factory-version/provider-v1.1.xml (original)
+++ felix/trunk/ipojo/tests/core/factory-version/provider-v1.1.xml Tue Apr  9 15:07:32 2013
@@ -1,5 +1,5 @@
 <ipojo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="org.apache.felix.ipojo http://people.apache.org/~clement/ipojo/SCHEMA-DEV/core.xsd"
+	xsi:schemaLocation="org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/SNAPSHOT/core.xsd"
 	xmlns="org.apache.felix.ipojo">
 	<component classname="org.apache.felix.ipojo.tests.core.component.MyComponent" version="BuNdlE">
 		<provides/>

Modified: felix/trunk/ipojo/tests/core/factory-version/provider-v1.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/factory-version/provider-v1.xml?rev=1466071&r1=1466070&r2=1466071&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/factory-version/provider-v1.xml (original)
+++ felix/trunk/ipojo/tests/core/factory-version/provider-v1.xml Tue Apr  9 15:07:32 2013
@@ -1,5 +1,5 @@
 <ipojo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="org.apache.felix.ipojo http://people.apache.org/~clement/ipojo/SCHEMA-DEV/core.xsd"
+	xsi:schemaLocation="org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/SNAPSHOT/core.xsd"
 	xmlns="org.apache.felix.ipojo">
 	<component classname="org.apache.felix.ipojo.tests.core.component.MyComponent" version="1.0">
 		<provides/>

Modified: felix/trunk/ipojo/tests/core/factory-version/vprovider-v1.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/factory-version/vprovider-v1.xml?rev=1466071&r1=1466070&r2=1466071&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/factory-version/vprovider-v1.xml (original)
+++ felix/trunk/ipojo/tests/core/factory-version/vprovider-v1.xml Tue Apr  9 15:07:32 2013
@@ -1,5 +1,5 @@
 <ipojo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="org.apache.felix.ipojo http://people.apache.org/~clement/ipojo/SCHEMA-DEV/core.xsd"
+	xsi:schemaLocation="org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/SNAPSHOT/core.xsd"
 	xmlns="org.apache.felix.ipojo">
 	<component name="provider" classname="org.apache.felix.ipojo.tests.core.component.MyComponent"
version="1.0">
 		<provides/>

Modified: felix/trunk/ipojo/tests/core/factory-version/vprovider-v2.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/factory-version/vprovider-v2.xml?rev=1466071&r1=1466070&r2=1466071&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/factory-version/vprovider-v2.xml (original)
+++ felix/trunk/ipojo/tests/core/factory-version/vprovider-v2.xml Tue Apr  9 15:07:32 2013
@@ -1,5 +1,5 @@
 <ipojo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="org.apache.felix.ipojo http://people.apache.org/~clement/ipojo/SCHEMA-DEV/core.xsd"
+	xsi:schemaLocation="org.apache.felix.ipojo http://felix.apache.org/ipojo/schemas/SNAPSHOT/core.xsd"
 	xmlns="org.apache.felix.ipojo">
 	<component name="provider" classname="org.apache.felix.ipojo.tests.core.component.MyComponent"
version="2.0">
 		<provides/>



Mime
View raw message