Author: remm
Date: Thu Nov 9 16:04:34 2006
New Revision: 473141
URL: http://svn.apache.org/viewvc?view=rev&rev=473141
Log:
- Polish, as reported by Yoav.
Added:
tomcat/tc6.0.x/trunk/NOTICE
tomcat/tc6.0.x/trunk/RUNNING.txt (with props)
Removed:
tomcat/tc6.0.x/trunk/README.txt
Modified:
tomcat/tc6.0.x/trunk/build.xml
tomcat/tc6.0.x/trunk/dist.xml
tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/tagext/TagFileInfo.java
tomcat/tc6.0.x/trunk/webapps/ROOT/index.html
tomcat/tc6.0.x/trunk/webapps/ROOT/index.jsp
Added: tomcat/tc6.0.x/trunk/NOTICE
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/NOTICE?view=auto&rev=473141
==============================================================================
--- tomcat/tc6.0.x/trunk/NOTICE (added)
+++ tomcat/tc6.0.x/trunk/NOTICE Thu Nov 9 16:04:34 2006
@@ -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
Added: tomcat/tc6.0.x/trunk/RUNNING.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/RUNNING.txt?view=auto&rev=473141
==============================================================================
--- tomcat/tc6.0.x/trunk/RUNNING.txt (added)
+++ tomcat/tc6.0.x/trunk/RUNNING.txt Thu Nov 9 16:04:34 2006
@@ -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.
Propchange: tomcat/tc6.0.x/trunk/RUNNING.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tomcat/tc6.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?view=diff&rev=473141&r1=473140&r2=473141
==============================================================================
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Thu Nov 9 16:04:34 2006
@@ -310,7 +310,7 @@
<copy todir="${tomcat.build}/webapps/docs">
<fileset dir=".">
<include name="BUILDING.txt"/>
- <include name="README.txt"/>
+ <include name="NOTICE"/>
<include name="RUNNING.txt"/>
</fileset>
</copy>
@@ -376,7 +376,7 @@
<copy todir="${tomcat.build}/webapps/docs/printer">
<fileset dir=".">
<include name="BUILDING.txt"/>
- <include name="README.txt"/>
+ <include name="NOTICE"/>
<include name="RUNNING.txt"/>
</fileset>
</copy>
Modified: tomcat/tc6.0.x/trunk/dist.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?view=diff&rev=473141&r1=473140&r2=473141
==============================================================================
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Thu Nov 9 16:04:34 2006
@@ -295,13 +295,13 @@
<target name="dist-static" depends="dist-prepare">
<!-- Copy the top-level documentation files -->
- <copy todir="${tomcat.dist}">
+ <filter token="VERSION" value="${version}"/>
+ <copy todir="${tomcat.dist}" filtering="true">
<fileset dir=".">
<include name="INSTALLING.txt"/>
<include name="LICENSE"/>
<include name="NOTICE"/>
- <include name="README.txt"/>
- <include name="RELEASE*"/>
+ <include name="RELEASE-NOTES"/>
<include name="RUNNING.txt"/>
</fileset>
</copy>
Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/tagext/TagFileInfo.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/tagext/TagFileInfo.java?view=diff&rev=473141&r1=473140&r2=473141
==============================================================================
--- tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/tagext/TagFileInfo.java
(original)
+++ tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/tagext/TagFileInfo.java Thu Nov
9 16:04:34 2006
@@ -33,7 +33,7 @@
* 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.
Modified: tomcat/tc6.0.x/trunk/webapps/ROOT/index.html
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/ROOT/index.html?view=diff&rev=473141&r1=473140&r2=473141
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/ROOT/index.html (original)
+++ tomcat/tc6.0.x/trunk/webapps/ROOT/index.html Thu Nov 9 16:04:34 2006
@@ -147,7 +147,8 @@
</tr>
<tr>
<td class="menu">
- <a href="examples/">Examples</a><br/>
+ <a href="examples/servlets/">Servlets Examples</a><br/>
+ <a href="examples/jsp/">JSP Examples</a><br/>
<a
href="http://java.sun.com/products/jsp";>Sun's Java Server Pages Site</a><br/>
<a
href="http://java.sun.com/products/servlet";>Sun's Servlet Site</a><br/>
Modified: tomcat/tc6.0.x/trunk/webapps/ROOT/index.jsp
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/ROOT/index.jsp?view=diff&rev=473141&r1=473140&r2=473141
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/ROOT/index.jsp (original)
+++ tomcat/tc6.0.x/trunk/webapps/ROOT/index.jsp Thu Nov 9 16:04:34 2006
@@ -148,8 +148,8 @@
</tr>
<tr>
<td class="menu">
- <a href="jsp-examples/">JSP Examples</a><br/>
- <a href="servlets-examples/">Servlet Examples</a><br/>
+ <a href="examples/servlets/">Servlets Examples</a><br/>
+ <a href="examples/jsp/">JSP Examples</a><br/>
<a href="webdav/">WebDAV capabilities</a><br/>
</td>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
