[jboss-cvs] JBossAS SVN: r69471 - in trunk: main and 1 other directories.

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

Author: pgier
Date: 2008-01-29 17:52:10 -0500 (Tue, 29 Jan 2008)
New Revision: 69471

Added:
   trunk/main/src/assembly/getopt.xml
   trunk/main/src/assembly/jboss-main-client.xml
   trunk/main/src/assembly/run.xml
Modified:
   trunk/main/pom.xml
   trunk/pom.xml
Log:
[JBBUILD-448] Adding assembly plugin to pluginManagement and adding a few assembly descriptors.

Modified: trunk/main/pom.xml
===================================================================
--- trunk/main/pom.xml	2008-01-29 22:49:24 UTC (rev 69470)
+++ trunk/main/pom.xml	2008-01-29 22:52:10 UTC (rev 69471)
@@ -23,44 +23,7 @@
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<executions>
-					<!--<execution>
-						<id>log4j-boot</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-						<configuration>
-							<includes>
-								<include>org/apache/log4j/*</include>
-								<include>org/apache/log4j/config/*</include>
-								<include>org/apache/log4j/helpers/*</include>
-								<include>org/apache/log4j/or/*</include>
-								<include>org/apache/log4j/spi/*</include>
-							</includes>
-						</configuration>
-					</execution>-->
-					<execution>
-						<id>main-client</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-						<configuration>
-							<includes>
-								<include>org/jboss/system/server/ServerLoader*.class</include>
-								<include>org/jboss/system/server/Server.class</include>
-								<include>org/jboss/system/server/ServerConfig.class</include>
-								<include>**/*MBean.class</include>
-							</includes>							
-						</configuration>
-					</execution>
-					
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
-        <version>2.2-beta-2-SNAPSHOT</version>
         <executions>
           <execution>
             <id>assemblies</id>
@@ -71,6 +34,9 @@
         </executions>
         <configuration>
           <descriptors>
+            <descriptor>src/assembly/jboss-main-client.xml</descriptor>
+            <descriptor>src/assembly/run.xml</descriptor>
+            <descriptor>src/assembly/getopt.xml</descriptor>
             <descriptor>src/assembly/log4j-boot.xml</descriptor>
           </descriptors>
         </configuration>

Added: trunk/main/src/assembly/getopt.xml
===================================================================
--- trunk/main/src/assembly/getopt.xml	                        (rev 0)
+++ trunk/main/src/assembly/getopt.xml	2008-01-29 22:52:10 UTC (rev 69471)
@@ -0,0 +1,15 @@
+<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


Property changes on: trunk/main/src/assembly/getopt.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/main/src/assembly/jboss-main-client.xml
===================================================================
--- trunk/main/src/assembly/jboss-main-client.xml	                        (rev 0)
+++ trunk/main/src/assembly/jboss-main-client.xml	2008-01-29 22:52:10 UTC (rev 69471)
@@ -0,0 +1,19 @@
+<assembly>
+  <id>${project.artifactId}-client</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>target/classes</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>org/jboss/system/server/ServerLoader*.class</include>
+        <include>org/jboss/system/server/Server.class</include>
+        <include>org/jboss/system/server/ServerConfig.class</include>
+        <include>**/*MBean.class</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+</assembly>
\ No newline at end of file


Property changes on: trunk/main/src/assembly/jboss-main-client.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Added: trunk/main/src/assembly/run.xml
===================================================================
--- trunk/main/src/assembly/run.xml	                        (rev 0)
+++ trunk/main/src/assembly/run.xml	2008-01-29 22:52:10 UTC (rev 69471)
@@ -0,0 +1,25 @@
+<assembly>
+  <id>run</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>target/classes</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>org/jboss/**</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>src/resources</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>*.properties</include>
+        <include>jdklogger.xml</include>
+        <include>org/jboss/version.properties</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+</assembly>
\ No newline at end of file


Property changes on: trunk/main/src/assembly/run.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2008-01-29 22:49:24 UTC (rev 69470)
+++ trunk/pom.xml	2008-01-29 22:52:10 UTC (rev 69471)
@@ -75,6 +75,11 @@
 					<version>2.2</version>
 				</plugin>
 				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-assembly-plugin</artifactId>
+					<version>2.2-beta-1</version>
+				</plugin>
+				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>javacc-maven-plugin</artifactId>
 					<version>2.3</version>