[patch] Fixes some minor build stopping issues

tomcat-5.0.16-fix-build.patch (text/plain), 2.25 KB, created by Greg Bowyer on 2004-01-11 17:34:41 UTC

--- ./build.xml	2003-11-30 15:07:14.000000000 +0000
+++ ./build.new	2004-01-11 06:06:11.653206944 +0000
@@ -47,7 +47,7 @@
    description="Builds all components">
 
     <ant dir="${tomcat.home}" target="download" />
-    <ant dir="${tomcat.home}" target="deploy" />
+    <ant dir="${tomcat.home}" target="dist" />
 
   </target>

--- ./jakarta-tomcat-5/build.xml	2003-11-30 15:07:02.000000000 +0000
+++ ./jakarta-tomcat-5/build.new	2004-01-04 13:15:01.122446352 +0000
@@ -147,7 +147,7 @@
     <copy todir="${tomcat.build}/server/lib" file="${commons-modeler.jar}" />
 
     <copy todir="${tomcat.build}/bin" file="${commons-daemon.jar}" />
-    <copy todir="${tomcat.build}/bin" file="${commons-daemon.jsvc.tar.gz}" />
+<!--    <copy todir="${tomcat.build}/bin" file="${commons-daemon.jsvc.tar.gz}" />-->
 
     <copy todir="${tomcat.build}/common/lib" file="${ant.jar}"/>
   </target>

--- ./jakarta-tomcat-catalina/modules/cluster/build.xml 2003-11-30 15:07:10.000000000 +0000
+++ ./jakarta-tomcat-catalina/modules/cluster/build.new 2004-01-09 18:25:56.861128304 +0000
@@ -19,7 +19,8 @@
     <pathelement location="${catalina.build}/server/lib/catalina.jar"/>
     <pathelement location="${commons-logging.jar}"/>
     <pathelement location="${jmx.jar}"/>
-    <pathelement location="${catalina.build}/common/lib/servlet-api.jar"/>
+<!--    <pathelement location="${catalina.build}/common/lib/servlet-api.jar"/> -->
+    <pathelement location="${servlet-api.jar}"/>
   </path>
  
     <!-- Source path -->
     
--- ./jakarta-servletapi-5/jsr154/build.xml	2003-11-30 15:07:02.000000000 +0000
+++ ./jakarta-servletapi-5/jsr154/build.new	2004-01-09 19:14:47.915540304 +0000
@@ -144,7 +144,7 @@
 
   </target>
 
-  <target name="dist" depends="compile,examples,javadoc,jar"
+  <target name="dist" depends="compile,examples,javadoc"
           description="Create binary distribution">
 
     <!-- Copy Javadocs -->

--- ./jakarta-servletapi-5/jsr152/build.xml	2004-01-09 19:29:21.378753712 +0000
+++ ./jakarta-servletapi-5/jsr152/build.new	2004-01-09 19:28:57.454390768 +0000
@@ -243,7 +243,7 @@
 
   </target>
 
-  <target name="dist" depends="compile,examples,javadoc,jar"
+  <target name="dist" depends="compile,examples,javadoc"
    description="Create binary distribution">
 
     <!-- Copy Javadocs -->