[jboss-cvs] JBossAS SVN: r66655 - in branches/JBPAPP_4_2/ejb3: src/resources/test/interceptors2 and 1 other directories.

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

Author: wolfc
Date: 2007-11-01 11:25:42 -0400 (Thu, 01 Nov 2007)
New Revision: 66655

Added:
   branches/JBPAPP_4_2/ejb3/src/resources/test/interceptors2/interceptors2test-mq-service.xml
Removed:
   branches/JBPAPP_4_2/ejb3/src/resources/test/interceptors2/interceptors2test-service.xml
Modified:
   branches/JBPAPP_4_2/ejb3/build-test.xml
   branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/unit/InterceptorsTestCase.java
Log:
JBPAPP-347: Fixed dd for interceptors2 test

Modified: branches/JBPAPP_4_2/ejb3/build-test.xml
===================================================================
--- branches/JBPAPP_4_2/ejb3/build-test.xml	2007-11-01 14:42:55 UTC (rev 66654)
+++ branches/JBPAPP_4_2/ejb3/build-test.xml	2007-11-01 15:25:42 UTC (rev 66655)
@@ -930,6 +930,7 @@
          </fileset>
       </copy>
 
+      <mq2jbm basedir="${resources}/test/interceptors2"/>
    </target>
 
    <target name="interceptors3"

Copied: branches/JBPAPP_4_2/ejb3/src/resources/test/interceptors2/interceptors2test-mq-service.xml (from rev 66642, branches/JBPAPP_4_2/ejb3/src/resources/test/interceptors2/interceptors2test-service.xml)
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/resources/test/interceptors2/interceptors2test-mq-service.xml	                        (rev 0)
+++ branches/JBPAPP_4_2/ejb3/src/resources/test/interceptors2/interceptors2test-mq-service.xml	2007-11-01 15:25:42 UTC (rev 66655)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+   <mbean code="org.jboss.mq.server.jmx.Queue"
+      name="jboss.mq.destination:service=Queue,name=mixedqueue">
+      <attribute name="JNDIName">queue/mixedqueue</attribute>
+      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+   </mbean>
+
+   <mbean code="org.jboss.mq.server.jmx.Queue"
+      name="jboss.mq.destination:service=Queue,name=defaultonlyqueue">
+      <attribute name="JNDIName">queue/defaultonlyqueue</attribute>
+      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+   </mbean>
+
+</server>

Deleted: branches/JBPAPP_4_2/ejb3/src/resources/test/interceptors2/interceptors2test-service.xml
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/resources/test/interceptors2/interceptors2test-service.xml	2007-11-01 14:42:55 UTC (rev 66654)
+++ branches/JBPAPP_4_2/ejb3/src/resources/test/interceptors2/interceptors2test-service.xml	2007-11-01 15:25:42 UTC (rev 66655)
@@ -1,15 +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=mixedqueue">
-      <attribute name="JNDIName">queue/mixedqueue</attribute>
-      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-   </mbean>
-
-   <mbean code="org.jboss.mq.server.jmx.Queue"
-      name="jboss.mq.destination:service=Queue,name=defaultonlyqueue">
-      <attribute name="JNDIName">queue/defaultonlyqueue</attribute>
-      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-   </mbean>
-
-</server>

Modified: branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/unit/InterceptorsTestCase.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/unit/InterceptorsTestCase.java	2007-11-01 14:42:55 UTC (rev 66654)
+++ branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/interceptors2/unit/InterceptorsTestCase.java	2007-11-01 15:25:42 UTC (rev 66655)
@@ -774,7 +774,7 @@
    
    public static Test suite() throws Exception
    {
-      return getDeploySetup(InterceptorsTestCase.class, "interceptors2test-service.xml, interceptors2-test.jar");
+      return getDeploySetup(InterceptorsTestCase.class, "interceptors2test-${jboss.jms.provider}-service.xml, interceptors2-test.jar");
    }
 
 }
\ No newline at end of file