dain 2004/04/19 18:30:46
Modified: modules/itests/src/etc2 ejb-jar.xml openejb-jar.xml
Log:
Finished basic cmp integration
All itests now run successfully
Revision Changes Path
1.5 +24 -4 openejb/modules/itests/src/etc2/ejb-jar.xml
Index: ejb-jar.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/itests/src/etc2/ejb-jar.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ejb-jar.xml 18 Apr 2004 23:35:03 -0000 1.4
+++ ejb-jar.xml 19 Apr 2004 22:30:46 -0000 1.5
@@ -79,6 +79,18 @@
<cmp-field><field-name>firstName</field-name></cmp-field>
<cmp-field><field-name>lastName</field-name></cmp-field>
<primkey-field>id</primkey-field>
+ <env-entry>
+
<env-entry-name>entity/references/JNDI_access_to_java_comp_env</env-entry-name>
+ <env-entry-type>java.lang.String</env-entry-type>
+ <env-entry-value>Success</env-entry-value>
+ </env-entry>
+ <ejb-ref>
+
<ejb-ref-name>entity/beanReferences/Enterprise_bean_access</ejb-ref-name>
+ <ejb-ref-type>Session</ejb-ref-type>
+ <home>org.openejb.test.stateful.BasicStatefulHome</home>
+ <remote>org.openejb.test.stateful.BasicStatefulObject</remote>
+ <ejb-link>BasicStatefulBean</ejb-link>
+ </ejb-ref>
<resource-ref>
<description>
This is a reference to a JDBC database.
@@ -87,6 +99,14 @@
<res-type>javax.sql.DataSource</res-type>
<res-auth>Container</res-auth>
</resource-ref>
+ <resource-ref>
+ <description>
+ This is a reference to a JDBC database.
+ </description>
+
<res-ref-name>entity/references/Resource_manager_access</res-ref-name>
+ <res-type>javax.sql.DataSource</res-type>
+ <res-auth>Container</res-auth>
+ </resource-ref>
</entity>
<!--
@@ -808,12 +828,12 @@
<reentrant>False</reentrant>
<primkey-field>primaryKey</primkey-field>
<env-entry>
-
<env-entry-name>stateless/references/JNDI_access_to_java_comp_env</env-entry-name>
+
<env-entry-name>entity/references/JNDI_access_to_java_comp_env</env-entry-name>
<env-entry-type>java.lang.String</env-entry-type>
<env-entry-value>Success</env-entry-value>
</env-entry>
<ejb-ref>
-
<ejb-ref-name>stateless/beanReferences/Enterprise_bean_access</ejb-ref-name>
+
<ejb-ref-name>entity/beanReferences/Enterprise_bean_access</ejb-ref-name>
<ejb-ref-type>Session</ejb-ref-type>
<home>org.openejb.test.stateful.BasicStatefulHome</home>
<remote>org.openejb.test.stateful.BasicStatefulObject</remote>
@@ -831,7 +851,7 @@
<description>
This is a reference to a JDBC database.
</description>
-
<res-ref-name>stateless/references/Resource_manager_access</res-ref-name>
+
<res-ref-name>entity/references/Resource_manager_access</res-ref-name>
<res-type>javax.sql.DataSource</res-type>
<res-auth>Container</res-auth>
</resource-ref>
@@ -1026,7 +1046,7 @@
<ejb-name>AOBasicCmpBean</ejb-name>
<method-name>*</method-name>
</method>
- <trans-attribute>Supports</trans-attribute>
+ <trans-attribute>Required</trans-attribute>
</container-transaction>
<container-transaction>
<method>
1.5 +77 -23 openejb/modules/itests/src/etc2/openejb-jar.xml
Index: openejb-jar.xml
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/itests/src/etc2/openejb-jar.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openejb-jar.xml 14 Apr 2004 08:33:29 -0000 1.4
+++ openejb-jar.xml 19 Apr 2004 22:30:46 -0000 1.5
@@ -9,6 +9,8 @@
<uri>junit/jars/junit-3.8.jar</uri>
</dependency>
+ <cmp-connection-factory>DefaultDatasource</cmp-connection-factory>
+
<enterprise-beans>
<!--
########################################################
@@ -125,7 +127,7 @@
<target-name>DefaultDatasource</target-name>
</resource-ref>
<resource-ref>
- <ref-name>stateless/references/Resource_manager_access</ref-name>
+ <ref-name>entity/references/Resource_manager_access</ref-name>
<target-name>DefaultDatasource</target-name>
</resource-ref>
</entity>
@@ -146,28 +148,80 @@
<jndi-name>client/tests/entity/bmp/RMI-over-IIOP/EJBHome</jndi-name>
</entity>
+ <!--
+ ########################################################
+ BMP
+ ########################################################
+ -->
+
+ <entity>
+ <ejb-name>BasicCmpBean</ejb-name>
+ <jndi-name>client/tests/entity/cmp/BasicCmpHome</jndi-name>
+ <query>
+ <query-method>
+ <method-name>findByLastName</method-name>
+ <method-params>
+ <method-param>java.lang.String</method-param>
+ </method-params>
+ </query-method>
+ <sql>SELECT id FROM BasicCmp WHERE lastName = ?</sql>
+ </query>
+ <query>
+ <query-method>
+ <method-name>findEmptyCollection</method-name>
+ <method-params/>
+ </query-method>
+ <sql>SELECT id FROM BasicCmp WHERE 1 = 0</sql>
+ </query>
+ <resource-ref>
+ <ref-name>jdbc/basic/entityDatabase</ref-name>
+ <target-name>DefaultDatasource</target-name>
+ </resource-ref>
+ </entity>
+ <entity>
+ <ejb-name>AOBasicCmpBean</ejb-name>
+
<jndi-name>client/tests/entity/cmp/allowed_operations/EntityHome</jndi-name>
+ <query>
+ <query-method>
+ <method-name>findByLastName</method-name>
+ <method-params>
+ <method-param>java.lang.String</method-param>
+ </method-params>
+ </query-method>
+ <sql>SELECT id FROM AOBasicCmp WHERE lastName = ?</sql>
+ </query>
+ <query>
+ <query-method>
+ <method-name>findEmptyCollection</method-name>
+ <method-params/>
+ </query-method>
+ <sql>SELECT id FROM AOBasicCmp WHERE 1 = 0</sql>
+ </query>
+ <resource-ref>
+ <ref-name>jdbc/basic/entityDatabase</ref-name>
+ <target-name>DefaultDatasource</target-name>
+ </resource-ref>
+ <resource-ref>
+ <ref-name>entity/references/Resource_manager_access</ref-name>
+ <target-name>DefaultDatasource</target-name>
+ </resource-ref>
+ </entity>
+ <entity>
+ <ejb-name>EncCmpBean</ejb-name>
+ <jndi-name>client/tests/entity/cmp/EncBean</jndi-name>
+ <resource-ref>
+ <ref-name>jdbc/basic/entityDatabase</ref-name>
+ <target-name>DefaultDatasource</target-name>
+ </resource-ref>
+ <resource-ref>
+ <ref-name>datasource</ref-name>
+ <target-name>DefaultDatasource</target-name>
+ </resource-ref>
+ </entity>
+ <entity>
+ <ejb-name>Cmp RMI-IIOP Bean</ejb-name>
+ <jndi-name>client/tests/entity/cmp/RMI-over-IIOP/EJBHome</jndi-name>
+ </entity>
</enterprise-beans>
- <!-- <ejb-deployment ejb-name="BasicCmpBean"
deployment-id="client/tests/entity/cmp/BasicCmpHome" container-id="Default CMP
Container">-->
- <!-- <resource-link res-ref-name="jdbc/basic/entityDatabase"
res-id="Default JDBC Database"/>-->
- <!-- <query>-->
- <!-- <query-method>-->
- <!-- <method-name>findByLastName</method-name>-->
- <!-- <method-params>-->
- <!-- <method-param>java.lang.String</method-param>-->
- <!-- </method-params>-->
- <!-- </query-method>-->
- <!-- <object-ql>-->
- <!-- SELECT o FROM org.openejb.test.entity.cmp.BasicCmpBean o
WHERE o.lastName = $1 -->
- <!-- </object-ql>-->
- <!-- </query> -->
- <!-- </ejb-deployment>-->
- <!-- <ejb-deployment ejb-name="AOBasicCmpBean"
deployment-id="client/tests/entity/cmp/allowed_operations/EntityHome"
container-id="Default CMP Container">-->
- <!-- <resource-link res-ref-name="jdbc/basic/entityDatabase"
res-id="Default JDBC Database"/>-->
- <!-- </ejb-deployment>-->
- <!-- <ejb-deployment ejb-name="EncCmpBean"
deployment-id="client/tests/entity/cmp/EncBean" container-id="Default CMP
Container">-->
- <!-- <resource-link res-ref-name="datasource" res-id="Default JDBC
Database"/>-->
- <!-- <resource-link res-ref-name="jdbc/basic/entityDatabase"
res-id="Default JDBC Database"/>-->
- <!-- </ejb-deployment>-->
- <!-- <ejb-deployment ejb-name="Cmp RMI-IIOP Bean"
deployment-id="client/tests/entity/cmp/RMI-over-IIOP/EJBHome" container-id="Default
CMP Container"/>-->
</openejb-jar>
\ No newline at end of file
