svn commit: r1202035 - in /tomcat/trunk: BUILDING.txt java/org/apache/catalina/loader/WebappClassLoader.java webapps/docs/building.xml

[kk...@apache.org]

Author: kkolinko
Date: Tue Nov 15 04:23:40 2011
New Revision: 1202035

URL: http://svn.apache.org/viewvc?rev=1202035&view=rev
Log:
Correct typo in Javadoc.
Add note to BUILDING.txt, that you do not need to build Tomcat if you just want to run it.
Move warning earlier than note, so that it is more visible.

Modified:
    tomcat/trunk/BUILDING.txt
    tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
    tomcat/trunk/webapps/docs/building.xml

Modified: tomcat/trunk/BUILDING.txt
URL: http://svn.apache.org/viewvc/tomcat/trunk/BUILDING.txt?rev=1202035&r1=1202034&r2=1202035&view=diff
==============================================================================
--- tomcat/trunk/BUILDING.txt (original)
+++ tomcat/trunk/BUILDING.txt Tue Nov 15 04:23:40 2011
@@ -23,9 +23,14 @@ $Id$
 
 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
@@ -87,9 +92,6 @@ do the following:
     cd ${tomcat.source}
     ant
 
-* 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.  On a typical Linux or MacOX system an ordinary user
   will not have access to write to this directory, and, even if you do,
@@ -99,6 +101,9 @@ do the following:
   directory, unless Cygwin is used. Read the next section 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.
+
 * The build can be controlled by creating a ${tomcat.source}/build.properties
   file, and adding the following content to it:
 

Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1202035&r1=1202034&r2=1202035&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Tue Nov 15 04:23:40 2011
@@ -541,7 +541,7 @@ public class WebappClassLoader
      * If this flag is true, this class loader delegates
      * to the parent class loader
      * <strong>before</strong> searching its own repositories, as
-     * in an ordinary (non-servlet) chain of of Java class loaders.
+     * in an ordinary (non-servlet) chain of Java class loaders.
      * If set to <code>false</code> (the default),
      * this class loader will search its own repositories first, and
      * delegate to the parent only if the class or resource is not

Modified: tomcat/trunk/webapps/docs/building.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/building.xml?rev=1202035&r1=1202034&r2=1202035&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/building.xml (original)
+++ tomcat/trunk/webapps/docs/building.xml Tue Nov 15 04:23:40 2011
@@ -112,11 +112,6 @@ Use the following commands to build Tomc
 </p>
 
 <p>
-<b>NOTE:</b> Users accessing the Internet through a proxy must use a properties
-  file to indicate to Ant the proxy configuration. Read below for details.
-</p>
-
-<p>
 <b>WARNING:</b> Running this command will download binary binaries to the
   <code>/usr/share/java</code> directory by default.
   On a typical Linux or MacOX system, an ordinary user
@@ -128,6 +123,11 @@ Use the following commands to build Tomc
 </p>
 
 <p>
+<b>NOTE:</b> Users accessing the Internet through a proxy must use a properties
+  file to indicate to Ant the proxy configuration. Read below for details.
+</p>
+
+<p>
   The build can be controlled by creating a <code>${tomcat.source}/build.properties</code>
   file and adding the following content to it:
 <br/>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org