[jboss-cvs] JBossAS SVN: r97482 - in trunk/server/src: main/java/org/jboss and 1 other directory.

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

Author: ALRubinger
Date: 2009-12-05 14:13:31 -0500 (Sat, 05 Dec 2009)
New Revision: 97482

Modified:
   trunk/server/src/assembly/shutdown.xml
   trunk/server/src/main/java/org/jboss/Shutdown.java
Log:
[JBAS-7521][JBAS-7087] Fix the shutdown.jar assembly and update to latest org.jboss.bootstrap APIs

Modified: trunk/server/src/assembly/shutdown.xml
===================================================================
--- trunk/server/src/assembly/shutdown.xml	2009-12-05 02:13:12 UTC (rev 97481)
+++ trunk/server/src/assembly/shutdown.xml	2009-12-05 19:13:31 UTC (rev 97482)
@@ -26,16 +26,9 @@
   <dependencySets>
     <dependencySet>
       <unpack>true</unpack>
-      <unpackOptions>
-        <includes>
-          <include>org/jboss/bootstrap/spi/Server.class</include>
-          <include>org/jboss/bootstrap/spi/ServerConfig.class</include>
-          <include>org/jboss/bootstrap/spi/ServerProcess.class</include>
-          <include>org/jboss/bootstrap/spi/util/ServerConfigUtil.class</include>
-        </includes>
-      </unpackOptions>
       <includes>
-        <include>org.jboss.bootstrap:jboss-bootstrap</include>
+        <include>org.jboss.bootstrap:jboss-bootstrap-api</include>
+        <include>org.jboss.bootstrap:jboss-bootstrap-api-as</include>
       </includes>
     </dependencySet>
     <dependencySet>
@@ -45,4 +38,4 @@
       </includes>
     </dependencySet>
   </dependencySets>
-</assembly>
+</assembly>
\ No newline at end of file

Modified: trunk/server/src/main/java/org/jboss/Shutdown.java
===================================================================
--- trunk/server/src/main/java/org/jboss/Shutdown.java	2009-12-05 02:13:12 UTC (rev 97481)
+++ trunk/server/src/main/java/org/jboss/Shutdown.java	2009-12-05 19:13:31 UTC (rev 97482)
@@ -38,7 +38,7 @@
 import javax.naming.Context;
 import javax.naming.InitialContext;
 
-import org.jboss.bootstrap.api.server.Server;
+import org.jboss.bootstrap.api.as.server.JBossASServer;
 import org.jboss.naming.HttpNamingContextFactory;
 import org.jboss.security.SecurityAssociation;
 import org.jboss.security.SimplePrincipal;
@@ -208,9 +208,9 @@
 
       MBeanServerConnection adaptor = (MBeanServerConnection) obj;
       ServerProxyHandler handler = new ServerProxyHandler(adaptor, serverJMXName);
-      Class<?>[] ifaces = {Server.class};
+      Class<?>[] ifaces = {JBossASServer.class};
       ClassLoader tcl = Thread.currentThread().getContextClassLoader();
-      Server<?,?> server = (Server<?,?>) Proxy.newProxyInstance(tcl, ifaces, handler);
+      JBossASServer server = (JBossASServer) Proxy.newProxyInstance(tcl, ifaces, handler);
       server.shutdown();
       
       System.out.println("Shutdown message has been posted to the server.");