diff options
Diffstat (limited to 'www-servers/tomcat/files')
5 files changed, 0 insertions, 377 deletions
diff --git a/www-servers/tomcat/files/tomcat-6.0.37-build.xml.patch b/www-servers/tomcat/files/tomcat-6.0.37-build.xml.patch deleted file mode 100644 index 6517dee4d196..000000000000 --- a/www-servers/tomcat/files/tomcat-6.0.37-build.xml.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- build.xml.orig 2012-07-06 20:26:21.361299240 +0200 -+++ build.xml 2012-07-06 20:26:56.085899911 +0200 -@@ -487,12 +487,14 @@ - - <target name="deploy" depends="build-only,build-docs,warn.dbcp"> - -+<!-- - <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" - file="${tomcat-native.tar.gz}" /> - <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz" - file="${commons-daemon.native.src.tgz}" /> - - <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> -+--> - - <!-- Copy scripts --> - <copy todir="${tomcat.build}/bin"> ---- build.xml.orig 2012-07-06 20:31:31.387806167 +0200 -+++ build.xml 2012-07-06 20:32:33.185315885 +0200 -@@ -646,9 +646,11 @@ - </fileset> - </txt2html> - -+<!-- - <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib" - failonerror="false"/> - <copy file="${jdt.jar}" todir="${tomcat.build}/lib" /> -+--> - - </target> - diff --git a/www-servers/tomcat/files/tomcat-6.0.39-build.xml.patch b/www-servers/tomcat/files/tomcat-6.0.39-build.xml.patch deleted file mode 100644 index 6517dee4d196..000000000000 --- a/www-servers/tomcat/files/tomcat-6.0.39-build.xml.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- build.xml.orig 2012-07-06 20:26:21.361299240 +0200 -+++ build.xml 2012-07-06 20:26:56.085899911 +0200 -@@ -487,12 +487,14 @@ - - <target name="deploy" depends="build-only,build-docs,warn.dbcp"> - -+<!-- - <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" - file="${tomcat-native.tar.gz}" /> - <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz" - file="${commons-daemon.native.src.tgz}" /> - - <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> -+--> - - <!-- Copy scripts --> - <copy todir="${tomcat.build}/bin"> ---- build.xml.orig 2012-07-06 20:31:31.387806167 +0200 -+++ build.xml 2012-07-06 20:32:33.185315885 +0200 -@@ -646,9 +646,11 @@ - </fileset> - </txt2html> - -+<!-- - <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib" - failonerror="false"/> - <copy file="${jdt.jar}" todir="${tomcat.build}/lib" /> -+--> - - </target> - diff --git a/www-servers/tomcat/files/tomcat-7.0.42-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.42-build.xml.patch deleted file mode 100644 index 9b07137451aa..000000000000 --- a/www-servers/tomcat/files/tomcat-7.0.42-build.xml.patch +++ /dev/null @@ -1,105 +0,0 @@ -diff --git a/build.xml b/build.xml -index 3ff8f81..83357a4 100644 ---- a/build.xml -+++ b/build.xml -@@ -613,7 +614,8 @@ - filesId="files.annotations-api" - manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> - -- <!-- Servlet 3.0 Implementation JAR File --> -+<!-- -+ Servlet 3.0 Implementation JAR File - <jarIt jarfile="${servlet-api.jar}" - filesDir="${tomcat.classes}" - filesId="files.servlet-api" -@@ -621,7 +623,7 @@ - notice="${tomcat.manifests}/servlet-api.jar.notice" - license="${tomcat.manifests}/servlet-api.jar.license" /> - -- <!-- JSP 2.2 Implementation JAR File --> -+ JSP 2.2 Implementation JAR File - <jarIt jarfile="${jsp-api.jar}" - filesDir="${tomcat.classes}" - filesId="files.jsp-api" -@@ -629,11 +631,12 @@ - notice="${tomcat.manifests}/jsp-api.jar.notice" - license="${tomcat.manifests}/jsp-api.jar.license" /> - -- <!-- JSP 2.2 EL Implementation JAR File --> -+ JSP 2.2 EL Implementation JAR File - <jarIt jarfile="${el-api.jar}" - filesDir="${tomcat.classes}" - filesId="files.el-api" - manifest="${tomcat.manifests}/el-api.jar.manifest" /> -+--> - - <!-- Bootstrap JAR File --> - <jarIt jarfile="${bootstrap.jar}" -@@ -834,13 +837,14 @@ - <target name="deploy" depends="package,build-docs" - description="Default. Builds a working Tomcat instance"> - -+<!-- - <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" - file="${tomcat-native.tar.gz}" /> - <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz" - file="${commons-daemon.native.src.tgz}" /> - - <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> -- -+--> - <!-- Copy scripts --> - <copy todir="${tomcat.build}/bin"> - <fileset dir="bin"> -@@ -918,9 +922,11 @@ - <!-- Add sources for examples --> - <antcall target="examples-sources" /> - -+<!-- - <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib" - failonerror="false"/> - <copy file="${jdt.jar}" todir="${tomcat.build}/lib" /> -+--> - - <!-- build the jdbc-pool jar and source jar--> - <echo message="Building Tomcat JDBC pool libraries"/> -@@ -1355,7 +1361,8 @@ - - <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}"/> -@@ -2278,7 +2285,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - </target> - - <target name="download-compile" -- description="Download (and build) components necessary to compile" > -+ description="Download (and build) components necessary to compile" -+ unless="noget"> - - <antcall target="downloadfile-2"> - <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> -@@ -2335,7 +2343,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - </target> - - <target name="download-test-compile" -- description="Download additional components for the tests" > -+ description="Download additional components for the tests" -+ unless="noget"> - - <antcall target="downloadzip"> - <param name="sourcefile" value="${junit.loc}"/> -@@ -2346,7 +2355,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - </target> - - <target name="download-dist" -- description="Download additional components for a distribution" > -+ description="Download additional components for a distribution" -+ unless="noget"> - - <antcall target="downloadzip-2"> - <param name="sourcefile.1" value="${tomcat-native.win.1}"/> diff --git a/www-servers/tomcat/files/tomcat-7.0.47-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.47-build.xml.patch deleted file mode 100644 index 9b07137451aa..000000000000 --- a/www-servers/tomcat/files/tomcat-7.0.47-build.xml.patch +++ /dev/null @@ -1,105 +0,0 @@ -diff --git a/build.xml b/build.xml -index 3ff8f81..83357a4 100644 ---- a/build.xml -+++ b/build.xml -@@ -613,7 +614,8 @@ - filesId="files.annotations-api" - manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> - -- <!-- Servlet 3.0 Implementation JAR File --> -+<!-- -+ Servlet 3.0 Implementation JAR File - <jarIt jarfile="${servlet-api.jar}" - filesDir="${tomcat.classes}" - filesId="files.servlet-api" -@@ -621,7 +623,7 @@ - notice="${tomcat.manifests}/servlet-api.jar.notice" - license="${tomcat.manifests}/servlet-api.jar.license" /> - -- <!-- JSP 2.2 Implementation JAR File --> -+ JSP 2.2 Implementation JAR File - <jarIt jarfile="${jsp-api.jar}" - filesDir="${tomcat.classes}" - filesId="files.jsp-api" -@@ -629,11 +631,12 @@ - notice="${tomcat.manifests}/jsp-api.jar.notice" - license="${tomcat.manifests}/jsp-api.jar.license" /> - -- <!-- JSP 2.2 EL Implementation JAR File --> -+ JSP 2.2 EL Implementation JAR File - <jarIt jarfile="${el-api.jar}" - filesDir="${tomcat.classes}" - filesId="files.el-api" - manifest="${tomcat.manifests}/el-api.jar.manifest" /> -+--> - - <!-- Bootstrap JAR File --> - <jarIt jarfile="${bootstrap.jar}" -@@ -834,13 +837,14 @@ - <target name="deploy" depends="package,build-docs" - description="Default. Builds a working Tomcat instance"> - -+<!-- - <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" - file="${tomcat-native.tar.gz}" /> - <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz" - file="${commons-daemon.native.src.tgz}" /> - - <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> -- -+--> - <!-- Copy scripts --> - <copy todir="${tomcat.build}/bin"> - <fileset dir="bin"> -@@ -918,9 +922,11 @@ - <!-- Add sources for examples --> - <antcall target="examples-sources" /> - -+<!-- - <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib" - failonerror="false"/> - <copy file="${jdt.jar}" todir="${tomcat.build}/lib" /> -+--> - - <!-- build the jdbc-pool jar and source jar--> - <echo message="Building Tomcat JDBC pool libraries"/> -@@ -1355,7 +1361,8 @@ - - <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}"/> -@@ -2278,7 +2285,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - </target> - - <target name="download-compile" -- description="Download (and build) components necessary to compile" > -+ description="Download (and build) components necessary to compile" -+ unless="noget"> - - <antcall target="downloadfile-2"> - <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> -@@ -2335,7 +2343,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - </target> - - <target name="download-test-compile" -- description="Download additional components for the tests" > -+ description="Download additional components for the tests" -+ unless="noget"> - - <antcall target="downloadzip"> - <param name="sourcefile" value="${junit.loc}"/> -@@ -2346,7 +2355,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - </target> - - <target name="download-dist" -- description="Download additional components for a distribution" > -+ description="Download additional components for a distribution" -+ unless="noget"> - - <antcall target="downloadzip-2"> - <param name="sourcefile.1" value="${tomcat-native.win.1}"/> diff --git a/www-servers/tomcat/files/tomcat-7.0.52-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.52-build.xml.patch deleted file mode 100644 index 9b07137451aa..000000000000 --- a/www-servers/tomcat/files/tomcat-7.0.52-build.xml.patch +++ /dev/null @@ -1,105 +0,0 @@ -diff --git a/build.xml b/build.xml -index 3ff8f81..83357a4 100644 ---- a/build.xml -+++ b/build.xml -@@ -613,7 +614,8 @@ - filesId="files.annotations-api" - manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> - -- <!-- Servlet 3.0 Implementation JAR File --> -+<!-- -+ Servlet 3.0 Implementation JAR File - <jarIt jarfile="${servlet-api.jar}" - filesDir="${tomcat.classes}" - filesId="files.servlet-api" -@@ -621,7 +623,7 @@ - notice="${tomcat.manifests}/servlet-api.jar.notice" - license="${tomcat.manifests}/servlet-api.jar.license" /> - -- <!-- JSP 2.2 Implementation JAR File --> -+ JSP 2.2 Implementation JAR File - <jarIt jarfile="${jsp-api.jar}" - filesDir="${tomcat.classes}" - filesId="files.jsp-api" -@@ -629,11 +631,12 @@ - notice="${tomcat.manifests}/jsp-api.jar.notice" - license="${tomcat.manifests}/jsp-api.jar.license" /> - -- <!-- JSP 2.2 EL Implementation JAR File --> -+ JSP 2.2 EL Implementation JAR File - <jarIt jarfile="${el-api.jar}" - filesDir="${tomcat.classes}" - filesId="files.el-api" - manifest="${tomcat.manifests}/el-api.jar.manifest" /> -+--> - - <!-- Bootstrap JAR File --> - <jarIt jarfile="${bootstrap.jar}" -@@ -834,13 +837,14 @@ - <target name="deploy" depends="package,build-docs" - description="Default. Builds a working Tomcat instance"> - -+<!-- - <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" - file="${tomcat-native.tar.gz}" /> - <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz" - file="${commons-daemon.native.src.tgz}" /> - - <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> -- -+--> - <!-- Copy scripts --> - <copy todir="${tomcat.build}/bin"> - <fileset dir="bin"> -@@ -918,9 +922,11 @@ - <!-- Add sources for examples --> - <antcall target="examples-sources" /> - -+<!-- - <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib" - failonerror="false"/> - <copy file="${jdt.jar}" todir="${tomcat.build}/lib" /> -+--> - - <!-- build the jdbc-pool jar and source jar--> - <echo message="Building Tomcat JDBC pool libraries"/> -@@ -1355,7 +1361,8 @@ - - <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}"/> -@@ -2278,7 +2285,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - </target> - - <target name="download-compile" -- description="Download (and build) components necessary to compile" > -+ description="Download (and build) components necessary to compile" -+ unless="noget"> - - <antcall target="downloadfile-2"> - <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> -@@ -2335,7 +2343,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - </target> - - <target name="download-test-compile" -- description="Download additional components for the tests" > -+ description="Download additional components for the tests" -+ unless="noget"> - - <antcall target="downloadzip"> - <param name="sourcefile" value="${junit.loc}"/> -@@ -2346,7 +2355,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - </target> - - <target name="download-dist" -- description="Download additional components for a distribution" > -+ description="Download additional components for a distribution" -+ unless="noget"> - - <antcall target="downloadzip-2"> - <param name="sourcefile.1" value="${tomcat-native.win.1}"/> |