gdamour 2004/10/25 10:24:33
Modified: modules/core/src/schema openejb-jar.xsd
Log:
o Update the way CMR fields are mapped.
The previous implementation was using the <ejb-relation-name> and
<ejb-relationship-role-name> elements, which were optional elements.
The new implementation uses the fact that at least one <relationship-role-source>
and <cmr-field> couple exists for a given relationship.
o It is no more required to configure a TransactionManager for EJB having OTM or MTM
relationships. One uses the TransactionManager contained by the
TransactionContextManager associated to the provided EARContext.
Revision Changes Path
1.12 +17 -3 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- openejb-jar.xsd 15 Oct 2004 14:56:47 -0000 1.11
+++ openejb-jar.xsd 25 Oct 2004 14:24:33 -0000 1.12
@@ -88,7 +88,6 @@
<xs:sequence>
<xs:element name="dependency" type="openejb:dependencyType"
minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="cmp-connection-factory" type="xs:string"
minOccurs="0" maxOccurs="1"/>
- <xs:element name="transaction-manager" type="xs:string" minOccurs="0"/>
<xs:element name="enterprise-beans">
<xs:complexType>
@@ -203,7 +202,7 @@
<xs:complexType name="ejb-relationType">
<xs:sequence>
- <xs:element name="ejb-relation-name" type="xs:string"/>
+ <xs:element name="ejb-relation-name" type="xs:string" minOccurs="0"/>
<xs:element name="many-to-many-table-name" type="xs:string"
minOccurs="0"/>
<xs:element name="ejb-relationship-role"
type="openejb:ejb-relationship-roleType" maxOccurs="2"/>
</xs:sequence>
@@ -211,7 +210,22 @@
<xs:complexType name="ejb-relationship-roleType">
<xs:sequence>
- <xs:element name="ejb-relationship-role-name" type="xs:string"/>
+ <xs:element name="ejb-relationship-role-name" type="xs:string"
minOccurs="0"/>
+ <xs:element name="relationship-role-source">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="ejb-name" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="cmr-field" minOccurs="0">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="cmr-field-name" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="foreign-key-column-on-source" minOccurs="0"/>
<xs:element name="role-mapping">
<xs:complexType>
<xs:sequence>
