[jboss-cvs] JBossAS SVN: r109299 - in branches/6.0.0.20101110-CR1/testsuite: src/main/org/jboss/test/mdb/test and 1 other directory.

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

Author: smcgowan at redhat.com
Date: 2010-11-12 11:48:41 -0500 (Fri, 12 Nov 2010)
New Revision: 109299

Modified:
   branches/6.0.0.20101110-CR1/testsuite/imports/sections/mdb.xml
   branches/6.0.0.20101110-CR1/testsuite/src/main/org/jboss/test/mdb/test/MDBUnitTestCase.java
Log:
JBAS-8594 - fix for CR1

Modified: branches/6.0.0.20101110-CR1/testsuite/imports/sections/mdb.xml
===================================================================
--- branches/6.0.0.20101110-CR1/testsuite/imports/sections/mdb.xml	2010-11-12 15:28:56 UTC (rev 109298)
+++ branches/6.0.0.20101110-CR1/testsuite/imports/sections/mdb.xml	2010-11-12 16:48:41 UTC (rev 109299)
@@ -16,6 +16,13 @@
          </fileset>
       </jar>
 
+     <!-- wrap hornetq xml files -->
+      <jar destfile="${build.lib}/hornetq-xmls.jar">
+         <fileset dir="${build.resources}/hornetq">
+           <include name="**/*.xml"/>
+         </fileset>
+      </jar>
+
       <!-- build mdb.jar -->
       <jar destfile="${build.lib}/mdb.jar">
          <fileset dir="${build.classes}">

Modified: branches/6.0.0.20101110-CR1/testsuite/src/main/org/jboss/test/mdb/test/MDBUnitTestCase.java
===================================================================
--- branches/6.0.0.20101110-CR1/testsuite/src/main/org/jboss/test/mdb/test/MDBUnitTestCase.java	2010-11-12 15:28:56 UTC (rev 109298)
+++ branches/6.0.0.20101110-CR1/testsuite/src/main/org/jboss/test/mdb/test/MDBUnitTestCase.java	2010-11-12 16:48:41 UTC (rev 109299)
@@ -21,27 +21,13 @@
  */
 package org.jboss.test.mdb.test;
 
-import javax.jms.ObjectMessage;
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueSender;
-import javax.jms.QueueSession;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-import javax.jms.Topic;
-import javax.jms.TopicConnection;
-import javax.jms.TopicConnectionFactory;
-import javax.jms.TopicPublisher;
-import javax.jms.TopicSession;
-import javax.management.ObjectName;
+import javax.jms.*;
 import javax.naming.NamingException;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
 import org.jboss.test.JBossJMSTestCase;
-import org.jboss.test.JBossTestCase;
 import org.jboss.test.JBossTestSetup;
 import org.jboss.test.mdb.bean.CustomMessage;
 
@@ -277,17 +263,14 @@
          protected void setUp() throws Exception
          {
             super.setUp();
-            ClassLoader loader = Thread.currentThread().getContextClassLoader();
             MDBUnitTestCase.deployQueue("testObjectMessage");
-            deploy(loader.getResource("hornetq/hornetq-jms.xml").toString());
-            deploy(loader.getResource("hornetq/hornetq-queues.xml").toString());
+            deploy("hornetq-xmls.jar");
             deploy("mdb.jar");
          }
 
          protected void tearDown() throws Exception
          {
             super.tearDown();
-            ClassLoader loader = Thread.currentThread().getContextClassLoader();
             try
             {
                undeploy("mdb.jar");
@@ -298,20 +281,12 @@
             }
             try
             {
-               undeploy(loader.getResource("hornetq/hornetq-jms.xml").toString());
+               undeploy("hornetq-xmls.jar");
             }
             catch (Exception ignored)
             {
-               getLog().warn("Unable to undeploy hornetq/hornetq-jms.xml", ignored);
+               getLog().warn("Unable to undeploy hornetq-xmls.jar", ignored);
             }
-            try
-            {
-               undeploy(loader.getResource("hornetq/hornetq-queues.xml").toString());
-            }
-            catch (Exception ignored)
-            {
-               getLog().warn("Unable to undeploy hornetq/hornetq-jms.xml", ignored);
-            }
             MDBUnitTestCase.undeployDestinations();
          }
       };