Author: kkolinko
Date: Sun Oct 2 19:45:16 2011
New Revision: 1178237
URL: http://svn.apache.org/viewvc?rev=1178237&view=rev
Log:
Merged revisions r1177850, r1177862, r1178228, r1178233 from tomcat/trunk:
Removed wrong duplicate lines from aio.xml.
Javadoc for CometEvent: Added <br> tags to make it more readable.
Corrected markup.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/comet/CometEvent.java
tomcat/tc7.0.x/trunk/webapps/docs/aio.xml
tomcat/tc7.0.x/trunk/webapps/docs/index.xml
tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 2 19:45:16 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256
,1173288,1173333,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177978,1178209
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256
,1173288,1173333,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/comet/CometEvent.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/comet/CometEvent.java?rev=1178237&r1=1178236&r2=1178237&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/comet/CometEvent.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/comet/CometEvent.java Sun Oct
2 19:45:16 2011
@@ -34,7 +34,7 @@ public interface CometEvent {
/**
* Enumeration describing the major events that the container can invoke
- * the CometProcessors event() method with
+ * the CometProcessors event() method with.<br>
* BEGIN - will be called at the beginning
* of the processing of the connection. It can be used to initialize any
relevant
* fields using the request and response objects. Between the end of the
processing
@@ -43,7 +43,7 @@ public interface CometEvent {
* Note that the response object and dependent OutputStream and Writer
are still
* not synchronized, so when they are accessed by multiple threads,
* synchronization is mandatory. After processing the initial event, the
request
- * is considered to be committed.
+ * is considered to be committed.<br>
* READ - This indicates that input data is available, and that one read
can be made
* without blocking. The available and ready methods of the InputStream or
* Reader may be used to determine if there is a risk of blocking: the
servlet
@@ -54,13 +54,13 @@ public interface CometEvent {
* Alternately, it is also possible to catch any exception, perform clean
up
* on any data structure the servlet may be using, and using the close
method
* of the event. It is not allowed to attempt reading data from the
request
- * object outside of the execution of this method.
+ * object outside of the execution of this method.<br>
* END - End may be called to end the processing of the request. Fields
that have
* been initialized in the begin method should be reset. After this event
has
* been processed, the request and response objects, as well as all their
dependent
* objects will be recycled and used to process other requests. End will
also be
* called when data is available and the end of file is reached on the
request input
- * (this usually indicates the client has pipelined a request).
+ * (this usually indicates the client has pipelined a request).<br>
* ERROR - Error will be called by the container in the case where an IO
exception
* or a similar unrecoverable error occurs on the connection. Fields that
have
* been initialized in the begin method should be reset. After this event
has
@@ -71,13 +71,13 @@ public interface CometEvent {
/**
- * Event details
+ * Event details.<br>
* TIMEOUT - the connection timed out (sub type of ERROR); note that this
ERROR type is not fatal, and
- * the connection will not be closed unless the servlet uses the close
method of the event
- * CLIENT_DISCONNECT - the client connection was closed (sub type of ERROR)
- * IOEXCEPTION - an IO exception occurred, such as invalid content, for
example, an invalid chunk block (sub type of ERROR)
- * WEBAPP_RELOAD - the webapplication is being reloaded (sub type of END)
- * SERVER_SHUTDOWN - the server is shutting down (sub type of END)
+ * the connection will not be closed unless the servlet uses the close
method of the event<br>
+ * CLIENT_DISCONNECT - the client connection was closed (sub type of
ERROR)<br>
+ * IOEXCEPTION - an IO exception occurred, such as invalid content, for
example, an invalid chunk block (sub type of ERROR)<br>
+ * WEBAPP_RELOAD - the webapplication is being reloaded (sub type of
END)<br>
+ * SERVER_SHUTDOWN - the server is shutting down (sub type of END)<br>
* SESSION_END - the servlet ended the session (sub type of END)
*/
public enum EventSubType { TIMEOUT, CLIENT_DISCONNECT, IOEXCEPTION,
WEBAPP_RELOAD, SERVER_SHUTDOWN, SESSION_END }
Modified: tomcat/tc7.0.x/trunk/webapps/docs/aio.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/aio.xml?rev=1178237&r1=1178236&r2=1178237&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/aio.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/aio.xml Sun Oct 2 19:45:16 2011
@@ -85,7 +85,6 @@
<li>EventType.READ: This indicates that input data is available, and that
one read can be made
without blocking. The available and ready methods of the InputStream or
Reader may be used to determine if there is a risk of blocking: the
servlet
- should read while data is reported available, and can make one
additional read
should read while data is reported available. When encountering a read
error,
the servlet should report it by propagating the exception properly.
Throwing
an exception will cause the error event to be invoked, and the
connection
@@ -124,7 +123,6 @@
method of the event.
</li>
<li>EventSubType.CLIENT_DISCONNECT: The client connection was closed (sub
type of ERROR).
- method of the event.
</li>
<li>EventSubType.IOEXCEPTION: An IO exception occurred, such as invalid
content, for example,
an invalid chunk block (sub type of ERROR).
@@ -307,7 +305,7 @@ public class ChatServlet
<source>CometEvent event.... event.setTimeout(30*1000);</source> or
<source>event.getHttpServletRequest().setAttribute("org.apache.tomcat.comet.timeout",
new Integer(30 * 1000));</source>
This sets the timeout to 30 seconds.
- Important note, in order to set this timeout, it has to be done on the
<code>BEGIN</code> event.
+ Important note: in order to set this timeout, it has to be done on the
<code>BEGIN</code> event.
The default value is <code>soTimeout</code>
</p>
<p>If you are using the APR connector, all Comet connections will have the
same timeout value. It is <code>soTimeout*50</code>
@@ -340,10 +338,10 @@ public class ChatServlet
</p>
<ul>
- <li>org.apache.tomcat.sendfile.filename: Canonical filename of the file
which will be sent as
+ <li><code>org.apache.tomcat.sendfile.filename</code>: Canonical filename of
the file which will be sent as
a String</li>
- <li>org.apache.tomcat.sendfile.start: Start offset as a Long</li>
- <li>org.apache.tomcat.sendfile.end: End offset as a Long</li>
+ <li><code>org.apache.tomcat.sendfile.start</code>: Start offset as a
Long</li>
+ <li><code>org.apache.tomcat.sendfile.end</code>: End offset as a Long</li>
</ul>
</section>
Modified: tomcat/tc7.0.x/trunk/webapps/docs/index.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/index.xml?rev=1178237&r1=1178236&r2=1178237&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/index.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/index.xml Sun Oct 2 19:45:16 2011
@@ -68,7 +68,7 @@ Apache Tomcat 7, and using many of the A
Operating the Apache Tomcat Deployer to deploy, precompile, and validate
web
applications.</li>
<li><a href="manager-howto.html"><strong>Manager</strong></a> -
- Operating the <code>Manager</code> web app to deploy, undeploy, and
+ Operating the <strong>Manager</strong> web app to deploy, undeploy, and
redeploy applications while Apache Tomcat is running.</li>
<li><a href="realm-howto.html"><strong>Realms and Access Control</strong></a>
- Description of how to configure <em>Realms</em> (databases of users,
Modified: tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml?rev=1178237&r1=1178236&r2=1178237&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/manager-howto.xml Sun Oct 2 19:45:16 2011
@@ -79,7 +79,7 @@ example:</p>
<p>If you have Tomcat configured to support multiple virtual hosts
(websites) you would need to configure a Manager for each.</p>
-<p>There are three ways to use the <code>Manager</code> web application.</p>
+<p>There are three ways to use the <strong>Manager</strong> web
application.</p>
<ul>
<li>As an application with a user interface you use in your browser.
Here is an example URL where you can replace <code>localhost</code> with
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
