You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by sd...@apache.org on 2014/01/20 14:30:31 UTC

svn commit: r1559691 - in /velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity: ./ app/ app/event/ app/event/implement/ context/ exception/ io/ runtime/ runtime/resource/ runtime/resource/loader/

Author: sdumitriu
Date: Mon Jan 20 13:30:31 2014
New Revision: 1559691

URL: http://svn.apache.org/r1559691
Log:
fixed typos

Modified:
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/VelocityContext.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/Velocity.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/VelocityEngine.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/EventCartridge.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/EventHandlerUtil.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/IncludeNotFound.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/AbstractContext.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalContextAdapterImpl.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/exception/ExtendedParseException.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/exception/MethodInvocationException.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/exception/ParseErrorException.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/exception/TemplateInitException.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/io/VelocityWriter.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/Renderable.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeConstants.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeServices.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/VelocimacroFactory.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceCacheImpl.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java
    velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/VelocityContext.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/VelocityContext.java?rev=1559691&r1=1559690&r2=1559691&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/VelocityContext.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/VelocityContext.java Mon Jan 20 13:30:31 2014
@@ -26,7 +26,7 @@ import org.apache.velocity.context.Abstr
 import org.apache.velocity.context.Context;
 
 /**
- *  General purpose implemention of the application Context
+ *  General purpose implementation of the application Context
  *  interface for general application use.  This class should
  *  be used in place of the original Context class.
  *

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/Velocity.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/Velocity.java?rev=1559691&r1=1559690&r2=1559691&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/Velocity.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/Velocity.java Mon Jan 20 13:30:31 2014
@@ -19,11 +19,7 @@ package org.apache.velocity.app;
  * under the License.
  */
 
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.Reader;
-import java.io.UnsupportedEncodingException;
 import java.io.Writer;
 import java.util.Properties;
 
