rpms/tomcat5/devel tomcat5-5.0.30-bz163689.patch,1.1,1.2

[fedora-cvs-commits at redhat.com]

Author: gbenson

Update of /cvs/dist/rpms/tomcat5/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28245

Modified Files:
	tomcat5-5.0.30-bz163689.patch 
Log Message:
Work around local #163689 failures

tomcat5-5.0.30-bz163689.patch:
 jakarta-tomcat-5/build.xml                      |    4 ++++
 jakarta-tomcat-catalina/webapps/admin/build.xml |    2 ++
 jakarta-tomcat-catalina/webapps/docs/build.xml  |   20 ++++++++++++++++++++
 3 files changed, 26 insertions(+)

Index: tomcat5-5.0.30-bz163689.patch
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5-5.0.30-bz163689.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat5-5.0.30-bz163689.patch	21 Jul 2005 10:17:21 -0000	1.1
+++ tomcat5-5.0.30-bz163689.patch	21 Jul 2005 11:12:28 -0000	1.2
@@ -30,3 +30,140 @@
  
      <javac destdir="${ROOT.base}/WEB-INF/classes"
             optimize="off"
+--- tomcat5-5.0.30/jakarta-tomcat-5.0.30-src/jakarta-tomcat-catalina/webapps/docs/build.xml~	2004-11-24 16:55:37.000000000 +0000
++++ tomcat5-5.0.30/jakarta-tomcat-5.0.30-src/jakarta-tomcat-catalina/webapps/docs/build.xml	2005-07-21 11:45:13.000000000 +0100
+@@ -72,6 +72,7 @@
+         <include name="RUNNING.txt"/>
+       </fileset>
+     </copy>
++<!--
+     <style basedir="."
+            destdir="${webapps.build}/${webapp.name}/printer"
+          extension=".html"
+@@ -81,6 +82,7 @@
+       <param name="relative-path" expression="./.."/>
+       <param name="project-menu" expression="nomenu"/>
+     </style>
++-->
+ 
+     <!-- WEB-INF Subdirectory -->
+     <mkdir     dir="${webapps.build}/${webapp.name}/WEB-INF"/>
+@@ -95,6 +97,7 @@
+   <target name="build-main" depends="build-static">
+ 
+     <!-- Top Level Directory -->
++<!--
+     <style basedir="."
+            destdir="${webapps.build}/${webapp.name}"
+          extension=".html"
+@@ -103,8 +106,10 @@
+           includes="*.xml">
+       <param name="relative-path" expression="."/>
+     </style>
++-->
+ 
+     <!-- Application Developer's Guide -->
++<!--
+     <style basedir="appdev"
+            destdir="${webapps.build}/${webapp.name}/appdev"
+          extension=".html"
+@@ -113,11 +118,13 @@
+           includes="*.xml">
+       <param name="relative-path" expression=".."/>
+     </style>
++-->
+     <mkdir     dir="${webapps.build}/${webapp.name}/appdev/printer"/>
+     <!-- Application Developer's Guide Examples -->
+     <copy    todir="${webapps.build}/${webapp.name}/appdev/printer">
+       <fileset dir="appdev" includes="*.txt"/>
+     </copy>
++<!--
+     <style basedir="appdev"
+            destdir="${webapps.build}/${webapp.name}/appdev/printer"
+          extension=".html"
+@@ -127,10 +134,12 @@
+       <param name="relative-path" expression="../.."/>
+       <param name="project-menu" expression="nomenu"/>
+     </style>
++-->
+ 
+     <!-- Catalina Functional Specifications -->
+     <mkdir     dir="${webapps.build}/${webapp.name}/catalina"/>
+     <mkdir     dir="${webapps.build}/${webapp.name}/catalina/funcspecs"/>
++<!--
+     <style basedir="funcspecs"
+            destdir="${webapps.build}/${webapp.name}/catalina/funcspecs"
+          extension=".html"
+@@ -139,7 +148,9 @@
+           includes="*.xml">
+       <param name="relative-path" expression="../.."/>
+     </style>
++-->
+     <mkdir     dir="${webapps.build}/${webapp.name}/catalina/funcspecs/printer"/>
++<!--
+     <style basedir="funcspecs"
+            destdir="${webapps.build}/${webapp.name}/catalina/funcspecs/printer"
+          extension=".html"
+@@ -149,8 +160,10 @@
+       <param name="relative-path" expression="../../.."/>
+       <param name="project-menu" expression="nomenu"/>
+     </style>
++-->
+ 
+     <!-- Server Configuration Reference -->
++<!--
+     <style basedir="config"
+            destdir="${webapps.build}/${webapp.name}/config"
+          extension=".html"
+@@ -159,7 +172,9 @@
+           includes="*.xml">
+       <param name="relative-path" expression=".."/>
+     </style>
++-->
+     <mkdir     dir="${webapps.build}/${webapp.name}/config/printer"/>
++<!--
+     <style basedir="config"
+            destdir="${webapps.build}/${webapp.name}/config/printer"
+          extension=".html"
+@@ -169,8 +184,10 @@
+       <param name="relative-path" expression="../.."/>
+       <param name="project-menu" expression="nomenu"/>
+     </style>
++-->
+ 
+     <!-- Server Architecture -->
++<!--
+     <style basedir="architecture"
+            destdir="${webapps.build}/${webapp.name}/architecture"
+          extension=".html"
+@@ -179,7 +196,9 @@
+           includes="*.xml">
+       <param name="relative-path" expression=".."/>
+     </style>
++-->
+     <mkdir     dir="${webapps.build}/${webapp.name}/architecture/printer"/>
++<!--
+     <style basedir="architecture"
+            destdir="${webapps.build}/${webapp.name}/architecture/printer"
+          extension=".html"
+@@ -189,6 +208,7 @@
+       <param name="relative-path" expression="../.."/>
+       <param name="project-menu" expression="nomenu"/>
+     </style>
++-->
+ 
+   </target>
+ 
+--- tomcat5-5.0.30/jakarta-tomcat-5.0.30-src/jakarta-tomcat-5/build.xml~	2005-07-21 11:46:29.000000000 +0100
++++ tomcat5-5.0.30/jakarta-tomcat-5.0.30-src/jakarta-tomcat-5/build.xml	2005-07-21 11:55:03.000000000 +0100
+@@ -792,8 +792,10 @@
+         <include name="images/tomcat.gif" />
+       </fileset>
+     </copy>
++<!--
+     <copy tofile="${tomcat.deployer}/docs/manual.html"
+       file="${tomcat.build}/webapps/tomcat-docs/printer/deployer-howto.html" />
++-->
+ 
+   </target>
+