[pkg-java] r11442 - in trunk/tomcat5.5/debian: . patches source
Niels Thykier
nthykier-guest at alioth.debian.org
Thu Jan 28 22:02:54 UTC 2010
Author: nthykier-guest
Date: 2010-01-28 22:02:52 +0000 (Thu, 28 Jan 2010)
New Revision: 11442
Added:
trunk/tomcat5.5/debian/patches/
trunk/tomcat5.5/debian/patches/series
trunk/tomcat5.5/debian/patches/tomcat5.5_5.5.26-5.diff
trunk/tomcat5.5/debian/source/
trunk/tomcat5.5/debian/source/format
Removed:
trunk/tomcat5.5/debian/context/
trunk/tomcat5.5/debian/libtomcat5.5-java.dirs
trunk/tomcat5.5/debian/libtomcat5.5-java.install
trunk/tomcat5.5/debian/libtomcat5.5-java.links
trunk/tomcat5.5/debian/policy/
trunk/tomcat5.5/debian/server.xml
trunk/tomcat5.5/debian/tomcat5.5-admin.dirs
trunk/tomcat5.5/debian/tomcat5.5-admin.install
trunk/tomcat5.5/debian/tomcat5.5-admin.links
trunk/tomcat5.5/debian/tomcat5.5-admin.postinst
trunk/tomcat5.5/debian/tomcat5.5-admin.prerm
trunk/tomcat5.5/debian/tomcat5.5-webapps.dirs
trunk/tomcat5.5/debian/tomcat5.5-webapps.install
trunk/tomcat5.5/debian/tomcat5.5-webapps.postinst
trunk/tomcat5.5/debian/tomcat5.5-webapps.postrm
trunk/tomcat5.5/debian/tomcat5.5-webapps.prerm
trunk/tomcat5.5/debian/tomcat5.5.default
trunk/tomcat5.5/debian/tomcat5.5.dirs
trunk/tomcat5.5/debian/tomcat5.5.docs
trunk/tomcat5.5/debian/tomcat5.5.examples
trunk/tomcat5.5/debian/tomcat5.5.init
trunk/tomcat5.5/debian/tomcat5.5.install
trunk/tomcat5.5/debian/tomcat5.5.links
trunk/tomcat5.5/debian/tomcat5.5.postinst
trunk/tomcat5.5/debian/tomcat5.5.postrm
trunk/tomcat5.5/debian/tomcat5.5.preinst
trunk/tomcat5.5/debian/tomcat55.cron.daily
Modified:
trunk/tomcat5.5/debian/changelog
trunk/tomcat5.5/debian/compat
trunk/tomcat5.5/debian/control
trunk/tomcat5.5/debian/rules
Log:
Discarded all binary packages and made a new one for jasper.
Switched to cdbs, debhelper 7, 3.0 (quilt).
Discarded all irrelevant files/dirs/settings to jasper.
Made a patch for all the changes that used to be in the diff.gz.
Modified: trunk/tomcat5.5/debian/changelog
===================================================================
--- trunk/tomcat5.5/debian/changelog 2010-01-28 21:37:22 UTC (rev 11441)
+++ trunk/tomcat5.5/debian/changelog 2010-01-28 22:02:52 UTC (rev 11442)
@@ -1,3 +1,13 @@
+tomcat5.5 (5.5.26-4) UNRELEASED; urgency=low
+
+ * Discard all binary packages and put jasper in its own package.
+ * Bumped debhelper compat to 7.
+ * Switched to cdbs instead of home-made debian/rules.
+ * Changed source to 3.0 (quilt) and moved all changes in the diff.gz
+ into its own patch.
+
+ -- Niels Thykier <niels at thykier.net> Thu, 28 Jan 2010 22:57:31 +0100
+
tomcat5.5 (5.5.26-3) unstable; urgency=high
* CVE-2008-1947: Fix XSS issue in host-manager web application.
Modified: trunk/tomcat5.5/debian/compat
===================================================================
--- trunk/tomcat5.5/debian/compat 2010-01-28 21:37:22 UTC (rev 11441)
+++ trunk/tomcat5.5/debian/compat 2010-01-28 22:02:52 UTC (rev 11442)
@@ -1 +1 @@
-5
+7
Modified: trunk/tomcat5.5/debian/control
===================================================================
--- trunk/tomcat5.5/debian/control 2010-01-28 21:37:22 UTC (rev 11441)
+++ trunk/tomcat5.5/debian/control 2010-01-28 22:02:52 UTC (rev 11442)
@@ -2,53 +2,24 @@
Section: web
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <avdyk at debian.org>, Marcus Better <marcus at better.se>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 5.0.0)
-Build-Depends-Indep: java-gcj-compat-dev, ant, ant-optional, libcommons-beanutils-java, libcommons-daemon-java, libcommons-digester-java, libcommons-el-java, libcommons-fileupload-java, libcommons-httpclient-java, libcommons-launcher-java, libcommons-logging-java, libcommons-modeler-java (>= 2.0), liblog4j1.2-java, libmx4j-java, libstruts1.2-java, libxerces2-java, libxalan2-java, junit, unzip, libgnumail-java
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Marcus Better <marcus at better.se>,
+ Michael Koch <konqueror at gmx.de>, Niels Thykier <niels at thykier.net>
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant,
+Build-Depends-Indep: libcommons-beanutils-java, libcommons-daemon-java, libcommons-digester-java, libcommons-el-java, libcommons-fileupload-java, libcommons-httpclient-java, libcommons-launcher-java, libcommons-logging-java, libcommons-modeler-java (>= 2.0), liblog4j1.2-java, libmx4j-java, libstruts1.2-java, libxerces2-java, libxalan2-java, junit, unzip, libgnumail-java
Standards-Version: 3.7.3
Homepage: http://tomcat.apache.org
Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/tomcat5.5
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/tomcat5.5/
-Package: tomcat5.5
+Package: libjasper-java
Architecture: all
-Depends: java-gcj-compat-dev (>= 1.0.30-5) | java2-runtime, libtomcat5.5-java (>= ${source:Version}), adduser (>= 3.34), libecj-java, jsvc (>= 1.0.2~svn20061127-6)
-Suggests: java-virtual-machine, libapache2-mod-jk, tomcat5.5-webapps (>= ${source:Version}), tomcat5.5-admin (>= ${source:Version})
-Conflicts: tomcat5.5-admin (<= 5.5.20-5)
-Description: Servlet and JSP engine
- Apache Tomcat is the reference implementation for the Java Servlet
- and JavaServer Pages technologies.
- .
- This package just contains the startup scripts for the daemon. No
- documentation or web applications are included here, please install
- the tomcat5.5-webapps package if you want them.
-
-Package: libtomcat5.5-java
-Architecture: all
-Depends: libxerces2-java, libservlet2.4-java, libcommons-el-java, ant, libcommons-launcher-java, libcommons-logging-java, libcommons-modeler-java (>= 2.0), libmx4j-java, libcommons-collections3-java, libcommons-dbcp-java, libcommons-pool-java
-Suggests: tomcat5.5
+Section: java
+Depends: default-jre-headless | java2-runtime-headless |
+ java5-runtime-headless | java6-runtime-headless,
+ ${misc:Depends}
Description: Java Servlet engine -- core libraries
Apache Tomcat is the reference implementation for the Java Servlet
and JavaServer Pages technologies.
.
This package contains the Tomcat core classes which can be used by other
Java applications to embed Tomcat.
-
-Package: tomcat5.5-webapps
-Architecture: all
-Depends: tomcat5.5 (>= ${source:Version})
-Description: Java Servlet engine -- documentation and example web applications
- Apache Tomcat is the reference implementation for the Java Servlet
- and JavaServer Pages technologies.
- .
- This package contains the HTML documentation and some web applications
- that are bundled with Tomcat.
-
-Package: tomcat5.5-admin
-Architecture: all
-Depends: tomcat5.5 (>= ${source:Version}), libstruts1.2-java, libcommons-beanutils-java, libcommons-collections3-java, libcommons-digester-java, libcommons-fileupload-java, libcommons-io-java
-Description: Java Servlet engine -- admin & manager web interfaces
- Apache Tomcat is the reference implementation for the Java Servlet
- and JavaServer Pages technologies.
- .
- This package contains the administrative web interfaces.
Deleted: trunk/tomcat5.5/debian/libtomcat5.5-java.dirs
===================================================================
--- trunk/tomcat5.5/debian/libtomcat5.5-java.dirs 2010-01-28 21:37:22 UTC (rev 11441)
+++ trunk/tomcat5.5/debian/libtomcat5.5-java.dirs 2010-01-28 22:02:52 UTC (rev 11442)
@@ -1 +0,0 @@
-/usr/share/tomcat5.5
Deleted: trunk/tomcat5.5/debian/libtomcat5.5-java.install
===================================================================
--- trunk/tomcat5.5/debian/libtomcat5.5-java.install 2010-01-28 21:37:22 UTC (rev 11441)
+++ trunk/tomcat5.5/debian/libtomcat5.5-java.install 2010-01-28 22:02:52 UTC (rev 11442)
@@ -1,4 +0,0 @@
-build/dist/bin /usr/share/tomcat5.5
-build/dist/common /usr/share/tomcat5.5
-build/dist/server/classes /usr/share/tomcat5.5/server
-build/dist/server/lib /usr/share/tomcat5.5/server
Deleted: trunk/tomcat5.5/debian/libtomcat5.5-java.links
===================================================================
--- trunk/tomcat5.5/debian/libtomcat5.5-java.links 2010-01-28 21:37:22 UTC (rev 11441)
+++ trunk/tomcat5.5/debian/libtomcat5.5-java.links 2010-01-28 22:02:52 UTC (rev 11442)
@@ -1,15 +0,0 @@
-/usr/share/java/commons-logging-api.jar /usr/share/tomcat5.5/bin/commons-logging-api.jar
-
-/usr/share/java/commons-el.jar /usr/share/tomcat5.5/common/lib/commons-el.jar
-/usr/share/java/jsp-api.jar /usr/share/tomcat5.5/common/lib/jsp-api.jar
-/usr/share/java/servlet-api.jar /usr/share/tomcat5.5/common/lib/servlet-api.jar
-/usr/share/java/ecj.jar /usr/share/tomcat5.5/common/lib/jasper-compiler-jdt.jar
-/usr/share/java/commons-pool.jar /usr/share/tomcat5.5/common/lib/commons-pool.jar
-/usr/share/java/commons-collections3.jar /usr/share/tomcat5.5/common/lib/commons-collections3.jar
-/usr/share/java/commons-dbcp.jar /usr/share/tomcat5.5/common/lib/commons-dbcp.jar
-
-/usr/share/java/commons-modeler.jar /usr/share/tomcat5.5/server/lib/commons-modeler.jar
-
-/usr/share/tomcat5.5/server/lib/catalina-ant.jar /usr/share/ant/lib/catalina5.5-ant.jar
-/usr/share/tomcat5.5/server/lib/catalina-ant-jmx.jar /usr/share/ant/lib/catalina5.5-ant-jmx.jar
-/usr/share/tomcat5.5/server/lib/tomcat-jkstatus-ant.jar /usr/share/ant/lib/tomcat5.5-jkstatus-ant.jar
Added: trunk/tomcat5.5/debian/patches/series
===================================================================
--- trunk/tomcat5.5/debian/patches/series (rev 0)
+++ trunk/tomcat5.5/debian/patches/series 2010-01-28 22:02:52 UTC (rev 11442)
@@ -0,0 +1 @@
+tomcat5.5_5.5.26-5.diff
Added: trunk/tomcat5.5/debian/patches/tomcat5.5_5.5.26-5.diff
===================================================================
--- trunk/tomcat5.5/debian/patches/tomcat5.5_5.5.26-5.diff (rev 0)
+++ trunk/tomcat5.5/debian/patches/tomcat5.5_5.5.26-5.diff 2010-01-28 22:02:52 UTC (rev 11442)
@@ -0,0 +1,524 @@
+Description: All changes to orig.tar.gz stored in the diff.gz up to 5.5.26-5
+
+--- tomcat5.5-5.5.26.orig/build.xml
++++ tomcat5.5-5.5.26/build.xml
+@@ -64,7 +64,7 @@
+ description="Builds all components">
+
+ <ant dir="${tomcat.home}" target="download" />
+- <ant dir="${tomcat.home}" target="deploy" />
++ <ant dir="${tomcat.home}" target="dist" />
+
+ </target>
+
+--- tomcat5.5-5.5.26.orig/connectors/jk/java/org/apache/jk/common/JkInputStream.java
++++ tomcat5.5-5.5.26/connectors/jk/java/org/apache/jk/common/JkInputStream.java
+@@ -279,7 +279,10 @@
+ outputMsg.appendByte(AjpConstants.JK_AJP13_SEND_HEADERS);
+ outputMsg.appendInt( res.getStatus() );
+
+- String message=res.getMessage();
++ String message = null;
++ if (org.apache.coyote.Constants.USE_CUSTOM_STATUS_MSG_IN_HEADER) {
++ message = res.getMessage();
++ }
+ if( message==null ){
+ message= HttpMessages.getMessage(res.getStatus());
+ } else {
+--- tomcat5.5-5.5.26.orig/connectors/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java
++++ tomcat5.5-5.5.26/connectors/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java
+@@ -942,7 +942,10 @@
+
+ // HTTP header contents
+ responseHeaderMessage.appendInt(response.getStatus());
+- String message = response.getMessage();
++ String message = null;
++ if (org.apache.coyote.Constants.USE_CUSTOM_STATUS_MSG_IN_HEADER) {
++ message = response.getMessage();
++ }
+ if (message == null){
+ message = HttpMessages.getMessage(response.getStatus());
+ } else {
+--- tomcat5.5-5.5.26.orig/connectors/util/build.xml
++++ tomcat5.5-5.5.26/connectors/util/build.xml
+@@ -86,11 +86,14 @@
+ <javac srcdir="java"
+ destdir="${tomcat-util.build}/classes"
+ deprecation="${compile.deprecation}"
++ source="${compile.source}"
+ debug="${compile.debug}"
+ optimize="off"
+ verbose="off"
+- excludes="**/CVS/**">
++ nowarn="true">
+ <classpath refid="compile.classpath"/>
++ <exclude name="**/CVS/**" />
++ <exclude name="**/JSSE13*.java" />
+ <exclude name="**/util/net/jsse/*" unless="jsse.present"/>
+ <exclude name="**/util/log/CommonLogHandler.java" unless="commons-logging.present"/>
+ <exclude name="**/util/net/puretls/*" unless="puretls.present"/>
+--- tomcat5.5-5.5.26.orig/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
++++ tomcat5.5-5.5.26/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
+@@ -37,8 +37,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.JSSE13Factory";
+ static final String SSLSocketClass = "javax.net.ssl.SSLSocket";
+
+ static org.apache.commons.logging.Log logger =
+@@ -68,7 +66,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 !");
++ }
+ }
+ }
+
+--- tomcat5.5-5.5.26.orig/connectors/coyote/src/java/org/apache/coyote/Constants.java
++++ tomcat5.5-5.5.26/connectors/coyote/src/java/org/apache/coyote/Constants.java
+@@ -53,4 +53,12 @@
+ public static final int STAGE_ENDED = 7;
+
+
++ /**
++ * If true, custom HTTP status messages will be used in headers.
++ */
++ public static final boolean USE_CUSTOM_STATUS_MSG_IN_HEADER =
++ Boolean.valueOf(System.getProperty(
++ "org.apache.coyote.USE_CUSTOM_STATUS_MSG_IN_HEADER",
++ "false")).booleanValue();
++
+ }
+--- tomcat5.5-5.5.26.orig/connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java
++++ tomcat5.5-5.5.26/connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java
+@@ -264,6 +264,13 @@
+ }
+ }
+
++ // Check that the URI is still normalized
++ if (!checkNormalize(req.decodedURI())) {
++ res.setStatus(400);
++ res.setMessage("Invalid URI character encoding");
++ throw new IOException("Invalid URI character encoding");
++ }
++
+ // Parse cookies
+ parseCookies(req, request);
+
+@@ -654,6 +661,67 @@
+ }
+
+
++ /**
++ * Check that the URI is normalized following character decoding.
++ * <p>
++ * This method checks for "\", 0, "//", "/./" and "/../". This method will
++ * return false if sequences that are supposed to be normalized are still
++ * present in the URI.
++ *
++ * @param uriMB URI to be checked (should be chars)
++ */
++ public static boolean checkNormalize(MessageBytes uriMB) {
++
++ CharChunk uriCC = uriMB.getCharChunk();
++ char[] c = uriCC.getChars();
++ int start = uriCC.getStart();
++ int end = uriCC.getEnd();
++
++ int pos = 0;
++
++ // Check for '\' and 0
++ for (pos = start; pos < end; pos++) {
++ if (c[pos] == '\\') {
++ return false;
++ }
++ if (c[pos] == 0) {
++ return false;
++ }
++ }
++
++ // Check for "//"
++ for (pos = start; pos < (end - 1); pos++) {
++ if (c[pos] == '/') {
++ if (c[pos + 1] == '/') {
++ return false;
++ }
++ }
++ }
++
++ // Check for ending with "/." or "/.."
++ if (((end - start) >= 2) && (c[end - 1] == '.')) {
++ if ((c[end - 2] == '/')
++ || ((c[end - 2] == '.')
++ && (c[end - 3] == '/'))) {
++ return false;
++ }
++ }
++
++ // Check for "/./"
++ if (uriCC.indexOf("/./", 0, 3, 0) >= 0) {
++ return false;
++ }
++
++ // Check for "/../"
++ if (uriCC.indexOf("/../", 0, 4, 0) >= 0) {
++ return false;
++ }
++
++ return true;
++
++ }
++
++
+ // ------------------------------------------------------ Protected Methods
+
+
+--- tomcat5.5-5.5.26.orig/connectors/http11/src/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
++++ tomcat5.5-5.5.26/connectors/http11/src/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
+@@ -429,11 +429,14 @@
+ buf[pos++] = Constants.SP;
+
+ // Write message
+- String message = response.getMessage();
++ String message = null;
++ if (org.apache.coyote.Constants.USE_CUSTOM_STATUS_MSG_IN_HEADER) {
++ message = response.getMessage();
++ }
+ if (message == null) {
+ write(HttpMessages.getMessage(status));
+ } else {
+- write(message);
++ write(message.replace('\n', ' ').replace('\r', ' '));
+ }
+
+ // End the response status line
+--- tomcat5.5-5.5.26.orig/connectors/http11/src/java/org/apache/coyote/http11/InternalOutputBuffer.java
++++ tomcat5.5-5.5.26/connectors/http11/src/java/org/apache/coyote/http11/InternalOutputBuffer.java
+@@ -448,11 +448,14 @@
+ buf[pos++] = Constants.SP;
+
+ // Write message
+- String message = response.getMessage();
++ String message = null;
++ if (org.apache.coyote.Constants.USE_CUSTOM_STATUS_MSG_IN_HEADER) {
++ message = response.getMessage();
++ }
+ if (message == null) {
+ write(getMessage(status));
+ } else {
+- write(message);
++ write(message.replace('\n', ' ').replace('\r', ' '));
+ }
+
+ // End the response status line
+--- tomcat5.5-5.5.26.orig/build/build.xml
++++ tomcat5.5-5.5.26/build/build.xml
+@@ -176,12 +176,11 @@
+ <copy todir="${tomcat.build}/bin" file="${commons-daemon.jsvc.tar.gz}"
+ failonerror="false" />
+
+- <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
+- file="${tomcat-native.tar.gz}" />
++<!-- <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
++ file="${tomcat-native.tar.gz}" />-->
+
+ <!-- <copy todir="${tomcat.build}/common/lib" file="${ant.jar}"/>
+ <copy todir="${tomcat.build}/common/lib" file="${ant-launcher.jar}"/> -->
+- <copy todir="${tomcat.build}/common/lib" file="${jasper-compiler-jdt.jar}"/>
+ </target>
+
+ <!-- ====================== Build all components =================== -->
+@@ -293,6 +292,8 @@
+ <ant dir="${jtc.home}/jk/jkstatus" target="dist">
+ <property name="catalina.build" value="${tomcat.build}"/>
+ <property name="jtc.home" value="${jtc.home}"/>
++ <property name="jk.build" value="${tomcat.build}/tmp/tomcat-jkstatus-ant/build"/>
++ <property name="jk.dist" value="${tomcat.build}/tmp/tomcat-jkstatus-ant/dist"/>
+ </ant>
+
+ <!-- jkstatus ant API -->
+@@ -300,6 +301,7 @@
+ <ant dir="${jtc.home}/jk/jkstatus" target="copy">
+ <property name="catalina.build" value="${tomcat.build}"/>
+ <property name="jtc.home" value="${jtc.home}"/>
++ <property name="jk.dist" value="${tomcat.build}/tmp/tomcat-jkstatus-ant/dist"/>
+ </ant>
+
+ </target>
+@@ -671,29 +673,6 @@
+
+ <!-- <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" />
+-
+- <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">
+@@ -1956,12 +1935,6 @@
+ <param name="destfile" value="${commons-launcher.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}"/>
+@@ -1972,12 +1945,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"/>
+
+@@ -2000,6 +1967,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">
+--- tomcat5.5-5.5.26.orig/build/resources/log4j.properties
++++ tomcat5.5-5.5.26/build/resources/log4j.properties
+@@ -0,0 +1,9 @@
++log4j.rootCategory=info, stdout
++
++log4j.appender.stdout=org.apache.log4j.ConsoleAppender
++log4j.appender.stdout.layout.ConversionPattern=%r [%t] %-5p\: %-15c{2} - %m%n
++log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
++
++#log4j.category.org.apache.catalina=info
++
++#log4j.category.org.apache.jasper.compiler.Compiler=debug
+--- tomcat5.5-5.5.26.orig/container/catalina/build.xml
++++ tomcat5.5-5.5.26/container/catalina/build.xml
+@@ -566,8 +566,6 @@
+ <!--
+ <copy todir="${catalina.build}/common/lib" file="${servlet-api.jar}"/>
+ -->
+- <copy todir="${catalina.build}/common/lib"
+- file="${tomcat-dbcp.jar}" />
+
+ <!-- Configuration Files -->
+ <copy todir="${catalina.build}/conf">
+--- tomcat5.5-5.5.26.orig/container/catalina/src/share/org/apache/catalina/core/ApplicationContext.java
++++ tomcat5.5-5.5.26/container/catalina/src/share/org/apache/catalina/core/ApplicationContext.java
+@@ -379,10 +379,21 @@
+ throw new IllegalArgumentException
+ (sm.getString
+ ("applicationContext.requestDispatcher.iae", path));
++
++ // Get query string
++ String queryString = null;
++ int pos = path.indexOf('?');
++ if (pos >= 0) {
++ queryString = path.substring(pos + 1);
++ path = path.substring(0, pos);
++ }
++
+ path = normalize(path);
+ if (path == null)
+ return (null);
+
++ pos = path.length();
++
+ // Retrieve the thread local URI
+ MessageBytes uriMB = (MessageBytes) localUriMB.get();
+ if (uriMB == null) {
+@@ -394,15 +405,6 @@
+ uriMB.recycle();
+ }
+
+- // Get query string
+- String queryString = null;
+- int pos = path.indexOf('?');
+- if (pos >= 0) {
+- queryString = path.substring(pos + 1);
+- } else {
+- pos = path.length();
+- }
+-
+ // Retrieve the thread local mapping data
+ MappingData mappingData = (MappingData) localMappingData.get();
+ if (mappingData == null) {
+--- tomcat5.5-5.5.26.orig/container/catalina/src/share/org/apache/catalina/core/StandardContextValve.java
++++ tomcat5.5-5.5.26/container/catalina/src/share/org/apache/catalina/core/StandardContextValve.java
+@@ -119,8 +119,7 @@
+ || (requestPathMB.equalsIgnoreCase("/META-INF"))
+ || (requestPathMB.startsWithIgnoreCase("/WEB-INF/", 0))
+ || (requestPathMB.equalsIgnoreCase("/WEB-INF"))) {
+- String requestURI = request.getDecodedRequestURI();
+- notFound(requestURI, response);
++ notFound(response);
+ return;
+ }
+
+@@ -136,8 +135,7 @@
+ // Select the Wrapper to be used for this Request
+ Wrapper wrapper = request.getWrapper();
+ if (wrapper == null) {
+- String requestURI = request.getDecodedRequestURI();
+- notFound(requestURI, response);
++ notFound(response);
+ return;
+ }
+
+@@ -206,13 +204,12 @@
+ * application, but currently that code runs at the wrapper level rather
+ * than the context level.
+ *
+- * @param requestURI The request URI for the requested resource
+ * @param response The response we are creating
+ */
+- private void notFound(String requestURI, HttpServletResponse response) {
++ private void notFound(HttpServletResponse response) {
+
+ try {
+- response.sendError(HttpServletResponse.SC_NOT_FOUND, requestURI);
++ response.sendError(HttpServletResponse.SC_NOT_FOUND);
+ } catch (IllegalStateException e) {
+ ;
+ } catch (IOException e) {
+--- tomcat5.5-5.5.26.orig/container/catalina/src/share/org/apache/naming/factory/Constants.java
++++ tomcat5.5-5.5.26/container/catalina/src/share/org/apache/naming/factory/Constants.java
+@@ -43,7 +43,7 @@
+ Package + ".EjbFactory";
+
+ public static final String DBCP_DATASOURCE_FACTORY =
+- "org.apache.tomcat.dbcp.dbcp.BasicDataSourceFactory";
++ "org.apache.commons.dbcp.BasicDataSourceFactory";
+
+ public static final String OPENEJB_EJB_FACTORY =
+ Package + ".OpenEjbFactory";
+--- tomcat5.5-5.5.26.orig/container/catalina/src/bin/catalina.sh
++++ tomcat5.5-5.5.26/container/catalina/src/bin/catalina.sh
+@@ -130,8 +130,11 @@
+ fi
+ fi
+
++gcj=no
++"$_RUNJAVA" -version 2>&1 | grep -q "^gij (GNU libgcj)" && gcj=yes
++
+ # Add on extra jar files to CLASSPATH
+-if [ -n "$JSSE_HOME" ]; then
++if [ -n "$JSSE_HOME" -a "$gcj" != "yes" ]; then
+ CLASSPATH="$CLASSPATH":"$JSSE_HOME"/lib/jcert.jar:"$JSSE_HOME"/lib/jnet.jar:"$JSSE_HOME"/lib/jsse.jar
+ fi
+ CLASSPATH="$CLASSPATH":"$CATALINA_HOME"/bin/bootstrap.jar:"$CATALINA_HOME"/bin/commons-logging-api.jar
+@@ -164,7 +167,8 @@
+ fi
+
+ # Set juli LogManager if it is present
+-if [ -r "$CATALINA_HOME"/bin/tomcat-juli.jar ]; then
++# Dont use juli LogManager when running with gcj
++if [ -r "$CATALINA_HOME"/bin/tomcat-juli.jar -a "$gcj" != "yes" ]; then
+ JAVA_OPTS="$JAVA_OPTS "-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" "-Djava.util.logging.config.file="$CATALINA_BASE/conf/logging.properties"
+ fi
+
+@@ -256,6 +260,12 @@
+ shift
+ touch "$CATALINA_BASE"/logs/catalina.out
+ if [ "$1" = "-security" ] ; then
++ if [ "$gcj" = "yes" ]; then
++ echo "The java-gcj-compat-dev environment currently doesn't support"
++ echo "a security manager. Please check the TOMCAT5_SECURITY variable"
++ echo "in /etc/default/tomcat5.5."
++ exit 1
++ fi
+ echo "Using Security Manager"
+ shift
+ "$_RUNJAVA" $JAVA_OPTS $CATALINA_OPTS \
+--- tomcat5.5-5.5.26.orig/container/catalina/etc/bootstrap.MF
++++ tomcat5.5-5.5.26/container/catalina/etc/bootstrap.MF
+@@ -1,5 +1,5 @@
+ Manifest-Version: 1.0
+ Main-Class: org.apache.catalina.startup.Bootstrap
+-Class-Path: jmx.jar commons-daemon.jar commons-logging-api-1.1.1.jar tomcat-juli.jar
++Class-Path: jmx.jar commons-daemon.jar commons-logging-api.jar tomcat-juli.jar
+ Specification-Title: Catalina
+ Specification-Version: 1.0
+--- tomcat5.5-5.5.26.orig/container/webapps/admin/build.xml
++++ tomcat5.5-5.5.26/container/webapps/admin/build.xml
+@@ -197,10 +197,6 @@
+
+ <!-- ================ BUILD: Copy Static Files ========================== -->
+ <target name="build-static" depends="flags,flags.display,build-prepare,copy-struts.jar">
+- <copy todir="${webapps.build}/${webapp.name}/WEB-INF/lib" file="${commons-beanutils.jar}"/>
+- <copy tofile="${webapps.build}/${webapp.name}/WEB-INF/lib/commons-collections.jar"
+- file="${commons-collections.jar}"/>
+- <copy todir="${webapps.build}/${webapp.name}/WEB-INF/lib" file="${commons-digester.jar}"/>
+ <copy todir="${webapps.build}/${webapp.name}">
+ <fileset dir=".">
+ <exclude name="build.*"/>
+--- tomcat5.5-5.5.26.orig/container/webapps/host-manager/WEB-INF/classes/org/apache/catalina/hostmanager/HTMLHostManagerServlet.java
++++ tomcat5.5-5.5.26/container/webapps/host-manager/WEB-INF/classes/org/apache/catalina/hostmanager/HTMLHostManagerServlet.java
+@@ -21,6 +21,7 @@
+ import java.io.IOException;
+ import java.io.PrintWriter;
+ import java.io.StringWriter;
++import java.net.URLEncoder;
+ import java.text.MessageFormat;
+ import java.util.Iterator;
+ import java.util.Map;
+@@ -276,17 +277,20 @@
+ args = new Object[7];
+ args[0] = response.encodeURL
+ (request.getContextPath() +
+- "/html/start?name=" + hostName);
++ "/html/start?name=" +
++ URLEncoder.encode(hostName, "UTF-8"));
+ args[1] = hostsStart;
+ args[2] = response.encodeURL
+ (request.getContextPath() +
+- "/html/stop?name=" + hostName);
++ "/html/stop?name=" +
++ URLEncoder.encode(hostName, "UTF-8"));
+ args[3] = hostsStop;
+ args[4] = response.encodeURL
+ (request.getContextPath() +
+- "/html/remove?name=" + hostName);
++ "/html/remove?name=" +
++ URLEncoder.encode(hostName, "UTF-8"));
+ args[5] = hostsRemove;
+- args[6] = hostName;
++ args[6] = RequestUtil.filter(hostName);
+ if (host == this.host) {
+ writer.print(MessageFormat.format(
+ MANAGER_HOST_ROW_BUTTON_SECTION, args));
Modified: trunk/tomcat5.5/debian/rules
===================================================================
--- trunk/tomcat5.5/debian/rules 2010-01-28 21:37:22 UTC (rev 11441)
+++ trunk/tomcat5.5/debian/rules 2010-01-28 22:02:52 UTC (rev 11442)
@@ -1,83 +1,21 @@
#!/usr/bin/make -f
-SHELL = /bin/bash
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
-JAVA_HOME := /usr/lib/jvm/java-gcj
-DEB_JARS_BASE := /usr/share/java
-JAVACMD := $(JAVA_HOME)/bin/java
+DEB_ANT_CLEAN_TARGET :=
+DEB_ANT_BUILD_TARGET := build -propertyfile debian/ant.properties \
+ -Dbase.path=$(CURDIR)/build/tmp
+DEB_ANT_INSTALL_TARGET :=
-DEB_JARS := ant ant-launcher ant-trax xercesImpl xalan2
-DEB_CLASSPATH = $(shell for jar in $(DEB_JARS); do \
- if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; \
- if [ -f "$$jar".jar ]; then echo -n "$${jar}.jar:"; fi; \
- if [ -f $(DEB_JARS_BASE)/"$$jar" ]; then echo -n "$(DEB_JARS_BASE)/$${jar}:"; fi; \
- if [ -f $(DEB_JARS_BASE)/"$$jar".jar ]; then echo -n "$(DEB_JARS_BASE)/$${jar}.jar:"; fi; \
- done; \
- if [ -f "$(JAVA_HOME)/lib/tools.jar" ]; then echo -n "$(JAVA_HOME)/lib/tools.jar"; fi)
+JAVA_HOME := /usr/lib/jvm/default-java
-ANT_ARGS := -propertyfile debian/ant.properties \
- -Dbase.path=$(CURDIR)/build/tmp
-ANT_INVOKE := $(JAVACMD) -classpath $(DEB_CLASSPATH) \
- org.apache.tools.ant.Main $(ANT_ARGS)
+DEB_JARS := ant ant-launcher ant-trax xercesImpl xalan2
-PKGNAME := tomcat5.5
-TOMCAT_INSTALL_DIR := $(CURDIR)/debian/$(PKGNAME)
-TOMCAT_SHARE_DIR := $(TOMCAT_INSTALL_DIR)/usr/share/$(PKGNAME)
-TOMCAT_VARLIB_DIR := $(TOMCAT_INSTALL_DIR)/var/lib/$(PKGNAME)
-LIBTOMCAT_INSTALL_DIR := $(CURDIR)/debian/lib$(PKGNAME)-java
-LIBTOMCAT_SHARE_DIR := $(LIBTOMCAT_INSTALL_DIR)/usr/share/$(PKGNAME)
-
-build: build-stamp
-build-stamp:
- dh_testdir
- $(ANT_INVOKE) build
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
+clean::
rm -f build-stamp
rm -rf connectors/util/build connectors/jk/jkstatus/build
rm -rf build/{build,compat,deployer,dist,tmp,embed} LICENSE
rm -rf servletapi/{jsr152,jsr154}/{build,dist}
dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
- dh_installinit -- defaults 90 10
- dh_installcron --name=tomcat55
- # Prune files that should not be installed at all.
- rm -f build/dist/bin/{*.bat,commons-*.jar}
- dh_install
- # Prune extra installed files from the various packages.
- rm -f $(TOMCAT_SHARE_DIR)/bin/*.{jar,xml} \
- $(TOMCAT_VARLIB_DIR)/conf/{server,web,tomcat-users}.xml \
- $(TOMCAT_VARLIB_DIR)/conf/Catalina/localhost/* \
- $(TOMCAT_VARLIB_DIR)/conf/catalina.policy \
- $(LIBTOMCAT_SHARE_DIR)/bin/*.sh \
- $(LIBTOMCAT_SHARE_DIR)/common/lib/{commons-*,{jsp,servlet}-api.jar} \
- $(LIBTOMCAT_SHARE_DIR)/server/lib/commons-*
- find $(TOMCAT_VARLIB_DIR) -type f -exec chmod -x {} \+
- dh_link
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary-arch: build install
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
Deleted: trunk/tomcat5.5/debian/server.xml
===================================================================
--- trunk/tomcat5.5/debian/server.xml 2010-01-28 21:37:22 UTC (rev 11441)
+++ trunk/tomcat5.5/debian/server.xml 2010-01-28 22:02:52 UTC (rev 11442)
@@ -1,384 +0,0 @@
-<!-- Server Configuration File for Tomcat 5.5 on Debian
- You can find a more complete example in /usr/share/doc/tomcat5.5/examples/
- -->
-
-<!-- Note that component elements are nested corresponding to their
- parent-child relationships with each other -->
-
-<!-- A "Server" is a singleton element that represents the entire JVM,
- which may contain one or more "Service" instances. The Server
- listens for a shutdown command on the indicated port.
-
- Note: A "Server" is not itself a "Container", so you may not
- define subcomponents such as "Valves" or "Loggers" at this level.
- -->
-
-<Server port="8005" shutdown="SHUTDOWN">
-
- <!-- Comment these entries out to disable JMX MBeans support used for the
- administration web application -->
- <Listener className="org.apache.catalina.core.AprLifecycleListener" />
- <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" />
- <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
- <Listener className="org.apache.catalina.storeconfig.StoreConfigLifecycleListener"/>
-
- <!-- Global JNDI resources -->
- <GlobalNamingResources>
-
- <!-- Test entry for demonstration purposes -->
- <Environment name="simpleValue" type="java.lang.Integer" value="30"/>
-
- <!-- Editable user database that can also be used by
- UserDatabaseRealm to authenticate users -->
- <Resource name="UserDatabase" auth="Container"
- type="org.apache.catalina.UserDatabase"
- description="User database that can be updated and saved"
- factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
- pathname="conf/tomcat-users.xml" />
-
- </GlobalNamingResources>
-
- <!-- A "Service" is a collection of one or more "Connectors" that share
- a single "Container" (and therefore the web applications visible
- within that Container). Normally, that Container is an "Engine",
- but this is not required.
-
- Note: A "Service" is not itself a "Container", so you may not
- define subcomponents such as "Valves" or "Loggers" at this level.
- -->
-
- <!-- Define the Tomcat Stand-Alone Service -->
- <Service name="Catalina">
-
- <!-- A "Connector" represents an endpoint by which requests are received
- and responses are returned. Each Connector passes requests on to the
- associated "Container" (normally an Engine) for processing.
-
- By default, a non-SSL HTTP/1.1 Connector is established on port 8180.
- You can also enable an SSL HTTP/1.1 Connector on port 8443 by
- following the instructions below and uncommenting the second Connector
- entry. SSL support requires the following steps (see the SSL Config
- HOWTO in the Tomcat 5 documentation bundle for more detailed
- instructions):
- * If your JDK version 1.3 or prior, download and install JSSE 1.0.2 or
- later, and put the JAR files into "$JAVA_HOME/jre/lib/ext".
- * Execute:
- %JAVA_HOME%\bin\keytool -genkey -alias tomcat -keyalg RSA (Windows)
- $JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA (Unix)
- with a password value of "changeit" for both the certificate and
- the keystore itself.
-
- By default, DNS lookups are enabled when a web application calls
- request.getRemoteHost(). This can have an adverse impact on
- performance, so you can disable it by setting the
- "enableLookups" attribute to "false". When DNS lookups are disabled,
- request.getRemoteHost() will return the String version of the
- IP address of the remote client.
- -->
-
- <!-- Define a non-SSL HTTP/1.1 Connector on port 8180 -->
- <Connector port="8180" maxHttpHeaderSize="8192"
- maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
- enableLookups="false" redirectPort="8443" acceptCount="100"
- connectionTimeout="20000" disableUploadTimeout="true" />
- <!-- Note : To disable connection timeouts, set connectionTimeout value
- to 0 -->
-
- <!-- Note : To use gzip compression you could set the following properties :
-
- compression="on"
- compressionMinSize="2048"
- noCompressionUserAgents="gozilla, traviata"
- compressableMimeType="text/html,text/xml"
- -->
-
- <!-- Define a SSL HTTP/1.1 Connector on port 8443 -->
- <!--
- <Connector port="8443" maxHttpHeaderSize="8192"
- maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
- enableLookups="false" disableUploadTimeout="true"
- acceptCount="100" scheme="https" secure="true"
- clientAuth="false" sslProtocol="TLS" />
- -->
-
- <!-- Define an AJP 1.3 Connector on port 8009 -->
- <Connector port="8009"
- enableLookups="false" redirectPort="8443" protocol="AJP/1.3" />
-
- <!-- Define a Proxied HTTP/1.1 Connector on port 8082 -->
- <!-- See proxy documentation for more information about using this. -->
- <!--
- <Connector port="8082"
- maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
- enableLookups="false" acceptCount="100" connectionTimeout="20000"
- proxyPort="80" disableUploadTimeout="true" />
- -->
-
- <!-- An Engine represents the entry point (within Catalina) that processes
- every request. The Engine implementation for Tomcat stand alone
- analyzes the HTTP headers included with the request, and passes them
- on to the appropriate Host (virtual host). -->
-
- <!-- You should set jvmRoute to support load-balancing via AJP ie :
- <Engine name="Standalone" defaultHost="localhost" jvmRoute="jvm1">
- -->
-
- <!-- Define the top level container in our container hierarchy -->
- <Engine name="Catalina" defaultHost="localhost">
-
- <!-- The request dumper valve dumps useful debugging information about
- the request headers and cookies that were received, and the response
- headers and cookies that were sent, for all requests received by
- this instance of Tomcat. If you care only about requests to a
- particular virtual host, or a particular application, nest this
- element inside the corresponding <Host> or <Context> entry instead.
-
- For a similar mechanism that is portable to all Servlet 2.4
- containers, check out the "RequestDumperFilter" Filter in the
- example application (the source for this filter may be found in
- "$CATALINA_HOME/webapps/examples/WEB-INF/classes/filters").
-
- Request dumping is disabled by default. Uncomment the following
- element to enable it. -->
- <!--
- <Valve className="org.apache.catalina.valves.RequestDumperValve"/>
- -->
-
- <!-- Because this Realm is here, an instance will be shared globally -->
-
- <!-- This Realm uses the UserDatabase configured in the global JNDI
- resources under the key "UserDatabase". Any edits
- that are performed against this UserDatabase are immediately
- available for use by the Realm. -->
- <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
- resourceName="UserDatabase"/>
-
- <!-- Comment out the old realm but leave here for now in case we
- need to go back quickly -->
- <!--
- <Realm className="org.apache.catalina.realm.MemoryRealm" />
- -->
-
- <!-- Replace the above Realm with one of the following to get a Realm
- stored in a database and accessed via JDBC -->
-
- <!--
- <Realm className="org.apache.catalina.realm.JDBCRealm"
- driverName="org.gjt.mm.mysql.Driver"
- connectionURL="jdbc:mysql://localhost/authority"
- connectionName="test" connectionPassword="test"
- userTable="users" userNameCol="user_name" userCredCol="user_pass"
- userRoleTable="user_roles" roleNameCol="role_name" />
- -->
-
- <!--
- <Realm className="org.apache.catalina.realm.JDBCRealm"
- driverName="oracle.jdbc.driver.OracleDriver"
- connectionURL="jdbc:oracle:thin:@ntserver:1521:ORCL"
- connectionName="scott" connectionPassword="tiger"
- userTable="users" userNameCol="user_name" userCredCol="user_pass"
- userRoleTable="user_roles" roleNameCol="role_name" />
- -->
-
- <!--
- <Realm className="org.apache.catalina.realm.JDBCRealm"
- driverName="sun.jdbc.odbc.JdbcOdbcDriver"
- connectionURL="jdbc:odbc:CATALINA"
- userTable="users" userNameCol="user_name" userCredCol="user_pass"
- userRoleTable="user_roles" roleNameCol="role_name" />
- -->
-
- <!-- Define the default virtual host
- Note: XML Schema validation will not work with Xerces 2.2.
- -->
- <Host name="localhost" appBase="webapps"
- unpackWARs="true" autoDeploy="true"
- xmlValidation="false" xmlNamespaceAware="false">
-
- <!-- Defines a cluster for this node,
- By defining this element, means that every manager will be changed.
- So when running a cluster, only make sure that you have webapps in there
- that need to be clustered and remove the other ones.
- A cluster has the following parameters:
-
- className = the fully qualified name of the cluster class
-
- clusterName = a descriptive name for your cluster, can be anything
-
- mcastAddr = the multicast address, has to be the same for all the nodes
-
- mcastPort = the multicast port, has to be the same for all the nodes
-
- mcastBindAddr = bind the multicast socket to a specific address
-
- mcastTTL = the multicast TTL if you want to limit your broadcast
-
- mcastSoTimeout = the multicast readtimeout
-
- mcastFrequency = the number of milliseconds in between sending a "I'm alive" heartbeat
-
- mcastDropTime = the number a milliseconds before a node is considered "dead" if no heartbeat is received
-
- tcpThreadCount = the number of threads to handle incoming replication requests, optimal would be the same amount of threads as nodes
-
- tcpListenAddress = the listen address (bind address) for TCP cluster request on this host,
- in case of multiple ethernet cards.
- auto means that address becomes
- InetAddress.getLocalHost().getHostAddress()
-
- tcpListenPort = the tcp listen port
-
- tcpSelectorTimeout = the timeout (ms) for the Selector.select() method in case the OS
- has a wakup bug in java.nio. Set to 0 for no timeout
-
- printToScreen = true means that managers will also print to std.out
-
- expireSessionsOnShutdown = true means that
-
- useDirtyFlag = true means that we only replicate a session after setAttribute,removeAttribute has been called.
- false means to replicate the session after each request.
- false means that replication would work for the following piece of code: (only for SimpleTcpReplicationManager)
- <%
- HashMap map = (HashMap)session.getAttribute("map");
- map.put("key","value");
- %>
- replicationMode = can be either 'pooled', 'synchronous' or 'asynchronous'.
- * Pooled means that the replication happens using several sockets in a synchronous way. Ie, the data gets replicated, then the request return. This is the same as the 'synchronous' setting except it uses a pool of sockets, hence it is multithreaded. This is the fastest and safest configuration. To use this, also increase the nr of tcp threads that you have dealing with replication.
- * Synchronous means that the thread that executes the request, is also the
- thread the replicates the data to the other nodes, and will not return until all
- nodes have received the information.
- * Asynchronous means that there is a specific 'sender' thread for each cluster node,
- so the request thread will queue the replication request into a "smart" queue,
- and then return to the client.
- The "smart" queue is a queue where when a session is added to the queue, and the same session
- already exists in the queue from a previous request, that session will be replaced
- in the queue instead of replicating two requests. This almost never happens, unless there is a
- large network delay.
- -->
- <!--
- When configuring for clustering, you also add in a valve to catch all the requests
- coming in, at the end of the request, the session may or may not be replicated.
- A session is replicated if and only if all the conditions are met:
- 1. useDirtyFlag is true or setAttribute or removeAttribute has been called AND
- 2. a session exists (has been created)
- 3. the request is not trapped by the "filter" attribute
-
- The filter attribute is to filter out requests that could not modify the session,
- hence we don't replicate the session after the end of this request.
- The filter is negative, ie, anything you put in the filter, you mean to filter out,
- ie, no replication will be done on requests that match one of the filters.
- The filter attribute is delimited by ;, so you can't escape out ; even if you wanted to.
-
- filter=".*\.gif;.*\.js;" means that we will not replicate the session after requests with the URI
- ending with .gif and .js are intercepted.
-
- The deployer element can be used to deploy apps cluster wide.
- Currently the deployment only deploys/undeploys to working members in the cluster
- so no WARs are copied upons startup of a broken node.
- The deployer watches a directory (watchDir) for WAR files when watchEnabled="true"
- When a new war file is added the war gets deployed to the local instance,
- and then deployed to the other instances in the cluster.
- When a war file is deleted from the watchDir the war is undeployed locally
- and cluster wide
- -->
-
- <!--
- <Cluster className="org.apache.catalina.cluster.tcp.SimpleTcpCluster"
- managerClassName="org.apache.catalina.cluster.session.DeltaManager"
- expireSessionsOnShutdown="false"
- useDirtyFlag="true"
- notifyListenersOnReplication="true">
-
- <Membership
- className="org.apache.catalina.cluster.mcast.McastService"
- mcastAddr="228.0.0.4"
- mcastPort="45564"
- mcastFrequency="500"
- mcastDropTime="3000"/>
-
- <Receiver
- className="org.apache.catalina.cluster.tcp.ReplicationListener"
- tcpListenAddress="auto"
- tcpListenPort="4001"
- tcpSelectorTimeout="100"
- tcpThreadCount="6"/>
-
- <Sender
- className="org.apache.catalina.cluster.tcp.ReplicationTransmitter"
- replicationMode="pooled"
- ackTimeout="15000"/>
-
- <Valve className="org.apache.catalina.cluster.tcp.ReplicationValve"
- filter=".*\.gif;.*\.js;.*\.jpg;.*\.png;.*\.htm;.*\.html;.*\.css;.*\.txt;"/>
-
- <Deployer className="org.apache.catalina.cluster.deploy.FarmWarDeployer"
- tempDir="/tmp/war-temp/"
- deployDir="/tmp/war-deploy/"
- watchDir="/tmp/war-listen/"
- watchEnabled="false"/>
-
- <ClusterListener className="org.apache.catalina.cluster.session.ClusterSessionListener"/>
- </Cluster>
- -->
-
-
-
- <!-- Normally, users must authenticate themselves to each web app
- individually. Uncomment the following entry if you would like
- a user to be authenticated the first time they encounter a
- resource protected by a security constraint, and then have that
- user identity maintained across *all* web applications contained
- in this virtual host. -->
- <!--
- <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
- -->
-
- <!-- Access log processes all requests for this virtual host. By
- default, log files are created in the "logs" directory relative to
- $CATALINA_HOME. If you wish, you can specify a different
- directory with the "directory" attribute. Specify either a relative
- (to $CATALINA_HOME) or absolute path to the desired directory.
- -->
- <!--
- <Valve className="org.apache.catalina.valves.AccessLogValve"
- directory="logs" prefix="localhost_access_log." suffix=".txt"
- pattern="common" resolveHosts="false"/>
- -->
-
- <!-- Access log processes all requests for this virtual host. By
- default, log files are created in the "logs" directory relative to
- $CATALINA_HOME. If you wish, you can specify a different
- directory with the "directory" attribute. Specify either a relative
- (to $CATALINA_HOME) or absolute path to the desired directory.
- This access log implementation is optimized for maximum performance,
- but is hardcoded to support only the "common" and "combined" patterns.
- -->
- <!--
- <Valve className="org.apache.catalina.valves.FastCommonAccessLogValve"
- directory="logs" prefix="localhost_access_log." suffix=".txt"
- pattern="common" resolveHosts="false"/>
- -->
- <!-- Access log processes all requests for this virtual host. By
- default, log files are created in the "logs" directory relative to
- $CATALINA_HOME. If you wish, you can specify a different
- directory with the "directory" attribute. Specify either a relative
- (to $CATALINA_HOME) or absolute path to the desired directory.
- This access log implementation is optimized for maximum performance,
- but is hardcoded to support only the "common" and "combined" patterns.
-
- This valve use NIO direct Byte Buffer to asynchornously store the
- log.
- -->
- <!--
- <Valve className="org.apache.catalina.valves.ByteBufferAccessLogValve"
- directory="logs" prefix="localhost_access_log." suffix=".txt"
- pattern="common" resolveHosts="false"/>
- -->
-
- </Host>
-
- </Engine>
-
- </Service>
-
-</Server>
Added: trunk/tomcat5.5/debian/source/format
===================================================================
--- trunk/tomcat5.5/debian/source/format (rev 0)
+++ trunk/tomcat5.5/debian/source/format 2010-01-28 22:02:52 UTC (rev 11442)
@@ -0,0 +1 @@
+3.0 (quilt)
Deleted: trunk/tomcat5.5/debian/tomcat5.5-admin.dirs
===================================================================
--- trunk/tomcat5.5/debian/tomcat5.5-admin.dirs 2010-01-28 21:37:22 UTC (rev 11441)
+++ trunk/tomcat5.5/debian/tomcat5.5-admin.dirs 2010-01-28 22:02:52 UTC (rev 11442)
@@ -1,3 +0,0 @@
-etc/tomcat5.5/policy.d
-etc/tomcat5.5/Catalina/localhost
-usr/share/tomcat5.5/server
Deleted: trunk/tomcat5.5/debian/tomcat5.5-admin.install
===================================================================
--- trunk/tomcat5.5/debian/tomcat5.5-admin.install 2010-01-28 21:37:22 UTC (rev 11441)
+++ trunk/tomcat5.5/debian/tomcat5.5-admin.install 2010-01-28 22:02:52 UTC (rev 11442)
@@ -1,2 +0,0 @@
-debian/context/admin/*.xml /etc/tomcat5.5/Catalina/localhost/
-build/dist/server/webapps /usr/share/tomcat5.5/server
Deleted: trunk/tomcat5.5/debian/tomcat5.5-admin.links
===================================================================
--- trunk/tomcat5.5/debian/tomcat5.5-admin.links 2010-01-28 21:37:22 UTC (rev 11441)
+++ trunk/tomcat5.5/debian/tomcat5.5-admin.links 2010-01-28 22:02:52 UTC (rev 11442)
@@ -1,7 +0,0 @@
-/usr/share/struts1.2/struts.jar /usr/share/tomcat5.5/server/webapps/admin/WEB-INF/lib/struts.jar
-/usr/share/java/commons-beanutils.jar /usr/share/tomcat5.5/server/webapps/admin/WEB-INF/lib/commons-beanutils.jar
-/usr/share/java/commons-digester.jar /usr/share/tomcat5.5/server/webapps/admin/WEB-INF/lib/commons-digester.jar
-/usr/share/java/commons-collections3.jar /usr/share/tomcat5.5/server/webapps/admin/WEB-INF/lib/commons-collections3.jar
-
-/usr/share/java/commons-fileupload.jar /usr/share/tomcat5.5/server/webapps/manager/WEB-INF/lib/commons-fileupload.jar
-/usr/share/java/commons-io.jar /usr/share/tomcat5.5/server/webapps/manager/WEB-INF/lib/commons-io.jar
Deleted: trunk/tomcat5.5/debian/tomcat5.5-admin.postinst
===================================================================
--- trunk/tomcat5.5/debian/tomcat5.5-admin.postinst 2010-01-28 21:37:22 UTC (rev 11441)
+++ trunk/tomcat5.5/debian/tomcat5.5-admin.postinst 2010-01-28 22:02:52 UTC (rev 11442)
@@ -1,17 +0,0 @@
-#!/bin/sh -e
-
-#DEBHELPER#
-
-case "$1" in
- configure)
- if [ -z "$2" ]; then
- # New installation, not a package upgrade
- if [ -x /etc/init.d/tomcat5.5 ]; then
- # Only restart tomcat if it is already running
- if invoke-rc.d tomcat5.5 status >/dev/null; then
- invoke-rc.d tomcat5.5 force-reload
- fi
- fi
- fi
- ;;
-esac
Deleted: trunk/tomcat5.5/debian/tomcat5.5-admin.prerm
===================================================================
--- trunk/tomcat5.5/debian/tomcat5.5-admin.prerm 2010-01-28 21:37:22 UTC (rev 11441)
+++ trunk/tomcat5.5/debian/tomcat5.5-admin.prerm 2010-01-28 22:02:52 UTC (rev 11442)
@@ -1,11 +0,0 @@
-#!/bin/sh -e
-
-#DEBHELPER#
-
-case "$1" in
- deconfigure|remove)
- if [ -x /etc/init.d/tomcat5.5 ]; then
- invoke-rc.d tomcat5.5 try-restart || true
- fi
- ;;
-esac
Deleted: trunk/tomcat5.5/debian/tomcat5.5-webapps.dirs
===================================================================
--- trunk/tomcat5.5/debian/tomcat5.5-webapps.dirs 2010-01-28 21:37:22 UTC (rev 11441)
+++ trunk/tomcat5.5/debian/tomcat5.5-webapps.dirs 2010-01-28 22:02:52 UTC (rev 11442)
@@ -1 +0,0 @@
-usr/share/tomcat5.5-webapps
Deleted: trunk/tomcat5.5/debian/tomcat5.5-webapps.install
===================================================================
--- trunk/tomcat5.5/debian/tomcat5.5-webapps.install 2010-01-28 21:37:22 UTC (rev 11441)
+++ trunk/tomcat5.5/debian/tomcat5.5-webapps.install 2010-01-28 22:02:52 UTC (rev 11442)
@@ -1,2 +0,0 @@
-build/dist/webapps/* /usr/share/tomcat5.5-webapps
-debian/context/webapps/*.xml /usr/share/tomcat5.5-webapps
Deleted: trunk/tomcat5.5/debian/tomcat5.5-webapps.postinst
===================================================================
--- trunk/tomcat5.5/debian/tomcat5.5-webapps.postinst 2010-01-28 21:37:22 UTC (rev 11441)
+++ trunk/tomcat5.5/debian/tomcat5.5-webapps.postinst 2010-01-28 22:02:52 UTC (rev 11442)
@@ -1,22 +0,0 @@
-#!/bin/sh -e
-
-#DEBHELPER#
-
-case "$1" in
- configure)
- if [ -z "$2" ]; then
- # New installation, not a package upgrade
- # create context links
- for context in /usr/share/tomcat5.5-webapps/*.xml; do
- ln -sf $context /etc/tomcat5.5/Catalina/localhost/
- done
-
- if [ -x /etc/init.d/tomcat5.5 ]; then
- # Only restart tomcat if it is already running
- if invoke-rc.d tomcat5.5 status >/dev/null; then
- invoke-rc.d tomcat5.5 force-reload
- fi
- fi
- fi
- ;;
-esac
Deleted: trunk/tomcat5.5/debian/tomcat5.5-webapps.postrm
===================================================================
--- trunk/tomcat5.5/debian/tomcat5.5-webapps.postrm 2010-01-28 21:37:22 UTC (rev 11441)
+++ trunk/tomcat5.5/debian/tomcat5.5-webapps.postrm 2010-01-28 22:02:52 UTC (rev 11442)
@@ -1,16 +0,0 @@
-#!/bin/sh -e
-
-#DEBHELPER#
-
-case "$1" in
- purge)
- if [ -d /etc/tomcat5.5/Catalina/localhost ]; then
- # Purge links created in postinst script..Closes: #453879.
- for context in /etc/tomcat5.5/Catalina/localhost/*.xml; do
- if [ -L "$context" ]; then
- rm -f $context
- fi
- done
- fi
- ;;
-esac
Deleted: trunk/tomcat5.5/debian/tomcat5.5-webapps.prerm
===================================================================
--- trunk/tomcat5.5/debian/tomcat5.5-webapps.prerm 2010-01-28 21:37:22 UTC (rev 11441)
+++ trunk/tomcat5.5/debian/tomcat5.5-webapps.prerm 2010-01-28 22:02:52 UTC (rev 11442)
@@ -1,11 +0,0 @@
-#!/bin/sh -e
-
-#DEBHELPER#
-
-case "$1" in
- deconfigure|remove)
- if [ -x /etc/init.d/tomcat5.5 ]; then
- invoke-rc.d tomcat5.5 try-restart || true
- fi
- ;;
-esac
Deleted: trunk/tomcat5.5/debian/tomcat5.5.default
===================================================================
--- trunk/tomcat5.5/debian/tomcat5.5.default 2010-01-28 21:37:22 UTC (rev 11441)
+++ trunk/tomcat5.5/debian/tomcat5.5.default 2010-01-28 22:02:52 UTC (rev 11442)
@@ -1,28 +0,0 @@
-# Run Tomcat as this user ID. Not setting this or leaving it blank will use the
-# default of tomcat55.
-#TOMCAT5_USER=tomcat55
-
-# The home directory of the Java development kit (JDK). You need at least
-# JDK version 1.4. If JAVA_HOME is not set, some common directories for
-# the Sun JDK, various J2SE 1.4 versions, and the free runtimes
-# java-gcj-compat-dev and kaffe are tried.
-#JAVA_HOME=/usr/lib/jvm/java-6-sun
-
-# Directory for per-instance configuration files and webapps. It contain the
-# directories conf, logs, webapps, work and temp. See RUNNING.txt for details.
-# Default: /var/lib/tomcat5.5
-#CATALINA_BASE=/var/lib/tomcat5.5
-
-# Arguments to pass to the Java virtual machine (JVM).
-#JAVA_OPTS="-Djava.awt.headless=true -Xmx128M"
-
-# Java compiler to use for translating JavaServer Pages (JSPs). You can use all
-# compilers that are accepted by Ant's build.compiler property.
-#JSP_COMPILER=jikes
-
-# Use the Java security manager? (yes/no, default: yes)
-# WARNING: Do not disable the security manager unless you understand
-# the consequences!
-# NOTE: java-gcj-compat-dev currently doesn't support a security
-# manager.
-#TOMCAT5_SECURITY=yes
Deleted: trunk/tomcat5.5/debian/tomcat5.5.dirs
===================================================================
--- trunk/tomcat5.5/debian/tomcat5.5.dirs 2010-01-28 21:37:22 UTC (rev 11441)
+++ trunk/tomcat5.5/debian/tomcat5.5.dirs 2010-01-28 22:02:52 UTC (rev 11442)
@@ -1,10 +0,0 @@
-etc/default
-etc/tomcat5.5/policy.d
-etc/tomcat5.5/Catalina/localhost
-usr/share/tomcat5.5
-var/cache/tomcat5.5
-var/lib/tomcat5.5/shared/classes
-var/lib/tomcat5.5/shared/lib
-var/lib/tomcat5.5/temp
-var/lib/tomcat5.5/webapps
-var/log/tomcat5.5
Deleted: trunk/tomcat5.5/debian/tomcat5.5.docs
===================================================================
--- trunk/tomcat5.5/debian/tomcat5.5.docs 2010-01-28 21:37:22 UTC (rev 11441)
+++ trunk/tomcat5.5/debian/tomcat5.5.docs 2010-01-28 22:02:52 UTC (rev 11442)
@@ -1 +0,0 @@
-build/RUNNING.txt
Deleted: trunk/tomcat5.5/debian/tomcat5.5.examples
===================================================================
--- trunk/tomcat5.5/debian/tomcat5.5.examples 2010-01-28 21:37:22 UTC (rev 11441)
+++ trunk/tomcat5.5/debian/tomcat5.5.examples 2010-01-28 22:02:52 UTC (rev 11442)
@@ -1,2 +0,0 @@
-build/dist/conf/server.xml
-build/dist/conf/web.xml
Deleted: trunk/tomcat5.5/debian/tomcat5.5.init
===================================================================
--- trunk/tomcat5.5/debian/tomcat5.5.init 2010-01-28 21:37:22 UTC (rev 11441)
+++ trunk/tomcat5.5/debian/tomcat5.5.init 2010-01-28 22:02:52 UTC (rev 11442)
@@ -1,228 +0,0 @@
-#!/bin/sh
-#
-# /etc/init.d/tomcat5.5 -- startup script for the Tomcat 5 servlet engine
-#
-# Written by Miquel van Smoorenburg <miquels at cistron.nl>.
-# Modified for Debian GNU/Linux by Ian Murdock <imurdock at gnu.ai.mit.edu>.
-# Modified for Tomcat by Stefan Gybas <sgybas at debian.org>.
-#
-### BEGIN INIT INFO
-# Provides: tomcat
-# Required-Start: $local_fs $remote_fs $network
-# Required-Stop: $local_fs $remote_fs $network
-# Should-Start: $named
-# Should-Stop: $named
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Start Tomcat.
-# Description: Start the Tomcat servlet engine.
-### END INIT INFO
-
-set -e
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-NAME=tomcat5.5
-DESC="Tomcat servlet engine"
-DAEMON=/usr/bin/jsvc
-CATALINA_HOME=/usr/share/$NAME
-DEFAULT=/etc/default/$NAME
-
-if [ `id -u` -ne 0 ]; then
- echo "You need root privileges to run this script"
- exit 1
-fi
-
-# Make sure tomcat is started with system locale
-if [ -r /etc/default/locale ]; then
- . /etc/default/locale
- export LANG
-fi
-
-. /lib/lsb/init-functions
-. /etc/default/rcS
-
-# The following variables can be overwritten in $DEFAULT
-
-# Run Tomcat 5 as this user ID
-TOMCAT5_USER=tomcat55
-
-# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not
-# defined in $DEFAULT)
-JDK_DIRS="/usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm /usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-blackdown /usr/lib/j2se/1.4 /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.3-sun /usr/lib/j2sdk1.3-blackdown /usr/lib/jvm/java-gcj /usr/lib/kaffe"
-
-# Look for the right JVM to use
-for jdir in $JDK_DIRS; do
- if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then
- JAVA_HOME_TMP="$jdir"
- # checks for a real JDK like environment, needed to check if
- # really the java-gcj-compat-dev package is installed
- if [ -r "$jdir/bin/jdb" ]; then
- JAVA_HOME="$JAVA_HOME_TMP"
- fi
- fi
-done
-export JAVA_HOME
-
-# Directory for per-instance configuration files and webapps
-CATALINA_BASE=/var/lib/$NAME
-
-# Use the Java security manager? (yes/no)
-TOMCAT5_SECURITY=yes
-
-# Timeout in seconds for the shutdown of all webapps
-TOMCAT5_SHUTDOWN=30
-
-# End of variables that can be overwritten in $DEFAULT
-
-# overwrite settings from default file
-if [ -f "$DEFAULT" ]; then
- . "$DEFAULT"
-fi
-
-test -f $DAEMON || exit 0
-
-[ -z "$TOMCAT5_USER" ] && TOMCAT5_USER=tomcat55
-
-# Check if we use gij
-gij=no
-"$JAVA_HOME/bin/java" -version 2>&1 | grep -q "^gij (GNU libgcj)" && gij=yes
-
-# gij doesn't support a security manager yet (see bug #399595)
-if [ "$gij" = "yes" ]; then
- printf "The java-gcj-compat-dev environment currently doesn't\nsupport a security manager. See README.Debian." | logger -p daemon.warning -t $NAME
-fi
-
-# Set java.awt.headless=true if JAVA_OPTS is not set so the
-# Xalan XSL transformer can work without X11 display on JDK 1.4+
-# It also looks like the default heap size of 64M is not enough for most cases
-# se the maximum heap size is set to 128M
-if [ -z "$JAVA_OPTS" ]; then
- JAVA_OPTS="-Djava.awt.headless=true -Xmx128M"
-fi
-
-JAVA_OPTS="$JAVA_OPTS -Djava.endorsed.dirs=$CATALINA_HOME/common/endorsed -Dcatalina.base=$CATALINA_BASE -Dcatalina.home=$CATALINA_HOME -Djava.io.tmpdir=$CATALINA_BASE/temp"
-
-# Set the JSP compiler if set in the tomcat5.5.default file
-if [ -n "$JSP_COMPILER" ]; then
- JAVA_OPTS="$JAVA_OPTS -Dbuild.compiler=$JSP_COMPILER"
-fi
-
-if [ "$TOMCAT5_SECURITY" = "yes" ]; then
- JAVA_OPTS="$JAVA_OPTS -Djava.security.manager -Djava.security.policy=$CATALINA_BASE/conf/catalina.policy"
-fi
-
-# juli LogManager disabled if running under gij (see bug #395167)
-if [ "$gij" != "yes" ]; then
- JAVA_OPTS="$JAVA_OPTS -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Djava.util.logging.config.file=$CATALINA_BASE/conf/logging.properties"
-fi
-
-# Define other required variables
-CATALINA_PID="/var/run/$NAME.pid"
-BOOTSTRAP_CLASS=org.apache.catalina.startup.Bootstrap
-JSVC_CLASSPATH="/usr/share/java/commons-daemon.jar:$CATALINA_HOME/bin/bootstrap.jar"
-
-# Look for Java Secure Sockets Extension (JSSE) JARs
-if [ -z "${JSSE_HOME}" -a -r "${JAVA_HOME}/jre/lib/jsse.jar" ]; then
- JSSE_HOME="${JAVA_HOME}/jre/"
-fi
-export JSSE_HOME
-
-case "$1" in
- start)
- if [ -z "$JAVA_HOME" ]; then
- log_failure_msg "no JDK found - please set JAVA_HOME"
- exit 1
- fi
-
- if [ ! -d "$CATALINA_BASE/conf" ]; then
- log_failure_msg "invalid CATALINA_BASE specified"
- exit 1
- fi
-
- log_daemon_msg "Starting $DESC" "$NAME"
- if start-stop-daemon --test --start --pidfile "$CATALINA_PID" \
- --user $TOMCAT5_USER --startas "$JAVA_HOME/bin/java" \
- >/dev/null; then
-
- # Create catalina.policy (for the security manager)
- rm -f "$CATALINA_BASE/conf/catalina.policy"
- umask 022
- echo "// AUTO-GENERATED FILE -- DO NOT EDIT!" \
- > "$CATALINA_BASE/conf/catalina.policy"
- echo "// Edit the files in /etc/tomcat5.5/policy.d/ instead" \
- >> "$CATALINA_BASE/conf/catalina.policy"
- echo "" >> "$CATALINA_BASE/conf/catalina.policy"
- cat /etc/tomcat5.5/policy.d/*.policy \
- >> "$CATALINA_BASE/conf/catalina.policy"
-
- # Clean up and set permissions on required files
- find "$CATALINA_BASE"/temp/ -mindepth 1 -exec rm -fr {} +
- REQUIRED_FILES='"$CATALINA_BASE/conf"
- "$CATALINA_BASE/logs" "$CATALINA_BASE/temp"
- "$CATALINA_BASE/webapps" "$CATALINA_BASE/work"'
- if [ -e "$CATALINA_BASE/conf/tomcat-users.xml" ]; then
- REQUIRED_FILES=$REQUIRED_FILES'
- "$CATALINA_BASE/conf/tomcat-users.xml"'
- fi
- eval chown --dereference "$TOMCAT5_USER" $REQUIRED_FILES \
- || true
-
- cd "$CATALINA_BASE/temp"
-
- $DAEMON -user "$TOMCAT5_USER" -cp "$JSVC_CLASSPATH" \
- -outfile SYSLOG -errfile SYSLOG \
- -pidfile "$CATALINA_PID" $JAVA_OPTS "$BOOTSTRAP_CLASS"
- else
- log_progress_msg "(already running)"
- fi
- log_end_msg 0
- ;;
- stop)
- log_daemon_msg "Stopping $DESC" "$NAME"
- if start-stop-daemon --test --start --pidfile "$CATALINA_PID" \
- --user "$TOMCAT5_USER" --startas "$JAVA_HOME/bin/java" \
- >/dev/null; then
- log_progress_msg "(not running)"
- else
- $DAEMON -cp "$JSVC_CLASSPATH" -pidfile "$CATALINA_PID" \
- -stop "$BOOTSTRAP_CLASS"
- fi
- log_end_msg 0
- ;;
- status)
- if start-stop-daemon --test --start --pidfile "$CATALINA_PID" \
- --user $TOMCAT5_USER --startas "$JAVA_HOME/bin/java" \
- >/dev/null; then
-
- if [ -f "$CATALINA_PID" ]; then
- log_success_msg "$DESC is not running, but pid file exists."
- else
- log_success_msg "$DESC is not running."
- fi
- else
- log_success_msg "$DESC is running with pid `cat $CATALINA_PID`"
- fi
- ;;
- restart|force-reload)
- if start-stop-daemon --test --stop --pidfile "$CATALINA_PID" \
- --user $TOMCAT5_USER --startas "$JAVA_HOME/bin/java" \
- >/dev/null; then
- $0 stop
- sleep 1
- fi
- $0 start
- ;;
- try-restart)
- if start-stop-daemon --test --start --pidfile "$CATALINA_PID" \
- --user $TOMCAT5_USER --startas "$JAVA_HOME/bin/java" \
- >/dev/null; then
- $0 start
- fi
- ;;
- *)
- log_success_msg "Usage: $0 {start|stop|restart|try-restart|force-reload|status}"
- exit 1
- ;;
-esac
-
-exit 0
Deleted: trunk/tomcat5.5/debian/tomcat5.5.install
===================================================================
--- trunk/tomcat5.5/debian/tomcat5.5.install 2010-01-28 21:37:22 UTC (rev 11441)
+++ trunk/tomcat5.5/debian/tomcat5.5.install 2010-01-28 22:02:52 UTC (rev 11442)
@@ -1,11 +0,0 @@
-build/dist/bin /usr/share/tomcat5.5
-build/dist/conf/server.xml /etc/tomcat5.5/
-build/dist/conf/logging.properties /etc/tomcat5.5/
-build/dist/conf/catalina.properties /etc/tomcat5.5/
-build/dist/conf/server-minimal.xml /etc/tomcat5.5/
-build/dist/conf/catalina.policy /etc/tomcat5.5/
-build/dist/conf/tomcat-users.xml /etc/tomcat5.5/
-build/dist/conf/context.xml /etc/tomcat5.5/
-build/dist/conf/web.xml /etc/tomcat5.5/
-debian/policy/* /etc/tomcat5.5/policy.d/
-debian/server.xml /etc/tomcat5.5/
Deleted: trunk/tomcat5.5/debian/tomcat5.5.links
===================================================================
--- trunk/tomcat5.5/debian/tomcat5.5.links 2010-01-28 21:37:22 UTC (rev 11441)
+++ trunk/tomcat5.5/debian/tomcat5.5.links 2010-01-28 22:02:52 UTC (rev 11442)
@@ -1,11 +0,0 @@
-/etc/tomcat5.5 /usr/share/tomcat5.5/conf
-/etc/tomcat5.5 /var/lib/tomcat5.5/conf
-/usr/share/doc/tomcat5.5 /usr/share/tomcat5.5/doc
-/var/lib/tomcat5.5/logs /usr/share/tomcat5.5/logs
-/var/lib/tomcat5.5/work /usr/share/tomcat5.5/work
-/var/lib/tomcat5.5/shared /usr/share/tomcat5.5/shared
-/var/lib/tomcat5.5/temp /usr/share/tomcat5.5/temp
-/var/lib/tomcat5.5/webapps /usr/share/tomcat5.5/webapps
-/var/log/tomcat5.5 /var/lib/tomcat5.5/logs
-/var/cache/tomcat5.5 /var/lib/tomcat5.5/work
-/usr/share/java/mx4j.jar /usr/share/tomcat5.5/bin/jmx.jar
Deleted: trunk/tomcat5.5/debian/tomcat5.5.postinst
===================================================================
--- trunk/tomcat5.5/debian/tomcat5.5.postinst 2010-01-28 21:37:22 UTC (rev 11441)
+++ trunk/tomcat5.5/debian/tomcat5.5.postinst 2010-01-28 22:02:52 UTC (rev 11442)
@@ -1,37 +0,0 @@
-#!/bin/sh -e
-
-# Move a conffile without triggering a dpkg question
-mv_conffile() {
- OLDCONFFILE="$1"
- NEWCONFFILE="$2"
-
- if [ -e "$OLDCONFFILE" ]; then
- echo "Preserving user changes to $NEWCONFFILE ..."
- mv -f "$NEWCONFFILE" "$NEWCONFFILE".dpkg-new
- mv -f "$OLDCONFFILE" "$NEWCONFFILE"
- fi
-}
-
-case "$1" in
- configure)
- if ! id tomcat55 > /dev/null 2>&1 ; then
- adduser --system --home /usr/share/tomcat5.5 --no-create-home \
- --ingroup nogroup --disabled-password --shell /bin/false \
- tomcat55
- fi
- chown -R tomcat55:nogroup /var/log/tomcat5.5 /var/cache/tomcat5.5
- chown -R tomcat55:adm /etc/tomcat5.5
- chown tomcat55:adm /var/log/tomcat5.5 /var/cache/tomcat5.5
- chmod -R 770 /etc/tomcat5.5
- chmod 750 /var/log/tomcat5.5 /etc/tomcat5.5
- chmod 700 /var/cache/tomcat5.5
- ln -sf /etc/tomcat5.5 /var/lib/tomcat5.5/conf
-
- # Moving conffiles.
- if dpkg --compare-versions "$2" le "5.5.25-4"; then
- mv_conffile "/etc/cron.daily/tomcat5.5" "/etc/cron.daily/tomcat55"
- fi
- ;;
-esac
-
-#DEBHELPER#
Deleted: trunk/tomcat5.5/debian/tomcat5.5.postrm
===================================================================
--- trunk/tomcat5.5/debian/tomcat5.5.postrm 2010-01-28 21:37:22 UTC (rev 11441)
+++ trunk/tomcat5.5/debian/tomcat5.5.postrm 2010-01-28 22:02:52 UTC (rev 11442)
@@ -1,34 +0,0 @@
-#!/bin/sh -e
-
-#DEBHELPER#
-
-# Remove cached files and auto-generated catalina.policy
-rm -rf /var/cache/tomcat5.5/* /etc/tomcat5.5/catalina.policy
-
-case "$1" in
- purge)
- # Remove user and log files (don't remove everything under
- # /var/lib/tomcat5.5 because there might be user-installed webapps)
- userdel tomcat55 || true
- rm -rf /var/log/tomcat5.5 /var/cache/tomcat5.5 \
- /var/lib/tomcat5.5/temp
- rmdir --ignore-fail-on-non-empty /var/lib/tomcat5.5 || true
- rmdir --ignore-fail-on-non-empty /etc/tomcat5.5/policy.d /etc/tomcat5.5 || true
- # remove user tomcat5 if it exists, and package tomcat5 is
- # marked as purged or has never been installed
- if [ -n "$(dpkg -l tomcat5 | grep pn)" -o -n "$(dpkg -l tomcat5 | grep un)" ]
- then
- (id tomcat5 > /dev/null 2>&1 && userdel tomcat5) || true
- fi
-
- ;;
-
- remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
- # Nothing to do here
- ;;
-
- *)
- echo "$0 called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
Deleted: trunk/tomcat5.5/debian/tomcat5.5.preinst
===================================================================
--- trunk/tomcat5.5/debian/tomcat5.5.preinst 2010-01-28 21:37:22 UTC (rev 11441)
+++ trunk/tomcat5.5/debian/tomcat5.5.preinst 2010-01-28 22:02:52 UTC (rev 11442)
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-# Prepare to move a conffile without triggering a dpkg question
-prep_mv_conffile() {
- PKGNAME="$1"
- CONFFILE="$2"
-
- if [ -e "$CONFFILE" ]; then
- md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
- old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE'{s/ obsolete$//;s/.* //p}\"`"
- if [ "$md5sum" = "$old_md5sum" ]; then
- rm -f "$CONFFILE"
- fi
- fi
-}
-
-case "$1" in
- install|upgrade)
-
- # Rename conffiles gracefully.
- if dpkg --compare-versions "$2" le "5.5.25-4"; then
- prep_mv_conffile tomcat5.5 "/etc/cron.daily/tomcat5.5"
- fi
- ;;
-esac
-
-case "$1" in
- upgrade)
-
- # Migrate any user config from /var/lib/tomcat5.5/conf to
- # /etc/tomcat5.5 if the former isn't a symlink yet.
- # Affects > 5.5.20-5
- if [ -e /var/lib/tomcat5.5/conf -a ! -L /var/lib/tomcat5.5/conf ]; then
- cp -a /var/lib/tomcat5.5/conf /var/lib/tomcat5.5/conf.backup
- for dir in $(find /var/lib/tomcat5.5/conf/ -type d); do
- mkdir -p $(echo $dir | sed -e's@/var/lib/tomcat5.5/conf/@/etc/tomcat5.5/@')
- done
- for file in $(find /var/lib/tomcat5.5/conf/ -type f); do
- mv $file $(echo $file | sed -e's@/var/lib/tomcat5.5/conf/@/etc/tomcat5.5/@')
- done
- rm -rf /var/lib/tomcat5.5/conf
- fi
- ;;
-esac
-
-#DEBHELPER#
Deleted: trunk/tomcat5.5/debian/tomcat55.cron.daily
===================================================================
--- trunk/tomcat5.5/debian/tomcat55.cron.daily 2010-01-28 21:37:22 UTC (rev 11441)
+++ trunk/tomcat5.5/debian/tomcat55.cron.daily 2010-01-28 22:02:52 UTC (rev 11442)
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-NAME=tomcat5.5
-DEFAULT=/etc/default/$NAME
-
-# The following variables can be overwritten in $DEFAULT
-
-# Default for number of days to keep old log files in /var/log/tomcat4/
-LOGFILE_DAYS=14
-
-# End of variables that can be overwritten in $DEFAULT
-
-# overwrite settings from default file
-if [ -f "$DEFAULT" ]; then
- . "$DEFAULT"
-fi
-
-if [ -d /var/log/$NAME ]; then
- find /var/log/$NAME/ -name \*.log -mtime +$LOGFILE_DAYS -print0 \
- | xargs --no-run-if-empty -0 rm
-fi
-
More information about the pkg-java-commits
mailing list