CVS tomcat5/debian
Wolfgang B??r
wbaer-guest at haydn.debian.org
Sun Sep 11 11:00:44 UTC 2005
Update of /cvsroot/pkg-java/tomcat5/debian
In directory haydn:/tmp/cvs-serv25161/debian
Modified Files:
README.Debian ant.properties changelog control
libtomcat5-java.install libtomcat5-java.links rules server.xml
tomcat5-admin.install tomcat5-webapps.install tomcat5.dirs
tomcat5.init tomcat5.install tomcat5.postinst
Added Files:
NEWS struts-config.xml
Log Message:
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.
* 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
* Install the jsp/servlet examples (closes: #325508, #325507, #326126)
* Added unzip to build-deps (needed to unzip example webapps)
* Changed depends to j2sdk1.3 | j2sdk1.4 | j2sdk1.5 | kaffe
* Removed depends on j2sdk1.3 | j2sdk1.4 | j2sdk1.5 | kaffe | java-compiler
* Updated *.policy files to match new jars and fixed typos
* Disable commons-daemon copy/build - not available on all platforms
* Removed classpath entry from MF and added jars directly to setclasspath.sh
* Build documentation through commandline xslt processing
--- /cvsroot/pkg-java/tomcat5/debian/README.Debian 2005/03/25 15:03:27 1.1.1.1
+++ /cvsroot/pkg-java/tomcat5/debian/README.Debian 2005/09/11 11:00:42 1.2
@@ -17,17 +17,17 @@
- The main configuration file is /etc/tomcat5/server.xml.
The default setup enables the built-in HTTP web server on port 8180 and
- a Coyote/JK2 AJP 1.3 connector for Apache on port 8009. The standard port
+ 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
Environment (JRE) is not sufficient because javac is needed for translating
- JavaServer Pages (JSP) into Java classes.
- You can download Debian packages of JDK 1.3 and JDK 1.4 from Blackdown
- (http://www.blackdown.org/java-linux/mirrors.html) or add one of the mirrors
- to your /etc/apt/sources.list.
+ 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 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
@@ -38,18 +38,18 @@
examples. This requires installation of the tomcat5-webapps package.
- Multiple Tomcat instances can be started by different users when
- $CALALINA_BASE is set to a local directory that contains the subdirectories
+ $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.
+ directory are joined to /etc/tomcat5/catalina.policy at startup.
If your webapp does not work with the tomcat5 Debian package but works fine
with the binary distribution from Jakarta, try to disbale the security
manager in /etc/default/tomcat5 first. If this works, add the required
- permissions in a new file in /etc/tomcat5/policy.d/ and re-enable the
- security manager.
+ permissions in a new file in /etc/tomcat5/policy.d/ restart and re-enable
+ the security manager.
Disbaling the security manager is not recommended on production systems
since a call to System.exit() in a servlet of JSP page would then stop the
@@ -71,8 +71,7 @@
<Resources className="org.apache.naming.resources.FileDirContext"
allowLinking="true" />
- See /etc/tomcat5/server.xml or /var/lib/tomcat5/webapps/admin.xml in the
- Debian package tomcat5-admin for examples.
+ See /etc/tomcat5/server.xml for examples.
- For more information about Jakarta-Tomcat please take a look at the Tomcat
home page at http://jakarta.apache.org/tomcat/index.html.
--- /cvsroot/pkg-java/tomcat5/debian/ant.properties 2005/06/29 21:43:35 1.4
+++ /cvsroot/pkg-java/tomcat5/debian/ant.properties 2005/09/11 11:00:43 1.5
@@ -15,7 +15,7 @@
struts.lib=/usr/share/struts1.2
struts.jar=/usr/share/struts1.2/struts.jar
xmlParserAPIs.jar=/usr/share/java/xmlParserAPIs.jar
-commons-daemon.jar=/usr/share/java/commons-daemon.jar
+#commons-daemon.jar=/usr/share/java/commons-daemon.jar
commons-launcher.jar=/usr/share/java/commons-launcher.jar
log4j.jar=/usr/share/java/log4j-1.2.jar
mail.jar=/usr/share/java/gnumail.jar
--- /cvsroot/pkg-java/tomcat5/debian/changelog 2005/08/20 08:42:33 1.5
+++ /cvsroot/pkg-java/tomcat5/debian/changelog 2005/09/11 11:00:43 1.6
@@ -1,3 +1,51 @@
+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
--- /cvsroot/pkg-java/tomcat5/debian/control 2005/08/20 08:42:33 1.6
+++ /cvsroot/pkg-java/tomcat5/debian/control 2005/09/11 11:00:43 1.7
@@ -2,14 +2,14 @@
Section: contrib/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>
-Build-Depends-Indep: cdbs (>= 0.4.8), debhelper (>= 4.1.0), kaffe, ant, libregexp-java, libcommons-beanutils-java, libcommons-collections3-java, libcommons-fileupload-java (>= 1.0-1), libcommons-digester-java, libcommons-logging-java, libcommons-modeler-java (>= 1.1-1), libmx4j-java, libcommons-dbcp-java, libstruts1.2-java, libgnujaf-java, libgnumail-java, libcommons-daemon-java, liblog4j1.2-java, libxerces2-java, libxalan2-java, junit, libcommons-httpclient-java, libsaxpath-java, libjaxen-java, libcommons-el-java, libjessie-java, libcommons-launcher-java
+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, libregexp-java, libcommons-beanutils-java, libcommons-collections3-java, libcommons-fileupload-java (>= 1.0-1), libcommons-digester-java, libcommons-logging-java, libcommons-modeler-java (>= 1.1-1), libmx4j-java, libcommons-dbcp-java, libstruts1.2-java, libgnujaf-java, libgnumail-java, liblog4j1.2-java, libxerces2-java, libxalan2-java, junit, libcommons-httpclient-java, libsaxpath-java, libjaxen-java, libcommons-el-java, libjessie-java, libcommons-launcher-java, unzip, xsltproc
Standards-Version: 3.6.2
Package: tomcat5
Architecture: all
-Depends: j2sdk1.4 | j2sdk1.3 | kaffe (>= 1.1.3) | java-virtual-machine, j2sdk1.4 | j2sdk1.3 | kaffe | java-compiler, libtomcat5-java (>= ${Source-Version}), adduser (>= 3.34), apache-utils (>= 1.3.29.0.2-1) | apache2-common, ${misc:Depends}
-Suggests: libapache-mod-jk | libapache2-mod-jk, tomcat5-webapps, tomcat5-admin, ant
+Depends: j2sdk1.3 | j2sdk1.4 | j2sdk1.5 | kaffe (>= 2:1.1.5-cvs20050808-2), libtomcat5-java (>= ${Source-Version}), adduser (>= 3.34), apache-utils (>= 1.3.29.0.2-1) | apache2-common
+Suggests: java-virtual-machine, libapache-mod-jk | libapache2-mod-jk, tomcat5-webapps, tomcat5-admin, ant
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.
@@ -23,15 +23,10 @@
.
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/
- .
- Note: You should install JDK 1.3 or 1.4 to run this package. JDK 1.3
- and 1.4 are not available from Debian but you can get packages from
- http://www.blackdown.org/java-linux/mirrors.html. But another free VM
- could do the job.
-
+
Package: libtomcat5-java
Architecture: all
-Depends: libxerces2-java, libservlet2.4-java, libcommons-el-java, ant, libregexp-java, libcommons-beanutils-java, libcommons-collections3-java, libcommons-digester-java, libcommons-fileupload-java (>= 1.0-1), libcommons-logging-java, libcommons-modeler-java (>= 1.1-1), libmx4j-java, libcommons-dbcp-java, libcommons-daemon-java, libcommons-launcher-java
+Depends: libxerces2-java, libservlet2.4-java, libcommons-el-java, ant, libregexp-java, libcommons-beanutils-java, libcommons-collections3-java, libcommons-digester-java, libcommons-fileupload-java (>= 1.0-1), libcommons-logging-java, libcommons-modeler-java (>= 1.1-1), libmx4j-java, libcommons-dbcp-java, libcommons-launcher-java
Suggests: tomcat5
Description: Java Servlet engine -- core libraries
Apache Tomcat 5 is the reference implementation for the Java Servlet 2.4
--- /cvsroot/pkg-java/tomcat5/debian/libtomcat5-java.install 2005/08/20 08:42:33 1.5
+++ /cvsroot/pkg-java/tomcat5/debian/libtomcat5-java.install 2005/09/11 11:00:43 1.6
@@ -1,13 +1,13 @@
-jakarta-tomcat-5/build/bin/bootstrap.jar /usr/share/tomcat5/bin/
-jakarta-tomcat-5/build/bin/jmx.jar /usr/share/tomcat5/bin/
-jakarta-tomcat-5/build/common/classes /usr/share/tomcat5/common/
-jakarta-tomcat-5/build/common/endorsed /usr/share/tomcat5/common/
-jakarta-tomcat-5/build/common/lib/jasper-*.jar /usr/share/tomcat5/common/lib/
-jakarta-tomcat-5/build/common/lib/naming-*.jar /usr/share/tomcat5/common/lib/
-jakarta-tomcat-5/build/server/classes /usr/share/tomcat5/server/
-jakarta-tomcat-5/build/server/lib/catalina*.jar /usr/share/tomcat5/server/lib/
-jakarta-tomcat-5/build/server/lib/servlets-*.jar /usr/share/tomcat5/server/lib/
-jakarta-tomcat-5/build/server/lib/servlets-*.renametojar /usr/share/tomcat5/server/lib/
-jakarta-tomcat-5/build/server/lib/tomcat-*.jar /usr/share/tomcat5/server/lib/
-jakarta-tomcat-5/build/server/lib/jkconfig.jar /usr/share/tomcat5/server/lib/
-jakarta-tomcat-5/build/server/lib/jkshm.jar /usr/share/tomcat5/server/lib/
+jakarta-tomcat-5/build/bin/bootstrap.jar /usr/share/tomcat5/bin/
+jakarta-tomcat-5/build/bin/jmx.jar /usr/share/tomcat5/bin/
+jakarta-tomcat-5/build/common/classes /usr/share/tomcat5/common/
+jakarta-tomcat-5/build/common/endorsed /usr/share/tomcat5/common/
+jakarta-tomcat-5/build/common/lib/jasper-*.jar /usr/share/tomcat5/common/lib/
+jakarta-tomcat-5/build/common/lib/naming-*.jar /usr/share/tomcat5/common/lib/
+jakarta-tomcat-5/build/server/classes /usr/share/tomcat5/server/
+jakarta-tomcat-5/build/server/lib/catalina*.jar /usr/share/tomcat5/server/lib/
+jakarta-tomcat-5/build/server/lib/servlets-*.jar /usr/share/tomcat5/server/lib/
+jakarta-tomcat-5/build/server/lib/servlets-*.renametojar /usr/share/tomcat5/server/lib/
+jakarta-tomcat-5/build/server/lib/tomcat-*.jar /usr/share/tomcat5/server/lib/
+jakarta-tomcat-5/build/server/lib/jkconfig.jar /usr/share/tomcat5/server/lib/
+jakarta-tomcat-5/build/server/lib/jkshm.jar /usr/share/tomcat5/server/lib/
--- /cvsroot/pkg-java/tomcat5/debian/libtomcat5-java.links 2005/08/20 08:42:33 1.5
+++ /cvsroot/pkg-java/tomcat5/debian/libtomcat5-java.links 2005/09/11 11:00:43 1.6
@@ -1,5 +1,4 @@
/usr/share/java/commons-logging-api.jar /usr/share/tomcat5/bin/commons-logging-api.jar
-/usr/share/java/commons-daemon.jar /usr/share/tomcat5/bin/commons-daemon.jar
/usr/share/java/commons-launcher.jar /usr/share/tomcat5/bin/commons-launcher.jar
/usr/share/ant/lib/ant.jar /usr/share/tomcat5/common/lib/ant.jar
@@ -7,7 +6,6 @@
/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-el.jar /usr/share/tomcat5/common/lib/commons-el.jar
-/usr/share/java/commons-fileupload.jar /usr/share/tomcat5/common/lib/commons-fileupload.jar
/usr/share/java/commons-pool.jar /usr/share/tomcat5/common/lib/commons-pool.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
@@ -16,7 +14,7 @@
/usr/share/java/commons-digester.jar /usr/share/tomcat5/server/lib/commons-digester.jar
/usr/share/java/commons-modeler.jar /usr/share/tomcat5/server/lib/commons-modeler.jar
/usr/share/java/regexp.jar /usr/share/tomcat5/server/lib/jakarta-regexp.jar
-
+/usr/share/java/commons-fileupload.jar /usr/share/tomcat5/server/lib/commons-fileupload.jar
/usr/share/java/mx4j.jar /usr/share/tomcat5/server/lib/mx4j.jar
/usr/share/tomcat5/server/lib/catalina-ant.jar /usr/share/ant/lib/catalina5-ant.jar
--- /cvsroot/pkg-java/tomcat5/debian/rules 2005/08/20 08:42:33 1.6
+++ /cvsroot/pkg-java/tomcat5/debian/rules 2005/09/11 11:00:43 1.7
@@ -3,6 +3,7 @@
UPSTREAM_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' | cut -f1 -d-)
TOMCAT_SRCDIR := jakarta-tomcat-5
+TOMCAT_BUILD := jakarta-tomcat-5/build
CATALINA_SRCDIR := jakarta-tomcat-catalina
CONNECTORS_SRCDIR := jakarta-tomcat-connectors
JASPAER_SRCDIR := jakarta-tomcat-jasper
@@ -11,51 +12,43 @@
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/ant.mk
-# This is for IBM's ppc JDK
-ifeq ($(shell dpkg --print-architecture),powerpc)
-export JITC_PROCESSOR_TYPE=6;
-endif
-
-# The first two must be specified: This package needs JDK 1.4 to build because
-# of the included JSSE (Java Secure Socket Extension) classes and some parts
-# of ant-optional.
-#JAVA_HOME := /usr/lib/j2se/1.4
JAVA_HOME := /usr/lib/kaffe
ANT_HOME := /usr/share/ant
-# Additional JARs to add to the class path, either full path or just the
-# basename for JARs in /usr/share/java. The ".jar" suffix may also be ommitted
DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar
-# Build compiler
-#DEB_ANT_COMPILER := modern
DEB_ANT_COMPILER := jikes
-
-# Ant target to call
DEB_ANT_BUILD_TARGET := build
-#DEB_ANT_INSTALL_TARGET := dist
# Examples and documentation for the tomcat5 package
-DEB_INSTALL_DOCS_tomcat5 := $(DEB_SRCDIR)/$(TOMCAT_SRCDIR)/RELEASE-* \
- $(DEB_SRCDIR)/$(TOMCAT_SRCDIR)/RUNNING.txt # $(DEB_SRCDIR)/README.txt
+DEB_INSTALL_DOCS_tomcat5 := $(DEB_SRCDIR)/$(TOMCAT_SRCDIR)/RUNNING.txt
DEB_INSTALL_EXAMPLES_tomcat5 := $(DEB_SRCDIR)/$(TOMCAT_SRCDIR)/build/conf/server.xml \
$(DEB_SRCDIR)/$(TOMCAT_SRCDIR)/build/conf/web.xml
-pre-build:: #$(_cdbs_tarball_dir)/jakarta-tomcat
-#$(_cdbs_tarball_dir)/jakarta-tomcat:
- -mkdir -p jakarta-commons/daemon/target
- -ln -s /usr/share/java/commons-daemon.jar jakarta-commons/daemon/target/commons-daemon.jar
-# -mkdir debian/tmp
-# -rm jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE13*
+pre-build::
-rm -r jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/puretls/
-# ln -s $(CONNECTORS_SRCDIR) $(_cdbs_tarball_dir)/jakarta-tomcat-connectors
clean::
- -rm jakarta-commons/daemon/target/commons-daemon.jar
- -rm -r jakarta-tomcat-5/debian
-rm -r jakarta-tomcat-5/build
-rm -r jakarta-tomcat-5/compat
-rm -r jakarta-tomcat-5/deployer
- -rm -r jakarta-tomcat-catalina/webapps/build/
-rm -f LICENSE
+
+install/tomcat5-webapps::
+ install -d jakarta-tomcat-5/build/webapps/tomcat-docs/
+ cd jakarta-tomcat-catalina/webapps/docs && cp -R *.xml *.xsl appdev architecture config funcspecs ../../../jakarta-tomcat-5/build/webapps/tomcat-docs/
+ cd jakarta-tomcat-5/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
+ cd jakarta-tomcat-5/build/webapps/tomcat-docs && find . -name '*.xml' -exec rm -f {} \;
+ cd jakarta-tomcat-5/build/webapps/tomcat-docs && rm -f tomcat-docs.xsl
+ cd jakarta-tomcat-catalina/webapps/docs && cp -R WEB-INF ../../../jakarta-tomcat-5/build/webapps/tomcat-docs/
+ # copy the RELEASE_NOTES into the tomcat-docs webapp
+ cp jakarta-tomcat-5/RELEASE-NOTES jakarta-tomcat-5/build/webapps/ROOT/RELEASE-NOTES.txt
+
+ gunzip $(TOMCAT_BUILD)/webapps/jsp-examples/examples-jsp.war.gz
+ gunzip $(TOMCAT_BUILD)/webapps/servlets-examples/examples-servlet.war.gz
+ unzip $(TOMCAT_BUILD)/webapps/jsp-examples/examples-jsp.war -d $(TOMCAT_BUILD)/webapps/jsp-examples/
+ unzip $(TOMCAT_BUILD)/webapps/servlets-examples/examples-servlet.war \
+ -d $(TOMCAT_BUILD)/webapps/servlets-examples/
+ rm $(TOMCAT_BUILD)/webapps/jsp-examples/examples-jsp.war
+ rm $(TOMCAT_BUILD)/webapps/servlets-examples/examples-servlet.war
--- /cvsroot/pkg-java/tomcat5/debian/server.xml 2005/03/25 15:03:27 1.1.1.1
+++ /cvsroot/pkg-java/tomcat5/debian/server.xml 2005/09/11 11:00:43 1.2
@@ -15,8 +15,6 @@
<Server port="8005" shutdown="SHUTDOWN" debug="0">
-
- <!-- Uncomment these entries to enable JMX MBeans support -->
<Listener className="org.apache.catalina.mbeans.ServerLifecycleListener"
debug="0"/>
<Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener"
@@ -82,8 +80,9 @@
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 -->
- <Engine name="Standalone" defaultHost="localhost" debug="0">
+ <!-- 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">
<!-- Global logger unless overridden at lower levels -->
<Logger className="org.apache.catalina.logger.FileLogger"
@@ -100,14 +99,7 @@
<!-- 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"/>
-
- <!-- Allow symlinks for the tomcat-docs webapp. This is required in
- the Debian packages to make the Servlet/JSP API docs work. -->
- <Context path="/tomcat-docs" docBase="tomcat-docs" debug="0">
- <Resources className="org.apache.naming.resources.FileDirContext"
- allowLinking="true" />
- </Context>
+ timestamp="true"/>
</Host>
@@ -115,26 +107,5 @@
</Service>
- <!-- Define an Apache-Connector Service -->
-<!--
- <Service name="Tomcat-Apache">
-
- <Connector className="org.apache.catalina.connector.warp.WarpConnector"
- port="8008" minProcessors="5" maxProcessors="75"
- enableLookups="true" appBase="webapps"
- acceptCount="10" debug="0"/>
-
- <Engine className="org.apache.catalina.connector.warp.WarpEngine"
- name="Apache" debug="0">
-
- <Logger className="org.apache.catalina.logger.FileLogger"
- prefix="mod_webapp_" suffix=".log" timestamp="true"/>
-
- <Realm className="org.apache.catalina.realm.MemoryRealm" />
-
- </Engine>
-
- </Service>
--->
</Server>
--- /cvsroot/pkg-java/tomcat5/debian/tomcat5-admin.install 2005/08/20 08:42:33 1.3
+++ /cvsroot/pkg-java/tomcat5/debian/tomcat5-admin.install 2005/09/11 11:00:43 1.4
@@ -1,5 +1,6 @@
-debian/webapps/admin.xml /var/lib/tomcat5/webapps/
-debian/webapps/manager.xml /var/lib/tomcat5/webapps/
-debian/policy/10admin.policy /etc/tomcat5/policy.d/
-jakarta-tomcat-5/build/server/webapps/admin /usr/share/tomcat5/server/webapps/
-jakarta-tomcat-5/build/server/webapps/manager /usr/share/tomcat5/server/webapps/
+debian/webapps/admin.xml /var/lib/tomcat5/conf/Catalina/localhost/
+debian/webapps/manager.xml /var/lib/tomcat5/conf/Catalina/localhost/
+debian/policy/10admin.policy /etc/tomcat5/policy.d/
+jakarta-tomcat-5/build/server/webapps/admin /usr/share/tomcat5/server/webapps/
+jakarta-tomcat-5/build/server/webapps/manager /usr/share/tomcat5/server/webapps/
+debian/struts-config.xml /usr/share/tomcat5/server/webapps/admin/WEB-INF/
--- /cvsroot/pkg-java/tomcat5/debian/tomcat5-webapps.install 2005/08/20 08:42:33 1.3
+++ /cvsroot/pkg-java/tomcat5/debian/tomcat5-webapps.install 2005/09/11 11:00:43 1.4
@@ -1,10 +1,11 @@
-jakarta-tomcat-5/build/webapps/balancer /var/lib/tomcat5/webapps/
-jakarta-tomcat-5/build/webapps/ROOT /var/lib/tomcat5/webapps/
-jakarta-tomcat-5/build/webapps/jsp-examples /usr/share/tomcat5/server/webapps
-jakarta-tomcat-5/build/webapps/servlets-examples /usr/share/tomcat5/server/webapps
-jakarta-tomcat-5/build/webapps/tomcat-docs /var/lib/tomcat5/webapps/
-jakarta-tomcat-5/build/webapps/webdav /var/lib/tomcat5/webapps/
-debian/webapps/examples.xml /var/lib/tomcat5/webapps/
+jakarta-tomcat-5/build/webapps/balancer /var/lib/tomcat5/webapps/
+jakarta-tomcat-5/build/webapps/ROOT /var/lib/tomcat5/webapps/
+jakarta-tomcat-5/build/webapps/jsp-examples /var/lib/tomcat5/webapps/
+jakarta-tomcat-5/build/webapps/servlets-examples /var/lib/tomcat5/webapps/
+jakarta-tomcat-5/build/webapps/tomcat-docs /var/lib/tomcat5/webapps/
+jakarta-tomcat-5/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/
jakarta-servletapi-5/jsr152/examples/WEB-INF/lib/jstl.jar /usr/share/tomcat5/server/webapps/jsp-examples/WEB-INF/lib
jakarta-servletapi-5/jsr152/examples/WEB-INF/lib/standard.jar /usr/share/tomcat5/server/webapps/jsp-examples/WEB-INF/lib
--- /cvsroot/pkg-java/tomcat5/debian/tomcat5.dirs 2005/03/25 15:03:27 1.1.1.1
+++ /cvsroot/pkg-java/tomcat5/debian/tomcat5.dirs 2005/09/11 11:00:43 1.2
@@ -2,7 +2,7 @@
etc/tomcat5/policy.d
usr/share/tomcat5/bin
var/cache/tomcat5/
-var/lib/tomcat5/conf
+var/lib/tomcat5/conf/Catalina/localhost
var/lib/tomcat5/shared/classes
var/lib/tomcat5/shared/lib
var/lib/tomcat5/temp
--- /cvsroot/pkg-java/tomcat5/debian/tomcat5.init 2005/08/05 10:14:37 1.4
+++ /cvsroot/pkg-java/tomcat5/debian/tomcat5.init 2005/09/11 11:00:43 1.5
@@ -20,15 +20,17 @@
# 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-bd /usr/lib/j2sdk1.4 /usr/lib/j2sdk1.3 /usr/lib/kaffe"
+JDK_DIRS="ß /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/kaffe"
# Directory for per-instance configuration files and webapps
CATALINA_BASE=/var/lib/tomcat5
# Use the Java security manager? (yes/no)
-#TOMCAT5_SECURITY=yes
-#Not sure it works with kaffe at the moment
-TOMCAT5_SECURITY=no
+TOMCAT5_SECURITY=yes
+# Still broken for kaffe at the moment
+if [ "$JAVA_HOME" = "/usr/lib/kaffe" ]; then
+ TOMCAT5_SECURITY=no
+fi
# Timeout in seconds for the shutdown of all webapps
TOMCAT5_SHUTDOWN=30
--- /cvsroot/pkg-java/tomcat5/debian/tomcat5.install 2005/06/29 18:10:40 1.2
+++ /cvsroot/pkg-java/tomcat5/debian/tomcat5.install 2005/09/11 11:00:43 1.3
@@ -1,9 +1,9 @@
-jakarta-tomcat-5/build/bin/*.sh /usr/share/tomcat5/bin/
-jakarta-tomcat-5/build/conf/tomcat-users.xml /usr/share/tomcat5/.debian/
+jakarta-tomcat-5/build/bin/*.sh /usr/share/tomcat5/bin/
+jakarta-tomcat-5/build/conf/tomcat-users.xml /usr/share/tomcat5/.debian/
jakarta-tomcat-5/build/webapps/ROOT/WEB-INF/web.xml /usr/share/tomcat5/.debian/
jakarta-tomcat-connectors/jk/conf/jk2.properties /usr/share/tomcat5/.debian/
-jakarta-tomcat-5/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/
+jakarta-tomcat-5/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/
--- /cvsroot/pkg-java/tomcat5/debian/tomcat5.postinst 2005/03/25 15:03:27 1.1.1.1
+++ /cvsroot/pkg-java/tomcat5/debian/tomcat5.postinst 2005/09/11 11:00:43 1.2
@@ -7,7 +7,7 @@
--ingroup nogroup --disabled-password --shell /bin/false \
tomcat5
fi
- chown tomcat5.adm /var/log/tomcat5 /var/cache/tomcat5 \
+ 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
More information about the pkg-java-commits
mailing list