costin 2003/03/20 15:29:34
Modified: catalina build.xml
Log:
Add a flag to turn off doc generation.
Add the 'index' flag - it is supposed to optimize jar reading on 1.4+
( without hurting 1.3-)
Copy all config files
Revision Changes Path
1.47 +27 -20 jakarta-tomcat-catalina/catalina/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/build.xml,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- build.xml 13 Mar 2003 21:00:29 -0000 1.46
+++ build.xml 20 Mar 2003 23:29:34 -0000 1.47
@@ -750,7 +750,7 @@
<!-- ================ BUILD: Create Catalina Javadocs =================== -->
- <target name="javadoc">
+ <target name="javadoc" unless="docs.uptodate" >
<delete dir="${catalina.build}/javadoc"/>
<mkdir dir="${catalina.build}/javadoc"/>
<javadoc packagenames="org.apache.catalina.*,org.apache.naming.*"
@@ -862,7 +862,7 @@
<!-- ====================== DEPLOY: Copy Static Files =================== -->
- <target name="deploy-static"
depends="build-main,deploy-prepare,deploy-static-only"/>
+ <target name="deploy-static"
depends="build-main,deploy-prepare,deploy-static-only,deploy-libs"/>
<target name="deploy-static-only" depends="deploy-prepare">
@@ -874,19 +874,24 @@
<fixcrlf srcdir="${catalina.deploy}/bin" includes="*.bat" eol="crlf"/>
<chmod perm="+x" dir="${catalina.build}/bin" includes="*.sh"/>
+ <!-- Configuration Files -->
+ <copy todir="${catalina.deploy}/conf">
+ <fileset dir="${catalina.build}/conf" />
+ </copy>
+
+ </target>
+
+ <target name="deploy-libs">
+
<!-- Common Extensions -->
<copy todir="${catalina.deploy}/common/endorsed">
<fileset dir="${catalina.build}/common/endorsed" />
</copy>
+
<copy todir="${catalina.deploy}/common/lib">
<fileset dir="${catalina.build}/common/lib" />
</copy>
- <!-- Configuration Files -->
- <copy todir="${catalina.deploy}/conf">
- <fileset dir="${catalina.build}/conf" />
- </copy>
-
<!-- Server Components -->
<copy todir="${catalina.deploy}/server/lib">
<fileset dir="${catalina.build}/server/lib" />
@@ -905,7 +910,7 @@
<target name="catalina-jars"
depends="build-static,deploy-prepare,flags,flags.display,build-catalina"
description="Build catalina jars">
- <!-- Catalina Bootstrap JAR File -->
+ <!-- Catalina Bootstrap JAR File. It is a very wrong idea to split packages in
multiple jars !!! -->
<jar jarfile="${catalina.deploy}/bin/bootstrap.jar"
manifest="etc/bootstrap.MF">
<fileset dir="${classes.dir}">
@@ -927,7 +932,8 @@
<!-- Excluding files from here is worse than duplicating them - a loader that
uses the
package name as index and includes both bootstrap and catalina will be
confused -->
- <jar jarfile="${catalina.deploy}/server/lib/catalina.jar">
+ <jar jarfile="${catalina.deploy}/server/lib/catalina.jar"
+ index="true">
<fileset dir="${classes.dir}">
<include name="org/apache/catalina/**" />
<exclude name="org/apache/catalina/ant/**" />
@@ -958,7 +964,8 @@
</jar>
<!-- Naming - Common JAR File -->
- <jar jarfile="${catalina.deploy}/common/lib/naming-common.jar">
+ <jar jarfile="${catalina.deploy}/common/lib/naming-common.jar"
+ index="true">
<fileset dir="${classes.dir}">
<include name="org/apache/naming/*" />
<include name="org/apache/naming/factory/Constants.class" />
@@ -972,7 +979,7 @@
<!-- Naming - Java: namespace. It shouldn't be included if tomcat is used
inside a different
container that provides this ns -->
- <jar jarfile="${catalina.deploy}/common/lib/naming-java.jar">
+ <jar jarfile="${catalina.deploy}/common/lib/naming-java.jar" index="true">
<fileset dir="${classes.dir}">
<include name="org/apache/naming/java/*" />
</fileset>
@@ -980,7 +987,7 @@
<!-- Naming - Factory JAR File -->
- <jar jarfile="${catalina.deploy}/common/lib/naming-factory.jar">
+ <jar jarfile="${catalina.deploy}/common/lib/naming-factory.jar" index="true">
<fileset dir="${classes.dir}">
<include name="org/apache/naming/factory/**" />
<exclude name="org/apache/naming/factory/Constants.class" />
@@ -989,14 +996,14 @@
</jar>
<!-- Naming - Resources JAR File -->
- <jar jarfile="${catalina.deploy}/common/lib/naming-resources.jar">
+ <jar jarfile="${catalina.deploy}/common/lib/naming-resources.jar" index="true">
<fileset dir="${classes.dir}">
<include name="org/apache/naming/resources/*" />
</fileset>
</jar>
<!-- Servlets - Common Files -->
- <jar jarfile="${catalina.deploy}/server/lib/servlets-common.jar">
+ <jar jarfile="${catalina.deploy}/server/lib/servlets-common.jar" index="true">
<fileset dir="${classes.dir}">
<include name="org/apache/catalina/servlets/Constants.class" />
<include name="org/apache/catalina/servlets/*.properties" />
@@ -1004,42 +1011,42 @@
</jar>
<!-- Servlets - CGI Servlet -->
- <jar jarfile="${catalina.deploy}/server/lib/servlets-cgi.renametojar">
+ <jar jarfile="${catalina.deploy}/server/lib/servlets-cgi.renametojar"
index="true">
<fileset dir="${classes.dir}">
<include name="org/apache/catalina/servlets/CGI*" />
</fileset>
</jar>
<!-- Servlets - Default File-Serving Servlet -->
- <jar jarfile="${catalina.deploy}/server/lib/servlets-default.jar">
+ <jar jarfile="${catalina.deploy}/server/lib/servlets-default.jar" index="true">
<fileset dir="${classes.dir}">
<include name="org/apache/catalina/servlets/Default*" />
</fileset>
</jar>
<!-- Servlets - Invoker Servlet -->
- <jar jarfile="${catalina.deploy}/server/lib/servlets-invoker.jar">
+ <jar jarfile="${catalina.deploy}/server/lib/servlets-invoker.jar" index="true">
<fileset dir="${classes.dir}">
<include name="org/apache/catalina/servlets/Invoker*" />
</fileset>
</jar>
<!-- Servlets - Manager Servlet -->
- <jar jarfile="${catalina.deploy}/server/lib/servlets-manager.jar">
+ <jar jarfile="${catalina.deploy}/server/lib/servlets-manager.jar" index="true">
<fileset dir="${classes.dir}">
<include name="org/apache/catalina/servlets/*Manager*" />
</fileset>
</jar>
<!-- Servlets - SSI Servlet -->
- <jar jarfile="${catalina.deploy}/server/lib/servlets-ssi.renametojar">
+ <jar jarfile="${catalina.deploy}/server/lib/servlets-ssi.renametojar"
index="true">
<fileset dir="${classes.dir}">
<include name="org/apache/catalina/ssi/**" />
</fileset>
</jar>
<!-- Servlets - Webdav Servlet -->
- <jar jarfile="${catalina.deploy}/server/lib/servlets-webdav.jar">
+ <jar jarfile="${catalina.deploy}/server/lib/servlets-webdav.jar" index="true">
<fileset dir="${classes.dir}">
<include name="org/apache/catalina/servlets/Webdav*" />
</fileset>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
