[Yanel-commits] rev 25969 -
public/yanel/contributions/projects/update-manager
simon at wyona.com
simon at wyona.com
Fri Jul 13 11:44:05 CEST 2007
Author: simon
Date: 2007-07-13 11:44:05 +0200 (Fri, 13 Jul 2007)
New Revision: 25969
Modified:
public/yanel/contributions/projects/update-manager/build.xml
Log:
changed build.xml accordingly to the other changes
Modified: public/yanel/contributions/projects/update-manager/build.xml
===================================================================
--- public/yanel/contributions/projects/update-manager/build.xml 2007-07-13 09:43:16 UTC (rev 25968)
+++ public/yanel/contributions/projects/update-manager/build.xml 2007-07-13 09:44:05 UTC (rev 25969)
@@ -10,45 +10,48 @@
<target name="init" depends="dependencies">
<mkdir dir="webapps"/>
- <mkdir dir="webapps/${project.name}"/>
- <mkdir dir="webapps/${project.name}/WEB-INF"/>
- <mkdir dir="webapps/${project.name}/WEB-INF/logs"/>
- <mkdir dir="webapps/${project.name}/WEB-INF/classes"/>
- <mkdir dir="webapps/${project.name}/WEB-INF/lib"/>
+ <mkdir dir="webapps/${project.id}"/>
+ <mkdir dir="webapps/${project.id}/WEB-INF"/>
+ <mkdir dir="webapps/${project.id}/WEB-INF/logs"/>
+ <mkdir dir="webapps/${project.id}/WEB-INF/classes"/>
+ <mkdir dir="webapps/${project.id}/WEB-INF/lib"/>
<property name="build.dir" value="."/>
</target>
<target name="build-webapp" depends="init, build-resources">
- <copy file="config/web.xml" tofile="webapps/${project.name}/WEB-INF/web.xml" overwrite="true"/>
+ <copy file="config/web.xml" tofile="webapps/${project.id}/WEB-INF/web.xml" overwrite="true"/>
- <copy todir="webapps/${project.name}/WEB-INF/classes">
+ <copy todir="webapps/${project.id}/WEB-INF/classes">
<fileset dir="config">
<exclude name="web.xml"/>
</fileset>
</copy>
- <replace file="webapps/${project.name}/WEB-INF/classes/install.rdf" value="${project.name}">
- <replacetoken>@PROJECTNAME@</replacetoken>
+ <replace file="webapps/${project.id}/WEB-INF/classes/install.rdf" value="${project.id}">
+ <replacetoken>@PROJECTID@</replacetoken>
</replace>
- <replace file="webapps/${project.name}/WEB-INF/classes/install.rdf" value="${project.version}">
+ <replace file="webapps/${project.id}/WEB-INF/classes/install.rdf" value="${project.version}">
<replacetoken>@VERSION@</replacetoken>
</replace>
- <replace file="webapps/${project.name}/WEB-INF/classes/install.rdf" value="${project.revision}">
+ <replace file="webapps/${project.id}/WEB-INF/classes/install.rdf" value="${project.revision}">
<replacetoken>@REVISION@</replacetoken>
</replace>
- <replace file="webapps/${project.name}/WEB-INF/classes/install.rdf" value="war">
+ <replace file="webapps/${project.id}/WEB-INF/classes/install.rdf" value="war">
<replacetoken>@INSTALLTYPE@</replacetoken>
</replace>
+ <replace file="webapps/${project.id}/WEB-INF/classes/log4j.properties" value="yanel-webapps/${project.id}-v-${project.version}-r-${project.revision}">
+ <replacetoken>@WEBAPP@</replacetoken>
+ </replace>
- <copy todir="webapps/${project.name}/realms">
+ <copy todir="webapps/${project.id}/realms">
<fileset dir="realms"/>
</copy>
- <copy todir="webapps/${project.name}/resource-types">
+ <copy todir="webapps/${project.id}/resource-types">
<fileset dir="resource-types"/>
</copy>
- <copy todir="webapps/${project.name}/WEB-INF/lib">
+ <copy todir="webapps/${project.id}/WEB-INF/lib">
<fileset refid="maven2.fileset"/>
<mapper type="flatten"/>
</copy>
@@ -65,7 +68,7 @@
<property value="${yanel.version}-r${yanel.revision}" name="yanel.source.version"/>
</ant>
- <copy todir="${build.dir}/webapps/${project.name}/WEB-INF/lib">
+ <copy todir="${build.dir}/webapps/${project.id}/WEB-INF/lib">
<fileset dir="${build.dir}/resource-types/file/build/lib"/>
</copy>
@@ -79,13 +82,13 @@
<property value="${yanel.version}-r${yanel.revision}" name="yanel.source.version"/>
</ant>
- <copy todir="${build.dir}/webapps/${project.name}/WEB-INF/lib">
+ <copy todir="${build.dir}/webapps/${project.id}/WEB-INF/lib">
<fileset dir="${build.dir}/resource-types/yanel-update-manager/build/lib"/>
</copy>
</target>
<target name="war" description="Build war file" depends="build-webapp">
- <jar jarfile="${project.name}-v-${yanel.version}-r-${yanel.revision}.war" basedir="webapps/${project.name}"/>
+ <jar jarfile="${project.id}-v-${yanel.version}-r-${yanel.revision}.war" basedir="webapps/${project.id}"/>
</target>
<target name="clean" description="clean" depends="init">
More information about the Yanel-commits
mailing list