hogstrom 2005/08/28 13:24:08
Modified: modules/openejb-builder/src/schema openejb-jar.xsd
Log:
Corrected schema problems identified by GERONIMO-937.
Text from JIRA:
I think there are errors in the openejb-jar schema:
<xs:element name="ejb-ql-compiler-factory" minOccurs="0"/>
<xs:element name="db-syntax-factory" minOccurs="0"/>
<xs:element name="enforce-foreign-key-constraints" minOccurs="0"/>
This means that each of those elements has "any" content. I don't think that
is what is intended. I think the first two are supposed to be strings and the
third is supposed to be empty.
I'm going to change this to
<xs:element name="ejb-ql-compiler-factory" type="xs:string"
minOccurs="0"/>
<xs:element name="db-syntax-factory" type="xs:string"
minOccurs="0"/>
<xs:element name="enforce-foreign-key-constraints"
type="openejb:emptyType" minOccurs="0"/>
where
<xs:complexType name="emptyType"/>
Revision Changes Path
1.24 +5 -3
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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- openejb-jar.xsd 26 Aug 2005 08:09:08 -0000 1.23
+++ openejb-jar.xsd 28 Aug 2005 17:24:08 -0000 1.24
@@ -65,14 +65,16 @@
<xs:element name="openejb-jar" type="openejb:openejb-jarType"/>
+ <xs:complexType name="emptyType"/>
+
<xs:complexType name="openejb-jarType">
<xs:sequence>
<xs:element ref="sys:dependency" minOccurs="0"
maxOccurs="unbounded"/>
<!-- use a ref to put this element in the naming namespace
rather than openejb namespace-->
<xs:element ref="naming:cmp-connection-factory" minOccurs="0"/>
- <xs:element name="ejb-ql-compiler-factory" minOccurs="0"/>
- <xs:element name="db-syntax-factory" minOccurs="0"/>
- <xs:element name="enforce-foreign-key-constraints"
minOccurs="0"/>
+ <xs:element name="ejb-ql-compiler-factory" type="xs:string"
minOccurs="0"/>
+ <xs:element name="db-syntax-factory" type="xs:string"
minOccurs="0"/>
+ <xs:element name="enforce-foreign-key-constraints"
type="openejb:emptyType" minOccurs="0"/>
<xs:element name="enterprise-beans">
<xs:complexType>
