djencks 2005/07/13 01:27:10
Modified: modules/openejb-builder/src/schema openejb-jar.xsd
resolver-catalog.xml xmlconfig.xml
Log:
GERONIMO-738 move to xmlbeans v2
Revision Changes Path
1.18 +4 -6
openejb/modules/openejb-builder/src/schema/openejb-jar.xsd
Index: openejb-jar.xsd
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/schema/openejb-jar.xsd,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- openejb-jar.xsd 7 Jul 2005 21:37:07 -0000 1.17
+++ openejb-jar.xsd 13 Jul 2005 05:27:10 -0000 1.18
@@ -58,12 +58,10 @@
attributeFormDefault="unqualified"
version="1.0">
- <xs:import namespace="http://geronimo.apache.org/xml/ns/naming";
schemaLocation="geronimo-naming.xsd"/>
- <xs:import namespace="http://geronimo.apache.org/xml/ns/security";
schemaLocation="geronimo-security.xsd"/>
- <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment";
schemaLocation="geronimo-config.xsd"/>
- <xs:import namespace="http://www.openejb.org/xml/ns/pkgen";
schemaLocation="openejb-pkgen.xsd"/>
-
- <!-- <xs:include schemaLocation="geronimo-security.xsd"/>-->
+ <xs:import namespace="http://geronimo.apache.org/xml/ns/naming";
schemaLocation="schema/geronimo-naming.xsd"/>
+ <xs:import namespace="http://geronimo.apache.org/xml/ns/security";
schemaLocation="schema/geronimo-security.xsd"/>
+ <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment";
schemaLocation="schema/geronimo-config.xsd"/>
+ <xs:import namespace="http://www.openejb.org/xml/ns/pkgen";
schemaLocation="schema/openejb-pkgen.xsd"/>
<xs:group name="openejb-jndiEnvironmentRefsGroup">
<xs:annotation>
1.3 +11 -11
openejb/modules/openejb-builder/src/schema/resolver-catalog.xml
Index: resolver-catalog.xml
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/schema/resolver-catalog.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- resolver-catalog.xml 8 Mar 2005 20:55:58 -0000 1.2
+++ resolver-catalog.xml 13 Jul 2005 05:27:10 -0000 1.3
@@ -1,15 +1,15 @@
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
- <public publicId="http://java.sun.com/xml/ns/j2ee";
- uri="./j2ee_1_4.xsd"/>
-
- <public publicId="http://www.w3.org/XML/1998/namespace";
- uri="./xml.xsd"/>
-
- <public publicId="http://java.sun.com/xml/ns/j2ee";
- uri="./ejb-jar_2_1.xsd"/>
-
- <system
systemId="http://www.ibm.com/webservices/xsd/j2ee_web_services_client_1_1.xsd";
- uri="./j2ee_web_services_client_1_1.xsd"/>
+<!-- <public publicId="http://java.sun.com/xml/ns/j2ee"-->
+<!-- uri="./j2ee_1_4.xsd"/>-->
+<!---->
+<!-- <public publicId="http://www.w3.org/XML/1998/namespace"-->
+<!-- uri="./xml.xsd"/>-->
+<!---->
+<!-- <public publicId="http://java.sun.com/xml/ns/j2ee"-->
+<!-- uri="./ejb-jar_2_1.xsd"/>-->
+<!---->
+<!-- <system
systemId="http://www.ibm.com/webservices/xsd/j2ee_web_services_client_1_1.xsd"-->
+<!-- uri="./j2ee_web_services_client_1_1.xsd"/>-->
</catalog>
1.4 +3 -10 openejb/modules/openejb-builder/src/schema/xmlconfig.xml
Index: xmlconfig.xml
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/schema/xmlconfig.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xmlconfig.xml 7 Jul 2005 21:37:07 -0000 1.3
+++ xmlconfig.xml 13 Jul 2005 05:27:10 -0000 1.4
@@ -6,26 +6,19 @@
<xb:prefix>Openejb</xb:prefix>
</xb:namespace>
- <!--this should be unnecessary. Probably needs xmlbeans plugin to reuse
the naming classes rather than generating duplicates-->
- <xb:namespace uri="http://geronimo.apache.org/xml/ns/naming";>
- <xb:package>org.apache.geronimo.xbeans.geronimo.naming</xb:package>
- <xb:prefix>Ger</xb:prefix>
- </xb:namespace>
- <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>
<xb:namespace uri="http://www.openejb.org/xml/ns/pkgen";>
<xb:package>org.openejb.xbeans.pkgen</xb:package>
<xb:prefix>Ejb</xb:prefix>
</xb:namespace>
+
<xb:namespace uri="http://www.openejb.org/xml/ns/corba-tss-config_1_0";>
<xb:package>org.openejb.xbeans.csiv2.tss</xb:package>
<xb:prefix>TSS</xb:prefix>
</xb:namespace>
+
<xb:namespace uri="http://www.openejb.org/xml/ns/corba-css-config_1_0";>
<xb:package>org.openejb.xbeans.csiv2.css</xb:package>
<xb:prefix>CSS</xb:prefix>
</xb:namespace>
-</xb:config>
\ No newline at end of file
+</xb:config>
