[jboss-cvs] JBossAS SVN: r64088 - in trunk/ejb3: src/resources/test-configs/clusteredjms/deploy-hasingleton and 2 other directories.

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

Author: bdecoste
Date: 2007-07-16 20:44:33 -0400 (Mon, 16 Jul 2007)
New Revision: 64088

Removed:
   trunk/ejb3/src/resources/test-configs/clusteredjms/deploy-hasingleton/mdbtest-service.xml
Modified:
   trunk/ejb3/build-test.xml
   trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredjms/QueueTestMDB.java
   trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredjms/TestStatusBean.java
   trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredjms/unit/MDBUnitTestCase.java
Log:
[EJBTHREE-975] adjusted tests for 5.0

Modified: trunk/ejb3/build-test.xml
===================================================================
--- trunk/ejb3/build-test.xml	2007-07-16 23:45:28 UTC (rev 64087)
+++ trunk/ejb3/build-test.xml	2007-07-17 00:44:33 UTC (rev 64088)
@@ -4648,7 +4648,6 @@
 	        <include name="conf/**"/>
 	        <include name="deploy*/**"/>
 	        <include name="lib/**"/>
-            <include name="deploy-hasingleton/**"/>
          </patternset>
       </create-config>
       <create-config baseconf="all" newconf="clusteredjms2">
@@ -4656,12 +4655,10 @@
 	        <include name="conf/**"/>
 	        <include name="deploy*/**"/>
 	        <include name="lib/**"/>
-            <include name="deploy-hasingleton/**"/>
-            <exclude name="deploy-hasingleton/mdbtest-service.xml"/>
+            <exclude name="deploy/mdbtest-service.xml"/>
          </patternset>
       </create-config>
-      
-   	  <echo message="!!!!! starting ${node0} ${node1} ${env.MYTESTIP_1} ${env.MYTESTIP_2} ${node0.http.url} ${node1.http.url}!!!!!"/>
+
       <start-jboss conf="clusteredjms" host="${node0}" jvmargs="-Xmx512M"/>
 	  <start-jboss conf="clusteredjms2" host="${node1}" jvmargs="-Xmx512M"/>	  
 	  

Deleted: trunk/ejb3/src/resources/test-configs/clusteredjms/deploy-hasingleton/mdbtest-service.xml
===================================================================
--- trunk/ejb3/src/resources/test-configs/clusteredjms/deploy-hasingleton/mdbtest-service.xml	2007-07-16 23:45:28 UTC (rev 64087)
+++ trunk/ejb3/src/resources/test-configs/clusteredjms/deploy-hasingleton/mdbtest-service.xml	2007-07-17 00:44:33 UTC (rev 64088)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-   <mbean code="org.jboss.mq.server.jmx.Queue"
-      name="jboss.mq.destination:service=Queue,name=queuetest">
-      <attribute name="JNDIName">queue/mdbtest</attribute>
-      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-   </mbean>
-</server>

Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredjms/QueueTestMDB.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredjms/QueueTestMDB.java	2007-07-16 23:45:28 UTC (rev 64087)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredjms/QueueTestMDB.java	2007-07-17 00:44:33 UTC (rev 64088)
@@ -45,7 +45,7 @@
 @MessageDriven(activationConfig =
         {
         @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
-        @ActivationConfigProperty(propertyName="destination", propertyValue="queue/mdbtest")
+        @ActivationConfigProperty(propertyName="destination", propertyValue="queue/queuetest")
         })
 public class QueueTestMDB
 implements MessageListener

Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredjms/TestStatusBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredjms/TestStatusBean.java	2007-07-16 23:45:28 UTC (rev 64087)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredjms/TestStatusBean.java	2007-07-17 00:44:33 UTC (rev 64088)
@@ -39,7 +39,7 @@
    
    public static int queueRan = 0;
    
-   @Resource(mappedName="queue/mdbtest") Queue queue;
+   @Resource(mappedName="queue/queuetest") Queue queue;
 
    public void clear()
    {

Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredjms/unit/MDBUnitTestCase.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredjms/unit/MDBUnitTestCase.java	2007-07-16 23:45:28 UTC (rev 64087)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredjms/unit/MDBUnitTestCase.java	2007-07-17 00:44:33 UTC (rev 64088)
@@ -62,7 +62,7 @@
       QueueSender sender = null;
       QueueSession session = null;
 
-      Queue queue = (Queue) getInitialContext().lookup("queue/mdbtest");
+      Queue queue = (Queue) getInitialContext().lookup("queue/queuetest");
       QueueConnectionFactory factory = getQueueConnectionFactory();
       cnn = factory.createQueueConnection();
       session = cnn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);