[jboss-cvs] JBossAS SVN: r78935 - projects/server-manager/trunk/src/main/java/org/jboss/jbossas/servermanager.

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

Author: smcgowan at redhat.com
Date: 2008-09-29 16:39:52 -0400 (Mon, 29 Sep 2008)
New Revision: 78935

Modified:
   projects/server-manager/trunk/src/main/java/org/jboss/jbossas/servermanager/Server.java
   projects/server-manager/trunk/src/main/java/org/jboss/jbossas/servermanager/ServerController.java
Log:
JBASM-12: allow the URL passed to server shutdown to be overridden

Modified: projects/server-manager/trunk/src/main/java/org/jboss/jbossas/servermanager/Server.java
===================================================================
--- projects/server-manager/trunk/src/main/java/org/jboss/jbossas/servermanager/Server.java	2008-09-29 16:08:13 UTC (rev 78934)
+++ projects/server-manager/trunk/src/main/java/org/jboss/jbossas/servermanager/Server.java	2008-09-29 20:39:52 UTC (rev 78935)
@@ -95,6 +95,9 @@
    /** the Naming Context */
    private Context namingContext;
 
+   /** Server URL Override */
+   private String serverUrl = null;
+
    /**
     * Get the name.
     *
@@ -552,4 +555,21 @@
 	this.namingContext = namingContext;
    }
 
+
+   /**
+    *
+    * Get the URL to pass to --server 
+    *
+    */
+   public String getServerUrl()
+   {
+	serverUrl = getSysProperty("jbosstest.server.url");
+
+	if (null == serverUrl ) 
+		return getRmiUrl();
+
+	return serverUrl;
+   }
+
+
 }

Modified: projects/server-manager/trunk/src/main/java/org/jboss/jbossas/servermanager/ServerController.java
===================================================================
--- projects/server-manager/trunk/src/main/java/org/jboss/jbossas/servermanager/ServerController.java	2008-09-29 16:08:13 UTC (rev 78934)
+++ projects/server-manager/trunk/src/main/java/org/jboss/jbossas/servermanager/ServerController.java	2008-09-29 20:39:52 UTC (rev 78935)
@@ -352,7 +352,7 @@
       }
 
       String execCmd = manager.getJavaExecutable() + " -cp " + manager.getStopClasspath() + " ";
-      execCmd = execCmd + SHUTDOWN_CLASS + " --server " + server.getRmiUrl();
+      execCmd = execCmd + SHUTDOWN_CLASS + " --server " + server.getServerUrl();
       execCmd = execCmd + strAuth +" --shutdown";
       return execCmd;
    }