markt 2005/07/30 04:39:50
Modified: coyote build.xml
util build.xml
Log:
Clean up content of coyote jars when building for TC4
Revision Changes Path
1.32 +2 -2 jakarta-tomcat-connectors/coyote/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/build.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- build.xml 6 Jan 2005 12:42:13 -0000 1.31
+++ build.xml 30 Jul 2005 11:39:49 -0000 1.32
@@ -277,7 +277,7 @@
manifest="${build.home}/conf/MANIFEST.MF">
<fileset dir="${build.home}/classes" >
<exclude name="**/tomcat3/*"/>
- <!-- exclude name="**/tomcat4/*"/ -->
+ <exclude name="**/tomcat4/*"/>
<exclude name="**/tomcat5/*"/>
<include name="org/apache/coyote/**"/>
</fileset>
1.33 +3 -0 jakarta-tomcat-connectors/util/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/build.xml,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- build.xml 15 Apr 2005 02:49:14 -0000 1.32
+++ build.xml 30 Jul 2005 11:39:50 -0000 1.33
@@ -62,8 +62,10 @@
<echo message="-- commons-logging = ${commons-logging.present}"/>
<echo message="-- jmx = ${jmx.present} ${jmx.jar}"/>
<echo message="-- modeler = ${modeler.present}
${commons-modeler.jar}"/>
+ <echo message="-- skip.digester = ${skip.digester}" />
<echo message="-- JDK14 = ${jdk1.4.present}"/>
<echo message="-- JDK15 = ${jdk1.5.present}" />
+ <echo message="-- JDK15 = ${jdk1.5.present}" />
<javac srcdir="java"
destdir="${tomcat-util.build}/classes"
@@ -82,6 +84,7 @@
<exclude name="**/util/net/jsse/JSSE14*" unless="jdk1.4.present"
/>
<exclude name="**/util/net/jsse/JSSE15*" unless="jdk1.5.present"
/>
<exclude name="**/util/net/jsse/JSSEKeyManager.java"
unless="jdk1.4.present" />
+ <exclude name="**/util/digester/*" if="skip.digester" />
</javac>
<!-- Copy static resource files -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]