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

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

Author: pgier
Date: 2008-11-13 15:56:54 -0500 (Thu, 13 Nov 2008)
New Revision: 80954

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

Modified: trunk/main/pom.xml
===================================================================
--- trunk/main/pom.xml	2008-11-13 20:41:23 UTC (rev 80953)
+++ trunk/main/pom.xml	2008-11-13 20:56:54 UTC (rev 80954)
@@ -14,11 +14,6 @@
   <description>JBoss Application Server (main module)</description>
   <build>
     <sourceDirectory>src/main</sourceDirectory>
-    <resources>
-      <resource>
-        <directory>src/resources</directory>
-      </resource>
-    </resources>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -45,13 +40,12 @@
       <artifactId>jboss-as-bootstrap</artifactId>
     </dependency>
     <dependency>
-      <groupId>urbanophile</groupId>
-      <artifactId>java-getopt</artifactId>
+      <groupId>gnu-getopt</groupId>
+      <artifactId>getopt</artifactId>
     </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>1.2.14</version>
     </dependency>
   </dependencies>
   

Deleted: trunk/main/src/assembly/getopt.xml
===================================================================
--- trunk/main/src/assembly/getopt.xml	2008-11-13 20:41:23 UTC (rev 80953)
+++ trunk/main/src/assembly/getopt.xml	2008-11-13 20:56:54 UTC (rev 80954)
@@ -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/main/src/assembly/run.xml
===================================================================
--- trunk/main/src/assembly/run.xml	2008-11-13 20:41:23 UTC (rev 80953)
+++ trunk/main/src/assembly/run.xml	2008-11-13 20:56:54 UTC (rev 80954)
@@ -15,6 +15,7 @@
     <fileSet>
       <directory>src/resources</directory>
       <outputDirectory>/</outputDirectory>
+      <filtered>true</filtered>
       <includes>
         <include>*.properties</include>
         <include>jdklogger.xml</include>
@@ -22,4 +23,25 @@
       </includes>
     </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/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