summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'www-servers/tomcat/files/5.5.17/tomcatbuild-xml.patch')
-rw-r--r--www-servers/tomcat/files/5.5.17/tomcatbuild-xml.patch148
1 files changed, 148 insertions, 0 deletions
diff --git a/www-servers/tomcat/files/5.5.17/tomcatbuild-xml.patch b/www-servers/tomcat/files/5.5.17/tomcatbuild-xml.patch
new file mode 100644
index 000000000000..73f56dad7742
--- /dev/null
+++ b/www-servers/tomcat/files/5.5.17/tomcatbuild-xml.patch
@@ -0,0 +1,148 @@
+--- apache-tomcat-5.5.15-src/build/build.xml 2006-01-03 10:15:03.000000000 -0500
++++ build/build.xml 2006-01-28 13:12:39.000000000 -0500
+@@ -140,6 +140,7 @@
+
+ <!-- ====================== DEPLOY: Copy Static Files =================== -->
+ <target name="deploy-static" depends="init">
++ <!--
+ <copy file="${jsp-api.jar}" todir="${tomcat.build}/common/lib"/>
+ <copy file="${servlet-api.jar}" todir="${tomcat.build}/common/lib"/>
+
+@@ -158,9 +159,9 @@
+ <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
+ file="${tomcat-native.tar.gz}" />
+
+- <!-- <copy todir="${tomcat.build}/common/lib" file="${ant.jar}"/>
+- <copy todir="${tomcat.build}/common/lib" file="${ant-launcher.jar}"/> -->
++ <copy todir="${tomcat.build}/common/lib" file="${ant-launcher.jar}"/>
+ <copy todir="${tomcat.build}/common/lib" file="${jasper-compiler-jdt.jar}"/>
++ -->
+ </target>
+
+ <!-- ====================== Build all components =================== -->
+@@ -650,28 +651,8 @@
+
+ <!-- <antcall target="build-commons-modeler" /> -->
+ <!-- <antcall target="build-commons-daemon" /> -->
+-
+- <antcall target="downloadgz">
+- <param name="sourcefile" value="${commons-collections-src.loc}"/>
+- <param name="destfile" value="${tomcat-dbcp.jar}" />
+- </antcall>
+- <antcall target="downloadgz">
+- <param name="sourcefile" value="${commons-pool-src.loc}"/>
+- <param name="destfile" value="${tomcat-dbcp.jar}" />
+- </antcall>
+- <antcall target="downloadgz">
+- <param name="sourcefile" value="${commons-dbcp-src.loc}"/>
+- <param name="destfile" value="${tomcat-dbcp.jar}" />
+- </antcall>
+-
+- <antcall target="build-tomcat-dbcp" />
+-
+- <antcall target="downloadzip">
+- <param name="sourcefile" value="${jdt.loc}"/>
+- <param name="destfile" value="${jdt.jar}"/>
+- <param name="destdir" value="${base.path}"/>
+- </antcall>
+- <antcall target="build-jasper-compiler-jdt" />
++ <!-- <antcall target="build-tomcat-dbcp" /> -->
++ <!-- <antcall target="build-jasper-compiler-jdt" /> -->
+ </target>
+
+ <target name="build-tomcat-dbcp">
+@@ -824,9 +805,10 @@
+ </ant>
+
+ <!-- Precompiling and fixing webapps -->
++ <!--
+ <antcall target="build-webapps-precompile" />
+ <antcall target="fix-webapps" />
+-
++ -->
+ </target>
+
+ <target name="fix-webapps" depends="init" >
+@@ -1038,11 +1020,11 @@
+ <!-- ====================== Compat target =================== -->
+
+ <target name="compat" description="Create compatibility binaries for JREs before 1.5" >
+-
++ <!--
+ <copy todir="${tomcat.compat}/common/endorsed" file="${xercesImpl.jar}"/>
+ <copy todir="${tomcat.compat}/common/endorsed" file="${xml-apis.jar}"/>
+ <copy tofile="${tomcat.compat}/bin/jmx.jar" file="${jmx.jar}"/>
+-
++ -->
+ </target>
+
+ <!-- ====================== DEPLOY: Deploy Components =================== -->
+@@ -1089,8 +1071,9 @@
+ <!-- Copy Unix JSVC from commons-daemon -->
+ <copy file="${commons-daemon.jsvc.tar.gz}"
+ tofile="${tomcat.dist}/bin/jsvc.tar.gz" />
++ <!--
+ <copy todir="${tomcat.build}/bin" file="${commons-daemon.jar}" />
+-
++ -->
+ <echo>Target: Webapps precompilation ...</echo>
+
+ <antcall target="build-admin"/>
+@@ -1185,10 +1168,11 @@
+ description="Catalina Tests" depends="dist-tester">
+
+ <!-- For Java 1.4 -->
++ <!--
+ <copy file="${jmx.jar}" tofile="${tomcat.build}/bin/jmx.jar" />
+ <copy todir="${tomcat.build}/common/endorsed" file="${xercesImpl.jar}"/>
+ <copy todir="${tomcat.build}/common/endorsed" file="${xml-apis.jar}"/>
+-
++ -->
+ <parallel>
+
+ <java classname="LauncherBootstrap" fork="yes">
+@@ -1827,10 +1811,10 @@
+
+ <!-- commons-digester needs ../LICENSE -->
+ <!-- That is ugly XXX needs a review -->
++ <!--
+ <copy file="LICENSE" tofile="../LICENSE"/>
+ <copy file="LICENSE" tofile="${base.path}/LICENSE"/>
+
+- <!-- Downdown any sub package or tools needed. -->
+ <antcall target="downloadgz">
+ <param name="sourcefile" value="${commons-beanutils.loc}"/>
+ <param name="destfile" value="${commons-beanutils.jar}"/>
+@@ -1872,7 +1856,6 @@
+ </antcall>
+
+ <antcall target="downloadgz">
+- <!-- xerces2 brings 2 files, test for one of them -->
+ <param name="sourcefile" value="${xerces.loc}"/>
+ <param name="destfile" value="${xml-apis.jar}"/>
+ </antcall>
+@@ -1893,7 +1876,6 @@
+ <param name="destfile" value="${commons-launcher.jar}"/>
+ </antcall>
+
+- <!--
+ <antcall target="downloadgz">
+ <param name="sourcefile" value="${commons-pool.loc}"/>
+ <param name="destfile" value="${commons-pool.jar}"/>
+@@ -1904,7 +1886,6 @@
+ <param name="destfile" value="${commons-dbcp.jar}"/>
+ <param name="destdir" value="${base.path}"/>
+ </antcall>
+- -->
+
+ <antcall target="downloadgz">
+ <param name="sourcefile" value="${commons-httpclient.loc}"/>
+@@ -1932,7 +1913,7 @@
+ <param name="destfile" value="${tomcat-native.tar.gz}"/>
+ <param name="destdir" value="${tomcat-native.home}"/>
+ </antcall>
+-
++ -->
+ <!-- Build the dependencies that are not yet released -->
+ <antcall target="build-depends"/>
+