r1838 - in branches/tomcat5/tomcat5.5.x/debian: . patches policy
webapps
Wolfgang Bär
wbaer-guest at costa.debian.org
Fri Jan 27 17:41:27 UTC 2006
Author: wbaer-guest
Date: 2006-01-27 17:41:24 +0000 (Fri, 27 Jan 2006)
New Revision: 1838
Added:
branches/tomcat5/tomcat5.5.x/debian/NEWS
branches/tomcat5/tomcat5.5.x/debian/patches/00_disable_sourcechecking_download.patch
branches/tomcat5/tomcat5.5.x/debian/patches/01_fix_doc_stylesheet.patch
branches/tomcat5/tomcat5.5.x/debian/patches/02_dont_build_servlet_api_and_jsp_api.patch
branches/tomcat5/tomcat5.5.x/debian/patches/03_dont_copy_deployer_howto.patch
branches/tomcat5/tomcat5.5.x/debian/patches/04_dont_copy_daemon.patch
branches/tomcat5/tomcat5.5.x/debian/patches/05_dont_build_and_fix_webapps.patch
branches/tomcat5/tomcat5.5.x/debian/patches/06_dont_copy_tomcatnative.patch
branches/tomcat5/tomcat5.5.x/debian/patches/07_dont_copy_jasper_jdt_compiler.patch
branches/tomcat5/tomcat5.5.x/debian/patches/07_fix_jasper_directory.patch
branches/tomcat5/tomcat5.5.x/debian/patches/08_dont_copy_tomcatdbcp.patch
branches/tomcat5/tomcat5.5.x/debian/patches/08_dont_copy_unusedjars.patch
branches/tomcat5/tomcat5.5.x/debian/patches/09_UseSystemDBCP.patch
branches/tomcat5/tomcat5.5.x/debian/patches/10_JSSEImplementation_RemoveJDK13Support.patch
branches/tomcat5/tomcat5.5.x/debian/patches/11_BuildXml_ExcludeJDK13Support.patch
branches/tomcat5/tomcat5.5.x/debian/patches/20_NoDocu_WebappsManager.patch
branches/tomcat5/tomcat5.5.x/debian/patches/21_NoDocu_WebappsHostManager.patch
branches/tomcat5/tomcat5.5.x/debian/patches/22_NoDocu_WebappsDocs.patch
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/tomcat-docs.xml
Removed:
branches/tomcat5/tomcat5.5.x/debian/patches/00_struts-config-upstream.patch
branches/tomcat5/tomcat5.5.x/debian/patches/01_jasper_dir.unpatch
branches/tomcat5/tomcat5.5.x/debian/patches/02_servlet_docs.unpatch
branches/tomcat5/tomcat5.5.x/debian/patches/03_dist_target.unpatch
branches/tomcat5/tomcat5.5.x/debian/patches/04_servlet_path.unpatch
branches/tomcat5/tomcat5.5.x/debian/patches/05_admin_dont_copy_struts.unpatch
branches/tomcat5/tomcat5.5.x/debian/patches/top_build_clean_target.patch.applyed_before_building
branches/tomcat5/tomcat5.5.x/debian/webapps/examples.xml
Modified:
branches/tomcat5/tomcat5.5.x/debian/README.Debian
branches/tomcat5/tomcat5.5.x/debian/ant.properties
branches/tomcat5/tomcat5.5.x/debian/changelog
branches/tomcat5/tomcat5.5.x/debian/control
branches/tomcat5/tomcat5.5.x/debian/libtomcat5-java.install
branches/tomcat5/tomcat5.5.x/debian/libtomcat5-java.links
branches/tomcat5/tomcat5.5.x/debian/policy/02debian.policy
branches/tomcat5/tomcat5.5.x/debian/policy/03catalina.policy
branches/tomcat5/tomcat5.5.x/debian/policy/04webapps.policy
branches/tomcat5/tomcat5.5.x/debian/policy/10admin.policy
branches/tomcat5/tomcat5.5.x/debian/rules
branches/tomcat5/tomcat5.5.x/debian/server.xml
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-webapps.install
branches/tomcat5/tomcat5.5.x/debian/tomcat5-webapps.links
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.postinst
branches/tomcat5/tomcat5.5.x/debian/watch
branches/tomcat5/tomcat5.5.x/debian/webapps/manager.xml
Log:
Initial commit, updates all over the place.
Added: branches/tomcat5/tomcat5.5.x/debian/NEWS
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/NEWS 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/NEWS 2006-01-27 17:41:24 UTC (rev 1838)
@@ -0,0 +1,11 @@
+tomcat5 (5.0.30-6) unstable; urgency=low
+
+ Tomcat5 has a new context file handling. The xml files with the context of
+ a webapp are now placed into directories conf/[Engine name]/[Host name].
+
+ For the standard standalone tomcat5 installation on localhost this directory
+ is now called conf/Catalina/localhost ! If you have own context files in
+ the old conf/Standalone/localhost directory you have to move them into the
+ new directory. Afterwards you may delete the old Standalone directory.
+
+ -- Wolfgang Baer <WBaer at gmx.de> Wed, 07 Sep 2005 17:25:44 +0200
\ No newline at end of file
Modified: branches/tomcat5/tomcat5.5.x/debian/README.Debian
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/README.Debian 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/README.Debian 2006-01-27 17:41:24 UTC (rev 1838)
@@ -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 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
@@ -38,20 +38,20 @@
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
+ 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/ 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
+ Disabling 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
whole virtual machine that is running Tomcat.
@@ -71,14 +71,13 @@
<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.
+ home page at <http://tomcat.apache.org/index.html>.
- 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/
+ <http://java.sun.com/products/servlet/> & <http://java.sun.com/products/jsp/>
- This package is heavily based on the great work of Stephan Gybas on
the tomcat4 package
Modified: branches/tomcat5/tomcat5.5.x/debian/ant.properties
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/ant.properties 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/ant.properties 2006-01-27 17:41:24 UTC (rev 1838)
@@ -1,24 +1,26 @@
base.path=./debian/tmp
activation.jar=/usr/share/java/activation.jar
-commons-beanutils.jar=/usr/share/java/commons-beanutils.jar
-commons-collections.jar=/usr/share/java/commons-collections.jar
-commons-digester.jar=/usr/share/java/commons-digester.jar
-commons-dbcp.jar=/usr/share/java/commons-dbcp.jar
commons-fileupload.jar=/usr/share/java/commons-fileupload.jar
commons-logging.jar=/usr/share/java/commons-logging.jar
-commons-logging-api.jar=/usr/share/java/commons-logging.jar
+commons-logging-api.jar=/usr/share/java/commons-logging-api.jar
commons-modeler.jar=/usr/share/java/commons-modeler.jar
-commons-pool.jar=/usr/share/java/commons-pool.jar
-servlet.jar=./jakarta-servletapi-5/jsr154/debian/tmp/servlet-api-2.4/lib/servlet-api.jar
+commons-launcher.jar=/usr/share/java/commons-launcher.jar
+commons-el.jar=/usr/share/java/commons-el.jar
+commons-beanutils.jar=/usr/share/java/commons-beanutils.jar
+servlet-api.jar=/usr/share/java/servlet-api.jar
+jsp-api.jar=/usr/share/java/jsp-api.jar
+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-launcher.jar=/usr/share/java/commons-daemon.jar
log4j.jar=/usr/share/java/log4j-1.2.jar
mail.jar=/usr/share/java/gnumail.jar
-regexp.jar=/usr/share/java/regexp.jar
xml-apis.jar=/usr/share/java/xml-apis.jar
xercesImpl.jar=/usr/share/java/xercesImpl.jar
jmx.jar=/usr/share/java/mx4j.jar
+jmx-remote.jar=/usr/share/java/mx4j-remote.jar
junit.jar=/usr/share/java/junit.jar
-commons-httpclient.jar=/usr/share/java/commons-httpclient.jar
+execute.installer=false
+jsse.jar=/usr/share/java/jsse.jar
+puretls.jar=
+puretls.present=false
+jasper-compiler-jdt.jar=/usr/share/java/ecj.jar
Modified: branches/tomcat5/tomcat5.5.x/debian/changelog
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/changelog 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/changelog 2006-01-27 17:41:24 UTC (rev 1838)
@@ -1,5 +1,146 @@
-tomcat5 (5.0.30-1) unstable; urgency=low
+tomcat5 (5.5.15-1) UNRELEASED; urgency=low
+ * New major upstream release
+ + New source layout - adaptions all over the place
+ + Ported all patches to new source layout
+ + Added patch (09_UseSystemDBCP.patch) to use system dbcp instead of
+ repackaged tomcat stuff (naming-factory-dbcp.jar)
+ + Drop now unneeded dependencies on libsaxpath-java, libjaxen-java,
+ libregexp-java from build-dependencies and dependencies
+ + Move dependency on libcommons-collections3-java,
+ libcommons-fileupload-java, libcommons-beanutils-java and
+ libcommons-digester-java to tomcat5-admin (only needed here)
+ + Move libraries around as required by new binary layout (e.g. i18n jars
+ into own directory)
+ + Moved and linked new jars (tomcat-jkstatus-ant.jar, tomcat-juli.jar)
+ + Updated 03catalina.policy to include tomcat-juli.jar, remove launcher.jar
+ + Install ant task definitions with libtomcat5-java
+ * Remove JDK 1.3 directories from JDK_DIRS in tomcat.init (not supported)
+ * Updated tomcat.default to remove JDK 1.3 options
+ * Updated description to include host-manager, fixed URLs
+ * Minor updates in README.Debian
+
+ -- Wolfgang Baer <WBaer at gmx.de> Fri, 27 Jan 2006 10:07:47 +0100
+
+tomcat5 (5.0.30-9) unstable; urgency=low
+
+ * kaffe compiler transition
+ + Remove build.compiler jikes property
+ + Modify tomcat5.init to use default compiler instead of jikes
+ * Fix spelling error in README.Debian (closes: #346573)
+
+ -- Wolfgang Baer <WBaer at gmx.de> Tue, 17 Jan 2006 11:50:52 +0100
+
+tomcat5 (5.0.30-8) unstable; urgency=low
+
+ * Correct description to refer to tomcat5-webapps (closes: #336984)
+ * Test in tomcat5.init for JDK like environment so we are sure
+ java-gcj-compat-dev is installed and used (closes: #337270)
+
+ -- Wolfgang Baer <WBaer at gmx.de> Mon, 7 Nov 2005 19:17:58 +0100
+
+tomcat5 (5.0.30-7) unstable; urgency=low
+
+ * Move to main - upload with orig.tar.gz included
+ * Works with kaffe (>= 1.1.6-3) and java-gcj-compat-dev
+ + changed debian/control accordingly
+ + adjusted tomcat5.init file
+ * Removed libcommons-httpclient-java build-dep - not needed
+
+ -- Wolfgang Baer <WBaer at gmx.de> Thu, 06 Oct 2005 21:59:36 +0200
+
+tomcat5 (5.0.30-6) unstable; urgency=low
+
+ * Move commons-fileupload jar from common/lib to server/lib
+ * Copy fixed struts-config.xml during install over the old one. The fixed
+ one is taken from upstream (published at download location)
+ * Tomcat5 has a new context file handling. The xml files with the context of
+ a webapp needs to be put into conf/[Engine name]/[Host name] whereas the
+ default engine which serves the admin webapp has to be called "Catalina":
+ + Create conf/Catalina/localhost directory during install
+ + Deploy the context files for the webapps into this directory
+ (closes: #315038)
+ + Added NEWS.Debian file to inform about moving context files to new
+ context directory hierarchy.
+ * Install the jsp/servlet examples (closes: #325508, #325507, #326126)
+ * Added unzip to build-deps (needed to unzip example webapps)
+ * Cleaned up debian/rules a bit
+ * libcommons-launcher-java dependency added in last upload (closes: #324041)
+ * Works with latest kaffe vm (closes: #320845) - added versioned dependency
+ * Changed depends to j2sdk1.3 | j2sdk1.4 | j2sdk1.5 | kaffe
+ * Removed depends on j2sdk1.3 | j2sdk1.4 | j2sdk1.5 | kaffe | java-compiler
+ as the above depends already includes an java-compiler as JDKs
+ * Removed note in description about non-free JDKs - kaffe works and the
+ info is superceded by the existance of java-package
+ * Updated *.policy files to match new jars and fixed typos
+ * As tomcat5 is now functional we can close the whishlist bugs for
+ packaging tomcat5 (closes: #222876, #267741)
+ * Disable commons-daemon copy/build - not available on all platforms
+ + Added patch 15_dont_copy_daemon.patch
+ + Removed related stuff from debian/rules and debian/control
+ * Removed classpath entry from MF and added jars directly to setclasspath.sh
+ + Patch 01_remove_classpath_manifest_a.patch removes the entry
+ + Patch 01_remove_classpath_manifest_b.patch adds it to setclasspath.sh
+ * Fixed typo CALALINA in README.Debian
+ * Fixed lintian warning in tomcat5.postinst
+ * Extended JDK_DIRS and enabled Security Manager for non-free JDKs
+ * Build documentation through commandline xslt processing
+ + Patch 03_fix_doc_stylesheet.patch to fix stylsheet variable definition
+ + Added xsltproc to build-deps and process docs in debian/rules
+ + Moved RELEASE-NOTES to webapps/ROOT where it belongs
+ + Added tomcat-docs.xml context definition to allow linking and also
+ starting tomcat5 without tomcat5-webapps installed (removed linking
+ for tomcat-docs from server.xml)
+ * Added myself to uploaders
+
+ * Upload sponsored by Petter Reinholdtsen
+
+ -- Wolfgang Baer <WBaer at gmx.de> Wed, 07 Sep 2005 17:25:44 +0200
+
+tomcat5 (5.0.30-5) unstable; urgency=low
+
+ * debian/control (libtomcat5-java: Depends): added
+ libcommons-launcher-java
+
+ -- Arnaud Vandyck <avdyk at debian.org> Sat, 20 Aug 2005 10:34:05 +0200
+
+tomcat5 (5.0.30-4) unstable; urgency=low
+
+ * upload to unstable
+ * debian/control: ant transition: change the dep from libant1.6-java to
+ ant
+ * debian/libtomcat5-java.links: added some links and corrected ant once
+ * updated to libcommons-collection3-java
+
+ -- Arnaud Vandyck <avdyk at debian.org> Fri, 19 Aug 2005 16:06:27 +0200
+
+tomcat5 (5.0.30-3) experimental; urgency=low
+
+ * Added libapache2-mod-jk to suggests, missing libcommons-el-java
+ to libtomcat5-java build-depends
+ * Fixed/Added links in libtomcat5-java (jsp-api/commons-el jars added)
+ * Changed JDK dirs (as generated by java-package), enabled security
+ manager and therefore put kaffe as last jdk (currently has problems)
+ * Fixed typo in ant.properties to correctly include logging-api.jar
+ and fixed libtomcat5-java accordingly
+ * Fixed servlet-api link in tomcat5-webapps.links and included needed
+ jsp-api link
+ * Standards-Version 3.6.2 - no changes required
+ * Build-Deps to Build-Dep-Indep to fix linitan warning
+
+ -- Wolfgang Baer <WBaer at gmx.de> Wed, 29 Jun 2005 22:32:49 +0200
+
+tomcat5 (5.0.30-2) experimental; urgency=low
+
+ * libtomcat5-java: does not provide commons-logging-api and
+ commons-daemon but use symlink to /usr/share/java. Now, tomcat5 can
+ start with non-free jdks (but it does not run with free one at the
+ moment for me) (closes: #315038)
+
+ -- Arnaud Vandyck <avdyk at debian.org> Tue, 21 Jun 2005 12:44:21 +0200
+
+tomcat5 (5.0.30-1) experimental; urgency=low
+
* Initial release release based on tomcat4 package by Stefan Gybas.
- -- Arnaud Vandyck <avdyk at debian.org> Fri, 25 Mar 2005 11:45:09 +0100
+ -- Arnaud Vandyck <avdyk at debian.org> Sat, 11 Jun 2005 17:00:35 +0200
Modified: branches/tomcat5/tomcat5.5.x/debian/control
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/control 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/control 2006-01-27 17:41:24 UTC (rev 1838)
@@ -1,42 +1,33 @@
Source: tomcat5
-Section: contrib/web
+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>
-Build-Depends: cdbs (>= 0.4.8), debhelper (>= 4.1.0), kaffe, libant1.6-java, libregexp-java, libcommons-beanutils-java, libcommons-collections-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, junit, libcommons-httpclient-java
-Standards-Version: 3.6.1
+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
Package: tomcat5
Architecture: all
-Section: contrib/web
-Priority: optional
-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, tomcat5-webapps, tomcat5-admin, ant
+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
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
- tomcat4-webapps package if you want them.
+ tomcat5-webapps package if you want them.
.
For more information about Tomcat please take a look at the Tomcat
- home page at http://jakarta.apache.org/tomcat/index.html.
+ home page at http://tomcat.apache.org/index.html.
.
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
-Section: contrib/web
-Priority: optional
-Depends: libxerces2-java, libservlet2.4-java, libant1.6-java, libregexp-java, libcommons-beanutils-java, libcommons-collections-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
-Suggests: tomcat5
+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
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.
@@ -46,12 +37,10 @@
install the tomcat5 package.
.
For more information about Tomcat please take a look at the Tomcat
- home page at http://jakarta.apache.org/tomcat/index.html.
+ home page at http://tomcat.apache.org/index.html.
Package: tomcat5-webapps
Architecture: all
-Section: contrib/web
-Priority: optional
Depends: tomcat5 (>= ${Source-Version})
Description: Java Servlet engine -- documentation and example web applications
Apache Tomcat 5 is the reference implementation for the Java Servlet 2.4
@@ -64,30 +53,17 @@
* webdav: WebDAV access to local files (e.g. using cadaver)
.
For more information about Tomcat please take a look at the Tomcat
- home page at http://jakarta.apache.org/tomcat/index.html.
+ home page at http://tomcat.apache.org/index.html.
Package: tomcat5-admin
Architecture: all
-Section: contrib/web
-Priority: optional
-Depends: tomcat5 (>= ${Source-Version}), libstruts1.1-java
-Description: Java Servlet engine -- admin web interfaces
+Depends: tomcat5 (>= ${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.
.
This package contains two administrative web interfaces as admin and
- manager web applications (webapps).
+ manager and host-manager web applications (webapps).
.
For more information about Tomcat please take a look at the Tomcat
- home page at http://jakarta.apache.org/tomcat/index.html.
-
-Package: libservlet2.4-java
-Architecure: all
-Section: contrib/web
-Priority: optional
-Depends: sablevm | gij | kaffe (>= 2:1.1.4) | java1-runtime | java2-runtime
-Description: servlet 2.4 reference api
- bla servlet bla bla 2.4 blablabla reference
- .
- For more information about Tomcat please take a look at the Tomcat
- home page at http://jakarta.apache.org/tomcat/index.html.
+ home page at http://tomcat.apache.org/index.html.
Modified: branches/tomcat5/tomcat5.5.x/debian/libtomcat5-java.install
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/libtomcat5-java.install 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/libtomcat5-java.install 2006-01-27 17:41:24 UTC (rev 1838)
@@ -1,10 +1,13 @@
-debian/tmp/usr/share/tomcat5/bin/bootstrap.jar
-debian/tmp/usr/share/tomcat5/common/classes
-debian/tmp/usr/share/tomcat5/common/endorsed
-debian/tmp/usr/share/tomcat5/common/lib/jasper-*.jar
-debian/tmp/usr/share/tomcat5/common/lib/naming-*.jar
-debian/tmp/usr/share/tomcat5/server/classes
-debian/tmp/usr/share/tomcat5/server/lib/catalina*.jar
-debian/tmp/usr/share/tomcat5/server/lib/servlets-*.jar
-debian/tmp/usr/share/tomcat5/server/lib/servlets-*.renametojar
-debian/tmp/usr/share/tomcat5/server/lib/tomcat-*.jar
+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/
Modified: branches/tomcat5/tomcat5.5.x/debian/libtomcat5-java.links
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/libtomcat5-java.links 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/libtomcat5-java.links 2006-01-27 17:41:24 UTC (rev 1838)
@@ -1,18 +1,15 @@
-/usr/share/ant1.6/lib/ant.jar /usr/share/tomcat5/common/lib/ant.jar
-/usr/share/java/commons-collections.jar /usr/share/tomcat5/common/lib/commons-collections.jar
-/usr/share/java/commons-logging-api.jar /usr/share/tomcat5/common/lib/commons-logging-api.jar
-/usr/share/java/servlet-2.3.jar /usr/share/tomcat5/common/lib/servlet.jar
-/usr/share/java/xercesImpl.jar /usr/share/tomcat5/common/lib/xercesImpl.jar
-/usr/share/java/xmlParserAPIs.jar /usr/share/tomcat5/common/lib/xmlParserAPIs.jar
+/usr/share/java/commons-logging-api.jar /usr/share/tomcat5/bin/commons-logging-api.jar
-/usr/share/java/commons-beanutils.jar /usr/share/tomcat5/server/lib/commons-beanutils.jar
-/usr/share/java/commons-dbcp.jar /usr/share/tomcat5/server/lib/commons-dbcp.jar
-/usr/share/java/commons-digester.jar /usr/share/tomcat5/server/lib/commons-digester.jar
-/usr/share/java/commons-fileupload.jar /usr/share/tomcat5/common/lib/commons-fileupload.jar
-/usr/share/java/commons-logging.jar /usr/share/tomcat5/server/lib/commons-logging.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/mx4j.jar /usr/share/tomcat5/server/lib/mx4j.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/tomcat5/server/lib/catalina-ant.jar /usr/share/ant/lib/catalina-ant.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
Added: branches/tomcat5/tomcat5.5.x/debian/patches/00_disable_sourcechecking_download.patch
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/patches/00_disable_sourcechecking_download.patch 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/patches/00_disable_sourcechecking_download.patch 2006-01-27 17:41:24 UTC (rev 1838)
@@ -0,0 +1,15 @@
+--- build.xml.orig 2006-01-03 16:15:02.000000000 +0100
++++ build.xml 2006-01-11 16:53:17.000000000 +0100
+@@ -42,10 +42,8 @@
+ <property name="tomcat.home"
+ value="${basedir}/${tomcat.project}"/>
+
+- <target name="build" depends="check.source,get.source"
+- description="Builds all components">
+-
+- <ant dir="${tomcat.home}" target="download" />
++ <target name="build" description="Builds all components">
++
+ <ant dir="${tomcat.home}" target="deploy" />
+
+ </target>
Deleted: branches/tomcat5/tomcat5.5.x/debian/patches/00_struts-config-upstream.patch
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/patches/00_struts-config-upstream.patch 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/patches/00_struts-config-upstream.patch 2006-01-27 17:41:24 UTC (rev 1838)
@@ -1,162 +0,0 @@
---- jakarta-tomcat-catalina/webapps/admin/WEB-INF/struts-config.xml.old 2005-03-25 12:28:13.850848904 +0100
-+++ jakarta-tomcat-catalina/webapps/admin/WEB-INF/struts-config.xml 2005-03-25 12:28:24.303259896 +0100
-@@ -1,8 +1,8 @@
- <?xml version="1.0" encoding="ISO-8859-1" ?>
-
- <!DOCTYPE struts-config PUBLIC
-- "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN"
-- "http://struts.apache.org/dtds/struts-config_1_2.dtd">
-+ "-//Apache Software Foundation//DTD Struts Configuration 1.0//EN"
-+ "http://jakarta.apache.org/struts/dtds/struts-config_1_0.dtd">
-
-
- <struts-config>
-@@ -46,6 +46,14 @@
- <form-bean name="aliasesForm"
- type="org.apache.webapp.admin.host.AliasesForm"/>
-
-+ <!-- ============= Logger Module ============= -->
-+
-+ <form-bean name="loggerForm"
-+ type="org.apache.webapp.admin.logger.LoggerForm"/>
-+
-+ <form-bean name="loggersForm"
-+ type="org.apache.webapp.admin.logger.LoggersForm"/>
-+
- <!-- ============= Realm Module ============= -->
-
- <form-bean name="dataSourceRealmForm"
-@@ -75,6 +83,12 @@
- type="org.apache.webapp.admin.context.ContextsForm"/>
-
- <!-- ============= DefaultContext Module ============= -->
-+
-+ <form-bean name="defaultContextForm"
-+ type="org.apache.webapp.admin.defaultcontext.DefaultContextForm"/>
-+
-+ <form-bean name="defaultContextsForm"
-+ type="org.apache.webapp.admin.defaultcontext.DefaultContextsForm"/>
-
- <!-- ============= Connector Module ============= -->
-
-@@ -235,6 +249,15 @@
- path="/host/aliases.jsp"
- redirect="false"/>
-
-+ <!-- ============ Logger Module ============== -->
-+
-+ <forward name="Logger"
-+ path="/logger/logger.jsp"
-+ redirect="false"/>
-+
-+ <forward name="Loggers"
-+ path="/logger/loggers.jsp"
-+ redirect="false"/>
-
- <!-- ============ Context Module ============== -->
-
-@@ -248,6 +271,14 @@
-
- <!-- ============ DefaultContext Module ============== -->
-
-+ <forward name="DefaultContext"
-+ path="/defaultcontext/defaultcontext.jsp"
-+ redirect="false"/>
-+
-+ <forward name="DefaultContexts"
-+ path="/defaultcontext/defaultcontexts.jsp"
-+ redirect="false"/>
-+
- <!-- ============ Connector Module ============== -->
-
- <forward name="Connector"
-@@ -669,6 +700,42 @@
- input="/realm/memoryRealm.jsp"
- scope="session"/>
-
-+ <!-- ============= Logger Module ============== -->
-+
-+ <!-- Set up Add Logger transaction -->
-+ <action path="/AddLogger"
-+ type="org.apache.webapp.admin.logger.AddLoggerAction">
-+ </action>
-+
-+ <!-- Set up Add Logger transaction -->
-+ <action path="/logger/AddLogger"
-+ type="org.apache.webapp.admin.logger.AddLoggerAction">
-+ </action>
-+
-+ <!-- Set up Delete Loggers transaction -->
-+ <action path="/DeleteLogger"
-+ type="org.apache.webapp.admin.logger.DeleteLoggerAction"
-+ name="loggersForm"
-+ scope="request"/>
-+
-+ <!-- Perform Delete Loggers transaction -->
-+ <action path="/DeleteLoggers"
-+ type="org.apache.webapp.admin.logger.DeleteLoggersAction"
-+ name="loggersForm"
-+ scope="request"/>
-+
-+ <!-- Set up Edit Logger transaction -->
-+ <action path="/EditLogger"
-+ type="org.apache.webapp.admin.logger.EditLoggerAction">
-+ </action>
-+
-+ <!-- Perform Save Logger transaction -->
-+ <action path="/SaveLogger"
-+ type="org.apache.webapp.admin.logger.SaveLoggerAction"
-+ name="loggerForm"
-+ input="/logger/logger.jsp"
-+ scope="session"/>
-+
- <!-- ============= Context Module ============== -->
-
- <!-- Set up Add Context transaction -->
-@@ -702,6 +769,35 @@
-
- <!-- ============= DefaultContext Module ============== -->
-
-+ <!-- Set up Add DefaultContext transaction -->
-+ <action path="/AddDefaultContext"
-+ type="org.apache.webapp.admin.defaultcontext.AddDefaultContextAction">
-+ </action>
-+
-+ <!-- Set up Delete DefaultContexts transaction -->
-+ <action path="/DeleteDefaultContext"
-+ type="org.apache.webapp.admin.defaultcontext.DeleteDefaultContextAction"
-+ name="defaultContextsForm"
-+ scope="request"/>
-+
-+ <!-- Perform Delete DefaultContexts transaction -->
-+ <action path="/DeleteDefaultContexts"
-+ type="org.apache.webapp.admin.defaultcontext.DeleteDefaultContextsAction"
-+ name="defaultContextsForm"
-+ scope="request"/>
-+
-+ <!-- Set up Edit DefaultContext transaction -->
-+ <action path="/EditDefaultContext"
-+ type="org.apache.webapp.admin.defaultcontext.EditDefaultContextAction">
-+ </action>
-+
-+ <!-- Perform Save DefaultContext transaction -->
-+ <action path="/SaveDefaultContext"
-+ type="org.apache.webapp.admin.defaultcontext.SaveDefaultContextAction"
-+ name="defaultContextForm"
-+ input="/defaultcontext/defaultcontext.jsp"
-+ scope="session"/>
-+
- <!-- ============= Connector Module ============== -->
-
- <!-- Set up Add Connector transaction -->
-@@ -962,9 +1058,5 @@
-
-
- </action-mappings>
--
-- <controller locale="true" nocache="true" />
--
-- <message-resources parameter="org.apache.webapp.admin.ApplicationResources" />
--
-+
- </struts-config>
Added: branches/tomcat5/tomcat5.5.x/debian/patches/01_fix_doc_stylesheet.patch
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/patches/01_fix_doc_stylesheet.patch 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/patches/01_fix_doc_stylesheet.patch 2006-01-27 17:41:24 UTC (rev 1838)
@@ -0,0 +1,25 @@
+--- container/webapps/docs/tomcat-docs.xsl.orig 2005-09-09 23:27:39.000000000 +0200
++++ container/webapps/docs/tomcat-docs.xsl 2005-09-09 23:28:12.000000000 +0200
+@@ -76,19 +76,19 @@
+ <img src="{$src}" align="left" alt="{$alt}" border="0"/>
+ </a>
+ <xsl:if test="project/logo">
+- <xsl:variable name="alt">
++ <xsl:variable name="alt2">
+ <xsl:value-of select="project/logo"/>
+ </xsl:variable>
+ <xsl:variable name="home">
+ <xsl:value-of select="project/@href"/>
+ </xsl:variable>
+- <xsl:variable name="src">
++ <xsl:variable name="src2">
+ <xsl:value-of select="$relative-path"/><xsl:value-of select="project/logo/@href"/>
+ </xsl:variable>
+
+ <xsl:comment>PROJECT LOGO</xsl:comment>
+ <a href="{$home}">
+- <img src="{$src}" align="right" alt="{$alt}" border="0"/>
++ <img src="{$src2}" align="right" alt="{$alt2}" border="0"/>
+ </a>
+ </xsl:if>
+
Deleted: branches/tomcat5/tomcat5.5.x/debian/patches/01_jasper_dir.unpatch
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/patches/01_jasper_dir.unpatch 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/patches/01_jasper_dir.unpatch 2006-01-27 17:41:24 UTC (rev 1838)
@@ -1,11 +0,0 @@
---- build.xml.orig 2003-10-07 16:03:50.000000000 +0200
-+++ build.xml 2003-10-14 00:12:40.000000000 +0200
-@@ -34,7 +34,7 @@
-
- <!-- Source dependencies -->
- <property name="jasper.home"
-- value="${basedir}/../jakarta-tomcat-jasper/jasper2"/>
-+ value="${basedir}/jasper"/>
- <property name="jtc.home"
- value="${basedir}/../jakarta-tomcat-connectors"/>
-
Added: branches/tomcat5/tomcat5.5.x/debian/patches/02_dont_build_servlet_api_and_jsp_api.patch
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/patches/02_dont_build_servlet_api_and_jsp_api.patch 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/patches/02_dont_build_servlet_api_and_jsp_api.patch 2006-01-27 17:41:24 UTC (rev 1838)
@@ -0,0 +1,49 @@
+--- build/build.xml.orig 2006-01-03 16:15:03.000000000 +0100
++++ build/build.xml 2006-01-11 17:00:22.000000000 +0100
+@@ -95,6 +95,7 @@
+ <mkdir dir="${tomcat.build}/server/lib" />
+ <mkdir dir="${tomcat.build}/common/lib" />
+
++<!--
+ <uptodate property="servletapi.build.notrequired"
+ targetfile="${servlet-api.jar}">
+ <srcfiles dir="${api.home}/jsr154/src" includes="**" />
+@@ -104,6 +105,12 @@
+ targetfile="${jsp-api.jar}">
+ <srcfiles dir="${api.home}/jsr152/src" includes="**" />
+ </uptodate>
++-->
++
++ <property name="servletapi.build.notrequired"
++ value="false"/>
++ <property name="jspapi.build.notrequired"
++ value="false"/>
+
+ <uptodate property="tomcatutil.build.notrequired"
+ targetfile="${tomcat.build}/server/lib/tomcat-util.jar">
+@@ -760,21 +767,20 @@
+ <mkdir dir="${tomcat.build}/server/webapps" />
+
+ <!-- The build files are far too difficult to hack - just build it and copy -->
++<!--
+ <ant dir="${api.home}/jsr154" target="dist">
+ </ant>
+ <ant dir="${api.home}/jsr152" target="dist">
+ </ant>
+-
++-->
+ <mkdir dir="${tomcat.build}/webapps/servlets-examples"/>
+ <copy todir="${tomcat.build}/webapps/servlets-examples">
+- <fileset dir="${api.home}/jsr154/build/examples" includes="**"/>
++ <fileset dir="/usr/share/doc/libservlet2.4-java/examples" includes="examples-servlet.war*"/>
+ </copy>
+
+ <mkdir dir="${tomcat.build}/webapps/jsp-examples"/>
+ <copy todir="${tomcat.build}/webapps/jsp-examples">
+- <fileset dir="${api.home}/jsr152/build/examples">
+- <exclude name="WEB-INF/tagPlugins.xml" />
+- </fileset>
++ <fileset dir="/usr/share/doc/libservlet2.4-java/examples" includes="examples-jsp.war*"/>
+ </copy>
+
+ <ant dir="${catalina.home}/webapps/ROOT" target="build-main">
Deleted: branches/tomcat5/tomcat5.5.x/debian/patches/02_servlet_docs.unpatch
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/patches/02_servlet_docs.unpatch 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/patches/02_servlet_docs.unpatch 2006-01-27 17:41:24 UTC (rev 1838)
@@ -1,15 +0,0 @@
---- build.xml.orig 2003-10-14 00:39:38.000000000 +0200
-+++ build.xml 2003-10-14 00:43:35.000000000 +0200
-@@ -211,10 +211,12 @@
- <copy todir="${tomcat.dist}/webapps/tomcat-docs/jasper/docs/api">
- <fileset dir="${jasper.build}/javadoc" />
- </copy>
-+ <!-- disabled for Debian: the docs are in the libservlet2.3-java package
- <mkdir dir="${tomcat.dist}/webapps/tomcat-docs/servletapi"/>
- <copy todir="${tomcat.dist}/webapps/tomcat-docs/servletapi">
- <fileset dir="${servlet.doc}" />
- </copy>
-+ -->
- </target>
-
-
Deleted: branches/tomcat5/tomcat5.5.x/debian/patches/03_dist_target.unpatch
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/patches/03_dist_target.unpatch 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/patches/03_dist_target.unpatch 2006-01-27 17:41:24 UTC (rev 1838)
@@ -1,11 +0,0 @@
---- build.xml.orig 2003-10-07 16:03:50.000000000 +0200
-+++ build.xml 2003-10-14 00:12:40.000000000 +0200
-@@ -27,7 +27,7 @@
- <property name="nsis.home" value="c:\program files\nsis"/>
- <property name="servlet.home" value="../jakarta-servletapi-4/dist"/>
- <property name="tomcat.build" value="${basedir}/build"/>
-- <property name="tomcat.dist" value="${basedir}/dist"/>
-+ <property name="tomcat.dist" value="${basedir}/../../debian/tmp/usr/share/tomcat4"/>
- <property name="webapps.build" value="${basedir}/webapps/build"/>
- <property name="webapps.dist" value="${basedir}/webapps/dist"/>
-
Added: branches/tomcat5/tomcat5.5.x/debian/patches/03_dont_copy_deployer_howto.patch
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/patches/03_dont_copy_deployer_howto.patch 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/patches/03_dont_copy_deployer_howto.patch 2006-01-27 17:41:24 UTC (rev 1838)
@@ -0,0 +1,14 @@
+--- build/build.xml.orig 2006-01-11 17:00:22.000000000 +0100
++++ build/build.xml 2006-01-11 17:01:48.000000000 +0100
+@@ -1036,9 +1036,10 @@
+ <include name="images/tomcat.gif" />
+ </fileset>
+ </copy>
++<!--
+ <copy tofile="${tomcat.deployer}/docs/manual.html"
+ file="${tomcat.build}/webapps/tomcat-docs/printer/deployer-howto.html" />
+-
++-->
+ </target>
+
+ <!-- ====================== Compat target =================== -->
Added: branches/tomcat5/tomcat5.5.x/debian/patches/04_dont_copy_daemon.patch
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/patches/04_dont_copy_daemon.patch 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/patches/04_dont_copy_daemon.patch 2006-01-27 17:41:24 UTC (rev 1838)
@@ -0,0 +1,14 @@
+--- build/build.xml.orig 2006-01-11 17:01:48.000000000 +0100
++++ build/build.xml 2006-01-11 17:06:15.000000000 +0100
+@@ -158,9 +158,9 @@
+
+ <copy todir="${tomcat.build}/server/lib" file="${commons-modeler.jar}" />
+
+- <copy todir="${tomcat.build}/bin" file="${commons-daemon.jar}" />
++<!-- <copy todir="${tomcat.build}/bin" file="${commons-daemon.jar}" />
+ <copy todir="${tomcat.build}/bin" file="${commons-daemon.jsvc.tar.gz}"
+- failonerror="false" />
++ failonerror="false" />-->
+
+ <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
+ file="${tomcat-native.tar.gz}" />
Deleted: branches/tomcat5/tomcat5.5.x/debian/patches/04_servlet_path.unpatch
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/patches/04_servlet_path.unpatch 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/patches/04_servlet_path.unpatch 2006-01-27 17:41:24 UTC (rev 1838)
@@ -1,11 +0,0 @@
---- catalina/build.xml.orig 2003-10-07 16:03:44.000000000 +0200
-+++ catalina/build.xml 2003-10-14 00:38:02.000000000 +0200
-@@ -760,7 +760,7 @@
- <chmod perm="+x" file="${catalina.build}/bin/tool-wrapper.sh"/>
-
- <!-- Common Extensions -->
-- <copy todir="${catalina.build}/common/lib" file="${servlet.jar}"/>
-+ <copy tofile="${catalina.build}/common/lib/servlet.jar" file="${servlet.jar}"/>
- <copy todir="${catalina.build}/common/lib"
- file="${commons-collections.jar}"/>
-
Deleted: branches/tomcat5/tomcat5.5.x/debian/patches/05_admin_dont_copy_struts.unpatch
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/patches/05_admin_dont_copy_struts.unpatch 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/patches/05_admin_dont_copy_struts.unpatch 2006-01-27 17:41:24 UTC (rev 1838)
@@ -1,12 +0,0 @@
---- webapps/admin/build.xml.orig 2004-06-14 12:21:27.000000000 +0200
-+++ webapps/admin/build.xml 2004-06-14 12:22:30.000000000 +0200
-@@ -157,7 +157,9 @@
-
- <!-- ======================== BUILD: Copy JARs ========================== -->
- <target name="copy-struts.jar" if="struts.present">
-+ <!-- This file is provided by libstruts1.1-java for the Debian package
- <copy todir="${webapps.build}/${webapp.name}/WEB-INF/lib" file="${struts.jar}"/>
-+ -->
- <copy todir="${webapps.build}/${webapp.name}/WEB-INF" file="${struts.lib}/struts-bean.tld"/>
- <copy todir="${webapps.build}/${webapp.name}/WEB-INF" file="${struts.lib}/struts-html.tld"/>
- <copy todir="${webapps.build}/${webapp.name}/WEB-INF" file="${struts.lib}/struts-logic.tld"/>
Added: branches/tomcat5/tomcat5.5.x/debian/patches/05_dont_build_and_fix_webapps.patch
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/patches/05_dont_build_and_fix_webapps.patch 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/patches/05_dont_build_and_fix_webapps.patch 2006-01-27 17:41:24 UTC (rev 1838)
@@ -0,0 +1,13 @@
+--- build/build.xml.orig 2006-01-11 17:06:15.000000000 +0100
++++ build/build.xml 2006-01-11 17:08:07.000000000 +0100
+@@ -830,8 +830,8 @@
+ </ant>
+
+ <!-- Precompiling and fixing webapps -->
+- <antcall target="build-webapps-precompile" />
+- <antcall target="fix-webapps" />
++<!-- <antcall target="build-webapps-precompile" />
++ <antcall target="fix-webapps" />-->
+
+ </target>
+
Added: branches/tomcat5/tomcat5.5.x/debian/patches/06_dont_copy_tomcatnative.patch
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/patches/06_dont_copy_tomcatnative.patch 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/patches/06_dont_copy_tomcatnative.patch 2006-01-27 17:41:24 UTC (rev 1838)
@@ -0,0 +1,13 @@
+--- build/build.xml.orig 2006-01-11 17:08:07.000000000 +0100
++++ build/build.xml 2006-01-11 17:09:30.000000000 +0100
+@@ -162,8 +162,8 @@
+ <copy todir="${tomcat.build}/bin" file="${commons-daemon.jsvc.tar.gz}"
+ failonerror="false" />-->
+
+- <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
+- file="${tomcat-native.tar.gz}" />
++<!-- <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
++ file="${tomcat-native.tar.gz}" />-->
+
+ <!-- <copy todir="${tomcat.build}/common/lib" file="${ant.jar}"/>
+ <copy todir="${tomcat.build}/common/lib" file="${ant-launcher.jar}"/> -->
Added: branches/tomcat5/tomcat5.5.x/debian/patches/07_dont_copy_jasper_jdt_compiler.patch
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/patches/07_dont_copy_jasper_jdt_compiler.patch 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/patches/07_dont_copy_jasper_jdt_compiler.patch 2006-01-27 17:41:24 UTC (rev 1838)
@@ -0,0 +1,11 @@
+--- build/build.xml.orig 2006-01-11 17:09:30.000000000 +0100
++++ build/build.xml 2006-01-11 17:11:31.000000000 +0100
+@@ -167,7 +167,7 @@
+
+ <!-- <copy todir="${tomcat.build}/common/lib" file="${ant.jar}"/>
+ <copy todir="${tomcat.build}/common/lib" file="${ant-launcher.jar}"/> -->
+- <copy todir="${tomcat.build}/common/lib" file="${jasper-compiler-jdt.jar}"/>
++<!-- <copy todir="${tomcat.build}/common/lib" file="${jasper-compiler-jdt.jar}"/> -->
+ </target>
+
+ <!-- ====================== Build all components =================== -->
Added: branches/tomcat5/tomcat5.5.x/debian/patches/07_fix_jasper_directory.patch
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/patches/07_fix_jasper_directory.patch 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/patches/07_fix_jasper_directory.patch 2006-01-27 17:41:24 UTC (rev 1838)
@@ -0,0 +1,11 @@
+--- build.xml.orig 2006-01-03 16:15:02.000000000 +0100
++++ build.xml 2006-01-27 10:07:46.000000000 +0100
+@@ -36,7 +36,7 @@
+ <property name="catalina.home"
+ value="${basedir}/${catalina.project}"/>
+ <property name="jasper.home"
+- value="${basedir}/${jasper.project}"/>
++ value="${basedir}/${jasper.project}/jasper2"/>
+ <property name="jtc.home"
+ value="${basedir}/${jtc.project}"/>
+ <property name="tomcat.home"
Added: branches/tomcat5/tomcat5.5.x/debian/patches/08_dont_copy_tomcatdbcp.patch
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/patches/08_dont_copy_tomcatdbcp.patch 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/patches/08_dont_copy_tomcatdbcp.patch 2006-01-27 17:41:24 UTC (rev 1838)
@@ -0,0 +1,13 @@
+--- container/catalina/build.xml.orig 2005-10-15 21:07:04.000000000 +0200
++++ container/catalina/build.xml 2005-10-15 22:00:46.000000000 +0200
+@@ -557,8 +557,8 @@
+ <!--
+ <copy todir="${catalina.build}/common/lib" file="${servlet-api.jar}"/>
+ -->
+- <copy todir="${catalina.build}/common/lib"
+- file="${tomcat-dbcp.jar}" />
++<!-- <copy todir="${catalina.build}/common/lib"
++ file="${tomcat-dbcp.jar}" />-->
+
+ <!-- Configuration Files -->
+ <copy todir="${catalina.build}/conf">
Added: branches/tomcat5/tomcat5.5.x/debian/patches/08_dont_copy_unusedjars.patch
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/patches/08_dont_copy_unusedjars.patch 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/patches/08_dont_copy_unusedjars.patch 2006-01-27 17:41:24 UTC (rev 1838)
@@ -0,0 +1,13 @@
+--- container/webapps/admin/build.xml.orig 2006-01-03 16:15:13.000000000 +0100
++++ container/webapps/admin/build.xml 2006-01-27 11:18:55.000000000 +0100
+@@ -175,10 +175,6 @@
+
+ <!-- ================ BUILD: Copy Static Files ========================== -->
+ <target name="build-static" depends="flags,flags.display,build-prepare,copy-struts.jar">
+- <copy todir="${webapps.build}/${webapp.name}/WEB-INF/lib" file="${commons-beanutils.jar}"/>
+- <copy tofile="${webapps.build}/${webapp.name}/WEB-INF/lib/commons-collections.jar"
+- file="${commons-collections.jar}"/>
+- <copy todir="${webapps.build}/${webapp.name}/WEB-INF/lib" file="${commons-digester.jar}"/>
+ <copy todir="${webapps.build}/${webapp.name}">
+ <fileset dir=".">
+ <exclude name="build.*"/>
Added: branches/tomcat5/tomcat5.5.x/debian/patches/09_UseSystemDBCP.patch
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/patches/09_UseSystemDBCP.patch 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/patches/09_UseSystemDBCP.patch 2006-01-27 17:41:24 UTC (rev 1838)
@@ -0,0 +1,11 @@
+--- container/catalina/src/share/org/apache/naming/factory/Constants.java.orig 2006-01-03 16:15:11.000000000 +0100
++++ container/catalina/src/share/org/apache/naming/factory/Constants.java 2006-01-27 11:04:59.000000000 +0100
+@@ -42,7 +42,7 @@
+ Package + ".EjbFactory";
+
+ public static final String DBCP_DATASOURCE_FACTORY =
+- "org.apache.tomcat.dbcp.dbcp.BasicDataSourceFactory";
++ "org.apache.commons.dbcp.BasicDataSourceFactory";
+
+ public static final String OPENEJB_EJB_FACTORY =
+ Package + ".OpenEjbFactory";
Added: branches/tomcat5/tomcat5.5.x/debian/patches/10_JSSEImplementation_RemoveJDK13Support.patch
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/patches/10_JSSEImplementation_RemoveJDK13Support.patch 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/patches/10_JSSEImplementation_RemoveJDK13Support.patch 2006-01-27 17:41:24 UTC (rev 1838)
@@ -0,0 +1,24 @@
+--- connectors/util/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java.orig 2005-10-15 14:43:19.000000000 +0200
++++ connectors/util/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java 2005-10-15 14:45:54.000000000 +0200
+@@ -36,8 +36,8 @@
+ "org.apache.tomcat.util.net.jsse.JSSE15Factory";
+ static final String JSSE14Factory =
+ "org.apache.tomcat.util.net.jsse.JSSE14Factory";
+- static final String JSSE13Factory =
+- "org.apache.tomcat.util.net.jsse.JSSE13Support";
++// static final String JSSE13Factory =
++// "org.apache.tomcat.util.net.jsse.JSSE13Support";
+ static final String SSLSocketClass = "javax.net.ssl.SSLSocket";
+
+ static org.apache.commons.logging.Log logger =
+@@ -67,7 +67,9 @@
+ }
+ }
+ } if(factory == null) {
+- factory = new JSSE13Factory();
++ if(logger.isDebugEnabled()) {
++ logger.debug("Error getting JDK 14/15 factory - JDK 1.3 is not supported by Debian package !");
++ }
+ }
+ }
+
Added: branches/tomcat5/tomcat5.5.x/debian/patches/11_BuildXml_ExcludeJDK13Support.patch
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/patches/11_BuildXml_ExcludeJDK13Support.patch 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/patches/11_BuildXml_ExcludeJDK13Support.patch 2006-01-27 17:41:24 UTC (rev 1838)
@@ -0,0 +1,10 @@
+--- connectors/util/build.xml.orig 2005-09-23 15:45:23.000000000 +0200
++++ connectors/util/build.xml 2005-10-15 14:40:17.000000000 +0200
+@@ -74,6 +74,7 @@
+ verbose="off"
+ excludes="**/CVS/**">
+ <classpath refid="compile.classpath"/>
++ <exclude name="**/util/net/jsse/JSSE13*" />
+ <exclude name="**/util/net/jsse/*" unless="jsse.present"/>
+ <exclude name="**/util/log/CommonLogHandler.java" unless="commons-logging.present"/>
+ <exclude name="**/util/net/puretls/*" unless="puretls.present"/>
Added: branches/tomcat5/tomcat5.5.x/debian/patches/20_NoDocu_WebappsManager.patch
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/patches/20_NoDocu_WebappsManager.patch 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/patches/20_NoDocu_WebappsManager.patch 2006-01-27 17:41:24 UTC (rev 1838)
@@ -0,0 +1,20 @@
+--- container/webapps/manager/build.xml.orig 2005-09-23 15:45:19.000000000 +0200
++++ container/webapps/manager/build.xml 2005-10-15 14:51:37.000000000 +0200
+@@ -61,7 +61,7 @@
+ <target name="build-main" depends="build-static">
+
+ <!-- Top Level Directory -->
+- <style basedir="../docs"
++<!-- <style basedir="../docs"
+ destdir="${webapps.build}/${webapp.name}"
+ extension=".html"
+ style="tomcat-docs.xsl"
+@@ -71,7 +71,7 @@
+ <param name="project-menu" expression="nomenu"/>
+ <param name="standalone" expression="standalone"/>
+ </style>
+-
++-->
+ <!-- Images Subdirectory -->
+ <copy todir="${webapps.build}/${webapp.name}/images">
+ <fileset dir="../docs/images">
Added: branches/tomcat5/tomcat5.5.x/debian/patches/21_NoDocu_WebappsHostManager.patch
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/patches/21_NoDocu_WebappsHostManager.patch 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/patches/21_NoDocu_WebappsHostManager.patch 2006-01-27 17:41:24 UTC (rev 1838)
@@ -0,0 +1,20 @@
+--- container/webapps/host-manager//build.xml.orig 2005-09-23 15:45:19.000000000 +0200
++++ container/webapps/host-manager/build.xml 2005-10-15 14:53:26.000000000 +0200
+@@ -58,7 +58,7 @@
+ <target name="build-main" depends="build-static">
+
+ <!-- Top Level Directory -->
+- <style basedir="../docs"
++<!-- <style basedir="../docs"
+ destdir="${webapps.build}/${webapp.name}"
+ extension=".html"
+ style="tomcat-docs.xsl"
+@@ -68,7 +68,7 @@
+ <param name="project-menu" expression="nomenu"/>
+ <param name="standalone" expression="standalone"/>
+ </style>
+-
++-->
+ <!-- Images Subdirectory -->
+ <copy todir="${webapps.build}/${webapp.name}/images">
+ <fileset dir="../docs/images">
Added: branches/tomcat5/tomcat5.5.x/debian/patches/22_NoDocu_WebappsDocs.patch
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/patches/22_NoDocu_WebappsDocs.patch 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/patches/22_NoDocu_WebappsDocs.patch 2006-01-27 17:41:24 UTC (rev 1838)
@@ -0,0 +1,96 @@
+--- container/webapps/docs/build.xml.orig 2005-10-15 14:57:26.000000000 +0200
++++ container/webapps/docs/build.xml 2005-10-15 14:56:58.000000000 +0200
+@@ -76,6 +76,7 @@
+ <include name="RUNNING.txt"/>
+ </fileset>
+ </copy>
++<!--
+ <style basedir="."
+ destdir="${webapps.build}/${webapp.name}/printer"
+ extension=".html"
+@@ -85,7 +86,7 @@
+ <param name="relative-path" expression="./.."/>
+ <param name="project-menu" expression="nomenu"/>
+ </style>
+-
++-->
+ <!-- WEB-INF Subdirectory -->
+ <mkdir dir="${webapps.build}/${webapp.name}/WEB-INF"/>
+ <copy todir="${webapps.build}/${webapp.name}/WEB-INF">
+@@ -99,6 +100,7 @@
+ <target name="build-main" depends="build-static">
+
+ <!-- Top Level Directory -->
++<!--
+ <style basedir="."
+ destdir="${webapps.build}/${webapp.name}"
+ extension=".html"
+@@ -107,8 +109,9 @@
+ includes="*.xml">
+ <param name="relative-path" expression="."/>
+ </style>
+-
++-->
+ <!-- Application Developer's Guide -->
++<!--
+ <style basedir="appdev"
+ destdir="${webapps.build}/${webapp.name}/appdev"
+ extension=".html"
+@@ -117,11 +120,13 @@
+ includes="*.xml">
+ <param name="relative-path" expression=".."/>
+ </style>
++-->
+ <mkdir dir="${webapps.build}/${webapp.name}/appdev/printer"/>
+ <!-- Application Developer's Guide Examples -->
+ <copy todir="${webapps.build}/${webapp.name}/appdev/printer">
+ <fileset dir="appdev" includes="*.txt"/>
+ </copy>
++<!--
+ <style basedir="appdev"
+ destdir="${webapps.build}/${webapp.name}/appdev/printer"
+ extension=".html"
+@@ -131,10 +136,11 @@
+ <param name="relative-path" expression="../.."/>
+ <param name="project-menu" expression="nomenu"/>
+ </style>
+-
++-->
+ <!-- Catalina Functional Specifications -->
+ <mkdir dir="${webapps.build}/${webapp.name}/catalina"/>
+ <mkdir dir="${webapps.build}/${webapp.name}/catalina/funcspecs"/>
++<!--
+ <style basedir="funcspecs"
+ destdir="${webapps.build}/${webapp.name}/catalina/funcspecs"
+ extension=".html"
+@@ -153,8 +159,9 @@
+ <param name="relative-path" expression="../../.."/>
+ <param name="project-menu" expression="nomenu"/>
+ </style>
+-
++-->
+ <!-- Server Configuration Reference -->
++<!--
+ <style basedir="config"
+ destdir="${webapps.build}/${webapp.name}/config"
+ extension=".html"
+@@ -173,8 +180,9 @@
+ <param name="relative-path" expression="../.."/>
+ <param name="project-menu" expression="nomenu"/>
+ </style>
+-
++-->
+ <!-- Server Architecture -->
++<!--
+ <style basedir="architecture"
+ destdir="${webapps.build}/${webapp.name}/architecture"
+ extension=".html"
+@@ -193,7 +201,7 @@
+ <param name="relative-path" expression="../.."/>
+ <param name="project-menu" expression="nomenu"/>
+ </style>
+-
++-->
+ </target>
+
+
Deleted: branches/tomcat5/tomcat5.5.x/debian/patches/top_build_clean_target.patch.applyed_before_building
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/patches/top_build_clean_target.patch.applyed_before_building 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/patches/top_build_clean_target.patch.applyed_before_building 2006-01-27 17:41:24 UTC (rev 1838)
@@ -1,14 +0,0 @@
---- build.xml 2004-11-24 17:54:57.000000000 +0100
-+++ build.xml.new 2005-03-25 11:57:34.452479960 +0100
-@@ -51,6 +51,11 @@
-
- </target>
-
-+ <target name="clean"
-+ description="Clean all components">
-+ <ant dir="${tomcat.home}" target="clean" />
-+ </target>
-+
- <target name="checkout"
- description="Update or checkout required sources from CVS">
-
Modified: branches/tomcat5/tomcat5.5.x/debian/policy/02debian.policy
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/policy/02debian.policy 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/policy/02debian.policy 2006-01-27 17:41:24 UTC (rev 1838)
@@ -2,17 +2,7 @@
grant codeBase "file:/usr/share/java/-" {
permission java.security.AllPermission;
};
-grant codeBase "file:/usr/share/ant1.6/lib/-" {
+grant codeBase "file:/usr/share/ant/lib/-" {
permission java.security.AllPermission;
};
-// These permissions apply the j2sdk1.3 package - it sets java.home to
-// "/usr/lib/j2re1.3" instead of "/usr/lib/j2sdk1.3"
-grant codeBase "file:/usr/lib/j2sdk1.3/lib/-" {
- permission java.security.AllPermission;
-};
-
-grant codeBase "file:/usr/lib/j2sdk1.3/lib/ext/-" {
- permission java.security.AllPermission;
-};
-
Modified: branches/tomcat5/tomcat5.5.x/debian/policy/03catalina.policy
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/policy/03catalina.policy 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/policy/03catalina.policy 2006-01-27 17:41:24 UTC (rev 1838)
@@ -1,10 +1,25 @@
// ========== CATALINA CODE PERMISSIONS =======================================
+// These permissions apply to the commons-logging API
+grant codeBase "file:${catalina.home}/bin/commons-logging-api.jar" {
+ permission java.security.AllPermission;
+};
+
// These permissions apply to the server startup code
grant codeBase "file:${catalina.home}/bin/bootstrap.jar" {
- permission java.security.AllPermission;
+ permission java.security.AllPermission;
};
+// These permissions apply to the JMX server
+grant codeBase "file:${catalina.home}/bin/jmx.jar" {
+ permission java.security.AllPermission;
+};
+
+// These permissions apply to the JMX server
+grant codeBase "file:${catalina.home}/bin/tomcat-juli.jar" {
+ permission java.security.AllPermission;
+};
+
// These permissions apply to the servlet API classes
// and those that are shared across all class loaders
// located in the "common" directory
@@ -17,14 +32,3 @@
grant codeBase "file:${catalina.home}/server/-" {
permission java.security.AllPermission;
};
-
-// These permissions apply to the jasper page compiler.
-grant codeBase "file:${catalina.home}/shared/lib/jasper-compiler.jar" {
- permission java.security.AllPermission;
-};
-
-// These permissions apply to the jasper JSP runtime
-grant codeBase "file:${catalina.home}/shared/lib/jasper-runtime.jar" {
- permission java.security.AllPermission;
-};
-
Modified: branches/tomcat5/tomcat5.5.x/debian/policy/04webapps.policy
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/policy/04webapps.policy 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/policy/04webapps.policy 2006-01-27 17:41:24 UTC (rev 1838)
@@ -55,3 +55,9 @@
// Allow read of JAXP compliant XML parser debug
permission java.util.PropertyPermission "jaxp.debug", "read";
};
+
+// The permissions granted to the balancer WEB-INF/classes directory
+grant codeBase "file:${catalina.home}/webapps/balancer/WEB-INF/classes/-" {
+ permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat.util.digester";
+ permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat.util.digester.*";
+};
Modified: branches/tomcat5/tomcat5.5.x/debian/policy/10admin.policy
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/policy/10admin.policy 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/policy/10admin.policy 2006-01-27 17:41:24 UTC (rev 1838)
@@ -7,7 +7,7 @@
permission java.security.AllPermission;
};
-grant codeBase "file:/usr/share/struts1.1/struts.jar" {
+grant codeBase "file:/usr/share/struts1.2/struts.jar" {
permission java.security.AllPermission;
};
Modified: branches/tomcat5/tomcat5.5.x/debian/rules
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/rules 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/rules 2006-01-27 17:41:24 UTC (rev 1838)
@@ -2,50 +2,54 @@
# debian/rules file for tomcat5 (uses cdbs)
UPSTREAM_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' | cut -f1 -d-)
-TOMCAT_SRCDIR := jakarta-tomcat-5
-CATALINA_SRCDIR := jakarta-tomcat-catalina
-CONNECTORS_SRCDIR := jakarta-tomcat-connectors
-JASPAER_SRCDIR := jakarta-tomcat-jasper
+TOMCAT_SRCDIR := build
+TOMCAT_BUILD := build/build
+CATALINA_SRCDIR := container
+CONNECTORS_SRCDIR := connectors
+JASPAER_SRCDIR := jasper
include /usr/share/cdbs/1/rules/debhelper.mk
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/ant1.6
+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
+DEB_ANT_CLEAN_TARGET := xxx
# Examples and documentation for the tomcat5 package
-DEB_INSTALL_DOCS_tomcat5 := $(DEB_SRCDIR)/README.txt $(DEB_SRCDIR)/RELEASE-NOTES-*.txt $(DEB_SRCDIR)/RUNNING.txt
-DEB_INSTALL_EXAMPLES_tomcat5 := $(DEB_SRCDIR)/build/conf/server.xml $(DEB_SRCDIR)/build/conf/web.xml
+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
-# ln -s $(CONNECTORS_SRCDIR) $(_cdbs_tarball_dir)/jakarta-tomcat-connectors
+pre-build::
+ -rm -r connectors/util/java/org/apache/tomcat/util/net/puretls/
clean::
- -rm jakarta-commons/daemon/target/commons-daemon.jar
+ -rm -r build/build
+ -rm -r build/compat
+ -rm -r build/deployer
+ -rm connectors/jk/jkstatus/dist/tomcat-jkstatus-ant.jar
+ -rm -f LICENSE
+
+install/tomcat5-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
+ cd $(TOMCAT_BUILD)/webapps/tomcat-docs && find . -name '*.xml' -exec rm -f {} \;
+ 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
+
+ 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
Modified: branches/tomcat5/tomcat5.5.x/debian/server.xml
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/server.xml 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/server.xml 2006-01-27 17:41:24 UTC (rev 1838)
@@ -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,41 +99,13 @@
<!-- 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"/>
+ 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>
-
</Host>
</Engine>
</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>
Modified: branches/tomcat5/tomcat5.5.x/debian/tomcat5-admin.install
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/tomcat5-admin.install 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/tomcat5-admin.install 2006-01-27 17:41:24 UTC (rev 1838)
@@ -1,6 +1,7 @@
-debian/webapps/admin.xml /var/lib/tomcat5/webapps/
-debian/webapps/manager.xml /var/lib/tomcat5/webapps/
-debian/policy/10admin.policy /etc/tomcat5/policy.d/
-debian/tmp/usr/share/tomcat5/server/webapps/admin
-debian/tmp/usr/share/tomcat5/server/webapps/manager
-
+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/
Modified: branches/tomcat5/tomcat5.5.x/debian/tomcat5-admin.links
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/tomcat5-admin.links 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/tomcat5-admin.links 2006-01-27 17:41:24 UTC (rev 1838)
@@ -1,2 +1,6 @@
-/usr/share/struts1.2/struts.jar /usr/share/tomcat5/server/webapps/admin/WEB-INF/lib/struts.jar
+/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
Modified: branches/tomcat5/tomcat5.5.x/debian/tomcat5-webapps.install
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/tomcat5-webapps.install 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/tomcat5-webapps.install 2006-01-27 17:41:24 UTC (rev 1838)
@@ -1,6 +1,11 @@
-debian/tmp/usr/share/tomcat5/webapps/ROOT /var/lib/tomcat5/webapps/
-debian/tmp/usr/share/tomcat5/webapps/examples /usr/share/tomcat5/server/webapps
-debian/tmp/usr/share/tomcat5/webapps/tomcat-docs /var/lib/tomcat5/webapps/
-debian/tmp/usr/share/tomcat5/webapps/webdav /var/lib/tomcat5/webapps/
-debian/webapps/examples.xml /var/lib/tomcat5/webapps/
+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
Modified: branches/tomcat5/tomcat5.5.x/debian/tomcat5-webapps.links
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/tomcat5-webapps.links 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/tomcat5-webapps.links 2006-01-27 17:41:24 UTC (rev 1838)
@@ -1 +1,2 @@
-/usr/share/doc/libservlet2.4-java/api /var/lib/tomcat5/webapps/tomcat-docs/servletapi
+/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
Modified: branches/tomcat5/tomcat5.5.x/debian/tomcat5.default
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/tomcat5.default 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/tomcat5.default 2006-01-27 17:41:24 UTC (rev 1838)
@@ -3,14 +3,10 @@
#TOMCAT5_USER=tomcat5
# The home directory of the Java development kit (JDK). You need at least
-# JDK version 1.2, just the Java runtime environment (JRE) will not work
-# because a Java compiler is needed to translate JavaServer Pages (JSP).
-# If JAVA_HOME is not set, some common directories for the j2sdk1.4 and
-# j2sdk1.3 Debian packages from Blackdown are tried. You can also set
-# JSSE_HOME here to enable SSL support (this is automatically done for
-# JDK 1.4+).
-#JAVA_HOME=/usr/local/j2sdk1.4.0
-#JSSE_HOME=/usr/local/jsse
+# 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.
@@ -35,4 +31,3 @@
# Number of days to keep old log files in /var/log/tomcat5 (default: 14)
#LOGFILE_DAYS=30
-
Modified: branches/tomcat5/tomcat5.5.x/debian/tomcat5.dirs
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/tomcat5.dirs 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/tomcat5.dirs 2006-01-27 17:41:24 UTC (rev 1838)
@@ -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
Modified: branches/tomcat5/tomcat5.5.x/debian/tomcat5.init
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/tomcat5.init 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/tomcat5.init 2006-01-27 17:41:24 UTC (rev 1838)
@@ -20,7 +20,7 @@
# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not
# defined in $DEFAULT)
-JDK_DIRS="/usr/lib/j2se/1.4 /usr/lib/j2sdk1.4 /usr/lib/j2se/1.3 /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/jvm/java-gcj /usr/lib/kaffe"
# Directory for per-instance configuration files and webapps
CATALINA_BASE=/var/lib/tomcat5
@@ -54,7 +54,12 @@
# 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="$jdir"
+ 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
@@ -67,10 +72,7 @@
CATALINA_OPTS="-Djava.awt.headless=true -Xmx128M"
fi
-# Set the JSP compiler to if we are using Kaffe and it is not set
-if [ -z "$JSP_COMPILER" -a "$JAVA_HOME" = "/usr/lib/kaffe" ]; then
- JSP_COMPILER=kjc
-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
Modified: branches/tomcat5/tomcat5.5.x/debian/tomcat5.install
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/tomcat5.install 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/tomcat5.install 2006-01-27 17:41:24 UTC (rev 1838)
@@ -1,9 +1,7 @@
-debian/tmp/usr/share/tomcat5/bin/*.sh
-debian/tmp/usr/share/tomcat5/conf/tomcat-users.xml /usr/share/tomcat5/.debian/
-build-tree/jakarta-tomcat/webapps/build/ROOT/WEB-INF/web.xml /usr/share/tomcat5/.debian/
-build-tree/jakarta-tomcat-connectors/jk/conf/jk2.properties /usr/share/tomcat5/.debian/
-debian/tmp/usr/share/tomcat5/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/
-
+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/
Modified: branches/tomcat5/tomcat5.5.x/debian/tomcat5.postinst
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/tomcat5.postinst 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/tomcat5.postinst 2006-01-27 17:41:24 UTC (rev 1838)
@@ -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
Modified: branches/tomcat5/tomcat5.5.x/debian/watch
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/watch 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/watch 2006-01-27 17:41:24 UTC (rev 1838)
@@ -1,2 +1,2 @@
version=3
-http://www.apache.org/dist/jakarta/tomcat-5/v(5\.0\.\d*)/src/jakarta-tomcat-$1-src\.tar\.gz debian uupdate
+http://www.apache.org/dist/jakarta/tomcat-5/v(5\.5\.\d*)/src/jakarta-tomcat-$1-src\.tar\.gz debian uupdate
Added: branches/tomcat5/tomcat5.5.x/debian/webapps/balancer.xml
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/webapps/balancer.xml 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/webapps/balancer.xml 2006-01-27 17:41:24 UTC (rev 1838)
@@ -0,0 +1,7 @@
+<!--
+ Context configuration file for the Tomcat Balancer Web App
+-->
+
+<Context path="/balancer" docBase="/usr/share/tomcat5/webapps/balancer"
+ debug="0" privileged="true" allowLinking="true">
+</Context>
Deleted: branches/tomcat5/tomcat5.5.x/debian/webapps/examples.xml
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/webapps/examples.xml 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/webapps/examples.xml 2006-01-27 17:41:24 UTC (rev 1838)
@@ -1,38 +0,0 @@
-<!--
- Context configuration file for the Tomcat Examples Web App
--->
-
-<Context path="/examples" docBase="/usr/share/tomcat5/server/webapps/examples"
- debug="0" reloadable="false" crossContext="true" privileged="false">
-
- <Ejb name="ejb/EmplRecord" type="Entity"
- home="com.wombat.empl.EmployeeRecordHome"
- remote="com.wombat.empl.EmployeeRecord"/>
-
- <Environment name="maxExemptions" type="java.lang.Integer" value="15"/>
-
- <Parameter name="context.param.name" value="context.param.value"
- override="false"/>
-
- <Resource name="jdbc/EmployeeAppDb" auth="SERVLET"
- type="javax.sql.DataSource"/>
- <ResourceParams name="jdbc/EmployeeAppDb">
- <parameter><name>user</name><value>sa</value></parameter>
- <parameter><name>password</name><value></value></parameter>
- <parameter><name>driverClassName</name>
- <value>org.hsql.jdbcDriver</value></parameter>
- <parameter><name>url</name>
- <value>jdbc:HypersonicSQL:database</value></parameter>
- </ResourceParams>
-
- <Resource name="mail/Session" auth="Container"
- type="javax.mail.Session"/>
- <ResourceParams name="mail/Session">
- <parameter><name>mail.smtp.host</name>
- <value>localhost</value></parameter>
- </ResourceParams>
-
- <ResourceLink name="linkToGlobalResource" global="simpleValue"
- type="java.lang.Integer"/>
-
-</Context>
Added: branches/tomcat5/tomcat5.5.x/debian/webapps/host-manager.xml
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/webapps/host-manager.xml 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/webapps/host-manager.xml 2006-01-27 17:41:24 UTC (rev 1838)
@@ -0,0 +1,8 @@
+<!--
+ Context configuration file for the Tomcat Host Manager Web App
+-->
+
+<Context path="/host-manager" docBase="/usr/share/tomcat5/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-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/webapps/manager.xml 2006-01-27 17:41:24 UTC (rev 1838)
@@ -2,7 +2,6 @@
Context configuration file for the Tomcat Manager Web App
-->
-
<Context path="/manager" docBase="/usr/share/tomcat5/server/webapps/manager"
debug="0" privileged="true">
Added: branches/tomcat5/tomcat5.5.x/debian/webapps/tomcat-docs.xml
===================================================================
--- branches/tomcat5/tomcat5.5.x/debian/webapps/tomcat-docs.xml 2006-01-26 22:12:38 UTC (rev 1837)
+++ branches/tomcat5/tomcat5.5.x/debian/webapps/tomcat-docs.xml 2006-01-27 17:41:24 UTC (rev 1838)
@@ -0,0 +1,8 @@
+<!--
+ Context configuration file for the Tomcat Documentation
+ Needed to allow linking to the JSP/Servlet API documentations
+-->
+
+<Context path="/tomcat-docs" docBase="/usr/share/tomcat5/webapps/tomcat-docs"
+ debug="0" privileged="false" allowLinking="true">
+</Context>
More information about the pkg-java-commits
mailing list