This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-logging.git


The following commit(s) were added to refs/heads/master by this push:
     new a3661dd  Normalize to US English spelling.
a3661dd is described below

commit a3661dd1926614032383dbb731f1a5ffb072e50f
Author: Gary Gregory <[email protected]>
AuthorDate: Mon Feb 8 14:14:24 2021 -0500

    Normalize to US English spelling.
---
 src/main/java/org/apache/commons/logging/LogFactory.java            | 6 +++---
 .../java/org/apache/commons/logging/impl/Jdk13LumberjackLogger.java | 2 +-
 src/main/java/org/apache/commons/logging/impl/Jdk14Logger.java      | 2 +-
 src/main/java/org/apache/commons/logging/impl/Log4JLogger.java      | 2 +-
 src/test/java/org/apache/commons/logging/AltHashtableTestCase.java  | 2 +-
 .../apache/commons/logging/security/SecurityAllowedTestCase.java    | 2 +-
 .../apache/commons/logging/security/SecurityForbiddenTestCase.java  | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/apache/commons/logging/LogFactory.java 
b/src/main/java/org/apache/commons/logging/LogFactory.java
index 2d8eb08..3251541 100644
--- a/src/main/java/org/apache/commons/logging/LogFactory.java
+++ b/src/main/java/org/apache/commons/logging/LogFactory.java
@@ -1661,7 +1661,7 @@ public abstract class LogFactory {
     }
 
     // ----------------------------------------------------------------------
-    // Static initialiser block to perform initialisation at class load time.
+    // Static initializer block to perform initialisation at class load time.
     //
     // We can't do this in the class constructor, as there are many
     // static methods on this class that can be called before any
@@ -1669,8 +1669,8 @@ public abstract class LogFactory {
     // stuff having been set up.
     //
     // Note that this block must come after any variable declarations used
-    // by any methods called from this block, as we want any static initialiser
-    // associated with the variable to run first. If static initialisers for
+    // by any methods called from this block, as we want any static initializer
+    // associated with the variable to run first. If static initializers for
     // variables run after this code, then (a) their value might be needed
     // by methods called from here, and (b) they might *override* any value
     // computed here!
diff --git 
a/src/main/java/org/apache/commons/logging/impl/Jdk13LumberjackLogger.java 
b/src/main/java/org/apache/commons/logging/impl/Jdk13LumberjackLogger.java
index 275fbed..f6b9e5b 100644
--- a/src/main/java/org/apache/commons/logging/impl/Jdk13LumberjackLogger.java
+++ b/src/main/java/org/apache/commons/logging/impl/Jdk13LumberjackLogger.java
@@ -52,7 +52,7 @@ public class Jdk13LumberjackLogger implements Log, 
Serializable {
     private boolean classAndMethodFound;
 
     /**
-     * This member variable simply ensures that any attempt to initialise
+     * This member variable simply ensures that any attempt to initialize
      * this class in a pre-1.4 JVM will result in an 
ExceptionInInitializerError.
      * It must not be private, as an optimising compiler could detect that it
      * is not used and optimise it away.
diff --git a/src/main/java/org/apache/commons/logging/impl/Jdk14Logger.java 
b/src/main/java/org/apache/commons/logging/impl/Jdk14Logger.java
index 7d48091..73cd2d1 100644
--- a/src/main/java/org/apache/commons/logging/impl/Jdk14Logger.java
+++ b/src/main/java/org/apache/commons/logging/impl/Jdk14Logger.java
@@ -36,7 +36,7 @@ public class Jdk14Logger implements Log, Serializable {
     private static final long serialVersionUID = 4784713551416303804L;
 
     /**
-     * This member variable simply ensures that any attempt to initialise
+     * This member variable simply ensures that any attempt to initialize
      * this class in a pre-1.4 JVM will result in an 
ExceptionInInitializerError.
      * It must not be private, as an optimising compiler could detect that it
      * is not used and optimise it away.
diff --git a/src/main/java/org/apache/commons/logging/impl/Log4JLogger.java 
b/src/main/java/org/apache/commons/logging/impl/Log4JLogger.java
index 563bbcf..485fb07 100644
--- a/src/main/java/org/apache/commons/logging/impl/Log4JLogger.java
+++ b/src/main/java/org/apache/commons/logging/impl/Log4JLogger.java
@@ -64,7 +64,7 @@ public class Log4JLogger implements Log, Serializable {
     // Static Initializer.
     //
     // Note that this must come after the static variable declarations
-    // otherwise initialiser expressions associated with those variables
+    // otherwise initializer expressions associated with those variables
     // will override any settings done here.
     //
     // Verify that log4j is available, and that it is version 1.2.
diff --git a/src/test/java/org/apache/commons/logging/AltHashtableTestCase.java 
b/src/test/java/org/apache/commons/logging/AltHashtableTestCase.java
index 9dad136..890de7f 100644
--- a/src/test/java/org/apache/commons/logging/AltHashtableTestCase.java
+++ b/src/test/java/org/apache/commons/logging/AltHashtableTestCase.java
@@ -48,7 +48,7 @@ public class AltHashtableTestCase extends TestCase {
      * Hashtable implementation for storing factories in.
      * <p>
      * This does make the assumption that whatever JVM we are running in
-     * doesn't initialise classes until they are actually referenced (ie the
+     * doesn't initialize classes until they are actually referenced (ie the
      * LogFactory class hasn't been initialized before this method is called).
      * This is true of all JVMs I know of; and if it isn't then this test will
      * fail and someone will tell us.
diff --git 
a/src/test/java/org/apache/commons/logging/security/SecurityAllowedTestCase.java
 
b/src/test/java/org/apache/commons/logging/security/SecurityAllowedTestCase.java
index 19541ec..f9dfc05 100644
--- 
a/src/test/java/org/apache/commons/logging/security/SecurityAllowedTestCase.java
+++ 
b/src/test/java/org/apache/commons/logging/security/SecurityAllowedTestCase.java
@@ -96,7 +96,7 @@ public class SecurityAllowedTestCase extends TestCase
 
         try {
             // Use reflection so that we can control exactly when the static
-            // initialiser for the LogFactory class is executed.
+            // initializer for the LogFactory class is executed.
             final Class c = this.getClass().getClassLoader().loadClass(
                     "org.apache.commons.logging.LogFactory");
             final Method m = c.getMethod("getLog", new Class[] {Class.class});
diff --git 
a/src/test/java/org/apache/commons/logging/security/SecurityForbiddenTestCase.java
 
b/src/test/java/org/apache/commons/logging/security/SecurityForbiddenTestCase.java
index 4c72df0..b81cf1d 100644
--- 
a/src/test/java/org/apache/commons/logging/security/SecurityForbiddenTestCase.java
+++ 
b/src/test/java/org/apache/commons/logging/security/SecurityForbiddenTestCase.java
@@ -107,7 +107,7 @@ public class SecurityForbiddenTestCase extends TestCase
 
         try {
             // Use reflection so that we can control exactly when the static
-            // initialiser for the LogFactory class is executed.
+            // initializer for the LogFactory class is executed.
             final Class c = this.getClass().getClassLoader().loadClass(
                     "org.apache.commons.logging.LogFactory");
             final Method m = c.getMethod("getLog", new Class[] {Class.class});

Reply via email to