--- tomcat6-6.0.16.orig/debian/patches/90-build.xml.nodownload.patch +++ tomcat6-6.0.16/debian/patches/90-build.xml.nodownload.patch @@ -0,0 +1,30 @@ +diff -Nur tomcat6-6.0.16/build.xml tomcat6-6.0.16.new/build.xml +--- tomcat6-6.0.16/build.xml 2008-02-28 13:32:22.000000000 +0100 ++++ tomcat6-6.0.16.new/build.xml 2008-02-28 13:33:25.000000000 +0100 +@@ -468,11 +468,15 @@ + + + ++ + ++ + + + +@@ -599,8 +603,10 @@ + + + ++ + + + --- tomcat6-6.0.16.orig/debian/watch +++ tomcat6-6.0.16/debian/watch @@ -0,0 +1,3 @@ +version=3 +# http://www.apache.org/dist/tomcat/tomcat-6/v6.0.16/src/apache-tomcat-6.0.16-src.tar.gz +http://www.apache.org/dist/tomcat/tomcat-6/v([\d\.]+)/src/apache-tomcat-([\d\.]+)-src\.tar\.gz --- tomcat6-6.0.16.orig/debian/libtomcat6-java.links +++ tomcat6-6.0.16/debian/libtomcat6-java.links @@ -0,0 +1,14 @@ +/usr/share/tomcat6/bin/bootstrap.jar /usr/share/java/bootstrap.jar +/usr/share/tomcat6/bin/tomcat-juli.jar /usr/share/java/tomcat-juli.jar +/usr/share/tomcat6/lib/tomcat-i18n-ja.jar /usr/share/java/tomcat-i18n-ja.jar +/usr/share/tomcat6/lib/catalina.jar /usr/share/java/catalina.jar +/usr/share/tomcat6/lib/annotations-api.jar /usr/share/java/annotations-api.jar +/usr/share/tomcat6/lib/catalina-tribes.jar /usr/share/java/catalina-tribes.jar +/usr/share/tomcat6/lib/el-api.jar /usr/share/java/el-api.jar +/usr/share/tomcat6/lib/jasper-el.jar /usr/share/java/jasper-el.jar +/usr/share/tomcat6/lib/tomcat-coyote.jar /usr/share/java/tomcat-coyote.jar +/usr/share/tomcat6/lib/tomcat-i18n-fr.jar /usr/share/java/tomcat-i18n-fr.jar +/usr/share/tomcat6/lib/catalina-ha.jar /usr/share/java/catalina-ha.jar +/usr/share/tomcat6/lib/tomcat-i18n-es.jar /usr/share/java/tomcat-i18n-es.jar +/usr/share/tomcat6/lib/jasper.jar /usr/share/java/jasper.jar +/usr/share/tomcat6/lib/catalina-ant.jar /usr/share/java/catalina-ant.jar --- tomcat6-6.0.16.orig/debian/tomcat6-manager.install +++ tomcat6-6.0.16/debian/tomcat6-manager.install @@ -0,0 +1,2 @@ +output/build/webapps/manager/* /var/www/tomcat6/manager +debian/etc/tomcat6/Catalina/localhost/tomcat6#manager.xml /etc/tomcat6/Catalina/localhost/ --- tomcat6-6.0.16.orig/debian/tomcat6-doc.links +++ tomcat6-6.0.16/debian/tomcat6-doc.links @@ -0,0 +1,2 @@ +/usr/share/doc/tomcat6 /var/www/tomcat6/docs +/usr/share/doc/tomcat6 /usr/share/tomcat6/doc --- tomcat6-6.0.16.orig/debian/libservlet2.5-java-doc.links +++ tomcat6-6.0.16/debian/libservlet2.5-java-doc.links @@ -0,0 +1 @@ +/dev/null /usr/share/doc/libservlet2.5-java-doc/TODOEXTRACTJAVADOC --- tomcat6-6.0.16.orig/debian/tomcat6.install +++ tomcat6-6.0.16/debian/tomcat6.install @@ -0,0 +1,24 @@ +output/build/bin/shutdown.sh /usr/share/tomcat6/bin/ +output/build/bin/version.sh /usr/share/tomcat6/bin/ +output/build/bin/catalina-tasks.xml /usr/share/tomcat6/bin/ +output/build/bin/tool-wrapper.sh /usr/share/tomcat6/bin/ +output/build/bin/setclasspath.sh /usr/share/tomcat6/bin/ +output/build/bin/catalina.sh /usr/share/tomcat6/bin/ +output/build/bin/digest.sh /usr/share/tomcat6/bin/ +output/build/bin/startup.sh /usr/share/tomcat6/bin/ +output/build/conf/logging.properties /etc/tomcat6/ +output/build/conf/web.xml /etc/tomcat6/ +output/build/conf/tomcat-users.xml /etc/tomcat6/ +output/build/conf/context.xml /etc/tomcat6/ +output/build/conf/catalina.policy /etc/tomcat6/ +output/build/conf/server.xml /etc/tomcat6/ +output/build/conf/catalina.properties /etc/tomcat6/ +debian/etc/tomcat6/policy.d/01system.policy /etc/tomcat6/policy.d/ +debian/etc/tomcat6/policy.d/02debian.policy /etc/tomcat6/policy.d/ +debian/etc/tomcat6/policy.d/04webapps.policy /etc/tomcat6/policy.d/ +debian/etc/tomcat6/policy.d/03catalina.policy /etc/tomcat6/policy.d/ +debian/etc/tomcat6/policy.d/10admin.policy /etc/tomcat6/policy.d/ +debian/etc/tomcat6/policy.d/50user.policy /etc/tomcat6/policy.d/ +output/build/webapps/ROOT/* /var/www/tomcat6 +debian/etc/tomcat6/Catalina/localhost/ROOT.xml /etc/tomcat6/Catalina/localhost/ +debian/etc/tomcat6/Catalina/localhost/tomcat6.xml /etc/tomcat6/Catalina/localhost/ --- tomcat6-6.0.16.orig/debian/tomcat6.links +++ tomcat6-6.0.16/debian/tomcat6.links @@ -0,0 +1,6 @@ +/etc/tomcat6 /usr/share/tomcat6/conf +/var/log/tomcat6 /usr/share/tomcat6/logs +/var/cache/tomcat6 /usr/share/tomcat6/work +/tmp /usr/share/tomcat6/temp +/var/www /usr/share/tomcat6/webapps +/usr/share/java/ecj.jar /usr/share/tomcat6/lib/jasper-jdt.jar --- tomcat6-6.0.16.orig/debian/copyright +++ tomcat6-6.0.16/debian/copyright @@ -0,0 +1,213 @@ +This package was debianized by Loris-Guillaume Minoia on +Wed, 27 Feb 2008 00:49:04 +0100. + +It was downloaded from + +License: + +The modifications and packaging for Debian and Debian are Copyright +(C) 2005 Arnaud Vandyck, Copyright (C) 2006 Marcus Better, Copyright +(C) 2008 Loris-Guillaume Minoia, and are released under the same +license as Tomcat itself. + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. --- tomcat6-6.0.16.orig/debian/README.Debian +++ tomcat6-6.0.16/debian/README.Debian @@ -0,0 +1,6 @@ +tomcat6 for Debian +------------------ + + + + -- Loris-Guillaume Minoia Wed, 27 Feb 2008 00:49:04 +0100 --- tomcat6-6.0.16.orig/debian/tomcat6.init +++ tomcat6-6.0.16/debian/tomcat6.init @@ -0,0 +1,217 @@ +#!/bin/sh +# +# /etc/init.d/tomcat6 -- startup script for the Tomcat 6 servlet engine +# +# Written by Miquel van Smoorenburg . +# Modified for Debian GNU/Linux by Ian Murdock . +# Modified for Tomcat by Stefan Gybas . +# Modified for Tomcat6 by Loris-Guillaume Minoia . +# - Update from tomcat5.5 to tomcat6 +# - Changed tomcat user to www-data +# - Putting temp files in $CATALINA_BASE/temp/$NAME to be able to link to /tmp +# +### BEGIN INIT INFO +# Provides: tomcat +# Required-Start: $local_fs $remote_fs $network +# Required-Stop: $local_fs $remote_fs $network +# Should-Start: $named +# Should-Stop: $named +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Start Tomcat. +# Description: Start the Tomcat servlet engine. +### END INIT INFO + +set -e + +PATH=/bin:/usr/bin:/sbin:/usr/sbin +NAME=tomcat6 +DESC="Tomcat servlet engine" +DAEMON=/usr/bin/jsvc +CATALINA_HOME=/usr/share/$NAME +DEFAULT=/etc/default/$NAME + +. /lib/lsb/init-functions +. /etc/default/rcS + +# The following variables can be overwritten in $DEFAULT + +# Run Tomcat 6 as this user ID +TOMCAT6_USER=www-data + +# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not +# defined in $DEFAULT) +JDK_DIRS="/usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.5-ibm /usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-blackdown /usr/lib/j2se/1.4 /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.3-sun /usr/lib/j2sdk1.3-blackdown /usr/lib/jvm/java-gcj /usr/lib/kaffe" + +# Look for the right JVM to use +for jdir in $JDK_DIRS; do + if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then + JAVA_HOME_TMP="$jdir" + # checks for a real JDK like environment, needed to check if + # really the java-gcj-compat-dev package is installed + if [ -r "$jdir/bin/jdb" ]; then + JAVA_HOME="$JAVA_HOME_TMP" + fi + fi +done +export JAVA_HOME + +# Directory for per-instance configuration files and webapps +CATALINA_BASE=/usr/share/$NAME + +# Use the Java security manager? (yes/no) +TOMCAT6_SECURITY=yes + +# Timeout in seconds for the shutdown of all webapps +TOMCAT6_SHUTDOWN=30 + +# End of variables that can be overwritten in $DEFAULT + +# overwrite settings from default file +if [ -f "$DEFAULT" ]; then + . "$DEFAULT" +fi + +test -f $DAEMON || exit 0 + +[ -z "$TOMCAT6_USER" ] && TOMCAT6_USER=www-data + +# Check if we use gij +gij=no +"$JAVA_HOME/bin/java" -version 2>&1 | grep -q "^gij (GNU libgcj)" && gij=yes + +# gij doesn't support a security manager yet (see bug #399595) +if [ "$gij" = "yes" ]; then + echo -e "The java-gcj-compat-dev environment currently doesn't\nsupport a security manager. See README.Debian." | logger -p daemon.warning -t $NAME +fi + +# Set java.awt.headless=true if JAVA_OPTS is not set so the +# Xalan XSL transformer can work without X11 display on JDK 1.4+ +# It also looks like the default heap size of 64M is not enough for most cases +# se the maximum heap size is set to 128M +if [ -z "$JAVA_OPTS" ]; then + JAVA_OPTS="-Djava.awt.headless=true -Xmx128M" +fi + +JAVA_OPTS="$JAVA_OPTS -Djava.endorsed.dirs=$CATALINA_HOME/common/endorsed -Dcatalina.base=$CATALINA_BASE -Dcatalina.home=$CATALINA_HOME -Djava.io.tmpdir=$CATALINA_BASE/temp/$NAME" + +# Set the JSP compiler if set in the tomcat6.default file +if [ -n "$JSP_COMPILER" ]; then + JAVA_OPTS="$JAVA_OPTS -Dbuild.compiler=$JSP_COMPILER" +fi + +if [ "$TOMCAT6_SECURITY" = "yes" ]; then + JAVA_OPTS="$JAVA_OPTS -Djava.security.manager -Djava.security.policy=$CATALINA_BASE/conf/catalina.policy" +fi + +# juli LogManager disabled if running under gij (see bug #395167) +if [ "$gij" != "yes" ]; then + JAVA_OPTS="$JAVA_OPTS -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Djava.util.logging.config.file=$CATALINA_BASE/conf/logging.properties" +fi + +# Define other required variables +CATALINA_PID="/var/run/$NAME.pid" +BOOTSTRAP_CLASS=org.apache.catalina.startup.Bootstrap +JSVC_CLASSPATH="/usr/share/java/commons-daemon.jar:$CATALINA_HOME/bin/bootstrap.jar" + +# Look for Java Secure Sockets Extension (JSSE) JARs +if [ -z "${JSSE_HOME}" -a -r "${JAVA_HOME}/jre/lib/jsse.jar" ]; then + JSSE_HOME="${JAVA_HOME}/jre/" +fi +export JSSE_HOME + +case "$1" in + start) + if [ -z "$JAVA_HOME" ]; then + log_failure_msg "no JDK found - please set JAVA_HOME" + exit 1 + fi + + if [ ! -d "$CATALINA_BASE/conf" ]; then + log_failure_msg "invalid CATALINA_BASE specified" + exit 1 + fi + + log_daemon_msg "Starting $DESC" "$NAME" + if start-stop-daemon --test --start --pidfile "$CATALINA_PID" \ + --user $TOMCAT6_USER --startas "$JAVA_HOME/bin/java" \ + >/dev/null; then + + # Create catalina.policy (for the security manager) + rm -f "$CATALINA_BASE/conf/catalina.policy" + umask 022 + echo "// AUTO-GENERATED FILE -- DO NOT EDIT!" \ + > "$CATALINA_BASE/conf/catalina.policy" + echo "// Edit the files in /etc/tomcat6/policy.d/ instead" \ + >> "$CATALINA_BASE/conf/catalina.policy" + echo "" >> "$CATALINA_BASE/conf/catalina.policy" + cat /etc/tomcat6/policy.d/*.policy \ + >> "$CATALINA_BASE/conf/catalina.policy" + + # Clean up and set permissions on required files + rm -rf "$CATALINA_BASE"/temp/"$NAME" + mkdir "$CATALINA_BASE"/temp/"$NAME" + chmod -R go-rwx "$CATALINA_BASE"/temp/"$NAME" + chown --dereference "$TOMCAT6_USER" "$CATALINA_BASE/conf" \ + "$CATALINA_BASE/conf/tomcat-users.xml" \ + "$CATALINA_BASE/logs" "$CATALINA_BASE/temp/$NAME" \ + "$CATALINA_BASE/webapps" "$CATALINA_BASE/work" \ + || true + + $DAEMON -user "$TOMCAT6_USER" -cp "$JSVC_CLASSPATH" \ + -outfile SYSLOG -errfile SYSLOG \ + -pidfile "$CATALINA_PID" $JAVA_OPTS "$BOOTSTRAP_CLASS" + else + log_progress_msg "(already running)" + fi + log_end_msg 0 + ;; + stop) + log_daemon_msg "Stopping $DESC" "$NAME" + if start-stop-daemon --test --start --pidfile "$CATALINA_PID" \ + --user "$TOMCAT6_USER" --startas "$JAVA_HOME/bin/java" \ + >/dev/null; then + log_progress_msg "(not running)" + else + $DAEMON -cp "$JSVC_CLASSPATH" -pidfile "$CATALINA_PID" \ + -stop "$BOOTSTRAP_CLASS" + fi + log_end_msg 0 + ;; + status) + if start-stop-daemon --test --start --pidfile "$CATALINA_PID" \ + --user $TOMCAT6_USER --startas "$JAVA_HOME/bin/java" \ + >/dev/null; then + + if [ -f "$CATALINA_PID" ]; then + log_success_msg "$DESC is not running, but pid file exists." + else + log_success_msg "$DESC is not running." + fi + else + log_success_msg "$DESC is running with pid `cat $CATALINA_PID`" + fi + ;; + restart|force-reload) + if start-stop-daemon --test --stop --pidfile "$CATALINA_PID" \ + --user $TOMCAT6_USER --startas "$JAVA_HOME/bin/java" \ + >/dev/null; then + $0 stop + sleep 1 + fi + $0 start + ;; + try-restart) + if start-stop-daemon --test --start --pidfile "$CATALINA_PID" \ + --user $TOMCAT6_USER --startas "$JAVA_HOME/bin/java" \ + >/dev/null; then + $0 start + fi + ;; + *) + log_success_msg "Usage: $0 {start|stop|restart|try-restart|force-reload|status}" + exit 1 + ;; +esac + +exit 0 --- tomcat6-6.0.16.orig/debian/compat +++ tomcat6-6.0.16/debian/compat @@ -0,0 +1 @@ +5 --- tomcat6-6.0.16.orig/debian/etc/tomcat6/Catalina/localhost/tomcat6#manager.xml +++ tomcat6-6.0.16/debian/etc/tomcat6/Catalina/localhost/tomcat6#manager.xml @@ -0,0 +1,30 @@ + + + + + + + + --- tomcat6-6.0.16.orig/debian/etc/tomcat6/Catalina/localhost/ROOT.xml +++ tomcat6-6.0.16/debian/etc/tomcat6/Catalina/localhost/ROOT.xml @@ -0,0 +1,7 @@ + + + + --- tomcat6-6.0.16.orig/debian/etc/tomcat6/Catalina/localhost/tomcat6#examples.xml +++ tomcat6-6.0.16/debian/etc/tomcat6/Catalina/localhost/tomcat6#examples.xml @@ -0,0 +1,7 @@ + + + + --- tomcat6-6.0.16.orig/debian/etc/tomcat6/Catalina/localhost/tomcat6.xml +++ tomcat6-6.0.16/debian/etc/tomcat6/Catalina/localhost/tomcat6.xml @@ -0,0 +1,7 @@ + + + + --- tomcat6-6.0.16.orig/debian/etc/tomcat6/policy.d/01system.policy +++ tomcat6-6.0.16/debian/etc/tomcat6/policy.d/01system.policy @@ -0,0 +1,37 @@ +// ============================================================================ +// catalina.corepolicy - Security Policy Permissions for Tomcat 5 +// +// This file contains a default set of security policies to be enforced (by the +// JVM) when Catalina is executed with the "-security" option. In addition +// to the permissions granted here, the following additional permissions are +// granted to the codebase specific to each web application: +// +// * Read access to the document root directory +// +// $Id: 01system.policy 2783 2006-11-22 10:50:31Z marcusb-guest $ +// ============================================================================ + + +// ========== SYSTEM CODE PERMISSIONS ========================================= + + +// These permissions apply to javac +grant codeBase "file:${java.home}/lib/-" { + permission java.security.AllPermission; +}; + +// These permissions apply to all shared system extensions +grant codeBase "file:${java.home}/jre/lib/ext/-" { + permission java.security.AllPermission; +}; + +// These permissions apply to javac when ${java.home] points at $JAVA_HOME/jre +grant codeBase "file:${java.home}/../lib/-" { + permission java.security.AllPermission; +}; + +// These permissions apply to all shared system extensions when +// ${java.home} points at $JAVA_HOME/jre +grant codeBase "file:${java.home}/lib/ext/-" { + permission java.security.AllPermission; +}; --- tomcat6-6.0.16.orig/debian/etc/tomcat6/policy.d/50user.policy +++ tomcat6-6.0.16/debian/etc/tomcat6/policy.d/50user.policy @@ -0,0 +1,31 @@ +// You can assign additional permissions to particular web applications by +// adding additional "grant" entries here, based on the code base for that +// application, /WEB-INF/classes/, or /WEB-INF/lib/ jar files. +// +// Different permissions can be granted to JSP pages, classes loaded from +// the /WEB-INF/classes/ directory, all jar files in the /WEB-INF/lib/ +// directory, or even to individual jar files in the /WEB-INF/lib/ directory. +// +// For instance, assume that the standard "examples" application +// included a JDBC driver that needed to establish a network connection to the +// corresponding database and used the scrape taglib to get the weather from +// the NOAA web server. You might create a "grant" entries like this: +// +// The permissions granted to the context root directory apply to JSP pages. +// grant codeBase "file:${catalina.base}/webapps/examples/-" { +// permission java.net.SocketPermission "dbhost.mycompany.com:5432", "connect"; +// permission java.net.SocketPermission "*.noaa.gov:80", "connect"; +// }; +// +// The permissions granted to the context WEB-INF/classes directory +// grant codeBase "file:${catalina.base}/webapps/examples/WEB-INF/classes/-" { +// }; +// +// The permission granted to your JDBC driver +// grant codeBase "jar:file:${catalina.base}/webapps/examples/WEB-INF/lib/driver.jar!/-" { +// permission java.net.SocketPermission "dbhost.mycompany.com:5432", "connect"; +// }; +// The permission granted to the scrape taglib +// grant codeBase "jar:file:${catalina.base}/webapps/examples/WEB-INF/lib/scrape.jar!/-" { +// permission java.net.SocketPermission "*.noaa.gov:80", "connect"; +// }; --- tomcat6-6.0.16.orig/debian/etc/tomcat6/policy.d/02debian.policy +++ tomcat6-6.0.16/debian/etc/tomcat6/policy.d/02debian.policy @@ -0,0 +1,7 @@ +// These permissions apply to all JARs from Debian packages +grant codeBase "file:/usr/share/java/-" { + permission java.security.AllPermission; +}; +grant codeBase "file:/usr/share/ant/lib/-" { + permission java.security.AllPermission; +}; --- tomcat6-6.0.16.orig/debian/etc/tomcat6/policy.d/49examples.policy +++ tomcat6-6.0.16/debian/etc/tomcat6/policy.d/49examples.policy @@ -0,0 +1,4 @@ +// These permissions apply to examples webapp's logging +grant codeBase "file:${catalina.home}/bin/tomcat-juli.jar" { + permission java.io.FilePermission "${catalina.base}${file.separator}webapps${file.separator}tomcat6${file.separator}examples${file.separator}WEB-INF${file.separator}classes${file.separator}logging.properties", "read"; +}; --- tomcat6-6.0.16.orig/debian/etc/tomcat6/policy.d/04webapps.policy +++ tomcat6-6.0.16/debian/etc/tomcat6/policy.d/04webapps.policy @@ -0,0 +1,56 @@ +// ========== WEB APPLICATION PERMISSIONS ===================================== + + +// These permissions are granted by default to all web applications +// In addition, a web application will be given a read FilePermission +// and JndiPermission for all files and directories in its document root. +grant { + // Required for JNDI lookup of named JDBC DataSource's and + // javamail named MimePart DataSource used to send mail + permission java.util.PropertyPermission "java.home", "read"; + permission java.util.PropertyPermission "java.naming.*", "read"; + permission java.util.PropertyPermission "javax.sql.*", "read"; + + // OS Specific properties to allow read access + permission java.util.PropertyPermission "os.name", "read"; + permission java.util.PropertyPermission "os.version", "read"; + permission java.util.PropertyPermission "os.arch", "read"; + permission java.util.PropertyPermission "file.separator", "read"; + permission java.util.PropertyPermission "path.separator", "read"; + permission java.util.PropertyPermission "line.separator", "read"; + permission java.util.PropertyPermission "catalina.base", "read"; + permission java.util.PropertyPermission "catalina.home", "read"; + + // JVM properties to allow read access + permission java.util.PropertyPermission "java.version", "read"; + permission java.util.PropertyPermission "java.vendor", "read"; + permission java.util.PropertyPermission "java.vendor.url", "read"; + permission java.util.PropertyPermission "java.class.version", "read"; + permission java.util.PropertyPermission "java.specification.version", "read"; + permission java.util.PropertyPermission "java.specification.vendor", "read"; + permission java.util.PropertyPermission "java.specification.name", "read"; + + permission java.util.PropertyPermission "java.vm.specification.version", "read"; + permission java.util.PropertyPermission "java.vm.specification.vendor", "read"; + permission java.util.PropertyPermission "java.vm.specification.name", "read"; + permission java.util.PropertyPermission "java.vm.version", "read"; + permission java.util.PropertyPermission "java.vm.vendor", "read"; + permission java.util.PropertyPermission "java.vm.name", "read"; + + // Required for OpenJMX + permission java.lang.RuntimePermission "getAttribute"; + + // Allow read of JAXP compliant XML parser debug + permission java.util.PropertyPermission "jaxp.debug", "read"; + + // Precompiled JSPs need access to this package. + permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime"; + permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime.*"; + +}; + +// The permissions granted to the balancer WEB-INF/classes and WEB-INF/lib directory +grant codeBase "file:/usr/share/tomcat5.5-webapps/balancer/-" { + permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat.util.digester"; + permission java.lang.RuntimePermission "defineClassInPackage.org.apache.tomcat.util.digester"; +}; --- tomcat6-6.0.16.orig/debian/etc/tomcat6/policy.d/03catalina.policy +++ tomcat6-6.0.16/debian/etc/tomcat6/policy.d/03catalina.policy @@ -0,0 +1,57 @@ +// ========== CATALINA CODE PERMISSIONS ======================================= + +// These permissions apply to the launcher code +grant codeBase "file:${catalina.home}/bin/commons-launcher.jar" { + permission java.security.AllPermission; +}; + +// These permissions apply to the daemon code +grant codeBase "file:${catalina.home}/bin/commons-daemon.jar" { + permission java.security.AllPermission; +}; + +// 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; +}; + +// These permissions apply to the JMX server +grant codeBase "file:${catalina.home}/bin/jmx.jar" { + permission java.security.AllPermission; +}; + +// These permissions apply to JULI +grant codeBase "file:${catalina.home}/bin/tomcat-juli.jar" { +// permission java.security.AllPermission; + permission java.util.PropertyPermission "java.util.logging.config.class", "read"; + permission java.util.PropertyPermission "java.util.logging.config.file", "read"; + permission java.lang.RuntimePermission "shutdownHooks"; + permission java.io.FilePermission "${catalina.base}${file.separator}conf${file.separator}logging.properties", "read"; + permission java.util.PropertyPermission "catalina.base", "read"; + permission java.util.logging.LoggingPermission "control"; + permission java.io.FilePermission "${catalina.base}${file.separator}logs", "read, write"; + permission java.io.FilePermission "${catalina.base}${file.separator}logs${file.separator}*", "read, write"; + permission java.lang.RuntimePermission "getClassLoader"; + // To enable per context logging configuration, permit read access to the appropriate file. + // Be sure that the logging configuration is secure before enabling such access + // eg for the examples web application: + // permission java.io.FilePermission "${catalina.base}${file.separator}webapps${file.separator}tomcat6${file.separator}examples${file.separator}WEB-INF${file.separator}classes${file.separator}logging.properties", "read"; +}; + +// These permissions apply to the servlet API classes +// and those that are shared across all class loaders +// located in the "lib" directory +grant codeBase "file:${catalina.home}/lib/-" { + permission java.security.AllPermission; +}; + +// These permissions apply to the container's core code, plus any additional +// libraries installed in the "server" directory +grant codeBase "file:${catalina.home}/server/-" { + permission java.security.AllPermission; +}; --- tomcat6-6.0.16.orig/debian/etc/tomcat6/policy.d/10admin.policy +++ tomcat6-6.0.16/debian/etc/tomcat6/policy.d/10admin.policy @@ -0,0 +1,3 @@ +grant codeBase "file:/usr/share/struts1.2/struts.jar" { + permission java.security.AllPermission; +}; --- tomcat6-6.0.16.orig/debian/tomcat6.logrotate +++ tomcat6-6.0.16/debian/tomcat6.logrotate @@ -0,0 +1,15 @@ +/var/log/tomcat6/*.log { + weekly + missingok + rotate 52 + compress + delaycompress + notifempty + create 640 www-data adm + sharedscripts + postrotate + if [ -f /var/run/tomcat6.pid ]; then + /etc/init.d/tomcat6 restart > /dev/null + fi + endscript +} --- tomcat6-6.0.16.orig/debian/dirs +++ tomcat6-6.0.16/debian/dirs @@ -0,0 +1,2 @@ +usr/bin +usr/sbin --- tomcat6-6.0.16.orig/debian/tomcat6-examples.install +++ tomcat6-6.0.16/debian/tomcat6-examples.install @@ -0,0 +1,3 @@ +output/build/webapps/examples/* /var/www/tomcat6/examples +debian/etc/tomcat6/Catalina/localhost/tomcat6#examples.xml /etc/tomcat6/Catalina/localhost/ +debian/etc/tomcat6/policy.d/49examples.policy /etc/tomcat6/policy.d/ --- tomcat6-6.0.16.orig/debian/tomcat6-doc.install +++ tomcat6-6.0.16/debian/tomcat6-doc.install @@ -0,0 +1 @@ +output/build/webapps/docs/* /usr/share/doc/tomcat6 --- tomcat6-6.0.16.orig/debian/libservlet2.5-java.postinst +++ tomcat6-6.0.16/debian/libservlet2.5-java.postinst @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +case "$1" in + configure) + update-alternatives --install \ + /usr/share/java/servlet-api.jar servlet-api /usr/share/java/servlet-api-2.5.jar 2521 \ + --slave /usr/share/java/jsp-api.jar jsp-api /usr/share/java/jsp-api-2.1.jar + ;; +esac + +#DEBHELPER# --- tomcat6-6.0.16.orig/debian/changelog +++ tomcat6-6.0.16/debian/changelog @@ -0,0 +1,12 @@ +tomcat6 (6.0.16-1) unstable; urgency=low + + * Personal Tomcat package for apache2 integration using mod_jk, be careful + it is not well tested and could lead to security problems. + - webapps are located in /var/www. Default webapp is in /var/www/tomcat6. + - user running tomcat is www-data (like apache2) + - no depends on libapache2-mod-jk, but configuration provided + * Initial release + * Using /var/www for webapps root (apache2 integration) + + -- Loris-Guillaume Minoia Wed, 27 Feb 2008 00:49:04 +0100 + --- tomcat6-6.0.16.orig/debian/tomcat6.dirs +++ tomcat6-6.0.16/debian/tomcat6.dirs @@ -0,0 +1,3 @@ +var/www +var/log/tomcat6 +var/cache/tomcat6 --- tomcat6-6.0.16.orig/debian/tomcat6-hostmanager.install +++ tomcat6-6.0.16/debian/tomcat6-hostmanager.install @@ -0,0 +1 @@ +output/build/webapps/host-manager/* /var/www/tomcat6/host-manager --- tomcat6-6.0.16.orig/debian/control +++ tomcat6-6.0.16/debian/control @@ -0,0 +1,75 @@ +Source: tomcat6 +Section: web +Priority: extra +Maintainer: Loris-Guillaume Minoia +Build-Depends: cdbs (>= 0.4.5.3), debhelper (>> 4.0.0), java2-compiler +Standards-Version: 3.7.2 + +Package: tomcat6 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, jsvc, libtomcat6-java (>= ${source:Version}), libservlet2.5-java (>= ${source:Version}) +Description: Servlet and JSP engine + Apache Tomcat is the reference implementation for the Java Servlet and JavaServer Pages technologies. + . + This package just contains the startup scripts for the daemon. No documentation or web applications are included here, please install the tomcat6-examples package if you want them. + . + Homepage: http://tomcat.apache.org + +Package: libtomcat6-java +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Java Servlet engine -- core libraries + Apache Tomcat is the reference implementation for the Java Servlet and JavaServer Pages technologies. + . + This package contains the Tomcat core classes which can be used by other Java applications toembed Tomcat. + . + Homepage: http://tomcat.apache.org + +Package: libservlet2.5-java +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Servlet 2.5 and JSP 2.1 Java library. + Apache Tomcat is the reference implementation for the Java Servlet and JavaServer Pages technologies. + . + The official Servlet and JSP specifications can be found at http://java.sun.com/products/servlet/ and http://java.sun.com/products/jsp/. + . + This package contains the Tomcat core classes which can be used by other Java applications to embed Servlet and JSP. + . + Homepage: http://tomcat.apache.org + +Package: libservlet2.5-java-doc +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Servlet 2.5 and JSP 2.1 Java documentation. + Apache Tomcat is the reference implementation for the Java Servlet and JavaServer Pages technologies. + . + The official Servlet and JSP specifications can be found at http://java.sun.com/products/servlet/ and http://java.sun.com/products/jsp/. + . + This package contains the Tomcat core documentation which can be used by other Java applications to embed Servlet and JSP. + . + Homepage: http://tomcat.apache.org + +Package: tomcat6-doc +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: + + +Package: tomcat6-examples +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: + + +Package: tomcat6-hostmanager +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: + + + +Package: tomcat6-manager +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: + --- tomcat6-6.0.16.orig/debian/libtomcat6-java.install +++ tomcat6-6.0.16/debian/libtomcat6-java.install @@ -0,0 +1,14 @@ +output/build/bin/bootstrap.jar /usr/share/tomcat6/bin/ +output/build/bin/tomcat-juli.jar /usr/share/tomcat6/bin/ +output/build/lib/tomcat-i18n-ja.jar /usr/share/tomcat6/lib/ +output/build/lib/catalina.jar /usr/share/tomcat6/lib/ +output/build/lib/annotations-api.jar /usr/share/tomcat6/lib/ +output/build/lib/catalina-tribes.jar /usr/share/tomcat6/lib/ +output/build/lib/el-api.jar /usr/share/tomcat6/lib/ +output/build/lib/jasper-el.jar /usr/share/tomcat6/lib/ +output/build/lib/tomcat-coyote.jar /usr/share/tomcat6/lib/ +output/build/lib/tomcat-i18n-fr.jar /usr/share/tomcat6/lib/ +output/build/lib/catalina-ha.jar /usr/share/tomcat6/lib/ +output/build/lib/tomcat-i18n-es.jar /usr/share/tomcat6/lib/ +output/build/lib/jasper.jar /usr/share/tomcat6/lib/ +output/build/lib/catalina-ant.jar /usr/share/tomcat6/lib/ --- tomcat6-6.0.16.orig/debian/rules +++ tomcat6-6.0.16/debian/rules @@ -0,0 +1,22 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk + +#DEB_TAR_SRCDIR := apache-tomcat-6.0.16-src +#include /usr/share/cdbs/1/rules/tarball.mk + +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +include /usr/share/cdbs/1/class/ant.mk +JAVA_HOME := /usr/lib/jvm/java-6-sun +DEB_JARS := ecj ant-trax + +# Add here any variable or target overrides you need. + +binary-fixup/tomcat6:: + chown -R www-data:www-data debian/$(cdbs_curpkg)/var/www/tomcat6 + chown -R www-data:www-data debian/$(cdbs_curpkg)/etc/tomcat6 + chown -R www-data:www-data debian/$(cdbs_curpkg)/usr/share/tomcat6 + chmod +x debian/$(cdbs_curpkg)/usr/share/tomcat6/bin/*.sh +binary-fixup/tomcat6-examples:: + chown -R www-data:www-data debian/$(cdbs_curpkg)/var/www/tomcat6 --- tomcat6-6.0.16.orig/debian/libservlet2.5-java.install +++ tomcat6-6.0.16/debian/libservlet2.5-java.install @@ -0,0 +1,2 @@ +output/build/lib/servlet-api.jar /usr/share/tomcat6/lib/ +output/build/lib/jsp-api.jar /usr/share/tomcat6/lib/ --- tomcat6-6.0.16.orig/debian/tomcat6.default +++ tomcat6-6.0.16/debian/tomcat6.default @@ -0,0 +1,28 @@ +# Run Tomcat as this user ID. Not setting this or leaving it blank will use the +# default of www-data. +#TOMCAT5_USER=www-data + +# The home directory of the Java development kit (JDK). You need at least +# JDK version 1.5. If JAVA_HOME is not set, some common directories for +# the Sun JDK, various J2SE 1.5 versions, and the free runtimes +# java-gcj-compat-dev and kaffe are tried. +#JAVA_HOME=/usr/lib/jvm/java-6-sun + +# Directory for per-instance configuration files and webapps. It contain the +# directories conf, logs, webapps, work and temp. See RUNNING.txt for details. +# Default: /usr/share/tomcat6 +#CATALINA_BASE=/usr/share/tomcat6 + +# Arguments to pass to the Java virtual machine (JVM). +#JAVA_OPTS="-Djava.awt.headless=true -Xmx128M" + +# Java compiler to use for translating JavaServer Pages (JSPs). You can use all +# compilers that are accepted by Ant's build.compiler property. +#JSP_COMPILER=jikes + +# Use the Java security manager? (yes/no, default: yes) +# WARNING: Do not disable the security manager unless you understand +# the consequences! +# NOTE: java-gcj-compat-dev currently doesn't support a security +# manager. +#TOMCAT6_SECURITY=yes --- tomcat6-6.0.16.orig/debian/libservlet2.5-java.prerm +++ tomcat6-6.0.16/debian/libservlet2.5-java.prerm @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +case "$1" in + remove|upgrade|deconfigure) + update-alternatives --remove servlet-api /usr/share/java/servlet-api-2.5.jar + ;; +esac + +#DEBHELPER# --- tomcat6-6.0.16.orig/debian/libservlet2.5-java.links +++ tomcat6-6.0.16/debian/libservlet2.5-java.links @@ -0,0 +1,4 @@ +/usr/share/tomcat6/lib/servlet-api.jar /usr/share/java/servlet-api-2.5.jar +/usr/share/tomcat6/lib/jsp-api.jar /usr/share/java/jsp-api-2.1.jar +/usr/share/java/servlet-api-2.5.jar /usr/share/java/servlet-api.jar +/usr/share/java/jsp-api-2.1.jar /usr/share/java/jsp-api.jar --- tomcat6-6.0.16.orig/output/dist/RUNNING.txt +++ tomcat6-6.0.16/output/dist/RUNNING.txt @@ -0,0 +1,166 @@ +================================================================================ + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +================================================================================ + +$Id: RUNNING.txt 354430 2005-12-06 13:44:26Z yoavs $ + + =================================================== + Running The Apache Tomcat 6.0 Servlet/JSP Container + =================================================== + +Apache Tomcat 6.0 requires the Java 2 Standard Edition Runtime +Environment (JRE) version 5.0 or later. + +============================= +Running With JRE 5.0 Or Later +============================= + +(1) Download and Install the J2SE Runtime Environment (JRE) + +(1.1) Download the Java 2 Standard Edition Runtime Environment (JRE), + release version 5.0 or later, from http://java.sun.com/j2se. + +(1.2) Install the JRE according to the instructions included with the + release. +(1.3) Set an environment variable named JRE_HOME to the pathname of + the directory into which you installed the JRE, e.g. c:\jre5.0 + or /usr/local/java/jre5.0. + +NOTE: You may also use the full JDK rather than just the JRE. In this + case set your JAVA_HOME environment variable to the pathname of + the directory into which you installed the JDK, e.g. c:\j2sdk5.0 + or /usr/local/java/j2sdk5.0. + + +(2) Download and Install the Tomcat Binary Distribution + +NOTE: As an alternative to downloading a binary distribution, you can create +your own from the Tomcat source repository, as described in "BUILDING.txt". +If you do this, the value to use for "${catalina.home}" will be the "dist" +subdirectory of your source distribution. + +(2.1) Download a binary distribution of Tomcat from: + + http://tomcat.apache.org + +(2.2) Unpack the binary distribution into a convenient location so that the + distribution resides in its own directory (conventionally named + "apache-tomcat-[version]"). For the purposes of the remainder of this document, + the symbolic name "$CATALINA_HOME" is used to refer to the full + pathname of the release directory. + + +(3) Start Up Tomcat + +(3.1) Tomcat can be started by executing the following commands: + + $CATALINA_HOME\bin\startup.bat (Windows) + + $CATALINA_HOME/bin/startup.sh (Unix) + +(3.2) After startup, the default web applications included with Tomcat will be + available by visiting: + + http://localhost:8080/ + +(3.3) Further information about configuring and running Tomcat can be found in + the documentation included here, as well as on the Tomcat web site: + + http://tomcat.apache.org + + +(4) Shut Down Tomcat + +(4.1) Tomcat can be shut down by executing the following command: + + $CATALINA_HOME\bin\shutdown (Windows) + + $CATALINA_HOME/bin/shutdown.sh (Unix) + + +================================================== +Advanced Configuration - Multiple Tomcat Instances +================================================== + +In many circumstances, it is desirable to have a single copy of a Tomcat +binary distribution shared among multiple users on the same server. To make +this possible, you can pass a "-Dcatalina.base=$CATALINA_BASE" argument when +executing the startup command (see (2)). In this +"-Dcatalina.base=$CATALINA_BASE" argument, replace $CATALINA_BASE with the +directory that contains the files for your 'personal' Tomcat instance. + +When you use this "-Dcatalina.base=$CATALINA_BASE" argument, Tomcat will +calculate all relative references for files in the following directories based +on the value of $CATALINA_BASE instead of $CATALINA_HOME: + +* bin - Only setenv.sh (*nix) and setenv.bat (windows) + +* conf - Server configuration files (including server.xml) + +* logs - Log and output files + +* lib - For classes and resources that must be shared across all web + applications + +* webapps - Automatically loaded web applications + +* work - Temporary working directories for web applications + +* temp - Directory used by the JVM for temporary files (java.io.tmpdir) + +If you do not pass the "-Dcatalina.base=$CATALINA_BASE" argument to the +startup command, $CATALINA_BASE will default to the same value as $CATALINA_HOME, + which means that the same directory is used for all relative path resolutions. + + +================ +Troubleshooting +================ + +There are only really 3 things likely to go wrong during the stand-alone +Tomcat install: + +(1) The most common hiccup is when another web server (or any process for that + matter) has laid claim to port 8080. This is the default HTTP port that + Tomcat attempts to bind to at startup. To change this, open the file: + + $CATALINA_HOME/conf/server.xml + + and search for '8080'. Change it to a port that isn't in use, and is + greater than 1024, as ports less than or equal to 1024 require superuser + access to bind under UNIX. + + Restart Tomcat and you're in business. Be sure that you replace the "8080" + in the URL you're using to access Tomcat. For example, if you change the + port to 1977, you would request the URL http://localhost:1977/ in your browser. + +(2) An "out of environment space" error when running the batch files in + Windows 95, 98, or ME operating systems. + + Right-click on the STARTUP.BAT and SHUTDOWN.BAT files. Click on + "Properties", then on the "Memory" tab. For the "Initial environment" field, + enter in something like 4096. + + After you click apply, Windows will create shortcuts which you can use + to start and stop the container. + +(3) The 'localhost' machine isn't found. This could happen if you're behind a + proxy. If that's the case, make sure the proxy configuration for your + browser knows that you shouldn't be going through the proxy to access the + "localhost". + + In Netscape, this is under Edit/Preferences -> Advanced/Proxies, and in + Internet Explorer, Tools -> Internet Options -> Connections -> LAN Settings. --- tomcat6-6.0.16.orig/output/dist/RELEASE-NOTES +++ tomcat6-6.0.16/output/dist/RELEASE-NOTES @@ -0,0 +1,191 @@ +================================================================================ + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +================================================================================ + +$Id: RELEASE-NOTES 612940 2008-01-17 19:22:26Z markt $ + + + Apache Tomcat Version 6.0-snapshot + Release Notes + + +============================= +KNOWN ISSUES IN THIS RELEASE: +============================= + +* Dependency Changes +* JNI Based Applications +* Bundled APIs +* Web application reloading and static fields in shared libraries +* Tomcat on Linux +* Enabling SSI and CGI Support +* Security manager URLs +* Symlinking static resources +* Enabling invoker servlet +* Viewing the Tomcat Change Log +* When all else fails + + +=================== +Dependency Changes: +=================== +Tomcat 6.0 is designed to run on JSE 5.0 and later. + +In addition, Tomcat 6.0 uses the Eclipse JDT Java compiler for compiling +JSP pages. This means you no longer need to have the complete +Java Development Kit (JDK) to run Tomcat, but a Java Runtime Environment +(JRE) is sufficient. The Eclipse JDT Java compiler is bundled with the +binary Tomcat distributions. Tomcat can also be configured to use the +compiler from the JDK to compile JSPs, or any other Java compiler supported +by Apache Ant. + + +======================= +JNI Based Applications: +======================= +Applications that require native libraries must ensure that the libraries have +been loaded prior to use. Typically, this is done with a call like: + + static { + System.loadLibrary("path-to-library-file"); + } + +in some class. However, the application must also ensure that the library is +not loaded more than once. If the above code were placed in a class inside +the web application (i.e. under /WEB-INF/classes or /WEB-INF/lib), and the +application were reloaded, the loadLibrary() call would be attempted a second +time. + +To avoid this problem, place classes that load native libraries outside of the +web application, and ensure that the loadLibrary() call is executed only once +during the lifetime of a particular JVM. + + +============= +Bundled APIs: +============= +A standard installation of Tomcat 6.0 makes all of the following APIs available +for use by web applications (by placing them in "lib"): +* annotations-api.jar (Annotations package) +* catalina.jar (Tomcat Catalina implementation) +* catalina-ant.jar (Tomcat Catalina Ant tasks) +* catalina-ha.jar (High availability package) +* catalina-tribes.jar (Group communication) +* el-api.jar (EL 2.1 API) +* jasper.jar (Jasper 2 Compiler and Runtime) +* jasper-el.jar (Jasper 2 EL implementation) +* jasper-jdt.jar (Eclipse JDT 3.3 Java compiler) +* jsp-api.jar (JSP 2.1 API) +* servlet-api.jar (Servlet 2.5 API) +* tomcat-coyote.jar (Tomcat connectors and utility classes) +* tomcat-dbcp.jar (package renamed database connection pool based on Commons DBCP) + +You can make additional APIs available to all of your web applications by +putting unpacked classes into a "classes" directory (not created by default), +or by placing them in JAR files in the "lib" directory. + +To override the XML parser implementation or interfaces, use the endorsed +mechanism of the JVM. The default configuration defines JARs located in +"endorsed" as endorsed. + + +================================================================ +Web application reloading and static fields in shared libraries: +================================================================ +Some shared libraries (many are part of the JDK) keep references to objects +instantiated by the web application. To avoid class loading related problems +(ClassCastExceptions, messages indicating that the classloader +is stopped, etc.), the shared libraries state should be reinitialized. + +Something which might help is to avoid putting classes which would be +referenced by a shared static field in the web application classloader, +and putting them in the shared classloader instead (JARs should be put in the +"lib" folder, and classes should be put in the "classes" folder). + + +================ +Tomcat on Linux: +================ +GLIBC 2.2 / Linux 2.4 users should define an environment variable: +export LD_ASSUME_KERNEL=2.2.5 + +Redhat Linux 9.0 users should use the following setting to avoid +stability problems: +export LD_ASSUME_KERNEL=2.4.1 + +There are some Linux bugs reported against the NIO sendfile behavior, make sure you +have a JDK that is up to date, or disable sendfile behavior in the Connector.
+6427312: (fc) FileChannel.transferTo() throws IOException "system call interrupted"
+5103988: (fc) FileChannel.transferTo should return -1 for EAGAIN instead throws IOException
+6253145: (fc) FileChannel.transferTo on Linux fails when going beyond 2GB boundary
+6470086: (fc) FileChannel.transferTo(2147483647, 1, channel) cause "Value too large" exception
+ + +============================= +Enabling SSI and CGI Support: +============================= +Because of the security risks associated with CGI and SSI available +to web applications, these features are disabled by default. + +To enable and configure CGI support, please see the cgi-howto.html page. + +To enable and configue SSI support, please see the ssi-howto.html page. + + +====================== +Security manager URLs: +====================== +In order to grant security permissions to JARs located inside the +web application repository, use URLs of of the following format +in your policy file: + +file:${catalina.home}/webapps/examples/WEB-INF/lib/driver.jar + + +============================ +Symlinking static resources: +============================ +By default, Unix symlinks will not work when used in a web application to link +resources located outside the web application root directory. + +This behavior is optional, and the "allowLinking" flag may be used to disable +the check. + + +========================= +Enabling invoker servlet: +========================= +Starting with Tomcat 4.1.12, the invoker servlet is no longer available by +default in all webapps. Enabling it for all webapps is possible by editing +$CATALINA_HOME/conf/web.xml to uncomment the "/servlet/*" servlet-mapping +definition. + +Using the invoker servlet in a production environment is not recommended and +is unsupported. More details are available on the Tomcat FAQ at +http://tomcat.apache.org/faq/misc.html#invoker. + + +============================== +Viewing the Tomcat Change Log: +============================== +See changelog.html in this directory. + + +==================== +When all else fails: +==================== +See the FAQ +http://tomcat.apache.org/faq/ --- tomcat6-6.0.16.orig/output/dist/LICENSE +++ tomcat6-6.0.16/output/dist/LICENSE @@ -0,0 +1,707 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + +APACHE TOMCAT SUBCOMPONENTS: + +Apache Tomcat includes a number of subcomponents with separate copyright notices +and license terms. Your use of these subcomponents is subject to the terms and +conditions of the following licenses. + + +For the jasper-jdt.jar component: + +Eclipse Public License - v 1.0 + +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC +LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM +CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + +1. DEFINITIONS + +"Contribution" means: + +a) in the case of the initial Contributor, the initial code and documentation +distributed under this Agreement, and + +b) in the case of each subsequent Contributor: + +i) changes to the Program, and + +ii) additions to the Program; + +where such changes and/or additions to the Program originate from and are +distributed by that particular Contributor. A Contribution 'originates' from a +Contributor if it was added to the Program by such Contributor itself or anyone +acting on such Contributor's behalf. Contributions do not include additions to +the Program which: (i) are separate modules of software distributed in +conjunction with the Program under their own license agreement, and (ii) are not +derivative works of the Program. + +"Contributor" means any person or entity that distributes the Program. + +"Licensed Patents" mean patent claims licensable by a Contributor which are +necessarily infringed by the use or sale of its Contribution alone or when +combined with the Program. + +"Program" means the Contributions distributed in accordance with this Agreement. + +"Recipient" means anyone who receives the Program under this Agreement, +including all Contributors. + +2. GRANT OF RIGHTS + +a) Subject to the terms of this Agreement, each Contributor hereby grants +Recipient a non-exclusive, worldwide, royalty-free copyright license to +reproduce, prepare derivative works of, publicly display, publicly perform, +distribute and sublicense the Contribution of such Contributor, if any, and such +derivative works, in source code and object code form. + +b) Subject to the terms of this Agreement, each Contributor hereby grants +Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed +Patents to make, use, sell, offer to sell, import and otherwise transfer the +Contribution of such Contributor, if any, in source code and object code form. +This patent license shall apply to the combination of the Contribution and the +Program if, at the time the Contribution is added by the Contributor, such +addition of the Contribution causes such combination to be covered by the +Licensed Patents. The patent license shall not apply to any other combinations +which include the Contribution. No hardware per se is licensed hereunder. + +c) Recipient understands that although each Contributor grants the licenses to +its Contributions set forth herein, no assurances are provided by any +Contributor that the Program does not infringe the patent or other intellectual +property rights of any other entity. Each Contributor disclaims any liability to +Recipient for claims brought by any other entity based on infringement of +intellectual property rights or otherwise. As a condition to exercising the +rights and licenses granted hereunder, each Recipient hereby assumes sole +responsibility to secure any other intellectual property rights needed, if any. +For example, if a third party patent license is required to allow Recipient to +distribute the Program, it is Recipient's responsibility to acquire that license +before distributing the Program. + +d) Each Contributor represents that to its knowledge it has sufficient copyright +rights in its Contribution, if any, to grant the copyright license set forth in +this Agreement. + +3. REQUIREMENTS + +A Contributor may choose to distribute the Program in object code form under its +own license agreement, provided that: + +a) it complies with the terms and conditions of this Agreement; and + +b) its license agreement: + +i) effectively disclaims on behalf of all Contributors all warranties and +conditions, express and implied, including warranties or conditions of title and +non-infringement, and implied warranties or conditions of merchantability and +fitness for a particular purpose; + +ii) effectively excludes on behalf of all Contributors all liability for +damages, including direct, indirect, special, incidental and consequential +damages, such as lost profits; + +iii) states that any provisions which differ from this Agreement are offered by +that Contributor alone and not by any other party; and + +iv) states that source code for the Program is available from such Contributor, +and informs licensees how to obtain it in a reasonable manner on or through a +medium customarily used for software exchange. + +When the Program is made available in source code form: + +a) it must be made available under this Agreement; and + +b) a copy of this Agreement must be included with each copy of the Program. + +Contributors may not remove or alter any copyright notices contained within the +Program. + +Each Contributor must identify itself as the originator of its Contribution, if +any, in a manner that reasonably allows subsequent Recipients to identify the +originator of the Contribution. + +4. COMMERCIAL DISTRIBUTION + +Commercial distributors of software may accept certain responsibilities with +respect to end users, business partners and the like. While this license is +intended to facilitate the commercial use of the Program, the Contributor who +includes the Program in a commercial product offering should do so in a manner +which does not create potential liability for other Contributors. Therefore, if +a Contributor includes the Program in a commercial product offering, such +Contributor ("Commercial Contributor") hereby agrees to defend and indemnify +every other Contributor ("Indemnified Contributor") against any losses, damages +and costs (collectively "Losses") arising from claims, lawsuits and other legal +actions brought by a third party against the Indemnified Contributor to the +extent caused by the acts or omissions of such Commercial Contributor in +connection with its distribution of the Program in a commercial product +offering. The obligations in this section do not apply to any claims or Losses +relating to any actual or alleged intellectual property infringement. In order +to qualify, an Indemnified Contributor must: a) promptly notify the Commercial +Contributor in writing of such claim, and b) allow the Commercial Contributor +to control, and cooperate with the Commercial Contributor in, the defense and +any related settlement negotiations. The Indemnified Contributor may +participate in any such claim at its own expense. + +For example, a Contributor might include the Program in a commercial product +offering, Product X. That Contributor is then a Commercial Contributor. If that +Commercial Contributor then makes performance claims, or offers warranties +related to Product X, those performance claims and warranties are such +Commercial Contributor's responsibility alone. Under this section, the +Commercial Contributor would have to defend claims against the other +Contributors related to those performance claims and warranties, and if a court +requires any other Contributor to pay any damages as a result, the Commercial +Contributor must pay those damages. + +5. NO WARRANTY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR +IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, +NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each +Recipient is solely responsible for determining the appropriateness of using and +distributing the Program and assumes all risks associated with its exercise of +rights under this Agreement , including but not limited to the risks and costs +of program errors, compliance with applicable laws, damage to or loss of data, +programs or equipment, and unavailability or interruption of operations. + +6. DISCLAIMER OF LIABILITY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY +CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST +PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS +GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. GENERAL + +If any provision of this Agreement is invalid or unenforceable under applicable +law, it shall not affect the validity or enforceability of the remainder of the +terms of this Agreement, and without further action by the parties hereto, such +provision shall be reformed to the minimum extent necessary to make such +provision valid and enforceable. + +If Recipient institutes patent litigation against any entity (including a +cross-claim or counterclaim in a lawsuit) alleging that the Program itself +(excluding combinations of the Program with other software or hardware) +infringes such Recipient's patent(s), then such Recipient's rights granted under +Section 2(b) shall terminate as of the date such litigation is filed. + +All Recipient's rights under this Agreement shall terminate if it fails to +comply with any of the material terms or conditions of this Agreement and does +not cure such failure in a reasonable period of time after becoming aware of +such noncompliance. If all Recipient's rights under this Agreement terminate, +Recipient agrees to cease use and distribution of the Program as soon as +reasonably practicable. However, Recipient's obligations under this Agreement +and any licenses granted by Recipient relating to the Program shall continue and +survive. + +Everyone is permitted to copy and distribute copies of this Agreement, but in +order to avoid inconsistency the Agreement is copyrighted and may only be +modified in the following manner. The Agreement Steward reserves the right to +publish new versions (including revisions) of this Agreement from time to time. +No one other than the Agreement Steward has the right to modify this Agreement. +The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation +may assign the responsibility to serve as the Agreement Steward to a suitable +separate entity. Each new version of the Agreement will be given a +distinguishing version number. The Program (including Contributions) may always +be distributed subject to the version of the Agreement under which it was +received. In addition, after a new version of the Agreement is published, +Contributor may elect to distribute the Program (including its Contributions) +under the new version. Except as expressly stated in Sections 2(a) and 2(b) +above, Recipient receives no rights or licenses to the intellectual property of +any Contributor under this Agreement, whether expressly, by implication, +estoppel or otherwise. All rights in the Program not expressly granted under +this Agreement are reserved. + +This Agreement is governed by the laws of the State of New York and the +intellectual property laws of the United States of America. No party to this +Agreement will bring a legal action under this Agreement more than one year +after the cause of action arose. Each party waives its rights to a jury trial in +any resulting litigation. + + +For the Windows Installer component: + + * All NSIS source code, plug-ins, documentation, examples, header files and + graphics, with the exception of the compression modules and where + otherwise noted, are licensed under the zlib/libpng license. + * The zlib compression module for NSIS is licensed under the zlib/libpng + license. + * The bzip2 compression module for NSIS is licensed under the bzip2 license. + * The lzma compression module for NSIS is licensed under the Common Public + License version 1.0. + +zlib/libpng license + +This software is provided 'as-is', without any express or implied warranty. In +no event will the authors be held liable for any damages arising from the use of +this software. + +Permission is granted to anyone to use this software for any purpose, including +commercial applications, and to alter it and redistribute it freely, subject to +the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not claim + that you wrote the original software. If you use this software in a + product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + +bzip2 license + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + 2. The origin of this software must not be misrepresented; you must not claim + that you wrote the original software. If you use this software in a + product, an acknowledgment in the product documentation would be + appreciated but is not required. + 3. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 4. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT +OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGE. + +Julian Seward, Cambridge, UK. + +jseward@acm.org +Common Public License version 1.0 + +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC +LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM +CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + +1. DEFINITIONS + +"Contribution" means: + +a) in the case of the initial Contributor, the initial code and documentation +distributed under this Agreement, and b) in the case of each subsequent +Contributor: + +i) changes to the Program, and + +ii) additions to the Program; + +where such changes and/or additions to the Program originate from and are +distributed by that particular Contributor. A Contribution 'originates' from a +Contributor if it was added to the Program by such Contributor itself or anyone +acting on such Contributor's behalf. Contributions do not include additions to +the Program which: (i) are separate modules of software distributed in +conjunction with the Program under their own license agreement, and (ii) are not +derivative works of the Program. + +"Contributor" means any person or entity that distributes the Program. + +"Licensed Patents " mean patent claims licensable by a Contributor which are +necessarily infringed by the use or sale of its Contribution alone or when +combined with the Program. + +"Program" means the Contributions distributed in accordance with this Agreement. + +"Recipient" means anyone who receives the Program under this Agreement, +including all Contributors. + +2. GRANT OF RIGHTS + +a) Subject to the terms of this Agreement, each Contributor hereby grants +Recipient a non-exclusive, worldwide, royalty-free copyright license to +reproduce, prepare derivative works of, publicly display, publicly perform, +distribute and sublicense the Contribution of such Contributor, if any, and such +derivative works, in source code and object code form. + +b) Subject to the terms of this Agreement, each Contributor hereby grants +Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed +Patents to make, use, sell, offer to sell, import and otherwise transfer the +Contribution of such Contributor, if any, in source code and object code form. +This patent license shall apply to the combination of the Contribution and the +Program if, at the time the Contribution is added by the Contributor, such +addition of the Contribution causes such combination to be covered by the +Licensed Patents. The patent license shall not apply to any other combinations +which include the Contribution. No hardware per se is licensed hereunder. + +c) Recipient understands that although each Contributor grants the licenses to +its Contributions set forth herein, no assurances are provided by any +Contributor that the Program does not infringe the patent or other intellectual +property rights of any other entity. Each Contributor disclaims any liability to +Recipient for claims brought by any other entity based on infringement of +intellectual property rights or otherwise. As a condition to exercising the +rights and licenses granted hereunder, each Recipient hereby assumes sole +responsibility to secure any other intellectual property rights needed, if any. +For example, if a third party patent license is required to allow Recipient to +distribute the Program, it is Recipient's responsibility to acquire that license +before distributing the Program. + +d) Each Contributor represents that to its knowledge it has sufficient copyright +rights in its Contribution, if any, to grant the copyright license set forth in +this Agreement. + +3. REQUIREMENTS + +A Contributor may choose to distribute the Program in object code form under its +own license agreement, provided that: + +a) it complies with the terms and conditions of this Agreement; and + +b) its license agreement: + +i) effectively disclaims on behalf of all Contributors all warranties and +conditions, express and implied, including warranties or conditions of title and +non-infringement, and implied warranties or conditions of merchantability and +fitness for a particular purpose; + +ii) effectively excludes on behalf of all Contributors all liability for +damages, including direct, indirect, special, incidental and consequential +damages, such as lost profits; + +iii) states that any provisions which differ from this Agreement are offered by +that Contributor alone and not by any other party; and + +iv) states that source code for the Program is available from such Contributor, +and informs licensees how to obtain it in a reasonable manner on or through a +medium customarily used for software exchange. + +When the Program is made available in source code form: + +a) it must be made available under this Agreement; and + +b) a copy of this Agreement must be included with each copy of the Program. + +Contributors may not remove or alter any copyright notices contained within the +Program. + +Each Contributor must identify itself as the originator of its Contribution, if +any, in a manner that reasonably allows subsequent Recipients to identify the +originator of the Contribution. + +4. COMMERCIAL DISTRIBUTION + +Commercial distributors of software may accept certain responsibilities with +respect to end users, business partners and the like. While this license is +intended to facilitate the commercial use of the Program, the Contributor who +includes the Program in a commercial product offering should do so in a manner +which does not create potential liability for other Contributors. Therefore, if +a Contributor includes the Program in a commercial product offering, such +Contributor ("Commercial Contributor") hereby agrees to defend and indemnify +every other Contributor ("Indemnified Contributor") against any losses, damages +and costs (collectively "Losses") arising from claims, lawsuits and other legal +actions brought by a third party against the Indemnified Contributor to the +extent caused by the acts or omissions of such Commercial Contributor in +connection with its distribution of the Program in a commercial product +offering. The obligations in this section do not apply to any claims or Losses +relating to any actual or alleged intellectual property infringement. In order +to qualify, an Indemnified Contributor must: a) promptly notify the Commercial +Contributor in writing of such claim, and b) allow the Commercial Contributor to +control, and cooperate with the Commercial Contributor in, the defense and any +related settlement negotiations. The Indemnified Contributor may participate in +any such claim at its own expense. + +For example, a Contributor might include the Program in a commercial product +offering, Product X. That Contributor is then a Commercial Contributor. If that +Commercial Contributor then makes performance claims, or offers warranties +related to Product X, those performance claims and warranties are such +Commercial Contributor's responsibility alone. Under this section, the +Commercial Contributor would have to defend claims against the other +Contributors related to those performance claims and warranties, and if a court +requires any other Contributor to pay any damages as a result, the Commercial +Contributor must pay those damages. + +5. NO WARRANTY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR +IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, +NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each +Recipient is solely responsible for determining the appropriateness of using and +distributing the Program and assumes all risks associated with its exercise of +rights under this Agreement, including but not limited to the risks and costs of +program errors, compliance with applicable laws, damage to or loss of data, +programs or equipment, and unavailability or interruption of operations. + +6. DISCLAIMER OF LIABILITY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY +CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST +PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS +GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. GENERAL + +If any provision of this Agreement is invalid or unenforceable under applicable +law, it shall not affect the validity or enforceability of the remainder of the +terms of this Agreement, and without further action by the parties hereto, such +provision shall be reformed to the minimum extent necessary to make such +provision valid and enforceable. + +If Recipient institutes patent litigation against a Contributor with respect to +a patent applicable to software (including a cross-claim or counterclaim in a +lawsuit), then any patent licenses granted by that Contributor to such Recipient +under this Agreement shall terminate as of the date such litigation is filed. In +addition, if Recipient institutes patent litigation against any entity +(including a cross-claim or counterclaim in a lawsuit) alleging that the Program +itself (excluding combinations of the Program with other software or hardware) +infringes such Recipient's patent(s), then such Recipient's rights granted under +Section 2(b) shall terminate as of the date such litigation is filed. + +All Recipient's rights under this Agreement shall terminate if it fails to +comply with any of the material terms or conditions of this Agreement and does +not cure such failure in a reasonable period of time after becoming aware of +such noncompliance. If all Recipient's rights under this Agreement terminate, +Recipient agrees to cease use and distribution of the Program as soon as +reasonably practicable. However, Recipient's obligations under this Agreement +and any licenses granted by Recipient relating to the Program shall continue and +survive. + +Everyone is permitted to copy and distribute copies of this Agreement, but in +order to avoid inconsistency the Agreement is copyrighted and may only be +modified in the following manner. The Agreement Steward reserves the right to +publish new versions (including revisions) of this Agreement from time to time. +No one other than the Agreement Steward has the right to modify this Agreement. +IBM is the initial Agreement Steward. IBM may assign the responsibility to serve +as the Agreement Steward to a suitable separate entity. Each new version of the +Agreement will be given a distinguishing version number. The Program (including +Contributions) may always be distributed subject to the version of the Agreement +under which it was received. In addition, after a new version of the Agreement +is published, Contributor may elect to distribute the Program (including its +Contributions) under the new version. Except as expressly stated in Sections +2(a) and 2(b) above, Recipient receives no rights or licenses to the +intellectual property of any Contributor under this Agreement, whether +expressly, by implication, estoppel or otherwise. All rights in the Program not +expressly granted under this Agreement are reserved. + +This Agreement is governed by the laws of the State of New York and the +intellectual property laws of the United States of America. No party to this +Agreement will bring a legal action under this Agreement more than one year +after the cause of action arose. Each party waives its rights to a jury trial in +any resulting litigation. + +Special exception for LZMA compression module + +Igor Pavlov and Amir Szekely, the authors of the LZMA compression module for +NSIS, expressly permit you to statically or dynamically link your code (or bind +by name) to the files from the LZMA compression module for NSIS without +subjecting your linked code to the terms of the Common Public license version +1.0. Any modifications or additions to files from the LZMA compression module +for NSIS, however, are subject to the terms of the Common Public License version +1.0. --- tomcat6-6.0.16.orig/output/dist/NOTICE +++ tomcat6-6.0.16/output/dist/NOTICE @@ -0,0 +1,16 @@ +Apache Tomcat +Copyright 1999-2007 The Apache Software Foundation + +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). + +The Windows Installer is built with the Nullsoft +Scriptable Install Sysem (NSIS), which is +open source software. The original software and +related information is available at +http://nsis.sourceforge.net. + +Java compilation software for JSP pages is provided by Eclipse, +which is open source software. The orginal software and +related infomation is available at +http://www.eclipse.org.