[jboss-cvs] JBossAS SVN: r103700 - in trunk/testsuite: src/main/org/jboss/test/profileservice/test/ejb3 and 1 other directories.

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

Author: emuckenhuber
Date: 2010-04-08 09:50:57 -0400 (Thu, 08 Apr 2010)
New Revision: 103700

Added:
   trunk/testsuite/src/resources/profileservice/hornetq-jms.xml
Removed:
   trunk/testsuite/src/resources/profileservice/testEjb3MetricsQueue-service.xml
Modified:
   trunk/testsuite/imports/sections/profileservice.xml
   trunk/testsuite/src/main/org/jboss/test/profileservice/test/ejb3/TestLoggingMDB.java
Log:
fix ejb3 metrics unit test case

Modified: trunk/testsuite/imports/sections/profileservice.xml
===================================================================
--- trunk/testsuite/imports/sections/profileservice.xml	2010-04-08 13:44:01 UTC (rev 103699)
+++ trunk/testsuite/imports/sections/profileservice.xml	2010-04-08 13:50:57 UTC (rev 103700)
@@ -33,7 +33,7 @@
           <include name="org/jboss/test/profileservice/test/ejb3/**"/>
          </fileset>
          <fileset dir="${build.resources}/profileservice/">
-           <include name="testEjb3MetricsQueue-service.xml"/>
+           <include name="hornetq-jms.xml"/>
          </fileset>
       </jar>
       <!-- build testEjb3Metrics.ear -->

Modified: trunk/testsuite/src/main/org/jboss/test/profileservice/test/ejb3/TestLoggingMDB.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/test/ejb3/TestLoggingMDB.java	2010-04-08 13:44:01 UTC (rev 103699)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/test/ejb3/TestLoggingMDB.java	2010-04-08 13:50:57 UTC (rev 103700)
@@ -26,7 +26,6 @@
 import javax.jms.Message;
 import javax.jms.MessageListener;
 
-import org.jboss.ejb3.annotation.Depends;
 import org.jboss.logging.Logger;
 
 /**
@@ -41,7 +40,7 @@
 @MessageDriven(activationConfig =
 {@ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
       @ActivationConfigProperty(propertyName = "destination", propertyValue = TestLoggingMDB.QUEUE_NAME)})
- at Depends("jboss.mq.destination:service=Queue,name=ejb3MetricsTestQueue")
+//@Depends("jboss.mq.destination:service=Queue,name=ejb3MetricsTestQueue")
 public class TestLoggingMDB implements MessageListener
 {
 

Added: trunk/testsuite/src/resources/profileservice/hornetq-jms.xml
===================================================================
--- trunk/testsuite/src/resources/profileservice/hornetq-jms.xml	                        (rev 0)
+++ trunk/testsuite/src/resources/profileservice/hornetq-jms.xml	2010-04-08 13:50:57 UTC (rev 103700)
@@ -0,0 +1,11 @@
+<?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="ejb3MetricsTestQueue">
+      <entry name="queue/ejb3MetricsTestQueue"/>
+   </queue>
+
+</configuration>

Deleted: trunk/testsuite/src/resources/profileservice/testEjb3MetricsQueue-service.xml
===================================================================
--- trunk/testsuite/src/resources/profileservice/testEjb3MetricsQueue-service.xml	2010-04-08 13:44:01 UTC (rev 103699)
+++ trunk/testsuite/src/resources/profileservice/testEjb3MetricsQueue-service.xml	2010-04-08 13:50:57 UTC (rev 103700)
@@ -1,9 +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=ejb3MetricsTestQueue">
-      <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
-   </mbean>
-   
-</server>
\ No newline at end of file