You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by vo...@apache.org on 2022/05/03 17:49:30 UTC
[myfaces] branch 2.3-next updated: Update terms 2.3-next
This is an automated email from the ASF dual-hosted git repository.
volosied pushed a commit to branch 2.3-next
in repository https://gitbox.apache.org/repos/asf/myfaces.git
The following commit(s) were added to refs/heads/2.3-next by this push:
new 36c6329a0 Update terms 2.3-next
new 4559d420c Merge pull request #263 from volosied/update-terms-2.3next
36c6329a0 is described below
commit 36c6329a0f2b6469d91605edd387906fa0dedf9e
Author: Volodymyr Siedlecki <vo...@gmail.com>
AuthorDate: Tue May 3 11:50:14 2022 -0400
Update terms 2.3-next
---
.../main/javascript/META-INF/resources/myfaces/_impl/_util/_Lang.js | 4 ++--
.../src/main/java/org/apache/myfaces/application/ApplicationImpl.java | 2 +-
.../java/org/apache/myfaces/lifecycle/clientwindow/ClientConfig.java | 2 +-
3 files changed, 4 insertions(+), 4 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 6d53e3bdd..f82301262 100755
--- a/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
@@ -2154,7 +2154,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/clientwindow/ClientConfig.java b/impl/src/main/java/org/apache/myfaces/lifecycle/clientwindow/ClientConfig.java
index 5bf1da483..3232beae2 100644
--- a/impl/src/main/java/org/apache/myfaces/lifecycle/clientwindow/ClientConfig.java
+++ b/impl/src/main/java/org/apache/myfaces/lifecycle/clientwindow/ClientConfig.java
@@ -198,7 +198,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>