@@ -39,7 +35,7 @@ import org.apache.velocity.runtime.log.L
 
 /**
  * This class provides  services to the application
- * developer, such as :
+ * developer, such as:
  * <ul>
  * <li> Simple Velocity Runtime engine initialization methods.
  * <li> Functions to apply the template engine to streams and strings
@@ -316,7 +312,7 @@ public class Velocity implements Runtime
     }
 
     /**
-     * <p>Determines whether a resource is accessable via the
+     * <p>Determines whether a resource is accessible via the
      * currently configured resource loaders.  {@link
      * org.apache.velocity.runtime.resource.Resource} is the generic
      * description of templates, static content, etc.</p>
@@ -349,7 +345,7 @@ public class Velocity implements Runtime
     /**
      *  <p>
      *  Set the an ApplicationAttribue, which is an Object
-     *  set by the application which is accessable from
+     *  set by the application which is accessible from
      *  any component of the system that gets a RuntimeServices.
      *  This allows communication between the application
      *  environment and custom pluggable components of the
@@ -357,7 +353,7 @@ public class Velocity implements Runtime
      *  </p>
      *
      *  <p>
-     *  Note that there is no enfocement or rules for the key
+     *  Note that there is no enforcement or rules for the key
      *  used - it is up to the application developer.  However, to
      *  help make the intermixing of components possible, using
      *  the target Class name (e.g.  com.foo.bar ) as the key

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/VelocityEngine.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/VelocityEngine.java?rev=1559691&r1=1559690&r2=1559691&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/VelocityEngine.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/VelocityEngine.java Mon Jan 20 13:30:31 2014
@@ -114,7 +114,7 @@ public class VelocityEngine implements R
      *  initialize the Velocity runtime engine, using default properties
      *  plus the properties in the passed in java.util.Properties object
      *
-     *  @param p  Proprties object containing initialization properties
+     *  @param p  Properties object containing initialization properties
      */
     public void init(Properties p)
     {
@@ -325,7 +325,7 @@ public class VelocityEngine implements R
     }
 
     /**
-     *   Determines if a resource is accessable via the currently
+     *   Determines if a resource is accessible via the currently
      *   configured resource loaders.
      *   <br><br>
      *   Note that the current implementation will <b>not</b>

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/EventCartridge.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/EventCartridge.java?rev=1559691&r1=1559690&r2=1559691&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/EventCartridge.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/EventCartridge.java Mon Jan 20 13:30:31 2014
@@ -68,7 +68,7 @@ public class EventCartridge
      *  will find all possible event handler interfaces supported
      *  by the passed in object.
      *
-     *  @param ev object impementing a valid EventHandler-derived interface
+     *  @param ev object implementing a valid EventHandler-derived interface
      *  @return true if a supported interface, false otherwise or if null
      */
     public boolean addEventHandler( EventHandler ev )

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/EventHandlerUtil.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/EventHandlerUtil.java?rev=1559691&r1=1559690&r2=1559691&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/EventHandlerUtil.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/EventHandlerUtil.java Mon Jan 20 13:30:31 2014
@@ -125,7 +125,7 @@ public class EventHandlerUtil {
      * @param context The internal context adapter.
      * @return Object to return as method result
      * @throws Exception
-     *             to be wrapped and propogated to app
+     *             to be wrapped and propagated to app
      */
     public static Object methodException(RuntimeServices rsvc,
             InternalContextAdapter context, Class claz, String method,

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/IncludeNotFound.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/IncludeNotFound.java?rev=1559691&r1=1559690&r2=1559691&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/IncludeNotFound.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/app/event/implement/IncludeNotFound.java Mon Jan 20 13:30:31 2014
@@ -58,7 +58,7 @@ public class IncludeNotFound implements 
     Context context;
 
     /**
-     * Chseck to see if included file exists, and display "not found" page if it
+     * Check to see if included file exists, and display "not found" page if it
      * doesn't. If "not found" page does not exist, log an error and return
      * null.
      * 

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/AbstractContext.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/AbstractContext.java?rev=1559691&r1=1559690&r2=1559691&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/AbstractContext.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/AbstractContext.java Mon Jan 20 13:30:31 2014
@@ -87,7 +87,7 @@ public abstract class AbstractContext ex
      *  Currently, this method is not used internally by
      *  the Velocity engine.
      *
-     *   @param key key to test for existance
+     *   @param key key to test for existence
      *   @return true if found, false if not
      */
     public abstract boolean internalContainsKey(Object key);
@@ -104,7 +104,7 @@ public abstract class AbstractContext ex
     public abstract Object[] internalGetKeys();
 
     /**
-     *  I mplement to remove an item from your storage.
+     *  Implement to remove an item from your storage.
      *  <br><br>
      *  Currently, this method is not used internally by
      *  the Velocity engine.
@@ -134,7 +134,7 @@ public abstract class AbstractContext ex
 
         /*
          *  now, do a 'forward pull' of event cartridge so
-         *  it's accessable, bringing to the top level.
+         *  it's accessible, bringing to the top level.
          */
 
         if (innerContext instanceof InternalEventContext )

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalContextAdapterImpl.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalContextAdapterImpl.java?rev=1559691&r1=1559690&r2=1559691&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalContextAdapterImpl.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/context/InternalContextAdapterImpl.java Mon Jan 20 13:30:31 2014
@@ -336,6 +336,3 @@ public final class InternalContextAdapte
     }
 
 }
-
-
-

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/exception/ExtendedParseException.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/exception/ExtendedParseException.java?rev=1559691&r1=1559690&r2=1559691&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/exception/ExtendedParseException.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/exception/ExtendedParseException.java Mon Jan 20 13:30:31 2014
@@ -32,21 +32,20 @@ package org.apache.velocity.exception;
 public interface ExtendedParseException
 {
     /**
-     * returns the Template name where this exception occured.
-     * @return The Template name where this exception occured.
+     * returns the Template name where this exception occurred.
+     * @return The Template name where this exception occurred.
      */
     String getTemplateName();
 
     /**
-     * returns the line number where this exception occured.
-     * @return The line number where this exception occured.
+     * returns the line number where this exception occurred.
+     * @return The line number where this exception occurred.
      */
     int getLineNumber();
 
     /**
-     * returns the column number where this exception occured.
-     * @return The column number where this exception occured.
+     * returns the column number where this exception occurred.
+     * @return The column number where this exception occurred.
      */
     int getColumnNumber();
 }
-

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/exception/MethodInvocationException.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/exception/MethodInvocationException.java?rev=1559691&r1=1559690&r2=1559691&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/exception/MethodInvocationException.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/exception/MethodInvocationException.java Mon Jan 20 13:30:31 2014
@@ -21,8 +21,6 @@ import org.apache.velocity.runtime.log.L
  * under the License.
  */
 
