remm 01/10/04 12:24:54
Modified: catalina Tag: tomcat_40_branch build.xml
Log:
- Merge a variety of fixes and small feature additions which have been made
and debugged in the HEAD branch, including:
- Removal of Jasper loader (merged with the shared loader).
- Fixes a lot of spec complaince issue regarding the commit state of the
response when using forwards, sendError or sendRedirect.
- Fixes cache consistency issues for static resource serving.
- Adds content caching for static resources (that's linked to the bugfix
mentioned just above).
- Merge enhanced error reporting and error page dispatching (which will be
able to display error pages for most errors returned from the pipeline -
like the 401 and 403 returned by the authenticator).
- Merge the fixes for all the other more recent bugfixes that have been
fixed in the HEAD branch.
- Passes all tester and Watchdog tests.
- Merge a variety of small enhancements to the build scripts which have been
made in the HEAD branch.
Revision Changes Path
No revision
No revision
1.60.2.6 +87 -58 jakarta-tomcat-4.0/catalina/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/build.xml,v
retrieving revision 1.60.2.5
retrieving revision 1.60.2.6
diff -u -r1.60.2.5 -r1.60.2.6
--- build.xml 2001/09/28 04:46:41 1.60.2.5
+++ build.xml 2001/10/04 19:24:54 1.60.2.6
@@ -11,9 +11,9 @@
<!-- Build Defaults -->
<property name="build.compiler" value="classic"/>
- <property name="catalina.build" value="build"/>
- <property name="catalina.deploy" value="../build"/>
- <property name="catalina.dist" value="dist"/>
+ <property name="catalina.build" value="${basedir}/build"/>
+ <property name="catalina.deploy" value="${basedir}/../build"/>
+ <property name="catalina.dist" value="${basedir}/dist"/>
<property name="test.failonerror" value="true"/>
<property name="test.runner" value="junit.textui.TestRunner"/>
<property name="test.webapp" value="../webapps/build/examples"/>
@@ -35,7 +35,7 @@
<pathelement location="${servlet.jar}"/>
<pathelement location="${tyrex.jar}"/>
<pathelement location="${xerces.jar}"/>
- <pathelement location="${catalina.build}/classes"/>
+ <pathelement location="${catalina.build}/server/classes"/>
</path>
<!-- Construct unit tests classpath -->
@@ -55,7 +55,7 @@
<pathelement location="${servlet.jar}"/>
<pathelement location="${tyrex.jar}"/>
<pathelement location="${xerces.jar}"/>
- <pathelement location="${catalina.build}/classes"/>
+ <pathelement location="${catalina.build}/server/classes"/>
<pathelement location="${catalina.build}/tests"/>
</path>
@@ -74,6 +74,14 @@
classname="org.apache.tools.ant.taskdefs.optional.TraXLiaison" />
<!-- Class availability flags -->
+ <condition property="jaxp.present">
+ <and>
+ <available classname="javax.xml.parsers.SAXParser"
+ classpath="${xerces.jar}" />
+ <available classname="org.xml.sax.ContentHandler"
+ classpath="${xerces.jar}" />
+ </and>
+ </condition>
<condition property="javamail.present">
<and>
<available classname="javax.activation.DataSource"
@@ -121,9 +129,12 @@
<available property="tyrex.present"
classname="tyrex.tm.Tyrex"
classpath="${tyrex.jar}" />
+ <available property="xerces.present"
+ classname="org.apache.xerces.parsers.SAXParser"
+ classpath="${xerces.jar}" />
<!-- JAR files availability flags -->
- <available property="ajp.jar.present" file="${ajp.jar}" />
+ <available property="tomcat-ajp.jar.present" file="${tomcat-ajp.jar}" />
<condition property="javamail.jar.present">
<and>
<available file="${activation.jar}" />
@@ -142,6 +153,7 @@
<available property="servlet.jar.present" file="${servlet.jar}" />
<available property="tomcat-util.jar.present" file="${tomcat-util.jar}" />
<available property="tyrex.jar.present" file="${tyrex.jar}" />
+ <available property="xerces.jar.present" file="${xerces.jar}" />
<!-- Conditional compilation flags (determined from the flags above) -->
<condition property="compile.javamail">
@@ -198,10 +210,10 @@
<!-- Conditional copy flags (determined from the flags above) -->
- <condition property="copy.ajp.jar">
+ <condition property="copy.tomcat-ajp.jar">
<or>
<equals arg1="${full.dist}" arg2="on" />
- <equals arg1="${ajp.jar.present}" arg2="true" />
+ <equals arg1="${tomcat-ajp.jar.present}" arg2="true" />
</or>
</condition>
<condition property="copy.jdbc20ext.jar">
@@ -268,16 +280,18 @@
</and>
</or>
</condition>
- <condition property="copy.tomcat-util.jar">
+ <condition property="copy.tyrex.jar">
<or>
<equals arg1="${full.dist}" arg2="on" />
- <equals arg1="${tomcat-util.jar.present}" arg2="true" />
+ <equals arg1="${tyrex.jar.present}" arg2="true" />
</or>
</condition>
- <condition property="copy.tyrex.jar">
+ <condition property="copy.xerces.jar">
<or>
<equals arg1="${full.dist}" arg2="on" />
- <equals arg1="${tyrex.jar.present}" arg2="true" />
+ <not>
+ <equals arg1="${jdk.1.4.present}" arg2="true" />
+ </not>
</or>
</condition>
@@ -307,6 +321,7 @@
<echo message="jdk.1.4.present=${jdk.1.4.present}" />
<echo message="--- Required Libraries ---" />
+ <echo message="jaxp.present=${jaxp.present}" />
<echo message="jndi.present=${jndi.present}" />
<echo message="regexp.present=${regexp.present}" />
<echo message="servlet.present=${servlet.present}" />
@@ -323,15 +338,16 @@
<echo message="jndi.jar.present(except JDK 1.3+)=${jndi.jar.present}" />
<echo message="regexp.jar.present=${regexp.jar.present}" />
<echo message="servlet.jar.present=${servlet.jar.present}" />
- <echo message="tomcat-util.jar.present=${tomcat-util.jar.present}" />
+ <echo message="xerces.jar.present(except JDK 1.4+)=${xerces.jar.present}" />
<echo message="--- Optional JARs ---" />
- <echo message="ajp.jar.present=${ajp.jar.present}" />
+ <echo message="tomcat-ajp.jar.present=${tomcat-ajp.jar.present}" />
<echo message="javamail.jar.present=${javamail.jar.present}" />
<echo message="jdbc20ext.jar.present=${jdbc20ext.jar.present}" />
<echo message="jta.jar.present=${jta.jar.present}" />
<echo message="junit.jar.present=${junit.jar.present}" />
<echo message="ldap.jar.present=${ldap.jar.present}" />
+ <echo message="tomcat-util.jar.present=${tomcat-util.jar.present}" />
<echo message="tyrex.jar.present=${tyrex.jar.present}" />
<echo message="--- Conditional compilation flags ---" />
@@ -345,14 +361,14 @@
<echo message="compile.tyrex=${compile.tyrex}" />
<echo message="--- Distribution flags ---" />
- <echo message="copy.ajp.jar=${copy.ajp.jar}" />
+ <echo message="copy.tomcat-ajp.jar=${copy.tomcat-ajp.jar}" />
<echo message="copy.jdbc20ext.jar=${copy.jdbc20ext.jar}" />
<echo message="copy.jndi.jar=${copy.jndi.jar}" />
<echo message="copy.javamail.jar=${copy.javamail.jar}" />
<echo message="copy.jta.jar=${copy.jta.jar}" />
<echo message="copy.ldap.jar=${copy.ldap.jar}" />
- <echo message="copy.tomcat-util.jar=${copy.tomcat-util.jar}" />
<echo message="copy.tyrex.jar=${copy.tyrex.jar}" />
+ <echo message="copy.xerces.jar=${copy.xerces.jar}" />
</target>
@@ -361,22 +377,22 @@
<mkdir dir="${catalina.build}"/>
<mkdir dir="${catalina.build}/bin"/>
- <mkdir dir="${catalina.build}/classes"/>
- <mkdir dir="${catalina.build}/common"/>
<mkdir dir="${catalina.build}/common/classes"/>
<mkdir dir="${catalina.build}/common/lib"/>
<mkdir dir="${catalina.build}/conf"/>
- <mkdir dir="${catalina.build}/lib"/>
- <mkdir dir="${catalina.build}/server"/>
+ <mkdir dir="${catalina.build}/logs"/>
<mkdir dir="${catalina.build}/server/classes"/>
<mkdir dir="${catalina.build}/server/lib"/>
+ <mkdir dir="${catalina.build}/classes"/>
+ <mkdir dir="${catalina.build}/lib"/>
+ <mkdir dir="${catalina.build}/work"/>
</target>
<!-- ======================== BUILD: Copy JARs ========================== -->
- <target name="copy-ajp.jar" if="copy.ajp.jar">
- <copy todir="${catalina.build}/server/lib" file="${ajp.jar}"/>
+ <target name="copy-tomcat-ajp.jar" if="copy.tomcat-ajp.jar">
+ <copy todir="${catalina.build}/server/lib" file="${tomcat-ajp.jar}"/>
</target>
<target name="copy-activation.jar" if="copy.javamail.jar">
<copy todir="${catalina.build}/common/lib" file="${activation.jar}"/>
@@ -403,17 +419,20 @@
<copy todir="${catalina.build}/common/lib" file="${jsse.jar}"/>
-->
</target>
- <target name="copy-tomcat-util.jar" if="copy.tomcat-util.jar">
+ <target name="copy-tomcat-util.jar">
<copy todir="${catalina.build}/server/lib" file="${tomcat-util.jar}"/>
</target>
<target name="copy-tyrex.jar" if="copy.tyrex.jar">
<copy todir="${catalina.build}/common/lib" file="${tyrex.jar}"/>
<copy todir="${catalina.build}/common/lib" file="../lib/tyrex.license"/>
</target>
+ <target name="copy-xerces.jar" if="copy.xerces.jar">
+ <copy todir="${catalina.build}/common/lib" file="${xerces.jar}"/>
+ </target>
<!-- =================== BUILD: Copy Static Files ======================= -->
- <target name="build-static"
depends="flags,flags.display,build-prepare,copy-activation.jar,copy-ajp.jar,copy-jdbc20ext.jar,copy-jndi.jar,copy-jsse.jar,copy-jta.jar,copy-ldap.jar,copy-tomcat-util.jar,copy-tyrex.jar">
+ <target name="build-static"
depends="flags,flags.display,build-prepare,copy-activation.jar,copy-tomcat-ajp.jar,copy-jdbc20ext.jar,copy-jndi.jar,copy-jsse.jar,copy-jta.jar,copy-ldap.jar,copy-tomcat-util.jar,copy-tyrex.jar,copy-xerces.jar">
<!-- Executable Commands -->
<copy todir="${catalina.build}/bin">
@@ -428,7 +447,6 @@
<!-- Common Extensions -->
<copy todir="${catalina.build}/common/lib" file="${servlet.jar}"/>
- <copy todir="${catalina.build}/common/lib" file="${xerces.jar}"/>
<!-- Configuration Files -->
<copy todir="${catalina.build}/conf">
@@ -450,13 +468,13 @@
<target name="build-main" depends="build-static">
<!-- Compile Service API -->
- <javac srcdir="../service/java" destdir="${catalina.build}/classes"
+ <javac srcdir="../service/java" destdir="${catalina.build}/server/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
excludes="**/CVS/**" />
<!-- Compile internal server components -->
- <javac srcdir="src/share" destdir="${catalina.build}/classes"
+ <javac srcdir="src/share" destdir="${catalina.build}/server/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
excludes="**/CVS/**">
@@ -486,9 +504,9 @@
</javac>
<!-- Copy static resource files -->
- <copy todir="${catalina.build}/classes">
+ <copy todir="${catalina.build}/server/classes">
<fileset dir="src/share">
- <include name="**/*.properties"/>
+ <exclude name="**/*.java"/>
</fileset>
</copy>
@@ -589,11 +607,10 @@
<mkdir dir="${catalina.deploy}"/>
<mkdir dir="${catalina.deploy}/bin"/>
<mkdir dir="${catalina.deploy}/conf"/>
- <mkdir dir="${catalina.deploy}/lib"/>
<mkdir dir="${catalina.deploy}/logs"/>
- <mkdir dir="${catalina.deploy}/common"/>
+ <mkdir dir="${catalina.deploy}/common/classes"/>
<mkdir dir="${catalina.deploy}/common/lib"/>
- <mkdir dir="${catalina.deploy}/server"/>
+ <mkdir dir="${catalina.deploy}/server/classes"/>
<mkdir dir="${catalina.deploy}/server/lib"/>
<mkdir dir="${catalina.deploy}/work"/>
</target>
@@ -606,7 +623,7 @@
<copy todir="${catalina.deploy}/bin">
<fileset dir="${catalina.build}/bin" />
</copy>
- <fixcrlf srcdir="${catalina.deploy}/bin" includes="*.sh" eol="lf"/>
+ <fixcrlf srcdir="${catalina.deploy}/bin" includes="*.sh" eol="lf"/>
<fixcrlf srcdir="${catalina.deploy}/bin" includes="*.bat" eol="crlf"/>
<chmod perm="+x" file="${catalina.deploy}/bin/catalina.sh"/>
<chmod perm="+x" file="${catalina.build}/bin/digest.sh"/>
@@ -623,16 +640,16 @@
<fileset dir="${catalina.build}/conf" />
</copy>
- <!-- Shared Extensions -->
- <copy todir="${catalina.deploy}/lib">
- <fileset dir="${catalina.build}/lib" />
- </copy>
-
<!-- Server Components -->
<copy todir="${catalina.deploy}/server/lib">
<fileset dir="${catalina.build}/server/lib" />
</copy>
+ <!-- Shared Extensions -->
+ <copy todir="${catalina.deploy}/lib">
+ <fileset dir="${catalina.build}/lib" />
+ </copy>
+
</target>
@@ -643,7 +660,7 @@
<!-- Catalina Bootstrap JAR File -->
<jar jarfile="${catalina.deploy}/bin/bootstrap.jar"
manifest="etc/bootstrap.MF">
- <fileset dir="${catalina.build}/classes">
+ <fileset dir="${catalina.build}/server/classes">
<include name="org/apache/service/Service.class" />
<include name="org/apache/service/ServiceController.class" />
<include name="org/apache/catalina/startup/Bootstrap.class" />
@@ -659,7 +676,7 @@
<!-- Catalina Main JAR File -->
<jar jarfile="${catalina.deploy}/server/lib/catalina.jar">
- <fileset dir="${catalina.build}/classes">
+ <fileset dir="${catalina.build}/server/classes">
<exclude name="org/apache/naming/**" />
<exclude name="**/connector/warp/**" />
<exclude name="org/apache/catalina/startup/Bootstrap.class" />
@@ -676,7 +693,7 @@
<!-- Naming - Common JAR File -->
<jar jarfile="${catalina.deploy}/common/lib/naming-common.jar">
- <fileset dir="${catalina.build}/classes">
+ <fileset dir="${catalina.build}/server/classes">
<include name="org/apache/naming/*" />
<include name="org/apache/naming/factory/Constants.class" />
<include name="org/apache/naming/java/*" />
@@ -686,7 +703,7 @@
<!-- Naming - Factory JAR File -->
<jar jarfile="${catalina.deploy}/lib/naming-factory.jar">
- <fileset dir="${catalina.build}/classes">
+ <fileset dir="${catalina.build}/server/classes">
<include name="org/apache/naming/factory/**" />
<exclude name="org/apache/naming/factory/Constants.class" />
</fileset>
@@ -694,14 +711,14 @@
<!-- Naming - Resources JAR File -->
<jar jarfile="${catalina.deploy}/common/lib/naming-resources.jar">
- <fileset dir="${catalina.build}/classes">
+ <fileset dir="${catalina.build}/server/classes">
<include name="org/apache/naming/resources/*" />
</fileset>
</jar>
<!-- Servlets - Common Files -->
<jar jarfile="${catalina.deploy}/server/lib/servlets-common.jar">
- <fileset dir="${catalina.build}/classes">
+ <fileset dir="${catalina.build}/server/classes">
<include name="org/apache/catalina/servlets/Constants.class" />
<include name="org/apache/catalina/servlets/*.properties" />
</fileset>
@@ -709,42 +726,42 @@
<!-- Servlets - CGI Servlet -->
<jar jarfile="${catalina.deploy}/server/lib/servlets-cgi.jar">
- <fileset dir="${catalina.build}/classes">
+ <fileset dir="${catalina.build}/server/classes">
<include name="org/apache/catalina/servlets/CGI*" />
</fileset>
</jar>
<!-- Servlets - Default File-Serving Servlet -->
<jar jarfile="${catalina.deploy}/server/lib/servlets-default.jar">
- <fileset dir="${catalina.build}/classes">
+ <fileset dir="${catalina.build}/server/classes">
<include name="org/apache/catalina/servlets/Default*" />
</fileset>
</jar>
<!-- Servlets - Invoker Servlet -->
<jar jarfile="${catalina.deploy}/server/lib/servlets-invoker.jar">
- <fileset dir="${catalina.build}/classes">
+ <fileset dir="${catalina.build}/server/classes">
<include name="org/apache/catalina/servlets/Invoker*" />
</fileset>
</jar>
<!-- Servlets - Manager Servlet -->
<jar jarfile="${catalina.deploy}/server/lib/servlets-manager.jar">
- <fileset dir="${catalina.build}/classes">
+ <fileset dir="${catalina.build}/server/classes">
<include name="org/apache/catalina/servlets/*Manager*" />
</fileset>
</jar>
<!-- Servlets - Snoop Servlet -->
<jar jarfile="${catalina.deploy}/server/lib/servlets-snoop.jar">
- <fileset dir="${catalina.build}/classes">
+ <fileset dir="${catalina.build}/server/classes">
<include name="org/apache/catalina/servlets/Snoop*" />
</fileset>
</jar>
<!-- Servlets - SSI Servlet -->
<jar jarfile="${catalina.deploy}/server/lib/servlets-ssi.jar">
- <fileset dir="${catalina.build}/classes">
+ <fileset dir="${catalina.build}/server/classes">
<include name="org/apache/catalina/servlets/Ssi*" />
<include name="org/apache/catalina/util/ssi/**" />
</fileset>
@@ -752,14 +769,14 @@
<!-- Servlets - Webdav Servlet -->
<jar jarfile="${catalina.deploy}/server/lib/servlets-webdav.jar">
- <fileset dir="${catalina.build}/classes">
+ <fileset dir="${catalina.build}/server/classes">
<include name="org/apache/catalina/servlets/Webdav*" />
</fileset>
</jar>
<!-- WARP Connector JAR File -->
<jar jarfile="${catalina.deploy}/server/lib/warp.jar"
- basedir="${catalina.build}/classes"
+ basedir="${catalina.build}/server/classes"
includes="**/connector/warp/**" />
</target>
@@ -782,6 +799,10 @@
<chmod perm="+x" file="${catalina.dist}/bin/shutdown.sh"/>
<!-- Common Extensions -->
+ <mkdir dir="${catalina.dist}/common/classes"/>
+ <copy todir="${catalina.dist}/common/classes">
+ <fileset dir="${catalina.build}/common/classes" />
+ </copy>
<mkdir dir="${catalina.dist}/common/lib"/>
<copy todir="${catalina.dist}/common/lib">
<fileset dir="${catalina.build}/common/lib" />
@@ -793,16 +814,24 @@
<fileset dir="${catalina.build}/conf" />
</copy>
- <!-- Shared Extensions -->
- <mkdir dir="${catalina.dist}/lib"/>
- <copy todir="${catalina.dist}/lib">
- <fileset dir="${catalina.build}/lib" />
- </copy>
-
<!-- Server Components -->
+ <mkdir dir="${catalina.dist}/server/classes"/>
+ <copy todir="${catalina.dist}/server/classes">
+ <fileset dir="${catalina.build}/server/classes" />
+ </copy>
<mkdir dir="${catalina.dist}/server/lib"/>
<copy todir="${catalina.dist}/server/lib">
<fileset dir="${catalina.build}/server/lib" />
+ </copy>
+
+ <!-- Shared Extensions -->
+ <mkdir dir="${catalina.dist}/classes"/>
+ <copy todir="${catalina.dist}/classes">
+ <fileset dir="${catalina.build}/classes" />
+ </copy>
+ <mkdir dir="${catalina.dist}/lib"/>
+ <copy todir="${catalina.dist}/lib">
+ <fileset dir="${catalina.build}/lib" />
</copy>
</target>
