tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r833111 - /tomcat/trunk/java/org/apache/catalina/core/
Date Thu, 05 Nov 2009 18:18:54 GMT
Author: markt
Date: Thu Nov  5 18:18:53 2009
New Revision: 833111

URL: http://svn.apache.org/viewvc?rev=833111&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48133
Spelling errors in javadoc
Patch provided by qingyang.xu

Modified:
    tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
    tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
    tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
    tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
    tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
    tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
    tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
    tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java
    tomcat/trunk/java/org/apache/catalina/core/StandardService.java
    tomcat/trunk/java/org/apache/catalina/core/StandardWrapperFacade.java
    tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java?rev=833111&r1=833110&r2=833111&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java Thu Nov  5 18:18:53
2009
@@ -285,7 +285,7 @@
     /**
      * Forward this request and response to another resource for processing.
      * Any runtime exception, IOException, or ServletException thrown by the
-     * called servlet will be propogated to the caller.
+     * called servlet will be propagated to the caller.
      *
      * @param request The servlet request to be forwarded
      * @param response The servlet response to be forwarded
@@ -389,7 +389,7 @@
         if  (response instanceof ResponseFacade) {
             ((ResponseFacade) response).finish();
         } else {
-            // Servlet SRV.6.2.2. The Resquest/Response may have been wrapped
+            // Servlet SRV.6.2.2. The Request/Response may have been wrapped
             // and may no longer be instance of RequestFacade 
             if (wrapper.getLogger().isDebugEnabled()){
                 wrapper.getLogger().debug( " The Response is vehiculed using a wrapper: "

@@ -469,7 +469,7 @@
     /**
      * Include the response from another resource in the current response.
      * Any runtime exception, IOException, or ServletException thrown by the
-     * called servlet will be propogated to the caller.
+     * called servlet will be propagated to the caller.
      *
      * @param request The servlet request that is including this one
      * @param response The servlet response to be appended to

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java?rev=833111&r1=833110&r2=833111&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java Thu Nov  5 18:18:53
2009
@@ -30,7 +30,7 @@
 import org.apache.catalina.deploy.FilterMap;
 
 /**
- * Factory for the creation and caching of Filters and creationg 
+ * Factory for the creation and caching of Filters and creation 
  * of Filter Chains.
  *
  * @author Greg Murray
@@ -56,7 +56,7 @@
 
 
     /*
-     * Prevent instanciation outside of the getInstanceMethod().
+     * Prevent instantiation outside of the getInstanceMethod().
      */
     private ApplicationFilterFactory() {
     }
