Commit 9f7a6693 authored by Miguel Landaeta's avatar Miguel Landaeta

Imported Upstream version 7.0.23

parent 761f73ee
# -----------------------------------------------------------------------------
# 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.
# -----------------------------------------------------------------------------
target
output
build.properties
work
logs
*.iml
......@@ -15,7 +15,7 @@
limitations under the License.
================================================================================
$Id: BUILDING.txt 1041573 2010-12-02 20:35:15Z markt $
$Id: BUILDING.txt 1202278 2011-11-15 16:22:09Z kkolinko $
====================================================
Building The Apache Tomcat @VERSION_MAJOR_MINOR@ Servlet/JSP Container
......@@ -23,9 +23,14 @@ $Id: BUILDING.txt 1041573 2010-12-02 20:35:15Z markt $
This subproject contains the source code for Tomcat @VERSION_MAJOR_MINOR@, a container that
implements the Servlet 3.0 and JSP 2.1 specifications from the Java
Community Process <http://www.jcp.org/>. In order to build a binary
distribution version of the container from a source distribution,
do the following:
Community Process <http://www.jcp.org/>.
Note: If you just need to run Apache Tomcat, it is not necessary to build
it. You may simply download a binary distribution. It is cross-platform.
Read RUNNING.txt for the instruction on how to run it.
In order to build a binary distribution version of Apache Tomcat from a
source distribution, do the following:
(0) Download and Install a Java Development Kit
......@@ -68,17 +73,16 @@ do the following:
(2.1) Checkout or obtain the source code for Tomcat @VERSION_MAJOR_MINOR@
* Tomcat SVN repository URL:
http://svn.apache.org/repos/asf/tomcat/tc@VERSION_MAJOR_MINOR@.x/
* Tomcat @VERSION_MAJOR_MINOR@ SVN repository URL:
http://svn.apache.org/repos/asf/tomcat/tc@VERSION_MAJOR_MINOR@.x/trunk/
* Download a source package from:
http://tomcat.apache.org/download-70.cgi
* Checkout the source using SVN, selecting the desired version or
branch (current development source is at
http://svn.apache.org/repos/asf/tomcat/tc@VERSION_MAJOR_MINOR@.x/trunk/), or
unpack the source package. The location where the source has been
placed will be referred as ${tomcat.source}.
* Checkout the source using SVN, selecting a tag for released version or
trunk for the current development code, or unpack a source package. The
location where the source has been placed will be referred as
${tomcat.source}.
(2.2) Building
......@@ -87,14 +91,18 @@ do the following:
cd ${tomcat.source}
ant
* WARNING: Running this command will download libraries required to build
Tomcat to the /usr/share/java directory. On a typical Linux or MacOX
system an ordinary user will not have access to write to this directory,
and, even if you do, it may not be appropriate for you to write there.
On Windows this usually corresponds to the "C:\usr\share\java"
directory, unless Cygwin is used. Read below to learn how to customize
the directory used to download the binaries.
* NOTE: Users accessing the Internet through a proxy must use a properties
file to indicate to Ant the proxy configuration. Read below.
* WARNING: Running this command will download binaries to the /usr/share/java
directory. Make sure this is appropriate to do on your computer. On Windows,
this usually corresponds to the "C:\usr\share\java" directory, unless Cygwin
is used. Read below to customize the directory used to download the binaries.
* The build can be controlled by creating a ${tomcat.source}/build.properties
file, and adding the following content to it:
......@@ -107,7 +115,7 @@ do the following:
# ----- Default Base Path for Dependent Packages -----
# Replace this path with the directory path where dependencies binaries
# should be downloaded
base.path=/usr/share/java
base.path=/home/me/some-place-to-download-to
(3) Updating sources
......
......@@ -3,7 +3,7 @@ Please don't use them for email unless you have to. Their main
purpose is code signing.
Apache users: pgp < KEYS
Apache developers:
Apache developers:
(pgpk -ll <your name> && pgpk -xa <your name>) >> this file.
or
(gpg --fingerprint --list-sigs <your name>
......
......@@ -203,11 +203,11 @@
APACHE TOMCAT SUBCOMPONENTS:
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.
conditions of the following licenses.
For the ecj-x.x.x.jar component:
......@@ -433,7 +433,7 @@ For the Windows Installer component:
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.
License version 1.0.
zlib/libpng license
......@@ -451,7 +451,7 @@ the following restrictions:
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.
3. This notice may not be removed or altered from any source distribution.
bzip2 license
......@@ -467,7 +467,7 @@ are permitted provided that the following conditions are met:
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.
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
......
......@@ -10,8 +10,8 @@ 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 original software and
Java compilation software for JSP pages is provided by Eclipse,
which is open source software. The original software and
related information is available at
http://www.eclipse.org.
......
......@@ -15,7 +15,7 @@
limitations under the License.
================================================================================
$Id: RELEASE-NOTES 1157872 2011-08-15 15:03:57Z markt $
$Id: RELEASE-NOTES 1189163 2011-10-26 12:19:26Z kkolinko $
Apache Tomcat Version @VERSION@
......@@ -48,9 +48,9 @@ Tomcat @VERSION_MAJOR_MINOR@ is designed to run on Java SE 6 and later.
In addition, Tomcat @VERSION_MAJOR_MINOR@ 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
(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
compiler from the JDK to compile JSPs, or any other Java compiler supported
by Apache Ant.
......@@ -105,10 +105,10 @@ for use by web applications (by placing them in "lib"):
* catalina-ant.jar (Tomcat Catalina Ant tasks)
* catalina-ha.jar (High availability package)
* catalina-tribes.jar (Group communication)
* ecj-@JDT_VERSION@.jar (Eclipse JDT Java compiler)
* el-api.jar (EL 2.2 API)
* jasper.jar (Jasper 2 Compiler and Runtime)
* jasper-el.jar (Jasper 2 EL implementation)
* ecj-@JDT_VERSION@.jar (Eclipse JDT Java compiler)
* jsp-api.jar (JSP 2.2 API)
* servlet-api.jar (Servlet 3.0 API)
* tomcat-api.jar (Interfaces shared by Catalina and Jasper)
......@@ -120,7 +120,7 @@ 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
mechanism of the JVM. The default configuration defines JARs located in
"endorsed" as endorsed.
......@@ -196,23 +196,23 @@ See changelog.html in this directory.
=============================
Cryptographic software notice
=============================
This distribution includes cryptographic software. The country in
which you currently reside may have restrictions on the import,
possession, use, and/or re-export to another country, of
encryption software. BEFORE using any encryption software, please
This distribution includes cryptographic software. The country in
which you currently reside may have restrictions on the import,
possession, use, and/or re-export to another country, of
encryption software. BEFORE using any encryption software, please
check your country's laws, regulations and policies concerning the
import, possession, or use, and re-export of encryption software, to
import, possession, or use, and re-export of encryption software, to
see if this is permitted. See <http://www.wassenaar.org/> for more
information.
The U.S. Government Department of Commerce, Bureau of Industry and
Security (BIS), has classified this software as Export Commodity
Security (BIS), has classified this software as Export Commodity
Control Number (ECCN) 5D002.C.1, which includes information security
software using or performing cryptographic functions with asymmetric
algorithms. The form and manner of this Apache Software Foundation
distribution makes it eligible for export under the License Exception
ENC Technology Software Unrestricted (TSU) exception (see the BIS
Export Administration Regulations, Section 740.13) for both object
ENC Technology Software Unrestricted (TSU) exception (see the BIS
Export Administration Regulations, Section 740.13) for both object
code and source code.
The following provides more details on the included cryptographic
......
This diff is collapsed.
......@@ -36,6 +36,7 @@
<fileset file="${catalina.home}/lib/jsp-api.jar"/>
<fileset file="${catalina.home}/lib/servlet-api.jar"/>
<fileset file="${catalina.home}/lib/catalina-ant.jar"/>
<fileset file="${catalina.home}/lib/tomcat-coyote.jar"/>
</classpath>
</taskdef>
<taskdef resource="org/apache/catalina/ant/jmx/jmxaccessor.tasks">
......
......@@ -55,8 +55,8 @@ rem the version command etc.
rem Most options should go into CATALINA_OPTS.
rem
rem JAVA_ENDORSED_DIRS (Optional) Lists of of semi-colon separated directories
rem containing some jars in order to allow replacement of APIs
rem created outside of the JCP (i.e. DOM and SAX from W3C).
rem containing some jars in order to allow replacement of APIs
rem created outside of the JCP (i.e. DOM and SAX from W3C).
rem It can also be used to update the XML parser implementation.
rem Defaults to $CATALINA_HOME/endorsed.
rem
......@@ -82,7 +82,7 @@ rem LOGGING_CONFIG (Optional) Override Tomcat's logging config file
rem Example (all one line)
rem set LOGGING_CONFIG="-Djava.util.logging.config.file=%CATALINA_BASE%\conf\logging.properties"
rem
rem LOGGING_MANAGER (Optional) Override Tomcat's logging manager
rem LOGGING_MANAGER (Optional) Override Tomcat's logging manager
rem Example (all one line)
rem set LOGGING_MANAGER="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
rem
......@@ -93,7 +93,7 @@ rem set TITLE=Tomcat.Cluster#1.Server#1 [%DATE% %TIME%]
rem
rem
rem
rem $Id: catalina.bat 1146096 2011-07-13 15:20:43Z markt $
rem $Id: catalina.bat 1202062 2011-11-15 06:50:02Z mturk $
rem ---------------------------------------------------------------------------
rem Suppress Terminate batch job on CTRL+C
......
......@@ -94,7 +94,7 @@
# Example (all one line)
# LOGGING_MANAGER="-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager"
#
# $Id: catalina.sh 1146069 2011-07-13 14:47:32Z markt $
# $Id: catalina.sh 1202062 2011-11-15 06:50:02Z mturk $
# -----------------------------------------------------------------------------
# OS specific support. $var _must_ be set to either true or false.
......@@ -494,7 +494,7 @@ elif [ "$1" = "configtest" ] ; then
-Dcatalina.base=\"$CATALINA_BASE\" \
-Dcatalina.home=\"$CATALINA_HOME\" \
-Djava.io.tmpdir=\"$CATALINA_TMPDIR\" \
org.apache.catalina.startup.Bootstrap configtest
org.apache.catalina.startup.Bootstrap configtest
result=$?
if [ $result -ne 0 ]; then
echo "Configuration error detected!"
......
......@@ -18,7 +18,7 @@
# -----------------------------------------------------------------------------
# Configuration Test Script for the CATALINA Server
#
# $Id: configtest.sh 1137558 2011-06-20 09:26:36Z rjung $
# $Id: configtest.sh 1202062 2011-11-15 06:50:02Z mturk $
# -----------------------------------------------------------------------------
# Better OS/400 detection: see Bugzilla 31132
......@@ -39,13 +39,13 @@ while [ -h "$PRG" ] ; do
PRG=`dirname "$PRG"`/"$link"
fi
done
PRGDIR=`dirname "$PRG"`
EXECUTABLE=catalina.sh
# Check that target executable exists
if $os400; then
# -x will Only work on the os400 if the files are:
# -x will Only work on the os400 if the files are:
# 1. owned by the user
# 2. owned by the PRIMARY group of the user
# this will not work if the user belongs in secondary groups
......@@ -57,6 +57,6 @@ else
echo "This file is needed to run this program"
exit 1
fi
fi
fi
exec "$PRGDIR"/"$EXECUTABLE" configtest "$@"
#!/bin/sh
# 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.
#
# -----------------------------------------------------------------------------
# Commons Daemon wrapper script.
#
# $Id: daemon.sh 1202058 2011-11-15 06:37:12Z mturk $
# -----------------------------------------------------------------------------
#
# resolve links - $0 may be a softlink
ARG0="$0"
while [ -h "$ARG0" ]; do
ls=`ls -ld "$ARG0"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
ARG0="$link"
else
ARG0="`dirname $ARG0`/$link"
fi
done
DIRNAME="`dirname $ARG0`"
PROGRAM="`basename $ARG0`"
for o
do
case "$o" in
--java-home )
JAVA_HOME="$2"
shift; shift;
continue
;;
--catalina-home )
CATALINA_HOME="$2"
shift; shift;
continue
;;
--catalina-base )
CATALINA_BASE="$2"
shift; shift;
continue
;;
--catalina-pid )
CATALINA_PID="$2"
shift; shift;