apache-tomcat-skip-servletapi.patch

   1 --- apache-tomcat-5.5.23-src/build/build.xml    2007-04-19 23:24:44.409317738 +0300
   2 +++ apache-tomcat-5.5.23-src/build/build.xml    2007-04-19 23:26:17.961392267 +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 @@ -484,6 +476,7 @@
  37        </fileset>
  38      </copy>
  39
  40 +       <!--
  41      <javac destdir="${jsp-examples.base}/WEB-INF/classes"
  42             optimize="off"
  43             debug="${compile.debug}"
  44 @@ -509,6 +502,7 @@
  45        <include name="**" />
  46        <exclude name="tags/**" />
  47      </javac>
  48 +       -->
  49
  50      <javac destdir="${admin.base}/WEB-INF/classes"
  51             optimize="off"
  52 @@ -649,8 +643,8 @@
  53
  54    <target name="build-depends" depends="init"
  55            description="Builds various dependent components - APIs, commons-el, commons-modeler, daemon">
  56 -    <antcall target="build-servletapi"/>
  57 -    <antcall target="build-jspapi"/>
  58 +    <!-- <antcall target="build-servletapi"/> -->
  59 +    <!-- <antcall target="build-jspapi"/> -->
  60
  61      <!-- <antcall target="build-commons-modeler" /> -->
  62      <!-- <antcall target="build-commons-daemon"  /> -->
  63 @@ -765,6 +759,7 @@
  64      <mkdir dir="${tomcat.build}/server/webapps" />
  65
  66      <!-- The build files are far too difficult to hack - just build it and copy -->
  67 +       <!--
  68      <ant dir="${api.home}/jsr154" target="dist">
  69      </ant>
  70      <ant dir="${api.home}/jsr152" target="dist">
  71 @@ -781,6 +776,7 @@
  72          <exclude name="WEB-INF/tagPlugins.xml" />
  73        </fileset>
  74      </copy>
  75 +       -->
  76
  77      <ant dir="${catalina.home}/webapps/ROOT" target="build-main">
  78          <property name="webapps.build" value="${tomcat.build}/webapps" />