[pkg-java] r3519 - in tags/tomcat5.5: . 5.5.20-5/connectors/util 5.5.20-5/debian 5.5.20-5/debian/policy
marcusb-guest at alioth.debian.org
marcusb-guest at alioth.debian.org
Fri May 18 17:58:47 UTC 2007
Author: marcusb-guest
Date: 2007-05-18 17:58:47 +0000 (Fri, 18 May 2007)
New Revision: 3519
Added:
tags/tomcat5.5/5.5.20-5/
tags/tomcat5.5/5.5.20-5/connectors/util/build.xml
tags/tomcat5.5/5.5.20-5/debian/README.Debian
tags/tomcat5.5/5.5.20-5/debian/ant.properties
tags/tomcat5.5/5.5.20-5/debian/changelog
tags/tomcat5.5/5.5.20-5/debian/control
tags/tomcat5.5/5.5.20-5/debian/policy/04webapps.policy
tags/tomcat5.5/5.5.20-5/debian/rules
tags/tomcat5.5/5.5.20-5/debian/tomcat5.5.default
tags/tomcat5.5/5.5.20-5/debian/tomcat5.5.init
tags/tomcat5.5/5.5.20-5/debian/tomcat5.5.links
Removed:
tags/tomcat5.5/5.5.20-5/connectors/util/build.xml
tags/tomcat5.5/5.5.20-5/debian/README.Debian
tags/tomcat5.5/5.5.20-5/debian/ant.properties
tags/tomcat5.5/5.5.20-5/debian/changelog
tags/tomcat5.5/5.5.20-5/debian/control
tags/tomcat5.5/5.5.20-5/debian/policy/04webapps.policy
tags/tomcat5.5/5.5.20-5/debian/rules
tags/tomcat5.5/5.5.20-5/debian/tomcat5.5.default
tags/tomcat5.5/5.5.20-5/debian/tomcat5.5.init
tags/tomcat5.5/5.5.20-5/debian/tomcat5.5.links
Log:
Tag release.
Copied: tags/tomcat5.5/5.5.20-5 (from rev 3324, branches/tomcat5.5/feature/debian)
Deleted: tags/tomcat5.5/5.5.20-5/connectors/util/build.xml
===================================================================
--- branches/tomcat5.5/feature/debian/connectors/util/build.xml 2007-04-24 13:00:33 UTC (rev 3324)
+++ tags/tomcat5.5/5.5.20-5/connectors/util/build.xml 2007-05-18 17:58:47 UTC (rev 3519)
@@ -1,152 +0,0 @@
-<project name="tomcat-util" default="build-main" basedir=".">
-
- <!-- ===================== Initialize Property Values =================== -->
- <property file="${user.home}/build.properties"/>
- <property file="build.properties"/>
- <property file="../build.properties.default"/>
- <property file="build.properties.sample"/>
-
- <property name="tomcat-util.build" value="${basedir}/build"/>
-
- <property name="jsse.home" location="${base.path}/jsse1.0.2"/>
- <property name="jsse.lib" location="${jsse.home}/lib"/>
- <property name="jsse.jar" location="${jsse.lib}/jsse.jar"/>
- <property name="jnet.jar" location="${jsse.lib}/jnet.jar"/>
- <property name="jcert.jar" location="${jsse.lib}/jcert.jar"/>
-
- <property name="puretls.home" location="${base.path}/puretls"/>
- <property name="puretls.lib" location="${puretls.home}"/>
- <property name="puretls.jar" location="${puretls.lib}/puretls.jar"/>
-
- <property name="commons-logging.jar" location="${base.path}/commons-logging-1.0.4/commons-logging.jar" />
- <property name="jmx.jar" location="${base.path}/mx4j-2.0.1/lib/mx4j.jar" />
- <property name="tomcat-util.lib" value="${tomcat-util.build}/lib" />
- <property name="tomcat-util.jar" value="${tomcat-util.lib}/tomcat-util.jar" />
- <property name="tomcat-loader.jar" value="${tomcat-util.lib}/tomcat-loader.jar" />
- <property name="tomcat-jni.jar" value="../jni/dist/tomcat-native-1.0.0.jar" />
-
- <path id="compile.classpath">
- <pathelement location="${jmx.jar}" />
- <pathelement location="${jsse.jar}" />
- <pathelement location="${java.home}/lib/jsse.jar" />
- <pathelement location="${jnet.jar}" />
- <pathelement location="${jcert.jar}" />
- <pathelement location="${puretls.jar}" />
- <pathelement location="${commons-logging.jar}" />
- <pathelement location="${commons-modeler.jar}" />
- <pathelement location="${tomcat-jni.jar}" />
- </path>
-
- <target name="detect">
- <available property="jsse.present" classname="javax.net.ssl.SSLSocket"/>
- <available property="jmx.present" file="${jmx.jar}"/>
- <available property="puretls.present" file="${puretls.jar}"/>
- <available property="commons-logging.present" file="${commons-logging.jar}"/>
- <available property="modeler.present" file="${commons-modeler.jar}"/>
- <available property="jdk1.4.present" classname="java.lang.CharSequence" />
- <available property="jdk1.5.present" classname="javax.net.ssl.CertPathTrustManagerParameters" />
- </target>
-
- <target name="build-prepare" depends="detect">
- <mkdir dir="${tomcat-util.build}"/>
- <mkdir dir="${tomcat-util.build}/classes"/>
- <mkdir dir="${tomcat-util.lib}"/>
- </target>
-
- <target name="build-main" depends="tomcat-util.jar"/> <!--tomcat-loader.jar -->
-
- <target name="tomcat-util.jar" depends="build-prepare">
- <echo message="----- Java-utils -----" />
- <echo message="-- puretls.present = ${puretls.present}" />
- <echo message="-- jsse.present = ${jsse.present} ${jsse.jar}"/>
- <echo message="-- commons-logging = ${commons-logging.present}"/>
- <echo message="-- jmx = ${jmx.present} ${jmx.jar}"/>
- <echo message="-- modeler = ${modeler.present} ${commons-modeler.jar}"/>
- <echo message="-- skip.digester = ${skip.digester}" />
- <echo message="-- JDK14 = ${jdk1.4.present}"/>
- <echo message="-- JDK15 = ${jdk1.5.present}" />
-
- <javac srcdir="java"
- destdir="${tomcat-util.build}/classes"
- deprecation="${compile.deprecation}"
- debug="${compile.debug}"
- optimize="off"
- verbose="off"
- excludes="**/CVS/**">
- <classpath refid="compile.classpath"/>
- <exclude name="**/util/net/jsse/JSSE13*" />
- <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"/>
- <exclude name="**/util/mx/*" unless="jmx.present"/>
- <exclude name="**/util/threads/ThreadPoolMX*" unless="modeler.present"/>
- <exclude name="**/util/compat/Jdk14Compat.java" unless="jdk1.4.present" />
- <exclude name="**/util/net/jsse/JSSE14*" unless="jdk1.4.present" />
- <exclude name="**/util/net/jsse/JSSE15*" unless="jdk1.5.present" />
- <exclude name="**/util/net/jsse/JSSEKeyManager.java" unless="jdk1.4.present" />
- <exclude name="**/util/digester/*" if="skip.digester" />
- </javac>
-
- <!-- Copy static resource files -->
- <copy todir="${tomcat-util.build}/classes">
- <fileset dir="java">
- <include name="**/*.properties"/>
- </fileset>
- </copy>
-
- <!-- Copy static resource files -->
- <copy todir="${tomcat-util.build}/classes">
- <fileset dir="java">
- <include name="**/*.properties"/>
- </fileset>
- </copy>
-
- <jar jarfile="${tomcat-util.jar}"
- index="true"
- basedir="${tomcat-util.build}/classes"
- manifest="java/tomcat-util.manifest" >
- <include name="org/apache/tomcat/util/**"/>
- </jar>
-
- </target>
-
- <target name="tomcat-loader.jar" depends="build-prepare">
- <mkdir dir="${tomcat-util.build}/loader"/>
- <javac srcdir="loader"
- destdir="${tomcat-util.build}/loader"
- deprecation="${compile.deprecation}"
- debug="${compile.debug}"
- optimize="off"
- verbose="off"
- excludes="**/CVS/**">
- <classpath refid="compile.classpath"/>
- </javac>
- <jar jarfile="${tomcat-loader.jar}"
- index="true"
- basedir="${tomcat-util.build}/loader"
- manifest="loader/tomcat-loader.manifest" >
- <include name="org/apache/tomcat/util/loader/**"/>
- </jar>
- </target>
-
- <!-- ================ BUILD: Create Tomcat-Util Javadocs =================== -->
- <target name="javadoc" unless="docs-uptodate">
- <delete dir="${tomcat-util.build}/javadoc"/>
- <mkdir dir="${tomcat-util.build}/javadoc"/>
- <javadoc packagenames="org.apache.tomcat.util.*"
- sourcepath="java"
- destdir="${tomcat-util.build}/javadoc"
- author="true"
- version="true"
- windowtitle="Tomcat Utilities Documentation"
- doctitle="Tomcat Utilities"
- bottom="Copyright © 2001 Apache Software Foundation. All Rights Reserved.">
- <classpath refid="compile.classpath"/>
- </javadoc>
- </target>
-
-
- <target name="clean">
- <delete dir="${tomcat-util.build}"/>
- </target>
-</project>
Copied: tags/tomcat5.5/5.5.20-5/connectors/util/build.xml (from rev 3512, branches/tomcat5.5/feature/debian/connectors/util/build.xml)
===================================================================
--- tags/tomcat5.5/5.5.20-5/connectors/util/build.xml (rev 0)
+++ tags/tomcat5.5/5.5.20-5/connectors/util/build.xml 2007-05-18 17:58:47 UTC (rev 3519)
@@ -0,0 +1,153 @@
+<project name="tomcat-util" default="build-main" basedir=".">
+
+ <!-- ===================== Initialize Property Values =================== -->
+ <property file="${user.home}/build.properties"/>
+ <property file="build.properties"/>
+ <property file="../build.properties.default"/>
+ <property file="build.properties.sample"/>
+
+ <property name="tomcat-util.build" value="${basedir}/build"/>
+
+ <property name="jsse.home" location="${base.path}/jsse1.0.2"/>
+ <property name="jsse.lib" location="${jsse.home}/lib"/>
+ <property name="jsse.jar" location="${jsse.lib}/jsse.jar"/>
+ <property name="jnet.jar" location="${jsse.lib}/jnet.jar"/>
+ <property name="jcert.jar" location="${jsse.lib}/jcert.jar"/>
+
+ <property name="puretls.home" location="${base.path}/puretls"/>
+ <property name="puretls.lib" location="${puretls.home}"/>
+ <property name="puretls.jar" location="${puretls.lib}/puretls.jar"/>
+
+ <property name="commons-logging.jar" location="${base.path}/commons-logging-1.0.4/commons-logging.jar" />
+ <property name="jmx.jar" location="${base.path}/mx4j-2.0.1/lib/mx4j.jar" />
+ <property name="tomcat-util.lib" value="${tomcat-util.build}/lib" />
+ <property name="tomcat-util.jar" value="${tomcat-util.lib}/tomcat-util.jar" />
+ <property name="tomcat-loader.jar" value="${tomcat-util.lib}/tomcat-loader.jar" />
+ <property name="tomcat-jni.jar" value="../jni/dist/tomcat-native-1.0.0.jar" />
+
+ <path id="compile.classpath">
+ <pathelement location="${jmx.jar}" />
+ <pathelement location="${jsse.jar}" />
+ <pathelement location="${java.home}/lib/jsse.jar" />
+ <pathelement location="${jnet.jar}" />
+ <pathelement location="${jcert.jar}" />
+ <pathelement location="${puretls.jar}" />
+ <pathelement location="${commons-logging.jar}" />
+ <pathelement location="${commons-modeler.jar}" />
+ <pathelement location="${tomcat-jni.jar}" />
+ </path>
+
+ <target name="detect">
+ <available property="jsse.present" classname="javax.net.ssl.SSLSocket"/>
+ <available property="jmx.present" file="${jmx.jar}"/>
+ <available property="puretls.present" file="${puretls.jar}"/>
+ <available property="commons-logging.present" file="${commons-logging.jar}"/>
+ <available property="modeler.present" file="${commons-modeler.jar}"/>
+ <available property="jdk1.4.present" classname="java.lang.CharSequence" />
+ <available property="jdk1.5.present" classname="javax.net.ssl.CertPathTrustManagerParameters" />
+ </target>
+
+ <target name="build-prepare" depends="detect">
+ <mkdir dir="${tomcat-util.build}"/>
+ <mkdir dir="${tomcat-util.build}/classes"/>
+ <mkdir dir="${tomcat-util.lib}"/>
+ </target>
+
+ <target name="build-main" depends="tomcat-util.jar"/> <!--tomcat-loader.jar -->
+
+ <target name="tomcat-util.jar" depends="build-prepare">
+ <echo message="----- Java-utils -----" />
+ <echo message="-- puretls.present = ${puretls.present}" />
+ <echo message="-- jsse.present = ${jsse.present} ${jsse.jar}"/>
+ <echo message="-- commons-logging = ${commons-logging.present}"/>
+ <echo message="-- jmx = ${jmx.present} ${jmx.jar}"/>
+ <echo message="-- modeler = ${modeler.present} ${commons-modeler.jar}"/>
+ <echo message="-- skip.digester = ${skip.digester}" />
+ <echo message="-- JDK14 = ${jdk1.4.present}"/>
+ <echo message="-- JDK15 = ${jdk1.5.present}" />
+
+ <javac srcdir="java"
+ destdir="${tomcat-util.build}/classes"
+ deprecation="${compile.deprecation}"
+ source="${compile.source}"
+ debug="${compile.debug}"
+ optimize="off"
+ verbose="off"
+ excludes="**/CVS/**">
+ <classpath refid="compile.classpath"/>
+ <exclude name="**/util/net/jsse/JSSE13*" />
+ <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"/>
+ <exclude name="**/util/mx/*" unless="jmx.present"/>
+ <exclude name="**/util/threads/ThreadPoolMX*" unless="modeler.present"/>
+ <exclude name="**/util/compat/Jdk14Compat.java" unless="jdk1.4.present" />
+ <exclude name="**/util/net/jsse/JSSE14*" unless="jdk1.4.present" />
+ <exclude name="**/util/net/jsse/JSSE15*" unless="jdk1.5.present" />
+ <exclude name="**/util/net/jsse/JSSEKeyManager.java" unless="jdk1.4.present" />
+ <exclude name="**/util/digester/*" if="skip.digester" />
+ </javac>
+
+ <!-- Copy static resource files -->
+ <copy todir="${tomcat-util.build}/classes">
+ <fileset dir="java">
+ <include name="**/*.properties"/>
+ </fileset>
+ </copy>
+
+ <!-- Copy static resource files -->
+ <copy todir="${tomcat-util.build}/classes">
+ <fileset dir="java">
+ <include name="**/*.properties"/>
+ </fileset>
+ </copy>
+
+ <jar jarfile="${tomcat-util.jar}"
+ index="true"
+ basedir="${tomcat-util.build}/classes"
+ manifest="java/tomcat-util.manifest" >
+ <include name="org/apache/tomcat/util/**"/>
+ </jar>
+
+ </target>
+
+ <target name="tomcat-loader.jar" depends="build-prepare">
+ <mkdir dir="${tomcat-util.build}/loader"/>
+ <javac srcdir="loader"
+ destdir="${tomcat-util.build}/loader"
+ deprecation="${compile.deprecation}"
+ debug="${compile.debug}"
+ optimize="off"
+ verbose="off"
+ excludes="**/CVS/**">
+ <classpath refid="compile.classpath"/>
+ </javac>
+ <jar jarfile="${tomcat-loader.jar}"
+ index="true"
+ basedir="${tomcat-util.build}/loader"
+ manifest="loader/tomcat-loader.manifest" >
+ <include name="org/apache/tomcat/util/loader/**"/>
+ </jar>
+ </target>
+
+ <!-- ================ BUILD: Create Tomcat-Util Javadocs =================== -->
+ <target name="javadoc" unless="docs-uptodate">
+ <delete dir="${tomcat-util.build}/javadoc"/>
+ <mkdir dir="${tomcat-util.build}/javadoc"/>
+ <javadoc packagenames="org.apache.tomcat.util.*"
+ sourcepath="java"
+ destdir="${tomcat-util.build}/javadoc"
+ author="true"
+ version="true"
+ windowtitle="Tomcat Utilities Documentation"
+ doctitle="Tomcat Utilities"
+ bottom="Copyright © 2001 Apache Software Foundation. All Rights Reserved.">
+ <classpath refid="compile.classpath"/>
+ </javadoc>
+ </target>
+
+
+ <target name="clean">
+ <delete dir="${tomcat-util.build}"/>
+ </target>
+</project>
Deleted: tags/tomcat5.5/5.5.20-5/debian/README.Debian
===================================================================
--- branches/tomcat5.5/feature/debian/debian/README.Debian 2007-04-24 13:00:33 UTC (rev 3324)
+++ tags/tomcat5.5/5.5.20-5/debian/README.Debian 2007-05-18 17:58:47 UTC (rev 3519)
@@ -1,80 +0,0 @@
-Apache Tomcat 5.5 for Debian
-============================
-
-- The home directory (CATALINA_HOME) for Tomcat 5.5 (a.k.a. Catalina) is
- /usr/share/tomcat5.5, the base directory (CATALINA_BASE) is
- /var/lib/tomcat5.5 but some files in there are just symlinks to the
- proper FHS directories.
-
- There's a .debian directory in /usr/share/tomcat5.5 which contains templates
- for configuration files. These are copied to the conf direcory during
- the package installation when the corresponding destination does not yet
- exist.
-
-- The package has been built as "light" distribution which means that some
- of the additional features like JavaMail, JTA and Tyrex are not enabled.
- Catalina was compiled using MX4J so JMX is available for an embedded
- servlet engine.
-
-- The main configuration file is /etc/tomcat5.5/server.xml.
- The default setup enables the built-in HTTP web server on port 8180 and
- a Coyote/JK AJP 1.3 connector for Apache on port 8009. The standard port
- 8080 for the web server was not used so the package does not conflict with
- junkbuster. Tomcat also listens on port 8005 (localhost only) for a
- shutdown command.
-
-- Tomcat 5.5 needs a full Java Development Kit (JDK), a Java Runtime
- Environment (JRE) is not sufficient because javac is needed for translating
- JavaServer Pages (JSP) into Java classes. A non-free JDK can be installed
- with help of the java-package tool by transforming a downloaded .bin JDK
- file from SUN or Blackdown into a deb package. Tomcat5.5 also works
- with free runtimes like java-gcj-compat-dev or kaffe.
-
- WARNING: Currently Tomcat cannot use a security manager while
- running under java-gcj-compat-dev. Do not run without a security
- manager unless you understand the consequences. See
- http://localhost:8180/tomcat-docs/security-manager-howto.html
- for more information.
-
-- You can test if Tomcat is working properly by pointing your favourite web
- browser to http://localhost:8180/ and testing some of the Servlet and JSP
- examples. This requires installation of the tomcat5.5-webapps package.
-
-- You can install your own web applications as .war files or in extracted form
- into a subdirectory of /var/lib/tomcat5.5/webapps. The name of the WAR file
- or subdirectory is the servlet context for this webapp.
-
-- Multiple Tomcat instances can be started by different users when
- $CATALINA_BASE is set to a local directory that contains the subdirectories
- conf, logs, webapps, work and temp. See RUNNING.txt for more about this.
-
-- When Tomcat runs with a security manager, you can define the permissions
- for your servlets and JSPs in /etc/tomcat5.5/policy.d/. For
- example, you can put your customizations in 50user.policy in this
- directory.
-
-- There is a webapp for basic web-based administration of Tomcat's webapps
- in the tomcat5.5-admin package. You need to add one of the users in
- /var/lib/tomcat5.5/conf/tomcat-users.xml to the manager role and probably
- set a better password. The "Web Application Manager" can then be accessed
- at http://localhost:8180/manager/html. There's also a more sophisticated
- administration webapp called "admin" in the same package but it can't make
- permanent changes to the configuration since the tomcat5.5 user does not have
- permission to do this in the default configuration.
-
-- Tomcat 5 does not follow symlinks by default. You can change this by adding
- this section to your webapp's context definition:
-
- <!-- make symlinks work in Tomcat 5.5 -->
- <Resources className="org.apache.naming.resources.FileDirContext"
- allowLinking="true" />
-
- See /etc/tomcat5.5/server.xml for examples.
-
-- For more information about Jakarta-Tomcat please take a look at the Tomcat
- home page at <http://tomcat.apache.org/index.html>.
-
-- This package is heavily based on the great work of Stephan Gybas on
- the tomcat4 package.
-
- -- Marcus Better <marcus at better.se>, Wed, 22 Nov 2006 11:49:16 +0100
Copied: tags/tomcat5.5/5.5.20-5/debian/README.Debian (from rev 3376, branches/tomcat5.5/feature/debian/debian/README.Debian)
===================================================================
--- tags/tomcat5.5/5.5.20-5/debian/README.Debian (rev 0)
+++ tags/tomcat5.5/5.5.20-5/debian/README.Debian 2007-05-18 17:58:47 UTC (rev 3519)
@@ -0,0 +1,83 @@
+Apache Tomcat 5.5 for Debian
+============================
+
+- WARNING: Currently Tomcat cannot use a security manager while
+ running under the current versions of java-gcj-compat-dev due to bug
+ #399595 in libgcj. Until this is fixed, Tomcat will crash at startup
+ with this message in the system log:
+
+ jsvc.exec[2648]: Service killed by signal 6
+
+ You can either install a non-free JDK such as sun-java6-jdk, or
+ disable the security manager (see TOMCAT_SECURITY in
+ /etc/default/tomcat5.5). Do not run without a security manager unless
+ you understand the consequences.
+
+- The home directory (CATALINA_HOME) for Tomcat 5.5 (a.k.a. Catalina) is
+ /usr/share/tomcat5.5, the base directory (CATALINA_BASE) is
+ /var/lib/tomcat5.5 but some files in there are just symlinks to the
+ proper FHS directories.
+
+ There's a .debian directory in /usr/share/tomcat5.5 which contains templates
+ for configuration files. These are copied to the conf direcory during
+ the package installation when the corresponding destination does not yet
+ exist.
+
+- The package has been built as "light" distribution which means that some
+ of the additional features like JavaMail, JTA and Tyrex are not enabled.
+ Catalina was compiled using MX4J so JMX is available for an embedded
+ servlet engine.
+
+- The main configuration file is /etc/tomcat5.5/server.xml.
+ The default setup enables the built-in HTTP web server on port 8180 and
+ a Coyote/JK AJP 1.3 connector for Apache on port 8009. The standard port
+ 8080 for the web server was not used so the package does not conflict with
+ junkbuster. Tomcat also listens on port 8005 (localhost only) for a
+ shutdown command.
+
+- Tomcat 5.5 needs a full Java Development Kit (JDK), a Java Runtime
+ Environment (JRE) is not sufficient because javac is needed for translating
+ JavaServer Pages (JSP) into Java classes.
+
+- You can test if Tomcat is working properly by pointing your favourite web
+ browser to http://localhost:8180/ and testing some of the Servlet and JSP
+ examples. This requires installation of the tomcat5.5-webapps package.
+
+- You can install your own web applications as .war files or in extracted form
+ into a subdirectory of /var/lib/tomcat5.5/webapps. The name of the WAR file
+ or subdirectory is the servlet context for this webapp.
+
+- Multiple Tomcat instances can be started by different users when
+ $CATALINA_BASE is set to a local directory that contains the subdirectories
+ conf, logs, webapps, work and temp. See RUNNING.txt for more about this.
+
+- When Tomcat runs with a security manager, you can define the permissions
+ for your servlets and JSPs in /etc/tomcat5.5/policy.d/. For
+ example, you can put your customizations in 50user.policy in this
+ directory.
+
+- There is a webapp for basic web-based administration of Tomcat's webapps
+ in the tomcat5.5-admin package. You need to add one of the users in
+ /var/lib/tomcat5.5/conf/tomcat-users.xml to the manager role and probably
+ set a better password. The "Web Application Manager" can then be accessed
+ at http://localhost:8180/manager/html. There's also a more sophisticated
+ administration webapp called "admin" in the same package but it can't make
+ permanent changes to the configuration since the tomcat5.5 user does not have
+ permission to do this in the default configuration.
+
+- Tomcat 5 does not follow symlinks by default. You can change this by adding
+ this section to your webapp's context definition:
+
+ <!-- make symlinks work in Tomcat 5.5 -->
+ <Resources className="org.apache.naming.resources.FileDirContext"
+ allowLinking="true" />
+
+ See /etc/tomcat5.5/server.xml for examples.
+
+- For more information about Jakarta-Tomcat please take a look at the Tomcat
+ home page at <http://tomcat.apache.org/index.html>.
+
+- This package is heavily based on the great work of Stephan Gybas on
+ the tomcat4 package.
+
+ -- Marcus Better <marcus at better.se>, Fri, 27 Apr 2007 07:39:01 +0200
Deleted: tags/tomcat5.5/5.5.20-5/debian/ant.properties
===================================================================
--- branches/tomcat5.5/feature/debian/debian/ant.properties 2007-04-24 13:00:33 UTC (rev 3324)
+++ tags/tomcat5.5/5.5.20-5/debian/ant.properties 2007-05-18 17:58:47 UTC (rev 3519)
@@ -1,24 +0,0 @@
-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
-commons-modeler.jar=/usr/share/java/commons-modeler.jar
-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
-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
-xmlParserAPIs.jar=/usr/share/java/xmlParserAPIs.jar
-log4j.jar=/usr/share/java/log4j-1.2.jar
-mail.jar=/usr/share/java/gnumail.jar
-xml-apis.jar=/usr/share/java/xml-apis.jar
-xercesImpl.jar=/usr/share/java/xercesImpl.jar
-jmx.jar=/usr/share/java/mx4j.jar
-jmx-remote.jar=/usr/share/java/mx4j-remote.jar
-junit.jar=/usr/share/java/junit.jar
-execute.installer=false
-jsse.jar=/usr/share/java/jsse.jar
-jasper-compiler-jdt.jar=/usr/share/java/ecj.jar
Copied: tags/tomcat5.5/5.5.20-5/debian/ant.properties (from rev 3512, branches/tomcat5.5/feature/debian/debian/ant.properties)
===================================================================
--- tags/tomcat5.5/5.5.20-5/debian/ant.properties (rev 0)
+++ tags/tomcat5.5/5.5.20-5/debian/ant.properties 2007-05-18 17:58:47 UTC (rev 3519)
@@ -0,0 +1,25 @@
+compile.source=1.5
+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
+commons-modeler.jar=/usr/share/java/commons-modeler.jar
+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
+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
+xmlParserAPIs.jar=/usr/share/java/xmlParserAPIs.jar
+log4j.jar=/usr/share/java/log4j-1.2.jar
+mail.jar=/usr/share/java/gnumail.jar
+xml-apis.jar=/usr/share/java/xml-apis.jar
+xercesImpl.jar=/usr/share/java/xercesImpl.jar
+jmx.jar=/usr/share/java/mx4j.jar
+jmx-remote.jar=/usr/share/java/mx4j-remote.jar
+junit.jar=/usr/share/java/junit.jar
+execute.installer=false
+jsse.jar=/usr/share/java/jsse.jar
+jasper-compiler-jdt.jar=/usr/share/java/ecj.jar
Deleted: tags/tomcat5.5/5.5.20-5/debian/changelog
===================================================================
--- branches/tomcat5.5/feature/debian/debian/changelog 2007-04-24 13:00:33 UTC (rev 3324)
+++ tags/tomcat5.5/5.5.20-5/debian/changelog 2007-05-18 17:58:47 UTC (rev 3519)
@@ -1,265 +0,0 @@
-tomcat5.5 (5.5.20-5) unstable; urgency=low
-
- * The named pipe "/var/log/tomcat5.5/catalina.out" is no longer
- created. Messages written to stdout and stderr during daemon startup
- are now lost. The -debug flag to jsvc may be used for early
- debugging. A proper solution is planned for future releases. (Closes:
- #402603)
-
- -- Marcus Better <marcus at better.se> Wed, 13 Dec 2006 20:05:48 +0100
-
-tomcat5.5 (5.5.20-4) unstable; urgency=low
-
- * The symlink "/usr/share/tomcat5.5/common/endorsed/xml-apis" is now
- correctly named "xml-apis.jar". Thanks to Javier Serrano
- Polo. (Closes: #402265)
- * The tomcat55 user now has write permissions to
- "/var/lib/tomcat5.5/conf", so that Tomcat can deploy webapps in WAR
- archives. (Closes: #402224)
- * The named pipe /var/log/tomcat5.5/catalina.out is now properly
- created.
- * The TOMCAT5_SHUTDOWN variable in /etc/default/tomcat5.5 is obsolete
- and has been removed.
- * The init script now supports the try-restart action.
- * Install the cron file.
-
- -- Marcus Better <marcus at better.se> Sat, 9 Dec 2006 22:41:52 +0100
-
-tomcat5.5 (5.5.20-3) experimental; urgency=low
-
- * Really fix the "/etc/init.d/tomcat5.5 status" command this
- time. (Closes: #398044)
- * Use jsvc for daemon startup, instead of the catalina.sh script. Daemon
- shutdown is now faster and more reliable.
- * Add missing permissions required by the admin webapp. Thanks to
- Jonathan-Marc Lapointe.
- * The CATALINA_OPTS variable in /etc/default/tomcat5.5 has been renamed
- to the more intuitive JAVA_OPTS.
-
- -- Marcus Better <marcus at better.se> Sat, 25 Nov 2006 21:20:18 +0100
-
-tomcat5.5 (5.5.20-2) unstable; urgency=medium
-
- * Now runs with java-gcj-compat. (Closes: #395167)
- * Add compatibility links for JDK 1.4. Thanks to Javier Serrano
- Polo. (Closes: #397996).
- * Fix accidental double removal of the tomcat55 user on purge in some
- cases. Thanks to Andreas Beckmann. (Closes: #393224)
- * Fix typo affecting "/etc/init.d/tomcat5.5 status" command. Thanks to
- Jhair Tocancipa Triana. (Closes: #398044)
- * Webapps are now installed in /usr/share/tomcat5.5-webapps. Their
- context definitions are copied into
- /var/lib/tomcat5.5/conf/Catalina/localhost on first install, but if
- removed they will no longer be re-enabled on every upgrade. Thanks to
- Adrian Bridgett. (Closes: #399184)
- * Change owner of various files from tomcat5 to tomcat55 on upgrade from
- release 5.5.17-1 or earlier. Thanks to Mike Whitaker. (Closes: #392569)
- * Don't use juli LogManager with java-gcj-compat, as workaround for bug
- #399251.
- * We no longer need xsltproc to generate documentation, since the
- required supporting functions are now available in main.
- * debian/ant.properties, debian/rules: Don't delete PureTLS code from
- the source. It will be ignored during build anyway.
- * Rebuild jkstatus-ant from source instead of using precompiled class
- files.
- * Simplified the .install files by grouping by directory.
- * Install forgotten files `catalina.properties', `logging.properties'
- and `context.xml' in /var/lib/tomcat5.5/conf.
- * Synchronized security policy files with upstream.
- * debian/rules: Don't use CDBS. Thus we no longer need a bogus "ant xxx"
- invocation in the "clean" target, and the script is simple enough
- anyway.
-
- -- Marcus Better <marcus at better.se> Tue, 21 Nov 2006 12:06:17 +0100
-
-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.
- * Make init script LSB compliant.
- * Don't call /etc/init.d/tomcat5.5 directly from the maintainer scripts.
-
- -- Marcus Better <marcus at better.se> Mon, 23 Oct 2006 13:28:15 +0200
-
-tomcat5.5 (5.5.17-2) unstable; urgency=low
-
- * debian/control: removed apache-utils version and added alternative
- apache2-utils (that provide the virtual apache-utils package)
- * debian/tomcat5.init: added Sun's jdk path as provided by sun-java5-bin
- package. (closes: #388617).
- * debian/control: updated apache2-common to apache2.2-common (closes:
- #391006) (thanks to Andrew Meaden and Luk Claes).
- * debian/control (depends): removed -webapps and -admin from Depends
- field and move them to Suggest to avoid circular dependencies, thanks
- to Bill Allombert. (closes: #387362).
- * tomcat5.5 has now the user tomcat55 and remove user tomcat5 if package
- tomcat5 is marked as purge or if it's never been installed (closes:
- #386831).
-
- -- Arnaud Vandyck <avdyk at debian.org> Mon, 9 Oct 2006 16:36:25 +0200
-
-tomcat5.5 (5.5.17-1) unstable; urgency=low
-
- * New upstream release.
- * debian/control: added tomcat5.5 dependency against ecj-boostrap so
- there is a jsp compiler closes: #384062).
-
- -- Arnaud Vandyck <avdyk at debian.org> Tue, 12 Sep 2006 14:42:58 +0200
-
-tomcat5.5 (5.5.15-1) experimental; urgency=low
-
- * Arnaud Vandyck <avdyk at debian.org>:
- + All the work as been done by Wolfgang to have this package in
- Debian.
- + The package is now tomcat5.5 and not tomcat5.
- + Now build with gcj instead of kaffe.
- + Put cdbs and debhelper in Build-Depends.
- + Standards-Version updated to 3.7.2.
- + tomcat depends on tomcat-webapps and tomcat-admin, not only suggest
- * New major upstream release
- + New source layout - adaptions all over the place
- + Ported all patches to new source layout
- + Added patch (09_UseSystemDBCP.patch) to use system dbcp instead of
- repackaged tomcat stuff (naming-factory-dbcp.jar)
- + Drop now unneeded dependencies on libsaxpath-java, libjaxen-java,
- libregexp-java from build-dependencies and dependencies
- + Move dependency on libcommons-collections3-java,
- libcommons-fileupload-java, libcommons-beanutils-java and
- libcommons-digester-java to tomcat5-admin (only needed here)
- + Move libraries around as required by new binary layout (e.g. i18n jars
- into own directory)
- + Moved and linked new jars (tomcat-jkstatus-ant.jar, tomcat-juli.jar)
- + Updated 03catalina.policy to include tomcat-juli.jar, remove launcher.jar
- + Install ant task definitions with libtomcat5-java
- * Remove JDK 1.3 directories from JDK_DIRS in tomcat.init (not supported)
- * Updated tomcat.default to remove JDK 1.3 options
- * Updated description to include host-manager, fixed URLs
- * Minor updates in README.Debian
-
- -- Wolfgang Baer <WBaer at gmx.de> Fri, 27 Jan 2006 10:07:47 +0100
-
-tomcat5 (5.0.30-9) unstable; urgency=low
-
- * kaffe compiler transition
- + Remove build.compiler jikes property
- + Modify tomcat5.init to use default compiler instead of jikes
- * Fix spelling error in README.Debian (closes: #346573)
-
- -- Wolfgang Baer <WBaer at gmx.de> Tue, 17 Jan 2006 11:50:52 +0100
-
-tomcat5 (5.0.30-8) unstable; urgency=low
-
- * Correct description to refer to tomcat5-webapps (closes: #336984)
- * Test in tomcat5.init for JDK like environment so we are sure
- java-gcj-compat-dev is installed and used (closes: #337270)
-
- -- Wolfgang Baer <WBaer at gmx.de> Mon, 7 Nov 2005 19:17:58 +0100
-
-tomcat5 (5.0.30-7) unstable; urgency=low
-
- * Move to main - upload with orig.tar.gz included
- * Works with kaffe (>= 1.1.6-3) and java-gcj-compat-dev
- + changed debian/control accordingly
- + adjusted tomcat5.init file
- * Removed libcommons-httpclient-java build-dep - not needed
-
- -- Wolfgang Baer <WBaer at gmx.de> Thu, 06 Oct 2005 21:59:36 +0200
-
-tomcat5 (5.0.30-6) unstable; urgency=low
-
- * Move commons-fileupload jar from common/lib to server/lib
- * Copy fixed struts-config.xml during install over the old one. The fixed
- one is taken from upstream (published at download location)
- * Tomcat5 has a new context file handling. The xml files with the context of
- a webapp needs to be put into conf/[Engine name]/[Host name] whereas the
- default engine which serves the admin webapp has to be called "Catalina":
- + Create conf/Catalina/localhost directory during install
- + Deploy the context files for the webapps into this directory
- (closes: #315038)
- + Added NEWS.Debian file to inform about moving context files to new
- context directory hierarchy.
- * Install the jsp/servlet examples (closes: #325508, #325507, #326126)
- * Added unzip to build-deps (needed to unzip example webapps)
- * Cleaned up debian/rules a bit
- * libcommons-launcher-java dependency added in last upload (closes: #324041)
- * Works with latest kaffe vm (closes: #320845) - added versioned dependency
- * Changed depends to j2sdk1.3 | j2sdk1.4 | j2sdk1.5 | kaffe
- * Removed depends on j2sdk1.3 | j2sdk1.4 | j2sdk1.5 | kaffe | java-compiler
- as the above depends already includes an java-compiler as JDKs
- * Removed note in description about non-free JDKs - kaffe works and the
- info is superceded by the existance of java-package
- * Updated *.policy files to match new jars and fixed typos
- * As tomcat5 is now functional we can close the whishlist bugs for
- packaging tomcat5 (closes: #222876, #267741)
- * Disable commons-daemon copy/build - not available on all platforms
- + Added patch 15_dont_copy_daemon.patch
- + Removed related stuff from debian/rules and debian/control
- * Removed classpath entry from MF and added jars directly to setclasspath.sh
- + Patch 01_remove_classpath_manifest_a.patch removes the entry
- + Patch 01_remove_classpath_manifest_b.patch adds it to setclasspath.sh
- * Fixed typo CALALINA in README.Debian
- * Fixed lintian warning in tomcat5.postinst
- * Extended JDK_DIRS and enabled Security Manager for non-free JDKs
- * Build documentation through commandline xslt processing
- + Patch 03_fix_doc_stylesheet.patch to fix stylsheet variable definition
- + Added xsltproc to build-deps and process docs in debian/rules
- + Moved RELEASE-NOTES to webapps/ROOT where it belongs
- + Added tomcat-docs.xml context definition to allow linking and also
- starting tomcat5 without tomcat5-webapps installed (removed linking
- for tomcat-docs from server.xml)
- * Added myself to uploaders
-
- * Upload sponsored by Petter Reinholdtsen
-
- -- Wolfgang Baer <WBaer at gmx.de> Wed, 07 Sep 2005 17:25:44 +0200
-
-tomcat5 (5.0.30-5) unstable; urgency=low
-
- * debian/control (libtomcat5-java: Depends): added
- libcommons-launcher-java
-
- -- Arnaud Vandyck <avdyk at debian.org> Sat, 20 Aug 2005 10:34:05 +0200
-
-tomcat5 (5.0.30-4) unstable; urgency=low
-
- * upload to unstable
- * debian/control: ant transition: change the dep from libant1.6-java to
- ant
- * debian/libtomcat5-java.links: added some links and corrected ant once
- * updated to libcommons-collection3-java
-
- -- Arnaud Vandyck <avdyk at debian.org> Fri, 19 Aug 2005 16:06:27 +0200
-
-tomcat5 (5.0.30-3) experimental; urgency=low
-
- * Added libapache2-mod-jk to suggests, missing libcommons-el-java
- to libtomcat5-java build-depends
- * Fixed/Added links in libtomcat5-java (jsp-api/commons-el jars added)
- * Changed JDK dirs (as generated by java-package), enabled security
- manager and therefore put kaffe as last jdk (currently has problems)
- * Fixed typo in ant.properties to correctly include logging-api.jar
- and fixed libtomcat5-java accordingly
- * Fixed servlet-api link in tomcat5-webapps.links and included needed
- jsp-api link
- * Standards-Version 3.6.2 - no changes required
- * Build-Deps to Build-Dep-Indep to fix linitan warning
-
- -- Wolfgang Baer <WBaer at gmx.de> Wed, 29 Jun 2005 22:32:49 +0200
-
-tomcat5 (5.0.30-2) experimental; urgency=low
-
- * libtomcat5-java: does not provide commons-logging-api and
- commons-daemon but use symlink to /usr/share/java. Now, tomcat5 can
- start with non-free jdks (but it does not run with free one at the
- moment for me) (closes: #315038)
-
- -- Arnaud Vandyck <avdyk at debian.org> Tue, 21 Jun 2005 12:44:21 +0200
-
-tomcat5 (5.0.30-1) experimental; urgency=low
-
- * Initial release release based on tomcat4 package by Stefan Gybas.
-
- -- Arnaud Vandyck <avdyk at debian.org> Sat, 11 Jun 2005 17:00:35 +0200
Copied: tags/tomcat5.5/5.5.20-5/debian/changelog (from rev 3512, branches/tomcat5.5/feature/debian/debian/changelog)
===================================================================
--- tags/tomcat5.5/5.5.20-5/debian/changelog (rev 0)
+++ tags/tomcat5.5/5.5.20-5/debian/changelog 2007-05-18 17:58:47 UTC (rev 3519)
@@ -0,0 +1,277 @@
+tomcat5.5 (5.5.20-5) unstable; urgency=low
+
+ * Messages are now logged to the system log instead of the pipe
+ "/var/log/tomcat5.5/catalina.out". (Closes: #402603, #402879)
+ * The security manager is enabled by default. A warning is logged to the
+ syslog when running under GCJ, which doesn't work in this mode
+ currently. (Closes: #411137)
+ * debian/rules: Set SHELL=/bin/bash as required. Thanks to David
+ Pashley. (Closes: #413845)
+ * Webapps are now permitted to read the properties "catalina.base" and
+ "catalina.home". Thanks to Adrian Bridgett. (Closes: #412479)
+ * Added the symlink "/usr/share/tomcat5.5/webapps" pointing to
+ "/var/lib/tomcat5.5/webapps". Thanks to Cyrille
+ <cnofficial at neotilus.com> and Florent Angebault. (Closes: #406614)
+ * Build with source level 1.5, since GCJ now supports generics. (Closes:
+ #424465)
+ * Recognise Sun JDK 6 from the sun-java6-jdk package.
+ * debian/control: Removed Stefan Gybas (on own request) and Wolfgang
+ Baer from Uploaders.
+
+ -- Marcus Better <marcus at better.se> Tue, 24 Apr 2007 15:04:17 +0200
+
+tomcat5.5 (5.5.20-4) unstable; urgency=low
+
+ * The symlink "/usr/share/tomcat5.5/common/endorsed/xml-apis" is now
+ correctly named "xml-apis.jar". Thanks to Javier Serrano
+ Polo. (Closes: #402265)
+ * The tomcat55 user now has write permissions to
+ "/var/lib/tomcat5.5/conf", so that Tomcat can deploy webapps in WAR
+ archives. (Closes: #402224)
+ * The named pipe /var/log/tomcat5.5/catalina.out is now properly
+ created.
+ * The TOMCAT5_SHUTDOWN variable in /etc/default/tomcat5.5 is obsolete
+ and has been removed.
+ * The init script now supports the try-restart action.
+ * Install the cron file.
+
+ -- Marcus Better <marcus at better.se> Sat, 9 Dec 2006 22:41:52 +0100
+
+tomcat5.5 (5.5.20-3) experimental; urgency=low
+
+ * Really fix the "/etc/init.d/tomcat5.5 status" command this
+ time. (Closes: #398044)
+ * Use jsvc for daemon startup, instead of the catalina.sh script. Daemon
+ shutdown is now faster and more reliable.
+ * Add missing permissions required by the admin webapp. Thanks to
+ Jonathan-Marc Lapointe.
+ * The CATALINA_OPTS variable in /etc/default/tomcat5.5 has been renamed
+ to the more intuitive JAVA_OPTS.
+
+ -- Marcus Better <marcus at better.se> Sat, 25 Nov 2006 21:20:18 +0100
+
+tomcat5.5 (5.5.20-2) unstable; urgency=medium
+
+ * Now runs with java-gcj-compat. (Closes: #395167)
+ * Add compatibility links for JDK 1.4. Thanks to Javier Serrano
+ Polo. (Closes: #397996).
+ * Fix accidental double removal of the tomcat55 user on purge in some
+ cases. Thanks to Andreas Beckmann. (Closes: #393224)
+ * Fix typo affecting "/etc/init.d/tomcat5.5 status" command. Thanks to
+ Jhair Tocancipa Triana. (Closes: #398044)
+ * Webapps are now installed in /usr/share/tomcat5.5-webapps. Their
+ context definitions are copied into
+ /var/lib/tomcat5.5/conf/Catalina/localhost on first install, but if
+ removed they will no longer be re-enabled on every upgrade. Thanks to
+ Adrian Bridgett. (Closes: #399184)
+ * Change owner of various files from tomcat5 to tomcat55 on upgrade from
+ release 5.5.17-1 or earlier. Thanks to Mike Whitaker. (Closes: #392569)
+ * Don't use juli LogManager with java-gcj-compat, as workaround for bug
+ #399251.
+ * We no longer need xsltproc to generate documentation, since the
+ required supporting functions are now available in main.
+ * debian/ant.properties, debian/rules: Don't delete PureTLS code from
+ the source. It will be ignored during build anyway.
+ * Rebuild jkstatus-ant from source instead of using precompiled class
+ files.
+ * Simplified the .install files by grouping by directory.
+ * Install forgotten files `catalina.properties', `logging.properties'
+ and `context.xml' in /var/lib/tomcat5.5/conf.
+ * Synchronized security policy files with upstream.
+ * debian/rules: Don't use CDBS. Thus we no longer need a bogus "ant xxx"
+ invocation in the "clean" target, and the script is simple enough
+ anyway.
+
+ -- Marcus Better <marcus at better.se> Tue, 21 Nov 2006 12:06:17 +0100
+
+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.
+ * Make init script LSB compliant.
+ * Don't call /etc/init.d/tomcat5.5 directly from the maintainer scripts.
+
+ -- Marcus Better <marcus at better.se> Mon, 23 Oct 2006 13:28:15 +0200
+
+tomcat5.5 (5.5.17-2) unstable; urgency=low
+
+ * debian/control: removed apache-utils version and added alternative
+ apache2-utils (that provide the virtual apache-utils package)
+ * debian/tomcat5.init: added Sun's jdk path as provided by sun-java5-bin
+ package. (closes: #388617).
+ * debian/control: updated apache2-common to apache2.2-common (closes:
+ #391006) (thanks to Andrew Meaden and Luk Claes).
+ * debian/control (depends): removed -webapps and -admin from Depends
+ field and move them to Suggest to avoid circular dependencies, thanks
+ to Bill Allombert. (closes: #387362).
+ * tomcat5.5 has now the user tomcat55 and remove user tomcat5 if package
+ tomcat5 is marked as purge or if it's never been installed (closes:
+ #386831).
+
+ -- Arnaud Vandyck <avdyk at debian.org> Mon, 9 Oct 2006 16:36:25 +0200
+
+tomcat5.5 (5.5.17-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/control: added tomcat5.5 dependency against ecj-boostrap so
+ there is a jsp compiler closes: #384062).
+
+ -- Arnaud Vandyck <avdyk at debian.org> Tue, 12 Sep 2006 14:42:58 +0200
+
+tomcat5.5 (5.5.15-1) experimental; urgency=low
+
+ * Arnaud Vandyck <avdyk at debian.org>:
+ + All the work as been done by Wolfgang to have this package in
+ Debian.
+ + The package is now tomcat5.5 and not tomcat5.
+ + Now build with gcj instead of kaffe.
+ + Put cdbs and debhelper in Build-Depends.
+ + Standards-Version updated to 3.7.2.
+ + tomcat depends on tomcat-webapps and tomcat-admin, not only suggest
+ * New major upstream release
+ + New source layout - adaptions all over the place
+ + Ported all patches to new source layout
+ + Added patch (09_UseSystemDBCP.patch) to use system dbcp instead of
+ repackaged tomcat stuff (naming-factory-dbcp.jar)
+ + Drop now unneeded dependencies on libsaxpath-java, libjaxen-java,
+ libregexp-java from build-dependencies and dependencies
+ + Move dependency on libcommons-collections3-java,
+ libcommons-fileupload-java, libcommons-beanutils-java and
+ libcommons-digester-java to tomcat5-admin (only needed here)
+ + Move libraries around as required by new binary layout (e.g. i18n jars
+ into own directory)
+ + Moved and linked new jars (tomcat-jkstatus-ant.jar, tomcat-juli.jar)
+ + Updated 03catalina.policy to include tomcat-juli.jar, remove launcher.jar
+ + Install ant task definitions with libtomcat5-java
+ * Remove JDK 1.3 directories from JDK_DIRS in tomcat.init (not supported)
+ * Updated tomcat.default to remove JDK 1.3 options
+ * Updated description to include host-manager, fixed URLs
+ * Minor updates in README.Debian
+
+ -- Wolfgang Baer <WBaer at gmx.de> Fri, 27 Jan 2006 10:07:47 +0100
+
+tomcat5 (5.0.30-9) unstable; urgency=low
+
+ * kaffe compiler transition
+ + Remove build.compiler jikes property
+ + Modify tomcat5.init to use default compiler instead of jikes
+ * Fix spelling error in README.Debian (closes: #346573)
+
+ -- Wolfgang Baer <WBaer at gmx.de> Tue, 17 Jan 2006 11:50:52 +0100
+
+tomcat5 (5.0.30-8) unstable; urgency=low
+
+ * Correct description to refer to tomcat5-webapps (closes: #336984)
+ * Test in tomcat5.init for JDK like environment so we are sure
+ java-gcj-compat-dev is installed and used (closes: #337270)
+
+ -- Wolfgang Baer <WBaer at gmx.de> Mon, 7 Nov 2005 19:17:58 +0100
+
+tomcat5 (5.0.30-7) unstable; urgency=low
+
+ * Move to main - upload with orig.tar.gz included
+ * Works with kaffe (>= 1.1.6-3) and java-gcj-compat-dev
+ + changed debian/control accordingly
+ + adjusted tomcat5.init file
+ * Removed libcommons-httpclient-java build-dep - not needed
+
+ -- Wolfgang Baer <WBaer at gmx.de> Thu, 06 Oct 2005 21:59:36 +0200
+
+tomcat5 (5.0.30-6) unstable; urgency=low
+
+ * Move commons-fileupload jar from common/lib to server/lib
+ * Copy fixed struts-config.xml during install over the old one. The fixed
+ one is taken from upstream (published at download location)
+ * Tomcat5 has a new context file handling. The xml files with the context of
+ a webapp needs to be put into conf/[Engine name]/[Host name] whereas the
+ default engine which serves the admin webapp has to be called "Catalina":
+ + Create conf/Catalina/localhost directory during install
+ + Deploy the context files for the webapps into this directory
+ (closes: #315038)
+ + Added NEWS.Debian file to inform about moving context files to new
+ context directory hierarchy.
+ * Install the jsp/servlet examples (closes: #325508, #325507, #326126)
+ * Added unzip to build-deps (needed to unzip example webapps)
+ * Cleaned up debian/rules a bit
+ * libcommons-launcher-java dependency added in last upload (closes: #324041)
+ * Works with latest kaffe vm (closes: #320845) - added versioned dependency
+ * Changed depends to j2sdk1.3 | j2sdk1.4 | j2sdk1.5 | kaffe
+ * Removed depends on j2sdk1.3 | j2sdk1.4 | j2sdk1.5 | kaffe | java-compiler
+ as the above depends already includes an java-compiler as JDKs
+ * Removed note in description about non-free JDKs - kaffe works and the
+ info is superceded by the existance of java-package
+ * Updated *.policy files to match new jars and fixed typos
+ * As tomcat5 is now functional we can close the whishlist bugs for
+ packaging tomcat5 (closes: #222876, #267741)
+ * Disable commons-daemon copy/build - not available on all platforms
+ + Added patch 15_dont_copy_daemon.patch
+ + Removed related stuff from debian/rules and debian/control
+ * Removed classpath entry from MF and added jars directly to setclasspath.sh
+ + Patch 01_remove_classpath_manifest_a.patch removes the entry
+ + Patch 01_remove_classpath_manifest_b.patch adds it to setclasspath.sh
+ * Fixed typo CALALINA in README.Debian
+ * Fixed lintian warning in tomcat5.postinst
+ * Extended JDK_DIRS and enabled Security Manager for non-free JDKs
+ * Build documentation through commandline xslt processing
+ + Patch 03_fix_doc_stylesheet.patch to fix stylsheet variable definition
+ + Added xsltproc to build-deps and process docs in debian/rules
+ + Moved RELEASE-NOTES to webapps/ROOT where it belongs
+ + Added tomcat-docs.xml context definition to allow linking and also
+ starting tomcat5 without tomcat5-webapps installed (removed linking
+ for tomcat-docs from server.xml)
+ * Added myself to uploaders
+
+ * Upload sponsored by Petter Reinholdtsen
+
+ -- Wolfgang Baer <WBaer at gmx.de> Wed, 07 Sep 2005 17:25:44 +0200
+
+tomcat5 (5.0.30-5) unstable; urgency=low
+
+ * debian/control (libtomcat5-java: Depends): added
+ libcommons-launcher-java
+
+ -- Arnaud Vandyck <avdyk at debian.org> Sat, 20 Aug 2005 10:34:05 +0200
+
+tomcat5 (5.0.30-4) unstable; urgency=low
+
+ * upload to unstable
+ * debian/control: ant transition: change the dep from libant1.6-java to
+ ant
+ * debian/libtomcat5-java.links: added some links and corrected ant once
+ * updated to libcommons-collection3-java
+
+ -- Arnaud Vandyck <avdyk at debian.org> Fri, 19 Aug 2005 16:06:27 +0200
+
+tomcat5 (5.0.30-3) experimental; urgency=low
+
+ * Added libapache2-mod-jk to suggests, missing libcommons-el-java
+ to libtomcat5-java build-depends
+ * Fixed/Added links in libtomcat5-java (jsp-api/commons-el jars added)
+ * Changed JDK dirs (as generated by java-package), enabled security
+ manager and therefore put kaffe as last jdk (currently has problems)
+ * Fixed typo in ant.properties to correctly include logging-api.jar
+ and fixed libtomcat5-java accordingly
+ * Fixed servlet-api link in tomcat5-webapps.links and included needed
+ jsp-api link
+ * Standards-Version 3.6.2 - no changes required
+ * Build-Deps to Build-Dep-Indep to fix linitan warning
+
+ -- Wolfgang Baer <WBaer at gmx.de> Wed, 29 Jun 2005 22:32:49 +0200
+
+tomcat5 (5.0.30-2) experimental; urgency=low
+
+ * libtomcat5-java: does not provide commons-logging-api and
+ commons-daemon but use symlink to /usr/share/java. Now, tomcat5 can
+ start with non-free jdks (but it does not run with free one at the
+ moment for me) (closes: #315038)
+
+ -- Arnaud Vandyck <avdyk at debian.org> Tue, 21 Jun 2005 12:44:21 +0200
+
+tomcat5 (5.0.30-1) experimental; urgency=low
+
+ * Initial release release based on tomcat4 package by Stefan Gybas.
+
+ -- Arnaud Vandyck <avdyk at debian.org> Sat, 11 Jun 2005 17:00:35 +0200
Deleted: tags/tomcat5.5/5.5.20-5/debian/control
===================================================================
--- branches/tomcat5.5/feature/debian/debian/control 2007-04-24 13:00:33 UTC (rev 3324)
+++ tags/tomcat5.5/5.5.20-5/debian/control 2007-05-18 17:58:47 UTC (rev 3519)
@@ -1,60 +0,0 @@
-Source: tomcat5.5
-Section: web
-Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Stefan Gybas <sgybas at debian.org>, Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>, Marcus Better <marcus at better.se>
-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 (>= 1.0-1), libcommons-httpclient-java, libcommons-launcher-java, libcommons-logging-java, libcommons-modeler-java (>= 1.1-1), liblog4j1.2-java, libmx4j-java, libstruts1.2-java, libxerces2-java, libxalan2-java, junit, unzip
-Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/tomcat5.5
-XS-Vcs-Browse: http://svn.debian.org/wsvn/pkg-java/trunk/tomcat5.5/
-
-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), ecj-bootstrap, jsvc
-Suggests: java-virtual-machine, libapache-mod-jk | libapache2-mod-jk, tomcat5.5-webapps (>= ${Source-Version}), tomcat5.5-admin (>= ${Source-Version})
-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.
- .
- Homepage: http://tomcat.apache.org
-
-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 (>= 1.1-1), libmx4j-java, libcommons-collections3-java, libcommons-dbcp-java, libcommons-pool-java
-Suggests: tomcat5.5
-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.
- .
- Homepage: http://tomcat.apache.org
-
-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.
- .
- Homepage: http://tomcat.apache.org
-
-Package: tomcat5.5-admin
-Architecture: all
-Depends: tomcat5.5 (>= ${Source-Version}), libstruts1.2-java, libcommons-fileupload-java (>= 1.0-1), libcommons-beanutils-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.
- .
- Homepage: http://tomcat.apache.org
Copied: tags/tomcat5.5/5.5.20-5/debian/control (from rev 3513, branches/tomcat5.5/feature/debian/debian/control)
===================================================================
--- tags/tomcat5.5/5.5.20-5/debian/control (rev 0)
+++ tags/tomcat5.5/5.5.20-5/debian/control 2007-05-18 17:58:47 UTC (rev 3519)
@@ -0,0 +1,60 @@
+Source: tomcat5.5
+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>
+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 (>= 1.1-1), liblog4j1.2-java, libmx4j-java, libstruts1.2-java, libxerces2-java, libxalan2-java, junit, unzip
+Standards-Version: 3.7.2
+XS-Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/tomcat5.5
+XS-Vcs-Browse: http://svn.debian.org/wsvn/pkg-java/trunk/tomcat5.5/
+
+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), ecj-bootstrap, jsvc (>= 1.0.2~svn20061127-6)
+Suggests: java-virtual-machine, libapache-mod-jk | libapache2-mod-jk, tomcat5.5-webapps (>= ${Source-Version}), tomcat5.5-admin (>= ${Source-Version})
+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.
+ .
+ Homepage: http://tomcat.apache.org
+
+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 (>= 1.1-1), libmx4j-java, libcommons-collections3-java, libcommons-dbcp-java, libcommons-pool-java
+Suggests: tomcat5.5
+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.
+ .
+ Homepage: http://tomcat.apache.org
+
+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.
+ .
+ Homepage: http://tomcat.apache.org
+
+Package: tomcat5.5-admin
+Architecture: all
+Depends: tomcat5.5 (>= ${Source-Version}), libstruts1.2-java, libcommons-fileupload-java, libcommons-beanutils-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.
+ .
+ Homepage: http://tomcat.apache.org
Deleted: tags/tomcat5.5/5.5.20-5/debian/policy/04webapps.policy
===================================================================
--- branches/tomcat5.5/feature/debian/debian/policy/04webapps.policy 2007-04-24 13:00:33 UTC (rev 3324)
+++ tags/tomcat5.5/5.5.20-5/debian/policy/04webapps.policy 2007-05-18 17:58:47 UTC (rev 3519)
@@ -1,54 +0,0 @@
-// ========== WEB APPLICATION PERMISSIONS =====================================
-
-
-// These permissions are granted by default to all web applications
-// In addition, a web application will be given a read FilePermission
-// and JndiPermission for all files and directories in its document root.
-grant {
- // Required for JNDI lookup of named JDBC DataSource's and
- // javamail named MimePart DataSource used to send mail
- permission java.util.PropertyPermission "java.home", "read";
- permission java.util.PropertyPermission "java.naming.*", "read";
- permission java.util.PropertyPermission "javax.sql.*", "read";
-
- // OS Specific properties to allow read access
- permission java.util.PropertyPermission "os.name", "read";
- permission java.util.PropertyPermission "os.version", "read";
- permission java.util.PropertyPermission "os.arch", "read";
- permission java.util.PropertyPermission "file.separator", "read";
- permission java.util.PropertyPermission "path.separator", "read";
- permission java.util.PropertyPermission "line.separator", "read";
-
- // JVM properties to allow read access
- permission java.util.PropertyPermission "java.version", "read";
- permission java.util.PropertyPermission "java.vendor", "read";
- permission java.util.PropertyPermission "java.vendor.url", "read";
- permission java.util.PropertyPermission "java.class.version", "read";
- permission java.util.PropertyPermission "java.specification.version", "read";
- permission java.util.PropertyPermission "java.specification.vendor", "read";
- permission java.util.PropertyPermission "java.specification.name", "read";
-
- permission java.util.PropertyPermission "java.vm.specification.version", "read";
- permission java.util.PropertyPermission "java.vm.specification.vendor", "read";
- permission java.util.PropertyPermission "java.vm.specification.name", "read";
- permission java.util.PropertyPermission "java.vm.version", "read";
- permission java.util.PropertyPermission "java.vm.vendor", "read";
- permission java.util.PropertyPermission "java.vm.name", "read";
-
- // Required for OpenJMX
- permission java.lang.RuntimePermission "getAttribute";
-
- // Allow read of JAXP compliant XML parser debug
- permission java.util.PropertyPermission "jaxp.debug", "read";
-
- // Precompiled JSPs need access to this package.
- permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime";
- permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime.*";
-
-};
-
-// The permissions granted to the balancer WEB-INF/classes and WEB-INF/lib directory
-grant codeBase "file:/usr/share/tomcat5.5-webapps/balancer/-" {
- permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat.util.digester";
- permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat.util.digester.*";
-};
Copied: tags/tomcat5.5/5.5.20-5/debian/policy/04webapps.policy (from rev 3371, branches/tomcat5.5/feature/debian/debian/policy/04webapps.policy)
===================================================================
--- tags/tomcat5.5/5.5.20-5/debian/policy/04webapps.policy (rev 0)
+++ tags/tomcat5.5/5.5.20-5/debian/policy/04webapps.policy 2007-05-18 17:58:47 UTC (rev 3519)
@@ -0,0 +1,56 @@
+// ========== WEB APPLICATION PERMISSIONS =====================================
+
+
+// These permissions are granted by default to all web applications
+// In addition, a web application will be given a read FilePermission
+// and JndiPermission for all files and directories in its document root.
+grant {
+ // Required for JNDI lookup of named JDBC DataSource's and
+ // javamail named MimePart DataSource used to send mail
+ permission java.util.PropertyPermission "java.home", "read";
+ permission java.util.PropertyPermission "java.naming.*", "read";
+ permission java.util.PropertyPermission "javax.sql.*", "read";
+
+ // OS Specific properties to allow read access
+ permission java.util.PropertyPermission "os.name", "read";
+ permission java.util.PropertyPermission "os.version", "read";
+ permission java.util.PropertyPermission "os.arch", "read";
+ permission java.util.PropertyPermission "file.separator", "read";
+ permission java.util.PropertyPermission "path.separator", "read";
+ permission java.util.PropertyPermission "line.separator", "read";
+ permission java.util.PropertyPermission "catalina.base", "read";
+ permission java.util.PropertyPermission "catalina.home", "read";
+
+ // JVM properties to allow read access
+ permission java.util.PropertyPermission "java.version", "read";
+ permission java.util.PropertyPermission "java.vendor", "read";
+ permission java.util.PropertyPermission "java.vendor.url", "read";
+ permission java.util.PropertyPermission "java.class.version", "read";
+ permission java.util.PropertyPermission "java.specification.version", "read";
+ permission java.util.PropertyPermission "java.specification.vendor", "read";
+ permission java.util.PropertyPermission "java.specification.name", "read";
+
+ permission java.util.PropertyPermission "java.vm.specification.version", "read";
+ permission java.util.PropertyPermission "java.vm.specification.vendor", "read";
+ permission java.util.PropertyPermission "java.vm.specification.name", "read";
+ permission java.util.PropertyPermission "java.vm.version", "read";
+ permission java.util.PropertyPermission "java.vm.vendor", "read";
+ permission java.util.PropertyPermission "java.vm.name", "read";
+
+ // Required for OpenJMX
+ permission java.lang.RuntimePermission "getAttribute";
+
+ // Allow read of JAXP compliant XML parser debug
+ permission java.util.PropertyPermission "jaxp.debug", "read";
+
+ // Precompiled JSPs need access to this package.
+ permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime";
+ permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime.*";
+
+};
+
+// The permissions granted to the balancer WEB-INF/classes and WEB-INF/lib directory
+grant codeBase "file:/usr/share/tomcat5.5-webapps/balancer/-" {
+ permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat.util.digester";
+ permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat.util.digester.*";
+};
Deleted: tags/tomcat5.5/5.5.20-5/debian/rules
===================================================================
--- branches/tomcat5.5/feature/debian/debian/rules 2007-04-24 13:00:33 UTC (rev 3324)
+++ tags/tomcat5.5/5.5.20-5/debian/rules 2007-05-18 17:58:47 UTC (rev 3519)
@@ -1,77 +0,0 @@
-#!/usr/bin/make -f
-
-JAVA_HOME := /usr/lib/jvm/java-gcj
-DEB_JARS_BASE := /usr/share/java
-JAVACMD := $(JAVA_HOME)/bin/java
-
-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)
-
-ANT_ARGS := -propertyfile debian/ant.properties \
- -Dbase.path=$(CURDIR)/build/tmp
-ANT_INVOKE := $(JAVACMD) -classpath $(DEB_CLASSPATH) \
- org.apache.tools.ant.Main $(ANT_ARGS)
-
-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
- rm -f build-stamp
- -rm -r build/{build,compat,deployer,dist,tmp} LICENSE
- 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
- # Prune files that should not be installed at all.
- rm 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/* \
- $(LIBTOMCAT_SHARE_DIR)/bin/*.sh \
- $(LIBTOMCAT_SHARE_DIR)/common/lib/{commons-*,{jsp,servlet}-api.jar} \
- $(LIBTOMCAT_SHARE_DIR)/server/lib/commons-*
- 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
Copied: tags/tomcat5.5/5.5.20-5/debian/rules (from rev 3329, branches/tomcat5.5/feature/debian/debian/rules)
===================================================================
--- tags/tomcat5.5/5.5.20-5/debian/rules (rev 0)
+++ tags/tomcat5.5/5.5.20-5/debian/rules 2007-05-18 17:58:47 UTC (rev 3519)
@@ -0,0 +1,79 @@
+#!/usr/bin/make -f
+
+SHELL = /bin/bash
+
+JAVA_HOME := /usr/lib/jvm/java-gcj
+DEB_JARS_BASE := /usr/share/java
+JAVACMD := $(JAVA_HOME)/bin/java
+
+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)
+
+ANT_ARGS := -propertyfile debian/ant.properties \
+ -Dbase.path=$(CURDIR)/build/tmp
+ANT_INVOKE := $(JAVACMD) -classpath $(DEB_CLASSPATH) \
+ org.apache.tools.ant.Main $(ANT_ARGS)
+
+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
+ rm -f build-stamp
+ -rm -r build/{build,compat,deployer,dist,tmp} LICENSE
+ 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
+ # Prune files that should not be installed at all.
+ rm 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/* \
+ $(LIBTOMCAT_SHARE_DIR)/bin/*.sh \
+ $(LIBTOMCAT_SHARE_DIR)/common/lib/{commons-*,{jsp,servlet}-api.jar} \
+ $(LIBTOMCAT_SHARE_DIR)/server/lib/commons-*
+ 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: tags/tomcat5.5/5.5.20-5/debian/tomcat5.5.default
===================================================================
--- branches/tomcat5.5/feature/debian/debian/tomcat5.5.default 2007-04-24 13:00:33 UTC (rev 3324)
+++ tags/tomcat5.5/5.5.20-5/debian/tomcat5.5.default 2007-05-18 17:58:47 UTC (rev 3519)
@@ -1,30 +0,0 @@
-# Run Tomcat as this user ID (default: tomcat55). Set this to an empty string
-# to prevent Tomcat from starting.
-#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-1.5.0-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)
-# "-Djava.awt.headless=true -Xmx128M" is automatically set if CATALINA_OPTS
-# is left empty here
-#JAVA_OPTS="-Djava.awt.headless=true -Xmx128M -server"
-
-# 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
Copied: tags/tomcat5.5/5.5.20-5/debian/tomcat5.5.default (from rev 3376, branches/tomcat5.5/feature/debian/debian/tomcat5.5.default)
===================================================================
--- tags/tomcat5.5/5.5.20-5/debian/tomcat5.5.default (rev 0)
+++ tags/tomcat5.5/5.5.20-5/debian/tomcat5.5.default 2007-05-18 17:58:47 UTC (rev 3519)
@@ -0,0 +1,28 @@
+# Run Tomcat as this user ID (default: tomcat55). Set this to an empty string
+# to prevent Tomcat from starting.
+#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: tags/tomcat5.5/5.5.20-5/debian/tomcat5.5.init
===================================================================
--- branches/tomcat5.5/feature/debian/debian/tomcat5.5.init 2007-04-24 13:00:33 UTC (rev 3324)
+++ tags/tomcat5.5/5.5.20-5/debian/tomcat5.5.init 2007-05-18 17:58:47 UTC (rev 3519)
@@ -1,206 +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
-
-. /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-1.5.0-sun /usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-blackdown /usr/lib/j2se/1.4 /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.3-sun /usr/lib/j2sdk1.3-blackdown /usr/lib/j2sdk1.5-ibm /usr/lib/j2sdk1.4-ibm /usr/lib/jvm/java-gcj /usr/lib/kaffe"
-
-# Directory for per-instance configuration files and webapps
-CATALINA_BASE=/var/lib/tomcat5.5
-
-# 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
-
-# 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
-
-# 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 libgcj (see bug #395167)
-gcj=no
-"$JAVA_HOME/bin/java" -version 2>&1 | grep -q "^gij (GNU libgcj)" && gcj=yes
-if [ "$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
-
-# 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
- rm -rf "$CATALINA_BASE"/temp/*
- chown --dereference "$TOMCAT5_USER" "$CATALINA_BASE/conf" \
- "$CATALINA_BASE/conf/tomcat-users.xml" \
- "$CATALINA_BASE/logs" "$CATALINA_BASE/temp" \
- "$CATALINA_BASE/webapps" "$CATALINA_BASE/work" \
- "$CATALINA_BASE/logs/catalina.out" || true
-
- $DAEMON -user "$TOMCAT5_USER" -cp "$JSVC_CLASSPATH" \
- -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."
- exit 1
- else
- log_success_msg "$DESC is not running."
- exit 3
- fi
- else
- log_success_msg "$DESC is running with pid `cat $CATALINA_PID`"
- exit 0
- 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
Copied: tags/tomcat5.5/5.5.20-5/debian/tomcat5.5.init (from rev 3381, branches/tomcat5.5/feature/debian/debian/tomcat5.5.init)
===================================================================
--- tags/tomcat5.5/5.5.20-5/debian/tomcat5.5.init (rev 0)
+++ tags/tomcat5.5/5.5.20-5/debian/tomcat5.5.init 2007-05-18 17:58:47 UTC (rev 3519)
@@ -0,0 +1,211 @@
+#!/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
+
+. /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/tomcat5.5
+
+# 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
+ echo -e "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
+ rm -rf "$CATALINA_BASE"/temp/*
+ chown --dereference "$TOMCAT5_USER" "$CATALINA_BASE/conf" \
+ "$CATALINA_BASE/conf/tomcat-users.xml" \
+ "$CATALINA_BASE/logs" "$CATALINA_BASE/temp" \
+ "$CATALINA_BASE/webapps" "$CATALINA_BASE/work" \
+ || true
+
+ $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: tags/tomcat5.5/5.5.20-5/debian/tomcat5.5.links
===================================================================
--- branches/tomcat5.5/feature/debian/debian/tomcat5.5.links 2007-04-24 13:00:33 UTC (rev 3324)
+++ tags/tomcat5.5/5.5.20-5/debian/tomcat5.5.links 2007-05-18 17:58:47 UTC (rev 3519)
@@ -1,11 +0,0 @@
-/var/lib/tomcat5.5/conf /usr/share/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/log/tomcat5.5 /var/lib/tomcat5.5/logs
-/etc/tomcat5.5/server.xml /var/lib/tomcat5.5/conf/server.xml
-/etc/tomcat5.5/web.xml /var/lib/tomcat5.5/conf/web.xml
-/var/cache/tomcat5.5 /var/lib/tomcat5.5/work
-/usr/share/java/mx4j.jar /usr/share/tomcat5.5/bin/jmx.jar
Copied: tags/tomcat5.5/5.5.20-5/debian/tomcat5.5.links (from rev 3373, branches/tomcat5.5/feature/debian/debian/tomcat5.5.links)
===================================================================
--- tags/tomcat5.5/5.5.20-5/debian/tomcat5.5.links (rev 0)
+++ tags/tomcat5.5/5.5.20-5/debian/tomcat5.5.links 2007-05-18 17:58:47 UTC (rev 3519)
@@ -0,0 +1,12 @@
+/var/lib/tomcat5.5/conf /usr/share/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
+/etc/tomcat5.5/server.xml /var/lib/tomcat5.5/conf/server.xml
+/etc/tomcat5.5/web.xml /var/lib/tomcat5.5/conf/web.xml
+/var/cache/tomcat5.5 /var/lib/tomcat5.5/work
+/usr/share/java/mx4j.jar /usr/share/tomcat5.5/bin/jmx.jar
More information about the pkg-java-commits
mailing list