apache-tomcat-skip-jdt.patch

   1 --- apache-tomcat-5.5.23-src/build/build.xml    2007-04-12 02:31:55.729662406 +0300
   2 +++ apache-tomcat-5.5.23-src/build/build.xml    2007-04-12 02:32:54.410985008 +0300
   3 @@ -62,9 +62,9 @@
   4    <property name="tomcat-dbcp.home" value="${base.path}/tomcat-deps" />
   5    <property name="tomcat-dbcp.jar"
   6         value="${tomcat-dbcp.home}/naming-factory-dbcp.jar"/>
   7 -  <property name="jasper-compiler-jdt.home" value="${base.path}/tomcat-deps" />
   8 +   <!--<property name="jasper-compiler-jdt.home" value="${base.path}/tomcat-deps" />
   9    <property name="jasper-compiler-jdt.jar"
  10 -       value="${jasper-compiler-jdt.home}/jasper-compiler-jdt.jar"/>
  11 +         value="${jasper-compiler-jdt.home}/jasper-compiler-jdt.jar"/>-->
  12
  13    <!-- Some compilers will disable debugging if true. And it doesn't do anything
  14         in most cases -->
  15 @@ -154,7 +154,7 @@
  16
  17      <!-- <copy todir="${tomcat.build}/common/lib" file="${ant.jar}"/>
  18      <copy todir="${tomcat.build}/common/lib" file="${ant-launcher.jar}"/> -->
  19 -    <copy todir="${tomcat.build}/common/lib" file="${jasper-compiler-jdt.jar}"/>
  20 +       <!--<copy todir="${tomcat.build}/common/lib" file="${jasper-compiler-jdt.jar}"/>-->
  21    </target>
  22
  23    <!-- ====================== Build all components =================== -->
  24 @@ -660,12 +660,14 @@
  25
  26      <antcall target="build-tomcat-dbcp" />
  27
  28 +       <!--
  29      <antcall target="downloadzip">
  30        <param name="sourcefile" value="${jdt.loc}"/>
  31        <param name="destfile" value="${jdt.jar}"/>
  32        <param name="destdir" value="${base.path}"/>
  33      </antcall>
  34 -    <antcall target="build-jasper-compiler-jdt" />
  35 +       <antcall target="build-jasper-compiler-jdt" />
  36 +       -->
  37    </target>
  38
  39    <target name="build-tomcat-dbcp">
  40 @@ -725,12 +727,14 @@
  41      </jar>
  42    </target>
  43
  44 +  <!--
  45        <target name="build-jasper-compiler-jdt">
  46         <mkdir dir="${jasper-compiler-jdt.home}"/>
  47         <antcall target="-build-jasper-compiler-jdt">
  48            <param name="basedir" value="${jasper-compiler-jdt.home}" />
  49         </antcall>
  50        </target>
  51 +       -->
  52
  53        <target name="-build-jasper-compiler-jdt">
  54          <unjar src="${jdt.jar}" dest="${jasper-compiler-jdt.home}" />
  55 @@ -944,7 +948,7 @@
  56      <copy todir="embed/lib">
  57        <fileset dir="build/common/lib">
  58          <include name="jasper-compiler.jar"/>
  59 -        <include name="jasper-compiler-jdt.jar"/>
  60 +               <!--<include name="jasper-compiler-jdt.jar"/>-->
  61        </fileset>
  62      </copy>
  63