[jboss-cvs] JBoss Messaging SVN: r4492 - branches/Branch_Experimental_JBMESSAGING_1356_2/tests/src/org/jboss/test/messaging/tools/container.

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

Author: ovidiu.feodorov at jboss.com
Date: 2008-06-16 21:28:31 -0400 (Mon, 16 Jun 2008)
New Revision: 4492

Modified:
   branches/Branch_Experimental_JBMESSAGING_1356_2/tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java
Log:
made location of messaging-service.xml configurable from test as 'test.server.peer.configuration.file'

Modified: branches/Branch_Experimental_JBMESSAGING_1356_2/tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java
===================================================================
--- branches/Branch_Experimental_JBMESSAGING_1356_2/tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java	2008-06-17 01:26:57 UTC (rev 4491)
+++ branches/Branch_Experimental_JBMESSAGING_1356_2/tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java	2008-06-17 01:28:31 UTC (rev 4492)
@@ -63,6 +63,9 @@
 
    private static final Logger log = Logger.getLogger(LocalTestServer.class);
 
+   public static final String DEFAULT_MAIN_CONFIG_FILE =
+       "server/default/deploy/messaging-service.xml";
+
    // Static ---------------------------------------------------------------------------------------
 
    public static void setEnvironmentServerIndex(int serverIndex)
@@ -299,8 +302,15 @@
          // we are using the "default" service deployment descriptors available in
          // src/etc/server/default/deploy. This will allow to test the default parameters we ship.
 
-         String mainConfigFile = "server/default/deploy/messaging-service.xml";
-         
+         String mainConfigFile = DEFAULT_MAIN_CONFIG_FILE;
+
+         String s = System.getProperty("test.server.peer.configuration.file");
+
+         if (s != null)
+         {
+             mainConfigFile = s;
+         }
+
          String persistenceConfigFile = sc.getPersistenceConfigFile(clustered);
 
          log.info(" Persistence config file .. " + persistenceConfigFile);