You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2023/08/01 07:20:56 UTC

[myfaces] branch main updated: MYFACES-4621 Improve spelling (#606)

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

tandraschko pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/myfaces.git


The following commit(s) were added to refs/heads/main by this push:
     new 0168160b8 MYFACES-4621 Improve spelling (#606)
0168160b8 is described below

commit 0168160b831abf636b6cf4f86a9c97ce8c62eb0d
Author: mkomko <mk...@users.noreply.github.com>
AuthorDate: Tue Aug 1 09:20:50 2023 +0200

    MYFACES-4621 Improve spelling (#606)
---
 .../main/java/jakarta/faces/component/UIData.java  |  2 +-
 .../java/jakarta/faces/component/UIViewRoot.java   |  8 +++----
 .../myfaces/application/viewstate/StateUtils.java  | 10 ++++-----
 .../component/validate/WholeBeanValidator.java     |  6 ++---
 .../config/DefaultFacesConfigurationProvider.java  | 10 ++++-----
 .../apache/myfaces/config/FacesConfigurator.java   |  2 +-
 .../myfaces/context/ExceptionHandlerUtils.java     |  2 +-
 .../apache/myfaces/lifecycle/LifecycleImpl.java    | 12 +++++-----
 .../myfaces/lifecycle/RestoreViewExecutor.java     |  2 +-
 .../apache/myfaces/renderkit/RendererUtils.java    | 26 +++++++++++-----------
 .../html/HtmlCompositeComponentRenderer.java       |  2 +-
 .../myfaces/renderkit/html/HtmlFormatRenderer.java |  2 +-
 .../myfaces/renderkit/html/HtmlRenderKitImpl.java  |  4 ++--
 .../renderkit/html/HtmlResponseStateManager.java   |  2 +-
 .../java/org/apache/myfaces/util/MessageUtils.java |  4 ++--
 .../facelets/FaceletViewDeclarationLanguage.java   |  2 +-
 .../view/facelets/compiler/CompilationManager.java |  2 +-
 .../facelets/compiler/FaceletsCompilerSupport.java |  2 +-
 .../facelets/el/ContextAwareExceptionWrapper.java  |  2 +-
 .../myfaces/webapp/FacesInitializerImpl.java       |  4 ++--
 .../myfaces/application/ViewHandlerImplTest.java   |  4 ++--
 21 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/api/src/main/java/jakarta/faces/component/UIData.java b/api/src/main/java/jakarta/faces/component/UIData.java
index c5655f27d..8ec882652 100644
--- a/api/src/main/java/jakarta/faces/component/UIData.java
+++ b/api/src/main/java/jakarta/faces/component/UIData.java
@@ -109,7 +109,7 @@ import org.apache.myfaces.core.api.shared.lang.Assert;
  * currently being decoded. Exactly the same process applies for the later validation and updateModel phases.
  * </p>
  * <p>
- * When the data model for the table is bound to a backing bean property, and no validation errors have occured during
+ * When the data model for the table is bound to a backing bean property, and no validation errors have occurred during
  * processing of a postback, the data model is refetched at the start of the rendering phase (ie after the update model
  * phase) so that the contents of the data model can be changed as a result of the latest form submission. Because the
  * saved row state must correspond to the elements within the data model, the row state must be discarded whenever a new
diff --git a/api/src/main/java/jakarta/faces/component/UIViewRoot.java b/api/src/main/java/jakarta/faces/component/UIViewRoot.java
index 693375fdc..b194487e2 100644
--- a/api/src/main/java/jakarta/faces/component/UIViewRoot.java
+++ b/api/src/main/java/jakarta/faces/component/UIViewRoot.java
@@ -442,7 +442,7 @@ public class UIViewRoot extends UIComponentBase implements UniqueIdVendor
                     name.add(clientId);
                 }
                 _getLogger().log(level,
-                        "Event broadcating for PhaseId {0} at UIViewRoot {1} reaches maximal limit, please check " +
+                        "Event broadcasting for PhaseId {0} at UIViewRoot {1} reaches maximum limit, please check " +
                         "listeners for infinite recursion. Component id: {2}",
                         new Object [] {phaseId, getViewId(), name});
             }
@@ -1033,7 +1033,7 @@ public class UIViewRoot extends UIComponentBase implements UniqueIdVendor
                 catch (Throwable t) 
                 {
                     beforePhaseSuccess[0] = false; // redundant - for clarity
-                    _getLogger().log(Level.SEVERE, "An Exception occured while processing " +
+                    _getLogger().log(Level.SEVERE, "An Exception occurred while processing " +
                                              listener.getExpressionString() + 
                                              " in Phase " + phaseId, t);
                     if (beforePhase)
@@ -1080,7 +1080,7 @@ public class UIViewRoot extends UIComponentBase implements UniqueIdVendor
                             catch (Throwable t) 
                             {
                                 beforePhaseSuccess[i + 1] = false; // redundant - for clarity
-                                _getLogger().log(Level.SEVERE, "An Exception occured while processing the " +
+                                _getLogger().log(Level.SEVERE, "An Exception occurred while processing the " +
                                                          "beforePhase method of PhaseListener " + phaseListener +
                                                          " in Phase " + phaseId, t);
                                 if (shouldViewRootPhaseListenerQueuesExceptions(context))
@@ -1123,7 +1123,7 @@ public class UIViewRoot extends UIComponentBase implements UniqueIdVendor
                             }
                             catch (Throwable t) 
                             {
-                                logger.log(Level.SEVERE, "An Exception occured while processing the " +
+                                logger.log(Level.SEVERE, "An Exception occurred while processing the " +
                                                          "afterPhase method of PhaseListener " + phaseListener +
                                                          " in Phase " + phaseId, t);
                                 if (shouldViewRootPhaseListenerQueuesExceptions(context))
diff --git a/impl/src/main/java/org/apache/myfaces/application/viewstate/StateUtils.java b/impl/src/main/java/org/apache/myfaces/application/viewstate/StateUtils.java
index 9df82caf5..82a78240d 100644
--- a/impl/src/main/java/org/apache/myfaces/application/viewstate/StateUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/application/viewstate/StateUtils.java
@@ -221,7 +221,7 @@ public final class StateUtils
 
         if (log.isLoggable(Level.FINE))
         {
-            log.fine("de/encrypting with " + algorithm + '/' + algorithmParams);
+            log.fine("De/encrypting with " + algorithm + '/' + algorithmParams);
         }
 
         return cipher;
@@ -672,7 +672,7 @@ public final class StateUtils
                 
                 if (log.isLoggable(Level.FINE))
                 {
-                    log.fine("generated random password of length " + bytes.length);
+                    log.fine("Generated random password of length " + bytes.length);
                 }
             }
             catch (NoSuchAlgorithmException e)
@@ -684,7 +684,7 @@ public final class StateUtils
                 
                 if (log.isLoggable(Level.FINE))
                 {
-                    log.fine("generated random password of length " + length);
+                    log.fine("Generated random password of length " + length);
                 }
             }
         }
@@ -788,7 +788,7 @@ public final class StateUtils
                 
                 if (log.isLoggable(Level.FINE))
                 {
-                    log.fine("generated random mac password of length " + bytes.length);
+                    log.fine("Generated random mac password of length " + bytes.length);
                 }
             }
             catch (NoSuchAlgorithmException e)
@@ -800,7 +800,7 @@ public final class StateUtils
                 
                 if(log.isLoggable(Level.FINE))
                 {
-                    log.fine("generated random mac password of length " + length);
+                    log.fine("Generated random mac password of length " + length);
                 }
             }
         }
