Author: cmailleux
Date: Fri May 25 11:52:26 2007
New Revision: 396
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D396&repname=
=3Desi_server
Log:
resolve issue ESI-324
Add Jahia Copyright and build number
Modified:
trunk/build.xml
trunk/src/org/jahia/esi/Utils.java
Modified: trunk/build.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/build.xml&rev=
=3D396&repname=3Desi_server
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/build.xml (original)
+++ trunk/build.xml Fri May 25 11:52:26 2007
@@ -1,182 +1,154 @@
<project name=3D"j2ep" default=3D"compile" basedir=3D".">
-
- <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
- <!-- check if ${build.properties.file} is present -=
->
- <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
- <!-- fail and print message if ${build.properties.file} is not
+ <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --><!-- che=
ck if ${build.properties.file} is present --><!-- =3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --><!-- fail and print messa=
ge if ${build.properties.file} is not
present -->
-
<target name=3D"check-build-properties-file" unless=3D"build.propertie=
s.present">
<fail message=3D"${build.properties.file} file not present.${line.=
separator}This file is required for building the ESI server.${line.separato=
r}Read ESI_readme.txt for instructions how to install the ${build.propertie=
s.file} file."/>
</target>
-
<!-- initialize the ant.build.properties.file property and the
- ant.build.properties.present property -->
+ ant.build.properties.present property -->
<target name=3D"init-check-build-properties-file">
<available file=3D"${build.properties.file}" type=3D"file" propert=
y=3D"build.properties.present"/>
<!--echo message=3D"Reading properties from ${build.properties.fil=
e}"/-->
</target>
-
- <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
- <!-- Properties are stored in a seperate properties file. This default=
s -->
- <!-- to ant.build.properties in the basedir of the Jahia distribution =
-->
- <!-- read the README file for details =
-->
- <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
+ <!-- =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --><!-- Pro=
perties are stored in a seperate properties file. This defaults --><!-- to=
ant.build.properties in the basedir of the Jahia distribution --><!-- r=
ead the README file for details --><!-- =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -->
<target name=3D"set-build-properties-file-location">
<property name=3D"build.properties.file" location=3D"build.propert=
ies"/>
</target>
+ <!-- set global properties for this build --><!-- first check if ${=
ant.build.properties.file} is present -->
+ <target name=3D"init"
+ depends=3D"set-build-properties-file-location,init-check-build=
-properties-file,check-build-properties-file">
+ <!--
=
- <!-- set global properties for this build -->
- <!-- first check if ${ant.build.properties.file} is present -->
- <target name=3D"init" depends=3D"set-build-properties-file-location,in=
it-check-build-properties-file,check-build-properties-file">
-
- <!--
-
- The property file has to include to following properties.
+ The property file has to include to following properties.
=
- * app.version - The version we are currently building.
+ * app.version - The version we are currently building.
=
- * external.libs - Location for commons-beanutils, commons-codec
- commons-digester and commons-httpclient.
+ * external.libs - Location for commons-beanutils, commons-codec
+ commons-digester and commons-httpclient.
=
- * server.url - Url to the server, standard is http://localhost:8080.
+ * server.url - Url to the server, standard is http://localhost:8=
080.
=
- You can also add params needed for the start of your container.
- This build file can deploy to Tomcat and therefor the following
- properties are added to build.properties.
+ You can also add params needed for the start of your container.
+ This build file can deploy to Tomcat and therefor the following
+ properties are added to build.properties.
=
- * catalina.home - Tomcat location.
+ * catalina.home - Tomcat location.
=
- * manager.username - User name for the manager role.
+ * manager.username - User name for the manager role.
=
- * manager.password - Password for the manager role.
+ * manager.password - Password for the manager role.
=
- -->
-
- <!-- read properties from ${ant.build.properties.file} -->
+ --><!-- read properties from ${ant.build.properties.file} -->
<property file=3D"${build.properties.file}"/>
+ <!--
=
- <!--
-
- Here are some properties used when building.
-
- -->
- <property name=3D"app.name" value=3D"j2ep"/>
- <property name=3D"build.home" value=3D"${basedir}/build"/>
- <property name=3D"app.home" value=3D"${basedir}/WEB-INF"=
/>
- <property name=3D"lib.home" value=3D"${basedir}/WEB-INF/=
lib"/>
- <property name=3D"dist.home" value=3D"${basedir}/dist"/>
- <property name=3D"docs.home" value=3D"${basedir}/docs"/>
- <property name=3D"src.home" value=3D"${basedir}/src"/>
- <property name=3D"test.relativehome" value=3D"/net/sf/j2ep/test"/>
- <property name=3D"test.path" value=3D"net.sf.j2ep.test"/>
- <property name=3D"reports.test" value=3D"${basedir}/testrepo=
rts"/>
- <property name=3D"manager.url" value=3D"${server.url}/manag=
er"/>
-
- <property name=3D"compile.debug" value=3D"true"/>
- <property name=3D"compile.deprecation" value=3D"false"/>
- <property name=3D"compile.optimize" value=3D"true"/>
-
+ Here are some properties used when building.
=
+ -->
+ <property name=3D"app.name" value=3D"j2ep"/>
+ <property name=3D"build.home" value=3D"${basedir}/build"/>
+ <property name=3D"app.home" value=3D"${basedir}/WEB-INF"/>
+ <property name=3D"lib.home" value=3D"${basedir}/WEB-INF/lib"/>
+ <property name=3D"dist.home" value=3D"${basedir}/dist"/>
+ <property name=3D"docs.home" value=3D"${basedir}/docs"/>
+ <property name=3D"src.home" value=3D"${basedir}/src"/>
+ <property name=3D"test.relativehome" value=3D"/net/sf/j2ep/test"/>
+ <property name=3D"test.path" value=3D"net.sf.j2ep.test"/>
+ <property name=3D"reports.test" value=3D"${basedir}/testreports"/>
+ <property name=3D"manager.url" value=3D"${server.url}/manager"/>
+ <property name=3D"compile.debug" value=3D"true"/>
+ <property name=3D"compile.deprecation" value=3D"false"/>
+ <property name=3D"compile.optimize" value=3D"true"/>
+ <!--
+
+ Dynamical construction of the classpath for ant.
+
+ -->
+ <path id=3D"compile.classpath">
+ <!-- Include all the external libs -->
+ <fileset dir=3D"${lib.home}">
+ <include name=3D"**/*.jar"/>
+ </fileset>
+ <fileset dir=3D"${catalina.home}/server/lib">
+ <include name=3D"**/*.jar"/>
+ </fileset>
+ <fileset dir=3D"${catalina.home}/common/lib">
+ <include name=3D"**/*.jar"/>
+ </fileset>
+ <!-- Base path included for the tests to relate to -->
+ <pathelement location=3D"${build.home}"/>
+ </path>
+ <taskdef resource=3D"cactus.tasks">
+ <classpath refid=3D"compile.classpath"/>
+ </taskdef>
+ </target>
<!--
=
- Dynamical construction of the classpath for ant.
-
- -->
- <path id=3D"compile.classpath">
-
- <!-- Include all the external libs -->
- <fileset dir=3D"${lib.home}">
- <include name=3D"**/*.jar" />
- </fileset>
-
- <fileset dir=3D"${catalina.home}/server/lib">
- <include name=3D"**/*.jar" />
- </fileset>
-
- <fileset dir=3D"${catalina.home}/common/lib">
- <include name=3D"**/*.jar" />
- </fileset>
- =
- <!-- Base path included for the tests to relate
to -->
- <pathelement location=3D"${build.home}"/>
- </path>
-
- </target>
-
- <!--
-
Deletes all previous builds to clean up the filesystem.
=
-->
<target name=3D"clean" description=3D"Delete old build and dist direct=
ories" depends=3D"init">
- <delete dir=3D"${build.home}" />
- <delete dir=3D"${dist.home}" />
- <delete dir=3D"${docs.home}/api" />
- <delete dir=3D"${targetapp.dir}/WEB-INF" />
- <delete dir=3D"${targetapp.dir}/esiadmin" />
+ <delete dir=3D"${build.home}"/>
+ <delete dir=3D"${dist.home}"/>
+ <delete dir=3D"${docs.home}/api"/>
+ <delete dir=3D"${targetapp.dir}/WEB-INF"/>
+ <delete dir=3D"${targetapp.dir}/esiadmin"/>
</target>
-
-
<!--
=
Compiles the source files to /WEB-INF/classes.
=
-->
- <target name=3D"compile" depends=3D"prepare" description=3D"Compile Ja=
va sources">
-
- <!-- Compile Java classes -->
- <mkdir dir=3D"${build.home}" />
- <javac source=3D"1.4" target=3D"1.4" srcdir=3D"${src.home}" destdi=
r=3D"${build.home}" debug=3D"${compile.debug}" deprecation=3D"${compile.dep=
recation}" optimize=3D"${compile.optimize}">
- <classpath refid=3D"compile.classpath" />
+ <target name=3D"compile" depends=3D"prepare,setBuildVersion" descripti=
on=3D"Compile Java sources">
+ <!-- Compile Java classes -->
+ <mkdir dir=3D"${build.home}"/>
+ <javac source=3D"1.4"
+ target=3D"1.4"
+ srcdir=3D"${src.home}"
+ destdir=3D"${build.home}"
+ debug=3D"${compile.debug}"
+ deprecation=3D"${compile.deprecation}"
+ optimize=3D"${compile.optimize}">
+ <classpath refid=3D"compile.classpath"/>
</javac>
-
<!-- Copy application resources -->
<copy todir=3D"${build.home}">
- <fileset dir=3D"${src.home}" excludes=3D"**/*.java,**/*.class"=
/>
+ <fileset dir=3D"${src.home}" excludes=3D"**/*.java,**/*.class"=
/>
</copy>
-
</target>
-
-
<!--
=
Will run the test cases for both junit and cactus.
=
-->
- <target name=3D"test" depends=3D"cactusrelease,redeploy.cactuswar,depl=
oy.cactuswar" description=3D"Run all junit and cactus tests">
-
+ <target name=3D"test"
+ depends=3D"cactusrelease,redeploy.cactuswar,deploy.cactuswar"
+ description=3D"Run all junit and cactus tests">
<!-- JUnit -->
<junit printsummary=3D"yes" haltonfailure=3D"yes">
- <classpath refid=3D"compile.classpath" />
- <formatter type=3D"plain" />
-
- <test name=3D"net.sf.j2ep.test.AllowHeaderTest" todir=3D"${rep=
orts.test}" />
- <test name=3D"net.sf.j2ep.test.CompositeRuleTest" todir=3D"${r=
eports.test}" />
- <test name=3D"net.sf.j2ep.test.DirectoryRuleTest" todir=3D"${r=
eports.test}" />
- <test name=3D"net.sf.j2ep.test.IPRuleTest" todir=3D"${reports.=
test}" />
- <test name=3D"net.sf.j2ep.test.RewriteRuleTest" todir=3D"${rep=
orts.test}" />
- <test name=3D"net.sf.j2ep.test.TimeRuleTest" todir=3D"${report=
s.test}" />
- <test name=3D"net.sf.j2ep.test.StatusCheckerTest" todir=3D"${r=
eports.test}" />
+ <classpath refid=3D"compile.classpath"/>
+ <formatter type=3D"plain"/>
+ <test name=3D"net.sf.j2ep.test.AllowHeaderTest" todir=3D"${rep=
orts.test}"/>
+ <test name=3D"net.sf.j2ep.test.CompositeRuleTest" todir=3D"${r=
eports.test}"/>
+ <test name=3D"net.sf.j2ep.test.DirectoryRuleTest" todir=3D"${r=
eports.test}"/>
+ <test name=3D"net.sf.j2ep.test.IPRuleTest" todir=3D"${reports.=
test}"/>
+ <test name=3D"net.sf.j2ep.test.RewriteRuleTest" todir=3D"${rep=
orts.test}"/>
+ <test name=3D"net.sf.j2ep.test.TimeRuleTest" todir=3D"${report=
s.test}"/>
+ <test name=3D"net.sf.j2ep.test.StatusCheckerTest" todir=3D"${r=
eports.test}"/>
</junit>
-
<!-- Cactus -->
<cactus warfile=3D"${dist.home}/${app.name}-${app.version}-CACTUS.=
war" printsummary=3D"yes">
- <classpath refid=3D"compile.classpath" />
- <formatter type=3D"plain" />
-
- <test name=3D"net.sf.j2ep.test.OptionTest" todir=3D"${reports.=
test}" />
- <test name=3D"net.sf.j2ep.test.GetTest" todir=3D"${reports.tes=
t}" />
- <test name=3D"net.sf.j2ep.test.PostTest" todir=3D"${reports.te=
st}" />
- <test name=3D"net.sf.j2ep.test.DirectoryMappingTest" todir=3D"=
${reports.test}" />
- <test name=3D"net.sf.j2ep.test.ClusterTest" todir=3D"${reports=
.test}" />
- <test name=3D"net.sf.j2ep.test.TraceTest" todir=3D"${reports.t=
est}" />
- <test name=3D"net.sf.j2ep.test.CycleTest"
todir=3D"${reports.test=
}" />
+ <classpath refid=3D"compile.classpath"/>
+ <formatter type=3D"plain"/>
+ <test name=3D"net.sf.j2ep.test.OptionTest" todir=3D"${reports.=
test}"/>
+ <test name=3D"net.sf.j2ep.test.GetTest" todir=3D"${reports.tes=
t}"/>
+ <test name=3D"net.sf.j2ep.test.PostTest" todir=3D"${reports.te=
st}"/>
+ <test name=3D"net.sf.j2ep.test.DirectoryMappingTest" todir=3D"=
${reports.test}"/>
+ <test name=3D"net.sf.j2ep.test.ClusterTest" todir=3D"${reports=
.test}"/>
+ <test name=3D"net.sf.j2ep.test.TraceTest" todir=3D"${reports.t=
est}"/>
+ <test name=3D"net.sf.j2ep.test.CycleTest" todir=3D"${reports.t=
est}"/>
</cactus>
-
</target>
-
-
<!--
=
Makes a WAR file containing the test classes which are normally
@@ -185,85 +157,69 @@
=
-->
<target name=3D"cactusrelease" depends=3D"compile" description=3D"Crea=
te war for cactus test">
-
<!-- Create temporary dist directory -->
- <mkdir dir=3D"${dist.home}/tmp/WEB-INF" />
+ <mkdir dir=3D"${dist.home}/tmp/WEB-INF"/>
<copy todir=3D"${dist.home}/tmp/WEB-INF">
- <fileset dir=3D"${app.home}" />
+ <fileset dir=3D"${app.home}"/>
</copy>
-
<!-- We only want the web.xml that cactus is making for us -->
- <move tofile=3D"${dist.home}/tmp/WEB-INF/web.xml" overwrite=3D"tru=
e" file=3D"${dist.home}/tmp/WEB-INF/cactus-web.xml" />
-
+ <move tofile=3D"${dist.home}/tmp/WEB-INF/web.xml"
+ overwrite=3D"true"
+ file=3D"${dist.home}/tmp/WEB-INF/cactus-web.xml"/>
<!-- Create application JAR file and cactify -->
- <jar jarfile=3D"${dist.home}/test.war" basedir=3D"${dist.home}/tmp=
" />
- <cactifywar srcfile=3D"${dist.home}/test.war" destfile=3D"${dist.h=
ome}/${app.name}-${app.version}-CACTUS.war" />
-
+ <jar jarfile=3D"${dist.home}/test.war" basedir=3D"${dist.home}/tmp=
"/>
+ <cactifywar srcfile=3D"${dist.home}/test.war" destfile=3D"${dist.h=
ome}/${app.name}-${app.version}-CACTUS.war"/>
<!-- Remove tempdir -->
- <delete dir=3D"${dist.home}/tmp" />
-
+ <delete dir=3D"${dist.home}/tmp"/>
<!-- Remove temporary war -->
- <delete file=3D"${dist.home}/test.war" />
-
+ <delete file=3D"${dist.home}/test.war"/>
<!-- Check if we have deployed a test relase already. We want to k=
now if we should undeploy. -->
<waitfor maxwait=3D"1000" checkevery=3D"450" timeoutproperty=3D"no=
tdeployed">
- <http url=3D"${server.url}/test/ServletRedirector?Cactus_Servi=
ce=3DRUN_TEST" />
+ <http url=3D"${server.url}/test/ServletRedirector?Cactus_Servi=
ce=3DRUN_TEST"/>
</waitfor>
-
</target>
-
<!--
=
Make a jar of the class files for simple embedding.
=
-->
<target name=3D"jar" depends=3D"compile" description=3D"Make a jar of =
the class files for simple embedding.">
- <mkdir dir=3D"${dist.home}" />
+ <mkdir dir=3D"${dist.home}"/>
<jar jarfile=3D"${dist.home}/${app.name}-${app.version}.jar">
- <fileset dir=3D"${build.home}" includes=3D'**/*.class' exclud=
es=3D'**/test/*'/>
+ <fileset dir=3D"${build.home}" includes=3D'**/*.class' exclude=
s=3D'**/test/*'/>
</jar>
</target>
-
<!--
=
Makes a release ready WAR file ready to deploy.
=
-->
<target name=3D"release" depends=3D"jar" description=3D"Create binary =
distribution">
-
<!-- Create temporary dist directory -->
- <mkdir dir=3D"${dist.home}/tmp/WEB-INF" />
+ <mkdir dir=3D"${dist.home}/tmp/WEB-INF"/>
<copy todir=3D"${dist.home}/tmp/WEB-INF">
- <fileset dir=3D"${app.home}" />
+ <fileset dir=3D"${app.home}"/>
</copy>
<copy todir=3D"${dist.home}/tmp/WEB-INF/lib" file=3D"${dist.home}/=
${app.name}-${app.version}.jar"/>
-
<!-- Remove tests and classes from war -->
<delete includeemptydirs=3D"true">
- <fileset dir=3D"${dist.home}/tmp/WEB-INF/classes" includes=3D"**=
/*"/>
+ <fileset dir=3D"${dist.home}/tmp/WEB-INF/classes" includes=3D"=
**/*"/>
</delete>
- <delete file=3D"${dist.home}/tmp/WEB-INF/cactus-web.xml" />
-
+ <delete file=3D"${dist.home}/tmp/WEB-INF/cactus-web.xml"/>
<!-- Create application JAR file -->
- <jar jarfile=3D"${dist.home}/${app.name}-${app.version}.war" based=
ir=3D"${dist.home}/tmp" />
-
+ <jar jarfile=3D"${dist.home}/${app.name}-${app.version}.war" based=
ir=3D"${dist.home}/tmp"/>
<!-- Remove tempdir -->
- <delete dir=3D"${dist.home}/tmp" />
-
+ <delete dir=3D"${dist.home}/tmp"/>
</target>
-
<!--
=
MC : compiles and copies new jar into tomcat root webinf
=
-->
<target name=3D"go" depends=3D"release" description=3D"MARC : compiles=
and copies new jar into tomcat root webinf">
-
- <copy file=3D"${dist.home}/${app.name}-custom.jar" todir=3D"${targ=
etapp.dir}/WEB-INF/lib">
+ <copy file=3D"${dist.home}/${app.name}-${app.version}.jar" todir=
=3D"${targetapp.dir}/WEB-INF/lib">
</copy>
-
</target>
-
<!--
=
Creates two bzip and zip archive.
@@ -271,92 +227,79 @@
The other as a source relase including javadoc.
=
-->
- <target name=3D"distribute" depends=3D"release,javadoc" description=3D=
"Make everything ready to be uploaded to file server">
-
+ <target name=3D"distribute"
+ depends=3D"release,javadoc"
+ description=3D"Make everything ready to be uploaded to file se=
rver">
<tar destfile=3D"${dist.home}/src.tar">
<tarfileset dir=3D"${docs.home}" fullpath=3D"/README">
- <include name=3D"readme-src.txt" />
+ <include name=3D"readme-src.txt"/>
</tarfileset>
<tarfileset dir=3D"${docs.home}" fullpath=3D"/LICENSE">
- <include name=3D"license.txt" />
+ <include name=3D"license.txt"/>
</tarfileset>
-
<tarfileset dir=3D"${docs.home}" prefix=3D"/docs">
- <exclude name=3D"*.txt" />
+ <exclude name=3D"*.txt"/>
</tarfileset>
-
<tarfileset dir=3D"${src.home}" prefix=3D"/src">
<include name=3D"**/*.java"/>
<include name=3D"**/*.xml"/>
</tarfileset>
-
- <tarfileset dir=3D"${basedir}" >
- <include name=3D"build.xml" />
- <include name=3D"build.properties.default" />
+ <tarfileset dir=3D"${basedir}">
+ <include name=3D"build.xml"/>
+ <include name=3D"build.properties.default"/>
</tarfileset>
</tar>
<bzip2 src=3D"${dist.home}/src.tar" destfile=3D"${dist.home}/${app=
.name}-${app.version}-src.tar.bz2"/>
-
<zip destfile=3D"${dist.home}/${app.name}-${app.version}-src.zip">
<zipfileset dir=3D"${docs.home}" fullpath=3D"README.txt">
- <include name=3D"readme-src.txt" />
+ <include name=3D"readme-src.txt"/>
</zipfileset>
<zipfileset dir=3D"${docs.home}" fullpath=3D"LICENSE">
- <include name=3D"license.txt" />
+ <include name=3D"license.txt"/>
</zipfileset>
-
<zipfileset dir=3D"${docs.home}" prefix=3D"docs">
- <exclude name=3D"*.txt" />
+ <exclude name=3D"*.txt"/>
</zipfileset>
-
<zipfileset dir=3D"${src.home}" prefix=3D"src">
- <include name=3D"**/*.java" />
- <include name=3D"**/*.xml" />
+ <include name=3D"**/*.java"/>
+ <include name=3D"**/*.xml"/>
</zipfileset>
-
<zipfileset dir=3D"${basedir}">
- <include name=3D"build.xml" />
- <include name=3D"build.properties.default" />
+ <include name=3D"build.xml"/>
+ <include name=3D"build.properties.default"/>
</zipfileset>
</zip>
-
<tar destfile=3D"${dist.home}/release.tar">
<tarfileset dir=3D"${docs.home}" fullpath=3D"/README">
- <include name=3D"readme.txt" />
+ <include name=3D"readme.txt"/>
</tarfileset>
<tarfileset dir=3D"${docs.home}" fullpath=3D"/LICENSE">
- <include name=3D"license.txt" />
+ <include name=3D"license.txt"/>
</tarfileset>
-
<tarfileset dir=3D"${docs.home}" prefix=3D"/docs">
- <exclude name=3D"*.txt" />
- <exclude name=3D"**/api/" />
+ <exclude name=3D"*.txt"/>
+ <exclude name=3D"**/api/"/>
</tarfileset>
-
<tarfileset dir=3D"${dist.home}">
- <include name=3D"${app.name}-${app.version}.war" />
+ <include name=3D"${app.name}-${app.version}.war"/>
</tarfileset>
</tar>
- <bzip2 src=3D"${dist.home}/release.tar" destfile=3D"${dist.home}/$=
{app.name}-${app.version}.tar.bz2" />
-
+ <bzip2 src=3D"${dist.home}/release.tar" destfile=3D"${dist.home}/$=
{app.name}-${app.version}.tar.bz2"/>
<zip destfile=3D"${dist.home}/${app.name}-${app.version}.zip">
<zipfileset dir=3D"${docs.home}" fullpath=3D"README.txt">
- <include name=3D"readme.txt" />
+ <include name=3D"readme.txt"/>
</zipfileset>
<zipfileset dir=3D"${docs.home}" fullpath=3D"LICENSE">
- <include name=3D"license.txt" />
+ <include name=3D"license.txt"/>
</zipfileset>
-
<zipfileset dir=3D"${docs.home}" prefix=3D"docs">
- <exclude name=3D"*.txt" />
- <exclude name=3D"**/api/" />
+ <exclude name=3D"*.txt"/>
+ <exclude name=3D"**/api/"/>
</zipfileset>
-
<zipfileset dir=3D"${dist.home}">
- <include name=3D"${app.name}-${app.version}.war" />
+ <include name=3D"${app.name}-${app.version}.war"/>
</zipfileset>
</zip>
-
<delete>
<fileset dir=3D"${dist.home}">
<exclude name=3D"${app.name}-${app.version}-src.zip"/>
@@ -365,11 +308,7 @@
<exclude name=3D"${app.name}-${app.version}.tar.bz2"/>
</fileset>
</delete>
-
-
</target>
-
-
<!--
=
Creates javadoc API documentation for the classes.
@@ -377,15 +316,14 @@
=
-->
<target name=3D"javadoc" depends=3D"compile" description=3D"Create Jav=
adoc API documentation">
-
- <mkdir dir=3D"${docs.home}/api" />
- <javadoc sourcepath=3D"${src.home}" destdir=3D"${docs.home}/api" e=
xcludepackagenames=3D"${test.path}.*" packagenames=3D"*">
- <classpath refid=3D"compile.classpath" />
+ <mkdir dir=3D"${docs.home}/api"/>
+ <javadoc sourcepath=3D"${src.home}"
+ destdir=3D"${docs.home}/api"
+ excludepackagenames=3D"${test.path}.*"
+ packagenames=3D"*">
+ <classpath refid=3D"compile.classpath"/>
</javadoc>
-
</target>
-
-
<!--
=
Tomcat specific deployment, change this to reflect your own container.
@@ -393,61 +331,56 @@
=
-->
<target name=3D"redeploy.cactuswar" unless=3D"notdeployed">
-
- <undeploy url=3D"${manager.url}" username=3D"${manager.username}" =
password=3D"${manager.password}" path=3D"/test" />
- <deploy url=3D"${manager.url}" username=3D"${manager.username}" pa=
ssword=3D"${manager.password}" path=3D"/test" localWar=3D"file://${dist.hom=
e}/${app.name}-${app.version}-CACTUS.war" />
-
+ <undeploy url=3D"${manager.url}" username=3D"${manager.username}" =
password=3D"${manager.password}" path=3D"/test"/>
+ <deploy url=3D"${manager.url}"
+ username=3D"${manager.username}"
+ password=3D"${manager.password}"
+ path=3D"/test"
+ localWar=3D"file://${dist.home}/${app.name}-${app.version}=
-CACTUS.war"/>
</target>
-
-
<!--
=
Tomcat specific deployment, change this to reflect your own contai=
ner.
=
-->
<target name=3D"deploy.cactuswar" if=3D"notdeployed">
-
- <deploy url=3D"${manager.url}" username=3D"${manager.username}" pa=
ssword=3D"${manager.password}" path=3D"/test" localWar=3D"file://${dist.hom=
e}/${app.name}-${app.version}-CACTUS.war" />
-
+ <deploy url=3D"${manager.url}"
+ username=3D"${manager.username}"
+ password=3D"${manager.password}"
+ path=3D"/test"
+ localWar=3D"file://${dist.home}/${app.name}-${app.version}=
-CACTUS.war"/>
</target>
-
-
<!--
=
Creates the necesary folders.
=
-->
<target name=3D"prepare" depends=3D"init">
-
- <echo> build.home =3D ${build.home} </echo>
-
- <property name=3D"commons-httpclient-3.0.1.jar"
value=3D"${lib.home}/com=
mons-httpclient-3.0.1.jar" />
- <property name=3D"commons-digester-1.7.jar" value=3D"${lib.home}/c=
ommons-digester-1.7.jar" />
- <property name=3D"commons-beanutils.jar" value=3D"${lib.home}/comm=
ons-beanutils.jar" />
- <property name=3D"commons-codec-1.3.jar" value=3D"${lib.home}/comm=
ons-codec-1.3.jar" />
- <property name=3D"commons-logging-1.0.4.jar" value=3D"${lib.home}/com=
mons-logging-1.0.4.jar" />
- <property name=3D"log4j-1.2.8.jar" value=3D"${lib.home}/log4j-1.2.8.j=
ar" />
- <property name=3D"fastmd5-2.6.jar" value=3D"${lib.home}/fastmd5-2.6.j=
ar" />
- <property name=3D"htmllexer.jar"
value=3D"${lib.home}/htmllexer.jar" />
- <property name=3D"htmlparser.jar"
value=3D"${lib.home}/htmlparser.jar" />
- <property name=3D"thumbelina.jar"
value=3D"${lib.home}/thumbelina.jar" />
- <property name=3D"filterbuilder.jar"
value=3D"${lib.home}/filterbuilder.=
jar" />
-
- <property name=3D"cactus-1.7.jar"
value=3D"${lib.home}/cactus-1.7.jar" />
- <property name=3D"cactus-ant-1.7.jar"
value=3D"${lib.home}/cactus-ant-1.=
7.jar" />
-
- <property name=3D"xercesImpl.jar"
value=3D"${lib.home}/xercesImpl.jar" />
- <property name=3D"aspectjrt-1.2.1.jar"
value=3D"${lib.home}/aspectjrt-1.=
2.1.jar" />
- <property name=3D"regexp-1.2.jar"
value=3D"${lib.home}/regexp-1.2.jar" />
-
- <property name=3D"itext-0.99.jar"
value=3D"${lib.home}/itext-0.99.jar" />
- <property name=3D"displaytag-1.0.jar"
value=3D"${lib.home}/displaytag-1.=
0.jar" />
- <property name=3D"commons-lang-2.0.jar"
value=3D"${lib.home}/commons-lan=
g-2.0.jar" />
- <property name=3D"commons-collections-3.1.jar"
value=3D"${lib.home}/comm=
ons-collections-3.1.jar" />
- <property name=3D"backport-util-concurrent.jar"
value=3D"${lib.home}/bac=
kport-util-concurrent.jar"/>
-
+ <echo>build.home =3D ${build.home}</echo>
+ <property name=3D"commons-httpclient-3.0.1.jar" value=3D"${lib.hom=
e}/commons-httpclient-3.0.1.jar"/>
+ <property name=3D"commons-digester-1.7.jar" value=3D"${lib.home}/c=
ommons-digester-1.7.jar"/>
+ <property name=3D"commons-beanutils.jar" value=3D"${lib.home}/comm=
ons-beanutils.jar"/>
+ <property name=3D"commons-codec-1.3.jar" value=3D"${lib.home}/comm=
ons-codec-1.3.jar"/>
+ <property name=3D"commons-logging-1.0.4.jar" value=3D"${lib.home}/=
commons-logging-1.0.4.jar"/>
+ <property name=3D"log4j-1.2.8.jar" value=3D"${lib.home}/log4j-1.2.=
8.jar"/>
+ <property name=3D"fastmd5-2.6.jar" value=3D"${lib.home}/fastmd5-2.=
6.jar"/>
+ <property name=3D"htmllexer.jar" value=3D"${lib.home}/htmllexer.ja=
r"/>
+ <property name=3D"htmlparser.jar" value=3D"${lib.home}/htmlparser.=
jar"/>
+ <property name=3D"thumbelina.jar" value=3D"${lib.home}/thumbelina.=
jar"/>
+ <property name=3D"filterbuilder.jar" value=3D"${lib.home}/filterbu=
ilder.jar"/>
+ <property name=3D"cactus-1.7.jar" value=3D"${lib.home}/cactus-1.7.=
jar"/>
+ <property name=3D"cactus-ant-1.7.jar" value=3D"${lib.home}/cactus-=
ant-1.7.jar"/>
+ <property name=3D"xercesImpl.jar" value=3D"${lib.home}/xercesImpl.=
jar"/>
+ <property name=3D"aspectjrt-1.2.1.jar" value=3D"${lib.home}/aspect=
jrt-1.2.1.jar"/>
+ <property name=3D"regexp-1.2.jar" value=3D"${lib.home}/regexp-1.2.=
jar"/>
+ <property name=3D"itext-0.99.jar" value=3D"${lib.home}/itext-0.99.=
jar"/>
+ <property name=3D"displaytag-1.0.jar" value=3D"${lib.home}/display=
tag-1.0.jar"/>
+ <property name=3D"commons-lang-2.0.jar" value=3D"${lib.home}/commo=
ns-lang-2.0.jar"/>
+ <property name=3D"commons-collections-3.1.jar" value=3D"${lib.home=
}/commons-collections-3.1.jar"/>
+ <property name=3D"backport-util-concurrent.jar" value=3D"${lib.hom=
e}/backport-util-concurrent.jar"/>
<!-- JBoss cache dependencies -->
- <property name=3D"concurrent-1.3.4.jar" value=3D"${lib.home}/concu=
rrent-1.3.4.jar"/><!-- overlaps with backport-util-concurrent.jar -->
+ <property name=3D"concurrent-1.3.4.jar" value=3D"${lib.home}/concu=
rrent-1.3.4.jar"/>
+ <!-- overlaps with backport-util-concurrent.jar -->
<property name=3D"jboss-common-4.0.3.jar" value=3D"${lib.home}/jbo=
ss-common-4.0.3.jar"/>
<property name=3D"jboss-cache-1.4.0GA.jar" value=3D"${lib.home}/jb=
oss-cache-1.4.0GA.jar"/>
<property name=3D"jboss-jmx-4.0.3.jar" value=3D"${lib.home}/jboss-=
jmx-4.0.3.jar"/>
@@ -456,50 +389,41 @@
<property name=3D"jgroups-2.2.9.2.jar" value=3D"${lib.home}/jgroup=
s-2.2.9.2.jar"/>
<property name=3D"jta-1.0.1.jar" value=3D"${lib.home}/jta-1.0.1.ja=
r"/>
<property name=3D"derby-10.1.jar" value=3D"${lib.home}/derby-10.1.=
jar"/>
- <property
name=3D"jboss-serialization-1.0.0.RC1.jar" value=3D"${lib.ho=
me}/jboss-serialization-1.0.0.RC1.jar"/>
- <property name=3D"jdbm-1.0.jar"
value=3D"${lib.home}/jdbm-1.0.jar"/>
- <property name=3D"trove-1.0.2.jar"
value=3D"${lib.home}/trove-1.0.2.ja=
r"/>
- =
-
- <property name=3D"catalina.jar" value=3D"${lib.home}/catalina.jar"=
/>
- <property name=3D"tomcat-util.jar" value=3D"${lib.home}/tomcat-util.ja=
r" />
- =
+ <property name=3D"jboss-serialization-1.0.0.RC1.jar" value=3D"${li=
b.home}/jboss-serialization-1.0.0.RC1.jar"/>
+ <property name=3D"jdbm-1.0.jar" value=3D"${lib.home}/jdbm-1.0.jar"=
/>
+ <property name=3D"trove-1.0.2.jar" value=3D"${lib.home}/trove-1.0.=
2.jar"/>
+ <property name=3D"catalina.jar" value=3D"${lib.home}/catalina.jar"=
/>
+ <property name=3D"tomcat-util.jar" value=3D"${lib.home}/tomcat-uti=
l.jar"/>
<!-- Create build directories as needed -->
- <mkdir dir=3D"${build.home}"/>
- <mkdir dir=3D"${build.home}"/>
- <mkdir dir=3D"${build.home}"/>
- <mkdir dir=3D"${reports.test}"/>
- <mkdir dir=3D"${targetapp.dir}/WEB-INF/config"/>
- <mkdir dir=3D"${targetapp.dir}/WEB-INF/classes"/>
-
+ <mkdir dir=3D"${build.home}"/>
+ <mkdir dir=3D"${build.home}"/>
+ <mkdir dir=3D"${build.home}"/>
+ <mkdir dir=3D"${reports.test}"/>
+ <mkdir dir=3D"${targetapp.dir}/WEB-INF/config"/>
+ <mkdir dir=3D"${targetapp.dir}/WEB-INF/classes"/>
<!-- Copy external dependencies as required -->
- <mkdir dir=3D"${targetapp.dir}/WEB-INF/lib"/>
+ <mkdir dir=3D"${targetapp.dir}/WEB-INF/lib"/>
<copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${commons-htt=
pclient-3.0.1.jar}"/>
<copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${commons-dig=
ester-1.7.jar}"/>
<copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${commons-bea=
nutils.jar}"/>
<copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${commons-cod=
ec-1.3.jar}"/>
- <copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${commons-loggin=
g-1.0.4.jar}"/>
- <copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${log4j-1.2.8.ja=
r}"/>
- <copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${fastmd5-2.6.ja=
r}"/>
-
- <copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${htmllexer.jar}=
"/>
- <copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${htmlparser.jar=
}"/>
- <copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${thumbelina.jar=
}"/>
- <copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${filterbuilder.=
jar}"/>
-
- <copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${cactus-1.7.jar=
}"/>
- <copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${xercesImpl.jar=
}"/>
- <copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${aspectjrt-1.2.=
1.jar}"/>
- <copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${regexp-1.2.jar=
}"/>
-
- <copy todir=3D"${targetapp.dir}/WEB-INF/lib"
file=3D"${cactus-ant-1.7.ja=
r}"/>
-
- <copy todir=3D"${targetapp.dir}/WEB-INF/lib"
file=3D"${itext-0.99.jar}"/>
- <copy todir=3D"${targetapp.dir}/WEB-INF/lib"
file=3D"${displaytag-1.0.ja=
r}"/>
- <copy todir=3D"${targetapp.dir}/WEB-INF/lib"
file=3D"${commons-lang-2.0.=
jar}"/>
- <copy todir=3D"${targetapp.dir}/WEB-INF/lib"
file=3D"${commons-collectio=
ns-3.1.jar}"/>
- <copy todir=3D"${targetapp.dir}/WEB-INF/lib"
file=3D"${backport-util-con=
current.jar}"/>
-
+ <copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${commons-log=
ging-1.0.4.jar}"/>
+ <copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${log4j-1.2.8=
.jar}"/>
+ <copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${fastmd5-2.6=
.jar}"/>
+ <copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${htmllexer.j=
ar}"/>
+ <copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${htmlparser.=
jar}"/>
+ <copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${thumbelina.=
jar}"/>
+ <copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${filterbuild=
er.jar}"/>
+ <copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${cactus-1.7.=
jar}"/>
+ <copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${xercesImpl.=
jar}"/>
+ <copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${aspectjrt-1=
.2.1.jar}"/>
+ <copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${regexp-1.2.=
jar}"/>
+ <copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${cactus-ant-=
1.7.jar}"/>
+ <copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${itext-0.99.=
jar}"/>
+ <copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${displaytag-=
1.0.jar}"/>
+ <copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${commons-lan=
g-2.0.jar}"/>
+ <copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${commons-col=
lections-3.1.jar}"/>
+ <copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${backport-ut=
il-concurrent.jar}"/>
<copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${concurrent-=
1.3.4.jar}"/>
<copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${jboss-commo=
n-4.0.3.jar}"/>
<copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${jboss-cache=
-1.4.0GA.jar}"/>
@@ -508,48 +432,44 @@
<copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${jboss-syste=
m-4.0.3.jar}"/>
<copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${jgroups-2.2=
.9.2.jar}"/>
<copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${jta-1.0.1.j=
ar}"/>
- <copy todir=3D"${targetapp.dir}/WEB-INF/lib"
file=3D"${jboss-serializa=
tion-1.0.0.RC1.jar}"/>
- <copy todir=3D"${targetapp.dir}/WEB-INF/lib"
file=3D"${jdbm-1.0.jar}"/>
- <copy todir=3D"${targetapp.dir}/WEB-INF/lib"
file=3D"${derby-10.1.jar}=
"/>
- <copy todir=3D"${targetapp.dir}/WEB-INF/lib"
file=3D"${trove-1.0.2.jar=
}"/>
-
-
-
+ <copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${jboss-seria=
lization-1.0.0.RC1.jar}"/>
+ <copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${jdbm-1.0.ja=
r}"/>
+ <copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${derby-10.1.=
jar}"/>
+ <copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${trove-1.0.2=
.jar}"/>
<copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${catalina.ja=
r}"/>
- <copy todir=3D"${targetapp.dir}/WEB-INF/lib"
file=3D"${tomcat-util.jar}"=
/>
-
- <!-- Copy config files -->
- <copy todir=3D"${targetapp.dir}/WEB-INF" file=3D"${app.home}/web.xml"=
/>
- <copy todir=3D"${targetapp.dir}/WEB-INF" file=3D"${app.home}/log4j.xm=
l"/>
- <copy todir=3D"${targetapp.dir}/WEB-INF" file=3D"${app.home}/log4j.xm=
l.debug"/>
- <copy todir=3D"${targetapp.dir}/WEB-INF" file=3D"${app.home}/log4j.xm=
l.info"/>
- <copy todir=3D"${targetapp.dir}/WEB-INF" file=3D"${app.home}/log4j.xm=
l.error"/>
- <copy todir=3D"${targetapp.dir}/WEB-INF/config" file=3D"${app.home}/c=
onfig/data.xml"/>
- <copy todir=3D"${targetapp.dir}/WEB-INF/classes" file=3D"${app.home}/=
classes/WCSinvalidation.dtd"/>
- <copy todir=3D"${targetapp.dir}/WEB-INF/classes" file=3D"${app.home}/=
classes/esi-cluster-cache.xml"/>
- <copy todir=3D"${targetapp.dir}/WEB-INF" file=3D"${app.home}/displayt=
ag-11.tld"/>
-
- <!-- Copy JSP admin files -->
- <mkdir dir=3D"${targetapp.dir}/esiadmin"/>
- <copy todir=3D"${targetapp.dir}/esiadmin">
- <fileset dir=3D"${basedir}/esiadmin" />
- </copy>
- <mkdir dir=3D"${targetapp.dir}/esierror"/>
+ <copy todir=3D"${targetapp.dir}/WEB-INF/lib" file=3D"${tomcat-util=
.jar}"/>
+ <!-- Copy config files -->
+ <copy todir=3D"${targetapp.dir}/WEB-INF" file=3D"${app.home}/web.x=
ml"/>
+ <copy todir=3D"${targetapp.dir}/WEB-INF" file=3D"${app.home}/log4j=
.xml"/>
+ <copy todir=3D"${targetapp.dir}/WEB-INF" file=3D"${app.home}/log4j=
.xml.debug"/>
+ <copy todir=3D"${targetapp.dir}/WEB-INF" file=3D"${app.home}/log4j=
.xml.info"/>
+ <copy todir=3D"${targetapp.dir}/WEB-INF" file=3D"${app.home}/log4j=
.xml.error"/>
+ <copy todir=3D"${targetapp.dir}/WEB-INF/config" file=3D"${app.home=
}/config/data.xml"/>
+ <copy todir=3D"${targetapp.dir}/WEB-INF/classes" file=3D"${app.hom=
e}/classes/WCSinvalidation.dtd"/>
+ <copy todir=3D"${targetapp.dir}/WEB-INF/classes" file=3D"${app.hom=
e}/classes/esi-cluster-cache.xml"/>
+ <copy todir=3D"${targetapp.dir}/WEB-INF" file=3D"${app.home}/displ=
aytag-11.tld"/>
+ <!-- Copy JSP admin files -->
+ <mkdir dir=3D"${targetapp.dir}/esiadmin"/>
+ <copy todir=3D"${targetapp.dir}/esiadmin">
+ <fileset dir=3D"${basedir}/esiadmin"/>
+ </copy>
+ <mkdir dir=3D"${targetapp.dir}/esierror"/>
<copy todir=3D"${targetapp.dir}/esierror">
- <fileset dir=3D"${basedir}/esierror" />
+ <fileset dir=3D"${basedir}/esierror"/>
</copy>
-
-
- <property name=3D"build.home"
value=3D"${basedir}/build"/>
-
- <!-- Define the Cactus tasks -->
- <taskdef resource=3D"cactus.tasks" classpathref=3D"compile.classpa=
th" />
-
- <!-- Tomcat specifc tasks -->
+ <property name=3D"build.home" value=3D"${basedir}/build"/>
+ <!-- Define the Cactus tasks --><!--taskdef resource=3D"cactus.tas=
ks" classpathref=3D"compile.classpath" /--><!-- Tomcat specifc tasks -->
<taskdef name=3D"deploy" classname=3D"org.apache.catalina.ant.Depl=
oyTask" classpathref=3D"compile.classpath"/>
<taskdef name=3D"reload" classname=3D"org.apache.catalina.ant.Relo=
adTask" classpathref=3D"compile.classpath"/>
<taskdef name=3D"undeploy" classname=3D"org.apache.catalina.ant.Un=
deployTask" classpathref=3D"compile.classpath"/>
-
</target>
-
+ <target name=3D"setBuildVersion" description=3D"Sets the buildversion =
for the current build" depends=3D"init">
+ <exec executable=3D"svnversion" spawn=3D"false" dir=3D"${basedir}"=
outputproperty=3D"buildversion">
+ <arg line=3D"."/>
+ </exec>
+ <replaceregexp file=3D"${src.home}/org/jahia/esi/Utils.java"
+ match=3D"buildnumber_([0-9M:]*)"
+ replace=3D"buildnumber_${buildversion}"
+ byline=3D"false"/>
+ </target>
</project>
Modified: trunk/src/org/jahia/esi/Utils.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/src/org/jahia/e=
si/Utils.java&rev=3D396&repname=3Desi_server
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/org/jahia/esi/Utils.java (original)
+++ trunk/src/org/jahia/esi/Utils.java Fri May 25 11:52:26 2007
@@ -73,7 +73,11 @@
=
private static final transient Log log =3D LogFactory.getLog(Utils.cla=
ss);
=
- public static String jahiaEsiServerBuildNumber =3D "0.9";
+ public static String ESIVERSION =3D "0.9";
+ public static final String COPYRIGHT =3D
+ "© Copyright 2002-2007 <a href=3D\"http://www.jahia.org\"=
target=3D\"newJahia\">Jahia Ltd</a> -";
+
+ public static final String BUILDNUMBER=3D"buildnumber_379:395M";
=
public static String stackTraceToString(Exception ex) {
// Append stack trace if not null
@@ -765,8 +769,8 @@
return 0;
}
=
- public static String getJahiaEsiServerBuildNumber() {
- return jahiaEsiServerBuildNumber;
+ public static String getESIVERSION() {
+ return ESIVERSION;
}
=
//TODO: move to external text file
@@ -778,7 +782,7 @@
StringBuffer msg =3D new StringBuffer ("\n\n\n\n");
msg.append ("\n");
msg.append (getJahiaWebCacheLogo());
- msg.append (" . . . s t a r t i n g j a h i a W e b c a c=
h e b u i l d " + jahiaEsiServerBuildNumber + " . . .\n");
+ msg.append (" . . . s t a r t i n g j a h i a W e b c a c=
h e b u i l d " + ESIVERSION + " . . .\n");
msg.append ("\n\n");
msg.append (" Copyright 2002-2006 - jahia http://www.jahia.org -=
all rights reserved\n");
msg.append ("\n\n");
@@ -821,7 +825,7 @@
page.append("] cannot be retrieve as it is declared in a forbidden=
-rule by the ESI server configuration.\n" );
page.append("\n" );
page.append("<hr>\n" );
- page.append("<p><h3>Jahia ESI Cache Server - version "+jahiaEsiSer=
verBuildNumber+"</h3></p>\n" );
+ page.append("<p><h3>Jahia ESI Cache Server - version "+ ESIVERSION=
+"</h3></p>\n" );
page.append("</fieldset>\n" );
page.append("</body> </html>");
return page.toString();
@@ -855,7 +859,7 @@
page.append("</p>\n" );
page.append("\n" );
page.append("<hr>\n" );
- page.append("<p><h3>Jahia ESI Cache Server - version "+jahiaEsiSer=
verBuildNumber+"</h3></p>\n" );
+ page.append("<p><h3>Jahia ESI Cache Server - version "+ ESIVERSION=
+"</h3></p>\n" );
page.append("</fieldset>\n" );
page.append("</body> </html>");
return page.toString();
@@ -911,7 +915,7 @@
page.append("</p>\n" );
page.append("\n" );
page.append("<hr>\n" );
- page.append("<p><h3>Jahia ESI Cache Server - version "+jahiaEsiSer=
verBuildNumber+"</h3></p>\n" );
+ page.append("<p><h3>Jahia ESI Cache Server - version "+ ESIVERSION=
+"</h3></p>\n" );
page.append("</fieldset>\n" );
page.append("</body> </html>");
return page.toString();
@@ -940,7 +944,7 @@
page.append("<p><center> <form><input type=3Dbutton value=3D\"Forc=
e Retry Now\" onClick=3D\"window.location.reload( true )\"></form></center>=
<p>");
page.append("\n" );
page.append("<hr>\n" );
- page.append("<p><h3>Jahia ESI Cache Server - version "+jahiaEsiSer=
verBuildNumber+"</h3></p>\n" );
+ page.append("<p><h3>Jahia ESI Cache Server - version "+ ESIVERSION=
+"</h3></p>\n" );
page.append("</fieldset>\n" );
page.append("</body> </html>");
return page.toString();
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
