[Yanel-commits] rev 22315 - public/yanel/trunk/src/build/targets

[michi at wyona.com]

Author: michi
Date: 2007-01-31 15:12:46 +0100 (Wed, 31 Jan 2007)
New Revision: 22315

Modified:
   public/yanel/trunk/src/build/targets/build-binary-snapshot.xml
Log:
build binary snapshot improved

Modified: public/yanel/trunk/src/build/targets/build-binary-snapshot.xml
===================================================================
--- public/yanel/trunk/src/build/targets/build-binary-snapshot.xml	2007-01-31 13:24:53 UTC (rev 22314)
+++ public/yanel/trunk/src/build/targets/build-binary-snapshot.xml	2007-01-31 14:12:46 UTC (rev 22315)
@@ -2,7 +2,10 @@
 
 <project name="build-binary-snapshot" default="bin-snapshot" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
 
+  <target name="bin-snapshot" description="Create a binary snapshot" depends="init, webapp">
+<!--
   <target name="bin-snapshot" description="Create a binary snapshot" depends="init, war">
+-->
     <artifact:remoteRepository id="wyona.org.remote.repository" url="http://www.wyona.org/maven2/"/>
 
     <artifact:dependencies pathId="maven2.tomcat.classpath" filesetId="maven2.tomcat.fileset">
@@ -13,6 +16,17 @@
     <delete dir="${build.dir}/bin-snapshots"/>
     <property name="snapshot.dir" value="${build.dir}/bin-snapshots/wyona-yanel-SNAPSHOT-${yanel.version}-r${yanel.revision}-bin"/>
     <mkdir dir="${snapshot.dir}"/>
+
+    <!-- Unpack Tomcat -->
+    <unzip dest="${snapshot.dir}">
+      <fileset refid="maven2.tomcat.fileset"/>
+    </unzip>
+    <delete dir="${snapshot.dir}/META-INF"/>
+    <chmod dir="${snapshot.dir}/apache-tomcat-${tomcat.version}/bin" perm="755" includes="*"/>
+    <!-- TODO: Differentiate between Java 1.4 and higher (jmx.jar)! -->
+    <copy file="${yanel.home.dir}/tools/apache-tomcat/java-1.4/apache-tomcat-5.5.20/bin/jmx.jar" todir="${snapshot.dir}/apache-tomcat-${tomcat.version}/bin"/>
+
+    <!-- Build WAR file -->
     <copy file="${yanel.home.dir}/src/binary-dist/README.txt" todir="${snapshot.dir}"/>
     <copy todir="${snapshot.dir}/${servlet.context.prefix}">
       <fileset dir="${yanel.home.dir}/build/webapps/${servlet.context.prefix}"/>
@@ -28,6 +42,10 @@
     </copy>
     <jar jarfile="${snapshot.dir}/${servlet.context.prefix}.war" basedir="${snapshot.dir}/${servlet.context.prefix}"/>
     <delete dir="${snapshot.dir}/${servlet.context.prefix}"/>
+
+    <move file="${snapshot.dir}/${servlet.context.prefix}.war" todir="${snapshot.dir}/apache-tomcat-${tomcat.version}/webapps"/>
+
+    <!-- Create ZIP file -->
     <zip destfile="${build.dir}/bin-snapshots/wyona-yanel-SNAPSHOT-${yanel.version}-r${yanel.revision}-bin.zip" basedir="${build.dir}/bin-snapshots"/>
   </target>