Author: kkolinko
Date: Thu Nov 10 04:06:54 2011
New Revision: 1200126
URL: http://svn.apache.org/viewvc?rev=1200126&view=rev
Log:
Merging r1187809 - Trailing whitespace removal from /webapps
/webapps/docs, 2
Modified:
tomcat/tc7.0.x/trunk/webapps/docs/WEB-INF/web.xml
tomcat/tc7.0.x/trunk/webapps/docs/api/index.html
tomcat/tc7.0.x/trunk/webapps/docs/architecture/overview.xml
tomcat/tc7.0.x/trunk/webapps/docs/architecture/project.xml
tomcat/tc7.0.x/trunk/webapps/docs/architecture/startup/serverStartup.txt
tomcat/tc7.0.x/trunk/webapps/docs/elapi/index.html
tomcat/tc7.0.x/trunk/webapps/docs/images/tomcat.svg
tomcat/tc7.0.x/trunk/webapps/docs/jspapi/index.html
tomcat/tc7.0.x/trunk/webapps/docs/servletapi/index.html
Modified: tomcat/tc7.0.x/trunk/webapps/docs/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/WEB-INF/web.xml?rev=1200126&r1=1200125&r2=1200126&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/WEB-INF/web.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/WEB-INF/web.xml Thu Nov 10 04:06:54 2011
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd";
version="3.0"
- metadata-complete="true">
+ metadata-complete="true">
<display-name>Tomcat Documentation</display-name>
<description>
Modified: tomcat/tc7.0.x/trunk/webapps/docs/api/index.html
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/api/index.html?rev=1200126&r1=1200125&r2=1200126&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/api/index.html (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/api/index.html Thu Nov 10 04:06:54 2011
@@ -23,10 +23,10 @@
<body>
-Tomcat's internal javadoc is not installed by default. Download and install
+Tomcat's internal javadoc is not installed by default. Download and install
the "fulldocs" package to get it.
-You can also access the javadoc online in the Tomcat
+You can also access the javadoc online in the Tomcat
<a href="http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/";>
documentation bundle</a>.
Modified: tomcat/tc7.0.x/trunk/webapps/docs/architecture/overview.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/architecture/overview.xml?rev=1200126&r1=1200125&r2=1200126&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/architecture/overview.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/architecture/overview.xml Thu Nov 10
04:06:54 2011
@@ -42,7 +42,7 @@ This page provides an overview of the To
<p>
In the Tomcat world, a
<a href="../config/server.html">Server</a> represents the whole container.
-Tomcat provides a default implementation of the
+Tomcat provides a default implementation of the
<a href="../api/org/apache/catalina/Server.html">Server interface</a>
which is rarely customized by users.
</p>
@@ -81,7 +81,7 @@ e.g. www.yourcompany.com, to the Tomcat
multiple hosts, and the Host element also supports network aliases such as
yourcompany.com and abc.yourcompany.com. Users rarely create custom
<a href="../api/org/apache/catalina/Host.html">Hosts</a>
-because the
+because the
<a href="../api/org/apache/catalina/core/StandardHost.html">StandardHost
implementation</a> provides significant additional functionality.
</p>
@@ -92,7 +92,7 @@ implementation</a> provides significant
A Connector handles communications with the client. There are multiple
connectors available with Tomcat. These include the
<a href="../config/http.html">HTTP connector</a> which is used for
-most HTTP traffic, especially when running Tomcat as a standalone server,
+most HTTP traffic, especially when running Tomcat as a standalone server,
and the <a href="../config/ajp.html">AJP connector</a> which implements
the AJP procotol used when connecting Tomcat to a web server such as
Apache HTTPD server. Creating a customized connector is a significant
Modified: tomcat/tc7.0.x/trunk/webapps/docs/architecture/project.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/architecture/project.xml?rev=1200126&r1=1200125&r2=1200126&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/architecture/project.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/architecture/project.xml Thu Nov 10
04:06:54 2011
@@ -24,7 +24,7 @@
The Apache Tomcat Servlet/JSP Container
</logo>
-
+
<body>
<menu name="Links">
Modified:
tomcat/tc7.0.x/trunk/webapps/docs/architecture/startup/serverStartup.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/architecture/startup/serverStartup.txt?rev=1200126&r1=1200125&r2=1200126&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/architecture/startup/serverStartup.txt
(original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/architecture/startup/serverStartup.txt
Thu Nov 10 04:06:54 2011
@@ -18,7 +18,7 @@ Tomcat 5 Startup Sequence
Sequence 1. Start from Command Line
Class: org.apache.catalina.startup.Bootstrap
What it does:
- a) Set up classloaders
+ a) Set up classloaders
commonLoader (common)-> System Loader
sharedLoader (shared)-> commonLoader -> System Loader
catalinaLoader(server) -> commonLoader -> System Loader
@@ -27,19 +27,19 @@ What it does:
setParentClassloader -> sharedLoader
Thread.contextClassloader -> catalinaLoader
c) Bootstrap.daemon.init() complete
-
+
Sequence 2. Process command line argument (start, startd, stop, stopd)
Class: org.apache.catalina.startup.Bootstrap (assume command->start)
-What it does:
+What it does:
a) Catalina.setAwait(true);
b) Catalina.load()
- b1) initDirs() -> set properties like
+ b1) initDirs() -> set properties like
catalina.home
catalina.base == catalina.home (most cases)
b2) initNaming
setProperty(javax.naming.Context.INITIAL_CONTEXT_FACTORY,
org.apache.naming.java.javaURLContextFactory ->default)
- b3) createStartDigester()
+ b3) createStartDigester()
Configures a digester for the main server.xml elements like
org.apache.catalina.core.StandardServer (can change of course :)
org.apache.catalina.deploy.NamingResources
@@ -62,7 +62,7 @@ What it does:
XML-object mapping tool, that will create the objects defined in
server.xml
Startup of the actual container has not started yet.
b5) Assigns System.out and System.err to the SystemLogHandler class
- b6) Calls initialize on all components, this makes each object
register itself with the
+ b6) Calls initialize on all components, this makes each object
register itself with the
JMX agent.
During the process call the Connectors also initialize the
adapters.
The adapters are the components that do the request pre-processing.
@@ -75,10 +75,10 @@ What it does:
c2) Starts the services under <Server> which are:
StandardService -> starts Engine (ContainerBase
->Logger,Loader,Realm,Cluster etc)
c3) StandardHost (started by the service)
- Configures a ErrorReportValvem to do proper HTML output for
different HTTP
+ Configures a ErrorReportValvem to do proper HTML output for
different HTTP
errors codes
Starts the Valves in the pipeline (at least the
ErrorReportValve)
- Configures the StandardHostValve,
+ Configures the StandardHostValve,
this valves ties the Webapp Class loader to the thread
context
it also finds the session for the request
and invokes the context pipeline
@@ -90,31 +90,31 @@ What it does:
will then invoke ContextConfig.start()
The ContextConfig.start() will process the default
web.xml (conf/web.xml)
and then process the applications web.xml
(WEB-INF/web.xml)
-
- c4) During the lifetime of the container (StandardEngine) there is a
background thread that
- keeps checking if the context has changed. If a context changes
(timestamp of war file,
+
+ c4) During the lifetime of the container (StandardEngine) there is a
background thread that
+ keeps checking if the context has changed. If a context changes
(timestamp of war file,
context xml file, web.xml) then a reload is issued
(stop/remove/deploy/start)
-
+
d) Tomcat receives a request on an HTTP port
- d1) The request is received by a separate thread which is waiting in
the PoolTcpEndPoint
+ d1) The request is received by a separate thread which is waiting in
the PoolTcpEndPoint
class. It is waiting for a request in a regular
ServerSocket.accept() method.
When a request is received, this thread wakes up.
- d2) The PoolTcpEndPoint assigns the a TcpConnection to handle the
request.
+ d2) The PoolTcpEndPoint assigns the a TcpConnection to handle the
request.
It also supplies a JMX object name to the catalina container (not
used I believe)
- d3) The processor to handle the request in this case is Coyote
Http11Processor,
+ d3) The processor to handle the request in this case is Coyote
Http11Processor,
and the process method is invoked.
This same processor is also continuing to check the input stream
of the socket
until the keep alive point is reached or the connection is
disconnected.
d4) The HTTP request is parsed using an internal buffer class (Coyote
Http11 Internal Buffer)
- The buffer class parses the request line, the headers, etc and
store the result in a
+ The buffer class parses the request line, the headers, etc and
store the result in a
Coyote request (not an HTTP request) This request contains all the
HTTP info, such
as servername, port, scheme, etc.
- d5) The processor contains a reference to an Adapter, in this case it
is the
+ d5) The processor contains a reference to an Adapter, in this case it
is the
Coyote Tomcat 5 Adapter. Once the request has been parsed, the
Http11 processor
- invokes service() on the adapter. In the service method, the
Request contains a
+ invokes service() on the adapter. In the service method, the
Request contains a
CoyoteRequest and CoyoteRespons (null for the first time)
The CoyoteRequest(Response) implements HttpRequest(Response) and
HttpServletRequest(Response)
- The adapter parses and associates everything with the request,
cookies, the context through a
+ The adapter parses and associates everything with the request,
cookies, the context through a
Mapper, etc
d6) When the parsing is finished, the CoyoteAdapter invokes its
container (StandardEngine)
and invokes the invoke(request,response) method.
Modified: tomcat/tc7.0.x/trunk/webapps/docs/elapi/index.html
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/elapi/index.html?rev=1200126&r1=1200125&r2=1200126&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/elapi/index.html (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/elapi/index.html Thu Nov 10 04:06:54 2011
@@ -23,10 +23,10 @@
<body>
-The EL Javadoc is not installed by default. Download and install
+The EL Javadoc is not installed by default. Download and install
the "fulldocs" package to get it.
-You can also access the javadoc online in the Tomcat
+You can also access the javadoc online in the Tomcat
<a href="http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/";>
documentation bundle</a>.
Modified: tomcat/tc7.0.x/trunk/webapps/docs/images/tomcat.svg
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/images/tomcat.svg?rev=1200126&r1=1200125&r2=1200126&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/images/tomcat.svg (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/images/tomcat.svg Thu Nov 10 04:06:54 2011
@@ -441,28 +441,28 @@ AJx+aX3n/OK/576ldpcalLBdTgKguLi/MzqoNQAz
i:knockout="Off"
width="26.245"
height="3.239"
- id="rect22" />
+ id="rect22" />
<svg:rect
x="133.209"
y="82.732"
i:knockout="Off"
width="26.245"
height="3.24"
- id="rect24" />
+ id="rect24" />
<svg:rect
x="213.35"
y="90.51"
i:knockout="Off"
width="26.244"
height="3.239"
- id="rect26" />
+ id="rect26" />
<svg:rect
x="213.35"
y="82.732"
i:knockout="Off"
width="26.244"
height="3.24"
- id="rect28" />
+ id="rect28" />
<svg:g
id="g30">
<svg:path
@@ -524,7 +524,7 @@ AJx+aX3n/OK/576ldpcalLBdTgKguLi/MzqoNQAz
</svg:switch>
<i:pgf
id="adobe_illustrator_pgf">
-
+
eJzdffle8sqy6H0B3gFUFGQwEyEBB2YHUEFwwJlJRJlkWGuv88d59lvVSUgICWmQ75x1716/7aed
Tnd1dXXN1fF6iuVQsjmot0J8mHG7vN70qFWbDEYxN2l1n3e70/FkhE2+G7+bZcMMdEqeS29qx7vW
aNwZ9GPkEXmYw7d951e565vTrN/t80NbpTPptqB1Mug1apPw+K+2X5sLXs7UJvAwciAfMKKbZWJ8
@@ -597,8 +597,8 @@ Tq9gNWkg3o0d20wa+dw/eUxcW08qVKtMTmaugMas
wizatDXmNPh+Zz3pKZPca/miVUv0TraDJ+qk1ZDPhN6TK+Ho2aWcVTb7/J2bW+vjIVOIhlic9HBh
0rPWQLyphTiYlAmZV1p4eqyZJiWzqGuNfjdzr3aTZpjL/RfZetLzn1jia3R1YzlpOb7Hw6m0Xqu4
nW+VecZm0qcQU37zb1lPmj9rXT09+n36pC6vYdq7vX7bdtLyZ+m9bjfpKXOXHx5aTw==
-
-
+
+
WuC9Lu9tLnF4ZLnWu+HFlu2kd2+nWxO7Sa+Z+5N8Rp8U1mKY9vI4+/ZaenmxnPTl+vvcdtKvaqSZ
s5n0Gbgl8zLuhqzXevU17F3LEm856dt5qG876chbDnj0SVGKGc/qLZPt9C4sJ5WuQluexEsoC5Py
YfOhmb5F39RJ67zfdGhcXv9jobZPpuX2jn1n82stMO/7sSROemyaFIb9+tGYvnhgnnQ82D1SJ52c
@@ -671,8 +671,8 @@ Ob0WOSR1jio9nDqMUue3qHMUKUq3csSvZ3Xq1Ptg
Z3nNCH3NqWNRhjqUGk2gKpSkUist9TbLvL5Tytt6qEs5qXXL+XNgX1tsWcA4x5NpzIu5fVmUPr/e
F+dLgFbdFzqVdaV9obsJaJVqZXPYCj0kv7mcCauVnSuZXKsdQ0rl1YzK2W3zVoeG7k4gClSqOgwi
0zH6uCoq9Zqm5TWJKxvmk+MfKzGo172aBeH6hvnk2CwG7Whsptpb00H7bCWTY3anyg==
-
-
+
+
wu6fUTK4oKJdvHOv77ZHU8OYhfm8tvE8OTGL+bUxRjK1N4IxOtaj62N2xDDGU7kop5dYjvYgrWwj
2wK1GBCkAsngUZwBRcVXKEDSbbblZ3/ewrYJUGKQaSFlxto/ZrKwna65GX7YX3PzMm6bkxhcXmcj
fEkRNOU2uSjLZH/MVudKwJki71/ny1NNV1U/YTxUc2jvhXOq3+JeJj77GxbsfUpLarRXYS5OudZY
@@ -745,8 +745,8 @@ cd4Sf1jBEaKOaIs7kxuEourZWUxi/brz2aepYLfw
lpU0fzpduDCfgeuiuNOg+mu34sI9ilY5Sb9wK1Yt8y3Xvn2YlK7TS2S6z50fUKvXWi2PjdiyTC1a
48KF+bNfpfHzr2JN6kIL8y0LQthebL2M2w7Xg6nLWPZdiHnr9TZ2YDsfRcTcdr7ZjTqqxxHxWKhk
6weNXrLfCA2Ske700iQDyFSpbktkEoff18+5/d1rjbk0kruZj6GfTebvHwuzfQYrSQ==
-
-
+
+
r7xXT5G5+/uV3l3vrNRqqTgpXKe6kodNX92XWrnD7HMY1nfvy/lLXDLxk3r1YWWKYg7MWk8aORyx
mIhXSlOsjz6TQp7dafY+de+ZP1zFTCNWa2Yb79niaMSNk5799qh0EPLGdvn7y0gyIgbGn+cHg2nN
5d07a0ny/snTzuOW53zi9yRzNwdb1VcxtlO+3854v/vlwl7rcxgSy4Wft+h3s9BOfL9ffeZbZVm+
@@ -819,8 +819,8 @@ u7e3JscnCQShlcTEo5pDNzhGk8urhE8OQ/et1Hfh
Lr62f8haovf8Yc04PYnHPo2F1PfeaU4z631eY6ArffyilmvNXmPzVZT775feLkasRMXi67xe9IHG
RiLG6bbk72QW0ObnZzHTBw8cvvxohp2JEj0ddRp+DdZ7KfHA+MPan7tg7+d8ecaLzulLOHK1XYUY
mrvBfG6fO+a0bXyU0Oru5N738i9wAo+2SWQE3ZgZA0sBGkqA/f3QS1Yus3l9c1xezQ==
-
-
+
+
/+uVsVMcWj1fydIVaJkY6tHRMYsgyXgOCkrwCO24+QfFRLx3nDYEfV74bBdsZOKA04JCxEFV1UJG
4ihRTudvQA/xn5MoHjpBJQw4PGldUl9JqfH4kDl4KEWVcNosGAXblPlIxJ+TF4Qnm4GKYrToKNmv
196V84K35xzujVvtrG/rrp3JeT8u5gNKF+J9zz9IDobDekqYpkqmiJTCYT5zJ+Pnu8Dx9uE2vnMG
@@ -893,8 +893,8 @@ wsusSN7jw1wEloC4EWVWgLXwAGaUcwOCw7LMwS+4
QIYgSWRT+EhUIDsHC5ZwC8jOMazSxghKJwkXjNsr46YubHja9QETQn+YXMGxBLvWI22wgIjSJsJa
sUXgcBBsEQSlJSLwSgP8z91wKZ0krRMfdSsDCbOBRPfidA0AggGiBsTBS6zyROQEAgduiCiSpoiE
hAQtUVmQlRYetxGIjYmyCiCw3wIBZLEXjiSpI0UlZaS56RCO/Vvrw0pOoXb4wiyMzA==
-
-
+
+
IPBw1sNSVMLjx8Ay4fBxoFlGOaQlwDEflWRcBeCdY4AKeUEGJCBa4HiJER7pmwHqwpPCSHBSgKp5
IBegdDwgAg/HgQFUzdoKpC0aZZR+oN5ESFtEwSTPiGExipvEc2FJ4pAykT/g8YWJGFw/0iXP424J
XAQQF4XXWJhbJCQjKQTCs3Bco4h3eJ8nYEELJ/HaYQfCBrA4EagPVyHKYZ6JwuBwklgBtrvqQtqO
@@ -950,7 +950,7 @@ wnlZIFSIZlhPDdDwircRaE5ws6CskOOD+8FEyYFC
ukDeRCUHcSZE8HDAoMSYAP01wiiEg5FscoCA3eHZQk4gS0TWgcxB1zOHngMGhS0GDnji58eRMPSA
yFdpGTkB8E0SH4oi3zGv1zHaaRX58RZr7VZlVOt0WyNXe1z7q+Wu9fuDSW3SGsITd3vUGk8Go5Z7
/Dn4G1vgFa2715u9zrn+L1T7Dxc=
-
+
</i:pgf>
<svg:text
xml:space="preserve"
Modified: tomcat/tc7.0.x/trunk/webapps/docs/jspapi/index.html
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/jspapi/index.html?rev=1200126&r1=1200125&r2=1200126&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/jspapi/index.html (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/jspapi/index.html Thu Nov 10 04:06:54 2011
@@ -23,10 +23,10 @@
<body>
-The JSP Javadoc is not installed by default. Download and install
+The JSP Javadoc is not installed by default. Download and install
the "fulldocs" package to get it.
-You can also access the javadoc online in the Tomcat
+You can also access the javadoc online in the Tomcat
<a href="http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/";>
documentation bundle</a>.
Modified: tomcat/tc7.0.x/trunk/webapps/docs/servletapi/index.html
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/servletapi/index.html?rev=1200126&r1=1200125&r2=1200126&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/servletapi/index.html (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/servletapi/index.html Thu Nov 10 04:06:54
2011
@@ -23,10 +23,10 @@
<body>
-The Servlet Javadoc is not installed by default. Download and install
+The Servlet Javadoc is not installed by default. Download and install
the "fulldocs" package to get it.
-You can also access the javadoc online in the Tomcat
+You can also access the javadoc online in the Tomcat
<a href="http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/";>
documentation bundle</a>.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
