gdamour 2005/08/05 06:55:29
Modified: modules/openejb-builder/src/schema openejb-jar.xsd
Log:
GERONIMO-827 - Support CMR mapping via ejb-relation-name and
ejb-relationship-role-name.
Revision Changes Path
1.19 +12 -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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- openejb-jar.xsd 13 Jul 2005 05:27:10 -0000 1.18
+++ openejb-jar.xsd 5 Aug 2005 10:55:29 -0000 1.19
@@ -105,7 +105,12 @@
</xs:complexType>
</xs:element>
- <xs:element name="relationships"
type="openejb:relationshipsType" minOccurs="0"/>
+ <xs:element name="relationships"
type="openejb:relationshipsType" minOccurs="0">
+ <xs:unique name="relationship-name-uniqueness">
+ <xs:selector xpath="openejb:ejb-relation"/>
+ <xs:field xpath="openejb:ejb-relation-name"/>
+ </xs:unique>
+ </xs:element>
<xs:element ref="security:security" minOccurs="0"/>
<xs:element ref="sys:gbean" minOccurs="0" maxOccurs="unbounded"/>
@@ -114,7 +119,6 @@
<xs:attribute name="parentId" type="xs:string" use="optional"/>
</xs:complexType>
-
<!-- session bean section-->
<xs:complexType name="session-beanType">
<xs:sequence>
@@ -286,7 +290,12 @@
<xs:complexType name="relationshipsType">
<xs:sequence>
- <xs:element name="ejb-relation" type="openejb:ejb-relationType"
maxOccurs="unbounded"/>
+ <xs:element name="ejb-relation" type="openejb:ejb-relationType"
maxOccurs="unbounded">
+ <xs:unique name="role-name-uniqueness">
+ <xs:selector
xpath=".//openejb:ejb-relationship-role-name"/>
+ <xs:field xpath="."/>
+ </xs:unique>
+ </xs:element>
</xs:sequence>
</xs:complexType>
