Author: marcusb-guest Date: 2006-10-23 11:28:11 +0000 (Mon, 23 Oct 2006) New Revision: 2649
Added: trunk/tomcat5.5/debian/patches/00_disable_deps_download.patch trunk/tomcat5.5/debian/patches/01_remove_unused_deps.patch Removed: trunk/tomcat5.5/debian/patches/00_disable_sourcechecking_download.patch trunk/tomcat5.5/debian/patches/02_dont_build_servlet_api_and_jsp_api.patch trunk/tomcat5.5/debian/patches/04_dont_copy_daemon.patch trunk/tomcat5.5/debian/patches/05_dont_build_and_fix_webapps.patch trunk/tomcat5.5/debian/patches/08_dont_copy_tomcatdbcp.patch Modified: trunk/tomcat5.5/debian/ant.properties trunk/tomcat5.5/debian/changelog trunk/tomcat5.5/debian/control trunk/tomcat5.5/debian/patches/06_dont_copy_tomcatnative.patch trunk/tomcat5.5/debian/patches/07_dont_copy_jasper_jdt_compiler.patch trunk/tomcat5.5/debian/patches/09_UseSystemDBCP.patch trunk/tomcat5.5/debian/patches/10_JSSEImplementation_RemoveJDK13Support.patch trunk/tomcat5.5/debian/rules Log: New upstream version. Modified: trunk/tomcat5.5/debian/ant.properties =================================================================== --- trunk/tomcat5.5/debian/ant.properties 2006-10-23 08:05:14 UTC (rev 2648) +++ trunk/tomcat5.5/debian/ant.properties 2006-10-23 11:28:11 UTC (rev 2649) @@ -1,5 +1,5 @@ -base.path=./debian/tmp activation.jar=/usr/share/java/activation.jar +commons-daemon.jar=/usr/share/java/commons-daemon.jar commons-fileupload.jar=/usr/share/java/commons-fileupload.jar commons-logging.jar=/usr/share/java/commons-logging.jar commons-logging-api.jar=/usr/share/java/commons-logging-api.jar @@ -7,10 +7,10 @@ commons-launcher.jar=/usr/share/java/commons-launcher.jar commons-el.jar=/usr/share/java/commons-el.jar commons-beanutils.jar=/usr/share/java/commons-beanutils.jar -servlet-api.jar=/usr/share/java/servlet-api.jar -jsp-api.jar=/usr/share/java/jsp-api.jar +commons-collections.jar=/usr/share/java/commons-collections3.jar +commons-digester.jar=/usr/share/java/commons-digester.jar +commons-httpclient.jar=/usr/share/java/commons-httpclient.jar struts.lib=/usr/share/struts1.2 -struts.jar=/usr/share/struts1.2/struts.jar xmlParserAPIs.jar=/usr/share/java/xmlParserAPIs.jar log4j.jar=/usr/share/java/log4j-1.2.jar mail.jar=/usr/share/java/gnumail.jar Modified: trunk/tomcat5.5/debian/changelog =================================================================== --- trunk/tomcat5.5/debian/changelog 2006-10-23 08:05:14 UTC (rev 2648) +++ trunk/tomcat5.5/debian/changelog 2006-10-23 11:28:11 UTC (rev 2649) @@ -1,3 +1,13 @@ +tomcat5.5 (5.5.20-1) unstable; urgency=low + + * New upstream release. + * Build JSP and servlet examples from source instead of copying them + from libservlet2.4-java. (Closes: #393905) + * debian/control: Add some missing dependencies. + * Enable commons-daemon functionality, it should work correctly by now. + + -- Marcus Better <[EMAIL PROTECTED]> Wed, 18 Oct 2006 12:57:19 +0200 + tomcat5.5 (5.5.17-2) unstable; urgency=low * debian/control: removed apache-utils version and added alternative Modified: trunk/tomcat5.5/debian/control =================================================================== --- trunk/tomcat5.5/debian/control 2006-10-23 08:05:14 UTC (rev 2648) +++ trunk/tomcat5.5/debian/control 2006-10-23 11:28:11 UTC (rev 2649) @@ -2,15 +2,15 @@ Section: web Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Stefan Gybas <[EMAIL PROTECTED]>, Arnaud Vandyck <[EMAIL PROTECTED]>, Wolfgang Baer <[EMAIL PROTECTED]> +Uploaders: Stefan Gybas <[EMAIL PROTECTED]>, Arnaud Vandyck <[EMAIL PROTECTED]>, Wolfgang Baer <[EMAIL PROTECTED]>, Marcus Better <[EMAIL PROTECTED]> Build-Depends: cdbs (>= 0.4.8), debhelper (>= 4.2.30) -Build-Depends-Indep: java-gcj-compat-dev, ant, libcommons-fileupload-java (>= 1.0-1), libcommons-launcher-java, libcommons-beanutils-java, libcommons-logging-java, libcommons-modeler-java (>= 1.1-1), libmx4j-java, libstruts1.2-java, libgnujaf-java, libgnumail-java, liblog4j1.2-java, libxerces2-java, libxalan2-java, junit, libcommons-el-java, libjessie-java, unzip, xsltproc +Build-Depends-Indep: java-gcj-compat-dev, ant, libcommons-beanutils-java, libcommons-daemon-java, libcommons-digester-java, libcommons-el-java, libcommons-fileupload-java (>= 1.0-1), libcommons-httpclient-java, libcommons-launcher-java, libcommons-logging-java, libcommons-modeler-java (>= 1.1-1), libgnujaf-java, libgnumail-java, libjessie-java, liblog4j1.2-java, libmx4j-java, libstruts1.2-java, libxerces2-java, libxalan2-java, junit, unzip, xsltproc Standards-Version: 3.7.2 Package: tomcat5.5 Architecture: all Depends: java-gcj-compat-dev (>= 1.0.30-5) | kaffe (>= 2:1.1.6-3) | java2-runtime, libtomcat5.5-java (>= ${Source-Version}), adduser (>= 3.34), apache2-utils | apache-utils | apache2.2-common, ecj-bootstrap -Suggests: java-virtual-machine, libapache-mod-jk | libapache2-mod-jk, tomcat5.5-webapps (>= ${Source-Version}), tomcat5.5-admin (>= ${Source-Version}) +Suggests: java-virtual-machine, libapache-mod-jk | libapache2-mod-jk, tomcat5.5-webapps (>= ${Source-Version}), tomcat5.5-admin (>= ${Source-Version}), jsvc Description: Java Servlet 2.4 engine with JSP 2.0 support Apache Tomcat 5 is the reference implementation for the Java Servlet 2.4 and JavaServer Pages (JSP) 2.0 specification from the Apache Jakarta project. Added: trunk/tomcat5.5/debian/patches/00_disable_deps_download.patch =================================================================== --- trunk/tomcat5.5/debian/patches/00_disable_deps_download.patch (rev 0) +++ trunk/tomcat5.5/debian/patches/00_disable_deps_download.patch 2006-10-23 11:28:11 UTC (rev 2649) @@ -0,0 +1,11 @@ +--- build/build.xml ++++ build/build.xml 2006-10-20 11:49:44.000000000 +0200 +@@ -1999,6 +1999,8 @@ + <target name="testexist"> + <echo message="Testing for ${destfile}"/> + <available file="${destfile}" property="exist"/> ++ <fail unless="exist" ++ message="Required file not found, and downloading disabled" /> + </target> + + <target name="downloadgz" unless="exist" depends="setproxy,testexist"> Deleted: trunk/tomcat5.5/debian/patches/00_disable_sourcechecking_download.patch =================================================================== --- trunk/tomcat5.5/debian/patches/00_disable_sourcechecking_download.patch 2006-10-23 08:05:14 UTC (rev 2648) +++ trunk/tomcat5.5/debian/patches/00_disable_sourcechecking_download.patch 2006-10-23 11:28:11 UTC (rev 2649) @@ -1,15 +0,0 @@ ---- build.xml.orig 2006-01-03 16:15:02.000000000 +0100 -+++ build.xml 2006-01-11 16:53:17.000000000 +0100 -@@ -42,10 +42,8 @@ - <property name="tomcat.home" - value="${basedir}/${tomcat.project}"/> - -- <target name="build" depends="check.source,get.source" -- description="Builds all components"> -- -- <ant dir="${tomcat.home}" target="download" /> -+ <target name="build" description="Builds all components"> -+ - <ant dir="${tomcat.home}" target="deploy" /> - - </target> Added: trunk/tomcat5.5/debian/patches/01_remove_unused_deps.patch =================================================================== --- trunk/tomcat5.5/debian/patches/01_remove_unused_deps.patch (rev 0) +++ trunk/tomcat5.5/debian/patches/01_remove_unused_deps.patch 2006-10-23 11:28:11 UTC (rev 2649) @@ -0,0 +1,15 @@ +--- build/build.xml ++++ build/build.xml 2006-10-20 12:12:20.000000000 +0200 +@@ -1955,12 +1956,6 @@ + <param name="destfile" value="${commons-httpclient.jar}"/> + </antcall> + +- <antcall target="downloadfile"> +- <param name="sourcefile" value="${nsis.loc}"/> +- <param name="destfile" value="${nsis.exe}"/> +- <param name="destdir" value="${nsis.home}"/> +- </antcall> +- + <antcall target="downloadgz"> + <param name="sourcefile" value="${struts.loc}"/> + <param name="destfile" value="${struts.jar}"/> Deleted: trunk/tomcat5.5/debian/patches/02_dont_build_servlet_api_and_jsp_api.patch =================================================================== --- trunk/tomcat5.5/debian/patches/02_dont_build_servlet_api_and_jsp_api.patch 2006-10-23 08:05:14 UTC (rev 2648) +++ trunk/tomcat5.5/debian/patches/02_dont_build_servlet_api_and_jsp_api.patch 2006-10-23 11:28:11 UTC (rev 2649) @@ -1,49 +0,0 @@ ---- build/build.xml.orig 2006-01-03 16:15:03.000000000 +0100 -+++ build/build.xml 2006-01-11 17:00:22.000000000 +0100 -@@ -95,6 +95,7 @@ - <mkdir dir="${tomcat.build}/server/lib" /> - <mkdir dir="${tomcat.build}/common/lib" /> - -+<!-- - <uptodate property="servletapi.build.notrequired" - targetfile="${servlet-api.jar}"> - <srcfiles dir="${api.home}/jsr154/src" includes="**" /> -@@ -104,6 +105,12 @@ - targetfile="${jsp-api.jar}"> - <srcfiles dir="${api.home}/jsr152/src" includes="**" /> - </uptodate> -+--> -+ -+ <property name="servletapi.build.notrequired" -+ value="false"/> -+ <property name="jspapi.build.notrequired" -+ value="false"/> - - <uptodate property="tomcatutil.build.notrequired" - targetfile="${tomcat.build}/server/lib/tomcat-util.jar"> -@@ -760,21 +767,20 @@ - <mkdir dir="${tomcat.build}/server/webapps" /> - - <!-- The build files are far too difficult to hack - just build it and copy --> -+<!-- - <ant dir="${api.home}/jsr154" target="dist"> - </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="**"/> -+ <fileset dir="/usr/share/doc/libservlet2.4-java/examples" includes="examples-servlet.war*"/> - </copy> - - <mkdir dir="${tomcat.build}/webapps/jsp-examples"/> - <copy todir="${tomcat.build}/webapps/jsp-examples"> -- <fileset dir="${api.home}/jsr152/build/examples"> -- <exclude name="WEB-INF/tagPlugins.xml" /> -- </fileset> -+ <fileset dir="/usr/share/doc/libservlet2.4-java/examples" includes="examples-jsp.war*"/> - </copy> - - <ant dir="${catalina.home}/webapps/ROOT" target="build-main"> Deleted: trunk/tomcat5.5/debian/patches/04_dont_copy_daemon.patch =================================================================== --- trunk/tomcat5.5/debian/patches/04_dont_copy_daemon.patch 2006-10-23 08:05:14 UTC (rev 2648) +++ trunk/tomcat5.5/debian/patches/04_dont_copy_daemon.patch 2006-10-23 11:28:11 UTC (rev 2649) @@ -1,14 +0,0 @@ ---- build/build.xml.orig 2006-01-11 17:01:48.000000000 +0100 -+++ build/build.xml 2006-01-11 17:06:15.000000000 +0100 -@@ -158,9 +158,9 @@ - - <copy todir="${tomcat.build}/server/lib" file="${commons-modeler.jar}" /> - -- <copy todir="${tomcat.build}/bin" file="${commons-daemon.jar}" /> -+<!-- <copy todir="${tomcat.build}/bin" file="${commons-daemon.jar}" /> - <copy todir="${tomcat.build}/bin" file="${commons-daemon.jsvc.tar.gz}" -- failonerror="false" /> -+ failonerror="false" />--> - - <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" - file="${tomcat-native.tar.gz}" /> Deleted: trunk/tomcat5.5/debian/patches/05_dont_build_and_fix_webapps.patch =================================================================== --- trunk/tomcat5.5/debian/patches/05_dont_build_and_fix_webapps.patch 2006-10-23 08:05:14 UTC (rev 2648) +++ trunk/tomcat5.5/debian/patches/05_dont_build_and_fix_webapps.patch 2006-10-23 11:28:11 UTC (rev 2649) @@ -1,13 +0,0 @@ ---- build/build.xml.orig 2006-01-11 17:06:15.000000000 +0100 -+++ build/build.xml 2006-01-11 17:08:07.000000000 +0100 -@@ -830,8 +830,8 @@ - </ant> - - <!-- Precompiling and fixing webapps --> -- <antcall target="build-webapps-precompile" /> -- <antcall target="fix-webapps" /> -+<!-- <antcall target="build-webapps-precompile" /> -+ <antcall target="fix-webapps" />--> - - </target> - Modified: trunk/tomcat5.5/debian/patches/06_dont_copy_tomcatnative.patch =================================================================== --- trunk/tomcat5.5/debian/patches/06_dont_copy_tomcatnative.patch 2006-10-23 08:05:14 UTC (rev 2648) +++ trunk/tomcat5.5/debian/patches/06_dont_copy_tomcatnative.patch 2006-10-23 11:28:11 UTC (rev 2649) @@ -11,3 +11,16 @@ <!-- <copy todir="${tomcat.build}/common/lib" file="${ant.jar}"/> <copy todir="${tomcat.build}/common/lib" file="${ant-launcher.jar}"/> --> +@@ -1971,12 +1966,6 @@ + <param name="destfile" value="${commons-daemon.jar}"/> + </antcall> + +- <antcall target="downloadfile"> +- <param name="sourcefile" value="${tomcat-native.loc}"/> +- <param name="destfile" value="${tomcat-native.tar.gz}"/> +- <param name="destdir" value="${tomcat-native.home}"/> +- </antcall> +- + <!-- Build the dependencies that are not yet released --> + <antcall target="build-depends"/> + Modified: trunk/tomcat5.5/debian/patches/07_dont_copy_jasper_jdt_compiler.patch =================================================================== --- trunk/tomcat5.5/debian/patches/07_dont_copy_jasper_jdt_compiler.patch 2006-10-23 08:05:14 UTC (rev 2648) +++ trunk/tomcat5.5/debian/patches/07_dont_copy_jasper_jdt_compiler.patch 2006-10-23 11:28:11 UTC (rev 2649) @@ -9,3 +9,17 @@ </target> <!-- ====================== Build all components =================== --> +@@ -668,13 +668,6 @@ + </antcall> + + <antcall target="build-tomcat-dbcp" /> +- +- <antcall target="downloadzip"> +- <param name="sourcefile" value="${jdt.loc}"/> +- <param name="destfile" value="${jdt.jar}"/> +- <param name="destdir" value="${base.path}"/> +- </antcall> +- <antcall target="build-jasper-compiler-jdt" /> + </target> + + <target name="build-tomcat-dbcp"> Deleted: trunk/tomcat5.5/debian/patches/08_dont_copy_tomcatdbcp.patch =================================================================== --- trunk/tomcat5.5/debian/patches/08_dont_copy_tomcatdbcp.patch 2006-10-23 08:05:14 UTC (rev 2648) +++ trunk/tomcat5.5/debian/patches/08_dont_copy_tomcatdbcp.patch 2006-10-23 11:28:11 UTC (rev 2649) @@ -1,13 +0,0 @@ ---- container/catalina/build.xml.orig 2005-10-15 21:07:04.000000000 +0200 -+++ container/catalina/build.xml 2005-10-15 22:00:46.000000000 +0200 -@@ -557,8 +557,8 @@ - <!-- - <copy todir="${catalina.build}/common/lib" file="${servlet-api.jar}"/> - --> -- <copy todir="${catalina.build}/common/lib" -- file="${tomcat-dbcp.jar}" /> -+<!-- <copy todir="${catalina.build}/common/lib" -+ file="${tomcat-dbcp.jar}" />--> - - <!-- Configuration Files --> - <copy todir="${catalina.build}/conf"> Modified: trunk/tomcat5.5/debian/patches/09_UseSystemDBCP.patch =================================================================== --- trunk/tomcat5.5/debian/patches/09_UseSystemDBCP.patch 2006-10-23 08:05:14 UTC (rev 2648) +++ trunk/tomcat5.5/debian/patches/09_UseSystemDBCP.patch 2006-10-23 11:28:11 UTC (rev 2649) @@ -1,6 +1,6 @@ --- container/catalina/src/share/org/apache/naming/factory/Constants.java.orig 2006-01-03 16:15:11.000000000 +0100 +++ container/catalina/src/share/org/apache/naming/factory/Constants.java 2006-01-27 11:04:59.000000000 +0100 -@@ -42,7 +42,7 @@ +@@ -42,8 +42,8 @@ Package + ".EjbFactory"; public static final String DBCP_DATASOURCE_FACTORY = @@ -9,3 +9,42 @@ public static final String OPENEJB_EJB_FACTORY = Package + ".OpenEjbFactory"; + +--- build/build.xml 2006-10-20 12:25:20.000000000 +0200 ++++ build/build.xml 2006-10-20 12:47:43.000000000 +0200 +@@ -653,22 +653,7 @@ + + <!-- <antcall target="build-commons-modeler" /> --> + <!-- <antcall target="build-commons-daemon" /> --> +- +- <antcall target="downloadgz"> +- <param name="sourcefile" value="${commons-collections-src.loc}"/> +- <param name="destfile" value="${tomcat-dbcp.jar}" /> +- </antcall> +- <antcall target="downloadgz"> +- <param name="sourcefile" value="${commons-pool-src.loc}"/> +- <param name="destfile" value="${tomcat-dbcp.jar}" /> +- </antcall> +- <antcall target="downloadgz"> +- <param name="sourcefile" value="${commons-dbcp-src.loc}"/> +- <param name="destfile" value="${tomcat-dbcp.jar}" /> +- </antcall> +- +- <antcall target="build-tomcat-dbcp" /> + </target> + + <target name="build-tomcat-dbcp"> + +--- container/catalina/build.xml.orig 2005-10-15 21:07:04.000000000 +0200 ++++ container/catalina/build.xml 2005-10-15 22:00:46.000000000 +0200 +@@ -557,8 +557,8 @@ + <!-- + <copy todir="${catalina.build}/common/lib" file="${servlet-api.jar}"/> + --> +- <copy todir="${catalina.build}/common/lib" +- file="${tomcat-dbcp.jar}" /> ++<!-- <copy todir="${catalina.build}/common/lib" ++ file="${tomcat-dbcp.jar}" />--> + + <!-- Configuration Files --> + <copy todir="${catalina.build}/conf"> Modified: trunk/tomcat5.5/debian/patches/10_JSSEImplementation_RemoveJDK13Support.patch =================================================================== --- trunk/tomcat5.5/debian/patches/10_JSSEImplementation_RemoveJDK13Support.patch 2006-10-23 08:05:14 UTC (rev 2648) +++ trunk/tomcat5.5/debian/patches/10_JSSEImplementation_RemoveJDK13Support.patch 2006-10-23 11:28:11 UTC (rev 2649) @@ -1,24 +1,22 @@ ---- connectors/util/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java.orig 2005-10-15 14:43:19.000000000 +0200 -+++ connectors/util/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java 2005-10-15 14:45:54.000000000 +0200 -@@ -36,8 +36,8 @@ +--- connectors/util/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java ++++ connectors/util/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java 2006-10-18 13:18:26.000000000 +0200 +@@ -36,8 +36,6 @@ "org.apache.tomcat.util.net.jsse.JSSE15Factory"; static final String JSSE14Factory = "org.apache.tomcat.util.net.jsse.JSSE14Factory"; - static final String JSSE13Factory = -- "org.apache.tomcat.util.net.jsse.JSSE13Support"; -+// static final String JSSE13Factory = -+// "org.apache.tomcat.util.net.jsse.JSSE13Support"; +- "org.apache.tomcat.util.net.jsse.JSSE13Factory"; static final String SSLSocketClass = "javax.net.ssl.SSLSocket"; static org.apache.commons.logging.Log logger = -@@ -67,7 +67,9 @@ +@@ -67,7 +65,9 @@ } } } if(factory == null) { - factory = new JSSE13Factory(); -+ if(logger.isDebugEnabled()) { -+ logger.debug("Error getting JDK 14/15 factory - JDK 1.3 is not supported by Debian package !"); -+ } ++ if(logger.isDebugEnabled()) { ++ logger.debug("Error getting JDK 14/15 factory - JDK 1.3 is not supported by Debian package !"); ++ } } } Modified: trunk/tomcat5.5/debian/rules =================================================================== --- trunk/tomcat5.5/debian/rules 2006-10-23 08:05:14 UTC (rev 2648) +++ trunk/tomcat5.5/debian/rules 2006-10-23 11:28:11 UTC (rev 2649) @@ -14,8 +14,9 @@ JAVA_HOME := /usr/lib/jvm/java-gcj ANT_HOME := /usr/share/ant +ANT_ARGS := -Dbase.path=$(CURDIR)/build/tmp -DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar +DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar xercesImpl xalan2 DEB_ANT_BUILD_TARGET := build DEB_ANT_CLEAN_TARGET := xxx @@ -33,6 +34,7 @@ -rm -r build/build -rm -r build/compat -rm -r build/deployer + -rm -r build/tmp -rm connectors/jk/jkstatus/dist/tomcat-jkstatus-ant.jar -rm -f LICENSE @@ -45,11 +47,3 @@ cd $(CATALINA_SRCDIR)/webapps/docs && cp -R WEB-INF ../../../$(TOMCAT_BUILD)/webapps/tomcat-docs/ # copy the RELEASE_NOTES into the tomcat-docs webapp cp $(TOMCAT_SRCDIR)/RELEASE-NOTES $(TOMCAT_BUILD)/webapps/ROOT/RELEASE-NOTES.txt - - gunzip $(TOMCAT_BUILD)/webapps/jsp-examples/examples-jsp.war.gz - gunzip $(TOMCAT_BUILD)/webapps/servlets-examples/examples-servlet.war.gz - unzip $(TOMCAT_BUILD)/webapps/jsp-examples/examples-jsp.war -d $(TOMCAT_BUILD)/webapps/jsp-examples/ - unzip $(TOMCAT_BUILD)/webapps/servlets-examples/examples-servlet.war \ - -d $(TOMCAT_BUILD)/webapps/servlets-examples/ - rm $(TOMCAT_BUILD)/webapps/jsp-examples/examples-jsp.war - rm $(TOMCAT_BUILD)/webapps/servlets-examples/examples-servlet.war _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
