craigmcc 01/02/03 14:09:47
Modified: webapps/ROOT build.xml
webapps/examples build.xml
webapps/manager build.xml
webapps/webdav build.xml
Log:
Make the individual webapp build scripts respect the build and dist
destination directories set by webapps/build.xml.
Revision Changes Path
1.6 +11 -11 jakarta-tomcat-4.0/webapps/ROOT/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/ROOT/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.xml 2001/02/01 19:08:06 1.5
+++ build.xml 2001/02/03 22:09:44 1.6
@@ -3,8 +3,8 @@
<!-- ===================== Initialize Property Values =================== -->
<property name="build.compiler" value="classic"/>
- <property name="build.dir" value="../build"/>
- <property name="dist.dir" value="../dist"/>
+ <property name="webapps.build" value="../build"/>
+ <property name="webapps.dist" value="../dist"/>
<property name="servletapi.home" value="../../../jakarta-servletapi-4"/>
<property name="webapp.name" value="ROOT"/>
@@ -15,19 +15,19 @@
<!-- =================== BUILD: Create Directories ====================== -->
<target name="build-prepare">
- <mkdir dir="${build.dir}"/>
- <mkdir dir="${build.dir}/${webapp.name}"/>
+ <mkdir dir="${webapps.build}"/>
+ <mkdir dir="${webapps.build}/${webapp.name}"/>
</target>
<!-- ================ BUILD: Copy Static Files ========================== -->
<target name="build-static" depends="build-prepare">
- <copy todir="${build.dir}/${webapp.name}">
+ <copy todir="${webapps.build}/${webapp.name}">
<fileset dir=".">
<exclude name="build.*"/>
</fileset>
</copy>
- <copy todir="${build.dir}/${webapp.name}/docs">
+ <copy todir="${webapps.build}/${webapp.name}/docs">
<fileset dir="../../catalina/docs" />
</copy>
<!-- FIXME: JavaDocs????? -->
@@ -44,26 +44,26 @@
<!-- ======================= BUILD: Clean Directory ===================== -->
<target name="build-clean">
- <delete dir="${build.dir}/${webapp.name}"/>
+ <delete dir="${webapps.build}/${webapp.name}"/>
</target>
<!-- ======================= DIST: Create Directories =================== -->
<target name="dist-prepare">
- <mkdir dir="${dist.dir}"/>
+ <mkdir dir="${webapps.dist}"/>
</target>
<!-- ======================= DIST: Create Distribution Files ============ -->
<target name="dist" depends="build-main,dist-prepare">
- <jar jarfile="${dist.dir}/${webapp.name}.war"
- basedir="${build.dir}/${webapp.name}" includes="**"/>
+ <jar jarfile="${webapps.dist}/${webapp.name}.war"
+ basedir="${webapps.build}/${webapp.name}" includes="**"/>
</target>
<!-- ======================= DIST: Clean Directory ====================== -->
<target name="dist-clean">
- <delete dir="${dist.dir}/${webapp.name}"/>
+ <delete dir="${webapps.dist}/${webapp.name}"/>
</target>
1.6 +11 -11 jakarta-tomcat-4.0/webapps/examples/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/examples/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.xml 2001/02/01 19:08:09 1.5
+++ build.xml 2001/02/03 22:09:45 1.6
@@ -3,8 +3,8 @@
<!-- ===================== Initialize Property Values =================== -->
<property name="build.compiler" value="classic"/>
- <property name="build.dir" value="../build"/>
- <property name="dist.dir" value="../dist"/>
+ <property name="webapps.build" value="../build"/>
+ <property name="webapps.dist" value="../dist"/>
<property name="servletapi.home" value="../../../jakarta-servletapi-4"/>
<property name="webapp.name" value="examples"/>
@@ -15,14 +15,14 @@
<!-- =================== BUILD: Create Directories ====================== -->
<target name="build-prepare">
- <mkdir dir="${build.dir}"/>
- <mkdir dir="${build.dir}/${webapp.name}"/>
+ <mkdir dir="${webapps.build}"/>
+ <mkdir dir="${webapps.build}/${webapp.name}"/>
</target>
<!-- ================ BUILD: Copy Static Files ========================== -->
<target name="build-static" depends="build-prepare">
- <copy todir="${build.dir}/${webapp.name}">
+ <copy todir="${webapps.build}/${webapp.name}">
<fileset dir=".">
<exclude name="build.*"/>
</fileset>
@@ -34,13 +34,13 @@
<target name="build-main" depends="build-static">
<javac srcdir="WEB-INF/classes"
- destdir="${build.dir}/${webapp.name}/WEB-INF/classes"
+ destdir="${webapps.build}/${webapp.name}/WEB-INF/classes"
classpath="${servlet.jar}"
deprecation="off" debug="on" optimize="off"
excludes="**/CVS/**"/>
<javac srcdir="jsp/plugin/applet"
- destdir="${build.dir}/${webapp.name}/jsp/plugin/applet"
+ destdir="${webapps.build}/${webapp.name}/jsp/plugin/applet"
classpath="${servlet.jar}"
deprecation="off" debug="on" optimize="off"
excludes="**/CVS/**"/>
@@ -54,20 +54,20 @@
<!-- ======================= BUILD: Clean Directory ===================== -->
<target name="build-clean">
- <delete dir="${build.dir}/${webapp.name}"/>
+ <delete dir="${webapps.build}/${webapp.name}"/>
</target>
<!-- ======================= DIST: Create Directories =================== -->
<target name="dist-prepare">
- <mkdir dir="${dist.dir}"/>
+ <mkdir dir="${webapps.dist}"/>
</target>
<!-- ======================= DIST: Create Distribution Files ============ -->
<target name="dist" depends="build-main,dist-prepare">
- <jar jarfile="${dist.dir}/${webapp.name}.war"
- basedir="${build.dir}/${webapp.name}" includes="**"/>
+ <jar jarfile="${webapps.dist}/${webapp.name}.war"
+ basedir="${webapps.build}/${webapp.name}" includes="**"/>
</target>
1.5 +10 -10 jakarta-tomcat-4.0/webapps/manager/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/manager/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml 2001/02/01 19:08:13 1.4
+++ build.xml 2001/02/03 22:09:45 1.5
@@ -3,8 +3,8 @@
<!-- ===================== Initialize Property Values =================== -->
<property name="build.compiler" value="classic"/>
- <property name="build.dir" value="../build"/>
- <property name="dist.dir" value="../dist"/>
+ <property name="webapps.build" value="../build"/>
+ <property name="webapps.dist" value="../dist"/>
<property name="servletapi.home" value="../../../jakarta-servletapi-4"/>
<property name="webapp.name" value="manager"/>
@@ -15,14 +15,14 @@
<!-- =================== BUILD: Create Directories ====================== -->
<target name="build-prepare">
- <mkdir dir="${build.dir}"/>
- <mkdir dir="${build.dir}/${webapp.name}"/>
+ <mkdir dir="${webapps.build}"/>
+ <mkdir dir="${webapps.build}/${webapp.name}"/>
</target>
<!-- ================ BUILD: Copy Static Files ========================== -->
<target name="build-static" depends="build-prepare">
- <copy todir="${build.dir}/${webapp.name}">
+ <copy todir="${webapps.build}/${webapp.name}">
<fileset dir=".">
<exclude name="build.*"/>
</fileset>
@@ -35,7 +35,7 @@
<!--
<javac srcdir="WEB-INF/classes"
- destdir="${build.dir}/${webapp.name}/WEB-INF/classes"
+ destdir="${webapps.build}/${webapp.name}/WEB-INF/classes"
classpath="${servlet.jar}"
deprecation="off" debug="on" optimize="off"
excludes="**/CVS/**"/>
@@ -50,20 +50,20 @@
<!-- ======================= BUILD: Clean Directory ===================== -->
<target name="build-clean">
- <delete dir="${build.dir}/${webapp.name}"/>
+ <delete dir="${webapps.build}/${webapp.name}"/>
</target>
<!-- ======================= DIST: Create Directories =================== -->
<target name="dist-prepare">
- <mkdir dir="${dist.dir}"/>
+ <mkdir dir="${webapps.dist}"/>
</target>
<!-- ======================= DIST: Create Distribution Files ============ -->
<target name="dist" depends="build-main,dist-prepare">
- <jar jarfile="${dist.dir}/${webapp.name}.war"
- basedir="${build.dir}/${webapp.name}" includes="**"/>
+ <jar jarfile="${webapps.dist}/${webapp.name}.war"
+ basedir="${webapps.build}/${webapp.name}" includes="**"/>
</target>
1.5 +9 -9 jakarta-tomcat-4.0/webapps/webdav/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/webdav/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml 2001/02/01 19:08:16 1.4
+++ build.xml 2001/02/03 22:09:46 1.5
@@ -3,8 +3,8 @@
<!-- ===================== Initialize Property Values =================== -->
<property name="build.compiler" value="classic"/>
- <property name="build.dir" value="../build"/>
- <property name="dist.dir" value="../dist"/>
+ <property name="webapps.build" value="../build"/>
+ <property name="webapps.dist" value="../dist"/>
<property name="servletapi.home" value="../../../jakarta-servletapi-4"/>
<property name="webapp.name" value="webdav"/>
@@ -15,14 +15,14 @@
<!-- =================== BUILD: Create Directories ====================== -->
<target name="build-prepare">
- <mkdir dir="${build.dir}"/>
- <mkdir dir="${build.dir}/${webapp.name}"/>
+ <mkdir dir="${webapps.build}"/>
+ <mkdir dir="${webapps.build}/${webapp.name}"/>
</target>
<!-- ================ BUILD: Copy Static Files ========================== -->
<target name="build-static" depends="build-prepare">
- <copy todir="${build.dir}/${webapp.name}">
+ <copy todir="${webapps.build}/${webapp.name}">
<fileset dir=".">
<exclude name="build.*"/>
</fileset>
@@ -40,20 +40,20 @@
<!-- ======================= BUILD: Clean Directory ===================== -->
<target name="build-clean">
- <delete dir="${build.dir}/${webapp.name}"/>
+ <delete dir="${webapps.build}/${webapp.name}"/>
</target>
<!-- ======================= DIST: Create Directories =================== -->
<target name="dist-prepare">
- <mkdir dir="${dist.dir}"/>
+ <mkdir dir="${webapps.dist}"/>
</target>
<!-- ======================= DIST: Create Distribution Files ============ -->
<target name="dist" depends="build-main,dist-prepare">
- <jar jarfile="${dist.dir}/${webapp.name}.war"
- basedir="${build.dir}/${webapp.name}" includes="**"/>
+ <jar jarfile="${webapps.dist}/${webapp.name}.war"
+ basedir="${webapps.build}/${webapp.name}" includes="**"/>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
