[jboss-cvs] JBossAS SVN: r60315 - in trunk: testsuite/src/resources/cmp2/jbas1361/META-INF and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Feb 5 19:22:34 EST 2007
Author: alex.loubyansky at jboss.com
Date: 2007-02-05 19:22:34 -0500 (Mon, 05 Feb 2007)
New Revision: 60315
Added:
trunk/testsuite/src/resources/deadlock/META-INF/jboss.xml
Modified:
trunk/server/src/etc/conf/default/standardjboss.xml
trunk/testsuite/src/resources/cmp2/jbas1361/META-INF/jboss.xml
trunk/testsuite/src/resources/cmp2/jbas979/META-INF/jboss.xml
Log:
JBAS-4030 make standard containers extend IPT
Modified: trunk/server/src/etc/conf/default/standardjboss.xml
===================================================================
--- trunk/server/src/etc/conf/default/standardjboss.xml 2007-02-05 22:32:19 UTC (rev 60314)
+++ trunk/server/src/etc/conf/default/standardjboss.xml 2007-02-06 00:22:34 UTC (rev 60315)
@@ -379,7 +379,7 @@
<container-configurations>
<container-configuration>
- <container-name>Standard CMP 2.x EntityBean</container-name>
+ <container-name>Standard Pessimistic CMP 2.x EntityBean</container-name>
<call-logging>false</call-logging>
<invoker-proxy-binding-name>entity-unified-invoker</invoker-proxy-binding-name>
<sync-on-commit-only>false</sync-on-commit-only>
@@ -590,8 +590,12 @@
<commit-option>C</commit-option>
</container-configuration>
+ <container-configuration extends="Instance Per Transaction CMP 2.x EntityBean">
+ <container-name>Standard CMP 2.x EntityBean</container-name>
+ </container-configuration>
+
<container-configuration>
- <container-name>Standard CMP EntityBean</container-name>
+ <container-name>Standard Pessimistic CMP EntityBean</container-name>
<call-logging>false</call-logging>
<invoker-proxy-binding-name>entity-unified-invoker</invoker-proxy-binding-name>
<sync-on-commit-only>false</sync-on-commit-only>
@@ -708,6 +712,10 @@
<commit-option>C</commit-option>
</container-configuration>
+ <container-configuration extends="Instance Per Transaction CMP EntityBean">
+ <container-name>Standard CMP EntityBean</container-name>
+ </container-configuration>
+
<container-configuration>
<container-name>Standard Stateless SessionBean</container-name>
<call-logging>false</call-logging>
@@ -855,7 +863,7 @@
</container-configuration>
<container-configuration>
- <container-name>Standard BMP EntityBean</container-name>
+ <container-name>Standard Pessimistic BMP EntityBean</container-name>
<call-logging>false</call-logging>
<invoker-proxy-binding-name>entity-unified-invoker</invoker-proxy-binding-name>
<sync-on-commit-only>false</sync-on-commit-only>
@@ -972,6 +980,10 @@
<commit-option>C</commit-option>
</container-configuration>
+ <container-configuration extends="Instance Per Transaction BMP EntityBean">
+ <container-name>Standard BMP EntityBean</container-name>
+ </container-configuration>
+
<container-configuration>
<container-name>Standard Message Driven Bean</container-name>
<call-logging>false</call-logging>
Modified: trunk/testsuite/src/resources/cmp2/jbas1361/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/jbas1361/META-INF/jboss.xml 2007-02-05 22:32:19 UTC (rev 60314)
+++ trunk/testsuite/src/resources/cmp2/jbas1361/META-INF/jboss.xml 2007-02-06 00:22:34 UTC (rev 60315)
@@ -8,10 +8,12 @@
<entity>
<ejb-name>B</ejb-name>
<local-jndi-name>BLocal</local-jndi-name>
+ <configuration-name>Standard Pessimistic CMP 2.x EntityBean</configuration-name>
</entity>
<entity>
<ejb-name>A</ejb-name>
<local-jndi-name>ALocal</local-jndi-name>
+ <configuration-name>Standard Pessimistic CMP 2.x EntityBean</configuration-name>
</entity>
<session>
Modified: trunk/testsuite/src/resources/cmp2/jbas979/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/jbas979/META-INF/jboss.xml 2007-02-05 22:32:19 UTC (rev 60314)
+++ trunk/testsuite/src/resources/cmp2/jbas979/META-INF/jboss.xml 2007-02-06 00:22:34 UTC (rev 60315)
@@ -25,7 +25,7 @@
</enterprise-beans>
<container-configurations>
- <container-configuration extends="Standard CMP 2.x EntityBean">
+ <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>
@@ -44,7 +44,7 @@
<commit-option>A</commit-option>
</container-configuration>
- <container-configuration extends="Standard CMP 2.x EntityBean">
+ <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>
Added: trunk/testsuite/src/resources/deadlock/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/deadlock/META-INF/jboss.xml (rev 0)
+++ trunk/testsuite/src/resources/deadlock/META-INF/jboss.xml 2007-02-06 00:22:34 UTC (rev 60315)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 3.2//EN" "http://www.jboss.org/j2ee/dtd/jboss_3_2.dtd">
+
+<jboss>
+ <enterprise-beans>
+ <entity>
+ <ejb-name>nextgenEnterpriseEntity</ejb-name>
+ <configuration-name>Standard Pessimistic CMP2.x EntityBean</configuration-name>
+ </entity>
+ <entity>
+ <ejb-name>nextgenEnterpriseEntityReentrant</ejb-name>
+ <configuration-name>Standard Pessimistic CMP2.x EntityBean</configuration-name>
+ </entity>
+ <entity>
+ <ejb-name>nextgenEnterpriseEntityNotSupported</ejb-name>
+ <configuration-name>Standard Pessimistic CMP2.x EntityBean</configuration-name>
+ </entity>
+ <entity>
+ <ejb-name>nextgenEnterpriseEntityNotSupportedReentrant</ejb-name>
+ <configuration-name>Standard Pessimistic CMP2.x EntityBean</configuration-name>
+ </entity>
+ </enterprise-beans>
+</jboss>
More information about the jboss-cvs-commits
mailing list