From d0dae1964e9b65b883c02d2946694a77dc4c11c9 Mon Sep 17 00:00:00 2001 From: markt Date: Thu, 5 Nov 2009 19:08:42 +0000 Subject: [PATCH] https://issues.apache.org/bugzilla/show_bug.cgi?id=48137 Fix javadoc typos Patch provided by qingyang.xu git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@833130 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/Cluster.java | 2 +- java/org/apache/catalina/CometEvent.java | 4 ++-- java/org/apache/catalina/CometProcessor.java | 2 +- java/org/apache/catalina/Context.java | 6 +++--- java/org/apache/catalina/Host.java | 6 +++--- java/org/apache/catalina/Pipeline.java | 4 ++-- java/org/apache/catalina/ant/BaseRedirectorHelperTask.java | 8 ++++---- java/org/apache/catalina/ant/JKStatusUpdateTask.java | 2 +- java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java | 6 +++--- java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java | 2 +- java/org/apache/catalina/ant/jmx/JMXAccessorTask.java | 2 +- .../apache/catalina/authenticator/AuthenticatorBase.java | 2 +- .../apache/catalina/authenticator/FormAuthenticator.java | 4 ++-- java/org/apache/catalina/authenticator/SingleSignOn.java | 2 +- java/org/apache/catalina/connector/Connector.java | 2 +- java/org/apache/catalina/connector/CoyoteAdapter.java | 2 +- java/org/apache/catalina/connector/CoyoteInputStream.java | 2 +- java/org/apache/catalina/connector/CoyoteReader.java | 2 +- java/org/apache/catalina/connector/OutputBuffer.java | 2 +- java/org/apache/catalina/connector/Request.java | 12 ++++++------ java/org/apache/catalina/connector/RequestFacade.java | 4 ++-- java/org/apache/catalina/connector/Response.java | 4 ++-- java/org/apache/catalina/deploy/ContextService.java | 2 +- java/org/apache/catalina/filters/WebdavFixFilter.java | 2 +- .../catalina/ha/authenticator/ClusterSingleSignOn.java | 2 +- java/org/apache/catalina/ha/backend/CollectedInfo.java | 2 +- java/org/apache/catalina/ha/backend/HeartbeatListener.java | 2 +- java/org/apache/catalina/ha/deploy/FarmWarDeployer.java | 4 ++-- java/org/apache/catalina/ha/deploy/FileMessageFactory.java | 2 +- java/org/apache/catalina/ha/deploy/WarWatcher.java | 2 +- java/org/apache/catalina/ha/session/DeltaManager.java | 6 +++--- java/org/apache/catalina/ha/session/DeltaRequest.java | 2 +- java/org/apache/catalina/ha/session/DeltaSession.java | 2 +- .../apache/catalina/ha/session/JvmRouteBinderValve.java | 14 +++++++------- .../org/apache/catalina/ha/session/SessionMessageImpl.java | 2 +- java/org/apache/catalina/ha/tcp/ReplicationValve.java | 4 ++-- java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java | 4 ++-- java/org/apache/catalina/loader/WebappClassLoader.java | 4 ++-- java/org/apache/catalina/manager/HTMLManagerServlet.java | 6 +++--- java/org/apache/catalina/manager/JMXProxyServlet.java | 2 +- java/org/apache/catalina/manager/ManagerServlet.java | 2 +- .../catalina/manager/host/HTMLHostManagerServlet.java | 4 ++-- java/org/apache/catalina/manager/util/SessionUtils.java | 2 +- .../apache/catalina/mbeans/ContextEnvironmentMBean.java | 2 +- .../apache/catalina/mbeans/ContextResourceLinkMBean.java | 2 +- java/org/apache/catalina/mbeans/ContextResourceMBean.java | 2 +- java/org/apache/catalina/mbeans/MBeanFactory.java | 12 ++++++------ .../apache/catalina/mbeans/ServerLifecycleListener.java | 4 ++-- java/org/apache/catalina/realm/DataSourceRealm.java | 4 ++-- java/org/apache/catalina/realm/JAASCallbackHandler.java | 6 +++--- java/org/apache/catalina/realm/JAASMemoryLoginModule.java | 6 +++--- java/org/apache/catalina/realm/JAASRealm.java | 6 +++--- java/org/apache/catalina/realm/JDBCRealm.java | 14 +++++++------- java/org/apache/catalina/realm/JNDIRealm.java | 2 +- java/org/apache/catalina/realm/LockOutRealm.java | 2 +- java/org/apache/catalina/realm/RealmBase.java | 2 +- java/org/apache/catalina/security/SecurityUtil.java | 10 +++++----- java/org/apache/catalina/servlets/CGIServlet.java | 12 ++++++------ java/org/apache/catalina/servlets/DefaultServlet.java | 2 +- java/org/apache/catalina/servlets/WebdavServlet.java | 12 ++++++------ java/org/apache/catalina/session/JDBCStore.java | 2 +- .../org/apache/catalina/session/PersistentManagerBase.java | 4 ++-- java/org/apache/catalina/session/StandardManager.java | 2 +- java/org/apache/catalina/ssi/ExpressionParseTree.java | 4 ++-- java/org/apache/catalina/ssi/SSIFsize.java | 2 +- .../apache/catalina/ssi/SSIServletExternalResolver.java | 2 +- .../apache/catalina/ssi/SSIStopProcessingException.java | 2 +- java/org/apache/catalina/tribes/Channel.java | 4 ++-- java/org/apache/catalina/tribes/ChannelListener.java | 2 +- java/org/apache/catalina/tribes/Heartbeat.java | 2 +- java/org/apache/catalina/tribes/Member.java | 2 +- java/org/apache/catalina/tribes/UniqueId.java | 2 +- java/org/apache/catalina/tribes/group/GroupChannel.java | 4 ++-- .../group/interceptors/MessageDispatch15Interceptor.java | 2 +- java/org/apache/catalina/tribes/io/ObjectReader.java | 2 +- .../catalina/tribes/membership/McastServiceImpl.java | 2 +- .../org/apache/catalina/tribes/transport/PooledSender.java | 2 +- .../catalina/tribes/transport/bio/BioReplicationTask.java | 2 +- .../apache/catalina/tribes/transport/bio/BioSender.java | 8 ++++---- .../catalina/tribes/transport/bio/util/FastQueue.java | 4 ++-- .../apache/catalina/tribes/transport/nio/NioSender.java | 2 +- .../catalina/tribes/transport/nio/ParallelNioSender.java | 4 ++-- java/org/apache/catalina/users/MemoryUserDatabase.java | 2 +- java/org/apache/catalina/util/Base64.java | 4 ++-- java/org/apache/catalina/util/DateTool.java | 2 +- java/org/apache/catalina/util/ExtensionValidator.java | 12 ++++++------ java/org/apache/catalina/util/IOTools.java | 2 +- java/org/apache/catalina/util/ManifestResource.java | 2 +- java/org/apache/catalina/util/ParameterMap.java | 2 +- java/org/apache/catalina/util/RequestUtil.java | 2 +- java/org/apache/catalina/util/SchemaResolver.java | 4 ++-- java/org/apache/catalina/util/Strftime.java | 6 +++--- java/org/apache/catalina/valves/AccessLogValve.java | 4 ++-- .../catalina/valves/CometConnectionManagerValve.java | 4 ++-- 94 files changed, 181 insertions(+), 181 deletions(-) diff --git a/java/org/apache/catalina/Cluster.java b/java/org/apache/catalina/Cluster.java index 13e879fe9..6a594ce29 100644 --- a/java/org/apache/catalina/Cluster.java +++ b/java/org/apache/catalina/Cluster.java @@ -105,7 +105,7 @@ public interface Cluster { /** * Register a manager with the cluster. If the cluster is not responsible * for creating a manager, then the container will at least notify the - * cluster that this mananger is participating in the cluster. + * cluster that this manager is participating in the cluster. * @param manager Manager */ public void registerManager(Manager manager); diff --git a/java/org/apache/catalina/CometEvent.java b/java/org/apache/catalina/CometEvent.java index acaff982c..341a57e61 100644 --- a/java/org/apache/catalina/CometEvent.java +++ b/java/org/apache/catalina/CometEvent.java @@ -40,7 +40,7 @@ public interface CometEvent { * fields using the request and response objects. Between the end of the processing * of this event, and the beginning of the processing of the end or error events, * it is possible to use the response object to write data on the open connection. - * Note that the response object and depedent OutputStream and Writer are still + * 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. @@ -115,7 +115,7 @@ public interface CometEvent { * Ends the Comet session. This signals to the container that * the container wants to end the comet session. This will send back to the * client a notice that the server has no more data to send as part of this - * request. The servlet should perform any needed cleanup as if it had recieved + * request. The servlet should perform any needed cleanup as if it had received * an END or ERROR event. * * @throws IOException if an IO exception occurs diff --git a/java/org/apache/catalina/CometProcessor.java b/java/org/apache/catalina/CometProcessor.java index 4536a8209..38e9f3bc3 100644 --- a/java/org/apache/catalina/CometProcessor.java +++ b/java/org/apache/catalina/CometProcessor.java @@ -25,7 +25,7 @@ import javax.servlet.Servlet; /** * This interface should be implemented by servlets which would like to handle - * asynchronous IO, recieving events when data is available for reading, and + * asynchronous IO, receiving events when data is available for reading, and * being able to output data without the need for being invoked by the container. * Note: When this interface is implemented, the service method of the servlet will * never be called, and will be replaced with a begin event. diff --git a/java/org/apache/catalina/Context.java b/java/org/apache/catalina/Context.java index b8478f4ac..46852d857 100644 --- a/java/org/apache/catalina/Context.java +++ b/java/org/apache/catalina/Context.java @@ -965,7 +965,7 @@ public interface Context extends Container { /** - * Remove the tag library location forthe specified tag library URI. + * Remove the tag library location for the specified tag library URI. * * @param uri URI, relative to the web.xml file */ @@ -1010,7 +1010,7 @@ public interface Context extends Container { /** * Get the server.xml attribute's xmlNamespaceAware. - * @return true if namespace awarenes is enabled. + * @return true if namespace awareness is enabled. * */ public boolean getXmlNamespaceAware(); @@ -1062,7 +1062,7 @@ public interface Context extends Container { /** * Get the server.xml <host> attribute's xmlNamespaceAware. - * @return true if namespace awarenes is enabled. + * @return true if namespace awareness is enabled. */ public boolean getTldNamespaceAware(); diff --git a/java/org/apache/catalina/Host.java b/java/org/apache/catalina/Host.java index 296839f43..b205de90f 100644 --- a/java/org/apache/catalina/Host.java +++ b/java/org/apache/catalina/Host.java @@ -102,7 +102,7 @@ public interface Host extends Container { /** * Return the value of the auto deploy flag. If true, it indicates that - * this host's child webapps should be discovred and automatically + * this host's child webapps should be discovered and automatically * deployed dynamically. */ public boolean getAutoDeploy(); @@ -134,7 +134,7 @@ public interface Host extends Container { /** * Return the value of the deploy on startup flag. If true, it indicates - * that this host's child webapps should be discovred and automatically + * that this host's child webapps should be discovered and automatically * deployed. */ public boolean getDeployOnStartup(); @@ -168,7 +168,7 @@ public interface Host extends Container { /** * Get the server.xml <host> attribute's xmlNamespaceAware. - * @return true if namespace awarenes is enabled. + * @return true if namespace awareness is enabled. * */ public boolean getXmlNamespaceAware(); diff --git a/java/org/apache/catalina/Pipeline.java b/java/org/apache/catalina/Pipeline.java index d457115d5..cfcf303d6 100644 --- a/java/org/apache/catalina/Pipeline.java +++ b/java/org/apache/catalina/Pipeline.java @@ -54,7 +54,7 @@ public interface Pipeline { /** *

