dain 2004/10/13 14:53:24
Modified: modules/itests/src/ejb/META-INF ejb-jar.xml openejb-jar.xml
Log:
CMP 1.1 beans now deploy... you can't use them but deployment won't complain
Synchronized version-info with geronimo
Revision Changes Path
1.2 +263 -9 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ejb-jar.xml 8 Sep 2004 17:08:30 -0000 1.1
+++ ejb-jar.xml 13 Oct 2004 18:53:23 -0000 1.2
@@ -37,12 +37,11 @@
<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>
+ <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>2.x</cmp-version>
- <abstract-schema-name>BasicCmp</abstract-schema-name>
+ <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>
@@ -70,11 +69,11 @@
<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>
+
<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>
- <abstract-schema-name>AOBasicCmp</abstract-schema-name>
+ <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>
@@ -122,11 +121,11 @@
<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>
+ <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>
- <abstract-schema-name>EncCmp</abstract-schema-name>
+ <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>
@@ -217,11 +216,11 @@
<ejb-name>CmpRMIIIOPBean</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>
+ <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>
- <abstract-schema-name>CmpRmiIiop</abstract-schema-name>
+ <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>
@@ -242,6 +241,233 @@
<!--
########################################################
########################################################
+ ###### CMP 2.x E N T I T Y B E A N S ###############
+ ########################################################
+ ########################################################
+ -->
+
+ <!--
+ ########################################################
+ ID: client/tests/entity/cmp/BasicCmpHome
+ ########################################################
+ -->
+
+ <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>BasicCmp2Bean</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>BasicCmp2</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>
+
+ <!--
+ ########################################################
+ ID: client/tests/entity/cmp/allowed_operations/EntityHome
+ ########################################################
+ -->
+
+ <entity>
+ <description>
+ blah, blah, blah
+ </description>
+ <ejb-name>AOBasicCmp2Bean</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>AOBasicCmp2</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/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.
+ </description>
+ <res-ref-name>jdbc/basic/entityDatabase</res-ref-name>
+ <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>
+
+ <!--
+ ########################################################
+ ID: client/tests/entity/cmp/EncBean
+ ########################################################
+ -->
+
+ <entity>
+ <description>
+ blah, blah, blah
+ </description>
+ <ejb-name>EncCmp2Bean</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>EncCmp2</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>BasicCmp2Bean</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>
+
+ <!--
+ ########################################################
+ ID: client/tests/entity/cmp/RMI-over-IIOP/EJBHome
+ ########################################################
+ -->
+
+ <entity>
+ <description>
+ blah, blah, blah
+ </description>
+ <ejb-name>Cmp2RMIIIOPBean</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>Cmp2RmiIiop</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>EncCmp2Bean</ejb-link>
+ </ejb-ref>
+ <security-role-ref>
+ <role-name>TheMan</role-name>
+ <role-link>Executive</role-link>
+ </security-role-ref>
+ </entity>
+
+ <!--
+ ########################################################
+ ########################################################
#### S T A T E F U L S E S S I O N B E A N S #####
########################################################
########################################################
@@ -1058,6 +1284,34 @@
<container-transaction>
<method>
<ejb-name>CmpRMIIIOPBean</ejb-name>
+ <method-name>*</method-name>
+ </method>
+ <trans-attribute>Never</trans-attribute>
+ </container-transaction>
+ <container-transaction>
+ <method>
+ <ejb-name>BasicCmp2Bean</ejb-name>
+ <method-name>*</method-name>
+ </method>
+ <trans-attribute>Supports</trans-attribute>
+ </container-transaction>
+ <container-transaction>
+ <method>
+ <ejb-name>AOBasicCmp2Bean</ejb-name>
+ <method-name>*</method-name>
+ </method>
+ <trans-attribute>Required</trans-attribute>
+ </container-transaction>
+ <container-transaction>
+ <method>
+ <ejb-name>EncCmp2Bean</ejb-name>
+ <method-name>*</method-name>
+ </method>
+ <trans-attribute>Supports</trans-attribute>
+ </container-transaction>
+ <container-transaction>
+ <method>
+ <ejb-name>Cmp2RMIIIOPBean</ejb-name>
<method-name>*</method-name>
</method>
<trans-attribute>Never</trans-attribute>
1.3 +8 -8 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openejb-jar.xml 12 Oct 2004 20:01:14 -0000 1.2
+++ openejb-jar.xml 13 Oct 2004 18:53:23 -0000 1.3
@@ -155,7 +155,7 @@
-->
<entity>
- <ejb-name>BasicCmpBean</ejb-name>
+ <ejb-name>BasicCmp2Bean</ejb-name>
<jndi-name>client/tests/entity/cmp/BasicCmpHome</jndi-name>
<query>
<query-method>
@@ -164,14 +164,14 @@
<method-param>java.lang.String</method-param>
</method-params>
</query-method>
- <sql>SELECT id FROM BasicCmp WHERE lastName = ?</sql>
+ <sql>SELECT id FROM BasicCmp2 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>
+ <sql>SELECT id FROM BasicCmp2 WHERE 1 = 0</sql>
</query>
<resource-ref>
<ref-name>jdbc/basic/entityDatabase</ref-name>
@@ -179,7 +179,7 @@
</resource-ref>
</entity>
<entity>
- <ejb-name>AOBasicCmpBean</ejb-name>
+ <ejb-name>AOBasicCmp2Bean</ejb-name>
<jndi-name>client/tests/entity/cmp/allowed_operations/EntityHome</jndi-name>
<query>
<query-method>
@@ -188,14 +188,14 @@
<method-param>java.lang.String</method-param>
</method-params>
</query-method>
- <sql>SELECT id FROM AOBasicCmp WHERE lastName = ?</sql>
+ <sql>SELECT id FROM AOBasicCmp2 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>
+ <sql>SELECT id FROM AOBasicCmp2 WHERE 1 = 0</sql>
</query>
<resource-ref>
<ref-name>jdbc/basic/entityDatabase</ref-name>
@@ -207,7 +207,7 @@
</resource-ref>
</entity>
<entity>
- <ejb-name>EncCmpBean</ejb-name>
+ <ejb-name>EncCmp2Bean</ejb-name>
<jndi-name>client/tests/entity/cmp/EncBean</jndi-name>
<resource-ref>
<ref-name>jdbc/basic/entityDatabase</ref-name>
@@ -219,7 +219,7 @@
</resource-ref>
</entity>
<entity>
- <ejb-name>CmpRMIIIOPBean</ejb-name>
+ <ejb-name>Cmp2RMIIIOPBean</ejb-name>
<jndi-name>client/tests/entity/cmp/RMI-over-IIOP/EJBHome</jndi-name>
</entity>
</enterprise-beans>
