- more

Changed files:
    apache-tomcat-skip-servletapi.patch -> 1.3

diff --git a/apache-tomcat-skip-servletapi.patch b/apache-tomcat-skip-servletapi.patch
index 124f5504b33588901b4aab93f0377cd198bd67c5..75105f71a5c993a1ae8df986ff677cc8ced06711 100644 (file)
--- a/apache-tomcat-skip-servletapi.patch
+++ b/apache-tomcat-skip-servletapi.patch
@@ -1,5 +1,5 @@
---- apache-tomcat-5.5.23-src/build/build.xml~  2007-04-12 00:32:27.088341587 +0300
-+++ apache-tomcat-5.5.23-src/build/build.xml   2007-04-12 00:32:28.698377904 +0300
+--- apache-tomcat-5.5.23-src/build/build.xml   2007-04-19 23:16:26.528291420 +0300
++++ apache-tomcat-5.5.23-src/build/build.xml   2007-04-19 23:24:44.409317738 +0300

 @@ -99,16 +99,6 @@
      <mkdir dir="${tomcat.build}/server/lib" />
      <mkdir dir="${tomcat.build}/common/lib" />
 @@ -99,16 +99,6 @@
      <mkdir dir="${tomcat.build}/server/lib" />
      <mkdir dir="${tomcat.build}/common/lib" />


@@ -17,7 +17,23 @@
      <uptodate property="tomcatutil.build.notrequired"
                targetfile="${tomcat.build}/server/lib/tomcat-util.jar">
        <srcfiles dir="${jtc.home}/util/java" includes="**" />
      <uptodate property="tomcatutil.build.notrequired"
                targetfile="${tomcat.build}/server/lib/tomcat-util.jar">
        <srcfiles dir="${jtc.home}/util/java" includes="**" />

-@@ -649,8 +639,8 @@
+@@ -439,6 +429,7 @@
+              addWebXmlMappings="true"
+              outputDir="${ROOT.base}/WEB-INF/src" />
+ 
++      <!--
+     <jasper2
+              compile="false"
+              validateXml="false"
+@@ -446,6 +437,7 @@
+          webXmlFragment="${jsp-examples.base}/WEB-INF/generated_web.xml"
+              addWebXmlMappings="true"
+              outputDir="${jsp-examples.base}/WEB-INF/src" />
++      -->
+ 
+     <jasper2
+              package="admin"
+@@ -649,8 +641,8 @@

  
    <target name="build-depends" depends="init"
            description="Builds various dependent components - APIs, commons-el, commons-modeler, daemon">
  
    <target name="build-depends" depends="init"
            description="Builds various dependent components - APIs, commons-el, commons-modeler, daemon">


@@ -28,3 +44,19 @@
  
      <!-- <antcall target="build-commons-modeler" /> -->
      <!-- <antcall target="build-commons-daemon"  /> -->
  
      <!-- <antcall target="build-commons-modeler" /> -->
      <!-- <antcall target="build-commons-daemon"  /> -->

+@@ -765,6 +757,7 @@
+     <mkdir dir="${tomcat.build}/server/webapps" />
+ 
+     <!-- The build files are far too difficult to hack - just build it and copy -->
++      <!--
+     <ant dir="${api.home}/jsr154" target="dist">
+     </ant>
+     <ant dir="${api.home}/jsr152" target="dist">
+@@ -781,6 +774,7 @@
+         <exclude name="WEB-INF/tagPlugins.xml" />
+       </fileset>
+     </copy>
++      -->
+ 
+     <ant dir="${catalina.home}/webapps/ROOT" target="build-main">
+         <property name="webapps.build" value="${tomcat.build}/webapps" />