[jboss-cvs] JBossAS SVN: r80950 - in trunk/server: src/assembly and 1 other directory.

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

Author: pgier
Date: 2008-11-13 15:31:48 -0500 (Thu, 13 Nov 2008)
New Revision: 80950

Removed:
   trunk/server/src/assembly/getopt.xml
Modified:
   trunk/server/pom.xml
   trunk/server/src/assembly/shutdown.xml
Log:
[JBBUILD-498] Fix generation of shutdown jar.

Modified: trunk/server/pom.xml
===================================================================
--- trunk/server/pom.xml	2008-11-13 20:31:16 UTC (rev 80949)
+++ trunk/server/pom.xml	2008-11-13 20:31:48 UTC (rev 80950)
@@ -119,6 +119,11 @@
     </dependency>
     
     <dependency>
+      <groupId>org.jboss.jbossas</groupId>
+      <artifactId>jboss-as-bootstrap</artifactId>
+    </dependency>
+    
+    <dependency>
       <groupId>org.jboss.integration</groupId>
       <artifactId>jboss-deployment-spi</artifactId>
     </dependency>

Deleted: trunk/server/src/assembly/getopt.xml
===================================================================
--- trunk/server/src/assembly/getopt.xml	2008-11-13 20:31:16 UTC (rev 80949)
+++ trunk/server/src/assembly/getopt.xml	2008-11-13 20:31:48 UTC (rev 80950)
@@ -1,15 +0,0 @@
-<assembly>
-  <id>getopt</id>
-  <formats>
-    <format>jar</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <dependencySets>
-    <dependencySet>
-      <unpack>true</unpack>
-      <includes>
-        <include>urbanophile:java-getopt</include>
-      </includes>
-    </dependencySet>
-  </dependencySets>
-</assembly>
\ No newline at end of file

Modified: trunk/server/src/assembly/shutdown.xml
===================================================================
--- trunk/server/src/assembly/shutdown.xml	2008-11-13 20:31:16 UTC (rev 80949)
+++ trunk/server/src/assembly/shutdown.xml	2008-11-13 20:31:48 UTC (rev 80950)
@@ -23,4 +23,26 @@
       </excludes>
     </fileSet>
   </fileSets>
+  <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.jbossas:jboss-as-bootstrap</include>
+      </includes>
+    </dependencySet>
+    <dependencySet>
+      <unpack>true</unpack>
+      <includes>
+        <include>gnu-getopt:getopt</include>
+      </includes>
+    </dependencySet>
+  </dependencySets>
 </assembly>
\ No newline at end of file