gdamour 2005/03/02 06:43:15
Modified: modules/itests/src/ejb/META-INF ejb-jar.xml openejb-jar.xml
Log:
GERONIMO-580
o add an itests test verifying the correct behavior of the implementation.
GERONIMO-598
o add the flush-cache-before-query optional element, which identifies if
the transactional cache should be flushed before the execution of the
associated finder or select operation; and
o update the various XValuedFinder and XValuedSelect in order to flush
the transaction cache if required.
Revision Changes Path
1.7 +58 -0 openejb/modules/itests/src/ejb/META-INF/ejb-jar.xml
Index: ejb-jar.xml
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/itests/src/ejb/META-INF/ejb-jar.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ejb-jar.xml 15 Feb 2005 03:24:04 -0000 1.6
+++ ejb-jar.xml 2 Mar 2005 11:43:15 -0000 1.7
@@ -58,6 +58,30 @@
<!--
########################################################
+ ID: client/tests/entity/cmp/BasicCmpHomeExplicitPK
+ ########################################################
+ -->
+
+ <entity>
+ <description>
+ Same as BasicCmpBean; however primary key is not auto-generated.
+ </description>
+ <ejb-name>BasicCmpBeanExplicitPK</ejb-name>
+ <home>org.openejb.test.entity.cmp.BasicCmpHome</home>
+ <remote>org.openejb.test.entity.cmp.BasicCmpObject</remote>
+ <ejb-class>org.openejb.test.entity.cmp.BasicCmpBean</ejb-class>
+ <persistence-type>Container</persistence-type>
+ <prim-key-class>java.lang.Integer</prim-key-class>
+ <reentrant>false</reentrant>
+ <cmp-version>1.x</cmp-version>
+ <cmp-field><field-name>id</field-name></cmp-field>
+ <cmp-field><field-name>firstName</field-name></cmp-field>
+ <cmp-field><field-name>lastName</field-name></cmp-field>
+ <primkey-field>id</primkey-field>
+ </entity>
+
+ <!--
+ ########################################################
ID: client/tests/entity/cmp/allowed_operations/EntityHome
########################################################
-->
@@ -1037,6 +1061,31 @@
<!--
########################################################
+ ID: client/tests/entity/cmp/SessionFacadeBean
+ ########################################################
+ -->
+
+ <session>
+ <description>A Session Facade Bean for specific CMP tests,
+ e.g. Transaction.
+ </description>
+ <ejb-name>SessionFacadeBean</ejb-name>
+ <home>org.openejb.test.entity.cmp.SessionFacadeHome</home>
+ <remote>org.openejb.test.entity.cmp.SessionFacadeObject</remote>
+
<ejb-class>org.openejb.test.entity.cmp.SessionFacadeBean</ejb-class>
+ <session-type>Stateless</session-type>
+ <transaction-type>Container</transaction-type>
+ <ejb-ref>
+ <ejb-ref-name>ejb/BasicCmpBeanExplicitPK</ejb-ref-name>
+ <ejb-ref-type>Entity</ejb-ref-type>
+ <home>org.openejb.test.entity.cmp.BasicCmpHome</home>
+ <remote>org.openejb.test.entity.cmp.BasicCmpObject</remote>
+ <ejb-link>BasicCmpBeanExplicitPK</ejb-link>
+ </ejb-ref>
+ </session>
+
+ <!--
+ ########################################################
########################################################
###### BMP E N T I T Y B E A N S #################
########################################################
@@ -1393,6 +1442,15 @@
</method>
<trans-attribute>Never</trans-attribute>
</container-transaction>
+
+ <container-transaction>
+ <method>
+ <ejb-name>SessionFacadeBean</ejb-name>
+ <method-name>*</method-name>
+ </method>
+ <trans-attribute>RequiresNew</trans-attribute>
+ </container-transaction>
+
<container-transaction>
<method>
<ejb-name>BasicBmpBean</ejb-name>
1.13 +42 -2 openejb/modules/itests/src/ejb/META-INF/openejb-jar.xml
Index: openejb-jar.xml
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/itests/src/ejb/META-INF/openejb-jar.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- openejb-jar.xml 15 Feb 2005 03:24:05 -0000 1.12
+++ openejb-jar.xml 2 Mar 2005 11:43:15 -0000 1.13
@@ -75,8 +75,20 @@
<ejb-name>StatelessRMIIIOPBean</ejb-name>
<jndi-name>client/tests/stateless/RMI-over-IIOP/EJBHome</jndi-name>
</session>
-
-
+ <session>
+ <ejb-name>BasicStatelessBean</ejb-name>
+ <jndi-name>client/tests/stateless/BasicStatelessHome</jndi-name>
+ <resource-ref>
+
<ref-name>stateless/references/Resource_manager_access</ref-name>
+ <application>null</application>
+ <module>org/apache/geronimo/DefaultDatabase</module>
+ <name>DefaultDatasource</name>
+ </resource-ref>
+ </session>
+ <session>
+ <ejb-name>SessionFacadeBean</ejb-name>
+ <jndi-name>client/tests/entity/cmp/SessionFacadeBean</jndi-name>
+ </session>
<!--
########################################################
@@ -352,6 +364,34 @@
<ejb-ql>
<![CDATA[SELECT OBJECT(a) FROM BasicCmpBean AS a WHERE 1 =
0]]>
</ejb-ql>
+ </query>
+ </entity>
+ <entity>
+ <ejb-name>BasicCmpBeanExplicitPK</ejb-name>
+ <table-name>entity_explicit_pk</table-name>
+ <cmp-field-mapping>
+ <cmp-field-name>id</cmp-field-name>
+ <table-column>id</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>firstName</cmp-field-name>
+ <table-column>first_name</table-column>
+ </cmp-field-mapping>
+ <cmp-field-mapping>
+ <cmp-field-name>lastName</cmp-field-name>
+ <table-column>last_name</table-column>
+ </cmp-field-mapping>
+ <query>
+ <query-method>
+ <method-name>findByLastName</method-name>
+ <method-params>
+ <method-param>java.lang.String</method-param>
+ </method-params>
+ </query-method>
+ <ejb-ql>
+ <![CDATA[SELECT OBJECT(a) FROM BasicCmpBeanExplicitPK AS a
WHERE a.lastName = ?1]]>
+ </ejb-ql>
+ <flush-cache-before-query/>
</query>
</entity>
<entity>
