r2213 - in branches/tomcat5/tomcat5.5.x/debian: . webapps
Arnaud Vandyck
avdyk at costa.debian.org
Fri Jun 23 15:38:48 UTC 2006
Author: avdyk
Date: 2006-06-23 15:38:46 +0000 (Fri, 23 Jun 2006)
New Revision: 2213
Added:
branches/tomcat5/tomcat5.5.x/debian/libtomcat5.5-java.install
branches/tomcat5/tomcat5.5.x/debian/libtomcat5.5-java.links
branches/tomcat5/tomcat5.5.x/debian/tomcat5.5-admin.install
branches/tomcat5/tomcat5.5.x/debian/tomcat5.5-admin.links
branches/tomcat5/tomcat5.5.x/debian/tomcat5.5-admin.postinst
branches/tomcat5/tomcat5.5.x/debian/tomcat5.5-admin.prerm
branches/tomcat5/tomcat5.5.x/debian/tomcat5.5-webapps.install
branches/tomcat5/tomcat5.5.x/debian/tomcat5.5-webapps.links
branches/tomcat5/tomcat5.5.x/debian/tomcat5.5-webapps.postinst
branches/tomcat5/tomcat5.5.x/debian/tomcat5.5-webapps.prerm
branches/tomcat5/tomcat5.5.x/debian/tomcat5.5.cron.daily
branches/tomcat5/tomcat5.5.x/debian/tomcat5.5.default
branches/tomcat5/tomcat5.5.x/debian/tomcat5.5.dirs
branches/tomcat5/tomcat5.5.x/debian/tomcat5.5.init
branches/tomcat5/tomcat5.5.x/debian/tomcat5.5.install
branches/tomcat5/tomcat5.5.x/debian/tomcat5.5.links
branches/tomcat5/tomcat5.5.x/debian/tomcat5.5.postinst
branches/tomcat5/tomcat5.5.x/debian/tomcat5.5.postrm
Removed:
branches/tomcat5/tomcat5.5.x/debian/libtomcat5-java.install
branches/tomcat5/tomcat5.5.x/debian/libtomcat5-java.links
branches/tomcat5/tomcat5.5.x/debian/tomcat5-admin.install
branches/tomcat5/tomcat5.5.x/debian/tomcat5-admin.links
branches/tomcat5/tomcat5.5.x/debian/tomcat5-admin.postinst
branches/tomcat5/tomcat5.5.x/debian/tomcat5-admin.prerm
branches/tomcat5/tomcat5.5.x/debian/tomcat5-webapps.install
branches/tomcat5/tomcat5.5.x/debian/tomcat5-webapps.links
branches/tomcat5/tomcat5.5.x/debian/tomcat5-webapps.postinst
branches/tomcat5/tomcat5.5.x/debian/tomcat5-webapps.prerm
branches/tomcat5/tomcat5.5.x/debian/tomcat5.cron.daily
branches/tomcat5/tomcat5.5.x/debian/tomcat5.default
branches/tomcat5/tomcat5.5.x/debian/tomcat5.dirs
branches/tomcat5/tomcat5.5.x/debian/tomcat5.init
branches/tomcat5/tomcat5.5.x/debian/tomcat5.install
branches/tomcat5/tomcat5.5.x/debian/tomcat5.links
branches/tomcat5/tomcat5.5.x/debian/tomcat5.postinst
branches/tomcat5/tomcat5.5.x/debian/tomcat5.postrm
Modified:
branches/tomcat5/tomcat5.5.x/debian/README.Debian
branches/tomcat5/tomcat5.5.x/debian/changelog
branches/tomcat5/tomcat5.5.x/debian/control
branches/tomcat5/tomcat5.5.x/debian/rules
branches/tomcat5/tomcat5.5.x/debian/server.xml
branches/tomcat5/tomcat5.5.x/debian/watch
branches/tomcat5/tomcat5.5.x/debian/webapps/admin.xml
branches/tomcat5/tomcat5.5.x/debian/webapps/balancer.xml
branches/tomcat5/tomcat5.5.x/debian/webapps/host-manager.xml
branches/tomcat5/tomcat5.5.x/debian/webapps/manager.xml
branches/tomcat5/tomcat5.5.x/debian/webapps/tomcat-docs.xml
Log:
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
Modified: branches/tomcat5/tomcat5.5.x/debian/README.Debian
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/README.Debian 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/README.Debian 2006-06-23 15:38:46 UTC (rev 2213)
@@ -1,11 +1,12 @@
-Apache-Tomcat 5 for Debian
+Apache-Tomcat 5.5 for Debian
============================
-- The home directory (CATALINA_HOME) for Tomcat 5 (a.k.a. Catalina) is
- /usr/share/tomcat5, the base directory (CATALINA_BASE) is /var/lib/tomcat5
- but some files in there are just symlinks to the proper FHS directories.
+- 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 which contains templates
+ 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.
@@ -15,40 +16,40 @@
Catalina was compiled using MX4J so JMX is available for an embedded
servlet engine.
-- The main configuration file is /etc/tomcat5/server.xml.
+- 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 needs a full Java Development Kit (JDK), a Java Runtime
+- 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 also works with free
- runtimes like java-gcj-compat-dev or kaffe.
+ file from SUN or Blackdown into a deb package. Tomcat5.5 also works
+ with free runtimes like java-gcj-compat-dev or kaffe.
- You can install our own web applications as .war files or in extracted form
- into a subdirectory of /var/lib/tomcat5/webapps. The name of the WAR file
+ into a subdirectory of /var/lib/tomcat5.5/webapps. The name of the WAR file
or subdirectory is the servlet context for this webapp.
- 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-webapps package.
+ examples. This requires installation of the tomcat5.5-webapps package.
- 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.
- Tomcat is started using a security manager, you can define the permissions
- for your servlets and JSPs in /etc/tomcat5/policy.d/*. All files in this
- directory are joined to /etc/tomcat5/catalina.policy at startup.
+ for your servlets and JSPs in /etc/tomcat5.5/policy.d/*. All files in this
+ directory are joined to /etc/tomcat5.5/catalina.policy at startup.
- If your webapp does not work with the tomcat5 Debian package but works fine
+ If your webapp does not work with the tomcat5.5 Debian package but works fine
with the binary distribution from Jakarta, try to disable the security
- manager in /etc/default/tomcat5 first. If this works, add the required
- permissions in a new file in /etc/tomcat5/policy.d/ restart and re-enable
+ manager in /etc/default/tomcat5.5 first. If this works, add the required
+ permissions in a new file in /etc/tomcat5.5/policy.d/ restart and re-enable
the security manager.
Disabling the security manager is not recommended on production systems
@@ -56,22 +57,22 @@
whole virtual machine that is running Tomcat.
- There is a webapp for basic web-based administration of Tomcat's webapps
- in the tomcat5-admin package. You need to add one of the users in
- /var/lib/tomcat5/conf/tomcat-users.xml to the manager role and probably
+ 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 user does not have
+ 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 -->
+ <!-- make symlinks work in Tomcat 5.5 -->
<Resources className="org.apache.naming.resources.FileDirContext"
allowLinking="true" />
- See /etc/tomcat5/server.xml for examples.
+ 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>.
@@ -82,4 +83,4 @@
- This package is heavily based on the great work of Stephan Gybas on
the tomcat4 package
- -- Arnaud Vandyck <avdyk at debian.org>, Thu Mar 24 11:03:25 2005
+ -- Arnaud Vandyck <avdyk at debian.org>, Fri, 23 Jun 2006 12:40:58 +0200
Modified: branches/tomcat5/tomcat5.5.x/debian/changelog
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/changelog 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/changelog 2006-06-23 15:38:46 UTC (rev 2213)
@@ -1,5 +1,13 @@
-tomcat5 (5.5.15-1) UNRELEASED; urgency=low
+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
Modified: branches/tomcat5/tomcat5.5.x/debian/control
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/control 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/control 2006-06-23 15:38:46 UTC (rev 2213)
@@ -1,22 +1,23 @@
-Source: tomcat5
+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>
-Build-Depends-Indep: cdbs (>= 0.4.8), debhelper (>= 4.2.30), kaffe, ant, libcommons-fileupload-java (>= 1.0-1), libcommons-launcher-java, libcommons-beanutils-java, libcommons-logging-java, libcommons-modeler-java (>= 1.1-1), libmx4j-java, libstruts1.2-java, libgnujaf-java, libgnumail-java, liblog4j1.2-java, libxerces2-java, libxalan2-java, junit, libcommons-el-java, libjessie-java, unzip, xsltproc
-Standards-Version: 3.6.2
+Build-Depends: cdbs (>= 0.4.8), debhelper (>= 4.2.30)
+Build-Depends-Indep: java-gcj-compat-dev, ant, libcommons-fileupload-java (>= 1.0-1), libcommons-launcher-java, libcommons-beanutils-java, libcommons-logging-java, libcommons-modeler-java (>= 1.1-1), libmx4j-java, libstruts1.2-java, libgnujaf-java, libgnumail-java, liblog4j1.2-java, libxerces2-java, libxalan2-java, junit, libcommons-el-java, libjessie-java, unzip, xsltproc
+Standards-Version: 3.7.2
-Package: tomcat5
+Package: tomcat5.5
Architecture: all
-Depends: kaffe (>= 2:1.1.6-3) | java-gcj-compat-dev (>= 1.0.30-5) | java2-runtime, libtomcat5-java (>= ${Source-Version}), adduser (>= 3.34), apache-utils (>= 1.3.33-1) | apache2-common
-Suggests: java-virtual-machine, libapache-mod-jk | libapache2-mod-jk, tomcat5-webapps, tomcat5-admin
+Depends: java-gcj-compat-dev (>= 1.0.30-5) | kaffe (>= 2:1.1.6-3) | java2-runtime, libtomcat5.5-java (>= ${Source-Version}), tomcat5.5-webapps (>= ${Source-Version}), tomcat5.5-admin (>= ${Source-Version}), adduser (>= 3.34), apache-utils (>= 1.3.33-1) | apache2-common
+Suggests: java-virtual-machine, libapache-mod-jk | libapache2-mod-jk
Description: Java Servlet 2.4 engine with JSP 2.0 support
Apache Tomcat 5 is the reference implementation for the Java Servlet 2.4
and JavaServer Pages (JSP) 2.0 specification from the Apache Jakarta project.
.
This package just contains the startup scripts for Tomcat 5. No documentation
or web applications (webapps) are included here, please install the
- tomcat5-webapps package if you want them.
+ tomcat5.5-webapps package if you want them.
.
For more information about Tomcat please take a look at the Tomcat
home page at http://tomcat.apache.org/index.html.
@@ -24,24 +25,24 @@
The official Servlet 2.4 and JSP 2.0 specifications can be found at
http://java.sun.com/products/servlet/ and http://java.sun.com/products/jsp/
-Package: libtomcat5-java
+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
+Suggests: tomcat5.5
Description: Java Servlet engine -- core libraries
Apache Tomcat 5 is the reference implementation for the Java Servlet 2.4
and JavaServer Pages (JSP) 2.0 specification from the Apache Jakarta project.
.
This package contains the Tomcat core classes which can be used by other
Java applications to embed Tomcat. If you want to run Tomcat you need to
- install the tomcat5 package.
+ install the tomcat5.5 package.
.
For more information about Tomcat please take a look at the Tomcat
home page at http://tomcat.apache.org/index.html.
-Package: tomcat5-webapps
+Package: tomcat5.5-webapps
Architecture: all
-Depends: tomcat5 (>= ${Source-Version})
+Depends: tomcat5.5 (>= ${Source-Version})
Description: Java Servlet engine -- documentation and example web applications
Apache Tomcat 5 is the reference implementation for the Java Servlet 2.4
and JavaServer Pages (JSP) 2.0 specification from the Apache Jakarta project.
@@ -55,9 +56,9 @@
For more information about Tomcat please take a look at the Tomcat
home page at http://tomcat.apache.org/index.html.
-Package: tomcat5-admin
+Package: tomcat5.5-admin
Architecture: all
-Depends: tomcat5 (>= ${Source-Version}), libstruts1.2-java, libcommons-fileupload-java (>= 1.0-1), libcommons-beanutils-java
+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 5 is the reference implementation for the Java Servlet 2.4
and JavaServer Pages (JSP) 2.0 specification from the Apache Jakarta project.
Deleted: branches/tomcat5/tomcat5.5.x/debian/libtomcat5-java.install
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/libtomcat5-java.install 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/libtomcat5-java.install 2006-06-23 15:38:46 UTC (rev 2213)
@@ -1,13 +0,0 @@
-build/build/bin/bootstrap.jar /usr/share/tomcat5/bin/
-build/build/bin/tomcat-juli.jar /usr/share/tomcat5/bin/
-build/build/bin/*.xml /usr/share/tomcat5/bin/
-build/build/common/classes /usr/share/tomcat5/common/
-build/build/common/endorsed /usr/share/tomcat5/common/
-build/build/common/i18n/*.jar /usr/share/tomcat5/common/i18n/
-build/build/common/lib/jasper-*.jar /usr/share/tomcat5/common/lib/
-build/build/common/lib/naming-*.jar /usr/share/tomcat5/common/lib/
-build/build/server/classes /usr/share/tomcat5/server/
-build/build/server/lib/catalina*.jar /usr/share/tomcat5/server/lib/
-build/build/server/lib/servlets-*.jar /usr/share/tomcat5/server/lib/
-build/build/server/lib/servlets-*.renametojar /usr/share/tomcat5/server/lib/
-build/build/server/lib/tomcat-*.jar /usr/share/tomcat5/server/lib/
Deleted: branches/tomcat5/tomcat5.5.x/debian/libtomcat5-java.links
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/libtomcat5-java.links 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/libtomcat5-java.links 2006-06-23 15:38:46 UTC (rev 2213)
@@ -1,15 +0,0 @@
-/usr/share/java/commons-logging-api.jar /usr/share/tomcat5/bin/commons-logging-api.jar
-
-/usr/share/java/commons-el.jar /usr/share/tomcat5/common/lib/commons-el.jar
-/usr/share/java/jsp-api.jar /usr/share/tomcat5/common/lib/jsp-api.jar
-/usr/share/java/servlet-api.jar /usr/share/tomcat5/common/lib/servlet-api.jar
-/usr/share/java/ecj.jar /usr/share/tomcat5/common/lib/jasper-compiler-jdt.jar
-/usr/share/java/commons-pool.jar /usr/share/tomcat5/common/lib/commons-pool.jar
-/usr/share/java/commons-collections3.jar /usr/share/tomcat5/common/lib/commons-collections3.jar
-/usr/share/java/commons-dbcp.jar /usr/share/tomcat5/common/lib/commons-dbcp.jar
-
-/usr/share/java/commons-modeler.jar /usr/share/tomcat5/server/lib/commons-modeler.jar
-
-/usr/share/tomcat5/server/lib/catalina-ant.jar /usr/share/ant/lib/catalina5-ant.jar
-/usr/share/tomcat5/server/lib/catalina-ant-jmx.jar /usr/share/ant/lib/catalina5-ant-jmx.jar
-/usr/share/tomcat5/server/lib/tomcat-jkstatus-ant.jar /usr/share/ant/lib/tomcat5-jkstatus-ant.jar
Copied: branches/tomcat5/tomcat5.5.x/debian/libtomcat5.5-java.install (from rev 2212, branches/tomcat5/tomcat5.5.x/debian/libtomcat5-java.install)
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/libtomcat5-java.install 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/libtomcat5.5-java.install 2006-06-23 15:38:46 UTC (rev 2213)
@@ -0,0 +1,13 @@
+build/build/bin/bootstrap.jar /usr/share/tomcat5.5/bin/
+build/build/bin/tomcat-juli.jar /usr/share/tomcat5.5/bin/
+build/build/bin/*.xml /usr/share/tomcat5.5/bin/
+build/build/common/classes /usr/share/tomcat5.5/common/
+build/build/common/endorsed /usr/share/tomcat5.5/common/
+build/build/common/i18n/*.jar /usr/share/tomcat5.5/common/i18n/
+build/build/common/lib/jasper-*.jar /usr/share/tomcat5.5/common/lib/
+build/build/common/lib/naming-*.jar /usr/share/tomcat5.5/common/lib/
+build/build/server/classes /usr/share/tomcat5.5/server/
+build/build/server/lib/catalina*.jar /usr/share/tomcat5.5/server/lib/
+build/build/server/lib/servlets-*.jar /usr/share/tomcat5.5/server/lib/
+build/build/server/lib/servlets-*.renametojar /usr/share/tomcat5.5/server/lib/
+build/build/server/lib/tomcat-*.jar /usr/share/tomcat5.5/server/lib/
Copied: branches/tomcat5/tomcat5.5.x/debian/libtomcat5.5-java.links (from rev 2212, branches/tomcat5/tomcat5.5.x/debian/libtomcat5-java.links)
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/libtomcat5-java.links 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/libtomcat5.5-java.links 2006-06-23 15:38:46 UTC (rev 2213)
@@ -0,0 +1,15 @@
+/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
Modified: branches/tomcat5/tomcat5.5.x/debian/rules
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/rules 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/rules 2006-06-23 15:38:46 UTC (rev 2213)
@@ -1,5 +1,5 @@
#!/usr/bin/make -f
-# debian/rules file for tomcat5 (uses cdbs)
+# debian/rules file for tomcat5.5 (uses cdbs)
UPSTREAM_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' | cut -f1 -d-)
TOMCAT_SRCDIR := build
@@ -12,7 +12,7 @@
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/ant.mk
-JAVA_HOME := /usr/lib/kaffe
+JAVA_HOME := /usr/lib/jvm/java-gcj
ANT_HOME := /usr/share/ant
DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar
@@ -20,9 +20,9 @@
DEB_ANT_BUILD_TARGET := build
DEB_ANT_CLEAN_TARGET := xxx
-# Examples and documentation for the tomcat5 package
-DEB_INSTALL_DOCS_tomcat5 := $(DEB_SRCDIR)/$(TOMCAT_SRCDIR)/RUNNING.txt
-DEB_INSTALL_EXAMPLES_tomcat5 := $(DEB_SRCDIR)/$(TOMCAT_SRCDIR)/build/conf/server.xml \
+# Examples and documentation for the tomcat5.5 package
+DEB_INSTALL_DOCS_tomcat5.5 := $(DEB_SRCDIR)/$(TOMCAT_SRCDIR)/RUNNING.txt
+DEB_INSTALL_EXAMPLES_tomcat5.5 := $(DEB_SRCDIR)/$(TOMCAT_SRCDIR)/build/conf/server.xml \
$(DEB_SRCDIR)/$(TOMCAT_SRCDIR)/build/conf/web.xml
@@ -36,7 +36,7 @@
-rm connectors/jk/jkstatus/dist/tomcat-jkstatus-ant.jar
-rm -f LICENSE
-install/tomcat5-webapps::
+install/tomcat5.5-webapps::
install -d $(TOMCAT_BUILD)/webapps/tomcat-docs/
cd $(CATALINA_SRCDIR)/webapps/docs && cp -R *.xml *.xsl appdev architecture config funcspecs ../../../$(TOMCAT_BUILD)/webapps/tomcat-docs/
cd $(TOMCAT_BUILD)/webapps/tomcat-docs && for i in `find . -maxdepth 2 -name '*.xml'`; do xsltproc tomcat-docs.xsl $$i > `dirname $$i`/`basename $$i .xml`.html; done
@@ -44,8 +44,8 @@
cd $(TOMCAT_BUILD)/webapps/tomcat-docs && rm -f tomcat-docs.xsl
cd $(CATALINA_SRCDIR)/webapps/docs && cp -R WEB-INF ../../../$(TOMCAT_BUILD)/webapps/tomcat-docs/
# copy the RELEASE_NOTES into the tomcat-docs webapp
- cp $(TOMCAT_SRCDIR)/RELEASE-NOTES $(TOMCAT_BUILD)/webapps/ROOT/RELEASE-NOTES.txt
-
+ cp $(TOMCAT_SRCDIR)/RELEASE-NOTES $(TOMCAT_BUILD)/webapps/ROOT/RELEASE-NOTES.txt
+
gunzip $(TOMCAT_BUILD)/webapps/jsp-examples/examples-jsp.war.gz
gunzip $(TOMCAT_BUILD)/webapps/servlets-examples/examples-servlet.war.gz
unzip $(TOMCAT_BUILD)/webapps/jsp-examples/examples-jsp.war -d $(TOMCAT_BUILD)/webapps/jsp-examples/
Modified: branches/tomcat5/tomcat5.5.x/debian/server.xml
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/server.xml 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/server.xml 2006-06-23 15:38:46 UTC (rev 2213)
@@ -1,5 +1,5 @@
-<!-- Server Configuration File for Tomcat 5 on Debian
- You can find a more complete example in /usr/share/doc/tomcat5/examples/
+<!-- 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
@@ -13,12 +13,14 @@
define subcomponents such as "Valves" or "Loggers" at this level.
-->
-<Server port="8005" shutdown="SHUTDOWN" debug="0">
+<Server port="8005" shutdown="SHUTDOWN">
- <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener"
- debug="0"/>
- <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener"
- debug="0"/>
+ <!-- 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>
@@ -30,18 +32,9 @@
UserDatabaseRealm to authenticate users -->
<Resource name="UserDatabase" auth="Container"
type="org.apache.catalina.UserDatabase"
- description="User database that can be updated and saved">
- </Resource>
- <ResourceParams name="UserDatabase">
- <parameter>
- <name>factory</name>
- <value>org.apache.catalina.users.MemoryUserDatabaseFactory</value>
- </parameter>
- <parameter>
- <name>pathname</name>
- <value>conf/tomcat-users.xml</value>
- </parameter>
- </ResourceParams>
+ description="User database that can be updated and saved"
+ factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+ pathname="conf/tomcat-users.xml" />
</GlobalNamingResources>
@@ -55,57 +48,337 @@
-->
<!-- Define the Tomcat Stand-Alone Service -->
- <Service name="Tomcat-Standalone">
+ <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 Coyote HTTP/1.1 Connector on port 8180 -->
- <Connector className="org.apache.coyote.tomcat5.CoyoteConnector"
- port="8180" minProcessors="5" maxProcessors="75"
- enableLookups="true" acceptCount="10" debug="0"
- connectionTimeout="20000" useURIValidationHack="false" />
+ <!-- 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 Coyote/JK2 AJP 1.3 Connector on port 8009 -->
- <Connector className="org.apache.coyote.tomcat5.CoyoteConnector"
- port="8009" minProcessors="5" maxProcessors="75"
- enableLookups="true" acceptCount="10" debug="0"
- connectionTimeout="20000" useURIValidationHack="false"
- protocolHandlerClassName="org.apache.jk.server.JkCoyoteHandler"/>
+ <!-- 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). -->
- <!-- Define the top level container in our container hierarchy
- The name must be Catalina for correct function of the admin webapp -->
- <Engine name="Catalina" defaultHost="localhost" debug="0">
+ <!-- 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">
- <!-- Global logger unless overridden at lower levels -->
- <Logger className="org.apache.catalina.logger.FileLogger"
- prefix="catalina_" suffix=".log" timestamp="true"/>
+ <!-- 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"
- debug="0" resourceName="UserDatabase"/>
+ resourceName="UserDatabase"/>
- <!-- Define the default virtual host -->
- <Host name="localhost" debug="0" appBase="webapps"
- unpackWARs="true" autoDeploy="true">
+ <!-- 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" />
+ -->
- <!-- Logger shared by all Contexts related to this virtual host. -->
- <Logger className="org.apache.catalina.logger.FileLogger"
- directory="logs" prefix="localhost_" suffix=".log"
- timestamp="true"/>
+ <!-- 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>
Deleted: branches/tomcat5/tomcat5.5.x/debian/tomcat5-admin.install
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/tomcat5-admin.install 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/tomcat5-admin.install 2006-06-23 15:38:46 UTC (rev 2213)
@@ -1,7 +0,0 @@
-debian/webapps/admin.xml /var/lib/tomcat5/conf/Catalina/localhost/
-debian/webapps/manager.xml /var/lib/tomcat5/conf/Catalina/localhost/
-debian/webapps/host-manager.xml /var/lib/tomcat5/conf/Catalina/localhost/
-debian/policy/10admin.policy /etc/tomcat5/policy.d/
-build/build/server/webapps/admin /usr/share/tomcat5/server/webapps/
-build/build/server/webapps/manager /usr/share/tomcat5/server/webapps/
-build/build/server/webapps/host-manager /usr/share/tomcat5/server/webapps/
Deleted: branches/tomcat5/tomcat5.5.x/debian/tomcat5-admin.links
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/tomcat5-admin.links 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/tomcat5-admin.links 2006-06-23 15:38:46 UTC (rev 2213)
@@ -1,6 +0,0 @@
-/usr/share/struts1.2/struts.jar /usr/share/tomcat5/server/webapps/admin/WEB-INF/lib/struts.jar
-/usr/share/java/commons-beanutils.jar /usr/share/tomcat5/server/webapps/admin/WEB-INF/lib/commons-beanutils.jar
-/usr/share/java/commons-digester.jar /usr/share/tomcat5/server/webapps/admin/WEB-INF/lib/commons-digester.jar
-/usr/share/java/commons-collections3.jar /usr/share/tomcat5/server/webapps/admin/WEB-INF/lib/commons-collections3.jar
-
-/usr/share/java/commons-fileupload.jar /usr/share/tomcat5/server/webapps/manager/WEB-INF/lib/commons-fileupload.jar
Deleted: branches/tomcat5/tomcat5.5.x/debian/tomcat5-admin.postinst
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/tomcat5-admin.postinst 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/tomcat5-admin.postinst 2006-06-23 15:38:46 UTC (rev 2213)
@@ -1,25 +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 ]; then
- # Only restart tomcat if it is already running
- if /etc/init.d/tomcat5 status >/dev/null; then
- /etc/init.d/tomcat5 force-reload
- fi
- fi
- fi
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "$0 called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
Deleted: branches/tomcat5/tomcat5.5.x/debian/tomcat5-admin.prerm
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/tomcat5-admin.prerm 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/tomcat5-admin.prerm 2006-06-23 15:38:46 UTC (rev 2213)
@@ -1,24 +0,0 @@
-#!/bin/sh -e
-
-#DEBHELPER#
-
-case "$1" in
- upgrade|failed-upgrade)
- # Nothing to do here
- ;;
-
- deconfigure|remove)
- # Remove the webapp if this is not an upgrade
- if [ -x /etc/init.d/tomcat5 ]; then
- # Only restart tomcat if it is already running
- if /etc/init.d/tomcat5 status >/dev/null; then
- /etc/init.d/tomcat5 force-reload || true
- fi
- fi
- ;;
-
- *)
- echo "$0 called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
Deleted: branches/tomcat5/tomcat5.5.x/debian/tomcat5-webapps.install
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/tomcat5-webapps.install 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/tomcat5-webapps.install 2006-06-23 15:38:46 UTC (rev 2213)
@@ -1,11 +0,0 @@
-build/build/webapps/balancer /var/lib/tomcat5/webapps/
-build/build/webapps/ROOT /var/lib/tomcat5/webapps/
-build/build/webapps/jsp-examples /var/lib/tomcat5/webapps/
-build/build/webapps/servlets-examples /var/lib/tomcat5/webapps/
-build/build/webapps/tomcat-docs /var/lib/tomcat5/webapps/
-build/build/webapps/webdav /var/lib/tomcat5/webapps/
-debian/webapps/balancer.xml /var/lib/tomcat5/conf/Catalina/localhost/
-debian/webapps/tomcat-docs.xml /var/lib/tomcat5/conf/Catalina/localhost/
-
-servletapi/jsr152/examples/WEB-INF/lib/jstl.jar /usr/share/tomcat5/server/webapps/jsp-examples/WEB-INF/lib
-servletapi/jsr152/examples/WEB-INF/lib/standard.jar /usr/share/tomcat5/server/webapps/jsp-examples/WEB-INF/lib
Deleted: branches/tomcat5/tomcat5.5.x/debian/tomcat5-webapps.links
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/tomcat5-webapps.links 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/tomcat5-webapps.links 2006-06-23 15:38:46 UTC (rev 2213)
@@ -1,2 +0,0 @@
-/usr/share/doc/libservlet2.4-java/api-servlet /var/lib/tomcat5/webapps/tomcat-docs/servletapi
-/usr/share/doc/libservlet2.4-java/api-jsp /var/lib/tomcat5/webapps/tomcat-docs/jspapi
Deleted: branches/tomcat5/tomcat5.5.x/debian/tomcat5-webapps.postinst
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/tomcat5-webapps.postinst 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/tomcat5-webapps.postinst 2006-06-23 15:38:46 UTC (rev 2213)
@@ -1,25 +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 ]; then
- # Only restart tomcat if it is already running
- if /etc/init.d/tomcat5 status >/dev/null; then
- /etc/init.d/tomcat5 force-reload
- fi
- fi
- fi
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "$0 called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
Deleted: branches/tomcat5/tomcat5.5.x/debian/tomcat5-webapps.prerm
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/tomcat5-webapps.prerm 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/tomcat5-webapps.prerm 2006-06-23 15:38:46 UTC (rev 2213)
@@ -1,24 +0,0 @@
-#!/bin/sh -e
-
-#DEBHELPER#
-
-case "$1" in
- upgrade|failed-upgrade)
- # Nothing to do here
- ;;
-
- deconfigure|remove)
- # Remove the webapp if this is not an upgrade
- if [ -x /etc/init.d/tomcat5 ]; then
- # Only restart tomcat if it is already running
- if /etc/init.d/tomcat5 status >/dev/null; then
- /etc/init.d/tomcat5 force-reload || true
- fi
- fi
- ;;
-
- *)
- echo "$0 called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
Copied: branches/tomcat5/tomcat5.5.x/debian/tomcat5.5-admin.install (from rev 2212, branches/tomcat5/tomcat5.5.x/debian/tomcat5-admin.install)
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/tomcat5-admin.install 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/tomcat5.5-admin.install 2006-06-23 15:38:46 UTC (rev 2213)
@@ -0,0 +1,7 @@
+debian/webapps/admin.xml /var/lib/tomcat5.5/conf/Catalina/localhost/
+debian/webapps/manager.xml /var/lib/tomcat5.5/conf/Catalina/localhost/
+debian/webapps/host-manager.xml /var/lib/tomcat5.5/conf/Catalina/localhost/
+debian/policy/10admin.policy /etc/tomcat5.5/policy.d/
+build/build/server/webapps/admin /usr/share/tomcat5.5/server/webapps/
+build/build/server/webapps/manager /usr/share/tomcat5.5/server/webapps/
+build/build/server/webapps/host-manager /usr/share/tomcat5.5/server/webapps/
Copied: branches/tomcat5/tomcat5.5.x/debian/tomcat5.5-admin.links (from rev 2212, branches/tomcat5/tomcat5.5.x/debian/tomcat5-admin.links)
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/tomcat5-admin.links 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/tomcat5.5-admin.links 2006-06-23 15:38:46 UTC (rev 2213)
@@ -0,0 +1,6 @@
+/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
Copied: branches/tomcat5/tomcat5.5.x/debian/tomcat5.5-admin.postinst (from rev 2212, branches/tomcat5/tomcat5.5.x/debian/tomcat5-admin.postinst)
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/tomcat5-admin.postinst 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/tomcat5.5-admin.postinst 2006-06-23 15:38:46 UTC (rev 2213)
@@ -0,0 +1,25 @@
+#!/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 /etc/init.d/tomcat5.5 status >/dev/null; then
+ /etc/init.d/tomcat5.5 force-reload
+ fi
+ fi
+ fi
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+
+ *)
+ echo "$0 called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
Copied: branches/tomcat5/tomcat5.5.x/debian/tomcat5.5-admin.prerm (from rev 2212, branches/tomcat5/tomcat5.5.x/debian/tomcat5-admin.prerm)
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/tomcat5-admin.prerm 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/tomcat5.5-admin.prerm 2006-06-23 15:38:46 UTC (rev 2213)
@@ -0,0 +1,24 @@
+#!/bin/sh -e
+
+#DEBHELPER#
+
+case "$1" in
+ upgrade|failed-upgrade)
+ # Nothing to do here
+ ;;
+
+ deconfigure|remove)
+ # Remove the webapp if this is not an upgrade
+ if [ -x /etc/init.d/tomcat5.5 ]; then
+ # Only restart tomcat if it is already running
+ if /etc/init.d/tomcat5.5 status >/dev/null; then
+ /etc/init.d/tomcat5.5 force-reload || true
+ fi
+ fi
+ ;;
+
+ *)
+ echo "$0 called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
Copied: branches/tomcat5/tomcat5.5.x/debian/tomcat5.5-webapps.install (from rev 2212, branches/tomcat5/tomcat5.5.x/debian/tomcat5-webapps.install)
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/tomcat5-webapps.install 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/tomcat5.5-webapps.install 2006-06-23 15:38:46 UTC (rev 2213)
@@ -0,0 +1,11 @@
+build/build/webapps/balancer /var/lib/tomcat5.5/webapps/
+build/build/webapps/ROOT /var/lib/tomcat5.5/webapps/
+build/build/webapps/jsp-examples /var/lib/tomcat5.5/webapps/
+build/build/webapps/servlets-examples /var/lib/tomcat5.5/webapps/
+build/build/webapps/tomcat-docs /var/lib/tomcat5.5/webapps/
+build/build/webapps/webdav /var/lib/tomcat5.5/webapps/
+debian/webapps/balancer.xml /var/lib/tomcat5.5/conf/Catalina/localhost/
+debian/webapps/tomcat-docs.xml /var/lib/tomcat5.5/conf/Catalina/localhost/
+
+servletapi/jsr152/examples/WEB-INF/lib/jstl.jar /usr/share/tomcat5.5/server/webapps/jsp-examples/WEB-INF/lib
+servletapi/jsr152/examples/WEB-INF/lib/standard.jar /usr/share/tomcat5.5/server/webapps/jsp-examples/WEB-INF/lib
Copied: branches/tomcat5/tomcat5.5.x/debian/tomcat5.5-webapps.links (from rev 2212, branches/tomcat5/tomcat5.5.x/debian/tomcat5-webapps.links)
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/tomcat5-webapps.links 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/tomcat5.5-webapps.links 2006-06-23 15:38:46 UTC (rev 2213)
@@ -0,0 +1,2 @@
+/usr/share/doc/libservlet2.4-java/api-servlet /var/lib/tomcat5.5/webapps/tomcat-docs/servletapi
+/usr/share/doc/libservlet2.4-java/api-jsp /var/lib/tomcat5.5/webapps/tomcat-docs/jspapi
Copied: branches/tomcat5/tomcat5.5.x/debian/tomcat5.5-webapps.postinst (from rev 2212, branches/tomcat5/tomcat5.5.x/debian/tomcat5-webapps.postinst)
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/tomcat5-webapps.postinst 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/tomcat5.5-webapps.postinst 2006-06-23 15:38:46 UTC (rev 2213)
@@ -0,0 +1,25 @@
+#!/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 /etc/init.d/tomcat5.5 status >/dev/null; then
+ /etc/init.d/tomcat5.5 force-reload
+ fi
+ fi
+ fi
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+
+ *)
+ echo "$0 called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
Copied: branches/tomcat5/tomcat5.5.x/debian/tomcat5.5-webapps.prerm (from rev 2212, branches/tomcat5/tomcat5.5.x/debian/tomcat5-webapps.prerm)
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/tomcat5-webapps.prerm 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/tomcat5.5-webapps.prerm 2006-06-23 15:38:46 UTC (rev 2213)
@@ -0,0 +1,24 @@
+#!/bin/sh -e
+
+#DEBHELPER#
+
+case "$1" in
+ upgrade|failed-upgrade)
+ # Nothing to do here
+ ;;
+
+ deconfigure|remove)
+ # Remove the webapp if this is not an upgrade
+ if [ -x /etc/init.d/tomcat5.5 ]; then
+ # Only restart tomcat if it is already running
+ if /etc/init.d/tomcat5.5 status >/dev/null; then
+ /etc/init.d/tomcat5.5 force-reload || true
+ fi
+ fi
+ ;;
+
+ *)
+ echo "$0 called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
Copied: branches/tomcat5/tomcat5.5.x/debian/tomcat5.5.cron.daily (from rev 2212, branches/tomcat5/tomcat5.5.x/debian/tomcat5.cron.daily)
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/tomcat5.cron.daily 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/tomcat5.5.cron.daily 2006-06-23 15:38:46 UTC (rev 2213)
@@ -0,0 +1,20 @@
+#!/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
+
+find /var/log/tomcat5.5/ -name \*.log -mtime +$LOGFILE_DAYS -print0 \
+ | xargs --no-run-if-empty -0 rm
+
Copied: branches/tomcat5/tomcat5.5.x/debian/tomcat5.5.default (from rev 2212, branches/tomcat5/tomcat5.5.x/debian/tomcat5.default)
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/tomcat5.default 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/tomcat5.5.default 2006-06-23 15:38:46 UTC (rev 2213)
@@ -0,0 +1,33 @@
+# Run Tomcat 5 as this user ID (default: tomcat5.5). Set this to an empty string
+# to prevent Tomcat from starting.
+#TOMCAT5_USER=tomcat5.5
+
+# 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 j2sdk1.4, j2sdk1.4 Debian packages created by java-package and the
+# free runtimes kaffe and java-gcj-compat-dev are tried.
+#JAVA_HOME=/usr/lib/j2sdk1.4-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
+#CATALINA_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)
+#TOMCAT5_SECURITY=yes
+
+# Timeout in seconds for the shutdown procedure (default: 30). The Java
+# processes will be killed if tomcat5.5 has not stopped until then.
+#TOMCAT5_SHUTDOWN=30
+
+# Number of days to keep old log files in /var/log/tomcat5.5 (default: 14)
+#LOGFILE_DAYS=30
Copied: branches/tomcat5/tomcat5.5.x/debian/tomcat5.5.dirs (from rev 2212, branches/tomcat5/tomcat5.5.x/debian/tomcat5.dirs)
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/tomcat5.dirs 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/tomcat5.5.dirs 2006-06-23 15:38:46 UTC (rev 2213)
@@ -0,0 +1,10 @@
+etc/default
+etc/tomcat5.5/policy.d
+usr/share/tomcat5.5/bin
+var/cache/tomcat5.5/
+var/lib/tomcat5.5/conf/Catalina/localhost
+var/lib/tomcat5.5/shared/classes
+var/lib/tomcat5.5/shared/lib
+var/lib/tomcat5.5/temp
+var/lib/tomcat5.5/webapps/ROOT/WEB-INF
+var/log/tomcat5.5
Copied: branches/tomcat5/tomcat5.5.x/debian/tomcat5.5.init (from rev 2212, branches/tomcat5/tomcat5.5.x/debian/tomcat5.init)
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/tomcat5.init 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/tomcat5.5.init 2006-06-23 15:38:46 UTC (rev 2213)
@@ -0,0 +1,216 @@
+#! /bin/sh -e
+#
+# /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>.
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+NAME=tomcat5.5
+DESC="Tomcat 5 servlet engine"
+CATALINA_HOME=/usr/share/$NAME
+DAEMON=$CATALINA_HOME/bin/catalina.sh
+DEFAULT=/etc/default/$NAME
+
+# The following variables can be overwritten in $DEFAULT
+
+# Run Tomcat 5 as this user ID
+TOMCAT5_USER=tomcat5
+
+# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not
+# defined in $DEFAULT)
+JDK_DIRS="/usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-blackdown /usr/lib/j2se/1.4 /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
+
+if [ `id -u` -ne 0 ]; then
+ echo "Not starting/stopping $DESC, you are not root."
+ exit 4
+fi
+
+if [ -z "$TOMCAT5_USER" ]; then
+ echo "Not starting/stopping $DESC as configured (TOMCAT5_USER is"
+ echo "empty in $DEFAULT)."
+ exit 0
+fi
+
+# 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 CATALINA_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 "$CATALINA_OPTS" ]; then
+ CATALINA_OPTS="-Djava.awt.headless=true -Xmx128M"
+fi
+
+# Set the JSP compiler if set in the tomcat5.5.default file
+if [ -n "$JSP_COMPILER" ]; then
+ CATALINA_OPTS="$CATALINA_OPTS -Dbuild.compiler=$JSP_COMPILER"
+fi
+
+# Define other required variables
+CATALINA_PID="$CATALINA_BASE/temp/$NAME.pid"
+STARTUP_OPTS=""
+if [ "$TOMCAT5_SECURITY" = "yes" ]; then
+ STARTUP_OPTS="-security"
+fi
+
+# 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 CATALINA_HOME CATALINA_BASE CATALINA_OPTS CATALINA_PID JSSE_HOME
+
+case "$1" in
+ start)
+ if [ -z "$JAVA_HOME" ]; then
+ echo "Could not start $DESC because no Java Development Kit"
+ echo "(JDK) was found. Please download and install JDK 1.3 or higher and set"
+ echo "JAVA_HOME in $DEFAULT to the JDK's installation directory."
+ exit 0
+ fi
+
+ if [ ! -d "$CATALINA_BASE/conf" ]; then
+ echo "Not starting Tomcat 5: Invalid CATALINA_BASE specified in $DEFAULT"
+ exit 1
+ fi
+
+ echo -n "Starting $DESC using Java from $JAVA_HOME: "
+
+ 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/* \
+ "$CATALINA_BASE/logs/catalina.out"
+ mkfifo -m700 "$CATALINA_BASE/logs/catalina.out"
+ 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
+
+ # Look for rotatelogs/rotatelogs2
+ if [ -x /usr/sbin/rotatelogs ]; then
+ ROTATELOGS=/usr/sbin/rotatelogs
+ else
+ ROTATELOGS=/usr/sbin/rotatelogs2
+ fi
+
+ # -p preserves the environment (for $JAVA_HOME etc.)
+ # -s is required because tomcat5.5's login shell is /bin/false
+ su -p -s /bin/sh $TOMCAT5_USER \
+ -c "$ROTATELOGS \"$CATALINA_BASE/logs/catalina_%F.log\" 86400" \
+ < "$CATALINA_BASE/logs/catalina.out" &
+ su -p -s /bin/sh $TOMCAT5_USER \
+ -c "\"$DAEMON\" start $STARTUP_OPTS" \
+ >> "$CATALINA_BASE/logs/catalina.out" 2>&1
+ echo "$NAME."
+ else
+ echo "(already running)."
+ fi
+ ;;
+ stop)
+ echo -n "Stopping $DESC: "
+ if start-stop-daemon --test --start --pidfile "$CATALINA_PID" \
+ --user "$TOMCAT5_USER" --startas "$JAVA_HOME/bin/java" \
+ >/dev/null; then
+ echo "(not running)."
+ else
+ su -p -s /bin/sh $TOMCAT5_USER -c "\"$DAEMON\" stop" \
+ >/dev/null 2>&1 || true
+ # Fallback to kill the JVM process in case stopping didn't work
+ sleep 1
+ while ! start-stop-daemon --test --start \
+ --pidfile "$CATALINA_PID" --user "$TOMCAT5_USER" \
+ --startas "$JAVA_HOME/bin/java" >/dev/null; do
+ sleep 1
+ echo -n "."
+ TOMCAT5_SHUTDOWN=`expr $TOMCAT5_SHUTDOWN - 1` || true
+ if [ $TOMCAT5_SHUTDOWN -le 0 ]; then
+ echo -n " (killing) "
+ start-stop-daemon --stop --signal 9 --oknodo \
+ --quiet --pidfile "$CATALINA_PID" \
+ --user "$TOMCAT5_USER"
+ fi
+ done
+ rm -f "$CATALINA_PID" "$CATALINA_BASE/logs/catalina.out"
+ echo "$NAME."
+ fi
+ ;;
+ 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
+ echo "$DESC is not running, but pid file exists."
+ exit 1
+ else
+ echo "$DESC is not running."
+ exit 3
+ fi
+ else
+ echo -n "$DESC is running with Java pid "
+ cat "$CATALINA_PID"
+ exit 0
+ fi
+ ;;
+ reload)
+ echo "Reload is not implemented!" >&2
+ exit 3
+ ;;
+ restart|force-reload)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ *)
+ echo "Usage: /etc/init.d/tomcat5.5 {start|stop|restart|force-reload|status}" >&2
+ exit 2
+ ;;
+esac
+
+exit 0
Copied: branches/tomcat5/tomcat5.5.x/debian/tomcat5.5.install (from rev 2212, branches/tomcat5/tomcat5.5.x/debian/tomcat5.install)
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/tomcat5.install 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/tomcat5.5.install 2006-06-23 15:38:46 UTC (rev 2213)
@@ -0,0 +1,7 @@
+build/build/bin/*.sh /usr/share/tomcat5.5/bin/
+build/build/conf/tomcat-users.xml /usr/share/tomcat5.5/.debian/
+build/build/webapps/ROOT/WEB-INF/web.xml /usr/share/tomcat5.5/.debian/
+build/build/conf/web.xml /etc/tomcat5.5/
+debian/policy/0*.policy /etc/tomcat5.5/policy.d/
+debian/policy/9*.policy /etc/tomcat5.5/policy.d/
+debian/server.xml /etc/tomcat5.5/
Copied: branches/tomcat5/tomcat5.5.x/debian/tomcat5.5.links (from rev 2212, branches/tomcat5/tomcat5.5.x/debian/tomcat5.links)
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/tomcat5.links 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/tomcat5.5.links 2006-06-23 15:38:46 UTC (rev 2213)
@@ -0,0 +1,11 @@
+/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/webapps /usr/share/tomcat5.5/webapps
+/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
Copied: branches/tomcat5/tomcat5.5.x/debian/tomcat5.5.postinst (from rev 2212, branches/tomcat5/tomcat5.5.x/debian/tomcat5.postinst)
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/tomcat5.postinst 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/tomcat5.5.postinst 2006-06-23 15:38:46 UTC (rev 2213)
@@ -0,0 +1,48 @@
+#!/bin/sh -e
+
+case "$1" in
+ configure)
+ if ! id tomcat5 > /dev/null 2>&1 ; then
+ adduser --system --home /usr/share/tomcat5.5 --no-create-home \
+ --ingroup nogroup --disabled-password --shell /bin/false \
+ tomcat5
+ fi
+ chown tomcat5:adm /var/log/tomcat5.5 /var/cache/tomcat5.5 \
+ /var/lib/tomcat5.5/conf
+ chmod 750 /var/log/tomcat5.5 /var/lib/tomcat5.5/conf
+ chmod 700 /var/cache/tomcat5.5
+ if [ ! -f /var/lib/tomcat5.5/webapps/ROOT/WEB-INF/web.xml ]; then
+ echo "Installing /var/lib/tomcat5.5/webapps/ROOT/WEB-INF/web.xml."
+ install -o root -g root -m 644 \
+ /usr/share/tomcat5.5/.debian/web.xml \
+ /var/lib/tomcat5.5/webapps/ROOT/WEB-INF/
+ fi
+ if [ ! -f /var/lib/tomcat5.5/conf/tomcat-users.xml ]; then
+ echo "Installing /var/lib/tomcat5.5/conf/tomcat-users.xml."
+ install -o tomcat5 -g adm -m 600 \
+ /usr/share/tomcat5.5/.debian/tomcat-users.xml \
+ /var/lib/tomcat5.5/conf/
+ fi
+# this file is no more present
+# if [ ! -f /var/lib/tomcat5.5/conf/jk2.properties ]; then
+# echo "Installing /var/lib/tomcat5.5/conf/jk2.properties"
+# install -o tomcat5 -g nogroup -m 644 \
+# /usr/share/tomcat5.5/.debian/jk2.properties \
+# /var/lib/tomcat5.5/conf/
+# fi
+ if [ -f /etc/tomcat5.5/tomcat-users.xml ]; then
+ mv /etc/tomcat5.5/tomcat-users.xml \
+ /etc/tomcat5.5/tomcat-users.xml.dpkg-old || true
+ fi
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+
+ *)
+ echo "$0 called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
Copied: branches/tomcat5/tomcat5.5.x/debian/tomcat5.5.postrm (from rev 2212, branches/tomcat5/tomcat5.5.x/debian/tomcat5.postrm)
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/tomcat5.postrm 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/tomcat5.5.postrm 2006-06-23 15:38:46 UTC (rev 2213)
@@ -0,0 +1,30 @@
+#!/bin/sh -e
+
+#DEBHELPER#
+
+# Remove cached files and auto-generated catalina.policy
+rm -rf /var/cache/tomcat5.5/* /var/lib/tomcat5.5/conf/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 tomcat5.5 || true
+ rm -rf /var/log/tomcat5.5 /var/cache/tomcat5.5 /var/lib/tomcat5.5/conf
+ rm -f /var/lib/tomcat5.5/webapps/ROOT/WEB-INF/web.xml
+ rmdir --ignore-fail-on-non-empty \
+ /var/lib/tomcat5.5/webapps/ROOT/WEB-INF \
+ /var/lib/tomcat5.5/webapps/ROOT /var/lib/tomcat5.5/webapps \
+ /var/lib/tomcat5.5 2>/dev/null || true
+ rmdir --ignore-fail-on-non-empty /etc/tomcat5.5/policy.d /etc/tomcat5.5
+ ;;
+
+ 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: branches/tomcat5/tomcat5.5.x/debian/tomcat5.cron.daily
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/tomcat5.cron.daily 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/tomcat5.cron.daily 2006-06-23 15:38:46 UTC (rev 2213)
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-NAME=tomcat5
-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
-
-find /var/log/tomcat5/ -name \*.log -mtime +$LOGFILE_DAYS -print0 \
- | xargs --no-run-if-empty -0 rm
-
Deleted: branches/tomcat5/tomcat5.5.x/debian/tomcat5.default
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/tomcat5.default 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/tomcat5.default 2006-06-23 15:38:46 UTC (rev 2213)
@@ -1,33 +0,0 @@
-# Run Tomcat 5 as this user ID (default: tomcat5). Set this to an empty string
-# to prevent Tomcat from starting.
-#TOMCAT5_USER=tomcat5
-
-# 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 j2sdk1.4, j2sdk1.4 Debian packages created by java-package and the
-# free runtimes kaffe and java-gcj-compat-dev are tried.
-#JAVA_HOME=/usr/lib/j2sdk1.4-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
-#CATALINA_BASE=/var/lib/tomcat5
-
-# Arguments to pass to the Java virtual machine (JVM)
-# "-Djava.awt.headless=true -Xmx128M" is automatically set if CATALINA_OPTS
-# is left empty here
-#CATALINA_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)
-#TOMCAT5_SECURITY=yes
-
-# Timeout in seconds for the shutdown procedure (default: 30). The Java
-# processes will be killed if tomcat5 has not stopped until then.
-#TOMCAT5_SHUTDOWN=30
-
-# Number of days to keep old log files in /var/log/tomcat5 (default: 14)
-#LOGFILE_DAYS=30
Deleted: branches/tomcat5/tomcat5.5.x/debian/tomcat5.dirs
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/tomcat5.dirs 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/tomcat5.dirs 2006-06-23 15:38:46 UTC (rev 2213)
@@ -1,10 +0,0 @@
-etc/default
-etc/tomcat5/policy.d
-usr/share/tomcat5/bin
-var/cache/tomcat5/
-var/lib/tomcat5/conf/Catalina/localhost
-var/lib/tomcat5/shared/classes
-var/lib/tomcat5/shared/lib
-var/lib/tomcat5/temp
-var/lib/tomcat5/webapps/ROOT/WEB-INF
-var/log/tomcat5
Deleted: branches/tomcat5/tomcat5.5.x/debian/tomcat5.init
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/tomcat5.init 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/tomcat5.init 2006-06-23 15:38:46 UTC (rev 2213)
@@ -1,216 +0,0 @@
-#! /bin/sh -e
-#
-# /etc/init.d/tomcat5 -- 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>.
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-NAME=tomcat5
-DESC="Tomcat 5 servlet engine"
-CATALINA_HOME=/usr/share/$NAME
-DAEMON=$CATALINA_HOME/bin/catalina.sh
-DEFAULT=/etc/default/$NAME
-
-# The following variables can be overwritten in $DEFAULT
-
-# Run Tomcat 5 as this user ID
-TOMCAT5_USER=tomcat5
-
-# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not
-# defined in $DEFAULT)
-JDK_DIRS="/usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-blackdown /usr/lib/j2se/1.4 /usr/lib/j2sdk1.5-sun /usr/lib/jvm/java-gcj /usr/lib/kaffe"
-
-# Directory for per-instance configuration files and webapps
-CATALINA_BASE=/var/lib/tomcat5
-
-# 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
-
-if [ `id -u` -ne 0 ]; then
- echo "Not starting/stopping $DESC, you are not root."
- exit 4
-fi
-
-if [ -z "$TOMCAT5_USER" ]; then
- echo "Not starting/stopping $DESC as configured (TOMCAT5_USER is"
- echo "empty in $DEFAULT)."
- exit 0
-fi
-
-# 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 CATALINA_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 "$CATALINA_OPTS" ]; then
- CATALINA_OPTS="-Djava.awt.headless=true -Xmx128M"
-fi
-
-# Set the JSP compiler if set in the tomcat5.default file
-if [ -n "$JSP_COMPILER" ]; then
- CATALINA_OPTS="$CATALINA_OPTS -Dbuild.compiler=$JSP_COMPILER"
-fi
-
-# Define other required variables
-CATALINA_PID="$CATALINA_BASE/temp/$NAME.pid"
-STARTUP_OPTS=""
-if [ "$TOMCAT5_SECURITY" = "yes" ]; then
- STARTUP_OPTS="-security"
-fi
-
-# 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 CATALINA_HOME CATALINA_BASE CATALINA_OPTS CATALINA_PID JSSE_HOME
-
-case "$1" in
- start)
- if [ -z "$JAVA_HOME" ]; then
- echo "Could not start $DESC because no Java Development Kit"
- echo "(JDK) was found. Please download and install JDK 1.3 or higher and set"
- echo "JAVA_HOME in $DEFAULT to the JDK's installation directory."
- exit 0
- fi
-
- if [ ! -d "$CATALINA_BASE/conf" ]; then
- echo "Not starting Tomcat 5: Invalid CATALINA_BASE specified in $DEFAULT"
- exit 1
- fi
-
- echo -n "Starting $DESC using Java from $JAVA_HOME: "
-
- 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/policy.d/ instead" \
- >> "$CATALINA_BASE/conf/catalina.policy"
- echo "" >> "$CATALINA_BASE/conf/catalina.policy"
- cat /etc/tomcat5/policy.d/*.policy \
- >> "$CATALINA_BASE/conf/catalina.policy"
-
- # Clean up and set permissions on required files
- rm -rf "$CATALINA_BASE"/temp/* \
- "$CATALINA_BASE/logs/catalina.out"
- mkfifo -m700 "$CATALINA_BASE/logs/catalina.out"
- 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
-
- # Look for rotatelogs/rotatelogs2
- if [ -x /usr/sbin/rotatelogs ]; then
- ROTATELOGS=/usr/sbin/rotatelogs
- else
- ROTATELOGS=/usr/sbin/rotatelogs2
- fi
-
- # -p preserves the environment (for $JAVA_HOME etc.)
- # -s is required because tomcat5's login shell is /bin/false
- su -p -s /bin/sh $TOMCAT5_USER \
- -c "$ROTATELOGS \"$CATALINA_BASE/logs/catalina_%F.log\" 86400" \
- < "$CATALINA_BASE/logs/catalina.out" &
- su -p -s /bin/sh $TOMCAT5_USER \
- -c "\"$DAEMON\" start $STARTUP_OPTS" \
- >> "$CATALINA_BASE/logs/catalina.out" 2>&1
- echo "$NAME."
- else
- echo "(already running)."
- fi
- ;;
- stop)
- echo -n "Stopping $DESC: "
- if start-stop-daemon --test --start --pidfile "$CATALINA_PID" \
- --user "$TOMCAT5_USER" --startas "$JAVA_HOME/bin/java" \
- >/dev/null; then
- echo "(not running)."
- else
- su -p -s /bin/sh $TOMCAT5_USER -c "\"$DAEMON\" stop" \
- >/dev/null 2>&1 || true
- # Fallback to kill the JVM process in case stopping didn't work
- sleep 1
- while ! start-stop-daemon --test --start \
- --pidfile "$CATALINA_PID" --user "$TOMCAT5_USER" \
- --startas "$JAVA_HOME/bin/java" >/dev/null; do
- sleep 1
- echo -n "."
- TOMCAT5_SHUTDOWN=`expr $TOMCAT5_SHUTDOWN - 1` || true
- if [ $TOMCAT5_SHUTDOWN -le 0 ]; then
- echo -n " (killing) "
- start-stop-daemon --stop --signal 9 --oknodo \
- --quiet --pidfile "$CATALINA_PID" \
- --user "$TOMCAT5_USER"
- fi
- done
- rm -f "$CATALINA_PID" "$CATALINA_BASE/logs/catalina.out"
- echo "$NAME."
- fi
- ;;
- 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
- echo "$DESC is not running, but pid file exists."
- exit 1
- else
- echo "$DESC is not running."
- exit 3
- fi
- else
- echo -n "$DESC is running with Java pid "
- cat "$CATALINA_PID"
- exit 0
- fi
- ;;
- reload)
- echo "Reload is not implemented!" >&2
- exit 3
- ;;
- restart|force-reload)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "Usage: /etc/init.d/tomcat5 {start|stop|restart|force-reload|status}" >&2
- exit 2
- ;;
-esac
-
-exit 0
Deleted: branches/tomcat5/tomcat5.5.x/debian/tomcat5.install
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/tomcat5.install 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/tomcat5.install 2006-06-23 15:38:46 UTC (rev 2213)
@@ -1,7 +0,0 @@
-build/build/bin/*.sh /usr/share/tomcat5/bin/
-build/build/conf/tomcat-users.xml /usr/share/tomcat5/.debian/
-build/build/webapps/ROOT/WEB-INF/web.xml /usr/share/tomcat5/.debian/
-build/build/conf/web.xml /etc/tomcat5/
-debian/policy/0*.policy /etc/tomcat5/policy.d/
-debian/policy/9*.policy /etc/tomcat5/policy.d/
-debian/server.xml /etc/tomcat5/
Deleted: branches/tomcat5/tomcat5.5.x/debian/tomcat5.links
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/tomcat5.links 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/tomcat5.links 2006-06-23 15:38:46 UTC (rev 2213)
@@ -1,11 +0,0 @@
-/var/lib/tomcat5/conf /usr/share/tomcat5/conf
-/usr/share/doc/tomcat5 /usr/share/tomcat5/doc
-/var/lib/tomcat5/logs /usr/share/tomcat5/logs
-/var/lib/tomcat5/webapps /usr/share/tomcat5/webapps
-/var/lib/tomcat5/work /usr/share/tomcat5/work
-/var/lib/tomcat5/shared /usr/share/tomcat5/shared
-/var/lib/tomcat5/temp /usr/share/tomcat5/temp
-/var/log/tomcat5 /var/lib/tomcat5/logs
-/etc/tomcat5/server.xml /var/lib/tomcat5/conf/server.xml
-/etc/tomcat5/web.xml /var/lib/tomcat5/conf/web.xml
-/var/cache/tomcat5 /var/lib/tomcat5/work
Deleted: branches/tomcat5/tomcat5.5.x/debian/tomcat5.postinst
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/tomcat5.postinst 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/tomcat5.postinst 2006-06-23 15:38:46 UTC (rev 2213)
@@ -1,47 +0,0 @@
-#!/bin/sh -e
-
-case "$1" in
- configure)
- if ! id tomcat5 > /dev/null 2>&1 ; then
- adduser --system --home /usr/share/tomcat5 --no-create-home \
- --ingroup nogroup --disabled-password --shell /bin/false \
- tomcat5
- fi
- chown tomcat5:adm /var/log/tomcat5 /var/cache/tomcat5 \
- /var/lib/tomcat5/conf
- chmod 750 /var/log/tomcat5 /var/lib/tomcat5/conf
- chmod 700 /var/cache/tomcat5
- if [ ! -f /var/lib/tomcat5/webapps/ROOT/WEB-INF/web.xml ]; then
- echo "Installing /var/lib/tomcat5/webapps/ROOT/WEB-INF/web.xml."
- install -o root -g root -m 644 \
- /usr/share/tomcat5/.debian/web.xml \
- /var/lib/tomcat5/webapps/ROOT/WEB-INF/
- fi
- if [ ! -f /var/lib/tomcat5/conf/tomcat-users.xml ]; then
- echo "Installing /var/lib/tomcat5/conf/tomcat-users.xml."
- install -o tomcat5 -g adm -m 600 \
- /usr/share/tomcat5/.debian/tomcat-users.xml \
- /var/lib/tomcat5/conf/
- fi
- if [ ! -f /var/lib/tomcat5/conf/jk2.properties ]; then
- echo "Installing /var/lib/tomcat5/conf/jk2.properties"
- install -o tomcat5 -g nogroup -m 644 \
- /usr/share/tomcat5/.debian/jk2.properties \
- /var/lib/tomcat5/conf/
- fi
- if [ -f /etc/tomcat5/tomcat-users.xml ]; then
- mv /etc/tomcat5/tomcat-users.xml \
- /etc/tomcat5/tomcat-users.xml.dpkg-old || true
- fi
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "$0 called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-#DEBHELPER#
Deleted: branches/tomcat5/tomcat5.5.x/debian/tomcat5.postrm
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/tomcat5.postrm 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/tomcat5.postrm 2006-06-23 15:38:46 UTC (rev 2213)
@@ -1,30 +0,0 @@
-#!/bin/sh -e
-
-#DEBHELPER#
-
-# Remove cached files and auto-generated catalina.policy
-rm -rf /var/cache/tomcat5/* /var/lib/tomcat5/conf/catalina.policy
-
-case "$1" in
- purge)
- # Remove user and log files (don't remove everything under
- # /var/lib/tomcat5 because there might be user-installed webapps)
- userdel tomcat5 || true
- rm -rf /var/log/tomcat5 /var/cache/tomcat5 /var/lib/tomcat5/conf
- rm -f /var/lib/tomcat5/webapps/ROOT/WEB-INF/web.xml
- rmdir --ignore-fail-on-non-empty \
- /var/lib/tomcat5/webapps/ROOT/WEB-INF \
- /var/lib/tomcat5/webapps/ROOT /var/lib/tomcat5/webapps \
- /var/lib/tomcat5 2>/dev/null || true
- rmdir --ignore-fail-on-non-empty /etc/tomcat5/policy.d /etc/tomcat5
- ;;
-
- remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
- # Nothing to do here
- ;;
-
- *)
- echo "$0 called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
Modified: branches/tomcat5/tomcat5.5.x/debian/watch
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/watch 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/watch 2006-06-23 15:38:46 UTC (rev 2213)
@@ -1,2 +1,2 @@
version=3
-http://www.apache.org/dist/jakarta/tomcat-5/v(5\.5\.\d*)/src/jakarta-tomcat-$1-src\.tar\.gz debian uupdate
+http://www.apache.org/dist/tomcat/tomcat-5/v(5\.5\.\d*)/src/apache-tomcat-$1-src\.tar\.gz debian uupdate
Modified: branches/tomcat5/tomcat5.5.x/debian/webapps/admin.xml
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/webapps/admin.xml 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/webapps/admin.xml 2006-06-23 15:38:46 UTC (rev 2213)
@@ -2,7 +2,7 @@
Context configuration file for the Tomcat Administration Web App
-->
-<Context path="/admin" docBase="/usr/share/tomcat5/server/webapps/admin"
+<Context path="/admin" docBase="/usr/share/tomcat5.5/server/webapps/admin"
debug="0" privileged="true" allowLinking="true">
<!-- make symlinks work in Tomcat 5 -->
Modified: branches/tomcat5/tomcat5.5.x/debian/webapps/balancer.xml
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/webapps/balancer.xml 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/webapps/balancer.xml 2006-06-23 15:38:46 UTC (rev 2213)
@@ -2,6 +2,6 @@
Context configuration file for the Tomcat Balancer Web App
-->
-<Context path="/balancer" docBase="/usr/share/tomcat5/webapps/balancer"
+<Context path="/balancer" docBase="/usr/share/tomcat5.5/webapps/balancer"
debug="0" privileged="true" allowLinking="true">
</Context>
Modified: branches/tomcat5/tomcat5.5.x/debian/webapps/host-manager.xml
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/webapps/host-manager.xml 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/webapps/host-manager.xml 2006-06-23 15:38:46 UTC (rev 2213)
@@ -2,7 +2,7 @@
Context configuration file for the Tomcat Host Manager Web App
-->
-<Context path="/host-manager" docBase="/usr/share/tomcat5/server/webapps/host-manager"
+<Context path="/host-manager" docBase="/usr/share/tomcat5.5/server/webapps/host-manager"
debug="0" privileged="true" antiResourceLocking="false" antiJARLocking="false">
</Context>
Modified: branches/tomcat5/tomcat5.5.x/debian/webapps/manager.xml
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/webapps/manager.xml 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/webapps/manager.xml 2006-06-23 15:38:46 UTC (rev 2213)
@@ -2,7 +2,7 @@
Context configuration file for the Tomcat Manager Web App
-->
-<Context path="/manager" docBase="/usr/share/tomcat5/server/webapps/manager"
+<Context path="/manager" docBase="/usr/share/tomcat5.5/server/webapps/manager"
debug="0" privileged="true">
<!-- Link to the user database we will get roles from -->
Modified: branches/tomcat5/tomcat5.5.x/debian/webapps/tomcat-docs.xml
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/webapps/tomcat-docs.xml 2006-06-22 12:31:07 UTC (rev 2212)
+++ branches/tomcat5/tomcat5.5.x/debian/webapps/tomcat-docs.xml 2006-06-23 15:38:46 UTC (rev 2213)
@@ -3,6 +3,6 @@
Needed to allow linking to the JSP/Servlet API documentations
-->
-<Context path="/tomcat-docs" docBase="/usr/share/tomcat5/webapps/tomcat-docs"
+<Context path="/tomcat-docs" docBase="/usr/share/tomcat5.5/webapps/tomcat-docs"
debug="0" privileged="false" allowLinking="true">
</Context>
More information about the pkg-java-commits
mailing list