- more

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

--- 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" />
 
-    <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"
@@ -649,8 +641,8 @@
 
   <target name="build-depends" depends="init"
           description="Builds various dependent components - APIs, commons-el, commons-modeler, daemon">
-    <antcall target="build-servletapi"/>
-    <antcall target="build-jspapi"/>
+    <!-- <antcall target="build-servletapi"/> -->
+    <!-- <antcall target="build-jspapi"/> -->
 
     <!-- <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" />