[cxf] branch master updated: Replacing some problematic language

[co...@apache.org]

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

coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/master by this push:
     new 5ac2429  Replacing some problematic language
5ac2429 is described below

commit 5ac24299998ad1891f50c0cc13e91c3dfc8b1aa4
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Aug 30 09:58:29 2021 +0100

    Replacing some problematic language
---
 .../src/main/java/org/apache/cxf/ws/security/SecurityConstants.java   | 4 ++--
 .../main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java | 2 +-
 .../main/java/org/apache/cxf/xkms/cache/EHCacheXKMSClientCache.java   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
index 4fc0b15..687a141 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
@@ -281,8 +281,8 @@ public final class SecurityConstants extends org.apache.cxf.rt.security.Security
      * decrypt passwords in the Merlin Crypto implementation (or any custom Crypto implementations).
      *
      * By default, WSS4J uses the JasyptPasswordEncryptor, which must be instantiated with a
-     * master password to use to decrypt keystore passwords in the Merlin Crypto properties file.
-     * This master password is obtained via the CallbackHandler defined via PW_CALLBACK_CLASS
+     * password to use to decrypt keystore passwords in the Merlin Crypto properties file.
+     * This password is obtained via the CallbackHandler defined via PW_CALLBACK_CLASS
      * or PW_CALLBACK_REF.
      *
      * The encrypted passwords must be stored in the format "ENC(encoded encrypted password)".
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
index 89ab2d4..f854fd0 100755
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
@@ -898,7 +898,7 @@ public abstract class AbstractSTSClient implements Configurable, InterceptorProv
      */
     public Element getCustomContent() throws Exception {
         if (customContent != null) {
-            // We can also support a CallbackHandler her as per getDelegationSecurityToken if required
+            // We can also support a CallbackHandler here as per getDelegationSecurityToken if required
             final boolean isString = customContent instanceof String;
             final boolean isElement = customContent instanceof Element;
             if (isString) {
diff --git a/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/cache/EHCacheXKMSClientCache.java b/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/cache/EHCacheXKMSClientCache.java
index f02ed95..bdba04f 100644
--- a/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/cache/EHCacheXKMSClientCache.java
+++ b/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/cache/EHCacheXKMSClientCache.java
@@ -68,7 +68,7 @@ public class EHCacheXKMSClientCache implements XKMSClientCache, BusLifeCycleList
 
     public EHCacheXKMSClientCache(Bus cxfBus, Path diskstorePath, long diskSize,
                                   long heapEntries, boolean persistent) throws XKMSClientCacheException {
-        // Do some sanity checking on the arguments
+        // Do some checking on the arguments
         if (persistent && diskstorePath == null) {
             throw new NullPointerException();
         }