diff --git a/impl/src/main/java/org/apache/myfaces/component/validate/WholeBeanValidator.java b/impl/src/main/java/org/apache/myfaces/component/validate/WholeBeanValidator.java
index e22e3ef2c..72a8d42f6 100644
--- a/impl/src/main/java/org/apache/myfaces/component/validate/WholeBeanValidator.java
+++ b/impl/src/main/java/org/apache/myfaces/component/validate/WholeBeanValidator.java
@@ -85,7 +85,7 @@ public class WholeBeanValidator implements Validator
         ValueExpression valueExpression = component.getValueExpression("value");
         if (valueExpression == null)
         {
-            log.warning("cannot validate component with empty value: " 
+            log.warning("Cannot validate component with empty value: "
                     + component.getClientId(context));
             return;
         }
@@ -376,7 +376,7 @@ public class WholeBeanValidator implements Validator
             ValueExpression valueExpression = target.getValueExpression("value");
             if (valueExpression == null)
             {
-                log.warning("cannot validate component with empty value: " 
+                log.warning("Cannot validate component with empty value: "
                         + target.getClientId(context.getFacesContext()));
                 return VisitResult.ACCEPT;
             }
@@ -419,4 +419,4 @@ public class WholeBeanValidator implements Validator
             return VisitResult.ACCEPT;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java b/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java
index b0f2f6274..a18c6304e 100644
--- a/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java
+++ b/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java
@@ -770,7 +770,7 @@ public class DefaultFacesConfigurationProvider extends FacesConfigurationProvide
                 }
                 catch (IOException e)
                 {
-                    log.log(Level.SEVERE, "Error Loading library: " + library, e);
+                    log.log(Level.SEVERE, "Error loading library: " + library, e);
                 }
             }
         }
