tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r833130 [2/2] - in /tomcat/trunk/java/org/apache/catalina: ./ ant/ ant/jmx/ authenticator/ connector/ deploy/ filters/ ha/authenticator/ ha/backend/ ha/deploy/ ha/session/ ha/tcp/ loader/ manager/ manager/host/ manager/util/ mbeans/ realm/ ...
Date Thu, 05 Nov 2009 19:08:44 GMT
Modified: tomcat/trunk/java/org/apache/catalina/tribes/UniqueId.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/UniqueId.java?rev=833130&r1=833129&r2=833130&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/UniqueId.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/UniqueId.java Thu Nov  5 19:08:42 2009
@@ -20,7 +20,7 @@
 import java.io.Serializable;
 
 /**
- * <p>Title: Represents a globabally unique Id</p>
+ * <p>Title: Represents a globally unique Id</p>
  *
  * <p>Company: </p>
  *

Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java?rev=833130&r1=833129&r2=833130&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java Thu Nov  5 19:08:42
2009
@@ -79,7 +79,7 @@
     protected ChannelCoordinator coordinator = new ChannelCoordinator();
 
     /**
-     * The first interceptor in the inteceptor stack.
+     * The first interceptor in the interceptor stack.
      * The interceptors are chained in a linked list, so we only need a reference to the
      * first one
      */
