[jboss-cvs] JBossAS SVN: r58638 - in trunk/testsuite/src/resources: aop/scoped/ear1/META-INF aop/scoped/ear2/META-INF bankiiop/META-INF bench/ejb/META-INF bmp/META-INF classloader/scoping/transaction/META-INF cmp2/commerce/META-INF cmp2/jbas1665/META-INF cmp2/jbas3541/META-INF cmp2/jbas3717/ejb/META-INF cmp2/jbas979/META-INF cmp2/lob/META-INF cmp2/readonly/META-INF cmp2/relationship/META-INF deployment/META-INF entity/unsetentitycontext/META-INF excepiiop/META-INF helloiiop/META-INF hellojrmpiiop/META-INF idgen/META-INF iiop/META-INF iiopperf/META-INF isolation/a/ejb/META-INF jca/ejb/META-INF jca/inflowmdb/META-INF jcaprops/goodmdb/META-INF jcaprops/uppergoodmdb/META-INF jmsra/META-INF jmx/META-INF lock/META-INF marshal/ejb-unmarshall/META-INF marshaliiop/ejb-iiop-unmarshall/META-INF mdb/META-INF messagedriven/jar/META-INF messagedriven/jmscontainerinvoker/META-INF naming/ear/a/META-INF naming/ear/b/META-INF naming/jar/META-INF recover/stateless/META-INF remote-naming/META-INF! retry/META-INF secure-perf/META-INF security-srp/ejb-inf session/session-remove/META-INF testbean2/META-INF testbyvalue/META-INF tm/txtimeout txpropiiop/a/META-INF txpropiiop/b/META-INF txtimer/META-INF web/META-INF xa/META-INF
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Nov 19 17:16:12 EST 2006
Author: alex.loubyansky at jboss.com
Date: 2006-11-19 17:15:22 -0500 (Sun, 19 Nov 2006)
New Revision: 58638
Modified:
trunk/testsuite/src/resources/aop/scoped/ear1/META-INF/jboss.xml
trunk/testsuite/src/resources/aop/scoped/ear2/META-INF/jboss.xml
trunk/testsuite/src/resources/bankiiop/META-INF/jboss.xml
trunk/testsuite/src/resources/bench/ejb/META-INF/jboss.xml
trunk/testsuite/src/resources/bmp/META-INF/jboss.xml
trunk/testsuite/src/resources/classloader/scoping/transaction/META-INF/jboss.xml
trunk/testsuite/src/resources/cmp2/commerce/META-INF/jboss.xml
trunk/testsuite/src/resources/cmp2/jbas1665/META-INF/jboss.xml
trunk/testsuite/src/resources/cmp2/jbas3541/META-INF/jboss.xml
trunk/testsuite/src/resources/cmp2/jbas3717/ejb/META-INF/jboss.xml
trunk/testsuite/src/resources/cmp2/jbas979/META-INF/jboss.xml
trunk/testsuite/src/resources/cmp2/lob/META-INF/jboss.xml
trunk/testsuite/src/resources/cmp2/readonly/META-INF/jboss.xml
trunk/testsuite/src/resources/cmp2/relationship/META-INF/jboss.xml
trunk/testsuite/src/resources/deployment/META-INF/jboss.xml
trunk/testsuite/src/resources/entity/unsetentitycontext/META-INF/jboss.xml
trunk/testsuite/src/resources/excepiiop/META-INF/jboss.xml
trunk/testsuite/src/resources/helloiiop/META-INF/jboss.xml
trunk/testsuite/src/resources/hellojrmpiiop/META-INF/jboss.xml
trunk/testsuite/src/resources/idgen/META-INF/jboss.xml
trunk/testsuite/src/resources/iiop/META-INF/jboss.xml
trunk/testsuite/src/resources/iiopperf/META-INF/jboss.xml
trunk/testsuite/src/resources/isolation/a/ejb/META-INF/jboss.xml
trunk/testsuite/src/resources/jca/ejb/META-INF/jboss.xml
trunk/testsuite/src/resources/jca/inflowmdb/META-INF/jboss.xml
trunk/testsuite/src/resources/jcaprops/goodmdb/META-INF/jboss.xml
trunk/testsuite/src/resources/jcaprops/uppergoodmdb/META-INF/jboss.xml
trunk/testsuite/src/resources/jmsra/META-INF/jboss.xml
trunk/testsuite/src/resources/jmx/META-INF/jboss.xml
trunk/testsuite/src/resources/lock/META-INF/jboss.xml
trunk/testsuite/src/resources/marshal/ejb-unmarshall/META-INF/jboss.xml
trunk/testsuite/src/resources/marshaliiop/ejb-iiop-unmarshall/META-INF/jboss.xml
trunk/testsuite/src/resources/mdb/META-INF/jboss.xml
trunk/testsuite/src/resources/messagedriven/jar/META-INF/jboss.xml
trunk/testsuite/src/resources/messagedriven/jmscontainerinvoker/META-INF/jboss.xml
trunk/testsuite/src/resources/naming/ear/a/META-INF/jboss.xml
trunk/testsuite/src/resources/naming/ear/b/META-INF/jboss.xml
trunk/testsuite/src/resources/naming/jar/META-INF/jboss.xml
trunk/testsuite/src/resources/recover/stateless/META-INF/jboss.xml
trunk/testsuite/src/resources/remote-naming/META-INF/jboss.xml
trunk/testsuite/src/resources/retry/META-INF/jboss.xml
trunk/testsuite/src/resources/secure-perf/META-INF/jboss.xml
trunk/testsuite/src/resources/security-srp/ejb-inf/jboss.xml
trunk/testsuite/src/resources/session/session-remove/META-INF/jboss.xml
trunk/testsuite/src/resources/testbean2/META-INF/jboss.xml
trunk/testsuite/src/resources/testbyvalue/META-INF/jboss.xml
trunk/testsuite/src/resources/tm/txtimeout/jboss.xml
trunk/testsuite/src/resources/txpropiiop/a/META-INF/jboss.xml
trunk/testsuite/src/resources/txpropiiop/b/META-INF/jboss.xml
trunk/testsuite/src/resources/txtimer/META-INF/jboss.xml
trunk/testsuite/src/resources/web/META-INF/jboss.xml
trunk/testsuite/src/resources/xa/META-INF/jboss.xml
Log:
making jboss.xml's valid
Modified: trunk/testsuite/src/resources/aop/scoped/ear1/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/aop/scoped/ear1/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/aop/scoped/ear1/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,5 +1,6 @@
-<!DOCTYPE ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN"
- "http://java.sun.com/dtd/ejb-jar_2_0.dtd">
+<!DOCTYPE jboss PUBLIC
+ "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
+
<jboss>
<enterprise-beans>
<session>
Modified: trunk/testsuite/src/resources/aop/scoped/ear2/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/aop/scoped/ear2/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/aop/scoped/ear2/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,5 +1,6 @@
-<!DOCTYPE ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN"
- "http://java.sun.com/dtd/ejb-jar_2_0.dtd">
+<!DOCTYPE jboss PUBLIC
+ "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
+
<jboss>
<enterprise-beans>
<session>
Modified: trunk/testsuite/src/resources/bankiiop/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/bankiiop/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/bankiiop/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC
+ "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<jboss>
<enterprise-beans>
@@ -62,7 +64,6 @@
</invoker>
</invoker-bindings>
</entity>
- <secure>false</secure>
</enterprise-beans>
<resource-managers />
</jboss>
Modified: trunk/testsuite/src/resources/bench/ejb/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/bench/ejb/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/bench/ejb/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE jboss PUBLIC
+ "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
+
<jboss>
<enterprise-beans>
<entity>
Modified: trunk/testsuite/src/resources/bmp/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/bmp/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/bmp/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,27 +1,9 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE jboss PUBLIC
+ "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
+
<jboss>
- <container-configurations>
- <container-configuration extends="Standard BMP EntityBean">
- <container-name>My BMP EntityBean</container-name>
- </container-configuration>
- <container-configuration extends="Standard BMP EntityBean">
- <container-name>Small Cache BMP EntityBean</container-name>
- <container-cache-conf>
- <cache-policy>org.jboss.ejb.plugins.LRUEnterpriseContextCachePolicy</cache-policy>
- <cache-policy-conf>
- <min-capacity>1</min-capacity>
- <max-capacity>50</max-capacity>
- <overager-period>1</overager-period>
- <max-bean-age>1</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>
- </container-configuration>
- </container-configurations>
<enterprise-beans>
<session>
@@ -59,4 +41,26 @@
</resource-managers>
+ <container-configurations>
+ <container-configuration extends="Standard BMP EntityBean">
+ <container-name>My BMP EntityBean</container-name>
+ </container-configuration>
+ <container-configuration extends="Standard BMP EntityBean">
+ <container-name>Small Cache BMP EntityBean</container-name>
+ <container-cache-conf>
+ <cache-policy>org.jboss.ejb.plugins.LRUEnterpriseContextCachePolicy</cache-policy>
+ <cache-policy-conf>
+ <min-capacity>1</min-capacity>
+ <max-capacity>50</max-capacity>
+ <overager-period>1</overager-period>
+ <max-bean-age>1</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>
+ </container-configuration>
+ </container-configurations>
+
</jboss>
Modified: trunk/testsuite/src/resources/classloader/scoping/transaction/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/classloader/scoping/transaction/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/classloader/scoping/transaction/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC
+ "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
+
<jboss>
<loader-repository>jboss.test:loader=scopedtx.jar</loader-repository>
Modified: trunk/testsuite/src/resources/cmp2/commerce/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/commerce/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/cmp2/commerce/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
+
<jboss>
<enterprise-beans>
<entity>
Modified: trunk/testsuite/src/resources/cmp2/jbas1665/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/jbas1665/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/cmp2/jbas1665/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<jboss>
<enterprise-beans>
Modified: trunk/testsuite/src/resources/cmp2/jbas3541/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/jbas3541/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/cmp2/jbas3541/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
+
<jboss>
<enterprise-beans>
<entity>
Modified: trunk/testsuite/src/resources/cmp2/jbas3717/ejb/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/jbas3717/ejb/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/cmp2/jbas3717/ejb/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
+
<jboss>
<enterprise-beans>
<entity>
Modified: trunk/testsuite/src/resources/cmp2/jbas979/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/jbas979/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/cmp2/jbas979/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
+
<jboss>
<enterprise-beans>
<entity>
Modified: trunk/testsuite/src/resources/cmp2/lob/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/lob/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/cmp2/lob/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<jboss>
<enterprise-beans>
Modified: trunk/testsuite/src/resources/cmp2/readonly/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/readonly/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/cmp2/readonly/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<jboss>
<enterprise-beans>
Modified: trunk/testsuite/src/resources/cmp2/relationship/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/cmp2/relationship/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/cmp2/relationship/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<jboss>
<enterprise-beans>
Modified: trunk/testsuite/src/resources/deployment/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/deployment/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/deployment/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,4 +1,9 @@
<?xml version="1.0"?>
+
+<!DOCTYPE jboss PUBLIC
+ "-//JBoss//DTD JBOSS 4.0//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
+
<jboss>
<enterprise-beans>
<session>
Modified: trunk/testsuite/src/resources/entity/unsetentitycontext/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/entity/unsetentitycontext/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/entity/unsetentitycontext/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 3.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_3_0.dtd">
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<jboss>
<enterprise-beans>
Modified: trunk/testsuite/src/resources/excepiiop/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/excepiiop/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/excepiiop/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<jboss>
<enterprise-beans>
Modified: trunk/testsuite/src/resources/helloiiop/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/helloiiop/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/helloiiop/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<jboss>
<enterprise-beans>
Modified: trunk/testsuite/src/resources/hellojrmpiiop/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/hellojrmpiiop/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/hellojrmpiiop/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<jboss>
<enterprise-beans>
Modified: trunk/testsuite/src/resources/idgen/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/idgen/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/idgen/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<jboss>
- <secure>false</secure>
<enterprise-beans>
<session>
<ejb-name>IdGen</ejb-name>
Modified: trunk/testsuite/src/resources/iiop/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/iiop/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/iiop/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<jboss>
<enterprise-beans>
Modified: trunk/testsuite/src/resources/iiopperf/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/iiopperf/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/iiopperf/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<jboss>
<enterprise-beans>
Modified: trunk/testsuite/src/resources/isolation/a/ejb/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/isolation/a/ejb/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/isolation/a/ejb/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<jboss>
<enterprise-beans>
Modified: trunk/testsuite/src/resources/jca/ejb/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/jca/ejb/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/jca/ejb/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<jboss>
<enterprise-beans>
@@ -12,7 +13,7 @@
</enterprise-beans>
<resource-managers>
- <resource-manager res-class="">
+ <resource-manager>
<res-name>DefaultDS</res-name>
<res-jndi-name>java:/DefaultDS</res-jndi-name>
</resource-manager>
Modified: trunk/testsuite/src/resources/jca/inflowmdb/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/jca/inflowmdb/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/jca/inflowmdb/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<jboss>
<enterprise-beans>
Modified: trunk/testsuite/src/resources/jcaprops/goodmdb/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/jcaprops/goodmdb/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/jcaprops/goodmdb/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<jboss>
<enterprise-beans>
Modified: trunk/testsuite/src/resources/jcaprops/uppergoodmdb/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/jcaprops/uppergoodmdb/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/jcaprops/uppergoodmdb/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<jboss>
<enterprise-beans>
Modified: trunk/testsuite/src/resources/jmsra/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/jmsra/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/jmsra/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,35 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
+
<jboss>
- <secure>false</secure>
- <resource-managers>
- <resource-manager>
- <res-name>queuefactoryref</res-name>
- <res-jndi-name>java:/JmsXA</res-jndi-name>
- </resource-manager>
- <resource-manager>
- <res-name>queueref</res-name>
- <res-jndi-name>queue/testQueue</res-jndi-name>
- </resource-manager>
- <resource-manager>
- <res-name>topicfactoryref</res-name>
- <res-jndi-name>java:/JmsXA</res-jndi-name>
- </resource-manager>
- <resource-manager>
- <res-name>topicref</res-name>
- <res-jndi-name>topic/testTopic</res-jndi-name>
- </resource-manager>
- <resource-manager>
- <res-name>recqueueref</res-name>
- <res-jndi-name>queue/A</res-jndi-name>
- </resource-manager>
- </resource-managers>
-
<enterprise-beans>
<session>
<ejb-name>QueuePublisher</ejb-name>
<jndi-name>TxPublisher</jndi-name>
<configuration-name>Standard Stateless SessionBean</configuration-name>
+ <ejb-ref>
+ <ejb-ref-name>ejb/PublisherCMP</ejb-ref-name>
+ <jndi-name></jndi-name>
+ </ejb-ref>
<resource-ref>
<res-ref-name>jms/MyQueueConnection</res-ref-name>
<resource-name>queuefactoryref</resource-name>
@@ -38,15 +20,15 @@
<res-ref-name>jms/QueueName</res-ref-name>
<resource-name>queueref</resource-name>
</resource-ref>
- <ejb-ref>
- <ejb-ref-name>ejb/PublisherCMP</ejb-ref-name>
- <jndi-name></jndi-name>
- </ejb-ref>
</session>
<session>
<ejb-name>TopicPublisher</ejb-name>
<jndi-name>TxTopicPublisher</jndi-name>
<configuration-name>Standard Stateless SessionBean</configuration-name>
+ <ejb-ref>
+ <ejb-ref-name>ejb/PublisherCMP</ejb-ref-name>
+ <jndi-name></jndi-name>
+ </ejb-ref>
<resource-ref>
<res-ref-name>jms/MyTopicConnection</res-ref-name>
<resource-name>topicfactoryref</resource-name>
@@ -55,10 +37,6 @@
<res-ref-name>jms/TopicName</res-ref-name>
<resource-name>topicref</resource-name>
</resource-ref>
- <ejb-ref>
- <ejb-ref-name>ejb/PublisherCMP</ejb-ref-name>
- <jndi-name></jndi-name>
- </ejb-ref>
</session>
<session>
<ejb-name>QueueRec</ejb-name>
@@ -79,8 +57,8 @@
</entity>
<message-driven>
<ejb-name>TopicAdapter</ejb-name>
+ <destination-jndi-name>topic/testTopic</destination-jndi-name>
<configuration-name>Standard Message Driven Bean</configuration-name>
- <destination-jndi-name>topic/testTopic</destination-jndi-name>
<resource-ref>
<res-ref-name>jms/MyQueueConnection</res-ref-name>
<resource-name>queuefactoryref</resource-name>
@@ -91,5 +69,28 @@
</resource-ref>
</message-driven>
</enterprise-beans>
+
+ <resource-managers>
+ <resource-manager>
+ <res-name>queuefactoryref</res-name>
+ <res-jndi-name>java:/JmsXA</res-jndi-name>
+ </resource-manager>
+ <resource-manager>
+ <res-name>queueref</res-name>
+ <res-jndi-name>queue/testQueue</res-jndi-name>
+ </resource-manager>
+ <resource-manager>
+ <res-name>topicfactoryref</res-name>
+ <res-jndi-name>java:/JmsXA</res-jndi-name>
+ </resource-manager>
+ <resource-manager>
+ <res-name>topicref</res-name>
+ <res-jndi-name>topic/testTopic</res-jndi-name>
+ </resource-manager>
+ <resource-manager>
+ <res-name>recqueueref</res-name>
+ <res-jndi-name>queue/A</res-jndi-name>
+ </resource-manager>
+ </resource-managers>
</jboss>
Modified: trunk/testsuite/src/resources/jmx/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/jmx/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/jmx/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<jboss>
<enterprise-beans>
@@ -6,7 +7,6 @@
<ejb-name>TestDataSource</ejb-name>
<jndi-name>test/TestDataSource</jndi-name>
</session>
- <secure>false</secure>
</enterprise-beans>
<resource-managers />
</jboss>
Modified: trunk/testsuite/src/resources/lock/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/lock/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/lock/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,43 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<jboss>
- <secure>false</secure>
- <container-configurations>
-
- <container-configuration extends="Standard CMP 2.x EntityBean">
- <container-name>EntityBean_A</container-name>
- <commit-option>A</commit-option>
- </container-configuration>
-
- <container-configuration extends="Standard CMP 2.x EntityBean">
- <container-name>EntityBean_B</container-name>
- <commit-option>B</commit-option>
- </container-configuration>
-
- <container-configuration extends="Standard CMP 2.x EntityBean">
- <container-name>EntityBean_C</container-name>
- <commit-option>C</commit-option>
- </container-configuration>
-
- <container-configuration extends="Standard CMP 2.x EntityBean">
- <container-name>EntityBean_D</container-name>
- <commit-option>D</commit-option>
- <optiond-refresh-rate>10</optiond-refresh-rate>
- </container-configuration>
-
- <container-configuration extends="Instance Per Transaction CMP 2.x EntityBean">
- <container-name>EntityBean_B_Multi</container-name>
- <commit-option>B</commit-option>
- </container-configuration>
-
- <container-configuration extends="Instance Per Transaction CMP 2.x EntityBean">
- <container-name>EntityBean_C_Multi</container-name>
- <commit-option>C</commit-option>
- </container-configuration>
-
- </container-configurations>
-
<enterprise-beans>
<entity>
<ejb-name>EnterpriseEntity_A</ejb-name>
@@ -76,4 +41,38 @@
</enterprise-beans>
+ <container-configurations>
+
+ <container-configuration extends="Standard CMP 2.x EntityBean">
+ <container-name>EntityBean_A</container-name>
+ <commit-option>A</commit-option>
+ </container-configuration>
+
+ <container-configuration extends="Standard CMP 2.x EntityBean">
+ <container-name>EntityBean_B</container-name>
+ <commit-option>B</commit-option>
+ </container-configuration>
+
+ <container-configuration extends="Standard CMP 2.x EntityBean">
+ <container-name>EntityBean_C</container-name>
+ <commit-option>C</commit-option>
+ </container-configuration>
+
+ <container-configuration extends="Standard CMP 2.x EntityBean">
+ <container-name>EntityBean_D</container-name>
+ <commit-option>D</commit-option>
+ <optiond-refresh-rate>10</optiond-refresh-rate>
+ </container-configuration>
+
+ <container-configuration extends="Instance Per Transaction CMP 2.x EntityBean">
+ <container-name>EntityBean_B_Multi</container-name>
+ <commit-option>B</commit-option>
+ </container-configuration>
+
+ <container-configuration extends="Instance Per Transaction CMP 2.x EntityBean">
+ <container-name>EntityBean_C_Multi</container-name>
+ <commit-option>C</commit-option>
+ </container-configuration>
+
+ </container-configurations>
</jboss>
Modified: trunk/testsuite/src/resources/marshal/ejb-unmarshall/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/marshal/ejb-unmarshall/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/marshal/ejb-unmarshall/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
+
<jboss>
<enterprise-beans>
<session>
Modified: trunk/testsuite/src/resources/marshaliiop/ejb-iiop-unmarshall/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/marshaliiop/ejb-iiop-unmarshall/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/marshaliiop/ejb-iiop-unmarshall/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
+
<jboss>
<enterprise-beans>
<session>
Modified: trunk/testsuite/src/resources/mdb/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/mdb/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/mdb/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -3,33 +3,11 @@
"-//JBoss//DTD JBOSS 3.2//EN"
"http://www.jboss.org/j2ee/dtd/jboss_3_2.dtd">
<jboss>
- <invoker-proxy-bindings>
- <invoker-proxy-binding>
- <name>my-message-driven-bean</name>
- <invoker-mbean>default</invoker-mbean>
- <proxy-factory>org.jboss.ejb.plugins.jms.JMSContainerInvoker</proxy-factory>
- <proxy-factory-config>
- <JMSProviderAdapterJNDI>DefaultJMSProvider</JMSProviderAdapterJNDI>
- <ServerSessionPoolFactoryJNDI>StdJMSPool</ServerSessionPoolFactoryJNDI>
- <MaximumSize>15</MaximumSize>
- <MaxMessages>1</MaxMessages>
- <MDBConfig>
- <ReconnectIntervalSec>10</ReconnectIntervalSec>
- <DLQConfig>
- <DestinationQueue>queue/DLQ</DestinationQueue>
- <MaxTimesRedelivered>10</MaxTimesRedelivered>
- <TimeToLive>0</TimeToLive>
- </DLQConfig>
- </MDBConfig>
- </proxy-factory-config>
- </invoker-proxy-binding>
- </invoker-proxy-bindings>
-
<enterprise-beans>
<message-driven>
<ejb-name>ObjectMessageBean</ejb-name>
+ <destination-jndi-name>queue/testObjectMessage</destination-jndi-name>
<configuration-name>Standard Message Driven Bean</configuration-name>
- <destination-jndi-name>queue/testObjectMessage</destination-jndi-name>
<invoker-bindings>
<invoker>
<invoker-proxy-binding-name>my-message-driven-bean</invoker-proxy-binding-name>
@@ -38,47 +16,69 @@
</message-driven>
<message-driven>
<ejb-name>BMTTXTimeOutBean</ejb-name>
+ <destination-jndi-name>queue/A</destination-jndi-name>
<configuration-name>Standard Message Driven Bean</configuration-name>
- <destination-jndi-name>queue/A</destination-jndi-name>
</message-driven>
<message-driven>
<ejb-name>CMTTXTimeOutBean</ejb-name>
+ <destination-jndi-name>queue/B</destination-jndi-name>
<configuration-name>Standard Message Driven Bean</configuration-name>
- <destination-jndi-name>queue/B</destination-jndi-name>
</message-driven>
<message-driven>
<ejb-name>QueueBean</ejb-name>
+ <destination-jndi-name>queue/testQueue</destination-jndi-name>
<configuration-name>Standard Message Driven Bean</configuration-name>
- <destination-jndi-name>queue/testQueue</destination-jndi-name>
</message-driven>
<message-driven>
<ejb-name>TopicBean</ejb-name>
+ <destination-jndi-name>topic/testTopic</destination-jndi-name>
<configuration-name>Standard Message Driven Bean</configuration-name>
- <destination-jndi-name>topic/testTopic</destination-jndi-name>
</message-driven>
<message-driven>
<ejb-name>DurableTopicBean</ejb-name>
- <configuration-name>Standard Message Driven Bean</configuration-name>
<destination-jndi-name>topic/testDurableTopic</destination-jndi-name>
<mdb-user>john</mdb-user>
<mdb-passwd>needle</mdb-passwd>
<mdb-subscription-id>DurableSubscriberExample</mdb-subscription-id>
+ <configuration-name>Standard Message Driven Bean</configuration-name>
</message-driven>
<message-driven>
<ejb-name>ExQueueBean</ejb-name>
+ <destination-jndi-name>queue/ex</destination-jndi-name>
<configuration-name>Standard Message Driven Bean</configuration-name>
- <destination-jndi-name>queue/ex</destination-jndi-name>
</message-driven>
<message-driven>
<ejb-name>QueueInADifferentContext</ejb-name>
+ <destination-jndi-name>anotherContext/QueueInADifferentContext</destination-jndi-name>
<configuration-name>Standard Message Driven Bean</configuration-name>
- <destination-jndi-name>anotherContext/QueueInADifferentContext</destination-jndi-name>
</message-driven>
<message-driven>
<ejb-name>TopicInADifferentContext</ejb-name>
+ <destination-jndi-name>anotherContext/TopicInADifferentContext</destination-jndi-name>
<configuration-name>Standard Message Driven Bean</configuration-name>
- <destination-jndi-name>anotherContext/TopicInADifferentContext</destination-jndi-name>
</message-driven>
</enterprise-beans>
+
+ <invoker-proxy-bindings>
+ <invoker-proxy-binding>
+ <name>my-message-driven-bean</name>
+ <invoker-mbean>default</invoker-mbean>
+ <proxy-factory>org.jboss.ejb.plugins.jms.JMSContainerInvoker</proxy-factory>
+ <proxy-factory-config>
+ <JMSProviderAdapterJNDI>DefaultJMSProvider</JMSProviderAdapterJNDI>
+ <ServerSessionPoolFactoryJNDI>StdJMSPool</ServerSessionPoolFactoryJNDI>
+ <MaximumSize>15</MaximumSize>
+ <MaxMessages>1</MaxMessages>
+ <MDBConfig>
+ <ReconnectIntervalSec>10</ReconnectIntervalSec>
+ <DLQConfig>
+ <DestinationQueue>queue/DLQ</DestinationQueue>
+ <MaxTimesRedelivered>10</MaxTimesRedelivered>
+ <TimeToLive>0</TimeToLive>
+ </DLQConfig>
+ </MDBConfig>
+ </proxy-factory-config>
+ </invoker-proxy-binding>
+ </invoker-proxy-bindings>
</jboss>
Modified: trunk/testsuite/src/resources/messagedriven/jar/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/messagedriven/jar/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/messagedriven/jar/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE jboss PUBLIC
- "-//JBoss//DTD JBOSS 3.2//EN"
+ "-//JBoss//DTD JBOSS 4.0//EN"
"http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<jboss>
Modified: trunk/testsuite/src/resources/messagedriven/jmscontainerinvoker/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/messagedriven/jmscontainerinvoker/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/messagedriven/jmscontainerinvoker/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,9 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE jboss PUBLIC
- "-//JBoss//DTD JBOSS 3.2//EN"
+ "-//JBoss//DTD JBOSS 4.0//EN"
"http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<jboss>
+ <enterprise-beans>
+ <message-driven>
+ <ejb-name>TestMDB</ejb-name>
+ <local-jndi-name>TestMDB</local-jndi-name>
+ <mdb-user>${test.messagedriven.user}</mdb-user>
+ <mdb-passwd>${test.messagedriven.password}</mdb-passwd>
+ <invoker-bindings>
+ <invoker>
+ <invoker-proxy-binding-name>jms-container-invoker-driven-bean</invoker-proxy-binding-name>
+ </invoker>
+ </invoker-bindings>
+ </message-driven>
+ </enterprise-beans>
<invoker-proxy-bindings>
<invoker-proxy-binding>
<name>jms-container-invoker-driven-bean</name>
@@ -29,17 +42,4 @@
</proxy-factory-config>
</invoker-proxy-binding>
</invoker-proxy-bindings>
- <enterprise-beans>
- <message-driven>
- <ejb-name>TestMDB</ejb-name>
- <local-jndi-name>TestMDB</local-jndi-name>
- <mdb-user>${test.messagedriven.user}</mdb-user>
- <mdb-passwd>${test.messagedriven.password}</mdb-passwd>
- <invoker-bindings>
- <invoker>
- <invoker-proxy-binding-name>jms-container-invoker-driven-bean</invoker-proxy-binding-name>
- </invoker>
- </invoker-bindings>
- </message-driven>
- </enterprise-beans>
</jboss>
Modified: trunk/testsuite/src/resources/naming/ear/a/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/naming/ear/a/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/naming/ear/a/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC
+ "-//JBoss//DTD JBOSS 4.0//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<jboss>
<enterprise-beans>
Modified: trunk/testsuite/src/resources/naming/ear/b/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/naming/ear/b/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/naming/ear/b/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC
+ "-//JBoss//DTD JBOSS 4.0//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<jboss>
<enterprise-beans>
Modified: trunk/testsuite/src/resources/naming/jar/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/naming/jar/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/naming/jar/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -82,15 +82,15 @@
</assembly-descriptor>
<resource-managers>
- <resource-manager res-class="">
+ <resource-manager>
<res-name>DefaultDS</res-name>
<res-jndi-name>java:/DefaultDS</res-jndi-name>
</resource-manager>
- <resource-manager res-class="">
+ <resource-manager>
<res-name>DefaultMail</res-name>
<res-jndi-name>java:/Mail</res-jndi-name>
</resource-manager>
- <resource-manager res-class="java.net.URL">
+ <resource-manager>
<res-name>SourceforgeHomePage</res-name>
<res-url>http://sourceforge.net/</res-url>
</resource-manager>
Modified: trunk/testsuite/src/resources/recover/stateless/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/recover/stateless/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/recover/stateless/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,4 +1,7 @@
<?xml version="1.0"?>
+<!DOCTYPE jboss PUBLIC
+ "-//JBoss//DTD JBOSS 4.0//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<jboss>
<enterprise-beans>
Modified: trunk/testsuite/src/resources/remote-naming/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/remote-naming/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/remote-naming/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,4 +1,7 @@
<?xml version="1.0"?>
+<!DOCTYPE jboss PUBLIC
+ "-//JBoss//DTD JBOSS 4.0//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<!-- The jboss.xml descriptor for the remote-naming.jar ejb unit -->
<jboss>
Modified: trunk/testsuite/src/resources/retry/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/retry/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/retry/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,8 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE jboss PUBLIC
+ "-//JBoss//DTD JBOSS 4.0//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
+
<jboss>
- <secure>false</secure>
+ <enterprise-beans>
+ <session>
+ <ejb-name>RetrySession</ejb-name>
+ <jndi-name>RetrySession</jndi-name>
+ <configuration-name>Retry</configuration-name>
+ </session>
+ </enterprise-beans>
+
<container-configurations>
<container-configuration extends="Standard Stateless SessionBean">
@@ -29,12 +40,4 @@
</container-configurations>
- <enterprise-beans>
- <session>
- <ejb-name>RetrySession</ejb-name>
- <jndi-name>RetrySession</jndi-name>
- <configuration-name>Retry</configuration-name>
- </session>
- </enterprise-beans>
-
</jboss>
Modified: trunk/testsuite/src/resources/secure-perf/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/secure-perf/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/secure-perf/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,4 +1,7 @@
<?xml version="1.0"?>
+<!DOCTYPE jboss PUBLIC
+ "-//JBoss//DTD JBOSS 4.0//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<!-- The jboss.xml descriptor for the secure-perf.jar
This descriptor redefines the JNDI names of the beans in the ejb-jar.xml
Modified: trunk/testsuite/src/resources/security-srp/ejb-inf/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/security-srp/ejb-inf/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/security-srp/ejb-inf/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,10 +1,31 @@
<?xml version="1.0"?>
+<!DOCTYPE jboss PUBLIC
+ "-//JBoss//DTD JBOSS 4.0//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
+
<!-- The jboss.xml descriptor for the security-srp.jar ejb unit.
-->
<jboss>
<security-domain>java:/jaas/srp-test</security-domain>
+ <enterprise-beans>
+ <session>
+ <ejb-name>StatelessSessionJCE</ejb-name>
+ <configuration-name>SRP Stateless SessionBean</configuration-name>
+ <invoker-bindings>
+ <invoker>
+ <invoker-proxy-binding-name>stateless-jce-invoker</invoker-proxy-binding-name>
+ <jndi-name>srp-jce.StatelessSession</jndi-name>
+ </invoker>
+ </invoker-bindings>
+ </session>
+ <session>
+ <ejb-name>StatelessSession</ejb-name>
+ <jndi-name>srp.StatelessSession</jndi-name>
+ </session>
+ </enterprise-beans>
+
<invoker-proxy-bindings>
<invoker-proxy-binding>
<name>stateless-jce-invoker</name>
@@ -46,21 +67,4 @@
</container-configuration>
</container-configurations>
- <enterprise-beans>
- <session>
- <ejb-name>StatelessSessionJCE</ejb-name>
- <configuration-name>SRP Stateless SessionBean</configuration-name>
- <invoker-bindings>
- <invoker>
- <invoker-proxy-binding-name>stateless-jce-invoker</invoker-proxy-binding-name>
- <jndi-name>srp-jce.StatelessSession</jndi-name>
- </invoker>
- </invoker-bindings>
- </session>
- <session>
- <ejb-name>StatelessSession</ejb-name>
- <jndi-name>srp.StatelessSession</jndi-name>
- </session>
- </enterprise-beans>
-
</jboss>
Modified: trunk/testsuite/src/resources/session/session-remove/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/session/session-remove/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/session/session-remove/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 3.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_3_0.dtd">
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<jboss>
<enterprise-beans>
Modified: trunk/testsuite/src/resources/testbean2/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/testbean2/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/testbean2/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<jboss>
Modified: trunk/testsuite/src/resources/testbyvalue/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/testbyvalue/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/testbyvalue/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<jboss>
<enterprise-beans>
Modified: trunk/testsuite/src/resources/tm/txtimeout/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/tm/txtimeout/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/tm/txtimeout/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<jboss>
<enterprise-beans>
Modified: trunk/testsuite/src/resources/txpropiiop/a/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/txpropiiop/a/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/txpropiiop/a/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<jboss>
<!--loader-repository>jboss.test.txpropiiop:loader=txpropiiopa.jar</loader-repository-->
Modified: trunk/testsuite/src/resources/txpropiiop/b/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/txpropiiop/b/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/txpropiiop/b/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<jboss>
<!--loader-repository>jboss.test.txpropiiop:loader=txpropiiopb.jar</loader-repository-->
Modified: trunk/testsuite/src/resources/txtimer/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/txtimer/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/txtimer/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,5 +1,5 @@
<?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">
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<jboss>
Modified: trunk/testsuite/src/resources/web/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/web/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/web/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<jboss>
Modified: trunk/testsuite/src/resources/xa/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/xa/META-INF/jboss.xml 2006-11-19 22:14:11 UTC (rev 58637)
+++ trunk/testsuite/src/resources/xa/META-INF/jboss.xml 2006-11-19 22:15:22 UTC (rev 58638)
@@ -1,18 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<jboss>
- <secure>false</secure>
- <container-configurations />
- <resource-managers>
- <resource-manager res-class="org.jboss.ejb.deployment.JDBCResource">
- <res-name>DB1</res-name>
- <res-jndi-name>java:/DefaultDS</res-jndi-name>
- </resource-manager>
- <resource-manager res-class="org.jboss.ejb.deployment.JDBCResource">
- <res-name>DB2</res-name>
- <res-jndi-name>java:/InstantDB</res-jndi-name>
- </resource-manager>
- </resource-managers>
<enterprise-beans>
<session>
<ejb-name>XATest</ejb-name>
@@ -28,4 +17,14 @@
</resource-ref>
</session>
</enterprise-beans>
+ <resource-managers>
+ <resource-manager>
+ <res-name>DB1</res-name>
+ <res-jndi-name>java:/DefaultDS</res-jndi-name>
+ </resource-manager>
+ <resource-manager>
+ <res-name>DB2</res-name>
+ <res-jndi-name>java:/InstantDB</res-jndi-name>
+ </resource-manager>
+ </resource-managers>
</jboss>
More information about the jboss-cvs-commits
mailing list