[portal-commits] JBoss Portal SVN: r11856 - modules/portlet/trunk/build/distrib.

Author: thomas.heute(a)jboss.com Date: 2008-09-10 05:01:29 -0400 (Wed, 10 Sep 2008) New Revision: 11856 Modified: modules/portlet/trunk/build/distrib/distrib.xml Log: Modified distrib build to package JBoss 5 CR2 (when released) Modified: modules/portlet/trunk/build/distrib/distrib.xml =================================================================== --- modules/portlet/trunk/build/distrib/distrib.xml 2008-09-10 08:32:07 UTC (rev 11855) +++ modules/portlet/trunk/build/distrib/distrib.xml 2008-09-10 09:01:29 UTC (rev 11856) @@ -2,8 +2,8 @@ <property name="source.dir" value="../.."/> <property name="src.docs.dir" value="${source.dir}/docs"/> - <property name="pc.release.version" value="2.1.0.CR1"/> - <property name="demo.release.version" value="2.1.0.CR1"/> + <property name="pc.release.version" value="2.1.0-SNAPSHOT"/> + <property name="demo.release.version" value="2.1.0-SNAPSHOT"/> <property name="maven.version" value="2.1.0-SNAPSHOT"/> <!-- --> @@ -11,11 +11,13 @@ <property name="demo.release.name" value="jboss-portletcontainer-${demo.release.version}"/> <property name="pc.release.name.src" value="${pc.release.name}-src"/> <property name="demo.release.name.jboss42" value="${demo.release.name}-jbossas42"/> + <property name="demo.release.name.jboss50" value="${demo.release.name}-jbossas50"/> <property name="demo.release.name.tomcat60" value="${demo.release.name}-tomcat6"/> <!-- --> <property name="pc.build.src" value="output/${pc.release.name.src}"/> <property name="pc.build.bin.as42" value="output/${demo.release.name.jboss42}"/> + <property name="pc.build.bin.as50" value="output/${demo.release.name.jboss50}"/> <property name="pc.build.bin.tomcat6" value="output/${demo.release.name.tomcat60}"/> <!-- Clean --> @@ -46,6 +48,7 @@ <antcall target="package-src"/> <antcall target="package-jboss42"/> + <antcall target="package-jboss50"/> <antcall target="package-tomcat60"/> </target> @@ -104,6 +107,48 @@ </target> <!-- + | JBoss Portlet Container binary distribution for AS 5.0.x + --> + <target name="package-jboss50" description="package AS binary" if="JBOSS_5_0_PATH" unless="no-jboss"> + + <!-- --> + <unzip src="${JBOSS_5_0_PATH}" dest="${pc.build.bin.as50}"> + <mapper type="regexp" from="^[^\/]*\/(.*)$$" to="\1"/> + </unzip> + <chmod dir="${pc.build.bin.as50}/bin" perm="ugo+rx" includes="**/*.sh"/> + + <!-- --> + <antcall target="__package-binary"> + <param name="bin.dir" value="${pc.build.bin.as50}"/> + <param name="deploy.dir" value="${pc.build.bin.as50}/server/default/deploy"/> + <param name="samples.dir" value="${pc.build.bin.as50}/server/default/deploy/samples"/> + </antcall> + + <!-- Simple portal --> + <copy todir="${pc.build.bin.as50}/server/default/deploy/simple-portal.sar"> + <fileset + dir="${source.dir}/portal/target/simple-portal-jboss50.dir/simple-portal"/> + </copy> + + <!-- Taglib integration --> + <!-- + <copy todir="${pc.build.bin.as50}" overwrite="true" filtering="true"> + <fileset dir="jboss-5.0"/> + <filterset> + <filter token="maven.version" value="${maven.version}"/> + </filterset> + </copy> + --> + + <!-- --> + <antcall target="__zip"> + <param name="release.name" value="${demo.release.name.jboss50}"/> + </antcall> + </target> + + + + <!-- | JBoss Portlet Container binary distribution for Tomcat 6.x --> <target name="package-tomcat60" description="package Tomcat binary" if="TOMCAT_6_0_PATH" unless="no-tomcat"> @@ -209,6 +254,14 @@ </not> </and> </condition> + <condition property="JBOSS_5_0_PATH" value="${env.JBOSS_5_0_PATH}"> + <and> + <isset property="env.JBOSS_5_0_PATH"/> + <not> + <isset property="JBOSS_5_0_PATH"/> + </not> + </and> + </condition> <condition property="TOMCAT_6_0_PATH" value="${env.TOMCAT_6_0_PATH}"> <and> <isset property="env.TOMCAT_6_0_PATH"/> @@ -218,8 +271,9 @@ </and> </condition> - <echo message="Set JBOSS_4_2_PATH and/or TOMCAT_6_0_PATH variables for binary distributions:"/> + <echo message="Set JBOSS_4_2_PATH and/or JBOSS_5_0_PATH and/or TOMCAT_6_0_PATH variables for binary distributions:"/> <echo message="JBoss AS 4.2.x path: ${JBOSS_4_2_PATH}"/> + <echo message="JBoss AS 5.0.x path: ${JBOSS_5_0_PATH}"/> <echo message="Tomcat 6.x path: ${TOMCAT_6_0_PATH}"/> <echo message="Useful variables:"/> <echo message="no-doc: do not generate documentation if set to true. Currently: ${no-doc}"/>