@@ -587,7 +587,7 @@
 
     /**
      * Returns the sleep time in milliseconds that the internal heartbeat will
-     * sleep in between invokations of <code>Channel.heartbeat()</code>
+     * sleep in between invocations of <code>Channel.heartbeat()</code>
      * @return long
      */
     public long getHeartbeatSleeptime() {

Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java?rev=833130&r1=833129&r2=833130&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java
Thu Nov  5 19:08:42 2009
@@ -28,7 +28,7 @@
 /**
  * 
  * Same implementation as the MessageDispatchInterceptor
- * except is ues an atomic long for the currentSize calculation
+ * except it uses an atomic long for the currentSize calculation
  * and uses a thread pool for message sending.
  * 
  * @author Filip Hanik

Modified: tomcat/trunk/java/org/apache/catalina/tribes/io/ObjectReader.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/io/ObjectReader.java?rev=833130&r1=833129&r2=833130&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/io/ObjectReader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/io/ObjectReader.java Thu Nov  5 19:08:42
2009
@@ -91,7 +91,7 @@
      * @param data new transfer buffer
      * @param off offset
      * @param len length in buffer
-     * @return number of messages that sended to callback
+     * @return number of messages that was sent to callback
      * @throws java.io.IOException
      */
     public int append(ByteBuffer data, int len, boolean count) throws java.io.IOException
{

Modified: tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java?rev=833130&r1=833129&r2=833130&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java Thu Nov
 5 19:08:42 2009
@@ -210,7 +210,7 @@
                 socket = new MulticastSocket(new InetSocketAddress(address,port));
             } catch (BindException e) {
                 /*
-                 * On some plattforms (e.g. Linux) it is not possible to bind
+                 * On some platforms (e.g. Linux) it is not possible to bind
                  * to the multicast address. In this case only bind to the
                  * port.
                  */

Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/PooledSender.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/PooledSender.java?rev=833130&r1=833129&r2=833130&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/PooledSender.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/PooledSender.java Thu Nov  5 19:08:42
2009
@@ -88,7 +88,7 @@
     }
 
     public void add(Member member) {
-        // no op, senders created upon demans
+        // no op, senders created upon demands
     }
 
     public void remove(Member member) {

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=833130&r1=833129&r2=833130&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 Thu
Nov  5 19:08:42 2009
@@ -138,7 +138,7 @@
 
 
     /**
-     * send a reply-acknowledgement (6,2,3)
+     * send a reply-acknowledgment (6,2,3)
      * @param key
      * @param channel
      */

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=833130&r1=833129&r2=833130&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 Thu Nov  5 19:08:42
2009
@@ -226,9 +226,9 @@
      * Wait for ack is needed and make auto retry when write message is failed.
      * After sending error close and reopen socket again.
      * 
-     * After successfull sending update stats
+     * After successful sending update stats
      * 
-     * WARNING: Subclasses must be very carefull that only one thread call this pushMessage
at once!!!
+     * WARNING: Subclasses must be very careful that only one thread call this pushMessage
at once!!!
      * 
      * @see #closeSocket()
      * @see #openSocket()
@@ -251,8 +251,8 @@
     }
     
     /**
-     * Wait for Acknowledgement from other server
-     * FIXME Please, not wait only for three charcters, better control that the wait ack
message is correct.
+     * Wait for Acknowledgment from other server
+     * FIXME Please, not wait only for three characters, better control that the wait ack
message is correct.
      * @param timeout
      * @throws java.io.IOException
      * @throws java.net.SocketTimeoutException

Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java?rev=833130&r1=833129&r2=833130&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/util/FastQueue.java Thu Nov
 5 19:08:42 2009
@@ -25,7 +25,7 @@
 
 /**
  * A fast queue that remover thread lock the adder thread. <br/>Limit the queue
- * length when you have strange producer thread problemes.
+ * length when you have strange producer thread problems.
  * 
  * FIXME add i18n support to log messages
  * @author Rainer Jung
@@ -69,7 +69,7 @@
     private boolean inMutex = false;
 
     /**
-     * limit the queue legnth ( default is unlimited)
+     * limit the queue length ( default is unlimited)
      */
     private int maxQueueLength = 0;
 

Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java?rev=833130&r1=833129&r2=833130&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java Thu Nov  5 19:08:42
2009
@@ -188,7 +188,7 @@
         }
         if ( current != null ) {
             if ( remaining > 0 ) {
-                //weve written everything, or we are starting a new package
+                //we have written everything, or we are starting a new package
                 //protect against buffer overwrite
                 int byteswritten = isUdpBased()?dataChannel.write(writebuf) : socketChannel.write(writebuf);
                 if (byteswritten == -1 ) throw new EOFException();

Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java?rev=833130&r1=833129&r2=833130&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java Thu
Nov  5 19:08:42 2009
@@ -95,7 +95,7 @@
                 delta = System.currentTimeMillis() - start;
             }
             if ( remaining > 0 ) {
-                //timeout has occured
+                //timeout has occurred
                 ChannelException cxtimeout = new ChannelException("Operation has timed out("+getTimeout()+"
ms.).");
                 if ( cx==null ) cx = new ChannelException("Operation has timed out("+getTimeout()+"
ms.).");
                 for (int i=0; i<senders.length; i++ ) {
@@ -307,7 +307,7 @@
                 }
             }
         }
-        //clean up any cancelled keys
+        //clean up any canceled keys
         if ( result ) try { selector.selectNow(); }catch (Exception ignore){}
         return result;
     }

Modified: tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java?rev=833130&r1=833129&r2=833130&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java Thu Nov  5 19:08:42
2009
@@ -111,7 +111,7 @@
 
 
     /**
-     * The relative or absolute pathname ot the file in which we write
+     * The relative or absolute pathname of the file in which we write
      * our new information prior to renaming.
      */
     protected String pathnameNew = pathname + ".new";

