[jboss-cvs] JBossAS SVN: r67950 - in trunk/testsuite/src: resources/jmsra/META-INF and 1 other directory.

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

Author: adrian at jboss.org
Date: 2007-12-05 12:35:02 -0500 (Wed, 05 Dec 2007)
New Revision: 67950

Modified:
   trunk/testsuite/src/main/org/jboss/test/jmsra/test/RaSyncRecUnitTestCase.java
   trunk/testsuite/src/resources/jmsra/META-INF/jboss.xml
Log:
Fix the null jndi names and don't close the cached initial context

Modified: trunk/testsuite/src/main/org/jboss/test/jmsra/test/RaSyncRecUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmsra/test/RaSyncRecUnitTestCase.java	2007-12-05 17:07:00 UTC (rev 67949)
+++ trunk/testsuite/src/main/org/jboss/test/jmsra/test/RaSyncRecUnitTestCase.java	2007-12-05 17:35:02 UTC (rev 67950)
@@ -96,19 +96,13 @@
     */
    protected void setUp() throws Exception
    {
+      super.setUp();
       // Create a receiver
       Context context = getInitialContext();
-      try
-      {
-         QueueRecHome home = (QueueRecHome)context.lookup(BEAN_JNDI);
-         rec = home.create();
+      QueueRecHome home = (QueueRecHome)context.lookup(BEAN_JNDI);
+      rec = home.create();
 
-         init(context);
-      }
-      finally
-      {
-         context.close();
-      }
+      init(context);
 
       // start up the session
       connection.start();

Modified: trunk/testsuite/src/resources/jmsra/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/jmsra/META-INF/jboss.xml	2007-12-05 17:07:00 UTC (rev 67949)
+++ trunk/testsuite/src/resources/jmsra/META-INF/jboss.xml	2007-12-05 17:35:02 UTC (rev 67950)
@@ -8,10 +8,6 @@
 	 <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>
@@ -25,10 +21,6 @@
 	 <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>