djencks 2004/09/24 03:18:55
Modified: modules/core/src/schema geronimo-naming.xsd openejb-jar.xsd
xmlconfig.xml
Log:
Use namespace rewriting to eliminate refAdapter use. Fix broken jndi for
non-app-client clients. Clean up exception handling. Fix invalid openejb-dd
Revision Changes Path
1.2 +8 -10 openejb/modules/core/src/schema/geronimo-naming.xsd
Index: geronimo-naming.xsd
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/schema/geronimo-naming.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geronimo-naming.xsd 1 Apr 2004 22:36:52 -0000 1.1
+++ geronimo-naming.xsd 24 Sep 2004 07:18:55 -0000 1.2
@@ -17,7 +17,8 @@
-->
<xsd:schema
- xmlns:j2ee="http://java.sun.com/xml/ns/j2ee";
+ targetNamespace="http://geronimo.apache.org/xml/ns/naming";
+ xmlns:gernaming="http://geronimo.apache.org/xml/ns/naming";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
elementFormDefault="qualified"
attributeFormDefault="unqualified"
@@ -33,7 +34,7 @@
</xsd:documentation>
</xsd:annotation>
- <xsd:import namespace="http://java.sun.com/xml/ns/j2ee";
schemaLocation="j2ee_1_4.xsd"/>
+ <!--xsd:import namespace="http://java.sun.com/xml/ns/j2ee";
schemaLocation="j2ee_1_4.xsd"/-->
<xsd:group name="jndiEnvironmentRefsGroup">
<xsd:annotation>
@@ -49,21 +50,18 @@
type="env-entryType"
minOccurs="0" maxOccurs="unbounded"/-->
<xsd:element name="ejb-ref"
- type="remote-refType"
+ type="gernaming:remote-refType"
minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="ejb-local-ref"
- type="local-refType"
+ type="gernaming:local-refType"
minOccurs="0" maxOccurs="unbounded"/>
<!-- leave web services out until I know what they do -->
<!--xsd:group ref="service-refGroup"/-->
<xsd:element name="resource-ref"
- type="local-refType"
+ type="gernaming:local-refType"
minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="resource-env-ref"
- type="local-refType"
- minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="message-destination-ref"
- type="remote-refType"
+ type="gernaming:local-refType"
minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:group>
@@ -84,7 +82,7 @@
<xsd:complexType name="local-refType">
<xsd:complexContent>
- <xsd:restriction base="remote-refType">
+ <xsd:restriction base="gernaming:remote-refType">
<xsd:sequence>
<xsd:element name="ref-name" type="xsd:string"/>
<xsd:choice>
1.7 +13 -5 openejb/modules/core/src/schema/openejb-jar.xsd
Index: openejb-jar.xsd
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/schema/openejb-jar.xsd,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- openejb-jar.xsd 27 Jul 2004 02:11:09 -0000 1.6
+++ openejb-jar.xsd 24 Sep 2004 07:18:55 -0000 1.7
@@ -49,12 +49,17 @@
<xs:schema
xmlns:openejb="http://www.openejb.org/xml/ns/openejb-jar";
targetNamespace="http://www.openejb.org/xml/ns/openejb-jar";
+ xmlns:naming="http://geronimo.apache.org/xml/ns/naming";
xmlns:xs="http://www.w3.org/2001/XMLSchema";
elementFormDefault="qualified"
attributeFormDefault="unqualified"
version="1.0">
+ <xs:import namespace="http://geronimo.apache.org/xml/ns/naming";
schemaLocation="geronimo-naming.xsd"/>
+
+ <!--
<xs:include schemaLocation="geronimo-naming.xsd"/>
+ -->
<xs:include schemaLocation="geronimo-common.xsd"/>
<xs:include schemaLocation="geronimo-security.xsd"/>
@@ -108,7 +113,8 @@
<xs:element name="jndi-name" type="xs:string" minOccurs="0"
maxOccurs="unbounded"/>
<xs:element name="local-jndi-name" type="xs:string" minOccurs="0"
maxOccurs="unbounded"/>
- <xs:group ref="openejb:openejb-jndiEnvironmentRefsGroup"/>
+ <xs:group ref="naming:jndiEnvironmentRefsGroup"/>
+ <!--xs:group ref="openejb:openejb-jndiEnvironmentRefsGroup"/-->
</xs:sequence>
<xs:attribute name="id" type="xs:ID"/>
</xs:complexType>
@@ -121,8 +127,9 @@
<xs:element name="query" type="openejb:queryType" minOccurs="0"
maxOccurs="unbounded"/>
- <xs:group ref="openejb:openejb-jndiEnvironmentRefsGroup"/>
- </xs:sequence>
+ <xs:group ref="naming:jndiEnvironmentRefsGroup"/>
+ <!--xs:group ref="openejb:openejb-jndiEnvironmentRefsGroup"/-->
+ </xs:sequence>
<xs:attribute name="id" type="xs:ID"/>
</xs:complexType>
@@ -153,8 +160,9 @@
<xs:element name="resource-adapter-name" type="xs:string"/>
<xs:element name="activation-spec-class" type="xs:string"/>
- <xs:group ref="openejb:openejb-jndiEnvironmentRefsGroup"/>
- </xs:sequence>
+ <xs:group ref="naming:jndiEnvironmentRefsGroup"/>
+ <!--xs:group ref="openejb:openejb-jndiEnvironmentRefsGroup"/-->
+ </xs:sequence>
<xs:attribute name="id" type="xs:ID"/>
</xs:complexType>
1.2 +2 -2 openejb/modules/core/src/schema/xmlconfig.xml
Index: xmlconfig.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/core/src/schema/xmlconfig.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xmlconfig.xml 1 Apr 2004 22:36:52 -0000 1.1
+++ xmlconfig.xml 24 Sep 2004 07:18:55 -0000 1.2
@@ -7,8 +7,8 @@
</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/j2ee";>
- <xb:package>org.apache.geronimo.xbeans.geronimo</xb:package>
+ <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>
