djencks 2004/02/12 08:29:00
Modified: modules/connector/src/schema geronimo-connector_1_5.xsd xmlconfig.xml modules/connector/src/test-data/connector_1_0 geronimo-ra.xml modules/connector/src/test-data/connector_1_5 geronimo-ra.xml modules/jetty/src/schema geronimo-jetty.xsd xmlconfig.xml modules/jetty/src/test-resources/deployables/war1 geronimo-web2.xml modules/jetty/src/test-resources/deployables/war1/WEB-INF geronimo-web.xml modules/security/src/schema geronimo-security.xsd xmlconfig.xml modules/security/src/test-data/xml/deployment geronimo-security.xml Log: reverse namespace components to correct order Revision Changes Path 1.6 +3 -3 incubator-geronimo/modules/connector/src/schema/geronimo-connector_1_5.xsd Index: geronimo-connector_1_5.xsd =================================================================== RCS file: /home/cvs/incubator-geronimo/modules/connector/src/schema/geronimo-connector_1_5.xsd,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- geronimo-connector_1_5.xsd 10 Feb 2004 19:59:14 -0000 1.5 +++ geronimo-connector_1_5.xsd 12 Feb 2004 16:29:00 -0000 1.6 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" - xmlns:ger="http://org.apache.geronimo/xml/ns/j2ee" - targetNamespace="http://org.apache.geronimo/xml/ns/j2ee" + xmlns:ger="http://geronimo.apache.org/xml/ns/j2ee" + targetNamespace="http://geronimo.apache.org/xml/ns/j2ee" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" @@ -13,7 +13,7 @@ <xsd:documentation> <![CDATA[ documents using this schema should start like: -<connector xmlns="http://org.apache.geronimo/xml/ns/j2ee" +<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee" version="1.5"> @(#)geronimo-connector_1_5.xsds 1.4 +1 -1 incubator-geronimo/modules/connector/src/schema/xmlconfig.xml Index: xmlconfig.xml =================================================================== RCS file: /home/cvs/incubator-geronimo/modules/connector/src/schema/xmlconfig.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xmlconfig.xml 9 Feb 2004 23:13:27 -0000 1.3 +++ xmlconfig.xml 12 Feb 2004 16:29:00 -0000 1.4 @@ -9,7 +9,7 @@ <xb:package>org.apache.geronimo.xbeans.j2ee.connector_1_0</xb:package> </xb:namespace--> - <xb:namespace uri="http://org.apache.geronimo/xml/ns/j2ee"> + <xb:namespace uri="http://geronimo.apache.org/xml/ns/j2ee"> <xb:package>org.apache.geronimo.xbeans.geronimo</xb:package> <xb:prefix>Ger</xb:prefix> </xb:namespace> 1.6 +1 -1 incubator-geronimo/modules/connector/src/test-data/connector_1_0/geronimo-ra.xml Index: geronimo-ra.xml =================================================================== RCS file: /home/cvs/incubator-geronimo/modules/connector/src/test-data/connector_1_0/geronimo-ra.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- geronimo-ra.xml 10 Feb 2004 19:59:14 -0000 1.5 +++ geronimo-ra.xml 12 Feb 2004 16:29:00 -0000 1.6 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<connector xmlns="http://org.apache.geronimo/xml/ns/j2ee" version="1.0"> +<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee" version="1.0"> <resourceadapter> <!-- how can we get rid of this?--> <resourceadapter-name>testRA</resourceadapter-name> 1.6 +1 -1 incubator-geronimo/modules/connector/src/test-data/connector_1_5/geronimo-ra.xml Index: geronimo-ra.xml =================================================================== RCS file: /home/cvs/incubator-geronimo/modules/connector/src/test-data/connector_1_5/geronimo-ra.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- geronimo-ra.xml 10 Feb 2004 19:59:14 -0000 1.5 +++ geronimo-ra.xml 12 Feb 2004 16:29:00 -0000 1.6 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<connector xmlns="http://org.apache.geronimo/xml/ns/j2ee" version="1.5"> +<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee" version="1.5"> <resourceadapter> <resourceadapter-name>testRA</resourceadapter-name> <config-property-setting name="RAStringProperty">NewStringValue</config-property-setting> 1.2 +2 -2 incubator-geronimo/modules/jetty/src/schema/geronimo-jetty.xsd Index: geronimo-jetty.xsd =================================================================== RCS file: /home/cvs/incubator-geronimo/modules/jetty/src/schema/geronimo-jetty.xsd,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- geronimo-jetty.xsd 6 Feb 2004 08:55:49 -0000 1.1 +++ geronimo-jetty.xsd 12 Feb 2004 16:29:00 -0000 1.2 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" - xmlns:ger="http://org.apache.geronimo/xml/ns/web/jetty" - targetNamespace="http://org.apache.geronimo/xml/ns/web/jetty" + xmlns:ger="http://geronimo.apache.org/xml/ns/web/jetty" + targetNamespace="http://geronimo.apache.org/xml/ns/web/jetty" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified" 1.2 +1 -1 incubator-geronimo/modules/jetty/src/schema/xmlconfig.xml Index: xmlconfig.xml =================================================================== RCS file: /home/cvs/incubator-geronimo/modules/jetty/src/schema/xmlconfig.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xmlconfig.xml 6 Feb 2004 08:55:49 -0000 1.1 +++ xmlconfig.xml 12 Feb 2004 16:29:00 -0000 1.2 @@ -1,7 +1,7 @@ <xb:config xmlns:xb="http://www.bea.com/2002/09/xbean/config" > - <xb:namespace uri="http://org.apache.geronimo/xml/ns/web/jetty"> + <xb:namespace uri="http://geronimo.apache.org/xml/ns/web/jetty"> <xb:package>org.apache.geronimo.xbeans.geronimo.deployment.jetty</xb:package> <xb:prefix>Jetty</xb:prefix> </xb:namespace> 1.2 +1 -1 incubator-geronimo/modules/jetty/src/test-resources/deployables/war1/geronimo-web2.xml Index: geronimo-web2.xml =================================================================== RCS file: /home/cvs/incubator-geronimo/modules/jetty/src/test-resources/deployables/war1/geronimo-web2.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- geronimo-web2.xml 6 Feb 2004 08:55:49 -0000 1.1 +++ geronimo-web2.xml 12 Feb 2004 16:29:00 -0000 1.2 @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<jetty:web-app xmlns:jetty="http://org.apache.geronimo/xml/ns/web/jetty"> +<jetty:web-app xmlns:jetty="http://geronimo.apache.org/xml/ns/web/jetty"> <jetty:context-root>/test</jetty:context-root> </jetty:web-app> 1.4 +1 -1 incubator-geronimo/modules/jetty/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml Index: geronimo-web.xml =================================================================== RCS file: /home/cvs/incubator-geronimo/modules/jetty/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- geronimo-web.xml 6 Feb 2004 08:55:49 -0000 1.3 +++ geronimo-web.xml 12 Feb 2004 16:29:00 -0000 1.4 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<jetty:web-app xmlns:jetty="http://org.apache.geronimo/xml/ns/web/jetty"> +<jetty:web-app xmlns:jetty="http://geronimo.apache.org/xml/ns/web/jetty"> <jetty:context-root>/test</jetty:context-root> <jetty:context-priority-classloader>false</jetty:context-priority-classloader> </jetty:web-app> 1.2 +2 -2 incubator-geronimo/modules/security/src/schema/geronimo-security.xsd Index: geronimo-security.xsd =================================================================== RCS file: /home/cvs/incubator-geronimo/modules/security/src/schema/geronimo-security.xsd,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- geronimo-security.xsd 12 Feb 2004 08:14:05 -0000 1.1 +++ geronimo-security.xsd 12 Feb 2004 16:29:00 -0000 1.2 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <xsd:schema - targetNamespace="http://org.apache.geronimo/xml/ns/security" - xmlns:ger="http://org.apache.geronimo/xml/ns/security" + targetNamespace="http://geronimo.apache.org/xml/ns/security" + xmlns:ger="http://geronimo.apache.org/xml/ns/security" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" elementFormDefault="qualified" 1.2 +1 -1 incubator-geronimo/modules/security/src/schema/xmlconfig.xml Index: xmlconfig.xml =================================================================== RCS file: /home/cvs/incubator-geronimo/modules/security/src/schema/xmlconfig.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xmlconfig.xml 12 Feb 2004 08:14:05 -0000 1.1 +++ xmlconfig.xml 12 Feb 2004 16:29:00 -0000 1.2 @@ -1,6 +1,6 @@ <xb:config xmlns:xb="http://www.bea.com/2002/09/xbean/config"> - <xb:namespace uri="http://org.apache.geronimo/xml/ns/security"> + <xb:namespace uri="http://geronimo.apache.org/xml/ns/security"> <xb:package>org.apache.geronimo.xbeans.geronimo.security</xb:package> <xb:prefix>Ger</xb:prefix> </xb:namespace> 1.2 +1 -1 incubator-geronimo/modules/security/src/test-data/xml/deployment/geronimo-security.xml Index: geronimo-security.xml =================================================================== RCS file: /home/cvs/incubator-geronimo/modules/security/src/test-data/xml/deployment/geronimo-security.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- geronimo-security.xml 12 Feb 2004 08:14:05 -0000 1.1 +++ geronimo-security.xml 12 Feb 2004 16:29:00 -0000 1.2 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <security xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://org.apache.geronimo/xml/ns/security" + xmlns="http://geronimo.apache.org/xml/ns/security" version="1.0"> <default-principal> <principal>