Author: markt
Date: Fri Aug 10 15:16:11 2018
New Revision: 1837809
URL: http://svn.apache.org/viewvc?rev=1837809&view=rev
Log:
Correct various spelling errors throughout the source code and documentation.
Patch provided by Kazuhiro Sera.
This closes #118
Modified:
tomcat/trunk/java/javax/servlet/resources/XMLSchema.dtd
tomcat/trunk/java/javax/servlet/resources/j2ee_web_services_client_1_1.xsd
tomcat/trunk/java/javax/servlet/resources/web-jsptaglibrary_1_1.dtd
tomcat/trunk/java/javax/servlet/resources/web-jsptaglibrary_1_2.dtd
tomcat/trunk/java/javax/servlet/resources/web-jsptaglibrary_2_0.xsd
tomcat/trunk/java/org/apache/catalina/connector/CoyoteInputStream.java
tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/trunk/java/org/apache/catalina/ha/session/SessionMessageImpl.java
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/servlets/CGIServlet.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java
tomcat/trunk/java/org/apache/catalina/users/mbeans-descriptors.xml
tomcat/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
tomcat/trunk/java/org/apache/coyote/Response.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DriverManagerConnectionFactory.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/ManagedConnection.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/TransactionContext.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/TransactionContextListener.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/TransactionRegistry.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
tomcat/trunk/java/org/apache/tomcat/util/digester/RulesBase.java
tomcat/trunk/java/org/apache/tomcat/util/digester/package.html
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
tomcat/trunk/res/findbugs/filter-false-positives.xml
tomcat/trunk/res/rat/rat-excludes.txt
tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java
tomcat/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXmlOrdering.java
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/context.xml
tomcat/trunk/webapps/docs/config/http.xml
tomcat/trunk/webapps/docs/host-manager-howto.xml
tomcat/trunk/webapps/docs/html-host-manager-howto.xml
tomcat/trunk/webapps/docs/monitoring.xml
Modified: tomcat/trunk/java/javax/servlet/resources/XMLSchema.dtd
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/XMLSchema.dtd?rev=1837809&r1=1837808&r2=1837809&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/resources/XMLSchema.dtd (original)
+++ tomcat/trunk/java/javax/servlet/resources/XMLSchema.dtd Fri Aug 10 15:16:11
2018
@@ -33,7 +33,7 @@
are defined in XML Schema: Part 2: Datatypes -->
<!ENTITY % xs-datatypes PUBLIC 'datatypes' 'datatypes.dtd' >
-<!ENTITY % p 'xs:'> <!-- can be overriden in the internal subset of a
+<!ENTITY % p 'xs:'> <!-- can be overridden in the internal subset of a
schema document to establish a different
namespace prefix -->
<!ENTITY % s ':xs'> <!-- if %p is defined (e.g. as foo:) then you must
@@ -170,7 +170,7 @@
%complexTypeAttrs;>
<!-- particleAndAttrs is shorthand for a root type -->
-<!-- mixed is disallowed if simpleContent, overriden if complexContent
+<!-- mixed is disallowed if simpleContent, overridden if complexContent
has one too. -->
<!-- If anyAttribute appears in one or more referenced attributeGroups
Modified:
tomcat/trunk/java/javax/servlet/resources/j2ee_web_services_client_1_1.xsd
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/j2ee_web_services_client_1_1.xsd?rev=1837809&r1=1837808&r2=1837809&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/resources/j2ee_web_services_client_1_1.xsd
(original)
+++ tomcat/trunk/java/javax/servlet/resources/j2ee_web_services_client_1_1.xsd
Fri Aug 10 15:16:11 2018
@@ -188,7 +188,7 @@
<xsd:documentation>
The service-qname element declares the specific WSDL service
- element that is being refered to. It is not specified if no
+ element that is being referred to. It is not specified if no
wsdl-file is declared.
</xsd:documentation>
Modified: tomcat/trunk/java/javax/servlet/resources/web-jsptaglibrary_1_1.dtd
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/web-jsptaglibrary_1_1.dtd?rev=1837809&r1=1837808&r2=1837809&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/resources/web-jsptaglibrary_1_1.dtd
(original)
+++ tomcat/trunk/java/javax/servlet/resources/web-jsptaglibrary_1_1.dtd Fri Aug
10 15:16:11 2018
@@ -35,7 +35,7 @@ jspversion the version of JSP the tag l
shortname a simple default short name that could be used by
a JSP authoring tool to create names with a mnemonic
- value; for example, the it may be used as the prefered
+ value; for example, the it may be used as the preferred
prefix value in taglib directives
uri a uri uniquely identifying this taglib
info a simple string describing the "use" of this taglib,
Modified: tomcat/trunk/java/javax/servlet/resources/web-jsptaglibrary_1_2.dtd
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/web-jsptaglibrary_1_2.dtd?rev=1837809&r1=1837808&r2=1837809&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/resources/web-jsptaglibrary_1_2.dtd
(original)
+++ tomcat/trunk/java/javax/servlet/resources/web-jsptaglibrary_1_2.dtd Fri Aug
10 15:16:11 2018
@@ -50,7 +50,7 @@ jsp-version the version of JSP the t
short-name a simple default short name that could be used by
a JSP authoring tool to create names with a mnemonic
- value; for example, the it may be used as the prefered
+ value; for example, the it may be used as the preferred
prefix value in taglib directives
uri a uri uniquely identifying this taglib
Modified: tomcat/trunk/java/javax/servlet/resources/web-jsptaglibrary_2_0.xsd
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/web-jsptaglibrary_2_0.xsd?rev=1837809&r1=1837808&r2=1837809&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/resources/web-jsptaglibrary_2_0.xsd
(original)
+++ tomcat/trunk/java/javax/servlet/resources/web-jsptaglibrary_2_0.xsd Fri Aug
10 15:16:11 2018
@@ -682,7 +682,7 @@
short-name a simple default short name that could be
used by a JSP authoring tool to create
names with a mnemonic value; for example,
- the it may be used as the prefered prefix
+ the it may be used as the preferred prefix
value in taglib directives
uri a uri uniquely identifying this taglib
Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteInputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteInputStream.java?rev=1837809&r1=1837808&r2=1837809&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteInputStream.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteInputStream.java Fri
Aug 10 15:16:11 2018
@@ -138,7 +138,7 @@ public class CoyoteInputStream extends S
* Transfers bytes from the buffer to the specified ByteBuffer. After the
* operation the position of the ByteBuffer will be returned to the one
* before the operation, the limit will be the position incremented by
- * the number of the transfered bytes.
+ * the number of the transferred bytes.
*
* @param b the ByteBuffer into which bytes are to be written.
* @return an integer specifying the actual number of bytes read, or -1 if
Modified: tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java?rev=1837809&r1=1837808&r2=1837809&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java Fri Aug 10
15:16:11 2018
@@ -351,7 +351,7 @@ public class InputBuffer extends Reader
* Transfers bytes from the buffer to the specified ByteBuffer. After the
* operation the position of the ByteBuffer will be returned to the one
* before the operation, the limit will be the position incremented by
- * the number of the transfered bytes.
+ * the number of the transferred bytes.
*
* @param to the ByteBuffer into which bytes are to be written.
* @return an integer specifying the actual number of bytes read, or -1 if
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=1837809&r1=1837808&r2=1837809&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java Fri Aug 10
15:16:11 2018
@@ -1170,7 +1170,7 @@ public class ExpiresFilter extends Filte
/**
* @return the subset of the given {@code str} that is before the first
- * occurence of the given {@code separator}. Return {@code null}
+ * occurrence of the given {@code separator}. Return {@code null}
* if the given {@code str} or the given {@code separator} is
* null. Return and empty string if the {@code separator} is empty.
*
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1837809&r1=1837808&r2=1837809&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Fri Aug
10 15:16:11 2018
@@ -296,7 +296,7 @@ public class DeltaManager extends Cluste
}
/**
- * Set that state transfered is complete
+ * Set that state transferred is complete
* @param stateTransfered Fag value
*/
public void setStateTransfered(boolean stateTransfered) {
@@ -802,8 +802,8 @@ public class DeltaManager extends Cluste
}
/**
- * Wait that cluster session state is transfered or timeout after 60 Sec
- * With stateTransferTimeout == -1 wait that backup is transfered (forever
mode)
+ * Wait that cluster session state is transferred or timeout after 60 Sec
+ * With stateTransferTimeout == -1 wait that backup is transferred
(forever mode)
* @param beforeSendTime Start instant of the operation
*/
protected void waitForSendAllSessions(long beforeSendTime) {
@@ -811,7 +811,7 @@ public class DeltaManager extends Cluste
long reqNow = reqStart ;
boolean isTimeout = false;
if(getStateTransferTimeout() > 0) {
- // wait that state is transfered with timeout check
+ // wait that state is transferred with timeout check
do {
try {
Thread.sleep(100);
@@ -823,7 +823,7 @@ public class DeltaManager extends Cluste
} while ((!getStateTransfered()) && (!isTimeout) &&
(!isNoContextManagerReceived()));
} else {
if(getStateTransferTimeout() == -1) {
- // wait that state is transfered
+ // wait that state is transferred
do {
try {
Thread.sleep(100);
@@ -1197,7 +1197,7 @@ public class DeltaManager extends Cluste
/**
- * handle receive session state is complete transfered
+ * handle receive session state is complete transferred
* @param msg Session message
* @param sender Member which sent the message
*/
@@ -1331,7 +1331,7 @@ public class DeltaManager extends Cluste
* handle receive that other node want all sessions ( restart )
* a) send all sessions with one message
* b) send session at blocks
- * After sending send state is complete transfered
+ * After sending send state is complete transferred
* @param msg Session message
* @param sender Member which sent the message
* @throws IOException IO error sending messages
@@ -1369,8 +1369,8 @@ public class DeltaManager extends Cluste
}//end if
SessionMessage newmsg = new SessionMessageImpl(name,
- SessionMessage.EVT_ALL_SESSION_TRANSFERCOMPLETE, null,
"SESSION-STATE-TRANSFERED",
- "SESSION-STATE-TRANSFERED" + getName());
+ SessionMessage.EVT_ALL_SESSION_TRANSFERCOMPLETE, null,
"SESSION-STATE-TRANSFERRED",
+ "SESSION-STATE-TRANSFERRED" + getName());
newmsg.setTimestamp(findSessionTimestamp);
if (log.isDebugEnabled()) {
log.debug(sm.getString("deltaManager.createMessage.allSessionTransfered",getName()));
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/SessionMessageImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/SessionMessageImpl.java?rev=1837809&r1=1837808&r2=1837809&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/SessionMessageImpl.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/SessionMessageImpl.java
Fri Aug 10 15:16:11 2018
@@ -71,7 +71,7 @@ public class SessionMessageImpl extends
* <B>EVT_ALL_SESSION_DATA</B><BR>
* Send complete serializes session list<BR>
* <B>EVT_ALL_SESSION_TRANSFERCOMPLETE</B><BR>
- * send that all session state information are transfered
+ * send that all session state information are transferred
* after GET_ALL_SESSION received from this sender.<BR>
* <B>EVT_CHANGE_SESSION_ID</B><BR>
* send original sessionID and new sessionID.<BR>
@@ -144,7 +144,7 @@ public class SessionMessageImpl extends
case EVT_GET_ALL_SESSIONS : return "SESSION-GET-ALL";
case EVT_SESSION_DELTA : return "SESSION-DELTA";
case EVT_ALL_SESSION_DATA : return "ALL-SESSION-DATA";
- case EVT_ALL_SESSION_TRANSFERCOMPLETE : return
"SESSION-STATE-TRANSFERED";
+ case EVT_ALL_SESSION_TRANSFERCOMPLETE : return
"SESSION-STATE-TRANSFERRED";
case EVT_CHANGE_SESSION_ID : return "SESSION-ID-CHANGED";
case EVT_ALL_SESSION_NOCONTEXTMANAGER : return
"NO-CONTEXT-MANAGER";
default : return "UNKNOWN-EVENT-TYPE";
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=1837809&r1=1837808&r2=1837809&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 Fri
Aug 10 15:16:11 2018
@@ -259,7 +259,7 @@
writeable="false"/>
<attribute
name="stateTransfered"
- description="Is session state transfered complete? "
+ description="Is session state transferred complete? "
type="boolean"/>
<attribute
name="stateTransferTimeout"
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=1837809&r1=1837808&r2=1837809&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java Fri Aug
10 15:16:11 2018
@@ -796,7 +796,7 @@ public class SimpleTcpCluster extends Li
if (log.isDebugEnabled()) {
log.debug("Message " + message.toString() + " from type "
+ message.getClass().getName()
- + " transfered but no listener registered");
+ + " transferred but no listener registered");
}
}
}
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=1837809&r1=1837808&r2=1837809&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java Fri Aug 10
15:16:11 2018
@@ -1161,7 +1161,7 @@ public final class CGIServlet extends Ht
sb.append(System.lineSeparator());
sb.append("Check the HttpServletRequest pathInfo property to
see if it is what ");
sb.append(System.lineSeparator());
- sb.append("you meant it to be. You must specify an existant
and executable file ");
+ sb.append("you meant it to be. You must specify an existent
and executable file ");
sb.append(System.lineSeparator());
sb.append("as part of the path-info.");
sb.append(System.lineSeparator());
@@ -1425,7 +1425,7 @@ public final class CGIServlet extends Ht
* directory, and input/output streams
*
* <p>
- * This implements the following CGI specification recommedations:
+ * This implements the following CGI specification recommendations:
* </p>
* <UL>
* <LI> Servers SHOULD provide the "<code>query</code>" component of
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java?rev=1837809&r1=1837808&r2=1837809&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
Fri Aug 10 15:16:11 2018
@@ -161,7 +161,7 @@ public class StandardContextSF extends S
!mover.getConfigOld().canWrite())) {
log.error("Cannot move orignal context output file at "
+ mover.getConfigOld());
- throw new IOException("Context orginal file at "
+ throw new IOException("Context original file at "
+ mover.getConfigOld()
+ " is null, not a file or not writable.");
}
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=1837809&r1=1837808&r2=1837809&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java Fri
Aug 10 15:16:11 2018
@@ -292,7 +292,7 @@ public class StoreAppender {
* Determine if the attribute value needs to be stored.
*
* @param bean
- * orginal bean
+ * original bean
* @param bean2
* default bean
* @param attrName
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java?rev=1837809&r1=1837808&r2=1837809&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java
Fri Aug 10 15:16:11 2018
@@ -101,7 +101,7 @@ public class BioSender extends AbstractS
* Send message.
* @param data The data to send
* @param waitForAck Wait for an ack
- * @throws IOException An IO error occured sending the message
+ * @throws IOException An IO error occurred sending the message
*/
public void sendMessage(byte[] data, boolean waitForAck) throws
IOException {
IOException exception = null;
Modified: tomcat/trunk/java/org/apache/catalina/users/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/mbeans-descriptors.xml?rev=1837809&r1=1837808&r2=1837809&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/users/mbeans-descriptors.xml
(original)
+++ tomcat/trunk/java/org/apache/catalina/users/mbeans-descriptors.xml Fri Aug
10 15:16:11 2018
@@ -43,7 +43,7 @@
writeable="false"/>
<attribute name="readonly"
- description="No persistant save of the user database"
+ description="No persistent save of the user database"
type="boolean"
writeable="false"/>
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=1837809&r1=1837808&r2=1837809&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
Fri Aug 10 15:16:11 2018
@@ -353,7 +353,7 @@ public class StuckThreadDetectionValve e
// no need to release the semaphore, it will be GCed
}
//else the request went through before being marked as stuck, no
need
- //to sync agains the semaphore
+ //to sync against the semaphore
return threadState;
}
Modified: tomcat/trunk/java/org/apache/coyote/Response.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Response.java?rev=1837809&r1=1837808&r2=1837809&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/Response.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Response.java Fri Aug 10 15:16:11 2018
@@ -98,7 +98,7 @@ public final class Response {
/**
* Committed flag.
*/
- volatile boolean commited = false;
+ volatile boolean committed = false;
/**
@@ -252,15 +252,15 @@ public final class Response {
public boolean isCommitted() {
- return commited;
+ return committed;
}
public void setCommitted(boolean v) {
- if (v && !this.commited) {
+ if (v && !this.committed) {
this.commitTime = System.currentTimeMillis();
}
- this.commited = v;
+ this.committed = v;
}
/**
@@ -333,7 +333,7 @@ public final class Response {
public void reset() throws IllegalStateException {
- if (commited) {
+ if (committed) {
throw new IllegalStateException();
}
@@ -612,7 +612,7 @@ public final class Response {
contentLength = -1;
status = 200;
message = null;
- commited = false;
+ committed = false;
commitTime = -1;
errorException = null;
errorState.set(0);
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DriverManagerConnectionFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DriverManagerConnectionFactory.java?rev=1837809&r1=1837808&r2=1837809&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DriverManagerConnectionFactory.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/DriverManagerConnectionFactory.java
Fri Aug 10 15:16:11 2018
@@ -47,7 +47,7 @@ public class DriverManagerConnectionFact
*/
public DriverManagerConnectionFactory(final String connectionUri) {
this.connectionUri = connectionUri;
- this.propeties = new Properties();
+ this.properties = new Properties();
}
/**
@@ -61,7 +61,7 @@ public class DriverManagerConnectionFact
*/
public DriverManagerConnectionFactory(final String connectionUri, final
Properties properties) {
this.connectionUri = connectionUri;
- this.propeties = properties;
+ this.properties = properties;
}
/**
@@ -83,17 +83,17 @@ public class DriverManagerConnectionFact
@Override
public Connection createConnection() throws SQLException {
- if (null == propeties) {
+ if (null == properties) {
if (userName == null && userPassword == null) {
return DriverManager.getConnection(connectionUri);
}
return DriverManager.getConnection(connectionUri, userName,
userPassword);
}
- return DriverManager.getConnection(connectionUri, propeties);
+ return DriverManager.getConnection(connectionUri, properties);
}
private final String connectionUri;
private String userName;
private String userPassword;
- private Properties propeties;
+ private Properties properties;
}
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/ManagedConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/ManagedConnection.java?rev=1837809&r1=1837808&r2=1837809&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/ManagedConnection.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/ManagedConnection.java
Fri Aug 10 15:16:11 2018
@@ -204,7 +204,7 @@ public class ManagedConnection<C extends
*/
protected class CompletionListener implements TransactionContextListener {
@Override
- public void afterCompletion(final TransactionContext completedContext,
final boolean commited) {
+ public void afterCompletion(final TransactionContext completedContext,
final boolean committed) {
if (completedContext == transactionContext) {
transactionComplete();
}
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/TransactionContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/TransactionContext.java?rev=1837809&r1=1837808&r2=1837809&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/TransactionContext.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/TransactionContext.java
Fri Aug 10 15:16:11 2018
@@ -67,7 +67,7 @@ public class TransactionContext {
}
/**
- * Provided for backwards compatability
+ * Provided for backwards compatibility
*
* @param transactionRegistry the TransactionRegistry used to obtain the
XAResource for the
* shared connection
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/TransactionContextListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/TransactionContextListener.java?rev=1837809&r1=1837808&r2=1837809&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/TransactionContextListener.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/TransactionContextListener.java
Fri Aug 10 15:16:11 2018
@@ -28,8 +28,8 @@ public interface TransactionContextListe
*
* @param transactionContext
* the transaction context that completed
- * @param commited
+ * @param committed
* true if the transaction committed; false otherwise
*/
- void afterCompletion(TransactionContext transactionContext, boolean
commited);
+ void afterCompletion(TransactionContext transactionContext, boolean
committed);
}
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/TransactionRegistry.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/TransactionRegistry.java?rev=1837809&r1=1837808&r2=1837809&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/TransactionRegistry.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/TransactionRegistry.java
Fri Aug 10 15:16:11 2018
@@ -61,7 +61,7 @@ public class TransactionRegistry {
}
/**
- * Provided for backwards compatability
+ * Provided for backwards compatibility
* @param transactionManager the transaction manager used to enlist
connections
*/
public TransactionRegistry(final TransactionManager transactionManager) {
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java?rev=1837809&r1=1837808&r2=1837809&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
Fri Aug 10 15:16:11 2018
@@ -29,7 +29,7 @@ import org.apache.tomcat.util.bcel.Const
* Wrapper class that parses a given Java .class file. The method <A
* href ="#parse">parse</A> returns a <A href ="JavaClass.html">
* JavaClass</A> object on success. When an I/O error or an
- * inconsistency occurs an appropiate exception is propagated back to
+ * inconsistency occurs an appropriate exception is propagated back to
* the caller.
*
* The structure and the names comply, except for a few conveniences,
@@ -141,7 +141,7 @@ public final class ClassParser {
*/
private void readClassInfo() throws IOException, ClassFormatException {
access_flags = dataInputStream.readUnsignedShort();
- /* Interfaces are implicitely abstract, the flag should be set
+ /* Interfaces are implicitly abstract, the flag should be set
* according to the JVM specification.
*/
if ((access_flags & Const.ACC_INTERFACE) != 0) {
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/RulesBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/RulesBase.java?rev=1837809&r1=1837808&r2=1837809&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/RulesBase.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/RulesBase.java Fri Aug 10
15:16:11 2018
@@ -97,7 +97,7 @@ public class RulesBase implements Rules
*/
@Override
public void add(String pattern, Rule rule) {
- // to help users who accidently add '/' to the end of their patterns
+ // to help users who accidentally add '/' to the end of their patterns
int patternLength = pattern.length();
if (patternLength>1 && pattern.endsWith("/")) {
pattern = pattern.substring(0, patternLength-1);
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/package.html
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/package.html?rev=1837809&r1=1837808&r2=1837809&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/package.html (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/package.html Fri Aug 10
15:16:11 2018
@@ -1028,7 +1028,7 @@ can be downloaded.
URLs may be local or remote but if the URL is chosen to be local, it is likely
only
to function correctly on a small number of machines (which are configured
precisely
to allow the xml to be parsed). This is usually unsatisfactory and so a
universally
-accessable URL is preferred. This usually means an internet URL.
+accessible URL is preferred. This usually means an internet URL.
</p>
<p>
To recap, in practice the <code><em>system-identifier</em></code> will (most
likely) be an
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=1837809&r1=1837808&r2=1837809&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
Fri Aug 10 15:16:11 2018
@@ -605,7 +605,7 @@ public class MultipartStream {
* @throws IOException if an i/o error occurs.
*/
public boolean skipPreamble() throws IOException {
- // First delimiter may be not preceeded with a CRLF.
+ // First delimiter may be not preceded with a CRLF.
System.arraycopy(boundary, 2, boundary, 0, boundary.length - 2);
boundaryLength = boundary.length - 2;
computeBoundaryTable();
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java?rev=1837809&r1=1837808&r2=1837809&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/ParameterParser.java
Fri Aug 10 15:16:11 2018
@@ -119,7 +119,7 @@ public class ParameterParser {
/**
* Tests if the given character is present in the array of characters.
*
- * @param ch the character to test for presense in the array of characters
+ * @param ch the character to test for presence in the array of characters
* @param charray the array of characters to test against
*
* @return {@code true} if the character is present in the array of
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java?rev=1837809&r1=1837808&r2=1837809&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java Fri Aug
10 15:16:11 2018
@@ -387,7 +387,7 @@ public class SecureNioChannel extends Ni
selector = Selector.open();
key = getIOChannel().register(selector, hsStatus);
} else {
- key.interestOps(hsStatus); // null warning
supressed
+ key.interestOps(hsStatus); // null warning
suppressed
}
int keyCount = selector.select(timeout);
if (keyCount == 0 && ((System.currentTimeMillis()-now)
>= timeout)) {
@@ -712,4 +712,4 @@ public class SecureNioChannel extends Ni
public ByteBuffer getEmptyBuf() {
return emptyBuf;
}
-}
\ No newline at end of file
+}
Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-false-positives.xml?rev=1837809&r1=1837808&r2=1837809&view=diff
==============================================================================
--- tomcat/trunk/res/findbugs/filter-false-positives.xml (original)
+++ tomcat/trunk/res/findbugs/filter-false-positives.xml Fri Aug 10 15:16:11
2018
@@ -1007,7 +1007,7 @@
<Bug pattern="NP_EQUALS_SHOULD_HANDLE_NULL_ARGUMENT" />
</Match>
<Match>
- <!-- Natural ordering behavoiur is docuemented in Javadoc -->
+ <!-- Natural ordering behaviour is docuemented in Javadoc -->
<Class name="org.apache.tomcat.dbcp.pool2.impl.DefaultPooledObject" />
<Bug pattern="EQ_COMPARETO_USE_OBJECT_EQUALS" />
</Match>
@@ -2000,4 +2000,4 @@
</Or>
<Bug pattern="RV_RETURN_VALUE_IGNORED_NO_SIDE_EFFECT"/>
</Match>
-</FindBugsFilter>
\ No newline at end of file
+</FindBugsFilter>
Modified: tomcat/trunk/res/rat/rat-excludes.txt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/rat/rat-excludes.txt?rev=1837809&r1=1837808&r2=1837809&view=diff
==============================================================================
--- tomcat/trunk/res/rat/rat-excludes.txt (original)
+++ tomcat/trunk/res/rat/rat-excludes.txt Fri Aug 10 15:16:11 2018
@@ -51,7 +51,7 @@
(*.gif, *.jpg are also binary, but are automatically detected by RAT as
ones, so no explicit configuration is needed)
- - Markdown files for display in ther GitHub UI
+ - Markdown files for display in their GitHub UI
- Temporary cache files used by Checkstle
@@ -184,4 +184,4 @@ output/dist/temp/safeToDelete.tmp
**/*.md
-output/res/checkstyle/*
\ No newline at end of file
+output/res/checkstyle/*
Modified: tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java?rev=1837809&r1=1837808&r2=1837809&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java (original)
+++ tomcat/trunk/test/org/apache/catalina/tribes/demos/MapDemo.java Fri Aug 10
15:16:11 2018
@@ -136,7 +136,7 @@ public class MapDemo implements ChannelL
long start = System.currentTimeMillis();
//create a channel object
ManagedChannel channel = (ManagedChannel)
ChannelCreator.createChannel(args);
- //define a map name, unless one is defined as a paramters
+ //define a map name, unless one is defined as a parameters
String mapName = "MapDemo";
if ( args.length > 0 && (!args[args.length-1].startsWith("-"))) {
mapName = args[args.length-1];
Modified:
tomcat/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXmlOrdering.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXmlOrdering.java?rev=1837809&r1=1837808&r2=1837809&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXmlOrdering.java
(original)
+++
tomcat/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXmlOrdering.java
Fri Aug 10 15:16:11 2018
@@ -328,7 +328,7 @@ public class TestWebXmlOrdering {
@Test
public void testOrderWebFragmentsRelative11() {
- // Test references to non-existant fragments
+ // Test references to non-existent fragments
doRelativeOrderingTest(new RelativeTestRunner11());
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1837809&r1=1837808&r2=1837809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Aug 10 15:16:11 2018
@@ -254,6 +254,10 @@
Update the internal fork of Apache Commons DBCP 2 to abc0484
(2018-08-09) to pick up some bug fixes and enhancements. (markt)
</update>
+ <fix>
+ Correct various spelling errors throughout the source code and
+ documentation. Patch provided by Kazuhiro Sera. (markt)
+ </fix>
</changelog>
</subsection>
</section>
@@ -661,7 +665,7 @@
<code>1.9</code> is still supported. (markt)
</update>
<add>
- Add support for specifing Java 10 (with the value <code>10</code>) as
+ Add support for specifying Java 10 (with the value <code>10</code>) as
the compiler source and/or compiler target for JSP compilation. (markt)
</add>
<fix>
Modified: tomcat/trunk/webapps/docs/config/context.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/context.xml?rev=1837809&r1=1837808&r2=1837809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/context.xml (original)
+++ tomcat/trunk/webapps/docs/config/context.xml Fri Aug 10 15:16:11 2018
@@ -813,7 +813,7 @@
<attribute name="skipMemoryLeakChecksOnJvmShutdown" required="false">
<p>If <code>true</code>, Tomcat will not perform the usual memory leak
- checks when the web applicaiton is stopped if that web application is
+ checks when the web application is stopped if that web application is
stopped as part of a JVM shutdown. If not specified, the default value
of <code>false</code> will be used.</p>
</attribute>
Modified: tomcat/trunk/webapps/docs/config/http.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/http.xml?rev=1837809&r1=1837808&r2=1837809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/trunk/webapps/docs/config/http.xml Fri Aug 10 15:16:11 2018
@@ -566,7 +566,7 @@
browsers are not compliant with this specification and use these
characters in unencoded form. To prevent Tomcat rejecting such requests,
this attribute may be used to specify the additional characters to allow.
- If not specified, no addtional characters will be allowed. The value may
+ If not specified, no additional characters will be allowed. The value may
be any combination of the following characters:
<code>" < > [ \ ] ^ ` { | }</code> . Any other characters
present in the value will be ignored.</p>
@@ -579,7 +579,7 @@
the major browsers are not compliant with this specification and use
these
characters in unencoded form. To prevent Tomcat rejecting such requests,
this attribute may be used to specify the additional characters to allow.
- If not specified, no addtional characters will be allowed. The value may
+ If not specified, no additional characters will be allowed. The value may
be any combination of the following characters:
<code>" < > [ \ ] ^ ` { | }</code> . Any other characters
present in the value will be ignored.</p>
Modified: tomcat/trunk/webapps/docs/host-manager-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/host-manager-howto.xml?rev=1837809&r1=1837808&r2=1837809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/host-manager-howto.xml (original)
+++ tomcat/trunk/webapps/docs/host-manager-howto.xml Fri Aug 10 15:16:11 2018
@@ -111,7 +111,7 @@ OK - Listed hosts
localhost:</source>
</p>
<p>
- Note that in case you retreive your users using the
+ Note that in case you retrieve your users using the
<code>DataSourceRealm</code>, <code>JDBCRealm</code>, or
<code>JNDIRealm</code> mechanism, add the appropriate role in the database
or the directory server respectively.
@@ -237,4 +237,4 @@ localhost:</source>
</subsection>
</section>
</body>
-</document>
\ No newline at end of file
+</document>
Modified: tomcat/trunk/webapps/docs/html-host-manager-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/html-host-manager-howto.xml?rev=1837809&r1=1837808&r2=1837809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/html-host-manager-howto.xml (original)
+++ tomcat/trunk/webapps/docs/html-host-manager-howto.xml Fri Aug 10 15:16:11
2018
@@ -111,7 +111,7 @@
log in with the created credentials.
</p>
<p>
- Note that in case you retreive your users using the
+ Note that in case you retrieve your users using the
<code>DataSourceRealm</code>, <code>JDBCRealm</code>, or
<code>JNDIRealm</code> mechanism, add the appropriate role in the
database
or the directory server respectively.
@@ -210,4 +210,4 @@
</section>
</body>
-</document>
\ No newline at end of file
+</document>
Modified: tomcat/trunk/webapps/docs/monitoring.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/monitoring.xml?rev=1837809&r1=1837808&r2=1837809&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/monitoring.xml (original)
+++ tomcat/trunk/webapps/docs/monitoring.xml Fri Aug 10 15:16:11 2018
@@ -1004,7 +1004,7 @@ List of Attributes
</table>
<p>
-Wait for server connection and that cluster backup node is accessable
+Wait for server connection and that cluster backup node is accessible
</p>
<source><