@@ -795,19 +795,19 @@ public class DefaultFacesConfigurationProvider extends FacesConfigurationProvide
                     }
                     if (log.isLoggable(Level.FINE))
                     {
-                        log.fine("Added Library from: " + url);
+                        log.fine("Added library from: " + url);
                     }
                 }
                 catch (Exception e)
                 {
-                    log.log(Level.SEVERE, "Error Loading Library: " + url, e);
+                    log.log(Level.SEVERE, "Error loading library: " + url, e);
                 }
             }
         }
         catch (IOException e)
         {
-            log.log(Level.SEVERE, "Compiler Initialization Error", e);
+            log.log(Level.SEVERE, "Compiler initialization error", e);
         }
         return facesConfigFilesList;
     }
-}
\ No newline at end of file
+}
diff --git a/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java b/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
index b433a17a2..b7f3bc566 100755
--- a/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
+++ b/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
@@ -800,7 +800,7 @@ public class FacesConfigurator
         }
         catch (InjectionProviderException ex)
         {
-            log.log(Level.INFO, "Exception on Injection or PostConstruct", ex);
+            log.log(Level.INFO, "Exception on Inject or PostConstruct", ex);
         }
     }
 
diff --git a/impl/src/main/java/org/apache/myfaces/context/ExceptionHandlerUtils.java b/impl/src/main/java/org/apache/myfaces/context/ExceptionHandlerUtils.java
index 02b97c487..d37889216 100644
--- a/impl/src/main/java/org/apache/myfaces/context/ExceptionHandlerUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/context/ExceptionHandlerUtils.java
@@ -38,7 +38,7 @@ public class ExceptionHandlerUtils
             exception = (Throwable) ((FacesWrapper) exception).getWrapped();
         }
 
-        String msg = exception.getClass().getName() + " occured while processing " + event.getPhaseId().getName();
+        String msg = exception.getClass().getName() + " occurred while processing " + event.getPhaseId().getName();
         String location = buildLocation(event.getException(), event.getComponent());
         if (location != null)
         {
diff --git a/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java b/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java
index c7efa136e..7a2562919 100755
--- a/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java
@@ -136,7 +136,7 @@ public class LifecycleImpl extends Lifecycle
 
         if (log.isLoggable(Level.FINEST))
         {
-            log.finest("entering " + executor.getPhase() + " in " + LifecycleImpl.class.getName());
+            log.finest("Entering " + executor.getPhase() + " in " + LifecycleImpl.class.getName());
         }
 
         PhaseId currentPhaseId = executor.getPhase();
@@ -200,7 +200,7 @@ public class LifecycleImpl extends Lifecycle
 
         if (!skipFurtherProcessing && log.isLoggable(Level.FINEST))
         {
-            log.finest("exiting " + executor.getPhase() + " in " + LifecycleImpl.class.getName());
+            log.finest("Exiting " + executor.getPhase() + " in " + LifecycleImpl.class.getName());
         }
 
         return skipFurtherProcessing;
@@ -216,7 +216,7 @@ public class LifecycleImpl extends Lifecycle
         }
         if (log.isLoggable(Level.FINEST))
         {
-            log.finest("entering " + renderExecutor.getPhase() + " in " + LifecycleImpl.class.getName());
+            log.finest("Entering " + renderExecutor.getPhase() + " in " + LifecycleImpl.class.getName());
         }
 
         PhaseListenerManager phaseListenerMgr = new PhaseListenerManager(this, facesContext, getPhaseListeners());
@@ -268,7 +268,7 @@ public class LifecycleImpl extends Lifecycle
 
         if (log.isLoggable(Level.FINEST))
         {
-            log.finest("exiting " + renderExecutor.getPhase() + " in " + LifecycleImpl.class.getName());
+            log.finest("Exiting " + renderExecutor.getPhase() + " in " + LifecycleImpl.class.getName());
         }
     }
 
