[jboss-cvs] JBossAS SVN: r109322 - in trunk/testsuite: src/resources/web/META-INF and 1 other directories.

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

Author: jaikiran
Date: 2010-11-14 09:18:12 -0500 (Sun, 14 Nov 2010)
New Revision: 109322

Added:
   trunk/testsuite/src/resources/web/META-INF/hornetq-jms.xml
Modified:
   trunk/testsuite/imports/sections/web.xml
   trunk/testsuite/src/resources/web/simple-xmlonly/encbinding-jboss-beans.xml
Log:
JBAS-8236 Fixed org.jboss.test.web.test.EncAnnotationsUnitTestCase and org.jboss.test.jacc.test.WebIntegrationUnitTestCase

Modified: trunk/testsuite/imports/sections/web.xml
===================================================================
--- trunk/testsuite/imports/sections/web.xml	2010-11-13 21:56:13 UTC (rev 109321)
+++ trunk/testsuite/imports/sections/web.xml	2010-11-14 14:18:12 UTC (rev 109322)
@@ -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: trunk/testsuite/src/resources/web/META-INF/hornetq-jms.xml
===================================================================
--- trunk/testsuite/src/resources/web/META-INF/hornetq-jms.xml	                        (rev 0)
+++ trunk/testsuite/src/resources/web/META-INF/hornetq-jms.xml	2010-11-14 14:18:12 UTC (rev 109322)
@@ -0,0 +1,31 @@
+<?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: trunk/testsuite/src/resources/web/simple-xmlonly/encbinding-jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/web/simple-xmlonly/encbinding-jboss-beans.xml	2010-11-13 21:56:13 UTC (rev 109321)
+++ trunk/testsuite/src/resources/web/simple-xmlonly/encbinding-jboss-beans.xml	2010-11-14 14:18:12 UTC (rev 109322)
@@ -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">