[jboss-cvs] JBossAS SVN: r58389 - in trunk/testsuite/src/resources: bmp/META-INF cmp2/audit/META-INF cmp2/cmrtransaction/META-INF cmp2/commerce/META-INF cmp2/distinct/META-INF cmp2/ejbselect/META-INF cmp2/jbas1361/META-INF cmp2/jbas3717/ear/META-INF cmp2/keygen/META-INF cmp2/perf dbtest/META-INF idgen/META-INF testbean/META-INF testbean2/META-INF
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Nov 15 07:57:22 EST 2006
Author: alex.loubyansky at jboss.com
Date: 2006-11-15 07:57:09 -0500 (Wed, 15 Nov 2006)
New Revision: 58389
Modified:
trunk/testsuite/src/resources/bmp/META-INF/ejb-jar.xml
trunk/testsuite/src/resources/cmp2/audit/META-INF/jboss.xml
trunk/testsuite/src/resources/cmp2/cmrtransaction/META-INF/ejb-jar.xml
trunk/testsuite/src/resources/cmp2/commerce/META-INF/ejb-jar.xml
trunk/testsuite/src/resources/cmp2/distinct/META-INF/ejb-jar.xml
trunk/testsuite/src/resources/cmp2/ejbselect/META-INF/jdbc2pm-jboss.xml
trunk/testsuite/src/resources/cmp2/jbas1361/META-INF/ejb-jar.xml
trunk/testsuite/src/resources/cmp2/jbas3717/ear/META-INF/application.xml
trunk/testsuite/src/resources/cmp2/keygen/META-INF/ejb-jar.xml
trunk/testsuite/src/resources/cmp2/perf/ejb-jar.xml
trunk/testsuite/src/resources/dbtest/META-INF/ejb-jar.xml
trunk/testsuite/src/resources/idgen/META-INF/ejb-jar.xml
trunk/testsuite/src/resources/testbean/META-INF/ejb-jar.xml
trunk/testsuite/src/resources/testbean2/META-INF/ejb-jar.xml
Log:
fixed xml
Modified: trunk/testsuite/src/resources/bmp/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/bmp/META-INF/ejb-jar.xml 2006-11-15 12:18:03 UTC (rev 58388)
+++ trunk/testsuite/src/resources/bmp/META-INF/ejb-jar.xml 2006-11-15 12:57:09 UTC (rev 58389)
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN"
"http://java.sun.com/dtd/ejb-jar_2_0.dtd">
<ejb-jar>
-
+
<enterprise-beans>
<session>
<description>SessionBean that creates, drops, looks up tables </description>
@@ -13,11 +13,6 @@
<session-type>Stateless</session-type>
<transaction-type>Container</transaction-type>
- <resource-ref>
- <res-ref-name>datasource</res-ref-name>
- <res-type>javax.sql.DataSource</res-type>
- <res-auth>Container</res-auth>
- </resource-ref>
<ejb-ref>
<ejb-ref-name>bean</ejb-ref-name>
<ejb-ref-type>Entity</ejb-ref-type>
@@ -25,6 +20,11 @@
<remote>org.jboss.test.bmp.interfaces.SimpleBMP</remote>
<ejb-link>bmp.SimpleBMP</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>
</session>
@@ -34,9 +34,8 @@
<home>org.jboss.test.bmp.interfaces.SimpleBMPHome</home>
<remote>org.jboss.test.bmp.interfaces.SimpleBMP</remote>
<ejb-class>org.jboss.test.bmp.beans.SimpleBMPBean</ejb-class>
- <prim-key-class>java.lang.Integer</prim-key-class>
<persistence-type>Bean</persistence-type>
- <transaction-type>Container</transaction-type>
+ <prim-key-class>java.lang.Integer</prim-key-class>
<reentrant>false</reentrant>
<resource-ref>
@@ -53,9 +52,8 @@
<home>org.jboss.test.bmp.interfaces.SimpleBMPHome</home>
<remote>org.jboss.test.bmp.interfaces.SimpleBMP</remote>
<ejb-class>org.jboss.test.bmp.beans.SimpleBMPBean</ejb-class>
- <prim-key-class>java.lang.Integer</prim-key-class>
<persistence-type>Bean</persistence-type>
- <transaction-type>Container</transaction-type>
+ <prim-key-class>java.lang.Integer</prim-key-class>
<reentrant>false</reentrant>
<resource-ref>
Modified: trunk/testsuite/src/resources/cmp2/audit/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/audit/META-INF/jboss.xml 2006-11-15 12:18:03 UTC (rev 58388)
+++ trunk/testsuite/src/resources/cmp2/audit/META-INF/jboss.xml 2006-11-15 12:57:09 UTC (rev 58389)
@@ -2,12 +2,6 @@
<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 3.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_3_0.dtd">
<jboss>
- <container-configurations>
- <container-configuration extends="Standard CMP 2.x EntityBean">
- <container-name>Secured CMP 2.x EnitityBean</container-name>
- <security-domain>java:/jaas/other</security-domain>
- </container-configuration>
- </container-configurations>
<enterprise-beans>
<session>
<ejb-name>AuditSessionEJB</ejb-name>
@@ -19,18 +13,18 @@
</session>
<entity>
<ejb-name>AuditEJB</ejb-name>
+ <local-jndi-name>cmp2/audit/Audit</local-jndi-name>
<configuration-name>Secured CMP 2.x EnitityBean</configuration-name>
- <local-jndi-name>cmp2/audit/Audit</local-jndi-name>
</entity>
<entity>
<ejb-name>AuditChangedNamesEJB</ejb-name>
+ <local-jndi-name>cmp2/audit/AuditChangedNames</local-jndi-name>
<configuration-name>Secured CMP 2.x EnitityBean</configuration-name>
- <local-jndi-name>cmp2/audit/AuditChangedNames</local-jndi-name>
</entity>
<entity>
<ejb-name>AuditMappedEJB</ejb-name>
+ <local-jndi-name>cmp2/audit/AuditMapped</local-jndi-name>
<configuration-name>Secured CMP 2.x EnitityBean</configuration-name>
- <local-jndi-name>cmp2/audit/AuditMapped</local-jndi-name>
</entity>
</enterprise-beans>
<resource-managers>
@@ -39,4 +33,10 @@
<res-jndi-name>java:/DefaultDS</res-jndi-name>
</resource-manager>
</resource-managers>
+ <container-configurations>
+ <container-configuration extends="Standard CMP 2.x EntityBean">
+ <container-name>Secured CMP 2.x EnitityBean</container-name>
+ <security-domain>java:/jaas/other</security-domain>
+ </container-configuration>
+ </container-configurations>
</jboss>
Modified: trunk/testsuite/src/resources/cmp2/cmrtransaction/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/cmrtransaction/META-INF/ejb-jar.xml 2006-11-15 12:18:03 UTC (rev 58388)
+++ trunk/testsuite/src/resources/cmp2/cmrtransaction/META-INF/ejb-jar.xml 2006-11-15 12:57:09 UTC (rev 58389)
@@ -6,12 +6,29 @@
<ejb-jar>
<enterprise-beans>
+ <session>
+ <ejb-name>CMRTreeFacadeBean</ejb-name>
+ <home>org.jboss.test.cmp2.cmrtransaction.interfaces.TreeFacadeHome</home>
+ <remote>org.jboss.test.cmp2.cmrtransaction.interfaces.TreeFacade</remote>
+ <ejb-class>org.jboss.test.cmp2.cmrtransaction.ejb.TreeFacadeSession</ejb-class>
+ <session-type>Stateless</session-type>
+ <transaction-type>Container</transaction-type>
+ <ejb-local-ref>
+ <description></description>
+ <ejb-ref-name>ejb/cmrTransactionTest/CMRTreeLocal</ejb-ref-name>
+ <ejb-ref-type>Entity</ejb-ref-type>
+ <local-home>org.jboss.test.cmp2.cmrtransaction.TreeLocalHome</local-home>
+ <local>org.jboss.test.cmp2.cmrtransaction.TreeLocal</local>
+ <ejb-link>CMRTreeBean</ejb-link>
+ </ejb-local-ref>
+ </session>
<entity>
<ejb-name>CMRTreeBean</ejb-name>
<local-home>org.jboss.test.cmp2.cmrtransaction.interfaces.TreeLocalHome</local-home>
<local>org.jboss.test.cmp2.cmrtransaction.interfaces.TreeLocal</local>
<ejb-class>org.jboss.test.cmp2.cmrtransaction.ejb.TreeEntity</ejb-class>
<persistence-type>Container</persistence-type>
+ <prim-key-class>java.lang.String</prim-key-class>
<reentrant>False</reentrant>
<cmp-version>2.x</cmp-version>
<abstract-schema-name>CMRTree</abstract-schema-name>
@@ -23,24 +40,7 @@
<field-name>sortOrder</field-name>
</cmp-field>
<primkey-field>id</primkey-field>
- <prim-key-class>java.lang.String</prim-key-class>
</entity>
- <session>
- <ejb-name>CMRTreeFacadeBean</ejb-name>
- <home>org.jboss.test.cmp2.cmrtransaction.interfaces.TreeFacadeHome</home>
- <remote>org.jboss.test.cmp2.cmrtransaction.interfaces.TreeFacade</remote>
- <ejb-class>org.jboss.test.cmp2.cmrtransaction.ejb.TreeFacadeSession</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- <ejb-local-ref>
- <description></description>
- <ejb-ref-name>ejb/cmrTransactionTest/CMRTreeLocal</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>org.jboss.test.cmp2.cmrtransaction.TreeLocalHome</local-home>
- <local>org.jboss.test.cmp2.cmrtransaction.TreeLocal</local>
- <ejb-link>CMRTreeBean</ejb-link>
- </ejb-local-ref>
- </session>
</enterprise-beans>
<relationships>
<ejb-relation>
Modified: trunk/testsuite/src/resources/cmp2/commerce/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/commerce/META-INF/ejb-jar.xml 2006-11-15 12:18:03 UTC (rev 58388)
+++ trunk/testsuite/src/resources/cmp2/commerce/META-INF/ejb-jar.xml 2006-11-15 12:57:09 UTC (rev 58389)
@@ -5,6 +5,23 @@
<ejb-jar>
<enterprise-beans>
+ <session>
+ <ejb-name>TxTesterEJB</ejb-name>
+ <local-home>org.jboss.test.cmp2.commerce.TxTesterHome</local-home>
+ <local>org.jboss.test.cmp2.commerce.TxTester</local>
+ <ejb-class>org.jboss.test.cmp2.commerce.TxTesterBean</ejb-class>
+ <session-type>Stateless</session-type>
+ <transaction-type>Container</transaction-type>
+ </session>
+ <session>
+ <description>JUnit Session Bean Test Runner</description>
+ <ejb-name>EJBTestRunnerEJB</ejb-name>
+ <home>net.sourceforge.junitejb.EJBTestRunnerHome</home>
+ <remote>net.sourceforge.junitejb.EJBTestRunner</remote>
+ <ejb-class>net.sourceforge.junitejb.EJBTestRunnerBean</ejb-class>
+ <session-type>Stateless</session-type>
+ <transaction-type>Bean</transaction-type>
+ </session>
<entity>
<description>User</description>
<ejb-name>UserEJB</ejb-name>
@@ -98,6 +115,13 @@
<cmp-field><field-name>id</field-name></cmp-field>
<cmp-field><field-name>name</field-name></cmp-field>
<primkey-field>id</primkey-field>
+ <ejb-ref>
+ <ejb-ref-name>ejb/User</ejb-ref-name>
+ <ejb-ref-type>Entity</ejb-ref-type>
+ <home>org.jboss.test.cmp2.commerce.UserHome</home>
+ <remote>org.jboss.test.cmp2.commerce.User</remote>
+ <ejb-link>UserEJB</ejb-link>
+ </ejb-ref>
<ejb-local-ref>
<ejb-ref-name>ejb/UserLocal</ejb-ref-name>
<ejb-ref-type>Entity</ejb-ref-type>
@@ -105,13 +129,6 @@
<local>org.jboss.test.cmp2.commerce.UserLocal</local>
<ejb-link>UserEJB</ejb-link>
</ejb-local-ref>
- <ejb-ref>
- <ejb-ref-name>ejb/User</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>org.jboss.test.cmp2.commerce.UserHome</home>
- <remote>org.jboss.test.cmp2.commerce.User</remote>
- <ejb-link>UserEJB</ejb-link>
- </ejb-ref>
<query>
<description>
Find all Customers
@@ -555,23 +572,6 @@
<cmp-field><field-name>name</field-name></cmp-field>
<primkey-field>id</primkey-field>
</entity>
- <session>
- <ejb-name>TxTesterEJB</ejb-name>
- <local-home>org.jboss.test.cmp2.commerce.TxTesterHome</local-home>
- <local>org.jboss.test.cmp2.commerce.TxTester</local>
- <ejb-class>org.jboss.test.cmp2.commerce.TxTesterBean</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- </session>
- <session>
- <description>JUnit Session Bean Test Runner</description>
- <ejb-name>EJBTestRunnerEJB</ejb-name>
- <home>net.sourceforge.junitejb.EJBTestRunnerHome</home>
- <remote>net.sourceforge.junitejb.EJBTestRunner</remote>
- <ejb-class>net.sourceforge.junitejb.EJBTestRunnerBean</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Bean</transaction-type>
- </session>
<entity>
<ejb-name>AutoNumberEJB</ejb-name>
<home>org.jboss.varia.autonumber.AutoNumberHome</home>
Modified: trunk/testsuite/src/resources/cmp2/distinct/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/distinct/META-INF/ejb-jar.xml 2006-11-15 12:18:03 UTC (rev 58388)
+++ trunk/testsuite/src/resources/cmp2/distinct/META-INF/ejb-jar.xml 2006-11-15 12:57:09 UTC (rev 58389)
@@ -29,7 +29,6 @@
<reentrant>false</reentrant>
<cmp-version>2.x</cmp-version>
<abstract-schema-name>A</abstract-schema-name>
- <primkey-field>id</primkey-field>
<cmp-field >
<description><![CDATA[]]></description>
<field-name>id</field-name>
@@ -42,6 +41,7 @@
<description><![CDATA[]]></description>
<field-name>myData</field-name>
</cmp-field>
+ <primkey-field>id</primkey-field>
<query>
<query-method>
Modified: trunk/testsuite/src/resources/cmp2/ejbselect/META-INF/jdbc2pm-jboss.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/ejbselect/META-INF/jdbc2pm-jboss.xml 2006-11-15 12:18:03 UTC (rev 58388)
+++ trunk/testsuite/src/resources/cmp2/ejbselect/META-INF/jdbc2pm-jboss.xml 2006-11-15 12:57:09 UTC (rev 58389)
@@ -13,12 +13,12 @@
<entity>
<ejb-name>B</ejb-name>
<local-jndi-name>BLocal</local-jndi-name>
- <container-name>cmp2.x jdbc2 pm</container-name>
+ <configuration-name>cmp2.x jdbc2 pm</configuration-name>
</entity>
<entity>
<ejb-name>A</ejb-name>
<local-jndi-name>ALocal</local-jndi-name>
- <container-name>cmp2.x jdbc2 pm</container-name>
+ <configuration-name>cmp2.x jdbc2 pm</configuration-name>
</entity>
</enterprise-beans>
</jboss>
Modified: trunk/testsuite/src/resources/cmp2/jbas1361/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/jbas1361/META-INF/ejb-jar.xml 2006-11-15 12:18:03 UTC (rev 58388)
+++ trunk/testsuite/src/resources/cmp2/jbas1361/META-INF/ejb-jar.xml 2006-11-15 12:57:09 UTC (rev 58389)
@@ -51,7 +51,6 @@
<reentrant>false</reentrant>
<cmp-version>2.x</cmp-version>
<abstract-schema-name>A</abstract-schema-name>
- <primkey-field>id</primkey-field>
<cmp-field >
<description><![CDATA[]]></description>
<field-name>id</field-name>
@@ -60,6 +59,7 @@
<description><![CDATA[]]></description>
<field-name>name</field-name>
</cmp-field>
+ <primkey-field>id</primkey-field>
</entity>
</enterprise-beans>
Modified: trunk/testsuite/src/resources/cmp2/jbas3717/ear/META-INF/application.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/jbas3717/ear/META-INF/application.xml 2006-11-15 12:18:03 UTC (rev 58388)
+++ trunk/testsuite/src/resources/cmp2/jbas3717/ear/META-INF/application.xml 2006-11-15 12:57:09 UTC (rev 58389)
@@ -3,6 +3,7 @@
'http://java.sun.com/j2ee/dtds/application_1_2.dtd'>
<application>
+ <display-name></display-name>
<module>
<ejb>cmp2-jbas3717.jar</ejb>
</module>
Modified: trunk/testsuite/src/resources/cmp2/keygen/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/keygen/META-INF/ejb-jar.xml 2006-11-15 12:18:03 UTC (rev 58388)
+++ trunk/testsuite/src/resources/cmp2/keygen/META-INF/ejb-jar.xml 2006-11-15 12:57:09 UTC (rev 58389)
@@ -13,6 +13,13 @@
<ejb-class>org.jboss.test.util.ejb.EJBTestRunnerBean</ejb-class>
<session-type>Stateless</session-type>
<transaction-type>Bean</transaction-type>
+ <ejb-ref>
+ <ejb-ref-name>remote/TestPkSqlEJB</ejb-ref-name>
+ <ejb-ref-type>Entity</ejb-ref-type>
+ <home>org.jboss.test.cmp2.keygen.ejb.UnknownPKHome</home>
+ <remote>org.jboss.test.cmp2.keygen.ejb.UnknownPK</remote>
+ <ejb-link>TestPkSqlEJB</ejb-link>
+ </ejb-ref>
<ejb-local-ref>
<ejb-ref-name>local/TestUUIDKeyGenEJB</ejb-ref-name>
<ejb-ref-type>Entity</ejb-ref-type>
@@ -34,13 +41,6 @@
<local>org.jboss.test.cmp2.keygen.ejb.UnknownPKLocal</local>
<ejb-link>TestPkSqlEJB</ejb-link>
</ejb-local-ref>
- <ejb-ref>
- <ejb-ref-name>remote/TestPkSqlEJB</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>org.jboss.test.cmp2.keygen.ejb.UnknownPKHome</home>
- <remote>org.jboss.test.cmp2.keygen.ejb.UnknownPK</remote>
- <ejb-link>TestPkSqlEJB</ejb-link>
- </ejb-ref>
<ejb-local-ref>
<ejb-ref-name>local/TestOtherEJB</ejb-ref-name>
<ejb-ref-type>Entity</ejb-ref-type>
Modified: trunk/testsuite/src/resources/cmp2/perf/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/perf/ejb-jar.xml 2006-11-15 12:18:03 UTC (rev 58388)
+++ trunk/testsuite/src/resources/cmp2/perf/ejb-jar.xml 2006-11-15 12:57:09 UTC (rev 58389)
@@ -69,8 +69,8 @@
<field-name>amount</field-name>
</cmp-field>
<cmp-field>
- <description>The category of the entry</description>
- <field-name>category</field-name>
+ <description>The logger of the entry</description>
+ <field-name>logger</field-name>
</cmp-field>
<cmp-field>
<description>The system timestamp of the entry</description>
Modified: trunk/testsuite/src/resources/dbtest/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/dbtest/META-INF/ejb-jar.xml 2006-11-15 12:18:03 UTC (rev 58388)
+++ trunk/testsuite/src/resources/dbtest/META-INF/ejb-jar.xml 2006-11-15 12:57:09 UTC (rev 58389)
@@ -11,7 +11,6 @@
<ejb-class>org.jboss.test.dbtest.bean.AllTypesBean</ejb-class>
<persistence-type>Container</persistence-type>
<prim-key-class>java.lang.String</prim-key-class>
- <primkey-field>aString</primkey-field>
<reentrant>False</reentrant>
@@ -42,12 +41,7 @@
<cmp-field>
<field-name>aDouble</field-name>
</cmp-field>
-<!-- <fucked up>
<cmp-field>
- <field-name>aChar</field-name>
- </cmp-field>
--->
- <cmp-field>
<field-name>aString</field-name>
</cmp-field>
@@ -70,6 +64,7 @@
<cmp-field>
<field-name>aList</field-name>
</cmp-field>
+ <primkey-field>aString</primkey-field>
</entity>
<entity>
@@ -79,7 +74,6 @@
<ejb-class>org.jboss.test.dbtest.bean.RecordBean</ejb-class>
<persistence-type>Container</persistence-type>
<prim-key-class>java.lang.String</prim-key-class>
- <primkey-field>name</primkey-field>
<reentrant>False</reentrant>
@@ -90,6 +84,7 @@
<cmp-field>
<field-name>address</field-name>
</cmp-field>
+ <primkey-field>name</primkey-field>
</entity>
</enterprise-beans>
Modified: trunk/testsuite/src/resources/idgen/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/idgen/META-INF/ejb-jar.xml 2006-11-15 12:18:03 UTC (rev 58388)
+++ trunk/testsuite/src/resources/idgen/META-INF/ejb-jar.xml 2006-11-15 12:57:09 UTC (rev 58389)
@@ -31,7 +31,6 @@
<ejb-class>org.jboss.test.idgen.ejb.IdCounterBeanCMP</ejb-class>
<persistence-type>Container</persistence-type>
<prim-key-class>java.lang.String</prim-key-class>
- <primkey-field>name</primkey-field>
<reentrant>True</reentrant>
<cmp-version>1.x</cmp-version>
<cmp-field>
@@ -42,6 +41,7 @@
<description>Counter value</description>
<field-name>currentValue</field-name>
</cmp-field>
+ <primkey-field>name</primkey-field>
<env-entry>
<env-entry-name>size</env-entry-name>
<env-entry-type>java.lang.Long</env-entry-type>
Modified: trunk/testsuite/src/resources/testbean/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/testbean/META-INF/ejb-jar.xml 2006-11-15 12:18:03 UTC (rev 58388)
+++ trunk/testsuite/src/resources/testbean/META-INF/ejb-jar.xml 2006-11-15 12:57:09 UTC (rev 58389)
@@ -40,7 +40,6 @@
<ejb-class>org.jboss.test.testbean.bean.BMTStatefulBean</ejb-class>
<session-type>Stateful</session-type>
<transaction-type>Bean</transaction-type>
- <reentrant>True</reentrant>
<resource-ref>
<description>A jdbc connection for the BMT bean</description>
<res-ref-name>jdbc/myDatabase</res-ref-name>
@@ -56,7 +55,6 @@
<ejb-class>org.jboss.test.testbean.bean.BMTStatelessBean</ejb-class>
<session-type>Stateless</session-type>
<transaction-type>Bean</transaction-type>
- <reentrant>True</reentrant>
</session>
<session>
<description>Nextgen test bean TX stateful</description>
@@ -66,7 +64,6 @@
<ejb-class>org.jboss.test.testbean.bean.TxSessionBean</ejb-class>
<session-type>Stateless</session-type>
<transaction-type>Container</transaction-type>
- <reentrant>True</reentrant>
</session>
<entity>
<description>Nextgen test bean entity </description>
@@ -97,20 +94,20 @@
<prim-key-class>java.lang.String</prim-key-class>
<reentrant>False</reentrant>
<primkey-field>name</primkey-field>
- <resource-ref>
- <description>A jdbc connection for the BMP bean</description>
- <res-ref-name>jdbc/myDatabase</res-ref-name>
- <res-type>javax.sql.DataSource</res-type>
- <res-auth>Container</res-auth>
- </resource-ref>
<ejb-ref>
<description>An EJB ref for this bean to test</description>
- <ejb-link>nextgen.StatelessSession</ejb-link>
<ejb-ref-name>ejb/myEJBRef</ejb-ref-name>
<ejb-ref-type>Session</ejb-ref-type>
<home>org.jboss.test.testbean.interfaces.StatelessSessionHome</home>
<remote>org.jboss.test.testbean.interfaces.StatelessSession</remote>
+ <ejb-link>nextgen.StatelessSession</ejb-link>
</ejb-ref>
+ <resource-ref>
+ <description>A jdbc connection for the BMP bean</description>
+ <res-ref-name>jdbc/myDatabase</res-ref-name>
+ <res-type>javax.sql.DataSource</res-type>
+ <res-auth>Container</res-auth>
+ </resource-ref>
</entity>
<entity>
<description>Nextgen PK bean</description>
Modified: trunk/testsuite/src/resources/testbean2/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/testbean2/META-INF/ejb-jar.xml 2006-11-15 12:18:03 UTC (rev 58388)
+++ trunk/testsuite/src/resources/testbean2/META-INF/ejb-jar.xml 2006-11-15 12:57:09 UTC (rev 58389)
@@ -13,29 +13,7 @@
<ejb-class>org.jboss.test.testbean2.bean.AllTypesBean</ejb-class>
<persistence-type>Container</persistence-type>
<prim-key-class>java.lang.String</prim-key-class>
- <primkey-field>aString</primkey-field>
- <ejb-ref>
- <ejb-ref-name>ejb/stateful</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>org.jboss.test.testbean.interfaces.StatefulSessionHome</home>
- <remote>org.jboss.test.testbean.interfaces.StatefulSession</remote>
- </ejb-ref>
-
- <ejb-ref>
- <ejb-ref-name>ejb/stateless</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>org.jboss.test.testbean.interfaces.StatelessSessionHome</home>
- <remote>org.jboss.test.testbean.interfaces.StatelessSession</remote>
- </ejb-ref>
-
- <ejb-ref>
- <ejb-ref-name>ejb/entity</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>org.jboss.test.testbean.interfaces.EnterpriseEntityHome</home>
- <remote>org.jboss.test.testbean.interfaces.EnterpriseEntity</remote>
- </ejb-ref>
-
<reentrant>False</reentrant>
<cmp-version>1.x</cmp-version>
<abstract-schema-name>alltypes</abstract-schema-name>
@@ -58,6 +36,27 @@
<cmp-field><field-name>statelessSession</field-name></cmp-field>
<cmp-field><field-name>enterpriseEntity</field-name></cmp-field>
<cmp-field><field-name>aList</field-name></cmp-field>
+ <primkey-field>aString</primkey-field>
+ <ejb-ref>
+ <ejb-ref-name>ejb/stateful</ejb-ref-name>
+ <ejb-ref-type>Session</ejb-ref-type>
+ <home>org.jboss.test.testbean.interfaces.StatefulSessionHome</home>
+ <remote>org.jboss.test.testbean.interfaces.StatefulSession</remote>
+ </ejb-ref>
+
+ <ejb-ref>
+ <ejb-ref-name>ejb/stateless</ejb-ref-name>
+ <ejb-ref-type>Session</ejb-ref-type>
+ <home>org.jboss.test.testbean.interfaces.StatelessSessionHome</home>
+ <remote>org.jboss.test.testbean.interfaces.StatelessSession</remote>
+ </ejb-ref>
+
+ <ejb-ref>
+ <ejb-ref-name>ejb/entity</ejb-ref-name>
+ <ejb-ref-type>Entity</ejb-ref-type>
+ <home>org.jboss.test.testbean.interfaces.EnterpriseEntityHome</home>
+ <remote>org.jboss.test.testbean.interfaces.EnterpriseEntity</remote>
+ </ejb-ref>
<query>
<query-method>
<method-name>findByMinInt</method-name>
More information about the jboss-cvs-commits
mailing list