[Cobricks-cvscommit] cobricks2 build.xml

[Michael K. <ko...@us...>]

Update of /cvsroot/cobricks/cobricks2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27536

Modified Files:
	build.xml 
Log Message:


Index: build.xml
===================================================================
RCS file: /cvsroot/cobricks/cobricks2/build.xml,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- build.xml	22 Nov 2005 08:34:45 -0000	1.49
+++ build.xml	22 Nov 2005 12:43:28 -0000	1.50
@@ -19,6 +19,7 @@
 <property name="build.home"    value="${basedir}/build"/>
 <property name="java.home.dir"     value="/usr/local/java"/>
 <property name="catalina.home" value="/usr/proj/java/jakarta-tomcat-5.0.28"/>
+<property name="catalina.version" value="5.0"/>
 <property name="axis.home"     value="/usr/proj/java/axis-1.2"/>
 <property name="dist.home"     value="${basedir}/dist"/>
 <property name="distbin"       value="${basedir}/dist/cobricks2-v0.36"/>
@@ -220,7 +221,7 @@
   </copy>
   <mkdir dir="${distbin}/tomcat"/>
   <copy todir="${distbin}/tomcat">
-    <fileset dir="${basedir}/tomcat" includes="**/*" />
+    <fileset dir="${basedir}/tomcat/${catalina.version}" includes="**/*" />
   </copy>
   <mkdir dir="${distbin}/web"/>
   <copy todir="${distbin}/web">
@@ -299,7 +300,7 @@
   </copy>
   <mkdir dir="${distsrc}/tomcat"/>
   <copy todir="${distsrc}/tomcat">
-    <fileset dir="${basedir}/tomcat" includes="**/*" />
+    <fileset dir="${basedir}/tomcat/${catalina.version}" includes="**/*" />
   </copy>
   <mkdir dir="${distsrc}/web"/>
   <copy todir="${distsrc}/web">
@@ -435,7 +436,7 @@
 
   <!-- copy tomcat configuration -->
   <copy todir="${build.home}/conf">
-    <fileset dir="${basedir}/tomcat/conf"/>
+    <fileset dir="${basedir}/tomcat/${catalina.version}/conf"/>
   </copy>
   <!-- adapt server.xml (port numbers) -->
   <replace file="${build.home}/conf/server.xml" token="@@@SERVERPORT@@@"
@@ -462,7 +463,7 @@
 
   <!-- copy manager web application and other web apps -->  
   <copy todir="${build.home}/webapps">
-    <fileset dir="${basedir}/tomcat/webapps" excludes="**/CVS"/>
+    <fileset dir="${basedir}/tomcat/${catalina.version}/webapps" excludes="**/CVS"/>
   </copy>
 
   <copy todir="${build.home}/webapps/${webappname}/WEB-INF/lib">