CVS tomcat4/debian
Barry Hawkins
barryh-guest@haydn.debian.org
Thu Mar 17 19:45:03 2005
Update of /cvsroot/pkg-java/tomcat4/debian
In directory haydn:/tmp/cvs-serv7018/debian
Modified Files:
README.Debian changelog control copyright rules
tomcat4.default tomcat4.init
Log Message:
Updated package to support JDKs packaged by the java-package utility.
Added settings to ensure proper behavior of IBM JDK JIT on PowerPC.
--- /cvsroot/pkg-java/tomcat4/debian/README.Debian 2004/08/13 11:49:46 1.9
+++ /cvsroot/pkg-java/tomcat4/debian/README.Debian 2005/03/18 02:44:25 1.10
@@ -22,18 +22,19 @@
junkbuster. Tomcat also listens on port 8005 (localhost only) for a
shutdown command.
-- Tomcat 4.1 needs a full Java Development Kit (JDK), a Java Runtime
+- Tomcat 4.1 needs a full Java Development Kit (JDK); a Java Runtime
Environment (JRE) is not sufficient because javac is needed for translating
JavaServer Pages (JSP) into Java classes.
- You can download Debian packages of JDK 1.3 and JDK 1.4 from Blackdown
- (http://www.blackdown.org/java-linux/mirrors.html) or add one of the mirrors
- to your /etc/apt/sources.list.
+ The java-package utility enables the creation of a Debian package
+ for your JDK, so that dependencies are appropriately handled. This is
+ recommended over manual installation of a JDK; see the java-package
+ documentation for details.
-- You can install our own web applications as .war files or in extracted form
+- You can install your own web applications as .war files or in extracted form
into a subdirectory of /var/lib/tomcat4/webapps. The name of the WAR file
or subdirectory is the servlet context for this webapp.
-- You can test if Tomcat is working properly by pointing your favourite web
+- You can test if Tomcat is working properly by pointing your favorite web
browser to http://localhost:8180/ and testing some of the Servlet and JSP
examples. This requires installation of the tomcat4-webapps package.
@@ -51,7 +52,7 @@
permissions in a new file in /etc/tomcat4/policy.d/ and re-enable the
security manager.
- Disbaling the security manager is not recommended on production systems
+ Disabling the security manager is not recommended on production systems
since a call to System.exit() in a servlet of JSP page would then stop the
whole virtual machine that is running Tomcat.
--- /cvsroot/pkg-java/tomcat4/debian/changelog 2005/01/06 13:25:32 1.23
+++ /cvsroot/pkg-java/tomcat4/debian/changelog 2005/03/18 02:44:26 1.24
@@ -1,3 +1,14 @@
+tomcat4 (4.1.31-3) unstable; urgency=low
+
+ * Changed default JSP compiler for kaffe in the tomcat4 init script
+ to be jikes now that kjc has been removed from the kaffe package
+ (Closes: #299643)
+ * Modified JDK_DIRS environment to reflect currently-supported JDK
+ paths in Debian packaging
+ * Updated license to Apache License 2.0 in copyright file
+
+ -- Barry Hawkins <barry@alltc.com> Tue, 15 Mar 2005 15:40:34 -0500
+
tomcat4 (4.1.31-2) unstable; urgency=low
* config files are reverted publicly readable because tomcat runs as
--- /cvsroot/pkg-java/tomcat4/debian/control 2005/01/06 13:25:32 1.20
+++ /cvsroot/pkg-java/tomcat4/debian/control 2005/03/18 02:44:26 1.21
@@ -2,7 +2,7 @@
Section: contrib/web
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Stefan Gybas <sgybas@debian.org>, Arnaud Vandyck <avdyk@debian.org>
+Uploaders: Stefan Gybas <sgybas@debian.org>, Arnaud Vandyck <avdyk@debian.org>, Barry Hawkins <barry@alltc.com>
Build-Depends: cdbs (>= 0.4.8), debhelper (>= 4.1.0), j2sdk1.4, libant1.6-java, libservlet2.3-java, libregexp-java, libcommons-beanutils-java, libcommons-collections-java, libcommons-fileupload-java (>= 1.0-1), libcommons-digester-java, libcommons-logging-java, libcommons-modeler-java (>= 1.1-1), libmx4j-java, libcommons-dbcp-java, libstruts1.1-java, libgnujaf-java, libgnumail-java
Standards-Version: 3.6.1
--- /cvsroot/pkg-java/tomcat4/debian/copyright 2003/10/15 10:20:30 1.2
+++ /cvsroot/pkg-java/tomcat4/debian/copyright 2005/03/18 02:44:26 1.3
@@ -7,60 +7,208 @@
The following copyright applies to this package (BSD-style license):
-/* ========================================================================= *
- * *
- * The Apache Software License, Version 1.1 *
- * *
- * Copyright (c) 1999, 2000 The Apache Software Foundation. *
- * All rights reserved. *
- * *
- * ========================================================================= *
- * *
- * Redistribution and use in source and binary forms, with or without modi- *
- * fication, are permitted provided that the following conditions are met: *
- * *
- * 1. Redistributions of source code must retain the above copyright notice *
- * notice, this list of conditions and the following disclaimer. *
- * *
- * 2. Redistributions in binary form must reproduce the above copyright *
- * notice, this list of conditions and the following disclaimer in the *
- * documentation and/or other materials provided with the distribution. *
- * *
- * 3. The end-user documentation included with the redistribution, if any, *
- * must include the following acknowlegement: *
- * *
- * "This product includes software developed by the Apache Software *
- * Foundation <http://www.apache.org/>." *
- * *
- * Alternately, this acknowlegement may appear in the software itself, if *
- * and wherever such third-party acknowlegements normally appear. *
- * *
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software *
- * Foundation" must not be used to endorse or promote products derived *
- * from this software without prior written permission. For written *
- * permission, please contact <apache@apache.org>. *
- * *
- * 5. Products derived from this software may not be called "Apache" nor may *
- * "Apache" appear in their names without prior written permission of the *
- * Apache Software Foundation. *
- * *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED 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 APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS 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. *
- * *
- * ========================================================================= *
- * *
- * This software consists of voluntary contributions made by many indivi- *
- * duals on behalf of the Apache Software Foundation. For more information *
- * on the Apache Software Foundation, please see <http://www.apache.org/>. *
- * *
- * ========================================================================= */
+/*
+ *
+ * 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.
+*/
--- /cvsroot/pkg-java/tomcat4/debian/rules 2005/01/06 13:25:32 1.8
+++ /cvsroot/pkg-java/tomcat4/debian/rules 2005/03/18 02:44:26 1.9
@@ -15,13 +15,18 @@
# The first two must be specified: This package needs JDK 1.4 to build because
# of the included JSSE (Java Secure Socket Extension) classes and some parts
# of ant-optional.
-export JITC_PROCESSOR_TYPE=6
-JAVA_HOME := /usr/lib/j2se/1.4
+JAVA_HOME := /usr/lib/j2sdk1.4-sun
ANT_HOME := /usr/share/ant1.6
+# Set the JITC_PROCESSOR_TYPE environment variable to enable JIT
+# appropriately in IBM JDKs on PowerPC architecture. This should
+# ultimately be conditional so as to avoid side effects with other
+# architectures and JDKs.
+#JITC_PROCESSOR_TYPE := 6
+
# Additional JARs to add to the class path, either full path or just the
# basename for JARs in /usr/share/java. The ".jar" suffix may also be ommitted
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar /usr/local/IBMJava2-ppc-142/jre/lib/security.jar
+DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar ${JAVA_HOME}/jre/lib/security.jar
# Build compiler
DEB_ANT_COMPILER := modern
--- /cvsroot/pkg-java/tomcat4/debian/tomcat4.default 2004/03/10 13:54:18 1.6
+++ /cvsroot/pkg-java/tomcat4/debian/tomcat4.default 2005/03/18 02:44:26 1.7
@@ -5,12 +5,17 @@
# The home directory of the Java development kit (JDK). You need at least
# JDK version 1.2, just the Java runtime environment (JRE) will not work
# because a Java compiler is needed to translate JavaServer Pages (JSP).
-# If JAVA_HOME is not set, some common directories for the j2sdk1.4 and
-# j2sdk1.3 Debian packages from Blackdown are tried. You can also set
-# JSSE_HOME here to enable SSL support (this is automatically done for
-# JDK 1.4+).
+# If JAVA_HOME is not set, some common directories for the Sun, IBM and
+# Blackdown packages prepared by the java-package utility and the Debian
+# packages from Blackdown for j2sdk1.4 and j2sdk1.3 are tried. You can
+# also set JSSE_HOME here to enable SSL support (this is automatically
+# done for JDK 1.4+). If the IBM JDK is being used with PowerPC
+# architecture, uncomment the JITC_PROCESSOR_TYPE variable to correctly
+# enable JIT for that JDK/processor combination. See the java-package
+# documentation for further information on this setting.
#JAVA_HOME=/usr/local/j2sdk1.4.0
#JSSE_HOME=/usr/local/jsse
+#JITC_PROCESSOR_TYPE=6
# Directory for per-instance configuration files and webapps. It contain the
# directories conf, logs, webapps, work and temp. See RUNNING.txt for details.
--- /cvsroot/pkg-java/tomcat4/debian/tomcat4.init 2004/08/13 11:49:46 1.11
+++ /cvsroot/pkg-java/tomcat4/debian/tomcat4.init 2005/03/18 02:44:26 1.12
@@ -20,7 +20,7 @@
# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not
# defined in $DEFAULT)
-JDK_DIRS="/usr/lib/j2se/1.4 /usr/lib/j2sdk1.4 /usr/lib/j2se/1.3 /usr/lib/j2sdk1.3 /usr/lib/kaffe"
+JDK_DIRS="/usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.3-ibm /usr/lib/j2sdk1.4 /usr/lib/j2sdk1.3 /usr/lib/j2se/1.4 /usr/lib/j2se/1.3 /usr/lib/kaffe"
# Directory for per-instance configuration files and webapps
CATALINA_BASE=/var/lib/tomcat4
@@ -69,7 +69,7 @@
# Set the JSP compiler to if we are using Kaffe and it is not set
if [ -z "$JSP_COMPILER" -a "$JAVA_HOME" = "/usr/lib/kaffe" ]; then
- JSP_COMPILER=kjc
+ JSP_COMPILER=jikes
fi
if [ -n "$JSP_COMPILER" ]; then
CATALINA_OPTS="$CATALINA_OPTS -Dbuild.compiler=$JSP_COMPILER"