[jboss-cvs] JBossAS SVN: r80638 - trunk/server.

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

Author: ALRubinger
Date: 2008-11-07 06:23:01 -0500 (Fri, 07 Nov 2008)
New Revision: 80638

Modified:
   trunk/server/build.xml
Log:
[JBAS-6174] Fix shutdown.jar

Modified: trunk/server/build.xml
===================================================================
--- trunk/server/build.xml	2008-11-07 10:57:33 UTC (rev 80637)
+++ trunk/server/build.xml	2008-11-07 11:23:01 UTC (rev 80638)
@@ -496,6 +496,14 @@
       </fileset>
     </jar>
 
+    <!-- Inflate out contents of the Bootstrap JAR into a Temp Directory -->
+     <property name="inflated.dir" value="tmp-bootstrap" />
+     <mkdir dir="${inflated.dir}"/>
+     <unjar dest="${inflated.dir}">
+       <fileset dir="../bootstrap/output/lib">
+         <include name="jboss-bootstrap.jar"/>
+       </fileset>
+     </unjar>
     
     <!-- Build shutdown.jar -->
     <jar jarfile="${build.lib}/shutdown.jar" manifest="${build.etc}/manifest/shutdown.mf">
@@ -506,12 +514,21 @@
         <include name="log4j.properties"/>
         <include name="jndi.properties"/>
       </fileset>
+      <!-- Add some classes from Bootstrap -->
+       <fileset dir="${inflated.dir}">
+          <include name="org/jboss/bootstrap/spi/Server.class"/>
+          <include name="org/jboss/bootstrap/spi/ServerConfig.class"/>
+          <include name="org/jboss/bootstrap/spi/util/ServerConfigUtil.class"/>
+       </fileset>
 
       <!-- Include getopt -->
       <zipfileset src="${gnu.getopt.lib}/getopt.jar">
         <include name="**"/>
       </zipfileset>
     </jar>
+  	
+    <!-- Remove the inflated contents of Bootstrap -->
+    <delete dir="${inflated.dir}" />
 
     <!-- uuid-key-generator.sar -->
     <mkdir dir="${build.lib}/uuid-key-generator.sar"/>