Set the Valve instance that has been distinguished as the basic - * Valve for this Pipeline (if any). Prioer to setting the basic Valve, + * Valve for this Pipeline (if any). Prior to setting the basic Valve, * the Valve's setContainer() will be called, if it * implements Contained, with the owning Container as an * argument. The method may throw an IllegalArgumentException @@ -84,7 +84,7 @@ public interface Pipeline { * * @exception IllegalArgumentException if this Container refused to * accept the specified Valve - * @exception IllegalArgumentException if the specifie Valve refuses to be + * @exception IllegalArgumentException if the specified Valve refuses to be * associated with this Container * @exception IllegalStateException if the specified Valve is already * associated with a different Container diff --git a/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java b/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java index e14ac3747..326a70e4b 100644 --- a/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java +++ b/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java @@ -93,7 +93,7 @@ public abstract class BaseRedirectorHelperTask extends Task { /** * Flag which indicates that, if redirected, output should also be - * always sent to the log. Default is that otput is sent only to + * always sent to the log. Default is that output is sent only to * redirected streams. */ protected boolean alwaysLog = false; @@ -271,7 +271,7 @@ public abstract class BaseRedirectorHelperTask extends Task { } /* * Due to depends chain, Ant could call the Task more than once, - * this is to prevent that we attempt to reuse the previuosly + * this is to prevent that we attempt to reuse the previously * closed Streams. */ redirectOutStream = null; @@ -346,7 +346,7 @@ public abstract class BaseRedirectorHelperTask extends Task { /** * Handles output with ERR priority to error stream and all other - * pritorities to output stream. + * priorities to output stream. * * @param output The output to log. Should not be null. */ @@ -360,7 +360,7 @@ public abstract class BaseRedirectorHelperTask extends Task { /** * Handles output with ERR priority to error stream and all other - * pritorities to output stream, then flushes the stream. + * priorities to output stream, then flushes the stream. * * @param output The output to log. Should not be null. */ diff --git a/java/org/apache/catalina/ant/JKStatusUpdateTask.java b/java/org/apache/catalina/ant/JKStatusUpdateTask.java index d59e9663c..cab3d8972 100644 --- a/java/org/apache/catalina/ant/JKStatusUpdateTask.java +++ b/java/org/apache/catalina/ant/JKStatusUpdateTask.java @@ -352,7 +352,7 @@ public class JKStatusUpdateTask extends AbstractCatalinaTask { } /** - * check correct lb and worker pararmeter + * check correct lb and worker parameter */ protected void checkParameter() { if (worker == null) { diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java b/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java index 4213888cf..399c7e49f 100644 --- a/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java +++ b/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java @@ -50,8 +50,8 @@ import org.apache.tools.ant.BuildException; * * with attribute attributebinding="true" you can get * all attributes also from result objects.
- * The poperty manager.lenght show the size of the result - * and with manager.[0..lenght].name the + * The property manager.lenght show the size of the result + * and with manager.[0..length].name the * resulted ObjectNames are saved. * These tasks require Ant 1.6 or later interface. * @@ -125,7 +125,7 @@ public class JMXAccessorQueryTask extends JMXAccessorTask { /** * Call Mbean server for some mbeans with same domain, attributes. - * with attributebindung=true you can save all attributes from all found objects + * with attributebinding=true you can save all attributes from all found objects * as your ant properties * @param jmxServerConnection * @param qry diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java b/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java index 581e44806..ef7d8fe64 100644 --- a/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java +++ b/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java @@ -197,7 +197,7 @@ public class JMXAccessorSetTask extends JMXAccessorTask { /** - * Get MBean Attriute from Mbean Server + * Get MBean Attribute from Mbean Server * @param jmxServerConnection * @param name * @param attribute diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java b/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java index e6bd419b4..70c7b09f4 100644 --- a/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java +++ b/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java @@ -604,7 +604,7 @@ public class JMXAccessorTask extends BaseRedirectorHelperTask { * an array and isSeparateArrayResults is true, resultproperty used as * prefix (resultproperty.0-array.length and store the * result array length at resultproperty.length. Other - * option is that you delemit your result with a delimiter + * option is that you delimit your result with a delimiter * (java.util.StringTokenizer is used). * * @param propertyPrefix diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java b/java/org/apache/catalina/authenticator/AuthenticatorBase.java index 725d0ab7e..f85e39b5c 100644 --- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java +++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java @@ -57,7 +57,7 @@ import org.apache.juli.logging.LogFactory; * Basic implementation of the Valve interface that enforces the * <security-constraint> elements in the web application * deployment descriptor. This functionality is implemented as a Valve - * so that it can be ommitted in environments that do not require these + * so that it can be omitted in environments that do not require these * features. Individual implementations of each supported authentication * method can subclass this base class as required. *

diff --git a/java/org/apache/catalina/authenticator/FormAuthenticator.java b/java/org/apache/catalina/authenticator/FormAuthenticator.java index 515505522..b67c50632 100644 --- a/java/org/apache/catalina/authenticator/FormAuthenticator.java +++ b/java/org/apache/catalina/authenticator/FormAuthenticator.java @@ -345,7 +345,7 @@ public class FormAuthenticator /** * Does this request match the saved one (so that it must be the redirect - * we signalled after successful authentication? + * we signaled after successful authentication? * * @param request The request to be verified */ @@ -409,7 +409,7 @@ public class FormAuthenticator Iterator names = saved.getHeaderNames(); while (names.hasNext()) { String name = names.next(); - // The browser isn't expecting this conditional reposponse now. + // The browser isn't expecting this conditional response now. // Assuming that it can quietly recover from an unexpected 412. // BZ 43687 if(!("If-Modified-Since".equalsIgnoreCase(name) || diff --git a/java/org/apache/catalina/authenticator/SingleSignOn.java b/java/org/apache/catalina/authenticator/SingleSignOn.java index 239810fc9..ea0805bb1 100644 --- a/java/org/apache/catalina/authenticator/SingleSignOn.java +++ b/java/org/apache/catalina/authenticator/SingleSignOn.java @@ -44,7 +44,7 @@ import org.apache.catalina.valves.ValveBase; /** * A Valve that supports a "single sign on" user experience, * where the security identity of a user who successfully authenticates to one - * web application is propogated to other web applications in the same + * web application is propagated to other web applications in the same * security domain. For successful use, the following requirements must * be met: *