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

[simon at wyona.com]

Author: simon
Date: 2007-07-17 17:29:51 +0200 (Tue, 17 Jul 2007)
New Revision: 26066

Modified:
   public/yanel/trunk/src/build/targets/build-update-war.xml
Log:
naming fixed, log4j fixed

Modified: public/yanel/trunk/src/build/targets/build-update-war.xml
===================================================================
--- public/yanel/trunk/src/build/targets/build-update-war.xml	2007-07-17 15:26:47 UTC (rev 26065)
+++ public/yanel/trunk/src/build/targets/build-update-war.xml	2007-07-17 15:29:51 UTC (rev 26066)
@@ -4,7 +4,7 @@
   
   <target name="update-war" description="Create a war to update" depends="init, webapp">
     <delete dir="${build.dir}/update-war"/>
-    <property name="update.dir" value="${build.dir}/update-war/wyona-yanel-UPDATE-${yanel.version}-r${yanel.revision}"/>
+    <property name="update.dir" value="${build.dir}/update-war/wyona-yanel-UPDATE-v-${yanel.version}-r-${yanel.revision}"/>
     <mkdir dir="${update.dir}"/>
     
    <copy todir="${update.dir}/${servlet.context.prefix}">
@@ -48,15 +48,18 @@
       <replacetoken>../src/realms/welcome-admin/yanel/resources</replacetoken>
     </replace>
     <copy file="${yanel.home.dir}/src/binary-dist/log4j.properties" todir="${update.dir}/${servlet.context.prefix}/WEB-INF/classes" overwrite="true"/>
-    <replace file="${update.dir}/${servlet.context.prefix}/WEB-INF/classes/log4j.properties" value="${servlet.context.prefix}">
+    <replace file="${update.dir}/${servlet.context.prefix}/WEB-INF/classes/log4j.properties" value="wyona-yanel-webapp-v-${yanel.version}-r-${yanel.revision}">
       <replacetoken>@SERVLET_CONTEXT@</replacetoken>
     </replace> 
     <mkdir dir="${update.dir}/${servlet.context.prefix}/WEB-INF/logs"/>
 
     <copy file="${yanel.home.dir}/src/build/install.rdf" todir="${update.dir}/${servlet.context.prefix}/WEB-INF/classes" overwrite="true"/>
-    <replace file="${update.dir}/${servlet.context.prefix}/WEB-INF/classes/install.rdf" value="${yanel.version}-r${yanel.revision}">
+    <replace file="${update.dir}/${servlet.context.prefix}/WEB-INF/classes/install.rdf" value="${yanel.version}">
       <replacetoken>@VERSION@</replacetoken>
     </replace>
+    <replace file="${update.dir}/${servlet.context.prefix}/WEB-INF/classes/install.rdf" value="${yanel.revision}">
+      <replacetoken>@REVISION@</replacetoken>
+    </replace>
     <replace file="${update.dir}/${servlet.context.prefix}/WEB-INF/classes/install.rdf" value="update">
       <replacetoken>@INSTALLTYPE@</replacetoken>
     </replace>