dain 2004/04/18 19:35:03
Modified: modules/itests/src/etc2 ejb-jar.xml
Log:
Added very basic CMP support
Revision Changes Path
1.4 +199 -182 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ejb-jar.xml 16 Apr 2004 02:21:04 -0000 1.3
+++ ejb-jar.xml 18 Apr 2004 23:35:03 -0000 1.4
@@ -26,31 +26,36 @@
########################################################
-->
-<!-- <entity>-->
-<!-- <description>-->
-<!-- The EmployeeRecord entity bean encapsulates access-->
-<!-- to the employee records.The deployer will use-->
-<!-- container-managed persistence to integrate the-->
-<!-- entity bean with the back-end system managing-->
-<!-- the employee records.-->
-<!-- </description>-->
-<!-- <ejb-name>BasicCmpBean</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>-->
-<!-- <primkey-field>primaryKey</primkey-field>-->
-<!-- <resource-ref>-->
-<!-- <description>-->
-<!-- This is a reference to a JDBC database.-->
-<!-- </description>-->
-<!-- <res-ref-name>jdbc/basic/entityDatabase</res-ref-name>-->
-<!-- <res-type>javax.sql.DataSource</res-type>-->
-<!-- <res-auth>Container</res-auth>-->
-<!-- </resource-ref>-->
-<!-- </entity>-->
+ <entity>
+ <description>
+ The EmployeeRecord entity bean encapsulates access
+ to the employee records.The deployer will use
+ container-managed persistence to integrate the
+ entity bean with the back-end system managing
+ the employee records.
+ </description>
+ <ejb-name>BasicCmpBean</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.BasicCmp2Bean</ejb-class>
+ <persistence-type>Container</persistence-type>
+ <prim-key-class>java.lang.Integer</prim-key-class>
+ <reentrant>False</reentrant>
+ <cmp-version>2.x</cmp-version>
+ <abstract-schema-name>BasicCmp</abstract-schema-name>
+ <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>
+ <resource-ref>
+ <description>
+ This is a reference to a JDBC database.
+ </description>
+ <res-ref-name>jdbc/basic/entityDatabase</res-ref-name>
+ <res-type>javax.sql.DataSource</res-type>
+ <res-auth>Container</res-auth>
+ </resource-ref>
+ </entity>
<!--
########################################################
@@ -58,27 +63,31 @@
########################################################
-->
-<!-- <entity>-->
-<!-- <description>-->
-<!-- blah, blah, blah-->
-<!-- </description>-->
-<!-- <ejb-name>AOBasicCmpBean</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.AllowedOperationsCmpBean</ejb-class>-->
-<!-- <persistence-type>Container</persistence-type>-->
-<!-- <prim-key-class>java.lang.Integer</prim-key-class>-->
-<!-- <reentrant>False</reentrant>-->
-<!-- <primkey-field>primaryKey</primkey-field>-->
-<!-- <resource-ref>-->
-<!-- <description>-->
-<!-- This is a reference to a JDBC database.-->
-<!-- </description>-->
-<!-- <res-ref-name>jdbc/basic/entityDatabase</res-ref-name>-->
-<!-- <res-type>javax.sql.DataSource</res-type>-->
-<!-- <res-auth>Container</res-auth>-->
-<!-- </resource-ref>-->
-<!-- </entity>-->
+ <entity>
+ <description>
+ blah, blah, blah
+ </description>
+ <ejb-name>AOBasicCmpBean</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.AllowedOperationsCmp2Bean</ejb-class>
+ <persistence-type>Container</persistence-type>
+ <prim-key-class>java.lang.Integer</prim-key-class>
+ <reentrant>False</reentrant>
+ <abstract-schema-name>AOBasicCmp</abstract-schema-name>
+ <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>
+ <resource-ref>
+ <description>
+ This is a reference to a JDBC database.
+ </description>
+ <res-ref-name>jdbc/basic/entityDatabase</res-ref-name>
+ <res-type>javax.sql.DataSource</res-type>
+ <res-auth>Container</res-auth>
+ </resource-ref>
+ </entity>
<!--
########################################################
@@ -86,90 +95,94 @@
########################################################
-->
-<!-- <entity>-->
-<!-- <description>-->
-<!-- blah, blah, blah-->
-<!-- </description>-->
-<!-- <ejb-name>EncCmpBean</ejb-name>-->
-<!-- <home>org.openejb.test.entity.cmp.EncCmpHome</home>-->
-<!-- <remote>org.openejb.test.entity.cmp.EncCmpObject</remote>-->
-<!-- <ejb-class>org.openejb.test.entity.cmp.EncCmpBean</ejb-class>-->
-<!-- <persistence-type>Container</persistence-type>-->
-<!-- <prim-key-class>java.lang.Integer</prim-key-class>-->
-<!-- <reentrant>False</reentrant>-->
-<!-- <primkey-field>primaryKey</primkey-field>-->
-<!-- <env-entry>-->
-<!--
<env-entry-name>entity/cmp/references/Boolean</env-entry-name>-->
-<!-- <env-entry-type>java.lang.Boolean</env-entry-type>-->
-<!-- <env-entry-value>true</env-entry-value>-->
-<!-- </env-entry>-->
-<!-- <env-entry>-->
-<!-- <env-entry-name>entity/cmp/references/String</env-entry-name>-->
-<!-- <env-entry-type>java.lang.String</env-entry-type>-->
-<!-- <env-entry-value>1</env-entry-value>-->
-<!-- </env-entry>-->
-<!-- <env-entry>-->
-<!-- <env-entry-name>entity/cmp/references/Double</env-entry-name>-->
-<!-- <env-entry-type>java.lang.Double</env-entry-type>-->
-<!-- <env-entry-value>1</env-entry-value>-->
-<!-- </env-entry>-->
-<!-- <env-entry>-->
-<!-- <env-entry-name>entity/cmp/references/Long</env-entry-name>-->
-<!-- <env-entry-type>java.lang.Long</env-entry-type>-->
-<!-- <env-entry-value>1</env-entry-value>-->
-<!-- </env-entry>-->
-<!-- <env-entry>-->
-<!-- <env-entry-name>entity/cmp/references/Float</env-entry-name>-->
-<!-- <env-entry-type>java.lang.Float</env-entry-type>-->
-<!-- <env-entry-value>1</env-entry-value>-->
-<!-- </env-entry>-->
-<!-- <env-entry>-->
-<!--
<env-entry-name>entity/cmp/references/Integer</env-entry-name>-->
-<!-- <env-entry-type>java.lang.Integer</env-entry-type>-->
-<!-- <env-entry-value>1</env-entry-value>-->
-<!-- </env-entry>-->
-<!-- <env-entry>-->
-<!-- <env-entry-name>entity/cmp/references/Short</env-entry-name>-->
-<!-- <env-entry-type>java.lang.Short</env-entry-type>-->
-<!-- <env-entry-value>1</env-entry-value>-->
-<!-- </env-entry>-->
-<!-- <env-entry>-->
-<!-- <env-entry-name>entity/cmp/references/Byte</env-entry-name>-->
-<!-- <env-entry-type>java.lang.Byte</env-entry-type>-->
-<!-- <env-entry-value>1</env-entry-value>-->
-<!-- </env-entry>-->
-<!-- <ejb-ref>-->
-<!--
<ejb-ref-name>entity/cmp/beanReferences/cmp_entity</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>BasicCmpBean</ejb-link>-->
-<!-- </ejb-ref>-->
-<!-- <ejb-ref>-->
-<!--
<ejb-ref-name>entity/cmp/beanReferences/stateful</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>-->
-<!-- <ejb-ref>-->
-<!--
<ejb-ref-name>entity/cmp/beanReferences/stateless</ejb-ref-name>-->
-<!-- <ejb-ref-type>Session</ejb-ref-type>-->
-<!-- <home>org.openejb.test.stateless.BasicStatelessHome</home>-->
-<!--
<remote>org.openejb.test.stateless.BasicStatelessObject</remote>-->
-<!-- <ejb-link>BasicStatelessBean</ejb-link>-->
-<!-- </ejb-ref>-->
-<!-- <resource-ref>-->
-<!-- <res-ref-name>datasource</res-ref-name>-->
-<!-- <res-type>javax.sql.DataSource</res-type>-->
-<!-- <res-auth>Container</res-auth>-->
-<!-- </resource-ref>-->
-<!-- <resource-ref>-->
-<!-- <res-ref-name>jdbc/basic/entityDatabase</res-ref-name>-->
-<!-- <res-type>javax.sql.DataSource</res-type>-->
-<!-- <res-auth>Container</res-auth>-->
-<!-- </resource-ref>-->
-<!-- </entity>-->
+ <entity>
+ <description>
+ blah, blah, blah
+ </description>
+ <ejb-name>EncCmpBean</ejb-name>
+ <home>org.openejb.test.entity.cmp.EncCmpHome</home>
+ <remote>org.openejb.test.entity.cmp.EncCmpObject</remote>
+ <ejb-class>org.openejb.test.entity.cmp.EncCmp2Bean</ejb-class>
+ <persistence-type>Container</persistence-type>
+ <prim-key-class>java.lang.Integer</prim-key-class>
+ <reentrant>False</reentrant>
+ <abstract-schema-name>EncCmp</abstract-schema-name>
+ <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>
+ <env-entry>
+ <env-entry-name>entity/cmp/references/Boolean</env-entry-name>
+ <env-entry-type>java.lang.Boolean</env-entry-type>
+ <env-entry-value>true</env-entry-value>
+ </env-entry>
+ <env-entry>
+ <env-entry-name>entity/cmp/references/String</env-entry-name>
+ <env-entry-type>java.lang.String</env-entry-type>
+ <env-entry-value>1</env-entry-value>
+ </env-entry>
+ <env-entry>
+ <env-entry-name>entity/cmp/references/Double</env-entry-name>
+ <env-entry-type>java.lang.Double</env-entry-type>
+ <env-entry-value>1</env-entry-value>
+ </env-entry>
+ <env-entry>
+ <env-entry-name>entity/cmp/references/Long</env-entry-name>
+ <env-entry-type>java.lang.Long</env-entry-type>
+ <env-entry-value>1</env-entry-value>
+ </env-entry>
+ <env-entry>
+ <env-entry-name>entity/cmp/references/Float</env-entry-name>
+ <env-entry-type>java.lang.Float</env-entry-type>
+ <env-entry-value>1</env-entry-value>
+ </env-entry>
+ <env-entry>
+ <env-entry-name>entity/cmp/references/Integer</env-entry-name>
+ <env-entry-type>java.lang.Integer</env-entry-type>
+ <env-entry-value>1</env-entry-value>
+ </env-entry>
+ <env-entry>
+ <env-entry-name>entity/cmp/references/Short</env-entry-name>
+ <env-entry-type>java.lang.Short</env-entry-type>
+ <env-entry-value>1</env-entry-value>
+ </env-entry>
+ <env-entry>
+ <env-entry-name>entity/cmp/references/Byte</env-entry-name>
+ <env-entry-type>java.lang.Byte</env-entry-type>
+ <env-entry-value>1</env-entry-value>
+ </env-entry>
+ <ejb-ref>
+ <ejb-ref-name>entity/cmp/beanReferences/cmp_entity</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>BasicCmpBean</ejb-link>
+ </ejb-ref>
+ <ejb-ref>
+ <ejb-ref-name>entity/cmp/beanReferences/stateful</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>
+ <ejb-ref>
+ <ejb-ref-name>entity/cmp/beanReferences/stateless</ejb-ref-name>
+ <ejb-ref-type>Session</ejb-ref-type>
+ <home>org.openejb.test.stateless.BasicStatelessHome</home>
+ <remote>org.openejb.test.stateless.BasicStatelessObject</remote>
+ <ejb-link>BasicStatelessBean</ejb-link>
+ </ejb-ref>
+ <resource-ref>
+ <res-ref-name>datasource</res-ref-name>
+ <res-type>javax.sql.DataSource</res-type>
+ <res-auth>Container</res-auth>
+ </resource-ref>
+ <resource-ref>
+ <res-ref-name>jdbc/basic/entityDatabase</res-ref-name>
+ <res-type>javax.sql.DataSource</res-type>
+ <res-auth>Container</res-auth>
+ </resource-ref>
+ </entity>
<!--
########################################################
@@ -177,30 +190,34 @@
########################################################
-->
-<!-- <entity>-->
-<!-- <description>-->
-<!-- blah, blah, blah-->
-<!-- </description>-->
-<!-- <ejb-name>Cmp RMI-IIOP Bean</ejb-name>-->
-<!-- <home>org.openejb.test.entity.cmp.RmiIiopCmpHome</home>-->
-<!-- <remote>org.openejb.test.entity.cmp.RmiIiopCmpObject</remote>-->
-<!-- <ejb-class>org.openejb.test.entity.cmp.RmiIiopCmpBean</ejb-class>-->
-<!-- <persistence-type>Container</persistence-type>-->
-<!-- <prim-key-class>java.lang.Integer</prim-key-class>-->
-<!-- <reentrant>False</reentrant>-->
-<!-- <primkey-field>primaryKey</primkey-field>-->
-<!-- <ejb-ref>-->
-<!-- <ejb-ref-name>cmp/rmi-iiop/home</ejb-ref-name>-->
-<!-- <ejb-ref-type>Entity</ejb-ref-type>-->
-<!-- <home>org.openejb.test.entity.cmp.EncCmpHome</home>-->
-<!-- <remote>org.openejb.test.entity.cmp.EncCmpObject</remote>-->
-<!-- <ejb-link>EncCmpBean</ejb-link>-->
-<!-- </ejb-ref>-->
-<!-- <security-role-ref>-->
-<!-- <role-name>TheMan</role-name>-->
-<!-- <role-link>Executive</role-link>-->
-<!-- </security-role-ref>-->
-<!-- </entity>-->
+ <entity>
+ <description>
+ blah, blah, blah
+ </description>
+ <ejb-name>Cmp RMI-IIOP Bean</ejb-name>
+ <home>org.openejb.test.entity.cmp.RmiIiopCmpHome</home>
+ <remote>org.openejb.test.entity.cmp.RmiIiopCmpObject</remote>
+ <ejb-class>org.openejb.test.entity.cmp.RmiIiopCmp2Bean</ejb-class>
+ <persistence-type>Container</persistence-type>
+ <prim-key-class>java.lang.Integer</prim-key-class>
+ <reentrant>False</reentrant>
+ <abstract-schema-name>CmpRmiIiop</abstract-schema-name>
+ <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>
+ <ejb-ref>
+ <ejb-ref-name>cmp/rmi-iiop/home</ejb-ref-name>
+ <ejb-ref-type>Entity</ejb-ref-type>
+ <home>org.openejb.test.entity.cmp.EncCmpHome</home>
+ <remote>org.openejb.test.entity.cmp.EncCmpObject</remote>
+ <ejb-link>EncCmpBean</ejb-link>
+ </ejb-ref>
+ <security-role-ref>
+ <role-name>TheMan</role-name>
+ <role-link>Executive</role-link>
+ </security-role-ref>
+ </entity>
<!--
########################################################
@@ -997,34 +1014,34 @@
</method>
<trans-attribute>Supports</trans-attribute>
</container-transaction>
-<!-- <container-transaction>-->
-<!-- <method>-->
-<!-- <ejb-name>BasicCmpBean</ejb-name>-->
-<!-- <method-name>*</method-name>-->
-<!-- </method>-->
-<!-- <trans-attribute>Supports</trans-attribute>-->
-<!-- </container-transaction>-->
-<!-- <container-transaction>-->
-<!-- <method>-->
-<!-- <ejb-name>AOBasicCmpBean</ejb-name>-->
-<!-- <method-name>*</method-name>-->
-<!-- </method>-->
-<!-- <trans-attribute>Supports</trans-attribute>-->
-<!-- </container-transaction>-->
-<!-- <container-transaction>-->
-<!-- <method>-->
-<!-- <ejb-name>EncCmpBean</ejb-name>-->
-<!-- <method-name>*</method-name>-->
-<!-- </method>-->
-<!-- <trans-attribute>Supports</trans-attribute>-->
-<!-- </container-transaction>-->
-<!-- <container-transaction>-->
-<!-- <method>-->
-<!-- <ejb-name>Cmp RMI-IIOP Bean</ejb-name>-->
-<!-- <method-name>*</method-name>-->
-<!-- </method>-->
-<!-- <trans-attribute>Never</trans-attribute>-->
-<!-- </container-transaction>-->
+ <container-transaction>
+ <method>
+ <ejb-name>BasicCmpBean</ejb-name>
+ <method-name>*</method-name>
+ </method>
+ <trans-attribute>Supports</trans-attribute>
+ </container-transaction>
+ <container-transaction>
+ <method>
+ <ejb-name>AOBasicCmpBean</ejb-name>
+ <method-name>*</method-name>
+ </method>
+ <trans-attribute>Supports</trans-attribute>
+ </container-transaction>
+ <container-transaction>
+ <method>
+ <ejb-name>EncCmpBean</ejb-name>
+ <method-name>*</method-name>
+ </method>
+ <trans-attribute>Supports</trans-attribute>
+ </container-transaction>
+ <container-transaction>
+ <method>
+ <ejb-name>Cmp RMI-IIOP Bean</ejb-name>
+ <method-name>*</method-name>
+ </method>
+ <trans-attribute>Never</trans-attribute>
+ </container-transaction>
<container-transaction>
<method>
<ejb-name>EncStatefulBean</ejb-name>
