[jboss-cvs] JBossAS SVN: r103479 - in trunk: testsuite/imports and 1 other directory.

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

Author: smarlow at redhat.com
Date: 2010-04-02 10:22:29 -0400 (Fri, 02 Apr 2010)
New Revision: 103479

Modified:
   trunk/server/src/main/java/org/jboss/Shutdown.java
   trunk/testsuite/imports/server-config.xml
Log:
JBAS-7825 more shutdown changes

Modified: trunk/server/src/main/java/org/jboss/Shutdown.java
===================================================================
--- trunk/server/src/main/java/org/jboss/Shutdown.java	2010-04-02 13:58:02 UTC (rev 103478)
+++ trunk/server/src/main/java/org/jboss/Shutdown.java	2010-04-02 14:22:29 UTC (rev 103479)
@@ -87,6 +87,7 @@
       System.out.println("    -a, --adapter=<name>      Specify JNDI name of the MBeanServerConnection to use");
       System.out.println("    -u, --user=<name>         Specify the username for authentication");
       System.out.println("    -p, --password=<name>     Specify the password for authentication");
+      System.out.println("    -v, --verbose             Be noisy");
       System.out.println();
       System.out.println("operations:");
       System.out.println("    -S, --shutdown            Shutdown the server");

Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml	2010-04-02 13:58:02 UTC (rev 103478)
+++ trunk/testsuite/imports/server-config.xml	2010-04-02 14:22:29 UTC (rev 103479)
@@ -864,11 +864,11 @@
          </java>
       </sequential>
    </macrodef>
-   <!-- A macro for stopping jboss with a jnp url
+   <!-- A macro for stopping jboss
    -->
    <macrodef name="stop-jboss">
-      <attribute name="url" default="jnp://${node0}:1099"
-         description="The jndi provider url used to lookup the RMIAdaptor"/>
+      <attribute name="targethost" default="${node0}"
+         description="The target host machine"/>
       <attribute name="jvmargs" default=""
          description="Addtional jvm args"/>
       <attribute name="jboss.dist" default="${jboss.dist}"
@@ -876,7 +876,7 @@
       <attribute name="java.exec" default="${java.exec}"
          description="Path to the java ececutable" />
       <sequential>
-         <echo message="Will stop the jboss instance at url @{url}"/>
+         <echo message="Will stop the jboss instance @{targethost}"/>
          <java classname="org.jboss.Shutdown" fork="true" dir="@{jboss.dist}/bin"
 	       jvmargs="@{jvmargs}" jvm="@{java.exec}">
             <classpath>
@@ -890,8 +890,9 @@
                <pathelement location="@{jboss.dist}/lib/jboss-system.jar"/>
                <pathelement location="@{jboss.dist}/lib/jboss-system-jmx.jar"/>
             </classpath>
-            <arg value="--server"/>
-            <arg value="@{url}"/>
+            <arg value="-v"/>
+            <arg value="--host"/>
+            <arg value="@{targethost}"/>
             <arg value="--shutdown"/>
          </java>
       </sequential>