[myfaces] branch 3.0.x updated: Update terms 3.0.x

[vo...@apache.org]

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

volosied pushed a commit to branch 3.0.x
in repository https://gitbox.apache.org/repos/asf/myfaces.git


The following commit(s) were added to refs/heads/3.0.x by this push:
     new 7a9df7a74 Update terms 3.0.x
     new 1341ddfc2 Merge pull request #264 from volosied/update-terms-3.0
7a9df7a74 is described below

commit 7a9df7a74599891fdd9bf982667e31acbe7fa935
Author: Volodymyr Siedlecki <vo...@gmail.com>
AuthorDate: Tue May 3 11:52:41 2022 -0400

    Update terms 3.0.x
---
 .../main/javascript/META-INF/resources/myfaces/_impl/_util/_Lang.js | 4 ++--
 .../main/java/org/apache/myfaces/application/ApplicationImpl.java   | 6 +++---
 impl/src/main/java/org/apache/myfaces/lifecycle/ClientConfig.java   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/api/src/main/javascript/META-INF/resources/myfaces/_impl/_util/_Lang.js b/api/src/main/javascript/META-INF/resources/myfaces/_impl/_util/_Lang.js
index 81e6b9e27..32e9306c6 100644
--- a/api/src/main/javascript/META-INF/resources/myfaces/_impl/_util/_Lang.js
+++ b/api/src/main/javascript/META-INF/resources/myfaces/_impl/_util/_Lang.js
@@ -250,7 +250,7 @@ _MF_SINGLTN(_PFX_UTIL + "_Lang", Object, /** @lends myfaces._impl._util._Lang.pr
      * @param {Object} src the source map
      * @param {boolean} overwrite if set to true the destination is overwritten if the keys exist in both maps
      **/
-    mixMaps:function (dest, src, overwrite, blockFilter, whitelistFilter) {
+    mixMaps:function (dest, src, overwrite, blockFilter, allowlistFilter) {
         if (!dest || !src) {
             throw this.makeException(new Error(), null, null, this._nameSpace, "mixMaps", this.getMessage("ERR_PARAM_MIXMAPS", null, "_Lang.mixMaps"));
         }
@@ -260,7 +260,7 @@ _MF_SINGLTN(_PFX_UTIL + "_Lang", Object, /** @lends myfaces._impl._util._Lang.pr
             if (blockFilter && blockFilter[key]) {
                 continue;
             }
-            if (whitelistFilter && !whitelistFilter[key]) {
+            if (allowlistFilter && !allowlistFilter[key]) {
                 continue;
             }
             if (!overwrite) {
diff --git a/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java b/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
index e4de57a7c..847344615 100755
--- a/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
@@ -1930,7 +1930,7 @@ public class ApplicationImpl extends Application
         if(context.isProjectStage(ProjectStage.Production) && !isCachedList && dependencyList != null)
         {
             // Note at this point dependencyList cannot be null, but just let this
-            // as a sanity check.
+            // as a verification check.
             _classToResourceDependencyMap.put(inspectedClass, dependencyList);
         }
         
@@ -2375,7 +2375,7 @@ public class ApplicationImpl extends Application
         if(isProduction && !isCachedList && listenerForList != null) 
         {
             // Note at this point listenerForList cannot be null, but just let listenerForList != null
-            // as a sanity check.
+            // as a verification check.
             _classToListenerForMap.put(inspectedClass, listenerForList);
         }
     }
@@ -2522,7 +2522,7 @@ public class ApplicationImpl extends Application
         if(isProduction && !isCachedList && dependencyList != null)   
         {
             // Note at this point listenerForList cannot be null, but just let dependencyList != null
-            // as a sanity check.
+            // as a verification check.
             _classToResourceDependencyMap.put(inspectedClass, dependencyList);
         }
         
diff --git a/impl/src/main/java/org/apache/myfaces/lifecycle/ClientConfig.java b/impl/src/main/java/org/apache/myfaces/lifecycle/ClientConfig.java
index adaea1fec..f0bedb0fb 100644
--- a/impl/src/main/java/org/apache/myfaces/lifecycle/ClientConfig.java
+++ b/impl/src/main/java/org/apache/myfaces/lifecycle/ClientConfig.java
@@ -203,7 +203,7 @@ public class ClientConfig implements Serializable
     /**
      * Users can overload this method to define in which scenarios a request should result
      * in an 'intercepted' page with proper windowId detection. This can e.g. contain
-     * blacklisting some userAgents.
+     * blocklisting some userAgents.
      * By default the following User-Agents will be served directly:
      * <ul>
      *     <li>.*bot.*</li>