Author: alessio.soldano(a)jboss.com
Date: 2010-07-06 07:19:18 -0400 (Tue, 06 Jul 2010)
New Revision: 12588
Modified:
stack/metro/trunk/build.xml
stack/metro/trunk/pom.xml
stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml
stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
stack/metro/trunk/src/main/scripts/assembly-src-dist.xml
Log:
[JBWS-3083] Avoid double maven lifecycle run for building src and bin dist
Modified: stack/metro/trunk/build.xml
===================================================================
--- stack/metro/trunk/build.xml 2010-07-06 10:50:52 UTC (rev 12587)
+++ stack/metro/trunk/build.xml 2010-07-06 11:19:18 UTC (rev 12588)
@@ -23,7 +23,7 @@
<property name="stack.client.dir"
value="${stack.modules.dir}/client"/>
<property name="stack.server.dir"
value="${stack.modules.dir}/server"/>
<property name="stack.resources.dir"
value="${stack.dir}/modules/resources/src/main/resources"/>
- <property name="deploy.artifacts.dir"
value="${stack.output.dir}/deploy-artifacts"/>
+ <property name="deploy.artifacts.dir"
value="${stack.output.dir}/assembly/deploy-artifacts"/>
<import file="${stack.distro.dir}/build-setup.xml"/>
<import file="${stack.distro.dir}/build-deploy.xml"/>
@@ -112,8 +112,11 @@
</exec>
</target>
- <target name="build-bin-dist" depends="prepare-deploy,os-init"
description="Build the binary distribution">
+ <target name="build-bin-dist" depends="prepare,os-init"
description="Build the binary distribution">
+ <!-- Use a system property to overwrite the empty default value -->
+ <property name="maven.opts" value=""/>
+
<echo/>
<echo message="${mvn} ${maven.opts} -Pbindist package
assembly:directory"/>
<echo/>
@@ -125,13 +128,16 @@
<zip destfile="${stack.output.dir}/jbossws-metro-bin-dist.zip">
<zipfileset
- dir="${stack.output.dir}/jbossws-metro-bin-dist"
+ dir="${stack.output.dir}/assembly/jbossws-metro-bin-dist"
includes="build/ deploy/ docs/ tests/ build.xml
ant.properties.example"
prefix="jbossws-metro-bin-dist"/>
</zip>
</target>
- <target name="build-src-dist" depends="prepare-deploy,os-init"
description="Build the source distribution">
+ <target name="build-src-dist" depends="prepare,os-init"
description="Build the source distribution">
+ <!-- Use a system property to overwrite the empty default value -->
+ <property name="maven.opts" value=""/>
+
<echo/>
<echo message="${mvn} ${maven.opts} -Psrcdist package
assembly:directory"/>
<echo/>
@@ -143,7 +149,7 @@
<zip destfile="${stack.output.dir}/jbossws-metro-src-dist.zip">
<zipfileset
- dir="${stack.output.dir}/jbossws-metro-src-dist"
+ dir="${stack.output.dir}/assembly/jbossws-metro-src-dist"
includes="modules/ src/ eclipse/ build.xml pom.xml profiles.xml.example
.classpath .project"
prefix="jbossws-metro-src-dist"/>
</zip>
Modified: stack/metro/trunk/pom.xml
===================================================================
--- stack/metro/trunk/pom.xml 2010-07-06 10:50:52 UTC (rev 12587)
+++ stack/metro/trunk/pom.xml 2010-07-06 11:19:18 UTC (rev 12588)
@@ -404,7 +404,7 @@
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
- <finalName>deploy-artifacts</finalName>
+ <finalName>assembly</finalName>
<ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
<appendAssemblyId>false</appendAssemblyId>
<!--
@@ -449,10 +449,11 @@
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
- <finalName>jbossws-metro-bin-dist</finalName>
+ <finalName>assembly</finalName>
<ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
+
<descriptor>src/main/scripts/assembly-deploy-artifacts.xml</descriptor>
<descriptor>src/main/scripts/assembly-bin-dist.xml</descriptor>
</descriptors>
</configuration>
@@ -472,10 +473,11 @@
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
- <finalName>jbossws-metro-src-dist</finalName>
+ <finalName>assembly</finalName>
<ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
+
<descriptor>src/main/scripts/assembly-deploy-artifacts.xml</descriptor>
<descriptor>src/main/scripts/assembly-src-dist.xml</descriptor>
</descriptors>
</configuration>
Modified: stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml 2010-07-06 10:50:52 UTC (rev
12587)
+++ stack/metro/trunk/src/main/scripts/assembly-bin-dist.xml 2010-07-06 11:19:18 UTC (rev
12588)
@@ -11,14 +11,14 @@
<!-- root -->
<fileSet>
<directory>src/main/distro</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory>jbossws-metro-bin-dist/</outputDirectory>
<includes>
<include>build.xml</include>
</includes>
</fileSet>
<fileSet>
<directory>src/main/distro</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory>jbossws-metro-bin-dist/</outputDirectory>
<filtered>true</filtered>
<includes>
<include>ant.properties.example</include>
@@ -27,7 +27,7 @@
<!-- build -->
<fileSet>
<directory>src/main/distro</directory>
- <outputDirectory>build</outputDirectory>
+ <outputDirectory>jbossws-metro-bin-dist/build</outputDirectory>
<includes>
<include>build-deploy.xml</include>
<include>build-setup.xml</include>
@@ -37,7 +37,7 @@
</fileSet>
<fileSet>
<directory>modules/resources/src/main/resources/resources</directory>
- <outputDirectory>build</outputDirectory>
+ <outputDirectory>jbossws-metro-bin-dist/build</outputDirectory>
<includes>
<include>deploy.conf</include>
<include>server-deploy.conf</include>
@@ -47,7 +47,7 @@
<!-- docs -->
<fileSet>
<directory>src/main/distro</directory>
- <outputDirectory>docs</outputDirectory>
+ <outputDirectory>jbossws-metro-bin-dist/docs</outputDirectory>
<filtered>true</filtered>
<includes>
<include>Install.txt</include>
@@ -57,13 +57,13 @@
</fileSet>
<!-- deploy -->
<fileSet>
- <directory>target/deploy-artifacts</directory>
- <outputDirectory>deploy</outputDirectory>
+ <directory>target/assembly/deploy-artifacts</directory>
+ <outputDirectory>jbossws-metro-bin-dist/deploy</outputDirectory>
</fileSet>
<!-- test etc -->
<fileSet>
<directory>modules/testsuite/metro-tests/src/test</directory>
- <outputDirectory>tests</outputDirectory>
+ <outputDirectory>jbossws-metro-bin-dist/tests</outputDirectory>
<includes>
<include>etc/**</include>
</includes>
@@ -71,7 +71,7 @@
<!-- test excludes -->
<fileSet>
<directory>modules/testsuite</directory>
- <outputDirectory>tests/resources</outputDirectory>
+
<outputDirectory>jbossws-metro-bin-dist/tests/resources</outputDirectory>
<includes>
<include>test-excludes-*.txt</include>
</includes>
@@ -87,7 +87,7 @@
<binaries>
<dependencySets>
<dependencySet>
- <outputDirectory>tests</outputDirectory>
+ <outputDirectory>jbossws-metro-bin-dist/tests</outputDirectory>
<useStrictFiltering>true</useStrictFiltering>
<scope>provided</scope>
<unpack>true</unpack>
Modified: stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-07-06 10:50:52
UTC (rev 12587)
+++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-07-06 11:19:18
UTC (rev 12588)
@@ -14,7 +14,7 @@
<include>org.jboss.ws.metro:jbossws-metro-server</include>
</includes>
<binaries>
- <outputDirectory>lib</outputDirectory>
+ <outputDirectory>deploy-artifacts/lib</outputDirectory>
<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
<unpack>false</unpack>
<dependencySets>
@@ -84,13 +84,13 @@
<include>org.jboss.ws.metro:jbossws-metro-management</include>
</includes>
<binaries>
- <outputDirectory>lib</outputDirectory>
+ <outputDirectory>deploy-artifacts/lib</outputDirectory>
<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
<includeDependencies>false</includeDependencies>
<unpack>false</unpack>
<dependencySets>
<dependencySet>
- <outputDirectory>lib</outputDirectory>
+ <outputDirectory>deploy-artifacts/lib</outputDirectory>
<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<scope>provided</scope>
@@ -103,7 +103,7 @@
</includes>
</dependencySet>
<dependencySet>
- <outputDirectory>lib</outputDirectory>
+ <outputDirectory>deploy-artifacts/lib</outputDirectory>
<outputFileNameMapping>jbossws-jboss501.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<scope>provided</scope>
@@ -113,7 +113,7 @@
</includes>
</dependencySet>
<dependencySet>
- <outputDirectory>lib</outputDirectory>
+ <outputDirectory>deploy-artifacts/lib</outputDirectory>
<outputFileNameMapping>jbossws-jboss510.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<scope>provided</scope>
@@ -123,7 +123,7 @@
</includes>
</dependencySet>
<dependencySet>
- <outputDirectory>lib</outputDirectory>
+ <outputDirectory>deploy-artifacts/lib</outputDirectory>
<outputFileNameMapping>jbossws-jboss600.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<scope>provided</scope>
@@ -136,7 +136,7 @@
<!-- START -->
<!--
<dependencySet>
- <outputDirectory>lib</outputDirectory>
+ <outputDirectory>deploy-artifacts/lib</outputDirectory>
<outputFileNameMapping>jbossws-jboss601.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<scope>provided</scope>
@@ -158,7 +158,7 @@
<include>org.jboss.ws.metro:jbossws-metro-wsit:jar:*</include>
</includes>
<binaries>
- <outputDirectory>lib</outputDirectory>
+ <outputDirectory>deploy-artifacts/lib</outputDirectory>
<outputFileNameMapping>${module.artifactId}-${module.classifier}.${module.extension}</outputFileNameMapping>
<includeDependencies>false</includeDependencies>
<unpack>false</unpack>
@@ -170,7 +170,7 @@
<!-- bin -->
<fileSet>
<directory>modules/resources/src/main/resources/bin</directory>
- <outputDirectory>bin</outputDirectory>
+ <outputDirectory>deploy-artifacts/bin</outputDirectory>
<includes>
<include>wsconsume.*</include>
<include>wsprovide.*</include>
@@ -181,7 +181,7 @@
<!-- resources -->
<fileSet>
<directory>modules/server/target/resources</directory>
- <outputDirectory>resources</outputDirectory>
+ <outputDirectory>deploy-artifacts/resources</outputDirectory>
<includes>
<include>jbossws-*/**</include>
</includes>
@@ -190,7 +190,7 @@
<!-- management console and port component link servlet -->
<fileSet>
<directory>modules/management/target</directory>
- <outputDirectory>lib</outputDirectory>
+ <outputDirectory>deploy-artifacts/lib</outputDirectory>
<includes>
<include>jbossws-metro-management.war</include>
<include>jbossws-metro-management-pcl.war</include>
@@ -201,12 +201,12 @@
<!-- This should be a moduleSet - see above -->
<files>
<file>
- <outputDirectory>lib</outputDirectory>
+ <outputDirectory>deploy-artifacts/lib</outputDirectory>
<source>modules/wsit/target/jbossws-metro-wsit-${project.version}-rt.jar</source>
<destName>jbossws-metro-wsit-rt.jar</destName>
</file>
<file>
- <outputDirectory>lib</outputDirectory>
+ <outputDirectory>deploy-artifacts/lib</outputDirectory>
<source>modules/wsit/target/jbossws-metro-wsit-${project.version}-tools.jar</source>
<destName>jbossws-metro-wsit-tools.jar</destName>
</file>
Modified: stack/metro/trunk/src/main/scripts/assembly-src-dist.xml
===================================================================
--- stack/metro/trunk/src/main/scripts/assembly-src-dist.xml 2010-07-06 10:50:52 UTC (rev
12587)
+++ stack/metro/trunk/src/main/scripts/assembly-src-dist.xml 2010-07-06 11:19:18 UTC (rev
12588)
@@ -10,15 +10,15 @@
<fileSets>
<fileSet>
<directory>eclipse/</directory>
- <outputDirectory>eclipse/</outputDirectory>
+ <outputDirectory>jbossws-metro-src-dist/eclipse/</outputDirectory>
</fileSet>
<fileSet>
<directory>src/</directory>
- <outputDirectory>src/</outputDirectory>
+ <outputDirectory>jbossws-metro-src-dist/src/</outputDirectory>
</fileSet>
<fileSet>
<directory>modules/</directory>
- <outputDirectory>modules/</outputDirectory>
+ <outputDirectory>jbossws-metro-src-dist/modules/</outputDirectory>
<excludes>
<exclude>**/target/**</exclude>
<exclude>**/framework-tests/**</exclude>
@@ -26,7 +26,7 @@
</fileSet>
<fileSet>
<directory>modules/testsuite/framework-tests</directory>
- <outputDirectory>modules/testsuite/framework-tests</outputDirectory>
+
<outputDirectory>jbossws-metro-src-dist/modules/testsuite/framework-tests</outputDirectory>
<includes>
<include>src/test/etc/</include>
<include>scripts/</include>
@@ -35,7 +35,7 @@
</fileSet>
<fileSet>
<directory></directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory>jbossws-metro-src-dist/</outputDirectory>
<includes>
<include>.classpath</include>
<include>.project</include>
@@ -55,7 +55,7 @@
<binaries>
<dependencySets>
<dependencySet>
-
<outputDirectory>modules/testsuite/framework-tests/src/test</outputDirectory>
+
<outputDirectory>jbossws-metro-src-dist/modules/testsuite/framework-tests/src/test</outputDirectory>
<useStrictFiltering>true</useStrictFiltering>
<scope>provided</scope>
<unpack>true</unpack>