[jboss-cvs] JBossAS SVN: r99003 - in trunk: build and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jan 4 14:42:47 EST 2010
Author: pgier
Date: 2010-01-04 14:42:47 -0500 (Mon, 04 Jan 2010)
New Revision: 99003
Modified:
trunk/build/build.xml
trunk/pom.xml
trunk/varia/src/assembly/deployment-service-sar.xml
trunk/varia/src/assembly/foe-deployer-3.2-sar.xml
trunk/varia/src/assembly/http-invoker-sar.xml
trunk/varia/src/assembly/httpha-invoker-sar.xml
trunk/varia/src/assembly/mbean-configurator-sar.xml
trunk/varia/src/assembly/persistent-service-sar.xml
trunk/varia/src/assembly/snmp-adaptor-sar.xml
Log:
[JBBUILD-544] Generate .sar files directly with the assembly plugin instead of using .jar extension.
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2010-01-04 18:56:38 UTC (rev 99002)
+++ trunk/build/build.xml 2010-01-04 19:42:47 UTC (rev 99003)
@@ -1377,10 +1377,10 @@
</copy>
<mkdir dir="${install.examples}/jmx/persistent-service.sar"/>
- <unjar src="${varia.module.output}/jboss-as-varia-persistent-service-sar.jar" dest="${install.examples}/jmx/persistent-service.sar"/>
+ <unjar src="${varia.module.output}/jboss-as-varia-persistent-service.sar" dest="${install.examples}/jmx/persistent-service.sar"/>
<mkdir dir="${install.examples.varia}/deployment-service"/>
- <copy file="${varia.module.output}/jboss-as-varia-deployment-service-sar.jar"
+ <copy file="${varia.module.output}/jboss-as-varia-deployment-service.sar"
tofile="${install.examples.varia}/deployment-service/deployment-service.sar"/>
<copy todir="${install.examples.varia}/deployment-service">
<fileset dir="${varia.module.output}/resources/services/deployment">
@@ -1390,7 +1390,7 @@
<!-- MBean Configurator sar for setting mbean attributes when registered -->
<mkdir dir="${install.examples}/jmx/mbean-configurator.sar"/>
- <unjar src="${varia.module.output}/jboss-as-varia-mbean-configurator-sar.jar" dest="${install.examples}/jmx/mbean-configurator.sar"/>
+ <unjar src="${varia.module.output}/jboss-as-varia-mbean-configurator.sar" dest="${install.examples}/jmx/mbean-configurator.sar"/>
<!-- Client jars -->
<mkdir dir="${install.client}"/>
@@ -1420,7 +1420,7 @@
<!-- copy snmp-adaptor.sar unpacked to deploy -->
<mkdir dir="${install.server}/all/deploy/snmp-adaptor.sar"/>
- <unjar src="${varia.module.output}/jboss-as-varia-snmp-adaptor-sar.jar"
+ <unjar src="${varia.module.output}/jboss-as-varia-snmp-adaptor.sar"
dest="${install.server}/all/deploy/snmp-adaptor.sar">
<mapper type="glob" from="jboss-as-varia-*.jar" to="*.jar"/>
</unjar>
@@ -1432,7 +1432,7 @@
<!-- Include the HTTP invoker service unpacked -->
<mkdir dir="${install.server}/all/deploy/httpha-invoker.sar"/>
- <unjar src="${varia.module.output}/jboss-as-varia-httpha-invoker-sar.jar" dest="${install.server}/all/deploy/httpha-invoker.sar"/>
+ <unjar src="${varia.module.output}/jboss-as-varia-httpha-invoker.sar" dest="${install.server}/all/deploy/httpha-invoker.sar"/>
<!-- copy the ant jmx client -->
<mkdir dir="${install.client}"/>
@@ -1510,7 +1510,7 @@
</fileset>
</copy>
- <unjar src="${project.root}/varia/target/jboss-as-varia-http-invoker-sar.jar"
+ <unjar src="${project.root}/varia/target/jboss-as-varia-http-invoker.sar"
dest="${install.default}/deploy/http-invoker.sar"/>
</target>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-01-04 18:56:38 UTC (rev 99002)
+++ trunk/pom.xml 2010-01-04 19:42:47 UTC (rev 99003)
@@ -124,6 +124,13 @@
</manifestSections>
</archive>
</configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jboss-packaging-maven-plugin</artifactId>
+ <version>${version.jboss.packaging.maven.plugin}</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -227,6 +234,11 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<!-- Dependency Management -->
Modified: trunk/varia/src/assembly/deployment-service-sar.xml
===================================================================
--- trunk/varia/src/assembly/deployment-service-sar.xml 2010-01-04 18:56:38 UTC (rev 99002)
+++ trunk/varia/src/assembly/deployment-service-sar.xml 2010-01-04 19:42:47 UTC (rev 99003)
@@ -1,7 +1,7 @@
<assembly>
- <id>deployment-service-sar</id>
+ <id>deployment-service</id>
<formats>
- <format>jar</format>
+ <format>sar</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
Modified: trunk/varia/src/assembly/foe-deployer-3.2-sar.xml
===================================================================
--- trunk/varia/src/assembly/foe-deployer-3.2-sar.xml 2010-01-04 18:56:38 UTC (rev 99002)
+++ trunk/varia/src/assembly/foe-deployer-3.2-sar.xml 2010-01-04 19:42:47 UTC (rev 99003)
@@ -1,7 +1,7 @@
<assembly>
- <id>foe-deployer-3.2-sar</id>
+ <id>foe-deployer-3.2</id>
<formats>
- <format>jar</format>
+ <format>sar</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
Modified: trunk/varia/src/assembly/http-invoker-sar.xml
===================================================================
--- trunk/varia/src/assembly/http-invoker-sar.xml 2010-01-04 18:56:38 UTC (rev 99002)
+++ trunk/varia/src/assembly/http-invoker-sar.xml 2010-01-04 19:42:47 UTC (rev 99003)
@@ -1,7 +1,7 @@
<assembly>
- <id>http-invoker-sar</id>
+ <id>http-invoker</id>
<formats>
- <format>jar</format>
+ <format>sar</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
Modified: trunk/varia/src/assembly/httpha-invoker-sar.xml
===================================================================
--- trunk/varia/src/assembly/httpha-invoker-sar.xml 2010-01-04 18:56:38 UTC (rev 99002)
+++ trunk/varia/src/assembly/httpha-invoker-sar.xml 2010-01-04 19:42:47 UTC (rev 99003)
@@ -1,7 +1,7 @@
<assembly>
- <id>httpha-invoker-sar</id>
+ <id>httpha-invoker</id>
<formats>
- <format>jar</format>
+ <format>sar</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
Modified: trunk/varia/src/assembly/mbean-configurator-sar.xml
===================================================================
--- trunk/varia/src/assembly/mbean-configurator-sar.xml 2010-01-04 18:56:38 UTC (rev 99002)
+++ trunk/varia/src/assembly/mbean-configurator-sar.xml 2010-01-04 19:42:47 UTC (rev 99003)
@@ -1,7 +1,7 @@
<assembly>
- <id>mbean-configurator-sar</id>
+ <id>mbean-configurator</id>
<formats>
- <format>jar</format>
+ <format>sar</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
Modified: trunk/varia/src/assembly/persistent-service-sar.xml
===================================================================
--- trunk/varia/src/assembly/persistent-service-sar.xml 2010-01-04 18:56:38 UTC (rev 99002)
+++ trunk/varia/src/assembly/persistent-service-sar.xml 2010-01-04 19:42:47 UTC (rev 99003)
@@ -1,7 +1,7 @@
<assembly>
- <id>persistent-service-sar</id>
+ <id>persistent-service</id>
<formats>
- <format>jar</format>
+ <format>sar</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
Modified: trunk/varia/src/assembly/snmp-adaptor-sar.xml
===================================================================
--- trunk/varia/src/assembly/snmp-adaptor-sar.xml 2010-01-04 18:56:38 UTC (rev 99002)
+++ trunk/varia/src/assembly/snmp-adaptor-sar.xml 2010-01-04 19:42:47 UTC (rev 99003)
@@ -1,7 +1,7 @@
<assembly>
- <id>snmp-adaptor-sar</id>
+ <id>snmp-adaptor</id>
<formats>
- <format>jar</format>
+ <format>sar</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
More information about the jboss-cvs-commits
mailing list