djencks 2005/11/21 18:45:42
Modified: modules/openejb-builder/src/schema openejb-jar-2.0.xsd
Log:
GERONIMO-1214 uniformize the classloader directives in geronimo plan schemas
Revision Changes Path
1.7 +11 -9
openejb/modules/openejb-builder/src/schema/openejb-jar-2.0.xsd
Index: openejb-jar-2.0.xsd
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/schema/openejb-jar-2.0.xsd,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- openejb-jar-2.0.xsd 27 Oct 2005 19:10:14 -0000 1.6
+++ openejb-jar-2.0.xsd 21 Nov 2005 23:45:41 -0000 1.7
@@ -69,10 +69,12 @@
<xs:complexType name="openejb-jarType">
<xs:sequence>
- <xs:element ref="sys:import" minOccurs="0"
maxOccurs="unbounded"/>
- <xs:element ref="sys:hidden-classes" minOccurs="0"
maxOccurs="unbounded"/>
- <xs:element ref="sys:non-overridable-classes" minOccurs="0"
maxOccurs="unbounded"/>
- <xs:element ref="sys:dependency" minOccurs="0"
maxOccurs="unbounded"/>
+<!-- <xs:element ref="sys:parent" minOccurs="0"
maxOccurs="unbounded"/>-->
+<!-- <xs:element ref="sys:dependency" minOccurs="0"
maxOccurs="unbounded"/>-->
+<!-- <xs:element ref="sys:hidden-classes" minOccurs="0"
maxOccurs="unbounded"/>-->
+<!-- <xs:element ref="sys:non-overridable-classes" minOccurs="0"
maxOccurs="unbounded"/>-->
+ <xs:group ref="sys:classloader-infoGroup"/>
+
<!-- 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" type="xs:string"
minOccurs="0"/>
@@ -103,7 +105,7 @@
</xs:sequence>
<xs:attribute name="configId" type="xs:string" use="required"/>
<xs:attribute name="parentId" type="xs:string" use="optional"/>
- <xs:attribute name="inverseClassloading" type="xs:boolean"
use="optional"/>
+ <xs:attribute name="inverseClassloading" type="xs:boolean"
use="optional"/>
</xs:complexType>
<!-- session bean section-->
@@ -116,7 +118,7 @@
<xs:group ref="naming:jndiEnvironmentRefsGroup"/>
<xs:element name="web-service-address" type="xs:string"
minOccurs="0"/>
- <xs:element name="web-service-virtual-host" type="xs:string"
minOccurs="0" maxOccurs="unbounded" />
+ <xs:element name="web-service-virtual-host" type="xs:string"
minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="web-service-security"
type="openejb:web-service-securityType" minOccurs="0"/>
</xs:sequence>
<xs:attribute name="id" type="xs:ID"/>
@@ -192,7 +194,7 @@
</xs:complexType>
</xs:element>
<xs:element name="primkey-field" type="xs:string"
minOccurs="0"/>
- <xs:element ref="pkgen:key-generator" minOccurs="0" />
+ <xs:element ref="pkgen:key-generator" minOccurs="0"/>
<xs:element name="prefetch-group" minOccurs="0">
<xs:complexType>
<xs:sequence>
@@ -215,9 +217,9 @@
<xs:element name="isolation-level">
<xs:simpleType>
<xs:restriction base="xs:string">
- <xs:enumeration
value="read-uncommitted"/>
+ <xs:enumeration
value="read-uncommitted"/>
<xs:enumeration value="read-committed"/>
- <xs:enumeration value="repeatable-read"/>
+ <xs:enumeration value="repeatable-read"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