@@ -279,7 +279,7 @@ public class LifecycleImpl extends Lifecycle
         {
             if (log.isLoggable(Level.FINE))
             {
-                log.fine("exiting from lifecycle.execute in " + phase
+                log.fine("Exiting from lifecycle.execute in " + phase
                         + " because getResponseComplete is true from one of the " + (before ? "before" : "after")
                         + " listeners");
             }
@@ -295,7 +295,7 @@ public class LifecycleImpl extends Lifecycle
         {
             if (log.isLoggable(Level.FINE))
             {
-                log.fine("exiting from lifecycle.execute in " + phase
+                log.fine("Exiting from lifecycle.execute in " + phase
                         + " because getRenderResponse is true from one of the " + (before ? "before" : "after")
                         + " listeners");
             }
diff --git a/impl/src/main/java/org/apache/myfaces/lifecycle/RestoreViewExecutor.java b/impl/src/main/java/org/apache/myfaces/lifecycle/RestoreViewExecutor.java
index 617cb8434..d3d5c4c45 100644
--- a/impl/src/main/java/org/apache/myfaces/lifecycle/RestoreViewExecutor.java
+++ b/impl/src/main/java/org/apache/myfaces/lifecycle/RestoreViewExecutor.java
@@ -530,7 +530,7 @@ class RestoreViewExecutor extends PhaseExecutor
             }
             catch (Throwable t) 
             {
-                log.log(Level.SEVERE, "An Exception occured while processing " +
+                log.log(Level.SEVERE, "An Exception occurred while processing " +
                         afterPhaseExpression.getExpressionString() + 
                         " in Phase " + getPhase(), t);
             }
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/RendererUtils.java b/impl/src/main/java/org/apache/myfaces/renderkit/RendererUtils.java
index 54b315b4c..0ff9e912c 100755
--- a/impl/src/main/java/org/apache/myfaces/renderkit/RendererUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/RendererUtils.java
@@ -148,7 +148,7 @@ public final class RendererUtils
                 
                 if (log.isLoggable(Level.FINE))
                 {
-                    log.fine("returning '" + submittedValue + '\'');
+                    log.fine("Returning '" + submittedValue + '\'');
                 }
                 return submittedValue.toString();
             }
@@ -181,7 +181,7 @@ public final class RendererUtils
                 converter = facesContext.getApplication().createConverter(value.getClass());
                 if (log.isLoggable(Level.FINE))
                 {
-                    log.fine("the created converter is " + converter);
+                    log.fine("The created converter is " + converter);
                 }
             }
             catch (FacesException e)
@@ -199,7 +199,7 @@ public final class RendererUtils
             {
                 if (log.isLoggable(Level.FINE))
                 {
-                    log.fine("returning an empty string");
+                    log.fine("Returning an empty string");
                 }
                 return "";
             }
@@ -211,7 +211,7 @@ public final class RendererUtils
 
             if (log.isLoggable(Level.FINE))
             {
-                log.fine("returning an .toString");
+                log.fine("Returning an .toString");
             }
             return value.toString();
 
@@ -219,7 +219,7 @@ public final class RendererUtils
 
         if (log.isLoggable(Level.FINE))
         {
-            log.fine("returning converter get as string " + converter);
+            log.fine("Returning converter get as string " + converter);
         }
         return converter.getAsString(facesContext, component, value);
     }
@@ -243,7 +243,7 @@ public final class RendererUtils
                 {
                     if (log.isLoggable(Level.FINE))
                     {
-                        log.fine("returning 1 '" + submittedValue + '\'');
+                        log.fine("Returning 1 '" + submittedValue + '\'');
                     }
                     return submittedValue.toString();
                 }
@@ -277,7 +277,7 @@ public final class RendererUtils
                             value.getClass());
                     if (log.isLoggable(Level.FINE))
                     {
-                        log.fine("the created converter is " + converter);
+                        log.fine("The created converter is " + converter);
                     }
                 }
                 catch (FacesException e)
@@ -304,7 +304,7 @@ public final class RendererUtils
 
                 if (log.isLoggable(Level.FINE))
                 {
-                    log.fine("returning an .toString");
+                    log.fine("Returning an .toString");
                 }
                 return value.toString();
 