-
-
 /**
  *  Application-level exception thrown when a reference method is
  *  invoked and an exception is thrown.
@@ -56,7 +54,7 @@ public class MethodInvocationException e
      *  @param message
      *  @param e Throwable that we are wrapping
      *  @param methodName name of method that threw the exception
-     *  @param templateName The name of the template where the exception occured.
+     *  @param templateName The name of the template where the exception occurred.
      */
     public MethodInvocationException(final String message, final Throwable e, final String methodName, final String templateName, final int lineNumber, final int columnNumber)
     {

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/exception/ParseErrorException.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/exception/ParseErrorException.java?rev=1559691&r1=1559690&r2=1559691&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/exception/ParseErrorException.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/exception/ParseErrorException.java Mon Jan 20 13:30:31 2014
@@ -247,7 +247,7 @@ public class ParseErrorException extends
     }
 
     /**
-     * Return our custum message if we have one, else return the default message
+     * Return our custom message if we have one, else return the default message
      */
     public String getMessage()
     {

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/exception/TemplateInitException.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/exception/TemplateInitException.java?rev=1559691&r1=1559690&r2=1559691&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/exception/TemplateInitException.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/exception/TemplateInitException.java Mon Jan 20 13:30:31 2014
@@ -60,7 +60,7 @@ public class TemplateInitException exten
     }
 
     /**
-     * Returns the Template name where this exception occured.
+     * Returns the Template name where this exception occurred.
      * @return the template name
      */
     public String getTemplateName()
@@ -69,7 +69,7 @@ public class TemplateInitException exten
     }
 
     /**
-     * Returns the line number where this exception occured.
+     * Returns the line number where this exception occurred.
      * @return the line number
      */
     public int getLineNumber()
@@ -78,7 +78,7 @@ public class TemplateInitException exten
     }
 
     /**
-     * Returns the column number where this exception occured.
+     * Returns the column number where this exception occurred.
      * @return the line number
      */
     public int getColumnNumber()

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/io/VelocityWriter.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/io/VelocityWriter.java?rev=1559691&r1=1559690&r2=1559691&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/io/VelocityWriter.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/io/VelocityWriter.java Mon Jan 20 13:30:31 2014
@@ -24,7 +24,7 @@ import java.io.Writer;
 
 /**
  * Implementation of a fast Writer. It was originally taken from JspWriter
- * and modified to have less syncronization going on.
+ * and modified to have less synchronization going on.
  *
  * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
  * @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/Renderable.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/Renderable.java?rev=1559691&r1=1559690&r2=1559691&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/Renderable.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/Renderable.java Mon Jan 20 13:30:31 2014
@@ -28,7 +28,7 @@ import java.io.Writer;
 import java.io.IOException;
 
 /**
- *  This interface caraterize objects other than ASTNodes that can be rendered
+ *  This interface characterize objects other than ASTNodes that can be rendered
  *  to a writer using a context.
  *
  * @author <a href="mailto:claude.brisson@gmail.com">Claude Brisson</a>

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeConstants.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeConstants.java?rev=1559691&r1=1559690&r2=1559691&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeConstants.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeConstants.java Mon Jan 20 13:30:31 2014
@@ -59,7 +59,7 @@ public interface RuntimeConstants
     String RUNTIME_REFERENCES_STRICT = "runtime.references.strict";
     
     /**
-     * Indicates we are going to use modifed escape behavior in strict mode
+     * Indicates we are going to use modified escape behavior in strict mode
      */
     String RUNTIME_REFERENCES_STRICT_ESCAPE = "runtime.references.strict.escape";
 
@@ -195,16 +195,16 @@ public interface RuntimeConstants
     /** switch for autoloading library-sourced VMs (for development). */
     String VM_LIBRARY_AUTORELOAD = "velocimacro.library.autoreload";
 
-    /** boolean (true/false) default true : allow inline (in-template) macro definitions. */
+    /** boolean (true/false) default true: allow inline (in-template) macro definitions. */
     String VM_PERM_ALLOW_INLINE = "velocimacro.permissions.allow.inline";
 
-    /** boolean (true/false) default false : allow inline (in-template) macro definitions to replace existing. */
+    /** boolean (true/false) default false: allow inline (in-template) macro definitions to replace existing. */
     String VM_PERM_ALLOW_INLINE_REPLACE_GLOBAL = "velocimacro.permissions.allow.inline.to.replace.global";
 
-    /** Switch for forcing inline macros to be local : default false. */
+    /** Switch for forcing inline macros to be local: default false. */
     String VM_PERM_INLINE_LOCAL = "velocimacro.permissions.allow.inline.local.scope";
 
-    /** Switch for VM blather : default true. */
+    /** Switch for VM blather: default true. */
     String VM_MESSAGES_ON = "velocimacro.messages.on";
 
     /** if true, throw an exception for wrong number of arguments **/
