From: remm Date: Fri, 10 Nov 2006 00:04:34 +0000 (+0000) Subject: - Polish, as reported by Yoav. X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=ec853c6e435f631cab3d1fd5cb0ee4f631213d83;p=tomcat7.0 - Polish, as reported by Yoav. git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@473141 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/NOTICE b/NOTICE new file mode 100644 index 000000000..c7503f8b5 --- /dev/null +++ b/NOTICE @@ -0,0 +1,13 @@ +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. \ No newline at end of file diff --git a/README.txt b/README.txt deleted file mode 100644 index 139597f9c..000000000 --- a/README.txt +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/RUNNING.txt b/RUNNING.txt new file mode 100644 index 000000000..11955abd6 --- /dev/null +++ b/RUNNING.txt @@ -0,0 +1,143 @@ +$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 JAVA_HOME to the pathname of + the directory into which you installed the JRE, 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: + +* 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. diff --git a/build.xml b/build.xml index 3c082f4f6..4bb171989 100644 --- a/build.xml +++ b/build.xml @@ -310,7 +310,7 @@ - + @@ -376,7 +376,7 @@ - + diff --git a/dist.xml b/dist.xml index c1965c052..5a1902af2 100644 --- a/dist.xml +++ b/dist.xml @@ -295,13 +295,13 @@ - + + - - + diff --git a/java/javax/servlet/jsp/tagext/TagFileInfo.java b/java/javax/servlet/jsp/tagext/TagFileInfo.java index 605bcca89..54f239c2c 100644 --- a/java/javax/servlet/jsp/tagext/TagFileInfo.java +++ b/java/javax/servlet/jsp/tagext/TagFileInfo.java @@ -33,7 +33,7 @@ public class TagFileInfo { * under request from some JSP code that is parsing a * TLD (Tag Library Descriptor). * - * Note that, since TagLibibraryInfo reflects both TLD information + * Note that, since TagLibraryInfo reflects both TLD information * and taglib directive information, a TagFileInfo instance is * dependent on a taglib directive. This is probably a * design error, which may be fixed in the future. diff --git a/webapps/ROOT/index.html b/webapps/ROOT/index.html index 029faef61..d29e6898e 100644 --- a/webapps/ROOT/index.html +++ b/webapps/ROOT/index.html @@ -147,7 +147,8 @@ - Examples
+ Servlets Examples
+ JSP Examples
Sun's Java Server Pages Site
Sun's Servlet Site
  diff --git a/webapps/ROOT/index.jsp b/webapps/ROOT/index.jsp index 0f6fa615c..bbd2aab84 100644 --- a/webapps/ROOT/index.jsp +++ b/webapps/ROOT/index.jsp @@ -148,8 +148,8 @@ - JSP Examples
- Servlet Examples
+ Servlets Examples
+ JSP Examples
WebDAV capabilities