Author: coheigea
Date: Fri Aug 23 15:43:04 2013
New Revision: 1516899
URL: http://svn.apache.org/r1516899
Log:
Update following recent merge to WSS4J
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JStaxInterceptor.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java?rev=1516899&r1=1516898&r2=1516899&view=diff
==============================================================================
---
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
(original)
+++
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
Fri Aug 23 15:43:04 2013
@@ -316,7 +316,7 @@ public final class SecurityConstants {
* This holds a reference to a PasswordEncryptor instance, which is used
to encrypt or
* decrypt passwords in the Merlin Crypto implementation (or any custom
Crypto implementations).
*
- * By default, WSS4J uses the StrongJasyptPasswordEncryptor, which must be
instantiated with a
+ * 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
* or PW_CALLBACK_REF.
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JStaxInterceptor.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JStaxInterceptor.java?rev=1516899&r1=1516898&r2=1516899&view=diff
==============================================================================
---
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JStaxInterceptor.java
(original)
+++
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JStaxInterceptor.java
Fri Aug 23 15:43:04 2013
@@ -57,8 +57,8 @@ import org.apache.cxf.ws.security.tokens
import org.apache.wss4j.common.ConfigurationConstants;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
+import org.apache.wss4j.common.crypto.JasyptPasswordEncryptor;
import org.apache.wss4j.common.crypto.PasswordEncryptor;
-import org.apache.wss4j.common.crypto.StrongJasyptPasswordEncryptor;
import org.apache.wss4j.common.ext.WSPasswordCallback;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.util.Loader;
@@ -467,7 +467,7 @@ public abstract class AbstractWSS4JStaxI
callbackHandler =
(CallbackHandler)getProperties().get(ConfigurationConstants.PW_CALLBACK_REF);
}
if (callbackHandler != null) {
- return new StrongJasyptPasswordEncryptor(callbackHandler);
+ return new JasyptPasswordEncryptor(callbackHandler);
}
return null;
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java?rev=1516899&r1=1516898&r2=1516899&view=diff
==============================================================================
---
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
(original)
+++
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
Fri Aug 23 15:43:04 2013
@@ -82,8 +82,8 @@ import org.apache.cxf.ws.security.wss4j.
import
org.apache.cxf.ws.security.wss4j.policyvalidators.X509TokenPolicyValidator;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
+import org.apache.wss4j.common.crypto.JasyptPasswordEncryptor;
import org.apache.wss4j.common.crypto.PasswordEncryptor;
-import org.apache.wss4j.common.crypto.StrongJasyptPasswordEncryptor;
import org.apache.wss4j.common.ext.WSSecurityException;
import org.apache.wss4j.common.util.Loader;
import org.apache.wss4j.dom.WSConstants;
@@ -448,7 +448,7 @@ public class PolicyBasedWSS4JInIntercept
CallbackHandler callbackHandler = requestData.getCallbackHandler();
if (callbackHandler != null) {
- return new StrongJasyptPasswordEncryptor(callbackHandler);
+ return new JasyptPasswordEncryptor(callbackHandler);
}
return null;
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java?rev=1516899&r1=1516898&r2=1516899&view=diff
==============================================================================
---
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
(original)
+++
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
Fri Aug 23 15:43:04 2013
@@ -81,8 +81,8 @@ import org.apache.neethi.Assertion;
import org.apache.wss4j.common.crypto.Crypto;
import org.apache.wss4j.common.crypto.CryptoFactory;
import org.apache.wss4j.common.crypto.CryptoType;
+import org.apache.wss4j.common.crypto.JasyptPasswordEncryptor;
import org.apache.wss4j.common.crypto.PasswordEncryptor;
-import org.apache.wss4j.common.crypto.StrongJasyptPasswordEncryptor;
import org.apache.wss4j.common.derivedKey.ConversationConstants;
import org.apache.wss4j.common.derivedKey.ConversationException;
import org.apache.wss4j.common.ext.WSPasswordCallback;
@@ -1635,7 +1635,7 @@ public abstract class AbstractBindingBui
CallbackHandler callbackHandler = getCallbackHandler();
if (callbackHandler != null) {
- return new StrongJasyptPasswordEncryptor(callbackHandler);
+ return new JasyptPasswordEncryptor(callbackHandler);
}
return null;
