apache-tomcat-skip-servletapi.patch

   1 --- apache-tomcat-5.5.23-src/build/build.xml    2007-04-19 23:16:26.528291420 +0300
   2 +++ apache-tomcat-5.5.23-src/build/build.xml    2007-04-19 23:24:44.409317738 +0300
   3 @@ -99,16 +99,6 @@
   4      <mkdir dir="${tomcat.build}/server/lib" />
   5      <mkdir dir="${tomcat.build}/common/lib" />
   6
   7 -    <uptodate property="servletapi.build.notrequired"
   8 -              targetfile="${servlet-api.jar}">
   9 -      <srcfiles dir="${api.home}/jsr154/src" includes="**" />
  10 -    </uptodate>
  11 -
  12 -    <uptodate property="jspapi.build.notrequired"
  13 -              targetfile="${jsp-api.jar}">
  14 -      <srcfiles dir="${api.home}/jsr152/src" includes="**" />
  15 -    </uptodate>
  16 -
  17      <uptodate property="tomcatutil.build.notrequired"
  18                targetfile="${tomcat.build}/server/lib/tomcat-util.jar">
  19        <srcfiles dir="${jtc.home}/util/java" includes="**" />
  20 @@ -439,6 +429,7 @@
  21               addWebXmlMappings="true"
  22               outputDir="${ROOT.base}/WEB-INF/src" />
  23
  24 +       <!--
  25      <jasper2
  26               compile="false"
  27               validateXml="false"
  28 @@ -446,6 +437,7 @@
  29           webXmlFragment="${jsp-examples.base}/WEB-INF/generated_web.xml"
  30               addWebXmlMappings="true"
  31               outputDir="${jsp-examples.base}/WEB-INF/src" />
  32 +       -->
  33
  34      <jasper2
  35               package="admin"
  36 @@ -649,8 +641,8 @@
  37
  38    <target name="build-depends" depends="init"
  39            description="Builds various dependent components - APIs, commons-el, commons-modeler, daemon">
  40 -    <antcall target="build-servletapi"/>
  41 -    <antcall target="build-jspapi"/>
  42 +    <!-- <antcall target="build-servletapi"/> -->
  43 +    <!-- <antcall target="build-jspapi"/> -->
  44
  45      <!-- <antcall target="build-commons-modeler" /> -->
  46      <!-- <antcall target="build-commons-daemon"  /> -->
  47 @@ -765,6 +757,7 @@
  48      <mkdir dir="${tomcat.build}/server/webapps" />
  49
  50      <!-- The build files are far too difficult to hack - just build it and copy -->
  51 +       <!--
  52      <ant dir="${api.home}/jsr154" target="dist">
  53      </ant>
  54      <ant dir="${api.home}/jsr152" target="dist">
  55 @@ -781,6 +774,7 @@
  56          <exclude name="WEB-INF/tagPlugins.xml" />
  57        </fileset>
  58      </copy>
  59 +       -->
  60
  61      <ant dir="${catalina.home}/webapps/ROOT" target="build-main">
  62          <property name="webapps.build" value="${tomcat.build}/webapps" />