Modified: tomcat/trunk/java/org/apache/catalina/util/Base64.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/Base64.java?rev=833130&r1=833129&r2=833130&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/Base64.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/Base64.java Thu Nov  5 19:08:42 2009
@@ -108,7 +108,7 @@
     }
 
     /**
-     * Encodes hex octects into Base64.
+     * Encodes hex octets into Base64.
      *
      * @param binaryData Array containing binary data to encode.
      * @return Base64-encoded data.
@@ -203,7 +203,7 @@
     }
 
     /**
-     * Decodes Base64 data into octects
+     * Decodes Base64 data into octets
      *
      * @param base64DataBC Byte array containing Base64 data
      * @param decodedDataCC The decoded data chars

Modified: tomcat/trunk/java/org/apache/catalina/util/DateTool.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/DateTool.java?rev=833130&r1=833129&r2=833130&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/DateTool.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/DateTool.java Thu Nov  5 19:08:42 2009
@@ -35,7 +35,7 @@
 public class DateTool {
 
     /**
-     * US locale - all HTTP dates are in english
+     * US locale - all HTTP dates are in English
      */
     public final static Locale LOCALE_US = Locale.US;
 

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=833130&r1=833129&r2=833130&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java Thu Nov  5 19:08:42
2009
@@ -39,9 +39,9 @@
 
 
 /**
- * Ensures that all extension dependies are resolved for a WEB application
+ * Ensures that all extension dependencies are resolved for a WEB application
  * are met. This class builds a master list of extensions available to an
- * applicaiton and then validates those extensions.
+ * application and then validates those extensions.
  *
  * See http://java.sun.com/j2se/1.4/docs/guide/extensions/spec.html for
  * a detailed explanation of the extension mechanism in Java.
@@ -113,7 +113,7 @@
 
 
     /**
-     * Runtime validation of a Web Applicaiton.
+     * Runtime validation of a Web Application.
      *
      * This method uses JNDI to look up the resources located under a 
      * <code>DirContext</code>. It locates Web Application MANIFEST.MF 
@@ -140,7 +140,7 @@
         // If the application context is null it does not exist and 
         // therefore is not valid
         if (dirContext == null) return false;
-        // Find the Manifest for the Web Applicaiton
+        // Find the Manifest for the Web Application
         InputStream inputStream = null;
         try {
             NamingEnumeration<Binding> wne =
@@ -236,7 +236,7 @@
      * represented by any given <code>ManifestResource</code> objects 
      * is not met.
      *
-     * This method should also provide static validation of a Web Applicaiton 
+     * This method should also provide static validation of a Web Application 
      * if provided with the necessary parameters.
      *
      * @param appName The name of the Application that will appear in the 
@@ -277,7 +277,7 @@
             while (rit.hasNext()) {
                 boolean found = false;
                 Extension requiredExt = rit.next();
-                // check the applicaion itself for the extension
+                // check the application itself for the extension
                 if (availableExtensions != null) {
                     Iterator<Extension> ait = availableExtensions.iterator();
                     while (ait.hasNext()) {

Modified: tomcat/trunk/java/org/apache/catalina/util/IOTools.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/IOTools.java?rev=833130&r1=833129&r2=833130&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/IOTools.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/IOTools.java Thu Nov  5 19:08:42 2009
@@ -41,7 +41,7 @@
      *
      * @param reader the reader to read from.
      * @param writer the writer to write to.
-     * @param buf the char array to use as a bufferx
+     * @param buf the char array to use as a buffer
      */
     public static void flow( Reader reader, Writer writer, char[] buf ) 
         throws IOException {

Modified: tomcat/trunk/java/org/apache/catalina/util/ManifestResource.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/ManifestResource.java?rev=833130&r1=833129&r2=833130&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/ManifestResource.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/ManifestResource.java Thu Nov  5 19:08:42 2009
@@ -100,7 +100,7 @@
     }
     
     /**
-     * Convienience method to check if this <code>ManifestResource</code>
+     * Convenience method to check if this <code>ManifestResource</code>
      * has an requires extensions.
      *
      * @return true if required extensions are present

Modified: tomcat/trunk/java/org/apache/catalina/util/ParameterMap.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/ParameterMap.java?rev=833130&r1=833129&r2=833130&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/ParameterMap.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/ParameterMap.java Thu Nov  5 19:08:42 2009
@@ -83,7 +83,7 @@
     /**
      * Construct a new map with the same mappings as the given map.
      *
-     * @param map Map whose contents are dupliated in the new map
+     * @param map Map whose contents are duplicated in the new map
      */
     public ParameterMap(Map<K,V> map) {
 

Modified: tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java?rev=833130&r1=833129&r2=833130&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/RequestUtil.java Thu Nov  5 19:08:42 2009
@@ -324,7 +324,7 @@
 
 
     /**
-     * Convert a byte character value to hexidecimal digit value.
+     * Convert a byte character value to hexadecimal digit value.
      *
      * @param b the character value byte
      */

Modified: tomcat/trunk/java/org/apache/catalina/util/SchemaResolver.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/SchemaResolver.java?rev=833130&r1=833129&r2=833130&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/SchemaResolver.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/SchemaResolver.java Thu Nov  5 19:08:42 2009
@@ -34,7 +34,7 @@
 public class SchemaResolver implements EntityResolver {
 
     /**
-     * The disgester instance for which this class is the entity resolver.
+     * The digester instance for which this class is the entity resolver.
      */
     protected Digester digester;
 
@@ -62,7 +62,7 @@
 
     /**
      * Create a new <code>EntityResolver</code> that will redirect
-     * all remote dtds and schema to a locat destination.
+     * all remote dtds and schema to a local destination.
      * @param digester The digester instance.
      */
     public SchemaResolver(Digester digester) {

Modified: tomcat/trunk/java/org/apache/catalina/util/Strftime.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/Strftime.java?rev=833130&r1=833129&r2=833130&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/Strftime.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/Strftime.java Thu Nov  5 19:08:42 2009
@@ -80,7 +80,7 @@
         translate.put("r","hh:mm:ss a");
         translate.put("R","HH:mm");
         //There's no way to specify this with SimpleDateFormat
-        //translate.put("s","seconds since ecpoch");
+        //translate.put("s","seconds since epoch");
         translate.put("S","ss");
         translate.put("t","\t");
         translate.put("T","HH:mm:ss");
@@ -88,12 +88,12 @@
         //translate.put("u","day of week ( 1-7 )");
 
         //There's no way to specify this with SimpleDateFormat
-        //translate.put("U","week in year with first sunday as first day...");
+        //translate.put("U","week in year with first Sunday as first day...");
 
         translate.put("V","ww"); //I'm not sure this is always exactly the same
 
         //There's no way to specify this with SimpleDateFormat
-        //translate.put("W","week in year with first monday as first day...");
+        //translate.put("W","week in year with first Monday as first day...");
 
         //There's no way to specify this with SimpleDateFormat
         //translate.put("w","E");

Modified: tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java?rev=833130&r1=833129&r2=833130&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java Thu Nov  5 19:08:42 2009
@@ -497,7 +497,7 @@
 
     /**
      * Return whether the attribute name to look for when
-     * performing conditional loggging. If null, every
+     * performing conditional logging. If null, every
      * request is logged.
      */
     public String getCondition() {
@@ -1358,7 +1358,7 @@
             if (replace) {
                 /*
                  * For code that processes {, the behavior will be ... if I do
-                 * not enounter a closing } - then I ignore the {
+                 * not encounter a closing } - then I ignore the {
                  */
                 if ('{' == ch) {
                     StringBuilder name = new StringBuilder();

Modified: tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java?rev=833130&r1=833129&r2=833130&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/CometConnectionManagerValve.java Thu Nov
 5 19:08:42 2009
@@ -94,7 +94,7 @@
 
     
     /**
-     * List of current Coment connections.
+     * List of current Comet connections.
      */
     protected List<Request> cometRequests =
         Collections.synchronizedList(new ArrayList<Request>());
@@ -259,7 +259,7 @@
             // begin event, and Comet mode is on
             HttpSession session = request.getSession(true);
             
-            // Track the conection for webapp reload
+            // Track the connection for webapp reload
             cometRequests.add(request);
             
             // Track the connection for session expiration



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message