[jboss-cvs] JBossAS SVN: r109330 - in branches/6.0.0.20101110-CR1/testsuite: src/resources/web/META-INF and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: smcgowan at redhat.com
Date: 2010-11-15 01:42:30 -0500 (Mon, 15 Nov 2010)
New Revision: 109330

Added:
   branches/6.0.0.20101110-CR1/testsuite/src/resources/web/META-INF/hornetq-jms.xml
Modified:
   branches/6.0.0.20101110-CR1/testsuite/imports/sections/web.xml
   branches/6.0.0.20101110-CR1/testsuite/src/resources/web/simple-xmlonly/encbinding-jboss-beans.xml
Log:
JBAS-8236 - testsuite fixes from trunk

Modified: branches/6.0.0.20101110-CR1/testsuite/imports/sections/web.xml
===================================================================
--- branches/6.0.0.20101110-CR1/testsuite/imports/sections/web.xml	2010-11-15 06:15:34 UTC (rev 109329)
+++ branches/6.0.0.20101110-CR1/testsuite/imports/sections/web.xml	2010-11-15 06:42:30 UTC (rev 109330)
@@ -230,6 +230,7 @@
          <metainf dir="${build.resources}/web/META-INF">
             <include name="jboss-app.xml"/>
             <include name="jboss-structure.xml"/>
+            <include name="hornetq-jms.xml"/>
          </metainf>
          <fileset dir="${build.lib}">
             <include name="jbosstest-web-ejbs.jar"/>

Added: branches/6.0.0.20101110-CR1/testsuite/src/resources/web/META-INF/hornetq-jms.xml
===================================================================
--- branches/6.0.0.20101110-CR1/testsuite/src/resources/web/META-INF/hornetq-jms.xml	                        (rev 0)
+++ branches/6.0.0.20101110-CR1/testsuite/src/resources/web/META-INF/hornetq-jms.xml	2010-11-15 06:42:30 UTC (rev 109330)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<configuration xmlns="urn:hornetq"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
+
+    <queue name="testQueue">
+        <entry name="queue/testQueue" />
+    </queue>
+
+    <queue name="A">
+        <entry name="queue/A" />
+    </queue>
+
+    <queue name="MockQueueA">
+        <entry name="MockQueueA" />
+    </queue>
+
+    <queue name="MockQueueB">
+        <entry name="MockQueueB" />
+    </queue>
+
+    <topic name="MockTopicA">
+        <entry name="MockTopicA"/>
+    </topic>
+
+    <topic name="testTopic">
+        <entry name="topic/testTopic"/>
+    </topic>
+                
+</configuration>
+

Modified: branches/6.0.0.20101110-CR1/testsuite/src/resources/web/simple-xmlonly/encbinding-jboss-beans.xml
===================================================================
--- branches/6.0.0.20101110-CR1/testsuite/src/resources/web/simple-xmlonly/encbinding-jboss-beans.xml	2010-11-15 06:15:34 UTC (rev 109329)
+++ branches/6.0.0.20101110-CR1/testsuite/src/resources/web/simple-xmlonly/encbinding-jboss-beans.xml	2010-11-15 06:42:30 UTC (rev 109330)
@@ -25,7 +25,7 @@
         <annotation>@org.jboss.aop.microcontainer.aspects.jndi.JndiBinding(name="jbosstest/ejbs/local/ENCBean1")</annotation>
     </bean>
     <bean name="ENC/ejb/CtsBmp" class="org.jboss.test.web.mock.EntityHomeBean">
-        <annotation>@org.jboss.aop.microcontainer.aspects.jndi.JndiBinding(name="jbosstest/ejbs/CtsBmp")</annotation>
+        <annotation>@org.jboss.aop.microcontainer.aspects.jndi.JndiBinding(name="ejbcts/BMPBean")</annotation>
     </bean>
     
     <bean name="ENC/mdr/ConsumesProducesJNDIName" class="org.jboss.test.web.mock.QueueBean">