You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by vi...@apache.org on 2017/01/10 15:14:53 UTC
svn commit: r1778139 - in /tomcat/trunk/java/org/apache/catalina: ./
ant/jmx/ authenticator/ authenticator/jaspic/ connector/ core/ deploy/
filters/ ha/backend/ ha/deploy/ ha/session/ ha/tcp/ manager/ realm/
security/ servlets/ session/ startup/ storec...
Author: violetagg
Date: Tue Jan 10 15:14:52 2017
New Revision: 1778139
URL: http://svn.apache.org/viewvc?rev=1778139&view=rev
Log:
Spelling fixes. Patch provided by Josh Soref.
Modified:
tomcat/trunk/java/org/apache/catalina/Session.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java
tomcat/trunk/java/org/apache/catalina/authenticator/package.html
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/java/org/apache/catalina/connector/CoyoteOutputStream.java
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapperFacade.java
tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
tomcat/trunk/java/org/apache/catalina/deploy/NamingResourcesImpl.java
tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java
tomcat/trunk/java/org/apache/catalina/ha/backend/CollectedInfo.java
tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java
tomcat/trunk/java/org/apache/catalina/ha/backend/MultiCastSender.java
tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/trunk/java/org/apache/catalina/security/SecurityListener.java
tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/catalina/startup/LifecycleListenerRule.java
tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreFactoryBase.java
tomcat/trunk/java/org/apache/catalina/tribes/ChannelException.java
tomcat/trunk/java/org/apache/catalina/tribes/ErrorHandler.java
tomcat/trunk/java/org/apache/catalina/tribes/group/RpcCallback.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java
tomcat/trunk/java/org/apache/catalina/util/Introspection.java
tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
tomcat/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
tomcat/trunk/java/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.java
Modified: tomcat/trunk/java/org/apache/catalina/Session.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Session.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Session.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Session.java Tue Jan 10 15:14:52 2017
@@ -326,7 +326,7 @@ public interface Session {
/**
* Remove a session event listener from this component.
*
- * @param listener remove the sesion listener, which will no longer be
+ * @param listener remove the session listener, which will no longer be
* notified
*/
public void removeSessionListener(SessionListener listener);
Modified: tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java Tue Jan 10 15:14:52 2017
@@ -50,7 +50,7 @@ import org.apache.tools.ant.BuildExcepti
* </pre>
* with attribute <em>attributebinding="true"</em> you can get
* all attributes also from result objects.<br>
- * The property manager.lenght show the size of the result
+ * The property manager.length 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.
Modified: tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java Tue Jan 10 15:14:52 2017
@@ -60,7 +60,7 @@ import org.apache.tools.ant.Project;
* <li>Bind Get, Call, Query result at Ant properties</li>
* </ul>
*
- * Examples: open server with reference and autorisation
+ * Examples: open server with reference and authorisation
*
* <pre>
*
Modified: tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java (original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java Tue Jan 10 15:14:52 2017
@@ -567,7 +567,7 @@ public class FormAuthenticator
String method = saved.getMethod();
MimeHeaders rmh = request.getCoyoteRequest().getMimeHeaders();
rmh.recycle();
- boolean cachable = "GET".equalsIgnoreCase(method) ||
+ boolean cacheable = "GET".equalsIgnoreCase(method) ||
"HEAD".equalsIgnoreCase(method);
Iterator<String> names = saved.getHeaderNames();
while (names.hasNext()) {
@@ -576,7 +576,7 @@ public class FormAuthenticator
// Assuming that it can quietly recover from an unexpected 412.
// BZ 43687
if(!("If-Modified-Since".equalsIgnoreCase(name) ||
- (cachable && "If-None-Match".equalsIgnoreCase(name)))) {
+ (cacheable && "If-None-Match".equalsIgnoreCase(name)))) {
Iterator<String> values = saved.getHeaderValues(name);
while (values.hasNext()) {
rmh.addValue(name).setString(values.next());
Modified: tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java (original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java Tue Jan 10 15:14:52 2017
@@ -63,7 +63,7 @@ public class AuthConfigFactoryImpl exten
@Override
public AuthConfigProvider getConfigProvider(String layer, String appContext,
RegistrationListener listener) {
- String registrationID = getRegistrarionID(layer, appContext);
+ String registrationID = getRegistrationID(layer, appContext);
RegistrationContextImpl registrationContext = registrations.get(registrationID);
if (registrationContext != null) {
registrationContext.addListener(null);
@@ -108,7 +108,7 @@ public class AuthConfigFactoryImpl exten
throw new SecurityException(e);
}
- String registrationID = getRegistrarionID(layer, appContext);
+ String registrationID = getRegistrationID(layer, appContext);
registrations.put(registrationID,
new RegistrationContextImpl(layer, appContext, description, true, provider, properties));
return registrationID;
@@ -122,7 +122,7 @@ public class AuthConfigFactoryImpl exten
log.debug(sm.getString("authConfigFactoryImpl.registerInstance",
provider.getClass().getName(), layer, appContext));
}
- String registrationID = getRegistrarionID(layer, appContext);
+ String registrationID = getRegistrationID(layer, appContext);
registrations.put(registrationID,
new RegistrationContextImpl(layer, appContext, description, false, provider, null));
return registrationID;
@@ -137,7 +137,7 @@ public class AuthConfigFactoryImpl exten
@Override
public String[] detachListener(RegistrationListener listener, String layer, String appContext) {
- String registrationID = getRegistrarionID(layer, appContext);
+ String registrationID = getRegistrationID(layer, appContext);
RegistrationContextImpl registrationContext = registrations.get(registrationID);
if (registrationContext.removeListener(listener)) {
return new String[] { registrationID };
@@ -174,7 +174,7 @@ public class AuthConfigFactoryImpl exten
}
- private String getRegistrarionID(String layer, String appContext) {
+ private String getRegistrationID(String layer, String appContext) {
return layer + ":" + appContext;
}
Modified: tomcat/trunk/java/org/apache/catalina/authenticator/package.html
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/package.html?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/package.html (original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/package.html Tue Jan 10 15:14:52 2017
@@ -36,7 +36,7 @@ following Properties file:</p>
following JavaBeans properties (with default values in square brackets):</p>
<ul>
<li><b>cache</b> - Should we cache authenticated Principals (thus avoiding
- per-request lookups in our underyling <code>Realm</code>) if this request
+ per-request lookups in our underlying <code>Realm</code>) if this request
is part of an HTTP session? [true]</li>
<li><b>debug</b> - Debugging detail level for this component. [0]</li>
</ul>
Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Tue Jan 10 15:14:52 2017
@@ -1097,7 +1097,7 @@ public class CoyoteAdapter implements Ad
/**
* Character conversion of the a US-ASCII MessageBytes.
*
- * @param mb The MessageBytes instance contaning the bytes that should be converted to chars
+ * @param mb The MessageBytes instance containing the bytes that should be converted to chars
*/
protected void convertMB(MessageBytes mb) {
Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteOutputStream.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteOutputStream.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteOutputStream.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteOutputStream.java Tue Jan 10 15:14:52 2017
@@ -125,7 +125,7 @@ public class CoyoteOutputStream extends
/**
* Checks for concurrent writes which are not permitted. This object has no
* state information so the call chain is
- * CoyoyeOutputStream->OutputBuffer->CoyoteResponse.
+ * CoyoteOutputStream->OutputBuffer->CoyoteResponse.
*
* @return <code>true</code> if this OutputStream is currently in
* non-blocking mode.
Modified: tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties Tue Jan 10 15:14:52 2017
@@ -48,7 +48,7 @@ coyoteRequest.parseParameters=Exception
coyoteRequest.postTooLarge=Parameters were not parsed because the size of the posted data was too big. Use the maxPostSize attribute of the connector to resolve this if the application should accept large POSTs.
coyoteRequest.chunkedPostTooLarge=Parameters were not parsed because the size of the posted data was too big. Because this request was a chunked request, it could not be processed further. Use the maxPostSize attribute of the connector to resolve this if the application should accept large POSTs.
coyoteRequest.alreadyAuthenticated=This request has already been authenticated
-coyoteRequest.authenticate.ise=Cannot call authenticate() after the reponse has been committed
+coyoteRequest.authenticate.ise=Cannot call authenticate() after the response has been committed
coyoteRequest.uploadLocationInvalid=The temporary upload location [{0}] is not valid
coyoteRequest.sessionEndAccessFail=Exception triggered ending access to session while recycling request
coyoteRequest.sendfileNotCanonical=Unable to determine canonical name of file [{0}] specified for use with sendfile
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Tue Jan 10 15:14:52 2017
@@ -955,7 +955,7 @@ public class Request implements HttpServ
if (isSecure() && !sslAttributesParsed) {
getAttribute(Globals.CERTIFICATES_ATTR);
}
- // Take a copy to prevent ConncurrentModificationExceptions if used to
+ // Take a copy to prevent ConcurrentModificationExceptions if used to
// remove attributes
Set<String> names = new HashSet<>();
names.addAll(attributes.keySet());
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java Tue Jan 10 15:14:52 2017
@@ -788,7 +788,7 @@ public class ApplicationContextFacade im
/**
* Use reflection to invoke the requested method. Cache the method object
* to speed up the process
- * @param appContext The AppliationContext object on which the method
+ * @param appContext The ApplicationContext object on which the method
* will be invoked
* @param methodName The method to call.
* @param params The arguments passed to the called method.
@@ -846,7 +846,7 @@ public class ApplicationContextFacade im
/**
* Executes the method of the specified <code>ApplicationContext</code>
* @param method The method object to be invoked.
- * @param context The AppliationContext object on which the method
+ * @param context The ApplicationContext object on which the method
* will be invoked
* @param params The arguments passed to the called method.
*/
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java Tue Jan 10 15:14:52 2017
@@ -393,7 +393,7 @@ final class ApplicationDispatcher implem
// This is not a real close in order to support error processing
if (wrapper.getLogger().isDebugEnabled() )
- wrapper.getLogger().debug(" Disabling the response for futher output");
+ wrapper.getLogger().debug(" Disabling the response for further output");
if (response instanceof ResponseFacade) {
((ResponseFacade) response).finish();
Modified: tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java Tue Jan 10 15:14:52 2017
@@ -49,7 +49,7 @@ public class AprLifecycleListener
private static boolean instanceCreated = false;
/**
* Info messages during init() are cached until Lifecycle.BEFORE_INIT_EVENT
- * so that, in normal (non-error) cases, init() releated log messages appear
+ * so that, in normal (non-error) cases, init() related log messages appear
* at the expected point in the lifecycle.
*/
private static final List<String> initInfoLogMessages = new ArrayList<>(3);
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Tue Jan 10 15:14:52 2017
@@ -41,8 +41,8 @@ applicationDispatcher.deallocateExceptio
applicationDispatcher.forward.ise=Cannot forward after response has been committed
applicationDispatcher.isUnavailable=Servlet {0} is currently unavailable
applicationDispatcher.serviceException=Servlet.service() for servlet {0} threw exception
-applicationDispatcher.specViolation.request=Original SevletRequest or wrapped original ServletRequest not passed to RequestDispatcher in violation of SRV.8.2 and SRV.14.2.5.1
-applicationDispatcher.specViolation.response=Original SevletResponse or wrapped original ServletResponse not passed to RequestDispatcher in violation of SRV.8.2 and SRV.14.2.5.1
+applicationDispatcher.specViolation.request=Original ServletRequest or wrapped original ServletRequest not passed to RequestDispatcher in violation of SRV.8.2 and SRV.14.2.5.1
+applicationDispatcher.specViolation.response=Original ServletResponse or wrapped original ServletResponse not passed to RequestDispatcher in violation of SRV.8.2 and SRV.14.2.5.1
applicationFilterConfig.jmxRegisterFail=JMX registration failed for filter of type [{0}] and name [{1}]
applicationFilterConfig.jmxUnregister=JMX de-registration complete for filter of type [{0}] and name [{1}]
applicationFilterConfig.jmxUnregisterFail=JMX de-registration failed for filter of type [{0}] and name [{1}]
@@ -181,7 +181,7 @@ standardEngine.notHost=Child of an Engin
standardEngine.notParent=Engine cannot have a parent Container
standardHost.asyncStateError=An asynchronous request was received for processing that was neither an async dispatch nor an error to process
standardHost.clientAbort=Remote Client Aborted Request, IOException: {0}
-standardHost.invalidErrorReportValveClass=Couldn''t load specified error report valve class: {0}
+standardHost.invalidErrorReportValveClass=Couldn't load specified error report valve class: {0}
standardHost.noContext=No Context configured to process this request
standardHost.notContext=Child of a Host must be a Context
standardHost.nullName=Host name is required
@@ -189,7 +189,7 @@ standardHost.problematicAppBase=Using an
standardHostValue.customStatusFailed=Custom error page [{0}] could not be dispatched correctly
standardServer.accept.timeout=The socket listening for the shutdown command experienced an unexpected timeout [{0}] milliseconds after the call to accept(). Is this an instance of bug 56684?
standardServer.shutdownViaPort=A valid shutdown command was received via the shutdown port. Stopping the Server instance.
-standardServer.storeConfig.notAvailable=No StoreConfig implementation was registered as an MBean named [{0}] so no configuration could be saved. A suitable MBean is normally registered via the StoreConfigLifecyleListener.
+standardServer.storeConfig.notAvailable=No StoreConfig implementation was registered as an MBean named [{0}] so no configuration could be saved. A suitable MBean is normally registered via the StoreConfigLifecycleListener.
standardService.engine.startFailed=Failed to start associated Engine
standardService.engine.stopFailed=Failed to stop associated Engine
standardService.mapperListener.startFailed=Failed to start associated MapperListener
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Tue Jan 10 15:14:52 2017
@@ -4992,7 +4992,7 @@ public class StandardContext extends Con
}
if (!dependencyCheck) {
- // do not make application available if depency check fails
+ // do not make application available if dependency check fails
ok = false;
}
@@ -5183,7 +5183,7 @@ public class StandardContext extends Con
}
// Check constraints for uncovered HTTP methods
- // Needs to be after SCIs and listeners as they may programatically
+ // Needs to be after SCIs and listeners as they may programmatically
// change constraints
if (ok) {
checkConstraintsForUncoveredMethods(findConstraints());
@@ -5408,7 +5408,7 @@ public class StandardContext extends Con
log.debug("Processing standard container shutdown");
// JNDI resources are unbound in CONFIGURE_STOP_EVENT so stop
- // naming resources before they are unbound since NamingResoucres
+ // naming resources before they are unbound since NamingResources
// does a JNDI lookup to retrieve the resource. This needs to be
// after the application has finished with the resource
if (namingResources != null) {
@@ -5465,7 +5465,7 @@ public class StandardContext extends Con
try {
resetContext();
} catch( Exception ex ) {
- log.error( "Error reseting context " + this + " " + ex, ex );
+ log.error( "Error resetting context " + this + " " + ex, ex );
}
//reset the instance manager
@@ -5685,10 +5685,10 @@ public class StandardContext extends Con
}
}
- // Note: For progammatically added Servlets this may not be the
+ // Note: For programmatically added Servlets this may not be the
// complete set of security constraints since additional
// URL patterns can be added after the application has called
- // setSecurity. For all programmatically added servilets, the
+ // setSecurity. For all programmatically added servlets, the
// #dynamicServletAdded() method sets a flag that ensures that
// the constraints are re-evaluated before the servlet is
// first used
@@ -6203,7 +6203,7 @@ public class StandardContext extends Con
}
- /* Remove a JMX notficationListener
+ /* Remove a JMX notificationListener
* @see javax.management.NotificationEmitter#removeNotificationListener(javax.management.NotificationListener, javax.management.NotificationFilter, java.lang.Object)
*/
@Override
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHost.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardHost.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardHost.java Tue Jan 10 15:14:52 2017
@@ -474,7 +474,7 @@ public class StandardHost extends Contai
/**
* Deploy XML Context config files flag mutator.
*
- * @param deployXML <code>true</code> if context descirptors should be deployed
+ * @param deployXML <code>true</code> if context descriptors should be deployed
*/
public void setDeployXML(boolean deployXML) {
@@ -582,7 +582,7 @@ public class StandardHost extends Contai
/**
* Unpack WARs flag mutator.
*
- * @param unpackWARs <code>true</code> to unpack WARs on deployement
+ * @param unpackWARs <code>true</code> to unpack WARs on deployment
*/
public void setUnpackWARs(boolean unpackWARs) {
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Tue Jan 10 15:14:52 2017
@@ -1677,7 +1677,7 @@ public class StandardWrapper extends Con
// Shut down this component
super.stopInternal();
- // Send j2ee.state.stoppped notification
+ // Send j2ee.state.stopped notification
if (this.getObjectName() != null) {
Notification notification =
new Notification("j2ee.state.stopped", this.getObjectName(),
@@ -1761,7 +1761,7 @@ public class StandardWrapper extends Con
/**
- * Remove a JMX notficationListener
+ * Remove a JMX notificationListener
* @see javax.management.NotificationEmitter#removeNotificationListener(javax.management.NotificationListener, javax.management.NotificationFilter, java.lang.Object)
*/
@Override
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapperFacade.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapperFacade.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapperFacade.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapperFacade.java Tue Jan 10 15:14:52 2017
@@ -28,7 +28,7 @@ import javax.servlet.ServletContext;
/**
* Facade for the <b>StandardWrapper</b> object.
*
- * @author Remy Maucharat
+ * @author Remy Maucherat
*/
public final class StandardWrapperFacade
implements ServletConfig {
Modified: tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml (original)
+++ tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml Tue Jan 10 15:14:52 2017
@@ -145,7 +145,7 @@
type="boolean" />
<attribute name="instanceManager"
- description="Object that creates and destroys servlets, filters, and listeners. Include dependency injection and postConstruct/preDestory handling"
+ description="Object that creates and destroys servlets, filters, and listeners. Include dependency injection and postConstruct/preDestroy handling"
type="org.apache.tomcat.InstanceManager" />
<attribute name="javaVMs"
@@ -1701,7 +1701,7 @@
impact="ACTION"
returnType="java.lang.String">
<parameter name="name"
- description="Security role reference used within this servle"
+ description="Security role reference used within this servlet"
type="java.lang.String"/>
</operation>
Modified: tomcat/trunk/java/org/apache/catalina/deploy/NamingResourcesImpl.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/NamingResourcesImpl.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/NamingResourcesImpl.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/NamingResourcesImpl.java Tue Jan 10 15:14:52 2017
@@ -120,7 +120,7 @@ public class NamingResourcesImpl extends
/**
- * The message destination referencess for this web application,
+ * The message destination references for this web application,
* keyed by name.
*/
private final HashMap<String, MessageDestinationRef> mdrs = new HashMap<>();
Modified: tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java Tue Jan 10 15:14:52 2017
@@ -464,14 +464,14 @@ public class ExpiresFilter extends Filte
DAY(Calendar.DAY_OF_YEAR), HOUR(Calendar.HOUR), MINUTE(Calendar.MINUTE), MONTH(
Calendar.MONTH), SECOND(Calendar.SECOND), WEEK(
Calendar.WEEK_OF_YEAR), YEAR(Calendar.YEAR);
- private final int calendardField;
+ private final int calendarField;
- private DurationUnit(int calendardField) {
- this.calendardField = calendardField;
+ private DurationUnit(int calendarField) {
+ this.calendarField = calendarField;
}
public int getCalendardField() {
- return calendardField;
+ return calendarField;
}
}
Modified: tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java Tue Jan 10 15:14:52 2017
@@ -877,7 +877,7 @@ public class RemoteIpFilter extends Gene
}
/**
- * Wrap the incoming <code>request</code> in a {@link XForwardedRequest} if the http header <code>x-forwareded-for</code> is not empty.
+ * Wrap the incoming <code>request</code> in a {@link XForwardedRequest} if the http header <code>x-forwarded-for</code> is not empty.
* {@inheritDoc}
*/
@Override
Modified: tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java Tue Jan 10 15:14:52 2017
@@ -43,7 +43,7 @@ import org.apache.juli.logging.LogFactor
* <p>When using this Filter, it is strongly recommended that the
* <code>org.apache.catalina.filter.RequestDumperFilter</code> logger is
* directed to a dedicated file and that the
- * <code>org.apache.juli.VerbatimFormmater</code> is used.</p>
+ * <code>org.apache.juli.VerbatimFormatter</code> is used.</p>
*
* @author Craig R. McClanahan
*/
Modified: tomcat/trunk/java/org/apache/catalina/ha/backend/CollectedInfo.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/backend/CollectedInfo.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/backend/CollectedInfo.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/backend/CollectedInfo.java Tue Jan 10 15:14:52 2017
@@ -32,7 +32,7 @@ import org.apache.tomcat.util.modeler.Re
/*
* Listener to provider informations to mod_heartbeat.c
* *msg_format = "v=%u&ready=%u&busy=%u"; (message to send).
- * send the muticast message using the format...
+ * send the multicast message using the format...
* what about the bind(IP. port) only IP makes sense (for the moment).
* BTW:v = version :-)
*/
Modified: tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/backend/HeartbeatListener.java Tue Jan 10 15:14:52 2017
@@ -29,7 +29,7 @@ import org.apache.juli.logging.LogFactor
/*
* Listener to provider informations to mod_heartbeat.c
* *msg_format = "v=%u&ready=%u&busy=%u"; (message to send).
- * send the muticast message using the format...
+ * send the multicast message using the format...
* what about the bind(IP. port) only IP makes sense (for the moment).
* BTW:v = version :-)
*/
@@ -117,7 +117,7 @@ public class HeartbeatListener implement
try {
sender.send(output);
} catch (Exception ex) {
- log.error("Unable to send colllected load information: " + ex);
+ log.error("Unable to send collected load information: " + ex);
}
}
}
Modified: tomcat/trunk/java/org/apache/catalina/ha/backend/MultiCastSender.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/backend/MultiCastSender.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/backend/MultiCastSender.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/backend/MultiCastSender.java Tue Jan 10 15:14:52 2017
@@ -73,7 +73,7 @@ public class MultiCastSender
try {
s.send(data);
} catch (Exception ex) {
- log.error("Unable to send colllected load information: " + ex);
+ log.error("Unable to send collected load information: " + ex);
s.close();
s = null;
return -1;
Modified: tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java Tue Jan 10 15:14:52 2017
@@ -98,7 +98,7 @@ public class FarmWarDeployer extends Clu
/**
* Frequency of the Farm watchDir check. Cluster wide deployment will be
- * done once for the specified amount of backgrondProcess calls (ie, the
+ * done once for the specified amount of backgroundProcess calls (ie, the
* lower the amount, the most often the checks will occur).
*/
protected int processDeployFrequency = 2;
@@ -275,7 +275,7 @@ public class FarmWarDeployer extends Clu
contextName));
} else
log.error(sm.getString(
- "farmWarDeployer.servicingUneploy",
+ "farmWarDeployer.servicingUndeploy",
contextName));
} catch (Exception ex) {
log.error(ex);
Modified: tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties Tue Jan 10 15:14:52 2017
@@ -39,7 +39,7 @@ farmWarDeployer.sendEnd=Send cluster war
farmWarDeployer.sendFragment=Send cluster war fragment path [{0}], war [{1}] to [{2}]
farmWarDeployer.sendStart=Send cluster war deployment path [{0}], war [{1}] started.
farmWarDeployer.servicingDeploy=Application [{0}] is being serviced. Touch war file [{1}] again!
-farmWarDeployer.servicingUneploy=Application [{0}] is being serviced and can't be removed from backup cluster node
+farmWarDeployer.servicingUndeploy=Application [{0}] is being serviced and can't be removed from backup cluster node
farmWarDeployer.started=Cluster FarmWarDeployer started.
farmWarDeployer.stopped=Cluster FarmWarDeployer stopped.
farmWarDeployer.undeployEnd=Undeployment from [{0}] finished.
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/JvmRouteBinderValve.java Tue Jan 10 15:14:52 2017
@@ -106,7 +106,7 @@ public class JvmRouteBinderValve extends
protected boolean enabled = true;
/**
- * number of session that no at this tomcat instanz hosted
+ * number of session that no at this tomcat instance hosted
*/
protected long numberOfSessions = 0;
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties Tue Jan 10 15:14:52 2017
@@ -72,7 +72,7 @@ jvmRoute.notFoundManager=Not found Clust
jvmRoute.turnoverInfo=Turnover Check time {0} msec
jvmRoute.valve.started=JvmRouteBinderValve started
jvmRoute.valve.stopped=JvmRouteBinderValve stopped
-jvmRoute.set.orignalsessionid=Set Orginal Session id at request attriute {0} value: {1}
+jvmRoute.set.orignalsessionid=Set Orginal Session id at request attribute {0} value: {1}
standardSession.notSerializable=Cannot serialize session attribute {0} for session {1}
standardSession.removeAttribute.ise=removeAttribute: Session already invalidated
standardSession.setAttribute.namenull=setAttribute: name parameter cannot be null
@@ -80,4 +80,4 @@ backupManager.noCluster=no cluster assoc
backupManager.startUnable=Unable to start BackupManager: [{0}]
backupManager.startFailed=Failed to start BackupManager: [{0}]
backupManager.stopped=Manager [{0}] is stopping
-clusterSessionListener.noManager=Context manager doesn''t exist:{0}
+clusterSessionListener.noManager=Context manager doesn't exist:{0}
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml Tue Jan 10 15:14:52 2017
@@ -304,7 +304,7 @@
type="boolean"/>
<attribute
name="sessionAttributeNameFilter"
- descritpion="The string pattern used for including session attributes in replication. Null means all attributes are included."
+ description="The string pattern used for including session attributes in replication. Null means all attributes are included."
type="java.lang.String"/>
<attribute
name="sessionAttributeValueClassNameFilter"
Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java Tue Jan 10 15:14:52 2017
@@ -739,7 +739,7 @@ public class SimpleTcpCluster extends Li
/**
* notify all listeners from receiving a new message is not ClusterMessage
- * emit Failure Event to LifecylceListener
+ * emit Failure Event to LifecycleListener
*
* @param msg
* received Message
Modified: tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java Tue Jan 10 15:14:52 2017
@@ -251,7 +251,7 @@ public class JMXProxyServlet extends Htt
* @param operation The name of the operation to invoke.
* @param parameters An array of Strings containing the parameters to the
* operation. They will be converted to the appropriate types to
- * call the reuested operation.
+ * call the requested operation.
* @return The value returned by the requested operation.
*/
private Object invokeOperationInternal(String onameStr, String operation, String[] parameters)
Modified: tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties Tue Jan 10 15:14:52 2017
@@ -29,7 +29,7 @@ jaasRealm.loginContextCreated=JAAS Login
jaasRealm.checkPrincipal=Checking Principal "{0}" [{1}]
jaasRealm.userPrincipalSuccess=Principal "{0}" is a valid user class. We will use this as the user Principal.
jaasRealm.userPrincipalFailure=No valid user Principal found
-jaasRealm.rolePrincipalAdd=Adding role Principal "{0}" to this user Principal''s roles
+jaasRealm.rolePrincipalAdd=Adding role Principal "{0}" to this user Principal's roles
jaasRealm.rolePrincipalFailure=No valid role Principals found.
jaasCallback.username=Returned username "{0}"
jdbcRealm.authenticateFailure=Username {0} NOT successfully authenticated
Modified: tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java Tue Jan 10 15:14:52 2017
@@ -421,7 +421,7 @@ public abstract class RealmBase extends
if (log.isDebugEnabled()) {
log.debug("Digest : " + clientDigest + " Username:" + username
- + " ClientSigest:" + clientDigest + " nonce:" + nonce
+ + " ClientDigest:" + clientDigest + " nonce:" + nonce
+ " nc:" + nc + " cnonce:" + cnonce + " qop:" + qop
+ " realm:" + realm + "md5a2:" + md5a2
+ " Server digest:" + serverDigest);
@@ -777,7 +777,7 @@ public abstract class RealmBase extends
}
/**
- * Convert an ArrayList to a SecurityContraint [].
+ * Convert an ArrayList to a SecurityConstraint [].
*/
private SecurityConstraint [] resultsToArray(
ArrayList<SecurityConstraint> results) {
Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityListener.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/security/SecurityListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityListener.java Tue Jan 10 15:14:52 2017
@@ -94,7 +94,7 @@ public class SecurityListener implements
* Returns the current list of operating system users not permitted to run
* Tomcat.
*
- * @return A comma separated list of operating sytem user names.
+ * @return A comma separated list of operating system user names.
*/
public String getCheckedOsUsers() {
if (checkedOsUsers.size() == 0) {
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=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java Tue Jan 10 15:14:52 2017
@@ -1630,7 +1630,7 @@ public final class CGIServlet extends Ht
try {
errReaderThread.join(stderrTimeout);
} catch (InterruptedException e) {
- log.warn(sm.getString("cgiServlet.runReaderInterupt")); }
+ log.warn(sm.getString("cgiServlet.runReaderInterrupt")); }
}
if (proc != null){
proc.destroy();
Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Tue Jan 10 15:14:52 2017
@@ -1083,7 +1083,7 @@ public class DefaultServlet extends Http
}
/**
- * Match the client preferred encoding formts to the available precompressed resources.
+ * Match the client preferred encoding formats to the available precompressed resources.
*
* @param request The servlet request we are processing
* @param precompressedResources List of available precompressed resources.
@@ -1924,7 +1924,7 @@ public class DefaultServlet extends Http
conditionSatisfied = true;
}
- // If none of the given ETags match, 412 Precodition failed is
+ // If none of the given ETags match, 412 Precondition failed is
// sent back
if (!conditionSatisfied) {
response.sendError
Modified: tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings.properties?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings.properties Tue Jan 10 15:14:52 2017
@@ -27,7 +27,7 @@ cgiServlet.runFail=I/O problems processi
cgiServlet.runHeaderReaderFail=I/O problems closing header reader
cgiServlet.runInvalidStatus=Invalid status [{0}]
cgiServlet.runOutputStreamFail=I/O problems closing output stream
-cgiServlet.runReaderInterupt=Interupted waiting for stderr reader thread
+cgiServlet.runReaderInterrupt=Interrupted waiting for stderr reader thread
cgiServlet.runStdErr=stderr line: [{0}]
cgiServlet.runStdErrCount=Received [{0}] lines on stderr
cgiServlet.runStdErrFail=I/O problems with stderr
Modified: tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java Tue Jan 10 15:14:52 2017
@@ -172,7 +172,7 @@ public abstract class ManagerBase extend
/**
* Frequency of the session expiration, and related manager operations.
* Manager operations will be done once for the specified amount of
- * backgrondProcess calls (ie, the lower the amount, the most often the
+ * backgroundProcess calls (ie, the lower the amount, the most often the
* checks will occur).
*/
protected int processExpiresFrequency = 6;
Modified: tomcat/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml (original)
+++ tomcat/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml Tue Jan 10 15:14:52 2017
@@ -119,7 +119,7 @@
writeable="false"/>
<attribute name="sessionAttributeNameFilter"
- descritpion="The string pattern used for including session attributes in distribution. Null means all attributes are included."
+ description="The string pattern used for including session attributes in distribution. Null means all attributes are included."
type="java.lang.String"/>
<attribute name="sessionAttributeValueClassNameFilter"
@@ -306,7 +306,7 @@
writeable="false"/>
<attribute name="sessionAttributeNameFilter"
- descritpion="The string pattern used for including session attributes in distribution. Null means all attributes are included."
+ description="The string pattern used for including session attributes in distribution. Null means all attributes are included."
type="java.lang.String"/>
<attribute name="sessionAttributeValueClassNameFilter"
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Tue Jan 10 15:14:52 2017
@@ -1431,7 +1431,7 @@ public class ContextConfig implements Li
} else {
if(log.isDebugEnabled()) {
for (String urlPattern : jspPropertyGroup.getUrlPatterns()) {
- log.debug("Skiping " + urlPattern + " , no servlet " +
+ log.debug("Skipping " + urlPattern + " , no servlet " +
jspServletName);
}
}
@@ -2199,8 +2199,8 @@ public class ContextConfig implements Li
populateJavaClassCache(javaClass.getSuperclassName(), javaClassCache);
- for (String iterface : javaClass.getInterfaceNames()) {
- populateJavaClassCache(iterface, javaClassCache);
+ for (String interfaceName : javaClass.getInterfaceNames()) {
+ populateJavaClassCache(interfaceName, javaClassCache);
}
}
Modified: tomcat/trunk/java/org/apache/catalina/startup/LifecycleListenerRule.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LifecycleListenerRule.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/LifecycleListenerRule.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LifecycleListenerRule.java Tue Jan 10 15:14:52 2017
@@ -122,7 +122,7 @@ public class LifecycleListenerRule exten
className = listenerClass;
}
- // Instantiate a new LifecyleListener implementation object
+ // Instantiate a new LifecycleListener implementation object
Class<?> clazz = Class.forName(className);
LifecycleListener listener =
(LifecycleListener) clazz.newInstance();
Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java (original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java Tue Jan 10 15:14:52 2017
@@ -38,9 +38,9 @@ import org.apache.tomcat.util.net.Socket
/**
* Store the Connector attributes. Connector has really special design. A
* Connector is only a startup Wrapper for a ProtocolHandler. This meant that
- * ProtocolHandler get all there attribtues from the Connector attribtue map.
+ * ProtocolHandler get all there attributes from the Connector attribute map.
* Strange is that some attributes change there name and the attribute
- * sslProtocol need a sepzial handling
+ * sslProtocol need a special handling
*/
public class ConnectorStoreAppender extends StoreAppender {
@@ -264,7 +264,7 @@ public class ConnectorStoreAppender exte
}
/**
- * Print Connector Values. <ul><li> Spezial handling to default jkHome.
+ * Print Connector Values. <ul><li> Special handling to default jkHome.
* </li><li> Don't save catalina.base path at server.xml</li><li></ul>
*
* @see org.apache.catalina.storeconfig.StoreAppender#isPrintValue(java.lang.Object,
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=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java (original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java Tue Jan 10 15:14:52 2017
@@ -203,7 +203,7 @@ public class StoreAppender {
* @param bean
* Bean whose properties are to be rendered as attributes,
* @param desc
- * RegistryDescrpitor from this bean
+ * RegistryDescriptor from this bean
*
* @exception Exception
* if an exception occurs while storing
@@ -277,7 +277,7 @@ public class StoreAppender {
* @param writer PrintWriter to which we are storing
* @param indent Indentation level
* @param bean The current bean
- * @param desc RegistryDescrpitor from this bean
+ * @param desc RegistryDescriptor from this bean
* @param attributeName The attribute name to store
* @param bean2 A default instance of the bean for comparison
* @param value The attribute value
Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java Tue Jan 10 15:14:52 2017
@@ -75,7 +75,7 @@ public class StoreConfigLifecycleListene
}
/**
- * Create StoreConfig MBean and load StoreRgistry MBeans name is
+ * Create StoreConfig MBean and load StoreRegistry MBeans name is
* <code>Catalina:type=StoreConfig</code>.
* @param server The Server instance
*/
Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/StoreFactoryBase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StoreFactoryBase.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StoreFactoryBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StoreFactoryBase.java Tue Jan 10 15:14:52 2017
@@ -25,7 +25,7 @@ import org.apache.juli.logging.LogFactor
import org.apache.tomcat.util.res.StringManager;
/**
- * StoreFactory saves spezial elements.
+ * StoreFactory saves special elements.
* Output was generate with StoreAppenders.
*/
public class StoreFactoryBase implements IStoreFactory {
@@ -47,7 +47,7 @@ public class StoreFactoryBase implements
private static final String info = "org.apache.catalina.config.StoreFactoryBase/1.0";
/**
- * @return descriptive information about this Facotry implementation and the
+ * @return descriptive information about this Factory implementation and the
* corresponding version number, in the format
* <code><description>/<version></code>.
*/
@@ -192,7 +192,7 @@ public class StoreFactoryBase implements
storeElement(aWriter, indent, elements[i]);
} catch (IOException ioe) {
// ignore children report error them self!
- // see StandartContext.storeWithBackup()
+ // see StandardContext.storeWithBackup()
}
}
}
Modified: tomcat/trunk/java/org/apache/catalina/tribes/ChannelException.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/ChannelException.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/ChannelException.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/ChannelException.java Tue Jan 10 15:14:52 2017
@@ -30,7 +30,7 @@ import java.util.ArrayList;
public class ChannelException extends Exception {
private static final long serialVersionUID = 1L;
/**
- * Empty list to avoid reinstatiating lists
+ * Empty list to avoid reinstantiating lists
*/
protected static final FaultyMember[] EMPTY_LIST = new FaultyMember[0];
/**
Modified: tomcat/trunk/java/org/apache/catalina/tribes/ErrorHandler.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/ErrorHandler.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/ErrorHandler.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/ErrorHandler.java Tue Jan 10 15:14:52 2017
@@ -28,7 +28,7 @@ package org.apache.catalina.tribes;
public interface ErrorHandler {
/**
- * Invoked if the message is dispatched asynch, and an error occurs
+ * Invoked if the message is dispatched async, and an error occurs
* @param x ChannelException - the error that happened
* @param id - the unique id for the message
* @see Channel#send(Member[], java.io.Serializable, int, ErrorHandler)
Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/RpcCallback.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/RpcCallback.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/RpcCallback.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/RpcCallback.java Tue Jan 10 15:14:52 2017
@@ -28,7 +28,7 @@ import org.apache.catalina.tribes.Member
public interface RpcCallback {
/**
- * Allows sending a response to a recieved message.
+ * Allows sending a response to a received message.
* @param msg The message
* @param sender Member
* @return Serializable object, <code>null</code> if no reply should be sent
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=1778139&r1=1778138&r2=1778139&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 Tue Jan 10 15:14:52 2017
@@ -38,9 +38,9 @@ import org.apache.juli.logging.LogFactor
* 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>
+ * OrderInterceptor.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>
+ * OrderInterceptor.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/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties Tue Jan 10 15:14:52 2017
@@ -42,7 +42,7 @@ tcpFailureDetector.already.disappeared=V
tcpFailureDetector.member.disappeared=Verification complete. Member disappeared[{0}]
tcpFailureDetector.still.alive=Verification complete. Member still alive[{0}]
tcpFailureDetector.heartbeat.failed=Unable to perform heartbeat on the TcpFailureDetector.
-tcpFailureDetector.performBasicCheck.memberAdded=Member added, even though we weren''t notified:{0}
+tcpFailureDetector.performBasicCheck.memberAdded=Member added, even though we weren't notified:{0}
tcpFailureDetector.suspectMember.dead=Suspect member, confirmed dead.[{0}]
tcpFailureDetector.suspectMember.alive=Suspect member, confirmed alive.[{0}]
tcpFailureDetector.failureDetection.failed=Unable to perform failure detection check, assuming member down.
Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java Tue Jan 10 15:14:52 2017
@@ -195,7 +195,7 @@ public class NonBlockingCoordinator exte
synchronized (electionMutex) {
Member local = getLocalMember(false);
Member[] others = membership.getMembers();
- fireInterceptorEvent(new CoordinationEvent(CoordinationEvent.EVT_START_ELECT,this,"Election initated"));
+ fireInterceptorEvent(new CoordinationEvent(CoordinationEvent.EVT_START_ELECT,this,"Election initiated"));
if ( others.length == 0 ) {
this.viewId = new UniqueId(UUIDGenerator.randomUUID(false));
this.view = new Membership(local,AbsoluteOrder.comp, true);
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=1778139&r1=1778138&r2=1778139&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 Tue Jan 10 15:14:52 2017
@@ -42,8 +42,8 @@ import org.apache.catalina.tribes.util.S
* 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.
+ * OrderInterceptor.expire=<milliseconds> - if a message arrives out of order, how long before we act on it <b>default=3000ms</b><br>
+ * OrderInterceptor.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
* do when a message has expired or the queue has grown larger than the maxQueue value.
Modified: tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java Tue Jan 10 15:14:52 2017
@@ -166,7 +166,7 @@ public abstract class AbstractReplicated
* Creates a new map.
* @param owner The map owner
* @param channel The channel to use for communication
- * @param timeout long - timeout for RPC messags
+ * @param timeout long - timeout for RPC messages
* @param mapContextName String - unique name for this map, to allow multiple maps per channel
* @param initialCapacity int - the size of this map, see HashMap
* @param loadFactor float - load factor, see HashMap
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=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java Tue Jan 10 15:14:52 2017
@@ -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</b> <code>breakdown()</code> or <code>finalize()</code> when you are done with the map to
+ * <br><br><b>REMEMBER 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
*
@@ -76,7 +76,7 @@ public class LazyReplicatedMap<K,V> exte
* Creates a new map
* @param owner The map owner
* @param channel The channel to use for communication
- * @param timeout long - timeout for RPC messags
+ * @param timeout long - timeout for RPC messages
* @param mapContextName String - unique name for this map, to allow multiple maps per channel
* @param initialCapacity int - the size of this map, see HashMap
* @param loadFactor float - load factor, see HashMap
@@ -90,7 +90,7 @@ public class LazyReplicatedMap<K,V> exte
* Creates a new map
* @param owner The map owner
* @param channel The channel to use for communication
- * @param timeout long - timeout for RPC messags
+ * @param timeout long - timeout for RPC messages
* @param mapContextName String - unique name for this map, to allow multiple maps per channel
* @param initialCapacity int - the size of this map, see HashMap
* @param cls Class loaders
@@ -103,7 +103,7 @@ public class LazyReplicatedMap<K,V> exte
* Creates a new map
* @param owner The map owner
* @param channel The channel to use for communication
- * @param timeout long - timeout for RPC messags
+ * @param timeout long - timeout for RPC messages
* @param mapContextName String - unique name for this map, to allow multiple maps per channel
* @param cls Class loaders
*/
@@ -115,7 +115,7 @@ public class LazyReplicatedMap<K,V> exte
* Creates a new map
* @param owner The map owner
* @param channel The channel to use for communication
- * @param timeout long - timeout for RPC messags
+ * @param timeout long - timeout for RPC messages
* @param mapContextName String - unique name for this map, to allow multiple maps per channel
* @param cls Class loaders
* @param terminate boolean - Flag for whether to terminate this map that failed to start.
Modified: tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java Tue Jan 10 15:14:52 2017
@@ -67,7 +67,7 @@ public class ReplicatedMap<K,V> extends
* Creates a new map
* @param owner The map owner
* @param channel The channel to use for communication
- * @param timeout long - timeout for RPC messags
+ * @param timeout long - timeout for RPC messages
* @param mapContextName String - unique name for this map, to allow multiple maps per channel
* @param initialCapacity int - the size of this map, see HashMap
* @param loadFactor float - load factor, see HashMap
@@ -81,7 +81,7 @@ public class ReplicatedMap<K,V> extends
* Creates a new map
* @param owner The map owner
* @param channel The channel to use for communication
- * @param timeout long - timeout for RPC messags
+ * @param timeout long - timeout for RPC messages
* @param mapContextName String - unique name for this map, to allow multiple maps per channel
* @param initialCapacity int - the size of this map, see HashMap
* @param cls Class loaders
@@ -94,7 +94,7 @@ public class ReplicatedMap<K,V> extends
* Creates a new map
* @param owner The map owner
* @param channel The channel to use for communication
- * @param timeout long - timeout for RPC messags
+ * @param timeout long - timeout for RPC messages
* @param mapContextName String - unique name for this map, to allow multiple maps per channel
* @param cls Class loaders
*/
@@ -106,7 +106,7 @@ public class ReplicatedMap<K,V> extends
* Creates a new map
* @param owner The map owner
* @param channel The channel to use for communication
- * @param timeout long - timeout for RPC messags
+ * @param timeout long - timeout for RPC messages
* @param mapContextName String - unique name for this map, to allow multiple maps per channel
* @param cls Class loaders
* @param terminate boolean - Flag for whether to terminate this map that failed to start.
Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java Tue Jan 10 15:14:52 2017
@@ -101,7 +101,7 @@ public class BioReplicationTask extends
/**
* Use send ack here if you want to ack the request to the remote
* server before completing the request
- * This is considered an asynchronized request
+ * This is considered an asynchronous request
*/
if (ChannelData.sendAckAsync(msgs[i].getOptions())) sendAck(Constants.ACK_COMMAND);
try {
Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/LocalStrings.properties?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/LocalStrings.properties Tue Jan 10 15:14:52 2017
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-bioReceiver.threadpool.fail=ThreadPool can initilzed. Listener not started
+bioReceiver.threadpool.fail=ThreadPool can initialized. Listener not started
bioReceiver.start.fail=Unable to start cluster receiver
bioReceiver.socket.closeFailed=Failed to close socket
bioReceiver.run.fail=Unable to run replication listener.
Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java Tue Jan 10 15:14:52 2017
@@ -200,7 +200,7 @@ public class NioReplicationTask extends
/**
* Use send ack here if you want to ack the request to the remote
* server before completing the request
- * This is considered an asynchronized request
+ * This is considered an asynchronous request
*/
if (ChannelData.sendAckAsync(msgs[i].getOptions())) sendAck(key,(WritableByteChannel)channel,Constants.ACK_COMMAND,saddr);
try {
Modified: tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java Tue Jan 10 15:14:52 2017
@@ -113,7 +113,7 @@ public final class ExtensionValidator {
* file in the /META-INF/ directory of the application and all
* MANIFEST.MF files in each JAR file located in the WEB-INF/lib
* directory and creates an <code>ArrayList</code> of
- * <code>ManifestResorce</code> objects. These objects are then passed
+ * <code>ManifestResource</code> objects. These objects are then passed
* to the validateManifestResources method for validation.
*
* @param resources The resources configured for this Web Application
@@ -286,7 +286,7 @@ public final class ExtensionValidator {
* Build this list of available extensions so that we do not have to
* re-build this list every time we iterate through the list of required
* extensions. All available extensions in all of the
- * <code>MainfestResource</code> objects will be added to a
+ * <code>ManifestResource</code> objects will be added to a
* <code>HashMap</code> which is returned on the first dependency list
* processing pass.
*
Modified: tomcat/trunk/java/org/apache/catalina/util/Introspection.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/Introspection.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/Introspection.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/Introspection.java Tue Jan 10 15:14:52 2017
@@ -140,7 +140,7 @@ public class Introspection {
* Attempt to load a class using the given Container's class loader. If the
* class cannot be loaded, a debug level log message will be written to the
* Container's log and null will be returned.
- * @param context The class loader of this context will be used to attemmpt
+ * @param context The class loader of this context will be used to attempt
* to load the class
* @param className The class name
* @return the loaded class or <code>null</code> if loading failed
Modified: tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java Tue Jan 10 15:14:52 2017
@@ -768,7 +768,7 @@ public class RemoteIpValve extends Valve
/**
* <p>
- * Header that holds the incoming protocol, usally named <code>X-Forwarded-Proto</code>. If <code>null</code>, request.scheme and
+ * Header that holds the incoming protocol, usually named <code>X-Forwarded-Proto</code>. If <code>null</code>, request.scheme and
* request.secure will not be modified.
* </p>
* <p>
Modified: tomcat/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java Tue Jan 10 15:14:52 2017
@@ -60,7 +60,7 @@ public class StuckThreadDetectionValve e
private final AtomicInteger stuckCount = new AtomicInteger(0);
/**
- * Keeps count of the number of stuck threads that have been interruoted
+ * Keeps count of the number of stuck threads that have been interrupted
*/
private AtomicLong interruptedThreadsCount = new AtomicLong();
@@ -77,7 +77,7 @@ public class StuckThreadDetectionValve e
/**
* The only references we keep to actual running Thread objects are in
* this Map (which is automatically cleaned in invoke()s finally clause).
- * That way, Threads can be GC'ed, eventhough the Valve still thinks they
+ * That way, Threads can be GC'ed, even though the Valve still thinks they
* are stuck (caused by a long monitor interval)
*/
private final Map<Long, MonitoredThread> activeThreads = new ConcurrentHashMap<>();
Modified: tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java Tue Jan 10 15:14:52 2017
@@ -729,7 +729,7 @@ public class RewriteValve extends ValveB
/**
- * Parser for ReweriteRule flags.
+ * Parser for RewriteRule flags.
* @param line The configuration line being parsed
* @param rule The current rule
* @param flag The flag
Modified: tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java (original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java Tue Jan 10 15:14:52 2017
@@ -237,7 +237,7 @@ public class StandardRoot extends Lifecy
* can be normalized without stepping outside of the root.
*
* @param path
- * @return the normlized path
+ * @return the normalized path
*/
private String validate(String path) {
if (!getState().isAvailable()) {
Modified: tomcat/trunk/java/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.java?rev=1778139&r1=1778138&r2=1778139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.java (original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.java Tue Jan 10 15:14:52 2017
@@ -27,7 +27,7 @@ import org.apache.catalina.webresources.
public class TomcatURLStreamHandlerFactory implements URLStreamHandlerFactory {
private static final String WAR_PROTOCOL = "war";
- private static final String CLASSPTH_PROTOCOL = "classpath";
+ private static final String CLASSPATH_PROTOCOL = "classpath";
// Singleton instance
private static volatile TomcatURLStreamHandlerFactory instance = null;
@@ -158,7 +158,7 @@ public class TomcatURLStreamHandlerFacto
// it.
if (WAR_PROTOCOL.equals(protocol)) {
return new Handler();
- } else if (CLASSPTH_PROTOCOL.equals(protocol)) {
+ } else if (CLASSPATH_PROTOCOL.equals(protocol)) {
return new ClasspathURLStreamHandler();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org