tomcat-build.xml.patch

   1 --- apache-tomcat-7.0.52-src/build.xml.orig     2014-02-13 08:40:56.000000000 +0100
   2 +++ apache-tomcat-7.0.52-src/build.xml  2014-02-28 11:21:53.676705236 +0100
   3 @@ -482,60 +482,6 @@
   4
   5    </target>
   6
   7 -  <target name="validate" if="${execute.validate}"
   8 -    depends="build-prepare,compile-prepare,download-validate"
   9 -    description="Uses Checkstyle tool to perform style check for the source code">
  10 -    <!-- Required so we can cache checkstyle results -->
  11 -    <mkdir dir="${tomcat.output}/res/checkstyle"/>
  12 -
  13 -    <taskdef resource="checkstyletask.properties"
  14 -             classpath="${checkstyle.jar}" />
  15 -    <checkstyle config="res/checkstyle/checkstyle.xml">
  16 -      <fileset dir="." >
  17 -        <patternset refid="text.files" />
  18 -        <include name="**/*.bat"/>
  19 -        <include name="**/*.sh"/>
  20 -        <exclude name="bin/setenv.*"/>
  21 -        <exclude name=".*/**"/>
  22 -        <exclude name="output/**"/>
  23 -        <exclude name="modules/**"/>
  24 -        <exclude name="**/*.mdl"/>
  25 -        <exclude name="**/*_2.xml"/>
  26 -        <exclude name="res/checkstyle/header-al2.txt"/>
  27 -        <!-- Exclude auto-generated files -->
  28 -        <exclude name="java/org/apache/el/parser/ELParser*.java" />
  29 -        <exclude name="java/org/apache/el/parser/Node.java" />
  30 -        <exclude name="java/org/apache/**/parser/JJT*ParserState.java" />
  31 -        <exclude name="java/org/apache/**/parser/ParseException.java" />
  32 -        <exclude name="java/org/apache/**/parser/SimpleCharStream.java" />
  33 -        <exclude name="java/org/apache/**/parser/Token*.java" />
  34 -        <!-- Exclude these else Gump runs validate on them -->
  35 -        <exclude name="**/org/apache/tomcat/dbcp/**"/>
  36 -        <exclude name="**/tomcat-deps/**"/>
  37 -        <!-- Exclude simple test files -->
  38 -        <exclude name="test/webapp-3.0/bug53257/**/*.txt"/>
  39 -        <exclude name="test/webapp-3.0-fragments/WEB-INF/classes/*.txt"/>
  40 -      </fileset>
  41 -      <fileset dir="modules/jdbc-pool" >
  42 -        <exclude name=".*/**"/>
  43 -        <exclude name="**/MANIFEST.MF"/>
  44 -        <patternset refid="text.files" />
  45 -      </fileset>
  46 -    </checkstyle>
  47 -    <!-- javax package checks -->
  48 -    <checkstyle config="res/checkstyle/javax-checkstyle.xml">
  49 -      <fileset dir="java/javax" >
  50 -        <include name="**/*.java"/>
  51 -      </fileset>
  52 -    </checkstyle>
  53 -    <!-- org package checks -->
  54 -    <checkstyle config="res/checkstyle/org-checkstyle.xml">
  55 -      <fileset dir="java/org" >
  56 -        <include name="**/*.java"/>
  57 -      </fileset>
  58 -    </checkstyle>
  59 -  </target>
  60 -
  61    <target name="validate-eoln" depends="build-prepare,compile-prepare"
  62      description="Validate that the source files have correct line ends">
  63
  64 @@ -595,7 +541,7 @@
  65    <target name="compile" depends="compile-java6,compile-java7" />
  66
  67    <target name="compile-java6"
  68 -          depends="build-prepare,download-compile,compile-prepare,validate">
  69 +          depends="build-prepare">
  70      <!-- Compile internal server components -->
  71      <javac srcdir="java" destdir="${tomcat.classes}"
  72             debug="${compile.debug}"
  73 @@ -937,13 +883,6 @@
  74    <target name="deploy" depends="package,build-docs"
  75            description="Default. Builds a working Tomcat instance">
  76
  77 -    <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
  78 -            file="${tomcat-native.tar.gz}" />
  79 -    <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
  80 -            file="${commons-daemon.native.src.tgz}" />
  81 -
  82 -    <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
  83 -
  84      <!-- Copy scripts -->
  85      <copy todir="${tomcat.build}/bin">
  86        <fileset dir="bin">
  87 @@ -1198,7 +1198,7 @@
  88
  89    </target>
  90
  91 -  <target name="test-compile" depends="compile,download-test-compile,compile-webapp-examples" >
  92 +  <target name="test-compile" depends="compile,compile-webapp-examples" >
  93      <mkdir dir="${test.classes}"/>
  94      <!-- Compile -->
  95      <javac srcdir="test" destdir="${test.classes}"
  96 @@ -1371,7 +1310,7 @@
  97      </path>
  98    </target>
  99
 100 -  <target name="cobertura-instrument" depends="compile,download-cobertura,cobertura-disabled"
 101 +  <target name="cobertura-instrument" depends="compile,cobertura-disabled"
 102            if="${test.cobertura}"
 103            description="Adds Cobertura instrumentation to the compiled bytecode">
 104
 105 @@ -1430,52 +1369,10 @@
 106      <mkdir dir="${tomcat.extras}/webservices"/>
 107    </target>
 108
 109 -  <target name="extras-commons-logging-prepare"
 110 -          depends="extras-prepare"
 111 -          description="Prepare to build web services extras package">
 112 -
 113 -    <antcall target="downloadfile-2">
 114 -      <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/>
 115 -      <param name="sourcefile.2" value="${commons-logging-src.loc.2}"/>
 116 -      <param name="destfile" value="${commons-logging-src.tar.gz}"/>
 117 -      <param name="destdir" value="${commons-logging.home}"/>
 118 -    </antcall>
 119 -
 120 -    <antcall target="downloadfile">
 121 -      <param name="sourcefile" value="${avalon-framework.loc}"/>
 122 -      <param name="destfile" value="${avalon-framework.jar}"/>
 123 -      <param name="destdir" value="${avalon-framework.home}"/>
 124 -    </antcall>
 125 -
 126 -    <antcall target="downloadfile">
 127 -      <param name="sourcefile" value="${log4j.loc}"/>
 128 -      <param name="destfile" value="${log4j.jar}"/>
 129 -      <param name="destdir" value="${log4j.home}"/>
 130 -    </antcall>
 131 -
 132 -    <antcall target="downloadfile">
 133 -      <param name="sourcefile" value="${logkit.loc}"/>
 134 -      <param name="destfile" value="${logkit.jar}"/>
 135 -      <param name="destdir" value="${logkit.home}"/>
 136 -    </antcall>
 137 -
 138 -    <antcall target="downloadfile">
 139 -      <param name="sourcefile" value="${servletapi.loc}"/>
 140 -      <param name="destfile" value="${servletapi.jar}"/>
 141 -      <param name="destdir" value="${servletapi.home}"/>
 142 -    </antcall>
 143 -
 144 -  </target>
 145 -
 146    <target name="extras-commons-logging"
 147 -          depends="extras-commons-logging-prepare,compile,build-manifests"
 148 +          depends="compile,build-manifests"
 149            description="Build JULI for log4j extras package">
 150
 151 -    <gunzip src="${commons-logging-src.tar.gz}"
 152 -      dest="${tomcat.extras}/logging/commons-logging-src.tar"/>
 153 -    <untar src="${tomcat.extras}/logging/commons-logging-src.tar"
 154 -      dest="${tomcat.extras}/logging/"/>
 155 -
 156      <replace dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/src/main/java/org/apache/commons"
 157          encoding="ISO-8859-1">
 158        <replacefilter token="org.apache.commons"
 159 @@ -1497,7 +1394,8 @@
 160        file="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/build.xml" />
 161
 162      <copy todir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src">
 163 -      <fileset file="${avalon-framework.jar}" />
 164 +      <fileset file="${avalon-framework-api.jar}" />
 165 +      <fileset file="${avalon-framework-impl.jar}" />
 166        <fileset file="${log4j.jar}" />
 167        <fileset file="${logkit.jar}" />
 168        <fileset file="${servletapi.jar}" />
 169 @@ -1577,18 +1475,6 @@
 170            depends="extras-prepare"
 171            description="Prepare to build web services extras package">
 172
 173 -    <antcall target="downloadfile">
 174 -      <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
 175 -      <param name="destfile" value="${jaxrpc-lib.jar}"/>
 176 -      <param name="destdir" value="${jaxrpc-lib.home}"/>
 177 -    </antcall>
 178 -
 179 -    <antcall target="downloadfile">
 180 -      <param name="sourcefile" value="${wsdl4j-lib.loc}"/>
 181 -      <param name="destfile" value="${wsdl4j-lib.jar}"/>
 182 -      <param name="destdir" value="${wsdl4j-lib.home}"/>
 183 -    </antcall>
 184 -
 185      <copy file="${jaxrpc-lib.jar}"
 186            tofile="${tomcat.extras}/webservices/jaxrpc.jar" />
 187      <copy file="${wsdl4j-lib.jar}"
 188 @@ -1694,7 +1580,7 @@
 189
 190    </target>
 191
 192 -  <target name="dist-prepare" depends="download-dist">
 193 +  <target name="dist-prepare">
 194      <mkdir dir="${tomcat.dist}"/>
 195      <mkdir dir="${tomcat.dist}/bin"/>
 196      <mkdir dir="${tomcat.dist}/conf"/>