[jboss-cvs] JBossAS SVN: r97480 - trunk/server/src/main/java/org/jboss.

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

Author: ALRubinger
Date: 2009-12-04 20:43:16 -0500 (Fri, 04 Dec 2009)
New Revision: 97480

Modified:
   trunk/server/src/main/java/org/jboss/Shutdown.java
Log:
[JBAS-7516] Remove -e and -h (exit and halt) support from Shutdown

Modified: trunk/server/src/main/java/org/jboss/Shutdown.java
===================================================================
--- trunk/server/src/main/java/org/jboss/Shutdown.java	2009-12-05 00:21:47 UTC (rev 97479)
+++ trunk/server/src/main/java/org/jboss/Shutdown.java	2009-12-05 01:43:16 UTC (rev 97480)
@@ -38,11 +38,10 @@
 import javax.naming.Context;
 import javax.naming.InitialContext;
 
-import org.jboss.bootstrap.api.as.server.JBossASServer;
+import org.jboss.bootstrap.api.server.Server;
 import org.jboss.naming.HttpNamingContextFactory;
 import org.jboss.security.SecurityAssociation;
 import org.jboss.security.SimplePrincipal;
-import org.jboss.system.server.ServerImplMBean;
 import org.jnp.interfaces.NamingContext;
 
 /**
@@ -79,8 +78,6 @@
       System.out.println();
       System.out.println("operations:");
       System.out.println("    -S, --shutdown            Shutdown the server");
-      System.out.println("    -e, --exit=<code>         Force the VM to exit with a status code");
-      System.out.println("    -H, --halt=<code>         Force the VM to halt with a status code");
       System.out.println();
    }
 
@@ -92,7 +89,7 @@
          System.exit(0);
       }
       
-      String sopts = "-:hD:s:n:a:u:p:Se:H:";
+      String sopts = "-:hD:s:n:a:u:p:S";
       LongOpt[] lopts =
       {
          new LongOpt("help", LongOpt.NO_ARGUMENT, null, 'h'),
@@ -100,8 +97,6 @@
          new LongOpt("adapter", LongOpt.REQUIRED_ARGUMENT, null, 'a'),
          new LongOpt("serverName", LongOpt.REQUIRED_ARGUMENT, null, 'n'),
          new LongOpt("shutdown", LongOpt.NO_ARGUMENT, null, 'S'),
-         new LongOpt("exit", LongOpt.REQUIRED_ARGUMENT, null, 'e'),
-         new LongOpt("halt", LongOpt.REQUIRED_ARGUMENT, null, 'H'),
          new LongOpt("user", LongOpt.REQUIRED_ARGUMENT, null, 'u'),
          new LongOpt("password", LongOpt.REQUIRED_ARGUMENT, null, 'p'),
       };
@@ -114,10 +109,7 @@
       String adapterName = "jmx/rmi/RMIAdaptor";
       String username = null;
       String password = null;
-      ObjectName serverJMXName = ServerImplMBean.OBJECT_NAME;
-      boolean exit = false;
-      boolean halt = false;
-      int exitcode = -1;
+      ObjectName serverJMXName = new ObjectName("jboss.system:type=Server");
 
       while ((code = getopt.getopt()) != -1)
       {
@@ -178,14 +170,6 @@
                password = getopt.getOptarg();
                SecurityAssociation.setCredential(password);
                break;
-            case 'e':
-               exitcode = Integer.parseInt(getopt.getOptarg());
-               exit = true;
-               break;
-            case 'H':
-               exitcode = Integer.parseInt(getopt.getOptarg());
-               halt = true;
-               break;
          }
       }
       
@@ -224,11 +208,11 @@
 
       MBeanServerConnection adaptor = (MBeanServerConnection) obj;
       ServerProxyHandler handler = new ServerProxyHandler(adaptor, serverJMXName);
-      Class<?>[] ifaces = {JBossASServer.class};
+      Class<?>[] ifaces = {Server.class};
       ClassLoader tcl = Thread.currentThread().getContextClassLoader();
-      JBossASServer server = (JBossASServer) Proxy.newProxyInstance(tcl, ifaces, handler);
+      Server<?,?> server = (Server<?,?>) Proxy.newProxyInstance(tcl, ifaces, handler);
       server.shutdown();
-       
+      
       System.out.println("Shutdown message has been posted to the server.");
       System.out.println("Server shutdown may take a while - check logfiles for completion");
    }