summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'www-servers/tomcat/files/7/build-xml.patch')
-rw-r--r--www-servers/tomcat/files/7/build-xml.patch149
1 files changed, 149 insertions, 0 deletions
diff --git a/www-servers/tomcat/files/7/build-xml.patch b/www-servers/tomcat/files/7/build-xml.patch
new file mode 100644
index 000000000000..637f08ae8a0b
--- /dev/null
+++ b/www-servers/tomcat/files/7/build-xml.patch
@@ -0,0 +1,149 @@
+diff -Naur apache-tomcat-7.0.5-src_orig/build.xml apache-tomcat-7.0.5-src/build.xml
+--- apache-tomcat-7.0.5-src_orig/build.xml 2010-12-06 17:20:48.777166339 -0500
++++ apache-tomcat-7.0.5-src/build.xml 2010-12-06 17:58:10.529303918 -0500
+@@ -38,9 +38,9 @@
+ <!-- Version numbers -->
+ <property name="version.major" value="7" />
+ <property name="version.minor" value="0" />
+- <property name="version.build" value="0" />
++ <property name="version.build" value="5" />
+ <property name="version.patch" value="0" />
+- <property name="version.suffix" value="-dev" />
++ <property name="version.suffix" value="-gentoo" />
+
+ <property name="version" value="${version.major}.${version.minor}.${version.build}${version.suffix}" />
+ <property name="version.number" value="${version.major}.${version.minor}.${version.build}.${version.patch}" />
+@@ -149,6 +149,7 @@
+
+ <!-- Classpaths -->
+ <path id="compile.classpath">
++ <pathelement location="${ant.jar}"/>
+ <pathelement location="${jdt.jar}"/>
+ </path>
+
+@@ -291,6 +292,7 @@
+ <exclude name="org/apache/catalina/mbeans/JmxRemote*" />
+ <exclude name="org/apache/catalina/tribes/**" />
+ <exclude name="org/apache/naming/factory/webservices/**" />
++ <exclude name="javax/servlet/**" />
+ </patternset>
+
+ <patternset id="files.catalina-tribes">
+@@ -420,7 +422,7 @@
+
+ </target>
+
+- <target name="validate" depends="download-validate" if="${execute.validate}">
++ <target name="validate" if="${execute.validate}">
+ <taskdef resource="checkstyletask.properties"
+ classpath="${checkstyle.jar}" />
+ <checkstyle config="checkstyle.xml">
+@@ -437,7 +439,7 @@
+ </checkstyle>
+ </target>
+
+- <target name="compile" depends="build-prepare,download-compile,validate">
++ <target name="compile" depends="build-prepare,validate">
+
+ <!-- Compile internal server components -->
+ <javac srcdir="java" destdir="${tomcat.classes}"
+@@ -498,7 +500,7 @@
+ 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"
+@@ -506,7 +508,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"
+@@ -514,12 +516,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}"
+ filesDir="${tomcat.classes}"
+@@ -610,7 +612,7 @@
+
+ </target>
+
+- <target name="build-docs" description="Builds all documentation from XML sources">
++ <target name="build-docs" unless="nobuild.docs" description="Builds all documentation from XML sources">
+
+ <copy todir="${tomcat.build}/webapps">
+ <fileset dir="webapps">
+@@ -718,14 +720,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">
+@@ -782,7 +784,7 @@
+ source="${compile.source}"
+ target="${compile.target}"
+ optimize="${compile.optimize}"
+- classpath="${tomcat.classes}"
++ classpath="${tomcat.classes}:${jsp-api.jar}"
+ excludes="**/CVS/**,**/.svn/**"
+ encoding="ISO-8859-1"
+ includeantruntime="false">
+@@ -794,7 +796,7 @@
+ source="${compile.source}"
+ target="${compile.target}"
+ optimize="${compile.optimize}"
+- classpath="$tomcat.lcasses}"
++ classpath="${tomcat.classes}:${jsp-api.jar}"
+ excludes="**/CVS/**,**/.svn/**"
+ encoding="ISO-8859-1"
+ includeantruntime="false">
+@@ -802,11 +804,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" />
+-
++-->
+ </target>
+
+ <target name="examples-sources" description="Create examples sources"
+@@ -946,7 +948,7 @@
+ description="Creates the experimental embedded release"
+ depends="embed,embed-sources,embed-extras" />
+
+- <target name="test-compile" depends="compile,download-test-compile" >
++ <target name="test-compile" depends="compile" >
+ <mkdir dir="${test.classes}"/>
+ <!-- Compile -->
+ <javac srcdir="test" destdir="${test.classes}"