costin 00/12/24 20:43:15
Modified: . build.xml
Log:
Removed any reference to other facades - non-servlet22 facades will not
be part of the standard distribution.
Removed webdav - it was a new feature for 3.3, and no new features should
be part of 3.3. The code will be reintroduced as part of the independent
"tomcat extensions" project.
Revision Changes Path
1.97 +4 -51 jakarta-tomcat/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/build.xml,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- build.xml 2000/11/30 06:17:11 1.96
+++ build.xml 2000/12/25 04:43:15 1.97
@@ -28,17 +28,8 @@
<property name="j2ee.home" value="../j2ee/build/unix"/>
<property name="jaxp" value="../jaxp-1.0.1"/>
- <!-- ========== Hack for building 2.2 and 2.3 versions ========== -->
- <!-- both servlet-2.2.jar and servlet-2.3.jar are checked in
- as binaries - checking out 2 revisions of servletapi and
- building is too complex ( plus they use the same directories ).
- -->
-
<property name="servlet22.jar" value="bin/servlet22.jar"/>
-
- <!-- default servlet.jar, used to compile webapps -->
- <!-- we use 2.2 because the api is backward compatible, but it
- may have problems in the reverse direction -->
+
<property name="servlet.jar" value="${servlet22.jar}"/>
<!-- ==================== Initialization - guessing config ========== -->
@@ -89,11 +80,8 @@
<!-- This act as a "default", Tomcat3.3 will not load it in
classpath, just a hack to ease the transition
-->
- <copy tofile="${tomcat.build}/lib/servlet.jar" file="${servlet.jar}"/>
+ <copy tofile="${tomcat.build}/lib/servlet.jar" file="${servlet22.jar}"/>
- <!-- new dir struct for running both 2.2 and 2.3 -->
- <mkdir dir="${tomcat.build}/lib/servlet22"/>
- <copy tofile="${tomcat.build}/lib/servlet22/servlet22.jar"
file="${servlet22.jar}"/>
<fixcrlf srcdir="${tomcat.build}/bin" includes="**/*.sh" cr="remove"/>
<fixcrlf srcdir="${tomcat.build}/bin" includes="**/*.bat" cr="add"/>
@@ -192,38 +180,12 @@
<include name="org/apache/tomcat/facade/**"/>
<include name="org/apache/tomcat/modules/facade22/**"/>
</javac>
- <jar jarfile="${tomcat.build}/lib/servlet22/facade22.jar"
basedir="${tomcat.build}/classes">
- <include name="org/apache/tomcat/facade/**"/>
- <include name="org/apache/tomcat/modules/facade22/**"/>
- </jar>
- <!-- Copy the file in lib/ too, for tomcat.sh use ( until this is
- fixed for multiple facades
- -->
<jar jarfile="${tomcat.build}/lib/facade22.jar"
basedir="${tomcat.build}/classes">
<include name="org/apache/tomcat/facade/**"/>
<include name="org/apache/tomcat/modules/facade22/**"/>
</jar>
</target>
- <!-- ==================== Webdav ========== -->
- <target depends="init" if="jdk12.present" name="dav">
- <javac destdir="${tomcat.build}/classes" debug="${debug}"
optimize="${optimize}" deprecation="off" srcdir="src/webdav">
- <classpath>
- <pathelement location="${servlet22.jar}"/>
- </classpath>
- <include name="org/apache/tomcat/webdav/**"/>
- </javac>
- <copy todir="${tomcat.build}/classes/org/apache/tomcat">
- <fileset dir="src/webdav/org/apache/tomcat">
- <include name="**/*.properties"/>
- </fileset>
- </copy>
- <jar jarfile="${tomcat.build}/lib/webdav.jar"
basedir="${tomcat.build}/classes">
- <include name="org/apache/tomcat/webdav/**"/>
- <include name="org/apache/tomcat/webdav/**/*.properties"/>
- </jar>
- </target>
-
<!-- ==================== "Standard" interceptors ========== -->
<target name="tomcat_modules" depends="init">
<javac destdir="${tomcat.build}/classes" srcdir="src/share" debug="${debug}"
optimize="${optimize}" deprecation="off">
@@ -269,7 +231,7 @@
<jar jarfile="${tomcat.build}/lib/jasper.jar" basedir="${tomcat.build}/classes"
includes="org/apache/jasper/**"/>
</target>
- <target name="tomcat-jars-new"
depends="tomcat_util,tomcat.jar,tomcat_core,jasper,tomcat_modules,facade22,tomcat_config,dav">
+ <target name="tomcat-jars-new"
depends="tomcat_util,tomcat.jar,tomcat_core,jasper,tomcat_modules,facade22,tomcat_config">
</target>
<!-- ==================== J2EE integration ========== -->
@@ -290,12 +252,6 @@
classpath="${tomcat.build}/classes;${servlet22.jar}"/>
<javac srcdir="src/examples/jsp/plugin/applet" optimize="${optimize}"
destdir="${tomcat.build}/webapps/examples/jsp/plugin/applet"/>
- <!-- webdav -->
- <mkdir dir="${tomcat.build}/webapps/webdav"/>
- <copy todir="${tomcat.build}/webapps/webdav">
- <fileset dir="src/webdav/webdav"/>
- </copy>
-
<!-- Tomcat profiling webapp - not ready for check in yet
<mkdir dir="${tomcat.build}/webapps/prof"/>
@@ -360,7 +316,7 @@
</copy -->
<copy tofile="${tomcat.dist}/lib/jaxp.jar" file="${jaxp}/jaxp.jar"/>
<copy tofile="${tomcat.dist}/lib/parser.jar" file="${jaxp}/parser.jar"/>
- <copy tofile="${tomcat.dist}/lib/servlet.jar" file="${servlet.jar}"/>
+ <copy tofile="${tomcat.dist}/lib/servlet.jar" file="${servlet22.jar}"/>
<!-- copy todir="${tomcat.dist}/src/org">
<fileset dir="src/facade22/org"/>
</copy -->
@@ -376,9 +332,6 @@
<!-- create webapp WARS -->
<jar jarfile="${tomcat.dist}/webapps/examples.war"
basedir="${tomcat.dist}/webapps/examples" excludes="jsp/snp/snoop.jsp" includes="**"/>
<delete dir="${tomcat.dist}/webapps/examples"/>
-
- <jar jarfile="${tomcat.dist}/webapps/webdav.war"
basedir="${tomcat.dist}/webapps/webdav" includes="**"/>
- <delete dir="${tomcat.dist}/webapps/webdav"/>
<jar jarfile="${tomcat.dist}/webapps/admin.war"
basedir="${tomcat.dist}/webapps/admin" includes="**"/>
<delete dir="${tomcat.dist}/webapps/admin"/>
