diff options
Diffstat (limited to 'www-servers/tomcat/files')
| -rw-r--r-- | www-servers/tomcat/files/tomcat-8.5.39-build.xml.patch | 247 | ||||
| -rw-r--r-- | www-servers/tomcat/files/tomcat-9.0.17-build.xml.patch (renamed from www-servers/tomcat/files/tomcat-9.0.14-build.xml.patch) | 80 |
2 files changed, 287 insertions, 40 deletions
diff --git a/www-servers/tomcat/files/tomcat-8.5.39-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.39-build.xml.patch new file mode 100644 index 000000000000..4b9bc77170a7 --- /dev/null +++ b/www-servers/tomcat/files/tomcat-8.5.39-build.xml.patch @@ -0,0 +1,247 @@ +diff --git a/build.xml b/build.xml +index 8f5f5c5..cebfcfa 100644 +--- a/build.xml ++++ b/build.xml +@@ -722,24 +722,29 @@ + manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> + + <!-- Servlet 3.1 Implementation JAR File --> ++<!-- + <jarIt jarfile="${servlet-api.jar}" + filesDir="${tomcat.classes}" + filesId="files.servlet-api" + manifest="${tomcat.manifests}/servlet-api.jar.manifest" + notice="${tomcat.manifests}/servlet-api.jar.notice" + license="${tomcat.manifests}/servlet-api.jar.license" /> +- ++--> + <!-- JSP 2.3 Implementation JAR File --> ++<!-- + <jarIt jarfile="${jsp-api.jar}" + filesDir="${tomcat.classes}" + filesId="files.jsp-api" + manifest="${tomcat.manifests}/jsp-api.jar.manifest" /> ++--> + + <!-- EL 3.0 Implementation JAR File --> ++<!-- + <jarIt jarfile="${el-api.jar}" + filesDir="${tomcat.classes}" + filesId="files.el-api" + manifest="${tomcat.manifests}/el-api.jar.manifest" /> ++--> + + <!-- WebSocket 1.1 API JAR File --> + <jarIt jarfile="${websocket-api.jar}" +@@ -1025,9 +1030,9 @@ + + <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" + description="Default. Builds a working Tomcat instance"> +- ++<!-- + <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> +- ++--> + <!-- Copy scripts --> + <copy todir="${tomcat.build}/bin"> + <fileset dir="bin"> +@@ -1087,7 +1092,7 @@ + <exclude name="${jdt.jar.filename}"/> + </fileset> + </delete> +- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> ++<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> --> + + <!-- Add sources for examples --> + <antcall target="examples-sources" /> +@@ -1123,7 +1128,7 @@ + </javac> + </target> + +- <target name="build-tomcat-jdbc" depends="package"> ++ <target name="build-tomcat-jdbc" depends="package" unless="noget"> + <!-- build the jdbc-pool jar and source jar--> + <echo message="Building Tomcat JDBC pool libraries"/> + <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" +@@ -1138,7 +1143,7 @@ + <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> + </target> + +- <target name="build-tomcat-jdbc-src"> ++ <target name="build-tomcat-jdbc-src" unless="noget"> + <!-- build the jdbc-pool source jar--> + <echo message="Building Tomcat JDBC pool src JAR"/> + <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" +@@ -1241,9 +1246,11 @@ + + <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> + <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> ++<!-- + <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}" + failonerror="false"/> + <copy file="${jdt.jar}" todir="${tomcat.embed}" /> ++--> + <copy file="${annotations-api.jar}" todir="${tomcat.embed}" /> + + <!-- Note the meta-inf below will work as long as there is only one JAR +@@ -1623,7 +1630,7 @@ + + <target name="extras-webservices-prepare" + depends="extras-prepare" +- description="Prepare to build web services extras package"> ++ description="Prepare to build web services extras package" unless="noget"> + + <antcall target="downloadfile"> + <param name="sourcefile" value="${jaxrpc-lib.loc}"/> +@@ -1787,6 +1794,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. + + <target name="javadoc" depends="dist-source,extras-webservices-prepare" + description="Create the Tomcat javadoc" > ++<!-- + <javadoc packagenames="javax.servlet.*" + excludepackagenames="javax.servlet.jsp.*" + sourcepath="${tomcat.dist}/src/java" +@@ -1851,6 +1859,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. + <path location="${ant.core.lib}"/> + </classpath> + </javadoc> ++--> + <javadoc packagenames="javax.websocket.*" + sourcepath="${tomcat.dist}/src/java" + destdir="${tomcat.dist}/webapps/docs/websocketapi" +@@ -1891,9 +1900,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. + <path refid="tomcat.webservices.classpath"/> + <path location="${ant.core.lib}"/> + </classpath> ++<!-- + <link href="../servletapi"/> + <link href="../jspapi"/> + <link href="../elapi"/> ++--> + <link href="../websocketapi"/> + <link href="http://docs.oracle.com/javase/7/docs/api/"/> + <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/> +@@ -2617,7 +2628,7 @@ skip.installer property in build.properties" /> + </target> + + <target name="download-compile" +- description="Download components necessary to compile" > ++ description="Download components necessary to compile" unless="noget" > + + <!-- Download Commons Daemon --> + <antcall target="downloadgz-2"> +@@ -2643,7 +2654,7 @@ skip.installer property in build.properties" /> + </target> + + <target name="download-test-compile" +- description="Download additional components for the tests" > ++ description="Download additional components for the tests" unless="noget"> + + <antcall target="downloadfile"> + <param name="sourcefile" value="${junit.loc}"/> +@@ -2721,7 +2732,7 @@ skip.installer property in build.properties" /> + </target> + + <target name="download-dist" +- description="Download additional components for a distribution" > ++ description="Download additional components for a distribution" unless="noget"> + + <antcall target="downloadfile-2"> + <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> +@@ -2776,13 +2787,13 @@ skip.installer property in build.properties" /> + + <!-- =============== Utility Targets to support downloads ================ --> + +- <target name="setproxy" if="${proxy.use}"> ++ <target name="setproxy" if="${proxy.use}" unless="noget"> + <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" + proxyuser="${proxy.user}" proxypassword="${proxy.password}" /> + <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> + </target> + +- <target name="testexist"> ++ <target name="testexist" unless="noget"> + <echo message="Testing for ${destfile}"/> + <available file="${destfile}" property="exist"/> + </target> +@@ -2904,7 +2915,7 @@ skip.installer property in build.properties" /> + </sequential> + </macrodef> + +- <target name="downloadgz" unless="exist" depends="testexist,setproxy"> ++ <target name="downloadgz" unless="noget" depends="testexist,setproxy"> + <!-- Download and extract the package --> + <local name="temp.file"/> + <mkdir dir="${base.path}"/> +@@ -2921,7 +2932,7 @@ skip.installer property in build.properties" /> + <delete file="${temp.file}.tar.gz"/> + </target> + +- <target name="downloadgz-2" unless="exist" depends="testexist"> ++ <target name="downloadgz-2" unless="noget" depends="testexist"> + <!-- Download and extract the package from the two alternative locations --> + <local name="temp.file"/> + <mkdir dir="${base.path}"/> +@@ -2946,7 +2957,7 @@ skip.installer property in build.properties" /> + <delete file="${temp.file}.tar.gz"/> + </target> + +- <target name="downloadzip" unless="exist" depends="testexist,setproxy"> ++ <target name="downloadzip" unless="noget" depends="testexist,setproxy"> + <!-- Download and extract the package --> + <local name="temp.file"/> + <mkdir dir="${base.path}"/> +@@ -2962,7 +2973,7 @@ skip.installer property in build.properties" /> + <delete file="${temp.file}"/> + </target> + +- <target name="downloadzip-2" unless="exist" depends="testexist"> ++ <target name="downloadzip-2" unless="noget" depends="testexist"> + <!-- Download and extract the package from the two alternative locations --> + <local name="temp.file"/> + <mkdir dir="${base.path}"/> +@@ -2986,7 +2997,7 @@ skip.installer property in build.properties" /> + <delete file="${temp.file}"/> + </target> + +- <target name="downloadfile" unless="exist" depends="testexist,setproxy"> ++ <target name="downloadfile" unless="noget" depends="testexist,setproxy"> + <!-- Download the file --> + <local name="temp.file"/> + <mkdir dir="${base.path}"/> +@@ -3001,7 +3012,7 @@ skip.installer property in build.properties" /> + <move file="${temp.file}" tofile="${destfile}"/> + </target> + +- <target name="downloadfile-2" unless="exist" depends="testexist"> ++ <target name="downloadfile-2" unless="noget" depends="testexist"> + <!-- Download the file from the two alternative locations --> + <local name="temp.file"/> + <mkdir dir="${base.path}"/> +@@ -3029,7 +3040,7 @@ skip.installer property in build.properties" /> + <move file="${temp.file}" tofile="${destfile}"/> + </target> + +- <target name="trydownload.check" depends="setproxy"> ++ <target name="trydownload.check" depends="setproxy" unless="noget"> + <condition property="trydownload.run"> + <and> + <not> +@@ -3040,7 +3051,7 @@ skip.installer property in build.properties" /> + </condition> + </target> + +- <target name="trydownload" if="trydownload.run" depends="trydownload.check"> ++ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget"> + <!-- Downloads a file if not yet downloaded and the source URL is available --> + <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" /> + </target> +@@ -3051,7 +3062,7 @@ skip.installer property in build.properties" /> + + <target name="ide-eclipse" + depends="download-compile, extras-webservices-prepare, download-test-compile" +- description="Prepares the source tree to be built in Eclipse"> ++ description="Prepares the source tree to be built in Eclipse" unless="noget"> + + <!-- Copy the sample project files into the root directory --> + <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/> diff --git a/www-servers/tomcat/files/tomcat-9.0.14-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.17-build.xml.patch index c3f3e71c0ebf..b86841762a09 100644 --- a/www-servers/tomcat/files/tomcat-9.0.14-build.xml.patch +++ b/www-servers/tomcat/files/tomcat-9.0.17-build.xml.patch @@ -1,8 +1,8 @@ diff --git a/build.xml b/build.xml -index 971f912..1e43ae0 100644 +index 54507d1..9c0bf6d 100644 --- a/build.xml +++ b/build.xml -@@ -769,6 +769,7 @@ +@@ -742,6 +742,7 @@ addOSGi="true" /> <!-- Servlet 4.0 Implementation JAR File --> @@ -10,7 +10,7 @@ index 971f912..1e43ae0 100644 <jarIt jarfile="${servlet-api.jar}" filesDir="${tomcat.classes}" filesId="files.servlet-api" -@@ -776,21 +777,23 @@ +@@ -749,21 +750,23 @@ notice="${tomcat.manifests}/servlet-api.jar.notice" license="${tomcat.manifests}/servlet-api.jar.license" addOSGi="true" /> @@ -37,7 +37,7 @@ index 971f912..1e43ae0 100644 <!-- WebSocket 1.1 API JAR File --> <jarIt jarfile="${websocket-api.jar}" filesDir="${tomcat.classes}" -@@ -1131,9 +1134,9 @@ +@@ -1114,9 +1117,9 @@ <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" description="Default. Builds a working Tomcat instance"> @@ -49,7 +49,7 @@ index 971f912..1e43ae0 100644 <!-- Copy scripts --> <copy todir="${tomcat.build}/bin"> <fileset dir="bin"> -@@ -1193,7 +1196,7 @@ +@@ -1176,7 +1179,7 @@ <exclude name="${jdt.jar.filename}"/> </fileset> </delete> @@ -58,7 +58,7 @@ index 971f912..1e43ae0 100644 <!-- Add sources for examples --> <antcall target="examples-sources" /> -@@ -1229,7 +1232,7 @@ +@@ -1212,7 +1215,7 @@ </javac> </target> @@ -67,7 +67,7 @@ index 971f912..1e43ae0 100644 <!-- build the jdbc-pool jar and source jar--> <echo message="Building Tomcat JDBC pool libraries"/> <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" -@@ -1244,7 +1247,7 @@ +@@ -1227,7 +1230,7 @@ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> </target> @@ -76,7 +76,7 @@ index 971f912..1e43ae0 100644 <!-- build the jdbc-pool source jar--> <echo message="Building Tomcat JDBC pool src JAR"/> <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" -@@ -1348,9 +1351,11 @@ +@@ -1330,9 +1333,11 @@ <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> @@ -88,16 +88,7 @@ index 971f912..1e43ae0 100644 <copy file="${annotations-api.jar}" todir="${tomcat.embed}" /> <!-- Note the meta-inf below will work as long as there is only one JAR -@@ -1734,7 +1739,7 @@ - - <target name="extras-webservices-prepare" - depends="extras-prepare" -- description="Prepare to build web services extras package"> -+ description="Prepare to build web services extras package" unless="noget"> - - <antcall target="downloadfile"> - <param name="sourcefile" value="${jaxrpc-lib.loc}"/> -@@ -1884,11 +1889,12 @@ +@@ -1785,11 +1790,12 @@ </copy> <!-- Source bundles for native components --> @@ -111,15 +102,15 @@ index 971f912..1e43ae0 100644 <!-- platform README files --> <echo append="false" file="${tomcat.dist}/bin/x64/README"> Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. -@@ -1898,6 +1904,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. +@@ -1799,6 +1805,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - <target name="javadoc" depends="dist-source,extras-webservices-prepare" + <target name="javadoc" depends="dist-source" description="Create the Tomcat javadoc" > +<!-- <javadoc packagenames="javax.servlet.*" excludepackagenames="javax.servlet.jsp.*" sourcepath="${tomcat.dist}/src/java" -@@ -1962,6 +1969,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. +@@ -1860,6 +1867,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. <path location="${ant.core.lib}"/> </classpath> </javadoc> @@ -127,8 +118,8 @@ index 971f912..1e43ae0 100644 <javadoc packagenames="javax.websocket.*" sourcepath="${tomcat.dist}/src/java" destdir="${tomcat.dist}/webapps/docs/websocketapi" -@@ -2002,9 +2010,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - <path refid="tomcat.webservices.classpath"/> +@@ -1898,9 +1906,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. + <path refid="compile.classpath"/> <path location="${ant.core.lib}"/> </classpath> +<!-- @@ -139,17 +130,17 @@ index 971f912..1e43ae0 100644 <link href="../websocketapi"/> <link href="http://docs.oracle.com/javase/8/docs/api/"/> <link href="https://commons.apache.org/proper/commons-io/javadocs/api-release/"/> -@@ -2727,7 +2737,7 @@ skip.installer property in build.properties" /> +@@ -2616,7 +2626,7 @@ skip.installer property in build.properties" /> </target> <target name="download-compile" -- description="Download (and build) components necessary to compile" > -+ description="Download (and build) components necessary to compile" unless="noget"> +- description="Download components necessary to compile" > ++ description="Download components necessary to compile" unless="noget" > <!-- Download Commons Daemon --> <antcall target="downloadgz-2"> -@@ -2763,7 +2773,7 @@ skip.installer property in build.properties" /> - </target> +@@ -2671,7 +2681,7 @@ skip.installer property in build.properties" /> + </target> <target name="download-test-compile" - description="Download additional components for the tests" > @@ -157,7 +148,7 @@ index 971f912..1e43ae0 100644 <antcall target="downloadfile"> <param name="sourcefile" value="${junit.loc}"/> -@@ -2841,7 +2851,7 @@ skip.installer property in build.properties" /> +@@ -2749,7 +2759,7 @@ skip.installer property in build.properties" /> </target> <target name="download-dist" @@ -166,7 +157,7 @@ index 971f912..1e43ae0 100644 <antcall target="downloadfile-2"> <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> -@@ -2896,13 +2906,13 @@ skip.installer property in build.properties" /> +@@ -2804,13 +2814,13 @@ skip.installer property in build.properties" /> <!-- =============== Utility Targets to support downloads ================ --> @@ -182,7 +173,7 @@ index 971f912..1e43ae0 100644 <echo message="Testing for ${destfile}"/> <available file="${destfile}" property="exist"/> </target> -@@ -3024,7 +3034,7 @@ skip.installer property in build.properties" /> +@@ -2932,7 +2942,7 @@ skip.installer property in build.properties" /> </sequential> </macrodef> @@ -191,7 +182,7 @@ index 971f912..1e43ae0 100644 <!-- Download and extract the package --> <local name="temp.file"/> <mkdir dir="${base.path}"/> -@@ -3041,7 +3051,7 @@ skip.installer property in build.properties" /> +@@ -2949,7 +2959,7 @@ skip.installer property in build.properties" /> <delete file="${temp.file}.tar.gz"/> </target> @@ -200,7 +191,7 @@ index 971f912..1e43ae0 100644 <!-- Download and extract the package from the two alternative locations --> <local name="temp.file"/> <mkdir dir="${base.path}"/> -@@ -3066,7 +3076,7 @@ skip.installer property in build.properties" /> +@@ -2974,7 +2984,7 @@ skip.installer property in build.properties" /> <delete file="${temp.file}.tar.gz"/> </target> @@ -209,7 +200,7 @@ index 971f912..1e43ae0 100644 <!-- Download and extract the package --> <local name="temp.file"/> <mkdir dir="${base.path}"/> -@@ -3082,7 +3092,7 @@ skip.installer property in build.properties" /> +@@ -2990,7 +3000,7 @@ skip.installer property in build.properties" /> <delete file="${temp.file}"/> </target> @@ -218,7 +209,7 @@ index 971f912..1e43ae0 100644 <!-- Download and extract the package from the two alternative locations --> <local name="temp.file"/> <mkdir dir="${base.path}"/> -@@ -3106,7 +3116,7 @@ skip.installer property in build.properties" /> +@@ -3014,7 +3024,7 @@ skip.installer property in build.properties" /> <delete file="${temp.file}"/> </target> @@ -227,7 +218,7 @@ index 971f912..1e43ae0 100644 <!-- Download the file --> <local name="temp.file"/> <mkdir dir="${base.path}"/> -@@ -3121,7 +3131,7 @@ skip.installer property in build.properties" /> +@@ -3029,7 +3039,7 @@ skip.installer property in build.properties" /> <move file="${temp.file}" tofile="${destfile}"/> </target> @@ -236,7 +227,7 @@ index 971f912..1e43ae0 100644 <!-- Download the file from the two alternative locations --> <local name="temp.file"/> <mkdir dir="${base.path}"/> -@@ -3149,7 +3159,7 @@ skip.installer property in build.properties" /> +@@ -3057,7 +3067,7 @@ skip.installer property in build.properties" /> <move file="${temp.file}" tofile="${destfile}"/> </target> @@ -245,7 +236,7 @@ index 971f912..1e43ae0 100644 <condition property="trydownload.run"> <and> <not> -@@ -3160,7 +3170,7 @@ skip.installer property in build.properties" /> +@@ -3068,7 +3078,7 @@ skip.installer property in build.properties" /> </condition> </target> @@ -254,12 +245,21 @@ index 971f912..1e43ae0 100644 <!-- Downloads a file if not yet downloaded and the source URL is available --> <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" /> </target> -@@ -3171,7 +3181,7 @@ skip.installer property in build.properties" /> +@@ -3079,7 +3089,7 @@ skip.installer property in build.properties" /> <target name="ide-eclipse" - depends="download-compile, extras-webservices-prepare, download-test-compile" + depends="download-compile, download-test-compile" - description="Prepares the source tree to be built in Eclipse"> + description="Prepares the source tree to be built in Eclipse" unless="noget"> <!-- Copy the sample project files into the root directory --> <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/> +@@ -3097,7 +3107,7 @@ Read the Building page on the Apache Tomcat documentation site for details on ho + + <target name="ide-intellij" + depends="download-compile, download-test-compile" +- description="Creates project directory .idea for IntelliJ IDEA"> ++ description="Creates project directory .idea for IntelliJ IDEA" unless="noget"> + + <copy todir="${tomcat.home}/.idea"> + <fileset dir="${tomcat.home}/res/ide-support/idea"/> |