tomcat-build.xml.patch

   1 --- apache-tomcat-7.0.63-src/build.xml~ 2015-06-30 11:15:44.000000000 +0300
   2 +++ apache-tomcat-7.0.63-src/build.xml  2015-07-26 21:31:46.613106110 +0300
   3 @@ -632,7 +574,7 @@
   4    <target name="compile" depends="compile-java6,check-java7,compile-java7" />
   5
   6    <target name="compile-java6"
   7 -          depends="build-prepare,download-compile,compile-prepare,validate">
   8 +          depends="build-prepare">
   9      <!-- Compile internal server components -->
  10      <javac srcdir="java" destdir="${tomcat.classes}"
  11             debug="${compile.debug}"
  12 @@ -1198,7 +1198,7 @@
  13
  14    </target>
  15
  16 -  <target name="test-compile" depends="compile,download-test-compile,compile-webapp-examples" >
  17 +  <target name="test-compile" depends="compile,compile-webapp-examples" >
  18      <mkdir dir="${test.classes}"/>
  19      <!-- Compile -->
  20      <javac srcdir="test" destdir="${test.classes}"
  21 @@ -1371,7 +1310,7 @@
  22      </path>
  23    </target>
  24
  25 -  <target name="cobertura-instrument" depends="compile,download-cobertura,cobertura-disabled"
  26 +  <target name="cobertura-instrument" depends="compile,cobertura-disabled"
  27            if="${test.cobertura}"
  28            description="Adds Cobertura instrumentation to the compiled bytecode">
  29
  30 @@ -1430,52 +1369,10 @@
  31      <mkdir dir="${tomcat.extras}/webservices"/>
  32    </target>
  33
  34 -  <target name="extras-commons-logging-prepare"
  35 -          depends="extras-prepare"
  36 -          description="Prepare to build web services extras package">
  37 -
  38 -    <antcall target="downloadfile-2">
  39 -      <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/>
  40 -      <param name="sourcefile.2" value="${commons-logging-src.loc.2}"/>
  41 -      <param name="destfile" value="${commons-logging-src.tar.gz}"/>
  42 -      <param name="destdir" value="${commons-logging.home}"/>
  43 -    </antcall>
  44 -
  45 -    <antcall target="downloadfile">
  46 -      <param name="sourcefile" value="${avalon-framework.loc}"/>
  47 -      <param name="destfile" value="${avalon-framework.jar}"/>
  48 -      <param name="destdir" value="${avalon-framework.home}"/>
  49 -    </antcall>
  50 -
  51 -    <antcall target="downloadfile">
  52 -      <param name="sourcefile" value="${log4j.loc}"/>
  53 -      <param name="destfile" value="${log4j.jar}"/>
  54 -      <param name="destdir" value="${log4j.home}"/>
  55 -    </antcall>
  56 -
  57 -    <antcall target="downloadfile">
  58 -      <param name="sourcefile" value="${logkit.loc}"/>
  59 -      <param name="destfile" value="${logkit.jar}"/>
  60 -      <param name="destdir" value="${logkit.home}"/>
  61 -    </antcall>
  62 -
  63 -    <antcall target="downloadfile">
  64 -      <param name="sourcefile" value="${servletapi.loc}"/>
  65 -      <param name="destfile" value="${servletapi.jar}"/>
  66 -      <param name="destdir" value="${servletapi.home}"/>
  67 -    </antcall>
  68 -
  69 -  </target>
  70 -
  71    <target name="extras-commons-logging"
  72 -          depends="extras-commons-logging-prepare,compile,build-manifests"
  73 +          depends="compile,build-manifests"
  74            description="Build JULI for log4j extras package">
  75
  76 -    <gunzip src="${commons-logging-src.tar.gz}"
  77 -      dest="${tomcat.extras}/logging/commons-logging-src.tar"/>
  78 -    <untar src="${tomcat.extras}/logging/commons-logging-src.tar"
  79 -      dest="${tomcat.extras}/logging/"/>
  80 -
  81      <replace dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/src/main/java/org/apache/commons"
  82          encoding="ISO-8859-1">
  83        <replacefilter token="org.apache.commons"
  84 @@ -1497,7 +1394,8 @@
  85        file="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/build.xml" />
  86
  87      <copy todir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src">
  88 -      <fileset file="${avalon-framework.jar}" />
  89 +      <fileset file="${avalon-framework-api.jar}" />
  90 +      <fileset file="${avalon-framework-impl.jar}" />
  91        <fileset file="${log4j.jar}" />
  92        <fileset file="${logkit.jar}" />
  93        <fileset file="${servletapi.jar}" />
  94 @@ -1577,18 +1475,6 @@
  95            depends="extras-prepare"
  96            description="Prepare to build web services extras package">
  97
  98 -    <antcall target="downloadfile">
  99 -      <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
 100 -      <param name="destfile" value="${jaxrpc-lib.jar}"/>
 101 -      <param name="destdir" value="${jaxrpc-lib.home}"/>
 102 -    </antcall>
 103 -
 104 -    <antcall target="downloadfile">
 105 -      <param name="sourcefile" value="${wsdl4j-lib.loc}"/>
 106 -      <param name="destfile" value="${wsdl4j-lib.jar}"/>
 107 -      <param name="destdir" value="${wsdl4j-lib.home}"/>
 108 -    </antcall>
 109 -
 110      <copy file="${jaxrpc-lib.jar}"
 111            tofile="${tomcat.extras}/webservices/jaxrpc.jar" />
 112      <copy file="${wsdl4j-lib.jar}"
 113 @@ -1694,7 +1580,7 @@
 114
 115    </target>
 116
 117 -  <target name="dist-prepare" depends="download-dist">
 118 +  <target name="dist-prepare">
 119      <mkdir dir="${tomcat.dist}"/>
 120      <mkdir dir="${tomcat.dist}/bin"/>
 121      <mkdir dir="${tomcat.dist}/conf"/>
 122 @@ -1832,13 +1832,6 @@
 123        </fileset>
 124      </copy>
 125
 126 -    <!-- Source bundles for native components -->
 127 -    <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
 128 -            file="${tomcat-native.tar.gz}" />
 129 -    <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
 130 -            file="${commons-daemon.native.src.tgz}" />
 131 -
 132 -    <!-- platform README files -->
 133      <echo append="false" file="${tomcat.dist}/bin/x64/README">
 134  Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
 135      </echo>
 136