remm 01/10/04 12:24:30
Modified: jasper 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.22.2.2 +1 -9 jakarta-tomcat-4.0/jasper/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/build.xml,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -u -r1.22.2.1 -r1.22.2.2
--- build.xml 2001/09/28 04:46:41 1.22.2.1
+++ build.xml 2001/10/04 19:24:29 1.22.2.2
@@ -48,7 +48,6 @@
<mkdir dir="${jasper.build}/common"/>
<mkdir dir="${jasper.build}/common/classes"/>
<mkdir dir="${jasper.build}/common/lib"/>
- <mkdir dir="${jasper.build}/jasper"/>
<mkdir dir="${jasper.build}/lib"/>
</target>
@@ -147,7 +146,6 @@
<mkdir dir="${jasper.deploy}/classes"/>
<mkdir dir="${jasper.deploy}/common"/>
<mkdir dir="${jasper.deploy}/common/lib"/>
- <mkdir dir="${jasper.deploy}/jasper"/>
<mkdir dir="${jasper.deploy}/lib"/>
</target>
@@ -164,11 +162,6 @@
<chmod perm="+x" file="${jasper.deploy}/bin/jasper.sh"/>
<chmod perm="+x" file="${jasper.deploy}/bin/jspc.sh"/>
- <!-- Jasper Compiler -->
- <copy todir="${jasper.deploy}/jasper">
- <fileset dir="${jasper.build}/jasper" />
- </copy>
-
<!-- Runtime Library -->
<copy todir="${jasper.deploy}/lib">
<fileset dir="${jasper.build}/lib" />
@@ -182,7 +175,7 @@
description="Build and deploy Jasper component">
<!-- Jasper Compiler JAR File -->
- <jar jarfile="${jasper.deploy}/jasper/jasper-compiler.jar">
+ <jar jarfile="${jasper.deploy}/lib/jasper-compiler.jar">
<fileset dir="${jasper.build}/classes">
<include name="org/apache/jasper/compiler/**" />
<include name="org/apache/jasper/parser/**" />
@@ -227,7 +220,6 @@
<mkdir dir="${jasper.dist}/lib"/>
<copy todir="${jasper.dist}/lib">
<fileset dir="${jasper.build}/lib"/>
- <fileset dir="${jasper.build}/jasper"/>
</copy>