dain 2006/02/01 06:50:15
Modified: modules/openejb-builder/src/test-cmp/onetomany/compoundpk
cascade-delete-ejb-jar.xml ejb-jar.xml
Log:
Major refactor
Split container into an object to represent a deployed ejb and a set of
shared containers which process invocations
Introduced interface between CMP container and CMP engine
Revision Changes Path
1.3 +23 -3
openejb/modules/openejb-builder/src/test-cmp/onetomany/compoundpk/cascade-delete-ejb-jar.xml
Index: cascade-delete-ejb-jar.xml
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test-cmp/onetomany/compoundpk/cascade-delete-ejb-jar.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cascade-delete-ejb-jar.xml 17 May 2005 15:49:38 -0000 1.2
+++ cascade-delete-ejb-jar.xml 1 Feb 2006 11:50:15 -0000 1.3
@@ -14,6 +14,7 @@
<ejb-class>org.openejb.deployment.entity.cmp.cmr.onetomany.ABean</ejb-class>
<persistence-type>Container</persistence-type>
<prim-key-class>org.openejb.deployment.entity.cmp.cmr.CompoundPK</prim-key-class>
+ <reentrant>false</reentrant>
<cmp-version>2.x</cmp-version>
<abstract-schema-name>onetomanyA</abstract-schema-name>
<cmp-field>
@@ -22,6 +23,16 @@
<cmp-field>
<field-name>field2</field-name>
</cmp-field>
+ <query>
+ <!-- CompondPK one-to-many shares the local home interface
so we need to declare this useless finder -->
+ <query-method>
+ <method-name>findByPrimaryKey</method-name>
+ <method-params>
+ <method-param>java.lang.Integer</method-param>
+ </method-params>
+ </query-method>
+ <ejb-ql>SELECT OBJECT(A) FROM onetomanyA A</ejb-ql>
+ </query>
</entity>
<entity>
<ejb-name>B</ejb-name>
@@ -29,7 +40,8 @@
<local>org.openejb.deployment.entity.cmp.cmr.onetomany.BLocal</local>
<ejb-class>org.openejb.deployment.entity.cmp.cmr.onetomany.BBean</ejb-class>
<persistence-type>Container</persistence-type>
- <prim-key-class>java.lang.Integer</prim-key-class>
+
<prim-key-class>org.openejb.deployment.entity.cmp.cmr.CompoundPK</prim-key-class>
+ <reentrant>false</reentrant>
<cmp-version>2.x</cmp-version>
<abstract-schema-name>onetomanyB</abstract-schema-name>
<cmp-field>
@@ -44,7 +56,16 @@
<cmp-field>
<field-name>field4</field-name>
</cmp-field>
- <primkey-field>field1</primkey-field>
+ <query>
+ <!-- CompondPK one-to-many shares the local home interface
so we need to declare this useless finder -->
+ <query-method>
+ <method-name>findByPrimaryKey</method-name>
+ <method-params>
+ <method-param>java.lang.Integer</method-param>
+ </method-params>
+ </query-method>
+ <ejb-ql>SELECT OBJECT(B) FROM onetomanyB B</ejb-ql>
+ </query>
</entity>
</enterprise-beans>
<relationships>
@@ -89,5 +110,4 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
</ejb-jar>
1.4 +20 -1
openejb/modules/openejb-builder/src/test-cmp/onetomany/compoundpk/ejb-jar.xml
Index: ejb-jar.xml
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test-cmp/onetomany/compoundpk/ejb-jar.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ejb-jar.xml 10 Sep 2005 14:49:09 -0000 1.3
+++ ejb-jar.xml 1 Feb 2006 11:50:15 -0000 1.4
@@ -23,6 +23,16 @@
<cmp-field>
<field-name>field2</field-name>
</cmp-field>
+ <query>
+ <!-- CompondPK one-to-many shares the local home interface
so we need to declare this useless finder -->
+ <query-method>
+ <method-name>findByPrimaryKey</method-name>
+ <method-params>
+ <method-param>java.lang.Integer</method-param>
+ </method-params>
+ </query-method>
+ <ejb-ql>SELECT OBJECT(A) FROM onetomanyA A</ejb-ql>
+ </query>
</entity>
<entity>
<ejb-name>B</ejb-name>
@@ -46,6 +56,16 @@
<cmp-field>
<field-name>field4</field-name>
</cmp-field>
+ <query>
+ <!-- CompondPK one-to-many shares the local home interface
so we need to declare this useless finder -->
+ <query-method>
+ <method-name>findByPrimaryKey</method-name>
+ <method-params>
+ <method-param>java.lang.Integer</method-param>
+ </method-params>
+ </query-method>
+ <ejb-ql>SELECT OBJECT(B) FROM onetomanyB B</ejb-ql>
+ </query>
</entity>
</enterprise-beans>
<relationships>
@@ -89,5 +109,4 @@
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
-
</ejb-jar>
