Created new patch re-writing some existing and adding a few new, ant targets for admin/example webapps. Should resolve bug #150715

(Portage version: 2.1.2_pre3-r2)
 (Unsigned Manifest commit)

3 files changed, 0 insertions, 205 deletions

diff --git a/www-servers/tomcat/files/5.5.20/tomcat.env b/www-servers/tomcat/files/5.5.20/tomcat.env
deleted file mode 100644
index 8afb01ff1d8e..000000000000
--- a/www-servers/tomcat/files/5.5.20/tomcat.env
+++ /dev/null
@@ -1 +0,0 @@
-CATALINA_HOME=/usr/share/tomcat-5.5
diff --git a/www-servers/tomcat/files/5.5.20/tomcatbuild-xml-docs.patch b/www-servers/tomcat/files/5.5.20/tomcatbuild-xml-docs.patch
deleted file mode 100644
index 513eeefe5d34..000000000000
--- a/www-servers/tomcat/files/5.5.20/tomcatbuild-xml-docs.patch
+++ /dev/null
@@ -1,120 +0,0 @@
---- apache-tomcat-5.5.17-src/build/build.xml	2006-04-14 14:11:26.000000000 -0400
-+++ build.xml	2006-07-29 14:58:08.000000000 -0400
-@@ -788,6 +788,7 @@
-         <property name="flags.hide" value="true" />
-     </ant>
- 
-+    <!--
-     <ant dir="${catalina.home}/webapps/docs" target="build-main">
-         <property name="webapps.build" value="${tomcat.build}/webapps" />
-         <property name="classes.dir" value="${tomcat.build}/classes" />
-@@ -795,6 +796,7 @@
-         <property name="catalina.deploy" value="${tomcat.build}" />
-         <property name="flags.hide" value="true" />
-     </ant>
-+    -->
- 
-     <antcall target="build-admin" />
- 
-@@ -843,11 +845,13 @@
-         filtering="true" />
- 
-     <!-- Add documents to the tomcat-docs webapp -->
-+    <!--
-     <copy file="${basedir}/resources/build.xml"
-         todir="${tomcat.build}/webapps/tomcat-docs" />
-     <copy file="./RELEASE-NOTES"
-         tofile="${tomcat.build}/webapps/tomcat-docs/RELEASE-NOTES.txt"
-         filtering="true" />
-+     -->
- 
-     <!-- Build JARs for webapps classes -->
-     <mkdir dir="${tomcat.build}/server/webapps/admin/WEB-INF/lib" />
-@@ -1027,6 +1031,7 @@
-     </copy>
- 
-     <!-- Copy deployer documentation -->
-+    <!--
-     <copy todir="${tomcat.deployer}">
-       <fileset dir="${tomcat.build}/webapps/tomcat-docs">
-         <include name="images/jakarta-logo.gif" />
-@@ -1035,7 +1040,8 @@
-     </copy>
-     <copy tofile="${tomcat.deployer}/docs/manual.html"
-       file="${tomcat.build}/webapps/tomcat-docs/printer/deployer-howto.html" />
--
-+    -->
-+    
-   </target>
- 
-   <!-- ====================== Compat target =================== -->
-@@ -1344,8 +1350,8 @@
- 
- 
-   <!-- ====================== DIST: Create Javadoc ======================== -->
--  <target name="dist-javadoc">
-     <!--
-+  <target name="dist-javadoc">
-     <ant dir="${catalina.home}" target="dist-javadoc"/>
-     <mkdir  dir="${tomcat.dist}/webapps/tomcat-docs/catalina/docs/api"/>
-     <copy todir="${tomcat.dist}/webapps/tomcat-docs/catalina/docs/api">
-@@ -1356,7 +1362,6 @@
-     <copy todir="${tomcat.dist}/webapps/tomcat-docs/jasper/docs/api">
-       <fileset dir="${jasper.build}/javadoc" />
-     </copy>
--    -->
-     <mkdir  dir="${tomcat.dist}/webapps/tomcat-docs/servletapi"/>
-     <copy todir="${tomcat.dist}/webapps/tomcat-docs/servletapi">
-       <fileset dir="${api.home}/jsr154/dist/docs/api" />
-@@ -1366,6 +1371,7 @@
-       <fileset dir="${api.home}/jsr152/dist/docs/api" />
-     </copy>
-   </target>
-+    -->
- 
- 
-   <!-- ====================== DIST: Create Sources ======================== -->
-@@ -1441,7 +1447,7 @@
- 
- 
-   <!-- ====================== DIST: Create Archives ======================= -->
--  <target name="dist" depends="deploy,dist-static,dist-javadoc,embed"
-+  <target name="dist" depends="deploy,dist-static,embed"
-    description="Create binary distribution">
-   </target>
- 
-@@ -1479,7 +1485,7 @@
- 
- 
-   <!-- ==================== RELEASE: Create Release ======================= -->
--  <target name="release" depends="clean,dist,dist-source,prepare-release,installer,package-zip,package-tgz,package-embed-zip,package-embed-tgz,package-deployer-zip,package-deployer-tgz,package-compat-zip,package-compat-tgz,package-admin-zip,package-admin-tgz,package-src-zip,package-src-tgz,package-docs-tgz,clean-tester,run-tester"
-+  <target name="release" depends="clean,dist,dist-source,prepare-release,installer,package-zip,package-tgz,package-embed-zip,package-embed-tgz,package-deployer-zip,package-deployer-tgz,package-compat-zip,package-compat-tgz,package-admin-zip,package-admin-tgz,package-src-zip,package-src-tgz,clean-tester,run-tester"
-    description="Create a Tomcat 5 packaged distribution">
- 
-     <filter token="VERSION" value="${version}"/>
-@@ -1772,8 +1778,8 @@
-   </target>
- 
-   <!-- Packages the documentation distro in tar.gz format -->
-+  <!--
-   <target name="package-docs-tgz" depends="prepare-release">
--    <!-- Generate docs -->
-     <ant dir="${catalina.home}" target="dist-javadoc"/>
-     <mkdir  dir="${tomcat.dist}/webapps/tomcat-docs/catalina/docs/api"/>
-     <copy todir="${tomcat.dist}/webapps/tomcat-docs/catalina/docs/api">
-@@ -1785,7 +1791,6 @@
-       <fileset dir="${jasper.build}/javadoc" />
-     </copy>
- 
--    <!-- Package gocs -->
-     <fixcrlf srcdir="${tomcat.dist}" includes="*.txt,LICENSE,NOTICE" eol="lf"/>
- 
-     <tar longfile="gnu" compression="gzip"
-@@ -1805,6 +1810,7 @@
-     <echo     file="${tomcat.release}/v${version}/bin/${final.name}-fulldocs.tar.gz.MD5"
-                       message="${md5sum.binary-prefix}${final.name}-fulldocs.tar.gz${line.separator}" append="true" />
-   </target>
-+  -->
- 
-   <!-- Packages the source code distribution in zip format -->
-   <target name="package-src-zip">
diff --git a/www-servers/tomcat/files/5.5.20/tomcatbuild-xml-examples.patch b/www-servers/tomcat/files/5.5.20/tomcatbuild-xml-examples.patch
deleted file mode 100644
index c2cae9e208b8..000000000000
--- a/www-servers/tomcat/files/5.5.20/tomcatbuild-xml-examples.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- apache-tomcat-5.5.17-src/build/build.xml	2006-04-14 14:11:26.000000000 -0400
-+++ build/build.xml	2006-07-29 13:02:50.000000000 -0400
-@@ -398,12 +398,16 @@
-     <!-- JSPC -->
-     <property name="admin.base" location="${tomcat.build}/server/webapps/admin" />
-     <property name="ROOT.base" location="${tomcat.build}/webapps/ROOT" />
-+    <!--
-     <property name="jsp-examples.base" location="${tomcat.build}/webapps/jsp-examples" />
-+    -->
- 
-     <mkdir dir="${admin.base}/WEB-INF/src/admin" />
-     <mkdir dir="${ROOT.base}/WEB-INF/src" />
-     <mkdir dir="${ROOT.base}/WEB-INF/classes" />
-+    <!--
-     <mkdir dir="${jsp-examples.base}/WEB-INF/src" />
-+    -->
- 
-     <path id="jspc.classpath">
-       <pathelement location="${java.home}/../lib/tools.jar"/>
-@@ -437,6 +441,7 @@
-              addWebXmlMappings="true"
-              outputDir="${ROOT.base}/WEB-INF/src" />
- 
-+    <!--
-     <jasper2
-              compile="false"
-              validateXml="false"
-@@ -444,6 +449,7 @@
-          webXmlFragment="${jsp-examples.base}/WEB-INF/generated_web.xml"
-              addWebXmlMappings="true"
-              outputDir="${jsp-examples.base}/WEB-INF/src" />
-+    -->
- 
-     <jasper2
-              package="admin"
-@@ -475,6 +481,7 @@
-       <include name="**" />
-     </javac>
- 
-+    <!--
-     <mkdir dir="${jsp-examples.base}/WEB-INF/src/tags"/>
-     <copy todir="${jsp-examples.base}/WEB-INF/classes">
-       <fileset dir="${jsp-examples.base}/WEB-INF/src">
-@@ -507,6 +514,7 @@
-       <include name="**" />
-       <exclude name="tags/**" />
-     </javac>
-+    -->
- 
-     <javac destdir="${admin.base}/WEB-INF/classes"
-            optimize="off"
-@@ -767,7 +775,7 @@
-     </ant>
-     <ant dir="${api.home}/jsr152" target="dist">
-     </ant>
--
-+    <!--
-     <mkdir dir="${tomcat.build}/webapps/servlets-examples"/>
-     <copy todir="${tomcat.build}/webapps/servlets-examples">
-       <fileset dir="${api.home}/jsr154/build/examples" includes="**"/>
-@@ -779,7 +787,7 @@
-         <exclude name="WEB-INF/tagPlugins.xml" />
-       </fileset>
-     </copy>
--
-+    -->
-     <ant dir="${catalina.home}/webapps/ROOT" target="build-main">
-         <property name="webapps.build" value="${tomcat.build}/webapps" />
-         <property name="classes.dir" value="${tomcat.build}/classes" />
-@@ -1082,12 +1090,14 @@
-     <antcall target="fix-webapps"/>
- 
-     <!-- Copy the examples webapps -->
-+    <!--
-     <copy todir="${tomcat.build}/webapps/jsp-examples">
-       <fileset dir="${api.home}/jsr152/build/examples"/>
-     </copy>
-     <copy todir="${tomcat.build}/webapps/servlets-examples">
-       <fileset dir="${api.home}/jsr154/build/examples"/>
-     </copy>
-+    -->
- 
-     <!-- Copy Unix JSVC from commons-daemon -->
-     <copy file="${commons-daemon.jsvc.tar.gz}"