summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'www-servers/tomcat/files/5.5.20/tomcatbuild-xml-examples.patch')
-rw-r--r--www-servers/tomcat/files/5.5.20/tomcatbuild-xml-examples.patch84
1 files changed, 0 insertions, 84 deletions
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}"