@@ -312,14 +312,14 @@ public final class RendererUtils
 
             if (log.isLoggable(Level.FINE))
             {
-                log.fine("returning converter get as string " + converter);
+                log.fine("Returning converter get as string " + converter);
             }
             return converter.getAsString(facesContext, component, value);
 
         }
         catch (PropertyNotFoundException ex)
         {
-            log.log(Level.SEVERE, "Property not found - called by component : "
+            log.log(Level.SEVERE, "Property not found - called by component: "
                     + ComponentUtils.getPathToComponent(component), ex);
 
             throw ex;
@@ -673,7 +673,7 @@ public final class RendererUtils
         {
             if (log.isLoggable(Level.FINE))
             {
-                log.fine("No conversion necessary for null / empty string uiselectone value: client id " 
+                log.fine("No conversion necessary for null / empty string UISelectOne value: client id "
                             + output.getClientId());
             }
             return null;
@@ -783,9 +783,9 @@ public final class RendererUtils
         }
         else if (value != null)
         {
-            log.severe("value for attribute "
+            log.severe("Value for attribute "
                     + attribute
-                    + " must be instanceof 'Boolean' or 'String', is of type : "
+                    + " must be instanceof 'Boolean' or 'String', is of type: "
                     + value.getClass());
 
             return defaultValue;
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeComponentRenderer.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeComponentRenderer.java
index 4878d4265..af5f202f9 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeComponentRenderer.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeComponentRenderer.java
@@ -58,7 +58,7 @@ public class HtmlCompositeComponentRenderer extends HtmlRenderer
         {
             if (log.isLoggable(Level.SEVERE))
             {
-                log.severe("facet UIComponent.COMPOSITE_FACET_NAME not found when rendering composite component "+
+                log.severe("Facet UIComponent.COMPOSITE_FACET_NAME not found when rendering composite component "+
                         component.getClientId(context));
             }
             return;            
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormatRenderer.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormatRenderer.java
index 6c5a254b5..3f85de64d 100755
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormatRenderer.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormatRenderer.java
@@ -142,7 +142,7 @@ public class HtmlFormatRenderer extends HtmlRenderer
             {
                 if (log.isLoggable(Level.FINE))
                 {
-                    log.fine("renderOutputText writing '" + text + '\'');
+                    log.fine("RenderOutputText writing '" + text + '\'');
                 }
                 writer.writeText(text, ComponentAttrs.VALUE_ATTR);
             }
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
index 154ec5e72..eabb7a22a 100755
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
@@ -131,7 +131,7 @@ public class HtmlRenderKitImpl extends RenderKit implements LazyRenderKit
 
         if (log.isLoggable(Level.FINEST))
         {
-            log.finest("add Renderer family = " + componentFamily + " rendererType = " + rendererType
+            log.finest("Add Renderer family = " + componentFamily + " rendererType = " + rendererType
                     + " renderer class = " + renderer.getClass().getName());
         }
     }
@@ -147,7 +147,7 @@ public class HtmlRenderKitImpl extends RenderKit implements LazyRenderKit
 
         if (log.isLoggable(Level.FINEST))
         {
-            log.finest("add Renderer family = " + componentFamily + " rendererType = " + rendererType
+            log.finest("Add Renderer family = " + componentFamily + " rendererType = " + rendererType
                     + " renderer class = " + rendererClass);
         }
     }
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java
index 47fa1ac17..837b7dda1 100755
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java
@@ -122,7 +122,7 @@ public class HtmlResponseStateManager extends MyfacesResponseStateManager
 
         if (log.isLoggable(Level.FINE)) 
         {
-             log.fine("Writing serialized viewstate string with hashCode : " + serializedState.hashCode());
+             log.fine("Writing serialized ViewState string with hashCode: " + serializedState.hashCode());
         }
 
         responseWriter.startElement(HTML.INPUT_ELEM, null);
diff --git a/impl/src/main/java/org/apache/myfaces/util/MessageUtils.java b/impl/src/main/java/org/apache/myfaces/util/MessageUtils.java
index 895881dde..e9e18b088 100755
--- a/impl/src/main/java/org/apache/myfaces/util/MessageUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/util/MessageUtils.java
@@ -199,7 +199,7 @@ public final class MessageUtils
     {
         if(log.isLoggable(Level.FINEST))
         {
-          log.finest("adding message " + messageId + " for clientId " + forClientId);
+          log.finest("Adding message " + messageId + " for clientId " + forClientId);
         }
         facesContext.addMessage(forClientId,
                                 getMessage(severity, messageId, args, facesContext));
@@ -214,7 +214,7 @@ public final class MessageUtils
     {
         if(log.isLoggable(Level.FINEST))
         {
-          log.finest("adding message " + messageId + " for clientId " + forClientId);
+          log.finest("Adding message " + messageId + " for clientId " + forClientId);
         }
         facesContext.addMessage(forClientId,
                   getMessage(bundleBaseName, severity, messageId, args, facesContext));
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java b/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java
index 619c37dd9..d0f38fe81 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java
@@ -260,7 +260,7 @@ public class FaceletViewDeclarationLanguage extends FaceletViewDeclarationLangua
             externalContext.getApplicationMap().put(CACHED_COMPONENT_IDS, componentIdsCached);
         }
 
-        log.finest("Initialization Successful");
+        log.finest("Initialization successful");
     }
 
 
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CompilationManager.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CompilationManager.java
index 8d533edb5..a7f5e25de 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CompilationManager.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CompilationManager.java
@@ -513,7 +513,7 @@ final class CompilationManager
         {
             if (log.isLoggable(Level.FINE))
             {
-                log.fine(attr + " Faces Facelet Compile Directive Found");
+                log.fine(attr + " Faces Facelet Compile Directive found");
             }
             String value = attr.getValue();
             String namespace;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/FaceletsCompilerSupport.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/FaceletsCompilerSupport.java
index e12b519b3..648939d11 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/FaceletsCompilerSupport.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/FaceletsCompilerSupport.java
@@ -170,7 +170,7 @@ public class FaceletsCompilerSupport
                 }
                 catch (Exception e)
                 {
-                    log.log(Level.SEVERE, "Error Loading decorator: " + decorator, e);
+                    log.log(Level.SEVERE, "Error loading decorator: " + decorator, e);
                 }
             }
         }
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareExceptionWrapper.java b/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareExceptionWrapper.java
index 7fe1aaf2f..beea11132 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareExceptionWrapper.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/ContextAwareExceptionWrapper.java
@@ -21,7 +21,7 @@ package org.apache.myfaces.view.facelets.el;
 import jakarta.faces.FacesWrapper;
 
 /**
- * A exception wrapper that "knows" interesting info about place where problem occured.
+ * A exception wrapper that "knows" interesting info about place where problem occurred.
 
  * @author martinkoci
  * 
diff --git a/impl/src/main/java/org/apache/myfaces/webapp/FacesInitializerImpl.java b/impl/src/main/java/org/apache/myfaces/webapp/FacesInitializerImpl.java
index d1fab0e85..32b5c01fb 100644
--- a/impl/src/main/java/org/apache/myfaces/webapp/FacesInitializerImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/webapp/FacesInitializerImpl.java
@@ -265,7 +265,7 @@ public class FacesInitializerImpl implements FacesInitializer
         }
         catch (Exception ex)
         {
-            log.log(Level.SEVERE, "An error occured while initializing MyFaces: "
+            log.log(Level.SEVERE, "An error occurred while initializing MyFaces: "
                       + ex.getMessage(), ex);
         }
     }
@@ -457,7 +457,7 @@ public class FacesInitializerImpl implements FacesInitializer
         {
             if (log.isLoggable(Level.FINE))
             {
-                log.log(Level.FINE, "An error occured while instantiating a new ExpressionFactory. "
+                log.log(Level.FINE, "An error occurred while instantiating a new ExpressionFactory. "
                         + "Attempted to load class '" + expressionFactoryClassName + "'.", ex);
             }
         }
diff --git a/impl/src/test/java/org/apache/myfaces/application/ViewHandlerImplTest.java b/impl/src/test/java/org/apache/myfaces/application/ViewHandlerImplTest.java
index 273fa0054..987da0d4a 100644
--- a/impl/src/test/java/org/apache/myfaces/application/ViewHandlerImplTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/ViewHandlerImplTest.java
@@ -116,7 +116,7 @@ public class ViewHandlerImplTest extends AbstractJsfTestCase
         }
         catch (UnsupportedOperationException uoe)
         {
-            // an UnsupportedOperationException occured, which means getBookmarkableURL()
+            // an UnsupportedOperationException occurred, which means getBookmarkableURL()
             // wanted to change the Map or any of the Lists and this is not allowed!
             Assertions.fail("ViewHandler.getBookmarkableURL() must not change the parameter Map!");
         }
@@ -160,7 +160,7 @@ public class ViewHandlerImplTest extends AbstractJsfTestCase
         }
         catch (UnsupportedOperationException uoe)
         {
-            // an UnsupportedOperationException occured, which means getRedirectURL()
+            // an UnsupportedOperationException occurred, which means getRedirectURL()
             // wanted to change the Map or any of the Lists and this is not allowed!
             Assertions.fail("ViewHandler.getRedirectURL() must not change the parameter Map!");
         }