costin 2003/01/16 12:58:24
Modified: catalina build.xml
Log:
Split the build in 2 parts. One is "required", with no external dependencies
( except JAAS and JMX ).
Also added fileupload check - probably it needs to be added to download too.
Revision Changes Path
1.36 +47 -9 jakarta-tomcat-catalina/catalina/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/build.xml,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- build.xml 15 Jan 2003 03:40:42 -0000 1.35
+++ build.xml 16 Jan 2003 20:58:24 -0000 1.36
@@ -601,7 +601,51 @@
<!-- ================ BUILD: Compile Catalina Components ================ -->
- <target name="build-catalina">
+ <target name="build-catalina"
depends="build-catalina-core,build-catalina-optional"/>
+
+ <target name="build-catalina-core">
+ <!-- Compile internal server components -->
+ <javac srcdir="src/share" destdir="${classes.dir}"
+ debug="${compile.debug}" deprecation="${compile.deprecation}"
+ optimize="${compile.optimize}"
+ excludes="**/CVS/**">
+ <classpath refid="catalina.classpath" />
+
+ <exclude name="org/apache/catalina/util/ProcessHelper.java"
+ unless="jdk.1.3.present"/>
+ <exclude name="org/apache/catalina/realm/JAAS**"
+ unless="compile.jaas"/>
+ <exclude name="org/apache/catalina/valves/CertificatesValve.java"
+ unless="compile.jsse"/>
+
+ <exclude name="org/apache/catalina/servlets/CGIServlet.java" />
+ <exclude name="org/apache/catalina/servlets/HTMLManagerServlet.java" />
+ <exclude name="org/apache/naming/factory/DbcpDataSourceFactory.java" />
+ <exclude name="org/apache/naming/factory/Tyrex*.java" />
+ <exclude name="org/apache/catalina/ssi/**"/>
+ <exclude name="org/apache/catalina/cluster/**"/>
+ <exclude name="org/apache/naming/factory/MailSessionFactory.java"/>
+ <exclude name="org/apache/naming/factory/SendMailFactory.java"/>
+ <exclude name="org/apache/catalina/launcher/**"/>
+ </javac>
+
+ <!-- Copy static resource files -->
+ <filter token="VERSION" value="${version}"/>
+ <copy todir="${classes.dir}" filtering="true">
+ <fileset dir="src/share">
+ <exclude name="**/*.java"/>
+ <exclude name="**/*.ser"/>
+ </fileset>
+ </copy>
+ <copy todir="${classes.dir}">
+ <fileset dir="src/share">
+ <include name="**/*.ser"/>
+ </fileset>
+ </copy>
+
+ </target>
+
+ <target name="build-catalina-optional" unless="build.tomcat.base">
<!-- Compile internal server components -->
<javac srcdir="src/share" destdir="${classes.dir}"
debug="${compile.debug}" deprecation="${compile.deprecation}"
@@ -612,16 +656,12 @@
unless="jdk.1.3.present"/>
<exclude name="org/apache/catalina/servlets/CGIServlet.java"
unless="jdk.1.3.present"/>
- <exclude name="org/apache/naming/NamingService.java"
- unless="compile.jmx"/>
+ <exclude name="org/apache/catalina/servlets/HTMLManagerServlet.java"
+ unless="fileupload.present"/>
<exclude name="org/apache/naming/factory/DbcpDataSourceFactory.java"
unless="compile.dbcp"/>
<exclude name="org/apache/naming/factory/Tyrex*.java"
unless="compile.tyrex"/>
- <exclude name="org/apache/catalina/mbeans/**"
- unless="compile.jmx"/>
- <exclude name="org/apache/catalina/realm/JAAS**"
- unless="compile.jaas"/>
<exclude name="org/apache/catalina/ssi/**"
unless="compile.ssi"/>
<exclude name="org/apache/catalina/valves/CertificatesValve.java"
@@ -647,9 +687,7 @@
<exclude name="**/*.java"/>
</fileset>
</copy>
-
</target>
-
<!-- ================== BUILD: Build tomcat-coyote ====================== -->
<target name="build-tomcat-coyote">
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
