Author: markt
Date: Mon Mar 16 15:55:56 2015
New Revision: 1667048
URL: http://svn.apache.org/r1667048
Log:
s/can not/cannot/
Modified:
tomcat/trunk/java/javax/websocket/WebSocketContainer.java
tomcat/trunk/java/org/apache/catalina/Wrapper.java
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
tomcat/trunk/java/org/apache/catalina/loader/JdbcLeakPrevention.java
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/trunk/java/org/apache/catalina/tribes/Channel.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java
tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java
tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java
tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/SoftReferenceObjectPool.java
tomcat/trunk/java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
tomcat/trunk/test/org/apache/catalina/valves/Benchmarks.java
tomcat/trunk/webapps/docs/config/context.xml
tomcat/trunk/webapps/docs/config/filter.xml
tomcat/trunk/webapps/docs/config/realm.xml
tomcat/trunk/webapps/docs/config/valve.xml
tomcat/trunk/webapps/docs/jndi-resources-howto.xml
tomcat/trunk/webapps/docs/realm-howto.xml
Modified: tomcat/trunk/java/javax/websocket/WebSocketContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/websocket/WebSocketContainer.java?rev=1667048&r1=1667047&r2=1667048&view=diff
==============================================================================
--- tomcat/trunk/java/javax/websocket/WebSocketContainer.java (original)
+++ tomcat/trunk/java/javax/websocket/WebSocketContainer.java Mon Mar 16
15:55:56 2015
@@ -55,7 +55,7 @@ public interface WebSocketContainer {
*
* @return The WebSocket session for the connection
*
- * @throws DeploymentException If the connection can not be established
+ * @throws DeploymentException If the connection cannot be established
* @throws IOException If an I/O occurred while trying to establish the
* connection
*/
@@ -76,7 +76,7 @@ public interface WebSocketContainer {
*
* @return The WebSocket session for the connection
*
- * @throws DeploymentException If the connection can not be established
+ * @throws DeploymentException If the connection cannot be established
* @throws IOException If an I/O occurred while trying to establish the
* connection
*/
Modified: tomcat/trunk/java/org/apache/catalina/Wrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Wrapper.java?rev=1667048&r1=1667047&r2=1667048&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Wrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Wrapper.java Mon Mar 16 15:55:56 2015
@@ -136,7 +136,7 @@ public interface Wrapper extends Contain
* @return Array of names of the methods supported by the underlying
* servlet
*
- * @throws ServletException If the target servlet can not be loaded
+ * @throws ServletException If the target servlet cannot be loaded
*/
public String[] getServletMethods() throws ServletException;
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=1667048&r1=1667047&r2=1667048&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Mon Mar
16 15:55:56 2015
@@ -570,7 +570,7 @@ public class CoyoteAdapter implements Ad
* @throws IOException If there is insufficient space in a buffer while
* processing headers
* @throws ServletException If the supported methods of the target servlet
- * can not be determined
+ * cannot be determined
*/
protected boolean postParseRequest(org.apache.coyote.Request req, Request
request,
org.apache.coyote.Response res, Response response) throws
IOException, ServletException {
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=1667048&r1=1667047&r2=1667048&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Mon Mar
16 15:55:56 2015
@@ -13,13 +13,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-applicationContext.addFilter.ise=Filters can not be added to context {0} as
the context has been initialised
+applicationContext.addFilter.ise=Filters cannot be added to context {0} as the
context has been initialised
applicationContext.addListener.iae.cnfe=Unable to create an instance of type
[{0}]
applicationContext.addListener.iae.wrongType=The type specified [{0}] is not
one of the expected listener types
applicationContext.addListener.iae.sclNotAllowed=Once the first
ServletContextListener has been called, no more ServletContextListeners may be
added.
-applicationContext.addListener.ise=Listeners can not be added to context {0}
as the context has been initialised
-applicationContext.addRole.ise=Roles can not be added to context {0} as the
context has been initialised
-applicationContext.addServlet.ise=Servlets can not be added to context {0} as
the context has been initialised
+applicationContext.addListener.ise=Listeners cannot be added to context {0} as
the context has been initialised
+applicationContext.addRole.ise=Roles cannot be added to context {0} as the
context has been initialised
+applicationContext.addServlet.ise=Servlets cannot be added to context {0} as
the context has been initialised
applicationContext.attributeEvent=Exception thrown by attributes event listener
applicationContext.invalidFilterName=Unable to add filter definition due to
invalid filter name [{0}].
applicationContext.invalidServletName=Unable to add servlet definition due to
invalid servlet name [{0}].
@@ -29,7 +29,7 @@ applicationContext.resourcePaths.iae=Pat
applicationContext.role.iae=An individual role to declare for context [{0}]
may not be null nor the empty string
applicationContext.roles.iae=Array of roles to declare for context [{0}]
cannot be null
applicationContext.setAttribute.namenull=Name cannot be null
-applicationContext.setInitParam.ise=Initialization parameters can not be set
after the context has been initialized
+applicationContext.setInitParam.ise=Initialization parameters cannot be set
after the context has been initialized
applicationContext.setSessionTracking.ise=The session tracking modes for
context {0} cannot be set whilst the context is running
applicationContext.setSessionTracking.iae.invalid=The session tracking mode
{0} requested for context {1} is not supported by that context
applicationContext.setSessionTracking.iae.ssl=The session tracking modes
requested for context {0} included SSL and at least one other mode. SSL may not
be configured with other modes.
@@ -49,7 +49,7 @@ applicationFilterRegistration.nullInitPa
applicationFilterRegistration.nullInitParams=Unable to set initialisation
parameters for filter due to null name and/or value. Name [{0}], Value [{1}]
applicationServletRegistration.setServletSecurity.iae=Null constraint
specified for servlet [{0}] deployed to context with name [{1}]
applicationServletRegistration.setServletSecurity.ise=Security constraints
can't be added to servlet [{0}] deployed to context with name [{1}] as the
context has already been initialised
-applicationSessionCookieConfig.ise=Property {0} can not be added to
SessionCookieConfig for context {1} as the context has been initialised
+applicationSessionCookieConfig.ise=Property {0} cannot be added to
SessionCookieConfig for context {1} as the context has been initialised
aprListener.aprInit=The APR based Apache Tomcat Native library which allows
optimal performance in production environments was not found on the
java.library.path: {0}
aprListener.aprInitDebug=The APR based Apache Tomcat Native library could not
be found using names [{0}] on the java.library.path [{1}]. The errors reported
were [{2}]
aprListener.aprInitError=The APR based Apache Tomcat Native library failed to
load. The error reported was [{0}]
Modified: tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties?rev=1667048&r1=1667047&r2=1667048&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/LocalStrings.properties Mon
Mar 16 15:55:56 2015
@@ -29,7 +29,7 @@ expiresFilter.noExpirationConfigured=Req
expiresFilter.setExpirationDate=Request "{0}" with response status "{1}"
content-type "{2}", set expiration date {3}
expiresFilter.startingPointNotFound=Starting point
(access|now|modification|a<seconds>|m<seconds>) not found in directive "{0}"
expiresFilter.startingPointInvalid=Invalid starting point
(access|now|modification|a<seconds>|m<seconds>) "{0}" in directive "{1}"
-expiresFilter.responseAlreadyCommited=Request "{0}", can not apply
ExpiresFilter on already committed response.
+expiresFilter.responseAlreadyCommited=Request "{0}", cannot apply
ExpiresFilter on already committed response.
expiresFilter.noExpirationConfiguredForContentType=No Expires configuration
found for content-type "{0}"
expiresFilter.useMatchingConfiguration=Use {0} matching "{1}" for content-type
"{2}" returns {3}
expiresFilter.useDefaultConfiguration=Use default {0} for content-type "{1}"
returns {2}
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=1667048&r1=1667047&r2=1667048&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java Mon Mar
16 15:55:56 2015
@@ -430,7 +430,7 @@ import org.apache.juli.logging.LogFactor
* </table>
* <p>
* Note : <code>x-forwarded-by</code> holds the trusted proxy
<code>proxy1</code>. <code>x-forwarded-by</code> holds
- * <code>140.211.11.130</code> because <code>untrusted-proxy</code> is not
trusted and thus, we can not trust that
+ * <code>140.211.11.130</code> because <code>untrusted-proxy</code> is not
trusted and thus, we cannot trust that
* <code>untrusted-proxy</code> is the actual remote ip.
<code>request.remoteAddr</code> is <code>untrusted-proxy</code> that is an IP
* verified by <code>proxy1</code>.
* </p>
Modified:
tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java?rev=1667048&r1=1667047&r2=1667048&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessageFactory.java Mon
Mar 16 15:55:56 2015
@@ -66,7 +66,7 @@ public class FileMessageFactory {
protected final boolean openForWrite;
/**
- * Once the factory is used, it can not be reused.
+ * Once the factory is used, it cannot be reused.
*/
protected boolean closed = false;
Modified: tomcat/trunk/java/org/apache/catalina/loader/JdbcLeakPrevention.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/JdbcLeakPrevention.java?rev=1667048&r1=1667047&r2=1667048&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/JdbcLeakPrevention.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/JdbcLeakPrevention.java Mon
Mar 16 15:55:56 2015
@@ -34,7 +34,7 @@ import java.util.List;
* version is do not just create a new instance of this class with the new
* keyword.
*
- * Since this class is loaded by {@link WebappClassLoaderBase}, it can not
refer
+ * Since this class is loaded by {@link WebappClassLoaderBase}, it cannot refer
* to any internal Tomcat classes as that will cause the security manager to
* complain.
*/
Modified: tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties?rev=1667048&r1=1667047&r2=1667048&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties Mon
Mar 16 15:55:56 2015
@@ -90,7 +90,7 @@ managerServlet.noCommand=FAIL - No comma
managerServlet.noContext=FAIL - No context exists for path {0}
managerServlet.noGlobal=FAIL - No global JNDI resources are available
managerServlet.noManager=FAIL - No manager exists for path {0}
-managerServlet.noSelf=FAIL - The manager can not reload, undeploy, stop, or
undeploy itself
+managerServlet.noSelf=FAIL - The manager cannot reload, undeploy, stop, or
undeploy itself
managerServlet.noWrapper=Container has not called setWrapper() for this servlet
managerServlet.notDeployed=FAIL - Context {0} is defined in server.xml and may
not be undeployed
managerServlet.notSslConnector=SSL is not enabled for this connector
Modified: tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=1667048&r1=1667047&r2=1667048&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java Mon Mar 16
15:55:56 2015
@@ -76,7 +76,7 @@ import org.ietf.jgss.GSSCredential;
* element in the top level <code>DirContext</code> that is accessed
* via the <code>connectionURL</code> property.</li>
*
- * <li>If a socket connection can not be made to the <code>connectURL</code>
+ * <li>If a socket connection cannot be made to the <code>connectURL</code>
* an attempt will be made to use the <code>alternateURL</code> if it
* exists.</li>
*
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=1667048&r1=1667047&r2=1667048&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Mon Mar
16 15:55:56 2015
@@ -333,7 +333,7 @@ public class DefaultServlet extends Http
protected String getRelativePath(HttpServletRequest request) {
// IMPORTANT: DefaultServlet can be mapped to '/' or '/path/*' but
always
// serves resources from the web app root with context rooted paths.
- // i.e. it can not be used to mount the web app root under a sub-path
+ // i.e. it cannot be used to mount the web app root under a sub-path
// This method must construct a complete context rooted path, although
// subclasses can change this behaviour.
Modified: tomcat/trunk/java/org/apache/catalina/tribes/Channel.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/Channel.java?rev=1667048&r1=1667047&r2=1667048&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/Channel.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/Channel.java Mon Mar 16
15:55:56 2015
@@ -246,7 +246,7 @@ public interface Channel {
/**
* Send a message to one or more members in the cluster
- * @param destination Member[] - the destinations, can not be null or zero
length, the reason for that
+ * @param destination Member[] - the destinations, cannot be null or zero
length, the reason for that
* is that a membership change can occur and at that time the application
is uncertain what group the message
* actually got sent to.
* @param msg Serializable - the message to send, has to be serializable,
or a <code>ByteMessage</code> to
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=1667048&r1=1667047&r2=1667048&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
Mon Mar 16 15:55:56 2015
@@ -96,7 +96,7 @@ import org.apache.juli.logging.LogFactor
* Lets assume that C1 arrives, C1 has lower priority than C, but higher
priority than D.<br>
* Lets also assume that C1 sees the following view {B,D,E}<br>
* C1 waits for a token to arrive. When the token arrives, the same scenario
as above will happen.<br>
- * In the scenario where C1 sees {D,E} and A,B,C can not see C1, no token will
ever arrive.<br>
+ * In the scenario where C1 sees {D,E} and A,B,C cannot see C1, no token will
ever arrive.<br>
* In this case, C1 sends a Z{C1-ldr, C1-src, mbrs-C1,D,E} to D<br>
* D receives Z{C1-ldr, C1-src, mbrs-C1,D,E} and sends Z{A-ldr, C1-src,
mbrs-A,B,C,C1,D,E} to E<br>
* E receives Z{A-ldr, C1-src, mbrs-A,B,C,C1,D,E} and sends it to A<br>
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=1667048&r1=1667047&r2=1667048&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java Mon Mar 16
15:55:56 2015
@@ -341,7 +341,7 @@ import org.apache.juli.logging.LogFactor
* </table>
* <p>
* Note : <code>x-forwarded-by</code> holds the trusted proxy
<code>proxy1</code>. <code>x-forwarded-by</code> holds
- * <code>140.211.11.130</code> because <code>untrusted-proxy</code> is not
trusted and thus, we can not trust that
+ * <code>140.211.11.130</code> because <code>untrusted-proxy</code> is not
trusted and thus, we cannot trust that
* <code>untrusted-proxy</code> is the actual remote ip.
<code>request.remoteAddr</code> is <code>untrusted-proxy</code> that is an IP
* verified by <code>proxy1</code>.
* </p>
Modified: tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java?rev=1667048&r1=1667047&r2=1667048&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java (original)
+++ tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java Mon Mar 16
15:55:56 2015
@@ -118,7 +118,7 @@ public class ReflectionUtil {
* @param paramTypes the parameter types to use
* @param paramValues the parameter values
* @return the method specified
- * @throws MethodNotFoundException If a method can not be found that
matches
+ * @throws MethodNotFoundException If a method cannot be found that matches
* the given criteria
*/
/*
Modified: tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java?rev=1667048&r1=1667047&r2=1667048&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ELParser.java Mon Mar 16
15:55:56 2015
@@ -96,7 +96,7 @@ public class ELParser {
*
* @return An ELNode.Nodes representing the EL expression
*
- * Note: This can not be refactored to use the standard EL implementation
as
+ * Note: This cannot be refactored to use the standard EL implementation as
* the EL API does not provide the level of access required to the
* parsed expression.
*/
Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java?rev=1667048&r1=1667047&r2=1667048&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java (original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java Mon Mar 16
15:55:56 2015
@@ -123,7 +123,7 @@ public class JspServlet extends HttpServ
return;
}
} catch (MalformedURLException e) {
- throw new ServletException("Can not locate jsp file", e);
+ throw new ServletException("cannot locate jsp file", e);
}
try {
if (SecurityUtil.isPackageProtectionEnabled()){
Modified: tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java?rev=1667048&r1=1667047&r2=1667048&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java (original)
+++ tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java Mon Mar 16
15:55:56 2015
@@ -121,7 +121,7 @@ public abstract class FactoryBase implem
* @return The default factory for the given reference object or
* <code>null</code> if no default factory exists.
*
- * @throws NamingException If the default factory can not be craeted
+ * @throws NamingException If the default factory cannot be craeted
*/
protected abstract ObjectFactory getDefaultFactory(Reference ref)
throws NamingException;
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/SoftReferenceObjectPool.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/SoftReferenceObjectPool.java?rev=1667048&r1=1667047&r2=1667048&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/SoftReferenceObjectPool.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/SoftReferenceObjectPool.java
Mon Mar 16 15:55:56 2015
@@ -110,7 +110,7 @@ public class SoftReferenceObjectPool<T>
* if an exception occurs creating a new instance
* @return a valid, activated object instance
*/
- @SuppressWarnings("null") // ref can not be null
+ @SuppressWarnings("null") // ref cannot be null
@Override
public synchronized T borrowObject() throws Exception {
assertOpen();
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java?rev=1667048&r1=1667047&r2=1667048&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java
Mon Mar 16 15:55:56 2015
@@ -96,7 +96,7 @@ public class Rfc6265CookieProcessor impl
public String generateHeader(javax.servlet.http.Cookie cookie) {
StringBuilder header = new StringBuilder();
- // TODO: Name validation takes place in Cookie and can not be
configured
+ // TODO: Name validation takes place in Cookie and cannot be configured
// per Context. Moving it to here would allow per Context config
// but delay validation until the header is generated. However,
// the spec requires an IllegalArgumentException on Cookie
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java?rev=1667048&r1=1667047&r2=1667048&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
Mon Mar 16 15:55:56 2015
@@ -449,7 +449,7 @@ public class MultipartStream {
throws IllegalBoundaryException {
if (boundary.length != boundaryLength - BOUNDARY_PREFIX.length) {
throw new IllegalBoundaryException(
- "The length of a boundary token can not be changed");
+ "The length of a boundary token cannot be changed");
}
System.arraycopy(boundary, 0, this.boundary, BOUNDARY_PREFIX.length,
boundary.length);
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties?rev=1667048&r1=1667047&r2=1667048&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties Mon
Mar 16 15:55:56 2015
@@ -60,7 +60,7 @@ wsFrame.messageTooBig=The message was [{
wsFrame.noContinuation=A new message was started when a continuation frame was
expected
wsFrame.notMasked=The client frame was not masked but all client frames must
be masked
wsFrame.oneByteCloseCode=The client sent a close frame with a single byte
payload which is not valid
-wsFrame.sessionClosed=The client data can not be processed because the session
has already been closed
+wsFrame.sessionClosed=The client data cannot be processed because the session
has already been closed
wsFrame.textMessageTooBig=The decoded text message was too big for the output
buffer and the endpoint does not support partial messages
wsFrame.wrongRsv=The client frame set the reserved bits to [{0}] for a message
with opCode [{1}] which was not supported by this endpoint
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java?rev=1667048&r1=1667047&r2=1667048&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
Mon Mar 16 15:55:56 2015
@@ -166,7 +166,7 @@ public class WsServerContainer extends W
* must be called before calling this method.
*
* @param sec The configuration to use when creating endpoint instances
- * @throws DeploymentException if the endpoint can not be published as
+ * @throws DeploymentException if the endpoint cannot be published as
* requested
*/
@Override
Modified: tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml?rev=1667048&r1=1667047&r2=1667048&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/doc/jdbc-pool.xml Mon Mar 16 15:55:56 2015
@@ -588,7 +588,7 @@
</p>
</subsection>
<subsection name="org.apache.tomcat.jdbc.pool.JdbcInterceptor">
- <p>Abstract base class for all interceptors, can not be instantiated.</p>
+ <p>Abstract base class for all interceptors, cannot be instantiated.</p>
<attributes>
<attribute name="useEquals" required="false">
<p>(boolean) Set to true if you wish the <code>ProxyConnection</code>
class to use <code>String.equals</code> and set to <code>false</code>
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java?rev=1667048&r1=1667047&r2=1667048&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
Mon Mar 16 15:55:56 2015
@@ -564,14 +564,14 @@ public class DataSourceFactory implement
log.warn("dataSourceJNDI property is configued, but local JNDI
context is null.");
}
} catch (NamingException e) {
- log.debug("The name \""+poolProperties.getDataSourceJNDI()+"\" can
not be found in the local context.");
+ log.debug("The name \""+poolProperties.getDataSourceJNDI()+"\"
cannot be found in the local context.");
}
if (jndiDS==null) {
try {
context = new InitialContext();
jndiDS = context.lookup(poolProperties.getDataSourceJNDI());
} catch (NamingException e) {
- log.warn("The name \""+poolProperties.getDataSourceJNDI()+"\"
can not be found in the InitialContext.");
+ log.warn("The name \""+poolProperties.getDataSourceJNDI()+"\"
cannot be found in the InitialContext.");
}
}
if (jndiDS!=null) {
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java?rev=1667048&r1=1667047&r2=1667048&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
Mon Mar 16 15:55:56 2015
@@ -55,7 +55,7 @@ public class DataSourceProxy implements
}
public DataSourceProxy(PoolConfiguration poolProperties) {
- if (poolProperties == null) throw new
NullPointerException("PoolConfiguration can not be null.");
+ if (poolProperties == null) throw new
NullPointerException("PoolConfiguration cannot be null.");
this.poolProperties = poolProperties;
}
Modified: tomcat/trunk/test/org/apache/catalina/valves/Benchmarks.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/Benchmarks.java?rev=1667048&r1=1667047&r2=1667048&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/valves/Benchmarks.java (original)
+++ tomcat/trunk/test/org/apache/catalina/valves/Benchmarks.java Mon Mar 16
15:55:56 2015
@@ -193,7 +193,7 @@ public class Benchmarks {
try {
index = Integer.parseInt(month) - 1;
} catch (Throwable t) {
- index = 0; // Can not happen, in theory
+ index = 0; // cannot happen, in theory
}
return (months[index]);
}
Modified: tomcat/trunk/webapps/docs/config/context.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/context.xml?rev=1667048&r1=1667047&r2=1667048&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/context.xml (original)
+++ tomcat/trunk/webapps/docs/config/context.xml Mon Mar 16 15:55:56 2015
@@ -502,7 +502,7 @@
<p>
Not reading the additional data will free the request processing thread
more quickly. Unfortunately most HTTP clients will not read the
response
- if they can not write the full request.</p>
+ if they cannot write the full request.</p>
<p>The default is <code>true</code>, so additional data will be
read.</p>
<p>Note if an error occurs during the request processing that triggers
Modified: tomcat/trunk/webapps/docs/config/filter.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/filter.xml?rev=1667048&r1=1667047&r2=1667048&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/filter.xml (original)
+++ tomcat/trunk/webapps/docs/config/filter.xml Mon Mar 16 15:55:56 2015
@@ -1176,7 +1176,7 @@ FINE: Request "/docs/config/manager.html
<p>
Note : <code>x-forwarded-by</code> holds the trusted proxy
<code>proxy1</code>.
<code>x-forwarded-by</code> holds <code>140.211.11.130</code> because
- <code>untrusted-proxy</code> is not trusted and thus, we can not trust that
+ <code>untrusted-proxy</code> is not trusted and thus, we cannot trust that
<code>untrusted-proxy</code> is the actual remote ip.
<code>request.remoteAddr</code> is <code>untrusted-proxy</code> that is an
IP
verified by <code>proxy1</code>.
Modified: tomcat/trunk/webapps/docs/config/realm.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/realm.xml?rev=1667048&r1=1667047&r2=1667048&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/realm.xml (original)
+++ tomcat/trunk/webapps/docs/config/realm.xml Mon Mar 16 15:55:56 2015
@@ -401,7 +401,7 @@
</attribute>
<attribute name="alternateURL" required="false">
- <p>If a socket connection can not be made to the provider at
+ <p>If a socket connection cannot be made to the provider at
the <code>connectionURL</code> an attempt will be made to use the
<code>alternateURL</code>.</p>
</attribute>
Modified: tomcat/trunk/webapps/docs/config/valve.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/valve.xml?rev=1667048&r1=1667047&r2=1667048&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/valve.xml (original)
+++ tomcat/trunk/webapps/docs/config/valve.xml Mon Mar 16 15:55:56 2015
@@ -317,7 +317,7 @@
<li><b><code>msec</code></b> - number of milliseconds since the epoch</li>
<li><b><code>msec_frac</code></b> - millisecond fraction</li>
</ul>
- <p>These formats can not be mixed with SimpleDateFormat formats in the
same format
+ <p>These formats cannot be mixed with SimpleDateFormat formats in the same
format
token.</p>
<p>Furthermore one can define whether to log the timestamp for the request
start
Modified: tomcat/trunk/webapps/docs/jndi-resources-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jndi-resources-howto.xml?rev=1667048&r1=1667047&r2=1667048&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/jndi-resources-howto.xml (original)
+++ tomcat/trunk/webapps/docs/jndi-resources-howto.xml Mon Mar 16 15:55:56 2015
@@ -328,7 +328,7 @@ writer.println("foo = " + bean.getFoo()
<code>foo</code> property (although we could have), the bean will
contain whatever default value is set up by its constructor.</p>
- <p>Some beans have properties with types that can not automatically be
+ <p>Some beans have properties with types that cannot automatically be
converted from a string value. Setting such properties using the Tomcat
BeanFactory will fail with a NamingException. In cases were those beans
provide methods to set the properties from a string value, the Tomcat
Modified: tomcat/trunk/webapps/docs/realm-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/realm-howto.xml?rev=1667048&r1=1667047&r2=1667048&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/realm-howto.xml (original)
+++ tomcat/trunk/webapps/docs/realm-howto.xml Mon Mar 16 15:55:56 2015
@@ -535,7 +535,7 @@ to, and optionally the port number and d
required root naming context.</p>
<p>If you have more than one provider you can configure an
-<strong>alternateURL</strong>. If a socket connection can not be
+<strong>alternateURL</strong>. If a socket connection cannot be
made to the provider at the <strong>connectionURL</strong> an
attempt will be made to use the <strong>alternateURL</strong>.</p>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
