[jboss-cvs] JBoss Messaging SVN: r3769 - tags/JBossMessaging_1_4_0_SP3_CP01/tests/src/org/jboss/test/messaging/tools/container.

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

Author: ataylor
Date: 2008-02-22 10:22:42 -0500 (Fri, 22 Feb 2008)
New Revision: 3769

Modified:
   tags/JBossMessaging_1_4_0_SP3_CP01/tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java
   tags/JBossMessaging_1_4_0_SP3_CP01/tests/src/org/jboss/test/messaging/tools/container/ServiceContainer.java
Log:
http://jira.jboss.org/jira/browse/JBMESSAGING-1222

Modified: tags/JBossMessaging_1_4_0_SP3_CP01/tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java
===================================================================
--- tags/JBossMessaging_1_4_0_SP3_CP01/tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java	2008-02-22 15:20:16 UTC (rev 3768)
+++ tags/JBossMessaging_1_4_0_SP3_CP01/tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java	2008-02-22 15:22:42 UTC (rev 3769)
@@ -40,6 +40,7 @@
 import org.jboss.jms.server.ServerPeer;
 import org.jboss.logging.Logger;
 import org.jboss.messaging.core.contract.MessageStore;
+import java.io.File;
 import org.jboss.messaging.core.contract.PersistenceManager;
 import org.jboss.messaging.core.contract.PostOffice;
 import org.jboss.messaging.util.XMLUtil;
@@ -904,6 +905,11 @@
    public void poisonTheServer(int type) throws Exception
    {
       URL url = this.getClass().getClassLoader().getResource("poison.xml");
+      if (url == null) // JBMESSAGING-1222 - Hack for OSX JVM Bug when testing the remote connectors
+      {               //(Assumes tests are being executed is the jboss-messaging/tests directory)
+
+         url = (new File("etc/poison.xml")).toURL();
+      }
       AspectXmlLoader.deployXML(url);
 
       log.debug(url + " deployed");

Modified: tags/JBossMessaging_1_4_0_SP3_CP01/tests/src/org/jboss/test/messaging/tools/container/ServiceContainer.java
===================================================================
--- tags/JBossMessaging_1_4_0_SP3_CP01/tests/src/org/jboss/test/messaging/tools/container/ServiceContainer.java	2008-02-22 15:20:16 UTC (rev 3768)
+++ tags/JBossMessaging_1_4_0_SP3_CP01/tests/src/org/jboss/test/messaging/tools/container/ServiceContainer.java	2008-02-22 15:22:42 UTC (rev 3769)
@@ -58,6 +58,7 @@
 
 import org.hsqldb.Server;
 import org.hsqldb.persist.HsqlProperties;
+import java.io.FileInputStream;
 import org.jboss.jms.jndi.JMSProviderAdapter;
 import org.jboss.jms.jndi.JNDIProviderAdapter;
 import org.jboss.jms.server.ServerPeer;
@@ -953,12 +954,15 @@
    private void readConfigurationFile() throws Exception
    {
       InputStream cs = getClass().getClassLoader().getResourceAsStream(CONFIGURATION_FILE_NAME);
-      if (cs == null)
-      {
-         throw new Exception("Cannot file container's configuration file " +
-                             CONFIGURATION_FILE_NAME + ". Make sure it is in the classpath.");
+      if (cs == null) // JBMESSAGING-1222 - Hack for OSX JVM Bug when testing the remote connectors
+      {               //(Assumes tests are being executed is the jboss-messaging/tests directory)
+         cs = new FileInputStream("etc/" + CONFIGURATION_FILE_NAME);
+         if (cs == null)
+         {
+            throw new Exception("Cannot file container's configuration file " +
+                    CONFIGURATION_FILE_NAME + ". Make sure it is in the classpath.");
+         }
       }
-
       try
       {
          config = new ServiceContainerConfiguration(cs);