packages: tomcat/tomcat-build.xml.patch, tomcat/server.xml-URIEncoding-utf8...
paszczus
paszczus at pld-linux.org
Mon Mar 19 10:18:17 CET 2012
Author: paszczus Date: Mon Mar 19 09:18:17 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- updated for 7.0.26
---- Files affected:
packages/tomcat:
tomcat-build.xml.patch (1.4 -> 1.5) , server.xml-URIEncoding-utf8.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: packages/tomcat/tomcat-build.xml.patch
diff -u packages/tomcat/tomcat-build.xml.patch:1.4 packages/tomcat/tomcat-build.xml.patch:1.5
--- packages/tomcat/tomcat-build.xml.patch:1.4 Wed Apr 13 11:51:36 2011
+++ packages/tomcat/tomcat-build.xml.patch Mon Mar 19 10:18:12 2012
@@ -1,6 +1,6 @@
---- apache-tomcat-7.0.8-src/build.xml.orig 2011-02-04 13:52:30.000000000 +0100
-+++ apache-tomcat-7.0.8-src/build.xml 2011-02-05 13:57:36.775158905 +0100
-@@ -421,51 +421,7 @@
+--- apache-tomcat-7.0.26-src/build.xml 2012-02-17 15:15:30.000000000 +0100
++++ apache-tomcat-7.0.26-src.new/build.xml 2012-03-19 10:05:29.185332581 +0100
+@@ -438,53 +438,6 @@
</target>
@@ -33,6 +33,9 @@
- <exclude name="**/org/apache/tomcat/dbcp/**"/>
- <exclude name="**/tomcat-deps/**"/>
- </fileset>
+- <fileset dir="modules/jdbc-pool" >
+- <patternset refid="text.files" />
+- </fileset>
- </checkstyle>
- <!-- javax package checks -->
- <checkstyle config="res/checkstyle/javax-checkstyle.xml">
@@ -48,12 +51,19 @@
- </checkstyle>
- </target>
-
-- <target name="compile" depends="build-prepare,download-compile,validate">
-+ <target name="compile" depends="build-prepare">
+ <target name="validate-eoln" depends="compile"
+ description="Validate that the source files have correct line ends">
+ <taskdef name="checkeol"
+@@ -524,7 +477,7 @@
+ </copy>
+ </target>
+- <target name="compile" depends="build-prepare,download-compile,compile-prepare,validate">
++ <target name="compile" depends="build-prepare">
<!-- Compile internal server components -->
<javac srcdir="java" destdir="${tomcat.classes}"
-@@ -744,13 +703,6 @@
+ debug="${compile.debug}"
+@@ -807,13 +760,6 @@
<target name="deploy" depends="package,build-docs"
description="Default. Builds a working Tomcat instance">
@@ -67,7 +77,7 @@
<!-- Copy scripts -->
<copy todir="${tomcat.build}/bin">
<fileset dir="bin">
-@@ -1006,7 +958,7 @@
+@@ -1078,7 +1024,7 @@
</target>
@@ -76,7 +86,7 @@
<mkdir dir="${test.classes}"/>
<!-- Compile -->
<javac srcdir="test" destdir="${test.classes}"
-@@ -1103,52 +1055,10 @@
+@@ -1183,52 +1129,10 @@
<mkdir dir="${tomcat.extras}/webservices"/>
</target>
@@ -130,7 +140,7 @@
<replace dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/src/java/org/apache/commons"
encoding="ISO-8859-1">
<replacefilter token="org.apache.commons"
-@@ -1170,7 +1080,8 @@
+@@ -1250,7 +1154,8 @@
file="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/build.xml" />
<copy todir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src">
@@ -140,7 +150,7 @@
<fileset file="${log4j.jar}" />
<fileset file="${logkit.jar}" />
<fileset file="${servletapi.jar}" />
-@@ -1250,18 +1161,6 @@
+@@ -1330,18 +1235,6 @@
depends="extras-prepare"
description="Prepare to build web services extras package">
@@ -159,7 +169,7 @@
<copy file="${jaxrpc-lib.jar}"
tofile="${tomcat.extras}/webservices/jaxrpc.jar" />
<copy file="${wsdl4j-lib.jar}"
-@@ -1368,7 +1267,7 @@
+@@ -1448,7 +1341,7 @@
</target>
@@ -168,12 +178,11 @@
<mkdir dir="${tomcat.dist}"/>
<mkdir dir="${tomcat.dist}/bin"/>
<mkdir dir="${tomcat.dist}/conf"/>
-@@ -2092,301 +1991,7 @@
- description="Delete the default output folders">
- <delete dir="${tomcat.output}" />
+@@ -2236,304 +2129,6 @@
+ <delete file="webapps/docs/jdbc-pool.xml"/>
</target>
--
-
+
+-
- <!-- ================ Download and dependency building =================== -->
-
- <target name="download-validate"
@@ -224,10 +233,14 @@
- <param name="destfile" value="${commons-dbcp.home}/build.xml" />
- </antcall>
- <mkdir dir="${tomcat-dbcp.home}"/>
+- <!-- Rebuild dbcp only if built jars do not exist -->
+- <!-- or new versions of pool or dbcp have been downloaded. -->
- <condition property="no.build.dbcp">
- <and>
-- <available file="${tomcat-dbcp.jar}"/>
-- <available file="${tomcat-dbcp-src.jar}"/>
+- <uptodate srcfile="${commons-pool.home}" targetfile="${tomcat-dbcp.jar}" />
+- <uptodate srcfile="${commons-pool.home}" targetfile="${tomcat-dbcp-src.jar}" />
+- <uptodate srcfile="${commons-dbcp.home}" targetfile="${tomcat-dbcp.jar}" />
+- <uptodate srcfile="${commons-dbcp.home}" targetfile="${tomcat-dbcp-src.jar}" />
- </and>
- </condition>
- <antcall target="build-tomcat-dbcp" />
================================================================
Index: packages/tomcat/server.xml-URIEncoding-utf8.patch
diff -u packages/tomcat/server.xml-URIEncoding-utf8.patch:1.2 packages/tomcat/server.xml-URIEncoding-utf8.patch:1.3
--- packages/tomcat/server.xml-URIEncoding-utf8.patch:1.2 Wed Apr 13 11:51:36 2011
+++ packages/tomcat/server.xml-URIEncoding-utf8.patch Mon Mar 19 10:18:12 2012
@@ -1,30 +1,24 @@
-Setup URIEncoding="UTF-8" to use unversal URI encoding.
-
-http://wiki.hudson-ci.org/display/HUDSON/Tomcat
-
-Some versions of Tomcat (such as 5.0.28) uses iso-8859-1 to decode URLs, which
-is in a clear violation of the relevant RFCs. To fix this problem, add the
-following URIEncoding attribute to the connector definition in
-$TOMCAT_HOME/conf/server.xml.
-
---- a/conf/server.xml.orig 2010-06-13 16:55:18.000000000 +0200
-+++ b/conf/server.xml 2010-07-20 13:51:33.000000000 +0200
-@@ -66,12 +66,14 @@
+--- apache-tomcat-7.0.26-src/conf/server.xml 2012-02-17 15:15:30.000000000 +0100
++++ apache-tomcat-7.0.26-src.new/conf/server.xml 2012-03-19 10:08:10.806085375 +0100
+@@ -68,13 +68,15 @@
+ Define a non-SSL HTTP/1.1 Connector on port 8080
-->
- <Connector port="8080" protocol="HTTP/1.1"
- connectionTimeout="20000"
-+ URIEncoding="UTF-8"
+ <Connector port="8080" protocol="HTTP/1.1"
+- connectionTimeout="20000"
++ connectionTimeout="20000"
++ URIEncoding="UTF-8"
redirectPort="8443" />
<!-- A "Connector" using the shared thread pool-->
<!--
<Connector executor="tomcatThreadPool"
- port="8080" protocol="HTTP/1.1"
- connectionTimeout="20000"
-+ URIEncoding="UTF-8"
+ port="8080" protocol="HTTP/1.1"
+- connectionTimeout="20000"
++ connectionTimeout="20000"
++ URIEncoding="UTF-8"
redirectPort="8443" />
- -->
+ -->
<!-- Define a SSL HTTP/1.1 Connector on port 8443
-@@ -80,12 +82,12 @@
+@@ -83,12 +85,12 @@
described in the APR documentation -->
<!--
<Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/tomcat-build.xml.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/server.xml-URIEncoding-utf8.patch?r1=1.2&r2=1.3&f=u
More information about the pld-cvs-commit
mailing list