[jboss-cvs] JBoss Messaging SVN: r6547 - in trunk: tests/joram-tests/src/org/jboss/test/jms and 1 other directory.

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

Author: jmesnil
Date: 2009-04-24 05:26:59 -0400 (Fri, 24 Apr 2009)
New Revision: 6547

Modified:
   trunk/AS/config/independent/jbm-jboss-beans.xml
   trunk/tests/joram-tests/src/org/jboss/test/jms/SpawnedJMSServer.java
Log:
fixed JMS & JORAM tests

* when JBoss Messaging is starting a JMS server, the JMSServerManager is in charge of starting/stopping the core MessagingServer
* in JMS test, fixed the beans config by ignoring start/stop on the MessagingServer bean
* in JORAM test, commented server.start() (will be started by the JMSServerManager)

Modified: trunk/AS/config/independent/jbm-jboss-beans.xml
===================================================================
--- trunk/AS/config/independent/jbm-jboss-beans.xml	2009-04-24 09:18:33 UTC (rev 6546)
+++ trunk/AS/config/independent/jbm-jboss-beans.xml	2009-04-24 09:26:59 UTC (rev 6547)
@@ -20,6 +20,8 @@
 
 	<!-- The core server -->
    <bean name="MessagingServer" class="org.jboss.messaging.core.server.impl.MessagingServerImpl"> 
+      <start ignored="true"/>
+      <stop ignored="true"/>
       <constructor>
          <parameter>
             <inject bean="Configuration"/>

Modified: trunk/tests/joram-tests/src/org/jboss/test/jms/SpawnedJMSServer.java
===================================================================
--- trunk/tests/joram-tests/src/org/jboss/test/jms/SpawnedJMSServer.java	2009-04-24 09:18:33 UTC (rev 6546)
+++ trunk/tests/joram-tests/src/org/jboss/test/jms/SpawnedJMSServer.java	2009-04-24 09:26:59 UTC (rev 6547)
@@ -77,7 +77,7 @@
          conf.setSecurityEnabled(false);
          conf.setEnableFileDeployment(true);
          final MessagingServer server = Messaging.newMessagingServer(conf);
-         server.start();
+         //server.start();
 
          JMSServerManager serverManager = new JMSServerManagerImpl(server);
          serverManager.start();