[packages/tomcat/dev-7.0.55] up to 7.0.55; compile fails
glen
glen at pld-linux.org
Fri Sep 19 15:39:50 CEST 2014
commit 05c77d28b4acd1015925331988c5915e6af54817
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Fri Sep 19 16:39:29 2014 +0300
up to 7.0.55; compile fails
server.xml-URIEncoding-utf8.patch | 16 +-
tomcat-build.xml.patch | 299 +-------------------------------------
tomcat.spec | 8 +-
3 files changed, 15 insertions(+), 308 deletions(-)
---
diff --git a/tomcat.spec b/tomcat.spec
index d2a68ce..8aef313 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -14,12 +14,12 @@
Summary: Web server and Servlet/JSP Engine, RI for Servlet %{servletapiver}/JSP %{jspapiver} API
Summary(pl.UTF-8): Serwer www i silnik Servlet/JSP będący wzorcową implementacją API Servlet %{servletapiver}/JSP %{jspapiver}
Name: tomcat
-Version: 7.0.52
-Release: 3
+Version: 7.0.55
+Release: 1
License: Apache v2.0
Group: Networking/Daemons/Java
Source0: http://www.apache.org/dist/tomcat/tomcat-7/v%{version}/src/apache-%{name}-%{version}-src.tar.gz
-# Source0-md5: 1b85c08721ab9d891b72ca35cd4a0e2d
+# Source0-md5: 3297f4d0a9834711c2f552096859c23e
Source1: apache-%{name}.init
Source2: apache-%{name}.sysconfig
Source3: %{name}-build.properties
@@ -53,7 +53,7 @@ BuildRequires: java-jdbc-mysql
BuildRequires: java-junit
BuildRequires: java-log4j
BuildRequires: java-mail
-BuildRequires: jdk
+BuildRequires: jdk >= 1.6
BuildRequires: jpackage-utils
BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpm-javaprov
diff --git a/server.xml-URIEncoding-utf8.patch b/server.xml-URIEncoding-utf8.patch
index 7eeda61..7c22914 100644
--- a/server.xml-URIEncoding-utf8.patch
+++ b/server.xml-URIEncoding-utf8.patch
@@ -1,5 +1,5 @@
---- 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
+--- apache-tomcat-7.0.55-src/conf/server.xml~ 2014-09-19 16:23:41.000000000 +0300
++++ apache-tomcat-7.0.55-src/conf/server.xml 2014-09-19 16:24:20.849354198 +0300
@@ -68,13 +68,15 @@
Define a non-SSL HTTP/1.1 Connector on port 8080
-->
@@ -18,18 +18,18 @@
redirectPort="8443" />
-->
<!-- Define a SSL HTTP/1.1 Connector on port 8443
-@@ -83,12 +85,12 @@
- described in the APR documentation -->
+@@ -86,12 +86,12 @@
+ documentation -->
<!--
- <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
-- maxThreads="150" scheme="https" secure="true"
-+ maxThreads="150" scheme="https" secure="true" URIEncoding="UTF-8"
+ <Connector port="8443" protocol="org.apache.coyote.http11.Http11Protocol"
+- maxThreads="150" SSLEnabled="true" scheme="https" secure="true"
++ maxThreads="150" SSLEnabled="true" scheme="https" secure="true" URIEncoding="UTF-8"
clientAuth="false" sslProtocol="TLS" />
-->
<!-- Define an AJP 1.3 Connector on port 8009 -->
- <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" />
-+ <Connector port="8009" protocol="AJP/1.3" URIEncoding="UTF-8" redirectPort="8443" />
++ <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" URIEncoding="UTF-8" />
<!-- An Engine represents the entry point (within Catalina) that processes
diff --git a/tomcat-build.xml.patch b/tomcat-build.xml.patch
index a21a07e..7540f5d 100644
--- a/tomcat-build.xml.patch
+++ b/tomcat-build.xml.patch
@@ -84,12 +84,12 @@
<!-- Copy scripts -->
<copy todir="${tomcat.build}/bin">
<fileset dir="bin">
-@@ -1239,7 +1178,7 @@
+@@ -1198,7 +1198,7 @@
</target>
-- <target name="test-compile" depends="compile,download-test-compile" >
-+ <target name="test-compile" depends="compile" >
+- <target name="test-compile" depends="compile,download-test-compile,compile-webapp-examples" >
++ <target name="test-compile" depends="compile,compile-webapp-examples" >
<mkdir dir="${test.classes}"/>
<!-- Compile -->
<javac srcdir="test" destdir="${test.classes}"
@@ -194,296 +194,3 @@
<mkdir dir="${tomcat.dist}"/>
<mkdir dir="${tomcat.dist}/bin"/>
<mkdir dir="${tomcat.dist}/conf"/>
-@@ -2602,292 +2488,6 @@
- </target>
-
-
-- <!-- ================ Download and dependency building =================== -->
--
-- <target name="download-validate"
-- description="Download components necessary to validate source"
-- if="${execute.validate}">
--
-- <antcall target="downloadzip">
-- <param name="sourcefile" value="${checkstyle.loc}"/>
-- <param name="destfile" value="${checkstyle.jar}"/>
-- <param name="destdir" value="${base.path}"/>
-- </antcall>
--
-- </target>
--
-- <target name="download-compile"
-- description="Download (and build) components necessary to compile" >
--
-- <antcall target="downloadfile-2">
-- <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
-- <param name="sourcefile.2" value="${tomcat-native.loc.2}"/>
-- <param name="destfile" value="${tomcat-native.tar.gz}"/>
-- <param name="destdir" value="${tomcat-native.home}"/>
-- </antcall>
--
-- <!-- Download Commons Daemon -->
-- <antcall target="downloadgz-2">
-- <param name="sourcefile.1" value="${commons-daemon.bin.loc.1}"/>
-- <param name="sourcefile.2" value="${commons-daemon.bin.loc.2}"/>
-- <param name="destfile" value="${commons-daemon.jar}"/>
-- </antcall>
--
-- <antcall target="downloadfile-2">
-- <param name="sourcefile.1" value="${commons-daemon.native.src.loc.1}"/>
-- <param name="sourcefile.2" value="${commons-daemon.native.src.loc.2}"/>
-- <param name="destfile" value="${commons-daemon.native.src.tgz}"/>
-- <param name="destdir" value="${commons-daemon.home}"/>
-- </antcall>
--
-- <!-- Download src and build Tomcat DBCP bundle -->
-- <antcall target="downloadgz-2">
-- <param name="sourcefile.1" value="${commons-pool-src.loc.1}"/>
-- <param name="sourcefile.2" value="${commons-pool-src.loc.2}"/>
-- <param name="destfile" value="${commons-pool.home}/build.xml" />
-- </antcall>
-- <antcall target="downloadgz-2">
-- <param name="sourcefile.1" value="${commons-dbcp-src.loc.1}"/>
-- <param name="sourcefile.2" value="${commons-dbcp-src.loc.2}"/>
-- <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>
-- <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" />
--
-- <!-- Download JDT (Eclipse compiler) -->
-- <antcall target="downloadfile-2">
-- <param name="sourcefile.1" value="${jdt.loc.1}"/>
-- <param name="sourcefile.2" value="${jdt.loc.2}"/>
-- <param name="destfile" value="${jdt.jar}"/>
-- <param name="destdir" value="${jdt.home}"/>
-- </antcall>
-- </target>
--
-- <target name="download-test-compile"
-- description="Download additional components for the tests" >
--
-- <antcall target="downloadfile">
-- <param name="sourcefile" value="${junit.loc}"/>
-- <param name="destfile" value="${junit.jar}"/>
-- <param name="destdir" value="${junit.home}"/>
-- </antcall>
--
-- <antcall target="downloadfile">
-- <param name="sourcefile" value="${hamcrest.loc}"/>
-- <param name="destfile" value="${hamcrest.jar}"/>
-- <param name="destdir" value="${hamcrest.home}"/>
-- </antcall>
--
-- </target>
--
-- <target name="download-cobertura"
-- if="${test.cobertura}"
-- description="Download the Cobertura code coverage tool" >
--
-- <antcall target="downloadgz">
-- <param name="sourcefile" value="${cobertura.loc}"/>
-- <param name="destfile" value="${cobertura.jar}"/>
-- </antcall>
--
-- </target>
--
-- <target name="download-dist"
-- description="Download additional components for a distribution" >
--
-- <antcall target="downloadzip-2">
-- <param name="sourcefile.1" value="${tomcat-native.win.1}"/>
-- <param name="sourcefile.2" value="${tomcat-native.win.2}"/>
-- <param name="destfile" value="${tomcat-native.home}/LICENSE"/>
-- <param name="destdir" value="${tomcat-native.home}"/>
-- </antcall>
--
-- <antcall target="downloadzip-2">
-- <param name="sourcefile.1" value="${commons-daemon.native.win.loc.1}"/>
-- <param name="sourcefile.2" value="${commons-daemon.native.win.loc.2}"/>
-- <param name="destfile" value="${commons-daemon.native.win.mgr.exe}"/>
-- <param name="destdir" value="${commons-daemon.native.win.home}"/>
-- </antcall>
--
-- <antcall target="downloadzip">
-- <param name="sourcefile" value="${nsis.loc}"/>
-- <param name="destfile" value="${nsis.exe}"/>
-- <param name="destdir" value="${nsis.home}/.."/>
-- </antcall>
--
-- </target>
--
--
-- <!-- =============== Targets for dependencies that need to =============== -->
-- <!-- ================ be built rather than used directly ================ -->
--
-- <target name="build-tomcat-dbcp" depends="build-manifests" unless="no.build.dbcp">
-- <copy todir="${tomcat-dbcp.home}">
-- <fileset dir="${commons-pool.home}">
-- <include name="**/*.java" />
-- <exclude name="**/test/**" />
-- </fileset>
-- <fileset dir="${commons-dbcp.home}">
-- <include name="**/*.java" />
-- <exclude name="**/test/**" />
-- <exclude name="**/managed/**" />
-- </fileset>
-- </copy>
-- <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons"
-- encoding="ISO-8859-1">
-- <replacefilter token="org.apache.commons"
-- value="org.apache.tomcat.dbcp" />
-- </replace>
-- <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons/pool/impl"
-- encoding="ISO-8859-1">
-- <replacefilter token="enum"
-- value="enumeration" />
-- </replace>
--
-- <mkdir dir="${tomcat-dbcp.home}/src/java/org/apache/tomcat/dbcp" />
-- <move todir="${tomcat-dbcp.home}/src/java/org/apache/tomcat/dbcp">
-- <fileset dir="${tomcat-dbcp.home}/src/java/org/apache/commons" />
-- </move>
-- <mkdir dir="${tomcat-dbcp.home}/classes"/>
-- <javac destdir="${tomcat-dbcp.home}/classes"
-- debug="${compile.debug}"
-- deprecation="${compile.deprecation}"
-- source="${compile.source}"
-- target="${compile.target}"
-- sourcepath="${tomcat-dbcp.home}/src/java"
-- srcdir="${tomcat-dbcp.home}/src/java"
-- encoding="ISO-8859-1"
-- includeantruntime="false">
-- <include name="**" />
-- </javac>
-- <jarIt jarfile="${tomcat-dbcp.jar}"
-- filesDir="${tomcat-dbcp.home}/classes"
-- filesId="files.tomcat-dbcp" />
-- <jarIt jarfile="${tomcat-dbcp-src.jar}"
-- filesDir="${tomcat-dbcp.home}/src/java"
-- filesId="files.tomcat-dbcp" />
-- </target>
--
-- <!-- =============== Utility Targets to support downloads ================ -->
--
-- <target name="proxyflags">
-- <!-- check proxy parameters. -->
-- <condition property="useproxy">
-- <equals arg1="${proxy.use}" arg2="on" />
-- </condition>
-- </target>
--
-- <target name="setproxy" depends="proxyflags" if="useproxy">
-- <taskdef name="setproxy"
-- classname="org.apache.tools.ant.taskdefs.optional.net.SetProxy" />
-- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
-- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
-- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
-- </target>
--
-- <target name="testexist">
-- <echo message="Testing for ${destfile}"/>
-- <available file="${destfile}" property="exist"/>
-- </target>
--
-- <target name="downloadgz" unless="exist" depends="setproxy,testexist">
-- <!-- Download and extract the package -->
-- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${base.path}/file.tar.gz" />
-- <gunzip src="${base.path}/file.tar.gz" dest="${base.path}/file.tar"/>
-- <untar src="${base.path}/file.tar" dest="${base.path}"/>
-- <delete file="${base.path}/file.tar"/>
-- <delete file="${base.path}/file.tar.gz"/>
-- </target>
--
-- <target name="downloadgz-2" unless="exist" depends="setproxy,testexist">
-- <!-- Download and extract the package from the two alternative locations -->
-- <delete file="${base.path}/file.tar" quiet="true" />
-- <delete file="${base.path}/file.tar.gz" quiet="true" />
-- <antcall target="trydownload">
-- <param name="sourcefile" value="${sourcefile.1}" />
-- <param name="destfile" value="${base.path}/file.tar.gz" />
-- </antcall>
-- <antcall target="trydownload">
-- <param name="sourcefile" value="${sourcefile.2}" />
-- <param name="destfile" value="${base.path}/file.tar.gz" />
-- </antcall>
-- <gunzip src="${base.path}/file.tar.gz" dest="${base.path}/file.tar"/>
-- <untar src="${base.path}/file.tar" dest="${base.path}"/>
-- <delete file="${base.path}/file.tar"/>
-- <delete file="${base.path}/file.tar.gz"/>
-- </target>
--
-- <target name="downloadzip" unless="exist" depends="setproxy,testexist">
-- <!-- Download and extract the package -->
-- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${base.path}/file.zip" />
-- <mkdir dir="${destdir}" />
-- <unzip src="${base.path}/file.zip" dest="${destdir}"/>
-- <delete file="${base.path}/file.zip"/>
-- </target>
--
-- <target name="downloadzip-2" unless="exist" depends="testexist">
-- <!-- Download and extract the package from the two alternative locations -->
-- <delete file="${base.path}/file.zip" quiet="true" />
-- <antcall target="trydownload">
-- <param name="sourcefile" value="${sourcefile.1}" />
-- <param name="destfile" value="${base.path}/file.zip" />
-- </antcall>
-- <antcall target="trydownload">
-- <param name="sourcefile" value="${sourcefile.2}" />
-- <param name="destfile" value="${base.path}/file.zip" />
-- </antcall>
-- <mkdir dir="${destdir}" />
-- <unzip src="${base.path}/file.zip" dest="${destdir}"/>
-- <delete file="${base.path}/file.zip"/>
-- </target>
--
-- <target name="downloadfile" unless="exist" depends="setproxy,testexist">
-- <!-- Download extract the file -->
-- <mkdir dir="${destdir}" />
-- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
-- </target>
--
-- <target name="downloadfile-2" unless="exist" depends="testexist">
-- <!-- Download the file from the two alternative locations -->
-- <mkdir dir="${destdir}" />
--
-- <antcall target="trydownload">
-- <param name="sourcefile" value="${sourcefile.1}" />
-- </antcall>
--
-- <antcall target="trydownload">
-- <param name="sourcefile" value="${sourcefile.2}" />
-- </antcall>
--
-- <available file="${destfile}" property="exist"/>
-- <fail unless="exist" message="Failed to download [${destfile}]. All download sources are unavailable." />
-- </target>
--
-- <target name="trydownload.check" depends="setproxy">
-- <condition property="trydownload.run">
-- <and>
-- <not>
-- <available file="${destfile}" />
-- </not>
-- <http url="${sourcefile}" />
-- </and>
-- </condition>
-- </target>
--
-- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
-- <!-- Downloads a file if not yet downloaded and the source URL is available -->
-- <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
-- </target>
--
- <!-- ============================ IDE Support ============================ -->
-
- <target name="ide-eclipse" depends="deploy, extras-webservices-prepare"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/tomcat.git/commitdiff/05c77d28b4acd1015925331988c5915e6af54817
More information about the pld-cvs-commit
mailing list