Author: markt
Date: Mon Oct 13 14:04:33 2014
New Revision: 1631399
URL: http://svn.apache.org/r1631399
Log:
Fix some more of the Java 8 Javadoc errors in the org.apace.catalina package
Modified:
tomcat/trunk/java/org/apache/catalina/manager/JspHelper.java
tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java
tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java
tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
tomcat/trunk/java/org/apache/catalina/session/PersistentManager.java
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
tomcat/trunk/java/org/apache/catalina/startup/HomesUserDatabase.java
tomcat/trunk/java/org/apache/catalina/startup/PasswdUserDatabase.java
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
tomcat/trunk/java/org/apache/catalina/startup/Tool.java
tomcat/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreFileMover.java
tomcat/trunk/java/org/apache/catalina/tribes/Channel.java
tomcat/trunk/java/org/apache/catalina/tribes/ChannelInterceptor.java
tomcat/trunk/java/org/apache/catalina/tribes/group/AbsoluteOrder.java
tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java
Modified: tomcat/trunk/java/org/apache/catalina/manager/JspHelper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/JspHelper.java?rev=1631399&r1=1631398&r2=1631399&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/JspHelper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/JspHelper.java Mon Oct 13
14:04:33 2014
@@ -192,11 +192,11 @@ public class JspHelper {
* Performs the following substring replacements
* (to facilitate output to XML/HTML pages):
*
- * & -> &
- * < -> <
- * > -> >
- * " -> "
- * ' -> '
+ * & -> &amp;
+ * < -> &lt;
+ * > -> &gt;
+ * " -> &#034;
+ * ' -> &#039;
*
* See also OutSupport.writeEscapedXml().
*/
Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1631399&r1=1631398&r2=1631399&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Mon Oct
13 14:04:33 2014
@@ -81,12 +81,12 @@ import org.apache.tomcat.util.res.String
* file found at the specified URL. The <code>docBase</code> attribute
* of the context configuration file is used to locate the actual
* WAR or directory containing the application.</li>
- * <li><b>/deploy?config={config-url}&war={war-url}/</b> - Install and start
+ * <li><b>/deploy?config={config-url}&war={war-url}/</b> - Install and
start
* a new web application, based on the contents of the context
* configuration file found at <code>{config-url}</code>, overriding the
* <code>docBase</code> attribute with the contents of the web
* application archive found at <code>{war-url}</code>.</li>
- * <li><b>/deploy?path=/xxx&war={war-url}</b> - Install and start a new
+ * <li><b>/deploy?path=/xxx&war={war-url}</b> - Install and start a new
* web application attached to context path <code>/xxx</code>, based
* on the contents of the web application archive found at the
* specified URL.</li>
@@ -105,7 +105,7 @@ import org.apache.tomcat.util.res.String
* <li><b>/expire?path=/xxx</b> - List session idle timeinformation about the
* web application attached to context path <code>/xxx</code> for this
* virtual host.</li>
- * <li><b>/expire?path=/xxx&idle=mm</b> - Expire sessions
+ * <li><b>/expire?path=/xxx&idle=mm</b> - Expire sessions
* for the context path <code>/xxx</code> which were idle for at
* least mm minutes.</li>
* <li><b>/start?path=/xxx</b> - Start the web application attached to
Modified:
tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java?rev=1631399&r1=1631398&r2=1631399&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
Mon Oct 13 14:04:33 2014
@@ -54,7 +54,7 @@ import org.apache.tomcat.util.res.String
* The following actions and parameters (starting after the servlet path)
* are supported:
* <ul>
- * <li><b>/add?name={host-name}&aliases={host-aliases}&manager={manager}</b> -
+ *
<li><b>/add?name={host-name}&aliases={host-aliases}&manager={manager}</b>
-
* Create and add a new virtual host. The <code>host-name</code> attribute
* indicates the name of the new host. The <code>host-aliases</code>
* attribute is a comma separated list of the host alias names.
Modified: tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java?rev=1631399&r1=1631398&r2=1631399&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java Mon Oct
13 14:04:33 2014
@@ -99,7 +99,7 @@ public class GenericPrincipal implements
* getUserPrincipal call if not null; if null, this will be returned
* @param loginContext - If provided, this will be used to log out the
user
* at the appropriate time
- * @param gssCredential - If provided, the user's delegated
credentials
+ * @param gssCredential - If provided, the user's delegated credentials
*/
public GenericPrincipal(String name, String password, List<String> roles,
Principal userPrincipal, LoginContext loginContext,
@@ -178,7 +178,7 @@ public class GenericPrincipal implements
/**
- * The user's delegated credentials.
+ * The user's delegated credentials.
*/
protected GSSCredential gssCredential = null;
Modified: tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=1631399&r1=1631398&r2=1631399&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java Mon Oct 13
14:04:33 2014
@@ -874,7 +874,7 @@ public class JNDIRealm extends RealmBase
* separated by parentheses. (for example, either "cn={0}", or
* "(cn={0})(cn={0},o=myorg)" Full LDAP search strings are also supported,
* but only the "OR", "|" syntax, so "(|(cn={0})(cn={0},o=myorg))" is
- * also valid. Complex search strings with &, etc are NOT supported.
+ * also valid. Complex search strings with &, etc are NOT supported.
*
* @param userPattern The new user pattern
*/
@@ -2259,13 +2259,13 @@ public class JNDIRealm extends RealmBase
* Given an LDAP search string, returns the string with certain characters
* escaped according to RFC 2254 guidelines.
* The character mapping is as follows:
- * char -> Replacement
+ * char -> Replacement
* ---------------------------
- * * -> \2a
- * ( -> \28
- * ) -> \29
- * \ -> \5c
- * \0 -> \00
+ * * -> \2a
+ * ( -> \28
+ * ) -> \29
+ * \ -> \5c
+ * \0 -> \00
* @param inString string to escape according to RFC 2254 guidelines
* @return String the escaped/encoded result
*/
Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java?rev=1631399&r1=1631398&r2=1631399&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java (original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityUtil.java Mon Oct 13
14:04:33 2014
@@ -87,7 +87,7 @@ public final class SecurityUtil{
/**
- * Perform work as a particular </code>Subject</code>. Here the work
+ * Perform work as a particular <code>Subject</code>. Here the work
* will be granted to a <code>null</code> subject.
*
* @param methodName the method to apply the security restriction
@@ -101,7 +101,7 @@ public final class SecurityUtil{
/**
- * Perform work as a particular </code>Subject</code>. Here the work
+ * Perform work as a particular <code>Subject</code>. Here the work
* will be granted to a <code>null</code> subject.
*
* @param methodName the method to apply the security restriction
@@ -127,7 +127,7 @@ public final class SecurityUtil{
/**
- * Perform work as a particular </code>Subject</code>. Here the work
+ * Perform work as a particular <code>Subject</code>. Here the work
* will be granted to a <code>null</code> subject.
*
* @param methodName the method to apply the security restriction
@@ -169,7 +169,7 @@ public final class SecurityUtil{
/**
- * Perform work as a particular </code>Subject</code>. Here the work
+ * Perform work as a particular <code>Subject</code>. Here the work
* will be granted to a <code>null</code> subject.
*
* @param methodName the method to apply the security restriction
@@ -249,7 +249,7 @@ public final class SecurityUtil{
/**
- * Perform work as a particular </code>Subject</code>. Here the work
+ * Perform work as a particular <code>Subject</code>. Here the work
* will be granted to a <code>null</code> subject.
*
* @param methodName the method to apply the security restriction
Modified: tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=1631399&r1=1631398&r2=1631399&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java Mon Oct 13
14:04:33 2014
@@ -117,7 +117,7 @@ import org.apache.catalina.util.IOTools;
*
* <B>CGI Specification</B>:<br> derived from
* <a href="http://cgi-spec.golux.com";>http://cgi-spec.golux.com</a>.
- * A work-in-progress & expired Internet Draft. Note no actual RFC describing
+ * A work-in-progress & expired Internet Draft. Note no actual RFC
describing
* the CGI specification exists. Where the behavior of this servlet differs
* from the specification cited above, it is either documented here, a bug,
* or an instance where the specification cited differs from Best
@@ -160,7 +160,6 @@ import org.apache.catalina.util.IOTools;
* </p>
* [end excerpt]
*
- * </p>
* <h2> Implementation notes</h2>
* <p>
*
@@ -229,7 +228,6 @@ import org.apache.catalina.util.IOTools;
* not needed
* <li> [add more to this TODO list]
* </ul>
- * </p>
*
* @author Martin T Dengler [[email protected]]
* @author Amy Roh
@@ -785,6 +783,7 @@ public final class CGIServlet extends Ht
*
* <p>
* Example URI:
+ * </p>
* <PRE> /servlet/cgigateway/dir1/realCGIscript/pathinfo1 </PRE>
* <ul>
* <LI><b>path</b> = $CATALINA_HOME/mywebapp/dir1/realCGIscript
@@ -792,7 +791,6 @@ public final class CGIServlet extends Ht
* <LI><b>cgiName</b> = /dir1/realCGIscript
* <LI><b>name</b> = realCGIscript
* </ul>
- * </p>
* <p>
* CGI search algorithm: search the real path below
* <my-webapp-root> and find the first non-directory in
@@ -1422,7 +1420,7 @@ public final class CGIServlet extends Ht
/**
- * Checks & sets ready status
+ * Checks and sets ready status
*/
protected void updateReadyStatus() {
if (command != null
@@ -1505,6 +1503,7 @@ public final class CGIServlet extends Ht
*
* <p>
* This implements the following CGI specification recommedations:
+ * </p>
* <UL>
* <LI> Servers SHOULD provide the "<code>query</code>" component of
* the script-URI as command-line arguments to scripts if it
@@ -1544,7 +1543,6 @@ public final class CGIServlet extends Ht
* container's implementation of the Servlet API methods.
* </ul>
* </UL>
- * </p>
*
* @exception IOException if problems during reading/writing occur
*
Modified: tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java?rev=1631399&r1=1631398&r2=1631399&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java Mon Oct
13 14:04:33 2014
@@ -59,12 +59,12 @@ import org.xml.sax.SAXException;
* Servlet which adds support for WebDAV level 2. All the basic HTTP requests
* are handled by the DefaultServlet. The WebDAVServlet must not be used as the
* default servlet (ie mapped to '/') as it will not work in this
configuration.
- * <p/>
+ * <p>
* Mapping a subpath (e.g. <code>/webdav/*</code> to this servlet has the
effect
* of re-mounting the entire web application under that sub-path, with WebDAV
* access to all the resources. This <code>WEB-INF</code> and
<code>META-INF</code>
* directories are protected in this re-mounted resource tree.
- * <p/>
+ * <p>
* To enable WebDAV for a context add the following to web.xml:
* <pre>
* <servlet>
Modified: tomcat/trunk/java/org/apache/catalina/session/PersistentManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/PersistentManager.java?rev=1631399&r1=1631398&r2=1631399&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/PersistentManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/PersistentManager.java Mon
Oct 13 14:04:33 2014
@@ -23,11 +23,13 @@ package org.apache.catalina.session;
* a Store to swap active Sessions to disk. It can be configured to
* achieve several different goals:
*
+ * <ul>
* <li>Persist sessions across restarts of the Container</li>
* <li>Fault tolerance, keep sessions backed up on disk to allow
* recovery in the event of unplanned restarts.</li>
* <li>Limit the number of active sessions kept in memory by
* swapping less active sessions out to disk.</li>
+ * </ul>
*
* @author Kief Morris ([email protected])
*/
Modified: tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java?rev=1631399&r1=1631398&r2=1631399&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Mon Oct 13
14:04:33 2014
@@ -54,13 +54,13 @@ import org.xml.sax.SAXParseException;
* <li><b>-config {pathname}</b> - Set the pathname of the configuration file
* to be processed. If a relative path is specified, it will be
* interpreted as relative to the directory pathname specified by the
- * "catalina.base" system property. [conf/server.xml]
- * <li><b>-help</b> - Display usage information.
- * <li><b>-nonaming</b> - Disable naming support.
- * <li><b>configtest</b> - Try to test the config
- * <li><b>start</b> - Start an instance of Catalina.
- * <li><b>stop</b> - Stop the currently running instance of Catalina.
- * </u>
+ * "catalina.base" system property. [conf/server.xml]</li>
+ * <li><b>-help</b> - Display usage information.</li>
+ * <li><b>-nonaming</b> - Disable naming support.</li>
+ * <li><b>configtest</b> - Try to test the config</li>
+ * <li><b>start</b> - Start an instance of Catalina.</li>
+ * <li><b>stop</b> - Stop the currently running instance of
Catalina.</li>
+ * </ul>
*
* @author Craig R. McClanahan
* @author Remy Maucherat
Modified: tomcat/trunk/java/org/apache/catalina/startup/HomesUserDatabase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HomesUserDatabase.java?rev=1631399&r1=1631398&r2=1631399&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/HomesUserDatabase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HomesUserDatabase.java Mon
Oct 13 14:04:33 2014
@@ -25,7 +25,7 @@ import java.util.Hashtable;
/**
- * Concrete implementation of the <strong>UserDatabase</code> interface
+ * Concrete implementation of the <code>UserDatabase</code> interface
* considers all directories in a directory whose pathname is specified
* to our constructor to be "home" directories for those users.
*
Modified: tomcat/trunk/java/org/apache/catalina/startup/PasswdUserDatabase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/PasswdUserDatabase.java?rev=1631399&r1=1631398&r2=1631399&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/PasswdUserDatabase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/PasswdUserDatabase.java Mon
Oct 13 14:04:33 2014
@@ -27,7 +27,7 @@ import java.util.Hashtable;
/**
- * Concrete implementation of the <strong>UserDatabase</code> interface
+ * Concrete implementation of the <code>UserDatabase</code> interface
* that processes the <code>/etc/passwd</code> file on a Unix system.
*
* @author Craig R. McClanahan
Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1631399&r1=1631398&r2=1631399&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Mon Oct 13
14:04:33 2014
@@ -183,7 +183,7 @@ public class Tomcat {
}
/**
- * This is equivalent to adding a web application to Tomcat's webapps
+ * This is equivalent to adding a web application to Tomcat's webapps
* directory. The equivalent of the default web.xml will be applied to the
* web application and any WEB-INF/web.xml and META-INF/context.xml
packaged
* with the application will be processed normally. Normal web fragment and
@@ -240,8 +240,7 @@ public class Tomcat {
}
/**
- * Equivalent with
- * <servlet><servlet-name><servlet-class>.
+ * Equivalent to <servlet><servlet-name><servlet-class>.
*
* In general it is better/faster to use the method that takes a
* Servlet as param - this one can be used if the servlet is not
Modified: tomcat/trunk/java/org/apache/catalina/startup/Tool.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tool.java?rev=1631399&r1=1631398&r2=1631399&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Tool.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tool.java Mon Oct 13 14:04:33
2014
@@ -56,7 +56,7 @@ import org.apache.tomcat.util.ExceptionU
* to corresponding to the value of <code>catalina.home</code>
* (useful when your command line tool runs Ant).</li>
* <li><em>-common</em> : Add <code>common/classes</code> and
- * <code>common/lib</codE) to the class loader repositories.</li>
+ * <code>common/lib</code> to the class loader repositories.</li>
* <li><em>-server</em> : Add <code>server/classes</code> and
* <code>server/lib</code> to the class loader repositories.</li>
* <li><em>-shared</em> : Add <code>shared/classes</code> and
Modified: tomcat/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java?rev=1631399&r1=1631398&r2=1631399&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java Mon
Oct 13 14:04:33 2014
@@ -36,17 +36,17 @@ import javax.servlet.ServletContext;
/**
* A variation of Java's JAR ServiceLoader that respects exclusion rules for
* web applications.
- * <p/>
+ * <p>
* Primarily intended for use loading ServletContainerInitializers as defined
* by Servlet 8.2.4. This implementation does not attempt lazy loading as the
* container is required to introspect all implementations discovered.
- * <p/>
+ * <p>
* If the ServletContext defines ORDERED_LIBS, then only JARs in WEB-INF/lib
* that are named in that set will be included in the search for
* provider configuration files; if ORDERED_LIBS is not defined then
* all JARs will be searched for provider configuration files. Providers
* defined by resources in the parent ClassLoader will always be returned.
- * <p/>
+ * <p>
* Provider classes will be loaded using the context's ClassLoader.
*
* @see javax.servlet.ServletContainerInitializer
Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java?rev=1631399&r1=1631398&r2=1631399&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java Mon
Oct 13 14:04:33 2014
@@ -346,8 +346,8 @@ public class StoreAppender {
}
/**
- * Given a string, this method replaces all occurrences of ' <', '>', '&',
- * and '"'.
+ * Given a string, this method replaces all occurrences of '<', '>',
+ * '&', and '"'.
*/
public String convertStr(String input) {
Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/StoreFileMover.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StoreFileMover.java?rev=1631399&r1=1631398&r2=1631399&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StoreFileMover.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StoreFileMover.java Mon
Oct 13 14:04:33 2014
@@ -147,7 +147,7 @@ public class StoreFileMover {
}
/**
- * Shuffle old->save and new->old
+ * Shuffle old->save and new->old
*
* @throws IOException
*/
Modified: tomcat/trunk/java/org/apache/catalina/tribes/Channel.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/Channel.java?rev=1631399&r1=1631398&r2=1631399&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/Channel.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/Channel.java Mon Oct 13
14:04:33 2014
@@ -323,7 +323,7 @@ public interface Channel {
/**
* Returns true if there are any members in the group,
- * this call is the same as <code>getMembers().length>0</code>
+ * this call is the same as <code>getMembers().length > 0</code>
* @return boolean - true if there are any members automatically discovered
*/
public boolean hasMembers() ;
Modified: tomcat/trunk/java/org/apache/catalina/tribes/ChannelInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/ChannelInterceptor.java?rev=1631399&r1=1631398&r2=1631399&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/ChannelInterceptor.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/ChannelInterceptor.java Mon
Oct 13 14:04:33 2014
@@ -34,7 +34,7 @@ public interface ChannelInterceptor exte
* When a message is sent, the options can be retrieved from
ChannelMessage.getOptions()
* and if the bit is set, this interceptor will react to it.<br>
* A simple evaluation if an interceptor should react to the message would
be:<br>
- * <code>boolean react = (getOptionFlag() == (getOptionFlag() &
ChannelMessage.getOptions()));</code><br>
+ * <code>boolean react = (getOptionFlag() == (getOptionFlag() &
ChannelMessage.getOptions()));</code><br>
* The default option is 0, meaning there is no way for the application to
trigger the
* interceptor. The interceptor itself will decide.<br>
* @return int
@@ -116,14 +116,14 @@ public interface ChannelInterceptor exte
public boolean hasMembers() ;
/**
- * Intercepts the code>Channel.getMembers()</code> method
+ * Intercepts the <code>Channel.getMembers()</code> method
* @return Member[]
* @see Channel#getMembers()
*/
public Member[] getMembers() ;
/**
- * Intercepts the code>Channel.getLocalMember(boolean)</code> method
+ * Intercepts the <code>Channel.getLocalMember(boolean)</code> method
* @param incAliveTime boolean
* @return Member
* @see Channel#getLocalMember(boolean)
@@ -131,7 +131,7 @@ public interface ChannelInterceptor exte
public Member getLocalMember(boolean incAliveTime) ;
/**
- * Intercepts the code>Channel.getMember(Member)</code> method
+ * Intercepts the <code>Channel.getMember(Member)</code> method
* @param mbr Member
* @return Member - the actual member information, including stay alive
* @see Channel#getMember(Member)
Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/AbsoluteOrder.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/AbsoluteOrder.java?rev=1631399&r1=1631398&r2=1631399&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/AbsoluteOrder.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/AbsoluteOrder.java Mon
Oct 13 14:04:33 2014
@@ -31,15 +31,14 @@ import org.apache.catalina.tribes.Member
* Ordering members can serve as a basis for electing a leader or
coordinating efforts.<br>
* This is stinky simple, it works on the basis of the <code>Member</code>
interface
* and orders members in the following format:
- *
- * <ol>
+ * </p>
+ * <ol>
* <li>IP comparison - byte by byte, lower byte higher rank</li>
* <li>IPv4 addresses rank higher than IPv6, ie the lesser number of
bytes, the higher rank</li>
* <li>Port comparison - lower port, higher rank</li>
* <li>UniqueId comparison- byte by byte, lower byte higher rank</li>
- * </ol>
+ * </ol>
*
- * </p>
*
* @version 1.0
* @see org.apache.catalina.tribes.Member
Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java?rev=1631399&r1=1631398&r2=1631399&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java Mon
Oct 13 14:04:33 2014
@@ -120,9 +120,9 @@ public class GroupChannel extends Channe
* <code>channel.addInterceptor(C);</code><br>
* <code>channel.addInterceptor(B);</code><br>
* Will result in a interceptor stack like this:<br>
- * <code>A -> C -> B</code><br>
+ * <code>A -> C -> B</code><br>
* The complete stack will look like this:<br>
- * <code>Channel -> A -> C -> B -> ChannelCoordinator</code><br>
+ * <code>Channel -> A -> C -> B ->
ChannelCoordinator</code><br>
* @param interceptor ChannelInterceptorBase
*/
@Override
@@ -168,7 +168,7 @@ public class GroupChannel extends Channe
/**
* Send a message to the destinations specified
- * @param destination Member[] - destination.length > 0
+ * @param destination Member[] - destination.length > 0
* @param msg Serializable - the message to send
* @param options sender options, options can trigger guarantee levels and
different
* interceptors to react to the message see class
documentation for the
@@ -185,7 +185,7 @@ public class GroupChannel extends Channe
/**
*
- * @param destination Member[] - destination.length > 0
+ * @param destination Member[] - destination.length > 0
* @param msg Serializable - the message to send
* @param options sender options, options can trigger guarantee levels and
different
* interceptors to react to the message see class
documentation for the
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java?rev=1631399&r1=1631398&r2=1631399&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
Mon Oct 13 14:04:33 2014
@@ -35,9 +35,9 @@ import org.apache.catalina.tribes.io.XBy
* and smaller messages can make it through.
*
* <br><b>Configuration Options</b><br>
- * OrderInteceptor.expire=<milliseconds> - how long do we keep the fragments
in memory and wait for the rest to arrive<b>default=60,000ms -> 60seconds</b>
+ * OrderInteceptor.expire=<milliseconds> - how long do we keep the
fragments in memory and wait for the rest to arrive<b>default=60,000ms ->
60seconds</b>
* This setting is useful to avoid OutOfMemoryErrors<br>
- * OrderInteceptor.maxSize=<max message size> - message size in bytes
<b>default=1024*100 (around a tenth of a MB)</b><br>
+ * OrderInteceptor.maxSize=<max message size> - message size in bytes
<b>default=1024*100 (around a tenth of a MB)</b><br>
* @version 1.0
*/
public class FragmentationInterceptor extends ChannelInterceptorBase {
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java?rev=1631399&r1=1631398&r2=1631399&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
Mon Oct 13 14:04:33 2014
@@ -41,10 +41,10 @@ import org.apache.catalina.tribes.io.XBy
* and the queue might become rather large. If this is the case, then you
might want to set
* the value OrderInterceptor.maxQueue = 25 (meaning that we will never keep
more than 25 messages in our queue)
* <br><b>Configuration Options</b><br>
- * OrderInteceptor.expire=<milliseconds> - if a message arrives out of order,
how long before we act on it <b>default=3000ms</b><br>
- * OrderInteceptor.maxQueue=<max queue size> - how much can the queue grow to
ensure ordering.
+ * OrderInteceptor.expire=<milliseconds> - if a message arrives out of
order, how long before we act on it <b>default=3000ms</b><br>
+ * OrderInteceptor.maxQueue=<max queue size> - how much can the queue
grow to ensure ordering.
* This setting is useful to avoid
OutOfMemoryErrors<b>default=Integer.MAX_VALUE</b><br>
- * OrderInterceptor.forwardExpired=<boolean> - this flag tells the interceptor
what to
+ * OrderInterceptor.forwardExpired=<boolean> - this flag tells the
interceptor what to
* do when a message has expired or the queue has grown larger than the
maxQueue value.
* true means that the message is sent up the stack to the receiver that will
receive and out of order message
* false means, forget the message and reset the message counter.
<b>default=true</b>
Modified: tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java?rev=1631399&r1=1631398&r2=1631399&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java Mon Oct 13
14:04:33 2014
@@ -37,10 +37,10 @@ import java.util.concurrent.atomic.Atomi
* <br>
* Transfer package:
* <ul>
- * <li><b>START_DATA/b> - 7 bytes - <i>FLT2002</i></li>
+ * <li><b>START_DATA</b>- 7 bytes - <i>FLT2002</i></li>
* <li><b>SIZE</b> - 4 bytes - size of the data package</li>
* <li><b>DATA</b> - should be as many bytes as the prev SIZE</li>
- * <li><b>END_DATA</b> - 7 bytes - <i>TLF2003</i></lI>
+ * <li><b>END_DATA</b> - 7 bytes - <i>TLF2003</i></li>
* </ul>
*/
public class XByteBuffer
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java?rev=1631399&r1=1631398&r2=1631399&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
Mon Oct 13 14:04:33 2014
@@ -57,7 +57,7 @@ import org.apache.juli.logging.LogFactor
* each time the object gets replicated the entire object gets serialized,
hence a call to <code>replicate(true)</code>
* will replicate all objects in this map that are using this node as primary.
*
- * <br><br><b>REMBER TO CALL <code>breakdown()</code> or
<code>finalize()</code> when you are done with the map to
+ * <br><br><b>REMBER TO CALL</b> <code>breakdown()</code> or
<code>finalize()</code> when you are done with the map to
* avoid memory leaks.<br><br>
* TODO implement periodic sync/transfer thread
* @version 1.0
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java?rev=1631399&r1=1631398&r2=1631399&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java
Mon Oct 13 14:04:33 2014
@@ -38,11 +38,11 @@ import org.apache.juli.logging.LogFactor
*
* This is a state machine, handled by the process method
* States are:
- * - NOT_CONNECTED -> connect() -> CONNECTED
- * - CONNECTED -> setMessage() -> READY TO WRITE
- * - READY_TO_WRITE -> write() -> READY TO WRITE | READY TO READ
- * - READY_TO_READ -> read() -> READY_TO_READ | TRANSFER_COMPLETE
- * - TRANSFER_COMPLETE -> CONNECTED
+ * - NOT_CONNECTED -> connect() -> CONNECTED
+ * - CONNECTED -> setMessage() -> READY TO WRITE
+ * - READY_TO_WRITE -> write() -> READY TO WRITE | READY TO READ
+ * - READY_TO_READ -> read() -> READY_TO_READ | TRANSFER_COMPLETE
+ * - TRANSFER_COMPLETE -> CONNECTED
*
* @version 1.0
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