@@ -66,7 +66,7 @@
 
 
     /**
-     * Return the fqctory instance.
+     * Return the factory instance.
      */
     public static ApplicationFilterFactory getInstance() {
         if (factory == null) {
@@ -328,7 +328,7 @@
 
 
     /**
-     * Convienience method which returns true if  the dispatcher type
+     * Convenience method which returns true if  the dispatcher type
      * matches the dispatcher types specified in the FilterMap
      */
     private boolean matchDispatcher(FilterMap filterMap, DispatcherType type) {

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java?rev=833111&r1=833110&r2=833111&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java Thu Nov  5 18:18:53
2009
@@ -118,7 +118,7 @@
 
 
     /**
-     * If this request is cross context, since this changes session accesss
+     * If this request is cross context, since this changes session access
      * behavior.
      */
     protected boolean crossContext = false;

Modified: tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=833111&r1=833110&r2=833111&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Thu Nov  5 18:18:53 2009
@@ -1209,7 +1209,7 @@
      *
      * @exception IllegalArgumentException if this Container refused to
      *  accept the specified Valve
-     * @exception IllegalArgumentException if the specifie Valve refuses to be
+     * @exception IllegalArgumentException if the specified Valve refuses to be
      *  associated with this Container
      * @exception IllegalStateException if the specified Valve is already
      *  associated with a different Container
@@ -1272,7 +1272,7 @@
 
     /**
      * <p>Set the Valve instance that has been distinguished as the basic
-     * Valve for this Pipeline (if any).  Prioer to setting the basic Valve,
+     * Valve for this Pipeline (if any).  Prior to setting the basic Valve,
      * the Valve's <code>setContainer()</code> will be called, if it
      * implements <code>Contained</code>, with the owning Container as an
      * argument.  The method may throw an <code>IllegalArgumentException</code>
@@ -1367,7 +1367,7 @@
 
 
     /**
-     * Return the abbreviated name of this container for logging messsages
+     * Return the abbreviated name of this container for logging messages
      */
     protected String logName() {
 

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=833111&r1=833110&r2=833111&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Thu Nov  5 18:18:53 2009
@@ -378,7 +378,7 @@
 
     /**
      * Filter mappings added via {@link ServletContext} may have to be inserted
-     * before the mappings in the deploymenmt descriptor but must be inserted in
+     * before the mappings in the deployment descriptor but must be inserted in
      * the order the {@link ServletContext} methods are called. This isn't an
      * issue for the mappings added after the deployment descriptor - they are
      * just added to the end - but correctly the adding mappings before the
@@ -1642,7 +1642,7 @@
      * Set the original document root for this Context.  This can be an absolute
      * pathname, a relative pathname, or a URL.
      *
-     * @param docBase The orginal document root
+     * @param docBase The original document root
      */
     public void setOriginalDocBase(String docBase) {
 

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java?rev=833111&r1=833110&r2=833111&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java Thu Nov  5 18:18:53 2009
@@ -98,7 +98,7 @@
      */
     private Service service = null;
 
-    /** Allow the base dir to be specified explicitely for
+    /** Allow the base dir to be specified explicitly for
      * each engine. In time we should stop using catalina.base property -
      * otherwise we loose some flexibility.
      */
@@ -135,7 +135,7 @@
     public Realm getRealm() {
         Realm configured=super.getRealm();
         // If no set realm has been called - default to JAAS
-        // This can be overriden at engine, context and host level  
+        // This can be overridden at engine, context and host level  
         if( configured==null ) {
             configured=new JAASRealm();
             this.setRealm( configured );
@@ -355,7 +355,7 @@
         //}
         
         if( service==null ) {
-            // for consistency...: we are probably in embeded mode
+            // for consistency...: we are probably in embedded mode
             try {
                 service=new StandardService();
                 service.setContainer( this );

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHost.java?rev=833111&r1=833110&r2=833111&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardHost.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardHost.java Thu Nov  5 18:18:53 2009
@@ -158,7 +158,7 @@
 
 
     /**
-     * Attribute value used to turn on/off XML namespace awarenes.
+     * Attribute value used to turn on/off XML namespace awareness.
      */
      private boolean xmlNamespaceAware = false;
      
@@ -319,7 +319,7 @@
 
     /**
      * Return the value of the deploy on startup flag.  If true, it indicates 
-     * that this host's child webapps should be discovred and automatically 
+     * that this host's child webapps should be discovered and automatically 
      * deployed at startup time.
      */
     public boolean getDeployOnStartup() {
@@ -491,7 +491,7 @@
 
     /**
      * Get the server.xml &lt;host&gt; attribute's xmlNamespaceAware.
-     * @return true if namespace awarenes is enabled.
+     * @return true if namespace awareness is enabled.
      *
      */
     public boolean getXmlNamespaceAware(){
@@ -774,7 +774,7 @@
 
     // -------------------- JMX  --------------------
     /**
-      * Return the MBean Names of the Valves assoicated with this Host
+      * Return the MBean Names of the Valves associated with this Host
       *
       * @exception Exception if an MBean cannot be created or registered
       */

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java?rev=833111&r1=833110&r2=833111&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java Thu Nov  5 18:18:53 2009
@@ -354,7 +354,7 @@
 
     /**
      * <p>Set the Valve instance that has been distinguished as the basic
-     * Valve for this Pipeline (if any).  Prioer to setting the basic Valve,
+     * Valve for this Pipeline (if any).  Prior to setting the basic Valve,
      * the Valve's <code>setContainer()</code> will be called, if it
      * implements <code>Contained</code>, with the owning Container as an
      * argument.  The method may throw an <code>IllegalArgumentException</code>
@@ -433,7 +433,7 @@
      *
      * @exception IllegalArgumentException if this Container refused to
      *  accept the specified Valve
-     * @exception IllegalArgumentException if the specifie Valve refuses to be
+     * @exception IllegalArgumentException if the specified Valve refuses to be
      *  associated with this Container
      * @exception IllegalStateException if the specified Valve is already
      *  associated with a different Container
@@ -554,7 +554,7 @@
                     log.error("StandardPipeline.removeValve: stop: ", e);
                 }
             }
-            // Unregister the removed valave
+            // Unregister the removed valve
             unregisterValve(valve);
         }
     

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardService.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardService.java?rev=833111&r1=833110&r2=833111&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardService.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardService.java Thu Nov  5 18:18:53 2009
@@ -584,7 +584,7 @@
                 }
             }
         }
-        // FIXME pero -- Why container stop first? KeepAlive connetions can send request!

+        // FIXME pero -- Why container stop first? KeepAlive connections can send request!

         // Stop our defined Connectors first
         synchronized (connectors) {
             for (int i = 0; i < connectors.length; i++) {
@@ -601,7 +601,7 @@
         if( oname==controller ) {
             // we registered ourself on init().
             // That should be the typical case - this object is just for
-            // backward compat, nobody should bother to load it explicitely
+            // backward compat, nobody should bother to load it explicitly
             Registry.getRegistry(null, null).unregisterComponent(oname);
             Executor[] executors = findExecutors();
             for (int i = 0; i < executors.length; i++) {
@@ -629,7 +629,7 @@
     public void initialize()
             throws LifecycleException
     {
-        // Service shouldn't be used with embeded, so it doesn't matter
+        // Service shouldn't be used with embedded, so it doesn't matter
         if (initialized) {
             if(log.isInfoEnabled())
                 log.info(sm.getString("standardService.initialize.initialized"));

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapperFacade.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapperFacade.java?rev=833111&r1=833110&r2=833111&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapperFacade.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapperFacade.java Thu Nov  5 18:18:53
2009
@@ -40,7 +40,7 @@
 
 
     /**
-     * Create a new facede around a StandardWrapper.
+     * Create a new facade around a StandardWrapper.
      */
     public StandardWrapperFacade(StandardWrapper config) {
 

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java?rev=833111&r1=833110&r2=833111&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java Thu Nov  5 18:18:53
2009
@@ -60,7 +60,7 @@
     // ----------------------------------------------------- Instance Variables
 
 
-    // Some JMX statistics. This vavle is associated with a StandardWrapper.
+    // Some JMX statistics. This valve is associated with a StandardWrapper.
     // We expose the StandardWrapper as JMX ( j2eeType=Servlet ). The fields
     // are here for performance.
     private volatile long processingTime;



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


Mime
View raw message