mcardle 2005/10/25 11:19:57 CEST
Modified files:
. build.properties.default build.xml
Log:
* now works on a different machine
Revision Changes Path
1.2 +4 -1 esi_server/build.properties.default
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/esi_server/build.properties.default.diff?r1=1.1&r2=1.2&f=h
1.3 +70 -48 esi_server/build.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/esi_server/build.xml.diff?r1=1.2&r2=1.3&f=h
Index: build.properties.default
===================================================================
RCS file: /home/cvs/repository/esi_server/build.properties.default,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.properties.default 7 Oct 2005 09:03:09 -0000 1.1
+++ build.properties.default 25 Oct 2005 09:19:57 -0000 1.2
@@ -9,7 +9,10 @@
#Directory having the libs that will be copied to build
#Change this to something that suits you and run the
#download task before running anything else.
-external.libs=${catalina.home}/webapps/j2ep/lib/
+external.libs=${catalina.home}/webapps/ROOT/WEB-INF/lib/
+
+catalina.targetapp.lib=${catalina.home}/webapps/ROOT/WEB-INF/lib/
+catalina.targetapp=${catalina.home}/webapps/ROOT/WEB-INF/
#Here are the libs downloaded from
download.libs=http://j2ep.sourceforge.net/lib
Index: build.xml
===================================================================
RCS file: /home/cvs/repository/esi_server/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 19 Oct 2005 09:08:42 -0000 1.2
+++ build.xml 25 Oct 2005 09:19:57 -0000 1.3
@@ -56,7 +56,15 @@
<path id="compile.classpath">
<!-- Include all the external libs -->
- <fileset dir="${external.libs}">
+ <fileset dir="${lib.home}">
+ <include name="*.jar" />
+ </fileset>
+
+ <fileset dir="${catalina.home}/server/lib">
+ <include name="*.jar" />
+ </fileset>
+
+ <fileset dir="${catalina.home}/common/lib">
<include name="*.jar" />
</fileset>
@@ -219,10 +227,10 @@
-->
<target name="go" depends="release" description="MARC : compiles and
copies new jar into tomcat root webinf">
- <echo> {catalina.targetapp} : ${catalina.targetapp} </echo>
+ <echo> {catalina.targetapp.lib} : ${catalina.targetapp.lib} </echo>
<echo> fileset dir="{dist.home}/{app.name}-custom.jar" :
dir="${dist.home}/${app.name}-custom.jar" </echo>
- <copy file="${dist.home}/${app.name}-custom.jar"
todir="${catalina.targetapp}">
+ <copy file="${dist.home}/${app.name}-custom.jar"
todir="${catalina.targetapp.lib}">
</copy>
</target>
@@ -382,20 +390,24 @@
-->
<target name="prepare">
-<echo> build.home = ${build.home} </echo>
+ <echo> build.home = ${build.home} </echo>
- <property name="commons-httpclient-3.0-rc3.jar"
value="${external.libs}/commons-httpclient-3.0-rc3.jar" />
- <property name="commons-digester-1.7.jar"
value="${external.libs}/commons-digester-1.7.jar" />
- <property name="commons-beanutils.jar"
value="${external.libs}/commons-beanutils.jar" />
- <property name="commons-codec-1.3.jar"
value="${external.libs}/commons-codec-1.3.jar" />
- <property name="commons-logging-1.0.4.jar"
value="${external.libs}/commons-logging-1.0.4.jar" />
- <property name="log4j-1.2.8.jar"
value="${external.libs}/log4j-1.2.8.jar" />
- <property name="fastmd5-2.6.jar"
value="${external.libs}/fastmd5-2.6.jar" />
- <property name="fastmd5-2.6.jar"
value="${external.libs}/fastmd5-2.6.jar" />
- <property name="htmllexer.jar"
value="${external.libs}/htmllexer.jar" />
- <property name="htmlparser.jar"
value="${external.libs}/htmlparser.jar" />
- <property name="thumbelina.jar"
value="${external.libs}/thumbelina.jar" />
- <property name="filterbuilder.jar"
value="${external.libs}/filterbuilder.jar" />
+ <property name="commons-httpclient-3.0-rc3.jar"
value="${lib.home}/commons-httpclient-3.0-rc3.jar" />
+ <property name="commons-digester-1.7.jar"
value="${lib.home}/commons-digester-1.7.jar" />
+ <property name="commons-beanutils.jar"
value="${lib.home}/commons-beanutils.jar" />
+ <property name="commons-codec-1.3.jar"
value="${lib.home}/commons-codec-1.3.jar" />
+ <property name="commons-logging-1.0.4.jar"
value="${lib.home}/commons-logging-1.0.4.jar" />
+ <property name="log4j-1.2.8.jar" value="${lib.home}/log4j-1.2.8.jar" />
+ <property name="fastmd5-2.6.jar" value="${lib.home}/fastmd5-2.6.jar" />
+ <property name="htmllexer.jar"
value="${lib.home}/htmllexer.jar" />
+ <property name="htmlparser.jar"
value="${lib.home}/htmlparser.jar" />
+ <property name="thumbelina.jar"
value="${lib.home}/thumbelina.jar" />
+ <property name="filterbuilder.jar"
value="${lib.home}/filterbuilder.jar" />
+
+ <property name="cactus-1.7.jar"
value="${lib.home}/cactus-1.7.jar" />
+ <property name="xercesImpl.jar"
value="${lib.home}/xercesImpl.jar" />
+ <property name="aspectjrt-1.2.1.jar"
value="${lib.home}/aspectjrt-1.2.1.jar" />
+ <property name="junit.jar" value="${lib.home}/junit.jar" />
<!-- Create build directories as needed -->
<mkdir dir="${build.home}"/>
@@ -404,19 +416,31 @@
<mkdir dir="${reports.test}"/>
<!-- Copy external dependencies as required -->
- <mkdir dir="${lib.home}"/>
- <copy todir="${lib.home}" file="${commons-httpclient-3.0-rc3.jar}"/>
- <copy todir="${lib.home}" file="${commons-digester-1.7.jar}"/>
- <copy todir="${lib.home}" file="${commons-beanutils.jar}"/>
- <copy todir="${lib.home}" file="${commons-codec-1.3.jar}"/>
- <copy todir="${lib.home}" file="${commons-logging-1.0.4.jar}"/>
- <copy todir="${lib.home}" file="${log4j-1.2.8.jar}"/>
- <copy todir="${lib.home}" file="${fastmd5-2.6.jar}"/>
-
- <copy todir="${lib.home}" file="${htmllexer.jar}"/>
- <copy todir="${lib.home}" file="${htmlparser.jar}"/>
- <copy todir="${lib.home}" file="${thumbelina.jar}"/>
- <copy todir="${lib.home}" file="${filterbuilder.jar}"/>
+ <mkdir dir="${external.libs}"/>
+ <copy todir="${external.libs}"
file="${commons-httpclient-3.0-rc3.jar}"/>
+ <copy todir="${external.libs}" file="${commons-digester-1.7.jar}"/>
+ <copy todir="${external.libs}" file="${commons-beanutils.jar}"/>
+ <copy todir="${external.libs}" file="${commons-codec-1.3.jar}"/>
+ <copy todir="${external.libs}" file="${commons-logging-1.0.4.jar}"/>
+ <copy todir="${external.libs}" file="${log4j-1.2.8.jar}"/>
+ <copy todir="${external.libs}" file="${fastmd5-2.6.jar}"/>
+
+ <copy todir="${external.libs}" file="${htmllexer.jar}"/>
+ <copy todir="${external.libs}" file="${htmlparser.jar}"/>
+ <copy todir="${external.libs}" file="${thumbelina.jar}"/>
+ <copy todir="${external.libs}" file="${filterbuilder.jar}"/>
+
+ <copy todir="${external.libs}" file="${cactus-1.7.jar}"/>
+ <copy todir="${external.libs}" file="${xercesImpl.jar}"/>
+ <copy todir="${external.libs}" file="${aspectjrt-1.2.1.jar}"/>
+ <copy todir="${external.libs}" file="${junit.jar}"/>
+
+ <copy todir="${catalina.targetapp}" file="${app.home}/web.xml"/>
+ <copy todir="${catalina.targetapp}" file="${app.home}/log4j.xml"/>
+
+ <mkdir dir="${catalina.targetapp}/config"/>
+
+ <copy todir="${catalina.targetapp}/config"
file="${app.home}/config/data.xml"/>
<echo> {compile.debug} = ${compile.debug} </echo>
<echo> {src.home} = ${src.home} </echo>
@@ -444,25 +468,23 @@
-->
<target name="download" description='Downloads all the necesarry
libarays to the external.libs'>
<mkdir dir="${external.libs}" />
- <get src="${download.libs}/cactus-ant-1.7.jar"
dest="${external.libs}/cactus-ant-1.7.jar"/>
- <get src="${download.libs}/commons-beanutils.jar"
dest="${external.libs}/commons-beanutils.jar"/>
- <get src="${download.libs}/commons-codec-1.3.jar"
dest="${external.libs}/commons-codec-1.3.jar"/>
- <get src="${download.libs}/commons-digester-1.7.jar"
dest="${external.libs}/commons-digester-1.7.jar"/>
- <get src="${download.libs}/commons-httpclient-3.0-rc3.jar"
dest="${external.libs}/commons-httpclient-3.0-rc3.jar"/>
- <get src="${download.libs}/commons-logging-1.0.4.jar"
dest="${external.libs}/commons-logging-1.0.4.jar"/>
- <get src="${download.libs}/aspectjrt-1.2.1.jar"
dest="${external.libs}/aspectjrt-1.2.1.jar"/>
- <get src="${download.libs}/cactus-1.7.jar"
dest="${external.libs}/cactus-1.7.jar"/>
- <get src="${download.libs}/xercesImpl.jar"
dest="${external.libs}/xercesImpl.jar"/>
- <get src="${download.libs}/junit.jar"
dest="${external.libs}/junit.jar"/>
- <get src="${download.libs}/catalina-ant.jar"
dest="${external.libs}/catalina-ant.jar"/>
- <get src="${download.libs}/servlet-api.jar"
dest="${external.libs}/servlet-api.jar"/>
- <get src="${download.libs}/log4j-1.2.8.jar"
dest="${external.libs}/log4j-1.2.8.jar"/>
- <get src="${download.libs}/fastmd5-2.6.jar"
dest="${external.libs}/fastmd5-2.6.jar"/>
-
- <get src="${download.libs}/htmllexer.jar"
dest="${external.libs}/htmllexer.jar"/>
- <get src="${download.libs}/htmlparser.jar"
dest="${external.libs}/htmlparser.jar"/>
- <get src="${download.libs}/thumbelina.jar"
dest="${external.libs}/thumbelina.jar"/>
- <get src="${download.libs}/filterbuilder.jar"
dest="${external.libs}/filterbuilder.jar"/>
+ <get src="${download.libs}/cactus-ant-1.7.jar"
dest="${lib.home}/cactus-ant-1.7.jar"/>
+ <get src="${download.libs}/commons-beanutils.jar"
dest="${lib.home}/commons-beanutils.jar"/>
+ <get src="${download.libs}/commons-codec-1.3.jar"
dest="${lib.home}/commons-codec-1.3.jar"/>
+ <get src="${download.libs}/commons-digester-1.7.jar"
dest="${lib.home}/commons-digester-1.7.jar"/>
+ <get src="${download.libs}/commons-httpclient-3.0-rc3.jar"
dest="${lib.home}/commons-httpclient-3.0-rc3.jar"/>
+ <get src="${download.libs}/commons-logging-1.0.4.jar"
dest="${lib.home}/commons-logging-1.0.4.jar"/>
+ <get src="${download.libs}/aspectjrt-1.2.1.jar"
dest="${lib.home}/aspectjrt-1.2.1.jar"/>
+ <get src="${download.libs}/cactus-1.7.jar"
dest="${lib.home}/cactus-1.7.jar"/>
+ <get src="${download.libs}/xercesImpl.jar"
dest="${lib.home}/xercesImpl.jar"/>
+ <get src="${download.libs}/junit.jar" dest="${lib.home}/junit.jar"/>
+
+ <!--<get src="${download.libs}/log4j-1.2.8.jar"
dest="${lib.home}/log4j-1.2.8.jar"/>
+ <get src="${download.libs}/fastmd5-2.6.jar"
dest="${lib.home}/fastmd5-2.6.jar"/>
+ <get src="${download.libs}/htmllexer.jar"
dest="${lib.home}/htmllexer.jar"/>
+ <get src="${download.libs}/htmlparser.jar"
dest="${lib.home}/htmlparser.jar"/>
+ <get src="${download.libs}/thumbelina.jar"
dest="${lib.home}/thumbelina.jar"/>
+ <get src="${download.libs}/filterbuilder.jar"
dest="${lib.home}/filterbuilder.jar"/>-->
</target>
