gdamour 2005/08/05 06:55:29
Added: modules/openejb-builder/src/test-cmp/cmr-mapping
cmr-name-nok-openejb-jar.xml ejb-jar.xml
names-ok-openejb-jar.xml
source-name-nok-openejb-jar.xml
Log:
GERONIMO-827 - Support CMR mapping via ejb-relation-name and
ejb-relationship-role-name.
Revision Changes Path
1.1
openejb/modules/openejb-builder/src/test-cmp/cmr-mapping/cmr-name-nok-openejb-jar.xml
Index: cmr-name-nok-openejb-jar.xml
===================================================================
<?xml version="1.0"?>
<openejb-jar
xmlns="http://www.openejb.org/xml/ns/openejb-jar";
configId="org/openejb/deployment/test"
parentId="org/apache/geronimo/Server">
<cmp-connection-factory>
<application>null</application>
<module>org/apache/geronimo/DefaultDatabase</module>
<name>DefaultDatasource</name>
</cmp-connection-factory>
<enterprise-beans>
<entity>
<ejb-name>A</ejb-name>
<table-name>A</table-name>
<cmp-field-mapping>
<cmp-field-name>field1</cmp-field-name>
<table-column>a1</table-column>
</cmp-field-mapping>
<cmp-field-mapping>
<cmp-field-name>field2</cmp-field-name>
<table-column>a2</table-column>
</cmp-field-mapping>
</entity>
<entity>
<ejb-name>B</ejb-name>
<table-name>B</table-name>
<cmp-field-mapping>
<cmp-field-name>field1</cmp-field-name>
<table-column>b1</table-column>
</cmp-field-mapping>
<cmp-field-mapping>
<cmp-field-name>field2</cmp-field-name>
<table-column>b2</table-column>
</cmp-field-mapping>
<cmp-field-mapping>
<cmp-field-name>field3</cmp-field-name>
<table-column>fka1</table-column>
</cmp-field-mapping>
</entity>
</enterprise-beans>
<relationships>
<ejb-relation>
<ejb-relation-name>relation</ejb-relation-name>
<ejb-relationship-role>
<ejb-relationship-role-name>BSide</ejb-relationship-role-name>
<relationship-role-source>
<ejb-name>A</ejb-name>
</relationship-role-source>
<foreign-key-column-on-source/>
<role-mapping>
<cmr-field-mapping>
<key-column>a1</key-column>
<foreign-key-column>fka1</foreign-key-column>
</cmr-field-mapping>
</role-mapping>
</ejb-relationship-role>
</ejb-relation>
</relationships>
</openejb-jar>
1.1
openejb/modules/openejb-builder/src/test-cmp/cmr-mapping/ejb-jar.xml
Index: ejb-jar.xml
===================================================================
<?xml version="1.0" encoding="US-ASCII"?>
<ejb-jar xmlns="http://java.sun.com/xml/ns/j2ee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd";
version="2.1">
<enterprise-beans>
<entity>
<ejb-name>A</ejb-name>
<local-home>org.openejb.deployment.entity.cmp.cmr.onetoone.ALocalHome</local-home>
<local>org.openejb.deployment.entity.cmp.cmr.onetoone.ALocal</local>
<ejb-class>org.openejb.deployment.entity.cmp.cmr.onetoone.ABean</ejb-class>
<persistence-type>Container</persistence-type>
<prim-key-class>java.lang.Integer</prim-key-class>
<cmp-version>2.x</cmp-version>
<abstract-schema-name>OneToOneA</abstract-schema-name>
<cmp-field>
<field-name>field1</field-name>
</cmp-field>
<cmp-field>
<field-name>field2</field-name>
</cmp-field>
<primkey-field>field1</primkey-field>
</entity>
<entity>
<ejb-name>B</ejb-name>
<local-home>org.openejb.deployment.entity.cmp.cmr.onetoone.BLocalHome</local-home>
<local>org.openejb.deployment.entity.cmp.cmr.onetoone.BLocal</local>
<ejb-class>org.openejb.deployment.entity.cmp.cmr.onetoone.BBean</ejb-class>
<persistence-type>Container</persistence-type>
<prim-key-class>java.lang.Integer</prim-key-class>
<cmp-version>2.x</cmp-version>
<abstract-schema-name>OneToOneB</abstract-schema-name>
<cmp-field>
<field-name>field1</field-name>
</cmp-field>
<cmp-field>
<field-name>field2</field-name>
</cmp-field>
<cmp-field>
<field-name>field3</field-name>
</cmp-field>
<primkey-field>field1</primkey-field>
</entity>
</enterprise-beans>
<relationships>
<ejb-relation>
<ejb-relation-name>relation</ejb-relation-name>
<ejb-relationship-role>
<ejb-relationship-role-name>ASide</ejb-relationship-role-name>
<multiplicity>One</multiplicity>
<cascade-delete/>
<relationship-role-source>
<ejb-name>A</ejb-name>
</relationship-role-source>
<cmr-field>
<cmr-field-name>b</cmr-field-name>
</cmr-field>
</ejb-relationship-role>
<ejb-relationship-role>
<ejb-relationship-role-name>BSide</ejb-relationship-role-name>
<multiplicity>One</multiplicity>
<relationship-role-source>
<ejb-name>B</ejb-name>
</relationship-role-source>
<cmr-field>
<cmr-field-name>a</cmr-field-name>
</cmr-field>
</ejb-relationship-role>
</ejb-relation>
</relationships>
<assembly-descriptor>
<container-transaction>
<method>
<ejb-name>A</ejb-name>
<method-name>*</method-name>
</method>
<trans-attribute>Required</trans-attribute>
</container-transaction>
<container-transaction>
<method>
<ejb-name>B</ejb-name>
<method-name>*</method-name>
</method>
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
</ejb-jar>
1.1
openejb/modules/openejb-builder/src/test-cmp/cmr-mapping/names-ok-openejb-jar.xml
Index: names-ok-openejb-jar.xml
===================================================================
<?xml version="1.0"?>
<openejb-jar
xmlns="http://www.openejb.org/xml/ns/openejb-jar";
configId="org/openejb/deployment/test"
parentId="org/apache/geronimo/Server">
<cmp-connection-factory>
<application>null</application>
<module>org/apache/geronimo/DefaultDatabase</module>
<name>DefaultDatasource</name>
</cmp-connection-factory>
<enterprise-beans>
<entity>
<ejb-name>A</ejb-name>
<table-name>A</table-name>
<cmp-field-mapping>
<cmp-field-name>field1</cmp-field-name>
<table-column>a1</table-column>
</cmp-field-mapping>
<cmp-field-mapping>
<cmp-field-name>field2</cmp-field-name>
<table-column>a2</table-column>
</cmp-field-mapping>
</entity>
<entity>
<ejb-name>B</ejb-name>
<table-name>B</table-name>
<cmp-field-mapping>
<cmp-field-name>field1</cmp-field-name>
<table-column>b1</table-column>
</cmp-field-mapping>
<cmp-field-mapping>
<cmp-field-name>field2</cmp-field-name>
<table-column>b2</table-column>
</cmp-field-mapping>
<cmp-field-mapping>
<cmp-field-name>field3</cmp-field-name>
<table-column>fka1</table-column>
</cmp-field-mapping>
</entity>
</enterprise-beans>
<relationships>
<ejb-relation>
<ejb-relation-name>relation</ejb-relation-name>
<ejb-relationship-role>
<ejb-relationship-role-name>BSide</ejb-relationship-role-name>
<relationship-role-source>
<ejb-name>B</ejb-name>
</relationship-role-source>
<foreign-key-column-on-source/>
<role-mapping>
<cmr-field-mapping>
<key-column>a1</key-column>
<foreign-key-column>fka1</foreign-key-column>
</cmr-field-mapping>
</role-mapping>
</ejb-relationship-role>
</ejb-relation>
</relationships>
</openejb-jar>
1.1
openejb/modules/openejb-builder/src/test-cmp/cmr-mapping/source-name-nok-openejb-jar.xml
Index: source-name-nok-openejb-jar.xml
===================================================================
<?xml version="1.0"?>
<openejb-jar
xmlns="http://www.openejb.org/xml/ns/openejb-jar";
configId="org/openejb/deployment/test"
parentId="org/apache/geronimo/Server">
<cmp-connection-factory>
<application>null</application>
<module>org/apache/geronimo/DefaultDatabase</module>
<name>DefaultDatasource</name>
</cmp-connection-factory>
<enterprise-beans>
<entity>
<ejb-name>A</ejb-name>
<table-name>A</table-name>
<cmp-field-mapping>
<cmp-field-name>field1</cmp-field-name>
<table-column>a1</table-column>
</cmp-field-mapping>
<cmp-field-mapping>
<cmp-field-name>field2</cmp-field-name>
<table-column>a2</table-column>
</cmp-field-mapping>
</entity>
<entity>
<ejb-name>B</ejb-name>
<table-name>B</table-name>
<cmp-field-mapping>
<cmp-field-name>field1</cmp-field-name>
<table-column>b1</table-column>
</cmp-field-mapping>
<cmp-field-mapping>
<cmp-field-name>field2</cmp-field-name>
<table-column>b2</table-column>
</cmp-field-mapping>
<cmp-field-mapping>
<cmp-field-name>field3</cmp-field-name>
<table-column>fka1</table-column>
</cmp-field-mapping>
</entity>
</enterprise-beans>
<relationships>
<ejb-relation>
<ejb-relation-name>relation</ejb-relation-name>
<ejb-relationship-role>
<ejb-relationship-role-name>BSide</ejb-relationship-role-name>
<relationship-role-source>
<ejb-name>B</ejb-name>
</relationship-role-source>
<cmr-field>
<cmr-field-name>b</cmr-field-name>
</cmr-field>
<foreign-key-column-on-source/>
<role-mapping>
<cmr-field-mapping>
<key-column>a1</key-column>
<foreign-key-column>fka1</foreign-key-column>
</cmr-field-mapping>
</role-mapping>
</ejb-relationship-role>
</ejb-relation>
</relationships>
</openejb-jar>
