Author: chris.laprun(a)jboss.com
Date: 2008-03-05 15:55:43 -0500 (Wed, 05 Mar 2008)
New Revision: 10218
Modified:
modules/portlet/trunk/build/distrib/distrib.xml
Log:
- Added nojboss and notomcat switches to not generate either tomcat or jboss distribs even
when the paths are set
Modified: modules/portlet/trunk/build/distrib/distrib.xml
===================================================================
--- modules/portlet/trunk/build/distrib/distrib.xml 2008-03-05 20:34:12 UTC (rev 10217)
+++ modules/portlet/trunk/build/distrib/distrib.xml 2008-03-05 20:55:43 UTC (rev 10218)
@@ -68,7 +68,7 @@
<!--
| JBoss Portlet Container binary distribution for AS 4.2.x
-->
- <target name="package-jboss42" description="package AS binary"
if="JBOSS_4_2_PATH">
+ <target name="package-jboss42" description="package AS binary"
if="JBOSS_4_2_PATH" unless="nojboss">
<!-- -->
<unzip src="${JBOSS_4_2_PATH}"
dest="${pc.build.bin.as42}">
@@ -85,7 +85,8 @@
<!-- Simple portal -->
<copy
todir="${pc.build.bin.as42}/server/default/deploy/simple-portal">
- <fileset
dir="${source.dir}/portal/target/portlet-portal-${maven.version}-simple-portal-jboss42.dir/simple-portal"/>
+ <fileset
+
dir="${source.dir}/portal/target/portlet-portal-${maven.version}-simple-portal-jboss42.dir/simple-portal"/>
</copy>
<!-- Taglib integration -->
@@ -102,7 +103,7 @@
<!--
| JBoss Portlet Container binary distribution for Tomcat 6.x
-->
- <target name="package-tomcat60" description="package Tomcat
binary" if="TOMCAT_6_0_PATH">
+ <target name="package-tomcat60" description="package Tomcat
binary" if="TOMCAT_6_0_PATH" unless="notomcat">
<!-- -->
<unzip src="${TOMCAT_6_0_PATH}"
dest="${pc.build.bin.tomcat6}">
@@ -119,10 +120,14 @@
<!-- -->
<copy todir="${pc.build.bin.tomcat6}/lib">
- <fileset
dir="${source.dir}/portal/target/portlet-portal-${maven.version}-simple-portal-tomcat60.dir/simple-portal/lib"
includes="**/*.jar"/>
+ <fileset
+
dir="${source.dir}/portal/target/portlet-portal-${maven.version}-simple-portal-tomcat60.dir/simple-portal/lib"
+ includes="**/*.jar"/>
</copy>
<jar file="${pc.build.bin.tomcat6}/webapps/simple-portal.war">
- <fileset
dir="${source.dir}/portal/target/portlet-portal-${maven.version}-simple-portal-tomcat60.dir/simple-portal/simple-portal.war"
includes="**"/>
+ <fileset
+
dir="${source.dir}/portal/target/portlet-portal-${maven.version}-simple-portal-tomcat60.dir/simple-portal/simple-portal.war"
+ includes="**"/>
</jar>
<!-- -->
@@ -138,8 +143,7 @@
<antcall target="__package-distrib">
<param name="todir" value="${bin.dir}"/>
</antcall>
- <antcall target="__package-bundled-binary">
- </antcall>
+ <antcall target="__package-bundled-binary"/>
</target>
<target name="__package-standalone-binary" if="bin-alone">
@@ -168,7 +172,7 @@
<target name="__package-doc" unless="no-doc">
<sequential>
- <mkdir dir="${todir}"/>
+ <mkdir dir="${todir}"/>
<mkdir dir="${todir}/user-guide"/>
<copy todir="${todir}/user-guide">
<fileset dir="${src.docs.dir}/user-guide/target/docbook"
includes="html_single/**"/>