[jboss-cvs] JBossAS SVN: r79126 - in trunk/testsuite/src/resources/cmp2: simple/META-INF and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Oct 6 02:33:14 EDT 2008
Author: istudens at redhat.com
Date: 2008-10-06 02:33:14 -0400 (Mon, 06 Oct 2008)
New Revision: 79126
Modified:
trunk/testsuite/src/resources/cmp2/jbas979/META-INF/ejb-jar.xml
trunk/testsuite/src/resources/cmp2/jbas979/META-INF/jboss.xml
trunk/testsuite/src/resources/cmp2/simple/META-INF/ejb-jar.xml
trunk/testsuite/src/resources/cmp2/simple/META-INF/jboss.xml
trunk/testsuite/src/resources/cmp2/simple/META-INF/jbosscmp-jdbc.xml
Log:
reverted bad commits
Modified: trunk/testsuite/src/resources/cmp2/jbas979/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/jbas979/META-INF/ejb-jar.xml 2008-10-06 05:48:34 UTC (rev 79125)
+++ trunk/testsuite/src/resources/cmp2/jbas979/META-INF/ejb-jar.xml 2008-10-06 06:33:14 UTC (rev 79126)
@@ -6,37 +6,73 @@
<ejb-jar>
<enterprise-beans>
<session>
- <ejb-name>DummyStatelessEJB</ejb-name>
- <home>org.jboss.test.deployers.jbas5349.ejb2.DummyStatelessHome</home>
- <remote>org.jboss.test.deployers.jbas5349.ejb2.DummyStateless</remote>
- <ejb-class>org.jboss.test.deployers.jbas5349.ejb2.DummyStatelessBean</ejb-class>
+ <description>JUnit Session Bean Test Runner</description>
+ <ejb-name>EJBTestRunnerEJB</ejb-name>
+ <home>org.jboss.test.util.ejb.EJBTestRunnerHome</home>
+ <remote>org.jboss.test.util.ejb.EJBTestRunner</remote>
+ <ejb-class>org.jboss.test.util.ejb.EJBTestRunnerBean</ejb-class>
<session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
+ <transaction-type>Bean</transaction-type>
</session>
<session>
- <ejb-name>DummyStatefulEJB</ejb-name>
- <home>org.jboss.test.deployers.jbas5349.ejb2.DummyStatefulHome</home>
- <remote>org.jboss.test.deployers.jbas5349.ejb2.DummyStateful</remote>
- <ejb-class>org.jboss.test.deployers.jbas5349.ejb2.DummyStatefulBean</ejb-class>
- <session-type>Stateful</session-type>
+ <ejb-name>FacadeEJB</ejb-name>
+ <home>org.jboss.test.cmp2.jbas979.FacadeHome</home>
+ <remote>org.jboss.test.cmp2.jbas979.Facade</remote>
+ <ejb-class>org.jboss.test.cmp2.jbas979.FacadeSessionBean</ejb-class>
+ <session-type>Stateless</session-type>
<transaction-type>Container</transaction-type>
</session>
+ <entity>
+ <ejb-name>AStoreNotFlushedTrueEJB</ejb-name>
+ <local-home>org.jboss.test.cmp2.jbas979.ALocalHome</local-home>
+ <local>org.jboss.test.cmp2.jbas979.ALocal</local>
+ <ejb-class>org.jboss.test.cmp2.jbas979.ABean</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>AStoreNotFlushedTrue</abstract-schema-name>
+ <cmp-field><field-name>id</field-name></cmp-field>
+ <cmp-field><field-name>name</field-name></cmp-field>
+ <primkey-field>id</primkey-field>
+ <query>
+ <query-method>
+ <method-name>findAll</method-name>
+ <method-params/>
+ </query-method>
+ <ejb-ql>SELECT OBJECT(o) FROM AStoreNotFlushedTrue o</ejb-ql>
+ </query>
+ </entity>
+ <entity>
+ <ejb-name>AStoreNotFlushedFalseEJB</ejb-name>
+ <local-home>org.jboss.test.cmp2.jbas979.ALocalHome</local-home>
+ <local>org.jboss.test.cmp2.jbas979.ALocal</local>
+ <ejb-class>org.jboss.test.cmp2.jbas979.ABean</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>AStoreNotFlushedFalse</abstract-schema-name>
+ <cmp-field><field-name>id</field-name></cmp-field>
+ <cmp-field><field-name>name</field-name></cmp-field>
+ <primkey-field>id</primkey-field>
+ <query>
+ <query-method>
+ <method-name>findAll</method-name>
+ <method-params/>
+ </query-method>
+ <ejb-ql>SELECT OBJECT(o) FROM AStoreNotFlushedFalse o</ejb-ql>
+ </query>
+ </entity>
</enterprise-beans>
- <assembly-descriptor>
- <container-transaction>
- <method>
- <ejb-name>DummyStatelessEJB</ejb-name>
+ <assembly-descriptor >
+ <container-transaction >
+ <method >
+ <ejb-name>FacadeEJB</ejb-name>
<method-name>*</method-name>
</method>
- <trans-attribute>Supports</trans-attribute>
+ <trans-attribute>RequiresNew</trans-attribute>
</container-transaction>
- <container-transaction>
- <method>
- <ejb-name>DummyStatefulEJB</ejb-name>
- <method-name>*</method-name>
- </method>
- <trans-attribute>Supports</trans-attribute>
- </container-transaction>
</assembly-descriptor>
</ejb-jar>
Modified: trunk/testsuite/src/resources/cmp2/jbas979/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/jbas979/META-INF/jboss.xml 2008-10-06 05:48:34 UTC (rev 79125)
+++ trunk/testsuite/src/resources/cmp2/jbas979/META-INF/jboss.xml 2008-10-06 06:33:14 UTC (rev 79126)
@@ -4,13 +4,63 @@
<jboss>
<enterprise-beans>
+ <entity>
+ <ejb-name>AStoreNotFlushedTrueEJB</ejb-name>
+ <local-jndi-name>AStoreNotFlushedTrue</local-jndi-name>
+ <configuration-name>store-not-flushed=true</configuration-name>
+ </entity>
+ <entity>
+ <ejb-name>AStoreNotFlushedFalseEJB</ejb-name>
+ <local-jndi-name>AStoreNotFlushedFalse</local-jndi-name>
+ <configuration-name>store-not-flushed=false</configuration-name>
+ </entity>
<session>
- <ejb-name>DummyStatelessEJB</ejb-name>
- <jndi-name>ejb/DummyStateless</jndi-name>
+ <ejb-name>EJBTestRunnerEJB</ejb-name>
+ <jndi-name>ejb/EJBTestRunner</jndi-name>
</session>
<session>
- <ejb-name>DummyStatefulEJB</ejb-name>
- <jndi-name>ejb/DummyStateful</jndi-name>
+ <ejb-name>FacadeEJB</ejb-name>
+ <jndi-name>Facade</jndi-name>
</session>
</enterprise-beans>
+
+ <container-configurations>
+ <container-configuration extends="Standard Pessimistic CMP 2.x EntityBean">
+ <container-name>store-not-flushed=true</container-name>
+ <store-not-flushed>true</store-not-flushed>
+ <container-cache-conf>
+ <cache-policy>org.jboss.ejb.plugins.LRUEnterpriseContextCachePolicy</cache-policy>
+ <cache-policy-conf>
+ <min-capacity>50</min-capacity>
+ <max-capacity>1000000</max-capacity>
+ <overager-period>1</overager-period>
+ <max-bean-age>3</max-bean-age>
+ <resizer-period>400</resizer-period>
+ <max-cache-miss-period>60</max-cache-miss-period>
+ <min-cache-miss-period>1</min-cache-miss-period>
+ <cache-load-factor>0.75</cache-load-factor>
+ </cache-policy-conf>
+ </container-cache-conf>
+ <commit-option>A</commit-option>
+ </container-configuration>
+
+ <container-configuration extends="Standard Pessimistic CMP 2.x EntityBean">
+ <container-name>store-not-flushed=false</container-name>
+ <store-not-flushed>false</store-not-flushed>
+ <container-cache-conf>
+ <cache-policy>org.jboss.ejb.plugins.LRUEnterpriseContextCachePolicy</cache-policy>
+ <cache-policy-conf>
+ <min-capacity>50</min-capacity>
+ <max-capacity>1000000</max-capacity>
+ <overager-period>1</overager-period>
+ <max-bean-age>3</max-bean-age>
+ <resizer-period>400</resizer-period>
+ <max-cache-miss-period>60</max-cache-miss-period>
+ <min-cache-miss-period>1</min-cache-miss-period>
+ <cache-load-factor>0.75</cache-load-factor>
+ </cache-policy-conf>
+ </container-cache-conf>
+ <commit-option>A</commit-option>
+ </container-configuration>
+ </container-configurations>
</jboss>
Modified: trunk/testsuite/src/resources/cmp2/simple/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/simple/META-INF/ejb-jar.xml 2008-10-06 05:48:34 UTC (rev 79125)
+++ trunk/testsuite/src/resources/cmp2/simple/META-INF/ejb-jar.xml 2008-10-06 06:33:14 UTC (rev 79126)
@@ -6,30 +6,166 @@
<ejb-jar>
<enterprise-beans>
+ <session>
+ <description>JUnit Session Bean Test Runner</description>
+ <ejb-name>EJBTestRunnerEJB</ejb-name>
+ <home>org.jboss.test.util.ejb.EJBTestRunnerHome</home>
+ <remote>org.jboss.test.util.ejb.EJBTestRunner</remote>
+ <ejb-class>org.jboss.test.util.ejb.EJBTestRunnerBean</ejb-class>
+ <session-type>Stateless</session-type>
+ <transaction-type>Bean</transaction-type>
+ </session>
+
<entity>
- <ejb-name>SimpleEntityEJB</ejb-name>
- <home>org.jboss.test.deployers.jbas5349.ejb2.SimpleEntityHome</home>
- <remote>org.jboss.test.deployers.jbas5349.ejb2.SimpleEntity</remote>
- <ejb-class>org.jboss.test.deployers.jbas5349.ejb2.SimpleEntityBean</ejb-class>
+ <ejb-name>SimpleEJB</ejb-name>
+ <local-home>org.jboss.test.cmp2.simple.SimpleHome</local-home>
+ <local>org.jboss.test.cmp2.simple.Simple</local>
+ <ejb-class>org.jboss.test.cmp2.simple.SimpleBean</ejb-class>
<persistence-type>Container</persistence-type>
- <prim-key-class>java.lang.Long</prim-key-class>
+ <prim-key-class>java.lang.String</prim-key-class>
<reentrant>False</reentrant>
<cmp-version>2.x</cmp-version>
<abstract-schema-name>simple</abstract-schema-name>
<cmp-field><field-name>id</field-name></cmp-field>
+ <cmp-field><field-name>booleanPrimitive</field-name></cmp-field>
+ <cmp-field><field-name>booleanObject</field-name></cmp-field>
+ <cmp-field><field-name>bytePrimitive</field-name></cmp-field>
+ <cmp-field><field-name>byteObject</field-name></cmp-field>
+ <cmp-field><field-name>shortPrimitive</field-name></cmp-field>
+ <cmp-field><field-name>shortObject</field-name></cmp-field>
+ <cmp-field><field-name>integerPrimitive</field-name></cmp-field>
+ <cmp-field><field-name>integerObject</field-name></cmp-field>
+ <cmp-field><field-name>longPrimitive</field-name></cmp-field>
+ <cmp-field><field-name>longObject</field-name></cmp-field>
+ <cmp-field><field-name>floatPrimitive</field-name></cmp-field>
+ <cmp-field><field-name>floatObject</field-name></cmp-field>
+ <cmp-field><field-name>doublePrimitive</field-name></cmp-field>
+ <cmp-field><field-name>doubleObject</field-name></cmp-field>
+ <cmp-field><field-name>stringValue</field-name></cmp-field>
+ <cmp-field><field-name>utilDateValue</field-name></cmp-field>
+ <cmp-field><field-name>sqlDateValue</field-name></cmp-field>
+ <cmp-field><field-name>timeValue</field-name></cmp-field>
+ <cmp-field><field-name>timestampValue</field-name></cmp-field>
+ <cmp-field><field-name>bigDecimalValue</field-name></cmp-field>
+ <cmp-field><field-name>byteArrayValue</field-name></cmp-field>
+ <cmp-field><field-name>objectValue</field-name></cmp-field>
+ <cmp-field><field-name>valueClass</field-name></cmp-field>
+ <cmp-field><field-name>hashtable</field-name></cmp-field>
<primkey-field>id</primkey-field>
+ <query>
+ <query-method>
+ <method-name>findWithByteArray</method-name>
+ <method-params>
+ <method-param>byte[]</method-param>
+ </method-params>
+ </query-method>
+ <ejb-ql/>
+ </query>
+ <query>
+ <query-method>
+ <method-name>ejbSelectDynamic</method-name>
+ <method-params>
+ <method-param>java.lang.String</method-param>
+ <method-param>java.lang.Object[]</method-param>
+ </method-params>
+ </query-method>
+ <ejb-ql/>
+ </query>
+ <query>
+ <query-method>
+ <method-name>ejbSelectValueClass</method-name>
+ <method-params/>
+ </query-method>
+ <ejb-ql>
+ SELECT s.valueClass
+ FROM simple s
+ </ejb-ql>
+ </query>
</entity>
+
+ <entity>
+ <ejb-name>SimpleEJBWithOptionA</ejb-name>
+ <local-home>org.jboss.test.cmp2.simple.SimpleHome</local-home>
+ <local>org.jboss.test.cmp2.simple.Simple</local>
+ <ejb-class>org.jboss.test.cmp2.simple.SimpleBean</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>simpleA</abstract-schema-name>
+ <cmp-field><field-name>id</field-name></cmp-field>
+ <cmp-field><field-name>booleanPrimitive</field-name></cmp-field>
+ <cmp-field><field-name>booleanObject</field-name></cmp-field>
+ <cmp-field><field-name>bytePrimitive</field-name></cmp-field>
+ <cmp-field><field-name>byteObject</field-name></cmp-field>
+ <cmp-field><field-name>shortPrimitive</field-name></cmp-field>
+ <cmp-field><field-name>shortObject</field-name></cmp-field>
+ <cmp-field><field-name>integerPrimitive</field-name></cmp-field>
+ <cmp-field><field-name>integerObject</field-name></cmp-field>
+ <cmp-field><field-name>longPrimitive</field-name></cmp-field>
+ <cmp-field><field-name>longObject</field-name></cmp-field>
+ <cmp-field><field-name>floatPrimitive</field-name></cmp-field>
+ <cmp-field><field-name>floatObject</field-name></cmp-field>
+ <cmp-field><field-name>doublePrimitive</field-name></cmp-field>
+ <cmp-field><field-name>doubleObject</field-name></cmp-field>
+ <cmp-field><field-name>stringValue</field-name></cmp-field>
+ <cmp-field><field-name>utilDateValue</field-name></cmp-field>
+ <cmp-field><field-name>sqlDateValue</field-name></cmp-field>
+ <cmp-field><field-name>timeValue</field-name></cmp-field>
+ <cmp-field><field-name>timestampValue</field-name></cmp-field>
+ <cmp-field><field-name>bigDecimalValue</field-name></cmp-field>
+ <cmp-field><field-name>byteArrayValue</field-name></cmp-field>
+ <cmp-field><field-name>objectValue</field-name></cmp-field>
+ <cmp-field><field-name>valueClass</field-name></cmp-field>
+ <cmp-field><field-name>hashtable</field-name></cmp-field>
+ <primkey-field>id</primkey-field>
+ <query>
+ <query-method>
+ <method-name>findWithByteArray</method-name>
+ <method-params>
+ <method-param>byte[]</method-param>
+ </method-params>
+ </query-method>
+ <ejb-ql/>
+ </query>
+ <query>
+ <query-method>
+ <method-name>ejbSelectDynamic</method-name>
+ <method-params>
+ <method-param>java.lang.String</method-param>
+ <method-param>java.lang.Object[]</method-param>
+ </method-params>
+ </query-method>
+ <ejb-ql/>
+ </query>
+ <query>
+ <query-method>
+ <method-name>ejbSelectValueClass</method-name>
+ <method-params/>
+ </query-method>
+ <ejb-ql>
+ SELECT s.valueClass
+ FROM simple s
+ </ejb-ql>
+ </query>
+ </entity>
</enterprise-beans>
<assembly-descriptor>
<container-transaction>
<method>
- <ejb-name>SimpleEntityEJB</ejb-name>
+ <ejb-name>SimpleEJB</ejb-name>
<method-name>*</method-name>
</method>
+ <method>
+ <ejb-name>SimpleEJBWithOptionA</ejb-name>
+ <method-name>*</method-name>
+ </method>
<trans-attribute>Required</trans-attribute>
</container-transaction>
</assembly-descriptor>
</ejb-jar>
+
+
Modified: trunk/testsuite/src/resources/cmp2/simple/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/simple/META-INF/jboss.xml 2008-10-06 05:48:34 UTC (rev 79125)
+++ trunk/testsuite/src/resources/cmp2/simple/META-INF/jboss.xml 2008-10-06 06:33:14 UTC (rev 79126)
@@ -5,10 +5,22 @@
<jboss>
<enterprise-beans>
+ <session>
+ <ejb-name>EJBTestRunnerEJB</ejb-name>
+ <jndi-name>ejb/EJBTestRunner</jndi-name>
+ </session>
+
<entity>
- <ejb-name>SimpleEntityEJB</ejb-name>
- <local-jndi-name>ejb/SimpleEntity</local-jndi-name>
+ <ejb-name>SimpleEJB</ejb-name>
+ <local-jndi-name>cmp2/simple/Simple</local-jndi-name>
</entity>
+
+ <entity>
+ <ejb-name>SimpleEJBWithOptionA</ejb-name>
+ <local-jndi-name>cmp2/simple/SimpleA</local-jndi-name>
+ <read-only>false</read-only>
+ <configuration-name>CMP 2.x and Cache</configuration-name>
+ </entity>
</enterprise-beans>
<container-configurations>
Modified: trunk/testsuite/src/resources/cmp2/simple/META-INF/jbosscmp-jdbc.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/simple/META-INF/jbosscmp-jdbc.xml 2008-10-06 05:48:34 UTC (rev 79125)
+++ trunk/testsuite/src/resources/cmp2/simple/META-INF/jbosscmp-jdbc.xml 2008-10-06 06:33:14 UTC (rev 79126)
@@ -28,8 +28,60 @@
<enterprise-beans>
<entity>
- <ejb-name>SimpleEntityEJB</ejb-name>
- <table-name>SimpleEntity</table-name>
+ <ejb-name>SimpleEJB</ejb-name>
+ <table-name>Simple</table-name>
+ <query>
+ <query-method>
+ <method-name>ejbSelectDynamic</method-name>
+ <method-params>
+ <method-param>java.lang.String</method-param>
+ <method-param>java.lang.Object[]</method-param>
+ </method-params>
+ </query-method>
+ <dynamic-ql/>
+ </query>
+ <query>
+ <query-method>
+ <method-name>findWithByteArray</method-name>
+ <method-params>
+ <method-param>byte[]</method-param>
+ </method-params>
+ </query-method>
+ <jboss-ql>
+ SELECT OBJECT(s)
+ FROM simple AS s
+ WHERE s.byteArrayValue = ?1
+ </jboss-ql>
+ </query>
</entity>
+
+ <entity>
+ <ejb-name>SimpleEJBWithOptionA</ejb-name>
+ <read-only>false</read-only>
+ <table-name>SimpleA</table-name>
+ <query>
+ <query-method>
+ <method-name>ejbSelectDynamic</method-name>
+ <method-params>
+ <method-param>java.lang.String</method-param>
+ <method-param>java.lang.Object[]</method-param>
+ </method-params>
+ </query-method>
+ <dynamic-ql/>
+ </query>
+ <query>
+ <query-method>
+ <method-name>findWithByteArray</method-name>
+ <method-params>
+ <method-param>byte[]</method-param>
+ </method-params>
+ </query-method>
+ <jboss-ql>
+ SELECT OBJECT(s)
+ FROM simpleA AS s
+ WHERE s.byteArrayValue = ?1
+ </jboss-ql>
+ </query>
+ </entity>
</enterprise-beans>
</jbosscmp-jdbc>
More information about the jboss-cvs-commits
mailing list