- add status

[packages/apache-tomcat.git] / apache-tomcat-skip-servletapi.patch

diff --git a/apache-tomcat-skip-servletapi.patch b/apache-tomcat-skip-servletapi.patch
index 2c27a65f2d460e9c7ad4dc794443382ce421b7e0..d4b70c58dcd23b98cb0b082ee452a9c4774e216a 100644 (file)
--- a/apache-tomcat-skip-servletapi.patch
+++ b/apache-tomcat-skip-servletapi.patch
@@ -1,6 +1,55 @@
---- apache-tomcat-5.5.23-src/build/build.xml~  2007-03-05 17:27:32.000000000 +0200
-+++ apache-tomcat-5.5.23-src/build/build.xml   2007-04-12 00:29:27.044280476 +0300
-@@ -649,8 +649,8 @@
+--- apache-tomcat-5.5.23-src/build/build.xml   2007-04-19 23:24:44.409317738 +0300
++++ apache-tomcat-5.5.23-src/build/build.xml   2007-04-19 23:26:17.961392267 +0300
+@@ -99,16 +99,6 @@
+     <mkdir dir="${tomcat.build}/server/lib" />
+     <mkdir dir="${tomcat.build}/common/lib" />
+ 
+-    <uptodate property="servletapi.build.notrequired"
+-              targetfile="${servlet-api.jar}">
+-      <srcfiles dir="${api.home}/jsr154/src" includes="**" />
+-    </uptodate>
+-
+-    <uptodate property="jspapi.build.notrequired"
+-              targetfile="${jsp-api.jar}">
+-      <srcfiles dir="${api.home}/jsr152/src" includes="**" />
+-    </uptodate>
+-
+     <uptodate property="tomcatutil.build.notrequired"
+               targetfile="${tomcat.build}/server/lib/tomcat-util.jar">
+       <srcfiles dir="${jtc.home}/util/java" includes="**" />
+@@ -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"
+@@ -484,6 +476,7 @@
+       </fileset>
+     </copy>
+ 
++      <!--
+     <javac destdir="${jsp-examples.base}/WEB-INF/classes"
+            optimize="off"
+            debug="${compile.debug}"
+@@ -509,6 +502,7 @@
+       <include name="**" />
+       <exclude name="tags/**" />
+     </javac>
++      -->
+ 
+     <javac destdir="${admin.base}/WEB-INF/classes"
+            optimize="off"
+@@ -649,8 +643,8 @@
  
    <target name="build-depends" depends="init"
            description="Builds various dependent components - APIs, commons-el, commons-modeler, daemon">
@@ -11,3 +60,19 @@
  
      <!-- <antcall target="build-commons-modeler" /> -->
      <!-- <antcall target="build-commons-daemon"  /> -->
+@@ -765,6 +759,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 +776,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" />