@@ -282,9 +282,4 @@ public interface RuntimeConstants
      * constant.
      */
     int NUMBER_OF_PARSERS = 20;
-
-    
-
-
-
 }

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java?rev=1559691&r1=1559690&r2=1559691&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeInstance.java Mon Jan 20 13:30:31 2014
@@ -127,7 +127,7 @@ public class RuntimeInstance implements 
      * The Runtime logger.  We start with an instance of
      * a 'primordial logger', which just collects log messages
      * then, when the log system is initialized, all the
-     * messages get dumpted out of the primordial one into the real one.
+     * messages get dumped out of the primordial one into the real one.
      */
     private Log log = new Log();
 
@@ -204,7 +204,7 @@ public class RuntimeInstance implements 
     private boolean provideEvaluateScope = false;
 
     /*
-     *  Opaque reference to something specificed by the
+     *  Opaque reference to something specified by the
      *  application for use in application supplied/specified
      *  pluggable components
      */
@@ -257,7 +257,7 @@ public class RuntimeInstance implements 
             initializeEvaluateScopeSettings();
             /*
              *  initialize the VM Factory.  It will use the properties
-             * accessable from Runtime, so keep this here at the end.
+             * accessible from Runtime, so keep this here at the end.
              */
             vmFactory.initVelocimacro();
 

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeServices.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeServices.java?rev=1559691&r1=1559690&r2=1559691&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeServices.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/RuntimeServices.java Mon Jan 20 13:30:31 2014
@@ -205,7 +205,7 @@ public interface RuntimeServices
      * @throws ParseErrorException The template could not be parsed.
      * @throws MethodInvocationException A method on a context object could not be invoked.
      * @throws ResourceNotFoundException A referenced resource could not be loaded.
-     * @throws IOException While rendering to the writer, an I/O problem occured.
+     * @throws IOException While rendering to the writer, an I/O problem occurred.
      * @since Velocity 1.6
      */
     public boolean evaluate(Context context, Writer out,

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/VelocimacroFactory.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/VelocimacroFactory.java?rev=1559691&r1=1559690&r2=1559691&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/VelocimacroFactory.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/VelocimacroFactory.java Mon Jan 20 13:30:31 2014
@@ -513,7 +513,7 @@ public class VelocimacroFactory
             /*
              * otherwise, if we have it already in global namespace, and they can't replace
              * since local templates are not allowed, the global namespace is implied.
-             *  remember, we don't know anything about namespace managment here, so lets
+             *  remember, we don't know anything about namespace management here, so lets
              *  note do anything fancy like trying to give it the global namespace here
              *
              *  so if we have it, and we aren't allowed to replace, bail

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceCacheImpl.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceCacheImpl.java?rev=1559691&r1=1559690&r2=1559691&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceCacheImpl.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceCacheImpl.java Mon Jan 20 13:30:31 2014
@@ -34,7 +34,7 @@ import java.util.concurrent.ConcurrentHa
  * Default implementation of the resource cache for the default
  * ResourceManager.  The cache uses a <i>least recently used</i> (LRU)
  * algorithm, with a maximum size specified via the
- * <code>resource.manager.cache.size</code> property (idenfied by the
+ * <code>resource.manager.cache.size</code> property (identified by the
  * {@link
  * org.apache.velocity.runtime.RuntimeConstants#RESOURCE_MANAGER_DEFAULTCACHE_SIZE}
  * constant).  This property get be set to <code>0</code> or less for

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java?rev=1559691&r1=1559690&r2=1559691&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/ResourceManagerImpl.java Mon Jan 20 13:30:31 2014
@@ -207,7 +207,7 @@ public class ResourceManagerImpl
     }
 
     /**
-     * This will produce a List of Hashtables, each hashtable contains the intialization info for a particular resource loader. This
+     * This will produce a List of Hashtables, each hashtable contains the initialization info for a particular resource loader. This
      * Hashtable will be passed in when initializing the the template loader.
      */
     private void assembleResourceLoaderInitializers()

Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java?rev=1559691&r1=1559690&r2=1559691&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java (original)
+++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/runtime/resource/loader/ClasspathResourceLoader.java Mon Jan 20 13:30:31 2014
@@ -52,7 +52,7 @@ import org.apache.velocity.util.ClassUti
  *  <br>
  *  To use, put your template directories, jars
  *  and zip files into the classpath or other mechanisms that make
- *  resources accessable to the classloader.
+ *  resources accessible to the classloader.
  *  <br>
  *  <br>
  *  This makes deployment trivial for web applications running in