You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2012/08/17 17:41:05 UTC
svn commit: r1374326 [4/5] - in /webservices/wss4j/trunk:
cxf-integration/src/test/java/org/swssf/cxfIntegration/test/integration/
cxf-integration/src/test/resources/integration/ policy/
streaming-ws-security/src/test/java/org/apache/ws/security/stax/w...
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/validate/UsernameTokenValidator.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/validate/UsernameTokenValidator.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/validate/UsernameTokenValidator.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/validate/UsernameTokenValidator.java Fri Aug 17 15:40:59 2012
@@ -25,9 +25,9 @@ import javax.security.auth.callback.Call
import javax.security.auth.callback.UnsupportedCallbackException;
import org.apache.ws.security.WSConstants;
-import org.apache.ws.security.WSPasswordCallback;
import org.apache.ws.security.WSSConfig;
-import org.apache.ws.security.WSSecurityException;
+import org.apache.ws.security.common.ext.WSPasswordCallback;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.message.token.UsernameToken;
import org.apache.ws.security.util.Base64;
@@ -57,7 +57,7 @@ public class UsernameTokenValidator impl
*/
public Credential validate(Credential credential, RequestData data) throws WSSecurityException {
if (credential == null || credential.getUsernametoken() == null) {
- throw new WSSecurityException(WSSecurityException.FAILURE, "noCredential");
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "noCredential");
}
boolean handleCustomPasswordTypes = false;
@@ -84,7 +84,7 @@ public class UsernameTokenValidator impl
log.debug("Authentication failed as the received password type does not "
+ "match the required password type of: " + requiredPasswordType);
}
- throw new WSSecurityException(WSSecurityException.FAILED_AUTHENTICATION);
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILED_AUTHENTICATION);
}
//
@@ -103,7 +103,7 @@ public class UsernameTokenValidator impl
if (log.isDebugEnabled()) {
log.debug("Authentication failed as handleCustomUsernameTokenTypes is false");
}
- throw new WSSecurityException(WSSecurityException.FAILED_AUTHENTICATION);
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILED_AUTHENTICATION);
}
verifyCustomPassword(usernameToken, data);
} else {
@@ -152,7 +152,7 @@ public class UsernameTokenValidator impl
protected void verifyDigestPassword(UsernameToken usernameToken,
RequestData data) throws WSSecurityException {
if (data.getCallbackHandler() == null) {
- throw new WSSecurityException(WSSecurityException.FAILURE, "noCallback");
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "noCallback");
}
String user = usernameToken.getName();
@@ -163,7 +163,7 @@ public class UsernameTokenValidator impl
boolean passwordsAreEncoded = usernameToken.getPasswordsAreEncoded();
WSPasswordCallback pwCb =
- new WSPasswordCallback(user, null, pwType, WSPasswordCallback.USERNAME_TOKEN, data);
+ new WSPasswordCallback(user, null, pwType, WSPasswordCallback.Usage.USERNAME_TOKEN);
try {
data.getCallbackHandler().handle(new Callback[]{pwCb});
} catch (IOException e) {
@@ -171,14 +171,14 @@ public class UsernameTokenValidator impl
log.debug(e);
}
throw new WSSecurityException(
- WSSecurityException.FAILED_AUTHENTICATION, null, null, e
+ WSSecurityException.ErrorCode.FAILED_AUTHENTICATION, null, null, e
);
} catch (UnsupportedCallbackException e) {
if (log.isDebugEnabled()) {
log.debug(e);
}
throw new WSSecurityException(
- WSSecurityException.FAILED_AUTHENTICATION, null, null, e
+ WSSecurityException.ErrorCode.FAILED_AUTHENTICATION, null, null, e
);
}
String origPassword = pwCb.getPassword();
@@ -186,7 +186,7 @@ public class UsernameTokenValidator impl
if (log.isDebugEnabled()) {
log.debug("Callback supplied no password for: " + user);
}
- throw new WSSecurityException(WSSecurityException.FAILED_AUTHENTICATION);
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILED_AUTHENTICATION);
}
if (usernameToken.isHashed()) {
String passDigest;
@@ -196,11 +196,11 @@ public class UsernameTokenValidator impl
passDigest = UsernameToken.doPasswordDigest(nonce, createdTime, origPassword);
}
if (!passDigest.equals(password)) {
- throw new WSSecurityException(WSSecurityException.FAILED_AUTHENTICATION);
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILED_AUTHENTICATION);
}
} else {
if (!origPassword.equals(password)) {
- throw new WSSecurityException(WSSecurityException.FAILED_AUTHENTICATION);
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILED_AUTHENTICATION);
}
}
}
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/validate/Validator.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/validate/Validator.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/validate/Validator.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/validate/Validator.java Fri Aug 17 15:40:59 2012
@@ -20,7 +20,7 @@
package org.apache.ws.security.validate;
-import org.apache.ws.security.WSSecurityException;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.RequestData;
/**
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/CustomAction.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/CustomAction.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/CustomAction.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/CustomAction.java Fri Aug 17 15:40:59 2012
@@ -20,9 +20,9 @@
package org.apache.ws.security.common;
import org.apache.ws.security.action.Action;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.WSHandler;
import org.apache.ws.security.handler.RequestData;
-import org.apache.ws.security.WSSecurityException;
/**
* a custom action that leaves a breadcumb
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/CustomCrypto.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/CustomCrypto.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/CustomCrypto.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/CustomCrypto.java Fri Aug 17 15:40:59 2012
@@ -19,7 +19,7 @@
package org.apache.ws.security.common;
-import org.apache.ws.security.components.crypto.Merlin;
+import org.apache.ws.security.common.crypto.Merlin;
public class CustomCrypto extends Merlin {
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/CustomHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/CustomHandler.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/CustomHandler.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/CustomHandler.java Fri Aug 17 15:40:59 2012
@@ -20,6 +20,7 @@
package org.apache.ws.security.common;
import org.apache.ws.security.WSSecurityEngineResult;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.WSHandler;
import org.apache.ws.security.handler.RequestData;
import org.w3c.dom.Document;
@@ -82,7 +83,7 @@ public class CustomHandler extends WSHan
RequestData reqData,
List<Integer> actions,
boolean request
- ) throws org.apache.ws.security.WSSecurityException {
+ ) throws WSSecurityException {
doSenderAction(
action,
doc,
@@ -95,7 +96,7 @@ public class CustomHandler extends WSHan
public void receive(
int action,
RequestData reqData
- ) throws org.apache.ws.security.WSSecurityException {
+ ) throws WSSecurityException {
doReceiverAction(
action,
reqData
@@ -105,21 +106,21 @@ public class CustomHandler extends WSHan
public void signatureConfirmation(
RequestData requestData,
List<WSSecurityEngineResult> results
- ) throws org.apache.ws.security.WSSecurityException {
+ ) throws WSSecurityException {
checkSignatureConfirmation(requestData, results);
}
public boolean checkResults(
List<WSSecurityEngineResult> results,
List<Integer> actions
- ) throws org.apache.ws.security.WSSecurityException {
+ ) throws WSSecurityException {
return checkReceiverResults(results, actions);
}
public boolean checkResultsAnyOrder(
List<WSSecurityEngineResult> results,
List<Integer> actions
- ) throws org.apache.ws.security.WSSecurityException {
+ ) throws WSSecurityException {
return checkReceiverResultsAnyOrder(results, actions);
}
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/CustomProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/CustomProcessor.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/CustomProcessor.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/CustomProcessor.java Fri Aug 17 15:40:59 2012
@@ -19,12 +19,12 @@
package org.apache.ws.security.common;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.processor.Processor;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSDocInfo;
import org.apache.ws.security.WSSecurityEngineResult;
-import org.apache.ws.security.WSSecurityException;
/**
* a custom processor that inserts itself into the results list
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/CustomSamlAssertionValidator.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/CustomSamlAssertionValidator.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/CustomSamlAssertionValidator.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/CustomSamlAssertionValidator.java Fri Aug 17 15:40:59 2012
@@ -19,7 +19,7 @@
package org.apache.ws.security.common;
-import org.apache.ws.security.WSSecurityException;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.saml.ext.AssertionWrapper;
import org.apache.ws.security.validate.Credential;
@@ -36,7 +36,7 @@ public class CustomSamlAssertionValidato
//
AssertionWrapper assertion = credential.getAssertion();
if (!"www.example.com".equals(assertion.getIssuerString())) {
- throw new WSSecurityException(WSSecurityException.FAILURE, "invalidSAMLsecurity");
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "invalidSAMLsecurity");
}
if (assertion.getSaml1() != null) {
// Get the SAML subject and validate it
@@ -62,20 +62,20 @@ public class CustomSamlAssertionValidato
if (samlSubject == null) {
throw new WSSecurityException(
- WSSecurityException.FAILURE, "invalidSAMLToken",
+ WSSecurityException.ErrorCode.FAILURE, "invalidSAMLToken",
new Object[] {"for Signature (no Subject)"}
);
}
String nameIdentifier = samlSubject.getNameIdentifier().getNameIdentifier();
if (nameIdentifier == null || !nameIdentifier.contains("uid=joe")) {
- throw new WSSecurityException(WSSecurityException.FAILURE, "invalidSAMLsecurity");
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "invalidSAMLsecurity");
}
} else {
org.opensaml.saml2.core.Assertion saml2Assertion = assertion.getSaml2();
org.opensaml.saml2.core.Subject subject = saml2Assertion.getSubject();
String nameIdentifier = subject.getNameID().getValue();
if (nameIdentifier == null || !nameIdentifier.contains("uid=joe")) {
- throw new WSSecurityException(WSSecurityException.FAILURE, "invalidSAMLsecurity");
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "invalidSAMLsecurity");
}
}
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/EncodedPasswordCallbackHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/EncodedPasswordCallbackHandler.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/EncodedPasswordCallbackHandler.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/EncodedPasswordCallbackHandler.java Fri Aug 17 15:40:59 2012
@@ -19,11 +19,12 @@
package org.apache.ws.security.common;
-import org.apache.ws.security.WSPasswordCallback;
-
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
+
+import org.apache.ws.security.common.ext.WSPasswordCallback;
+
import java.io.IOException;
/**
@@ -37,7 +38,7 @@ public class EncodedPasswordCallbackHand
for (int i = 0; i < callbacks.length; i++) {
if (callbacks[i] instanceof WSPasswordCallback) {
WSPasswordCallback pc = (WSPasswordCallback) callbacks[i];
- if (pc.getUsage() == WSPasswordCallback.USERNAME_TOKEN) {
+ if (pc.getUsage() == WSPasswordCallback.Usage.USERNAME_TOKEN) {
if ("wernerd".equals(pc.getIdentifier())) {
// Base64 encoded SHA-1 hash of "verySecret"
pc.setPassword("hGqoUreBgahTJblQ3DbJIkE6uNs=");
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/KeystoreCallbackHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/KeystoreCallbackHandler.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/KeystoreCallbackHandler.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/KeystoreCallbackHandler.java Fri Aug 17 15:40:59 2012
@@ -19,11 +19,12 @@
package org.apache.ws.security.common;
-import org.apache.ws.security.WSPasswordCallback;
-
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
+
+import org.apache.ws.security.common.ext.WSPasswordCallback;
+
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/SAML1AuthnHOKHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/SAML1AuthnHOKHandler.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/SAML1AuthnHOKHandler.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/SAML1AuthnHOKHandler.java Fri Aug 17 15:40:59 2012
@@ -19,10 +19,10 @@
package org.apache.ws.security.common;
-import org.apache.ws.security.WSSecurityException;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoFactory;
-import org.apache.ws.security.components.crypto.CryptoType;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoFactory;
+import org.apache.ws.security.common.crypto.CryptoType;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.saml.ext.SAMLCallback;
import org.apache.ws.security.saml.ext.bean.AuthenticationStatementBean;
import org.apache.ws.security.saml.ext.bean.KeyInfoBean;
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/SAML1CallbackHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/SAML1CallbackHandler.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/SAML1CallbackHandler.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/SAML1CallbackHandler.java Fri Aug 17 15:40:59 2012
@@ -19,9 +19,9 @@
package org.apache.ws.security.common;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoFactory;
-import org.apache.ws.security.components.crypto.CryptoType;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoFactory;
+import org.apache.ws.security.common.crypto.CryptoType;
import org.apache.ws.security.saml.ext.SAMLCallback;
import org.apache.ws.security.saml.ext.bean.KeyInfoBean;
import org.apache.ws.security.saml.ext.bean.SubjectBean;
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/SAML2CallbackHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/SAML2CallbackHandler.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/SAML2CallbackHandler.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/SAML2CallbackHandler.java Fri Aug 17 15:40:59 2012
@@ -19,9 +19,9 @@
package org.apache.ws.security.common;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoFactory;
-import org.apache.ws.security.components.crypto.CryptoType;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoFactory;
+import org.apache.ws.security.common.crypto.CryptoType;
import org.apache.ws.security.saml.ext.SAMLCallback;
import org.apache.ws.security.saml.ext.bean.KeyInfoBean;
import org.apache.ws.security.saml.ext.bean.SubjectBean;
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/SecretKeyCallbackHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/SecretKeyCallbackHandler.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/SecretKeyCallbackHandler.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/SecretKeyCallbackHandler.java Fri Aug 17 15:40:59 2012
@@ -19,8 +19,8 @@
package org.apache.ws.security.common;
-import org.apache.ws.security.WSPasswordCallback;
-import org.apache.ws.security.WSSecurityException;
+import org.apache.ws.security.common.ext.WSPasswordCallback;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.util.Base64;
import org.apache.ws.security.util.WSSecurityUtil;
@@ -44,9 +44,8 @@ public class SecretKeyCallbackHandler im
for (int i = 0; i < callbacks.length; i++) {
if (callbacks[i] instanceof WSPasswordCallback) {
WSPasswordCallback pc = (WSPasswordCallback) callbacks[i];
- switch (pc.getUsage()) {
- case WSPasswordCallback.SECRET_KEY:
- case WSPasswordCallback.SECURITY_CONTEXT_TOKEN: {
+ if ((pc.getUsage() == WSPasswordCallback.Usage.SECRET_KEY)
+ || (pc.getUsage() == WSPasswordCallback.Usage.SECURITY_CONTEXT_TOKEN)) {
byte[] secret = (byte[]) this.secrets.get(pc.getIdentifier());
if (secret == null) {
secret = outboundSecret;
@@ -54,7 +53,6 @@ public class SecretKeyCallbackHandler im
pc.setKey(secret);
break;
}
- }
} else {
throw new UnsupportedCallbackException(callbacks[i], "Unrecognized Callback");
}
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/UsernamePasswordCallbackHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/UsernamePasswordCallbackHandler.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/UsernamePasswordCallbackHandler.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/UsernamePasswordCallbackHandler.java Fri Aug 17 15:40:59 2012
@@ -19,11 +19,12 @@
package org.apache.ws.security.common;
-import org.apache.ws.security.WSPasswordCallback;
-
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
+
+import org.apache.ws.security.common.ext.WSPasswordCallback;
+
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
@@ -46,7 +47,7 @@ public class UsernamePasswordCallbackHan
for (int i = 0; i < callbacks.length; i++) {
if (callbacks[i] instanceof WSPasswordCallback) {
WSPasswordCallback pc = (WSPasswordCallback) callbacks[i];
- if (pc.getUsage() == WSPasswordCallback.USERNAME_TOKEN) {
+ if (pc.getUsage() == WSPasswordCallback.Usage.USERNAME_TOKEN) {
pc.setPassword(users.get(pc.getIdentifier()));
break;
}
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/components/crypto/CertificateStoreTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/components/crypto/CertificateStoreTest.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/components/crypto/CertificateStoreTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/components/crypto/CertificateStoreTest.java Fri Aug 17 15:40:59 2012
@@ -23,9 +23,13 @@ import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSecurityEngineResult;
-import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.common.KeystoreCallbackHandler;
import org.apache.ws.security.common.SOAPUtil;
+import org.apache.ws.security.common.crypto.CertificateStore;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoFactory;
+import org.apache.ws.security.common.crypto.CryptoType;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.message.WSSecHeader;
import org.apache.ws.security.message.WSSecSignature;
import org.apache.ws.security.util.WSSecurityUtil;
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/components/crypto/CryptoProviderTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/components/crypto/CryptoProviderTest.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/components/crypto/CryptoProviderTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/components/crypto/CryptoProviderTest.java Fri Aug 17 15:40:59 2012
@@ -23,6 +23,8 @@ import org.apache.ws.security.WSSecurity
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.common.KeystoreCallbackHandler;
import org.apache.ws.security.common.SOAPUtil;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoFactory;
import org.apache.ws.security.message.WSSecEncrypt;
import org.apache.ws.security.message.WSSecHeader;
import org.apache.ws.security.message.WSSecSignature;
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/components/crypto/CryptoTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/components/crypto/CryptoTest.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/components/crypto/CryptoTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/components/crypto/CryptoTest.java Fri Aug 17 15:40:59 2012
@@ -25,12 +25,15 @@ import java.security.KeyStore;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngine;
-import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.common.CustomCrypto;
import org.apache.ws.security.common.SOAPUtil;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoFactory;
+import org.apache.ws.security.common.crypto.Merlin;
+import org.apache.ws.security.common.ext.WSSecurityException;
+import org.apache.ws.security.common.util.Loader;
import org.apache.ws.security.message.WSSecHeader;
import org.apache.ws.security.message.WSSecSignature;
-import org.apache.ws.security.util.Loader;
import org.w3c.dom.Document;
public class CryptoTest extends org.junit.Assert {
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/handler/CustomActionProcessorTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/handler/CustomActionProcessorTest.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/handler/CustomActionProcessorTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/handler/CustomActionProcessorTest.java Fri Aug 17 15:40:59 2012
@@ -23,13 +23,13 @@ import org.apache.ws.security.WSSecurity
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngineResult;
-import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.common.CustomAction;
import org.apache.ws.security.common.CustomHandler;
import org.apache.ws.security.common.CustomProcessor;
import org.apache.ws.security.common.SOAPUtil;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoFactory;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoFactory;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.message.WSSecSignature;
import org.apache.ws.security.message.WSSecHeader;
import org.apache.ws.security.util.WSSecurityUtil;
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/handler/SignatureConfirmationTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/handler/SignatureConfirmationTest.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/handler/SignatureConfirmationTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/handler/SignatureConfirmationTest.java Fri Aug 17 15:40:59 2012
@@ -23,12 +23,12 @@ import org.apache.ws.security.WSConstant
import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSSecurityEngineResult;
-import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.common.CustomHandler;
import org.apache.ws.security.common.KeystoreCallbackHandler;
import org.apache.ws.security.common.SOAPUtil;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoFactory;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoFactory;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.message.WSSecHeader;
import org.apache.ws.security.message.token.SignatureConfirmation;
import org.apache.ws.security.util.Base64;
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/handler/SignatureUTAliasTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/handler/SignatureUTAliasTest.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/handler/SignatureUTAliasTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/handler/SignatureUTAliasTest.java Fri Aug 17 15:40:59 2012
@@ -27,13 +27,13 @@ import javax.security.auth.callback.Call
import javax.security.auth.callback.UnsupportedCallbackException;
import org.apache.ws.security.WSConstants;
-import org.apache.ws.security.WSPasswordCallback;
import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSSecurityEngineResult;
import org.apache.ws.security.common.CustomHandler;
import org.apache.ws.security.common.SOAPUtil;
-import org.apache.ws.security.components.crypto.CryptoFactory;
+import org.apache.ws.security.common.crypto.CryptoFactory;
+import org.apache.ws.security.common.ext.WSPasswordCallback;
import org.w3c.dom.Document;
@@ -125,10 +125,10 @@ public class SignatureUTAliasTest extend
for (int i = 0; i < callbacks.length; i++) {
if (callbacks[i] instanceof WSPasswordCallback) {
WSPasswordCallback pc = (WSPasswordCallback) callbacks[i];
- if (pc.getUsage() == WSPasswordCallback.USERNAME_TOKEN
+ if (pc.getUsage() == WSPasswordCallback.Usage.USERNAME_TOKEN
&& "alice".equals(pc.getIdentifier())) {
pc.setPassword("verySecret");
- } else if (pc.getUsage() == WSPasswordCallback.SIGNATURE
+ } else if (pc.getUsage() == WSPasswordCallback.Usage.SIGNATURE
&& "wss40".equals(pc.getIdentifier())) {
pc.setPassword("security");
} else {
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/handler/WSHandlerGetPasswordTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/handler/WSHandlerGetPasswordTest.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/handler/WSHandlerGetPasswordTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/handler/WSHandlerGetPasswordTest.java Fri Aug 17 15:40:59 2012
@@ -19,12 +19,12 @@
package org.apache.ws.security.handler;
-import org.apache.ws.security.WSPasswordCallback;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.common.CustomHandler;
import org.apache.ws.security.common.SOAPUtil;
import org.apache.ws.security.common.UsernamePasswordCallbackHandler;
+import org.apache.ws.security.common.ext.WSPasswordCallback;
import org.w3c.dom.Document;
import javax.security.auth.callback.CallbackHandler;
@@ -60,7 +60,7 @@ public class WSHandlerGetPasswordTest ex
handler.getPasswordCB("alice", WSConstants.UT, callbackHandler, reqData);
assertTrue("alice".equals(callback.getIdentifier()));
assertTrue("securityPassword".equals(callback.getPassword()));
- assertTrue(WSPasswordCallback.USERNAME_TOKEN == callback.getUsage());
+ assertTrue(WSPasswordCallback.Usage.USERNAME_TOKEN == callback.getUsage());
}
/**
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/CertErrorTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/CertErrorTest.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/CertErrorTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/CertErrorTest.java Fri Aug 17 15:40:59 2012
@@ -20,9 +20,9 @@
package org.apache.ws.security.message;
import org.apache.ws.security.WSSConfig;
-import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.common.SOAPUtil;
-import org.apache.ws.security.components.crypto.CryptoFactory;
+import org.apache.ws.security.common.crypto.CryptoFactory;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.w3c.dom.Document;
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/DerivedKeyTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/DerivedKeyTest.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/DerivedKeyTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/DerivedKeyTest.java Fri Aug 17 15:40:59 2012
@@ -25,9 +25,9 @@ import org.apache.ws.security.WSSecurity
import org.apache.ws.security.WSSecurityEngineResult;
import org.apache.ws.security.common.KeystoreCallbackHandler;
import org.apache.ws.security.common.SOAPUtil;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoFactory;
-import org.apache.ws.security.components.crypto.CryptoType;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoFactory;
+import org.apache.ws.security.common.crypto.CryptoType;
import org.apache.ws.security.message.token.SecurityTokenReference;
import org.apache.ws.security.util.WSSecurityUtil;
import org.w3c.dom.Document;
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/EncryptedDataInHeaderTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/EncryptedDataInHeaderTest.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/EncryptedDataInHeaderTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/EncryptedDataInHeaderTest.java Fri Aug 17 15:40:59 2012
@@ -31,8 +31,8 @@ import org.apache.ws.security.WSSecurity
import org.apache.ws.security.WSSecurityEngineResult;
import org.apache.ws.security.common.KeystoreCallbackHandler;
import org.apache.ws.security.common.SOAPUtil;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoFactory;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoFactory;
import org.apache.ws.security.util.WSSecurityUtil;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/EncryptionCRLTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/EncryptionCRLTest.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/EncryptionCRLTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/EncryptionCRLTest.java Fri Aug 17 15:40:59 2012
@@ -29,8 +29,8 @@ import org.apache.ws.security.WSSecurity
import org.apache.ws.security.common.CustomHandler;
import org.apache.ws.security.common.KeystoreCallbackHandler;
import org.apache.ws.security.common.SOAPUtil;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoFactory;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoFactory;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.handler.WSHandlerConstants;
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/EncryptionGCMTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/EncryptionGCMTest.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/EncryptionGCMTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/EncryptionGCMTest.java Fri Aug 17 15:40:59 2012
@@ -28,8 +28,8 @@ import org.apache.ws.security.WSSecurity
import org.apache.ws.security.WSSecurityEngineResult;
import org.apache.ws.security.common.KeystoreCallbackHandler;
import org.apache.ws.security.common.SOAPUtil;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoFactory;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoFactory;
import org.w3c.dom.Document;
/**
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/EncryptionPartsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/EncryptionPartsTest.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/EncryptionPartsTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/EncryptionPartsTest.java Fri Aug 17 15:40:59 2012
@@ -26,11 +26,11 @@ import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSecurityEngineResult;
-import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.common.KeystoreCallbackHandler;
import org.apache.ws.security.common.SOAPUtil;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoFactory;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoFactory;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.util.WSSecurityUtil;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/EncryptionTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/EncryptionTest.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/EncryptionTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/EncryptionTest.java Fri Aug 17 15:40:59 2012
@@ -26,13 +26,13 @@ import org.apache.ws.security.WSSecurity
import org.apache.ws.security.WSEncryptionPart;
import org.apache.ws.security.WSSecurityEngineResult;
import org.apache.ws.security.WSDataRef;
-import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.common.CustomHandler;
import org.apache.ws.security.common.KeystoreCallbackHandler;
import org.apache.ws.security.common.SecretKeyCallbackHandler;
import org.apache.ws.security.common.SOAPUtil;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoFactory;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoFactory;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.handler.WSHandlerConstants;
import org.apache.ws.security.str.STRParser.REFERENCE_TYPE;
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/ModifiedRequestTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/ModifiedRequestTest.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/ModifiedRequestTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/ModifiedRequestTest.java Fri Aug 17 15:40:59 2012
@@ -24,12 +24,12 @@ import org.apache.ws.security.WSEncrypti
import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSSecurityEngineResult;
-import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.common.KeystoreCallbackHandler;
import org.apache.ws.security.common.SAML1CallbackHandler;
import org.apache.ws.security.common.SOAPUtil;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoFactory;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoFactory;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.saml.WSSecSignatureSAML;
import org.apache.ws.security.saml.ext.AssertionWrapper;
import org.apache.ws.security.saml.ext.SAMLParms;
@@ -124,7 +124,7 @@ public class ModifiedRequestTest extends
verify(signedDoc);
fail("Failure expected on multiple elements with the same wsu:Id");
} catch (WSSecurityException ex) {
- assertTrue(ex.getErrorCode() == 6);
+ assertTrue(ex.getErrorCode() == WSSecurityException.ErrorCode.FAILED_CHECK);
assertTrue(ex.getMessage().startsWith("The signature or decryption was invalid"));
}
}
@@ -209,7 +209,7 @@ public class ModifiedRequestTest extends
WSSecurityUtil.checkSignsAllElements(actionResult, new String[]{actualId});
fail("Failure expected on bad wsu:Id");
} catch (WSSecurityException ex) {
- assertTrue(ex.getErrorCode() == 6);
+ assertTrue(ex.getErrorCode() == WSSecurityException.ErrorCode.FAILED_CHECK);
assertTrue(ex.getMessage().startsWith("The signature or decryption was invalid"));
}
}
@@ -391,7 +391,7 @@ public class ModifiedRequestTest extends
newEngine.processSecurityHeader(doc, null, new KeystoreCallbackHandler(), wssCrypto);
fail("Failure expected on a modified EncryptedData CipherValue");
} catch (WSSecurityException ex) {
- assertTrue(ex.getErrorCode() == 6);
+ assertTrue(ex.getErrorCode() == WSSecurityException.ErrorCode.FAILED_CHECK);
assertTrue(ex.getMessage().startsWith("The signature or decryption was invalid"));
}
}
@@ -439,7 +439,7 @@ public class ModifiedRequestTest extends
newEngine.processSecurityHeader(doc, null, new KeystoreCallbackHandler(), wssCrypto);
fail("Failure expected on a modified EncryptedData CipherValue");
} catch (WSSecurityException ex) {
- assertTrue(ex.getErrorCode() == 6);
+ assertTrue(ex.getErrorCode() == WSSecurityException.ErrorCode.FAILED_CHECK);
assertTrue(ex.getMessage().startsWith("The signature or decryption was invalid"));
}
}
@@ -489,7 +489,7 @@ public class ModifiedRequestTest extends
verify(signedDoc);
fail("Failure expected on a modified Signature Reference");
} catch (WSSecurityException ex) {
- assertTrue(ex.getErrorCode() == 6);
+ assertTrue(ex.getErrorCode() == WSSecurityException.ErrorCode.FAILED_CHECK);
assertTrue(ex.getMessage().startsWith("The signature or decryption was invalid"));
}
}
@@ -518,7 +518,7 @@ public class ModifiedRequestTest extends
verify(signedDoc);
fail("Failure expected on an untrusted Certificate");
} catch (WSSecurityException ex) {
- assertTrue(ex.getErrorCode() == 6);
+ assertTrue(ex.getErrorCode() == WSSecurityException.ErrorCode.FAILED_CHECK);
assertTrue(ex.getMessage().startsWith("The signature or decryption was invalid"));
}
}
@@ -554,7 +554,7 @@ public class ModifiedRequestTest extends
verify(signedDoc);
fail("Failure expected on a modified Signature element");
} catch (WSSecurityException ex) {
- assertTrue(ex.getErrorCode() == 6);
+ assertTrue(ex.getErrorCode() == WSSecurityException.ErrorCode.FAILED_CHECK);
assertTrue(ex.getMessage().startsWith("The signature or decryption was invalid"));
}
}
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/NoSoapPrefixSignatureTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/NoSoapPrefixSignatureTest.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/NoSoapPrefixSignatureTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/NoSoapPrefixSignatureTest.java Fri Aug 17 15:40:59 2012
@@ -23,8 +23,8 @@ import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.common.SOAPUtil;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoFactory;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoFactory;
import org.w3c.dom.Document;
/**
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/PasswordTypeTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/PasswordTypeTest.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/PasswordTypeTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/PasswordTypeTest.java Fri Aug 17 15:40:59 2012
@@ -19,13 +19,13 @@
package org.apache.ws.security.message;
-import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.common.CustomHandler;
import org.apache.ws.security.common.SOAPUtil;
import org.apache.ws.security.common.UsernamePasswordCallbackHandler;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.handler.WSHandlerConstants;
import org.w3c.dom.Document;
@@ -85,7 +85,7 @@ public class PasswordTypeTest extends or
secEngine.processSecurityHeader(doc, null, callbackHandler, null);
fail("Expected failure on the wrong password type");
} catch (WSSecurityException ex) {
- assertTrue(ex.getErrorCode() == WSSecurityException.FAILED_AUTHENTICATION);
+ assertTrue(ex.getErrorCode() == WSSecurityException.ErrorCode.FAILED_AUTHENTICATION);
// expected
}
}
@@ -135,7 +135,7 @@ public class PasswordTypeTest extends or
secEngine.processSecurityHeader(doc, null, callbackHandler, null);
fail("Expected failure on the wrong password type");
} catch (WSSecurityException ex) {
- assertTrue(ex.getErrorCode() == WSSecurityException.FAILED_AUTHENTICATION);
+ assertTrue(ex.getErrorCode() == WSSecurityException.ErrorCode.FAILED_AUTHENTICATION);
// expected
}
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/ReplayTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/ReplayTest.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/ReplayTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/ReplayTest.java Fri Aug 17 15:40:59 2012
@@ -29,13 +29,13 @@ import org.apache.ws.security.WSEncrypti
import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSSecurityEngineResult;
-import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.cache.MemoryReplayCache;
import org.apache.ws.security.common.KeystoreCallbackHandler;
import org.apache.ws.security.common.SOAPUtil;
import org.apache.ws.security.common.UsernamePasswordCallbackHandler;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoFactory;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoFactory;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.util.WSSecurityUtil;
import org.w3c.dom.Document;
@@ -104,7 +104,7 @@ public class ReplayTest extends org.juni
verify(createdDoc, wssConfig, data);
fail("Expected failure on a replay attack");
} catch (WSSecurityException ex) {
- assertTrue(ex.getErrorCode() == WSSecurityException.INVALID_SECURITY);
+ assertTrue(ex.getErrorCode() == WSSecurityException.ErrorCode.INVALID_SECURITY);
}
}
@@ -152,7 +152,7 @@ public class ReplayTest extends org.juni
verify(createdDoc, wssConfig, data);
fail("Expected failure on a replay attack");
} catch (WSSecurityException ex) {
- assertTrue(ex.getErrorCode() == WSSecurityException.INVALID_SECURITY);
+ assertTrue(ex.getErrorCode() == WSSecurityException.ErrorCode.INVALID_SECURITY);
}
}
@@ -205,7 +205,7 @@ public class ReplayTest extends org.juni
verify(createdDoc, wssConfig, data);
fail("Expected failure on a replay attack");
} catch (WSSecurityException ex) {
- assertTrue(ex.getErrorCode() == WSSecurityException.INVALID_SECURITY);
+ assertTrue(ex.getErrorCode() == WSSecurityException.ErrorCode.INVALID_SECURITY);
}
}
@@ -239,7 +239,7 @@ public class ReplayTest extends org.juni
verify(signedDoc, wssConfig, data);
fail("Expected failure on a replay attack");
} catch (WSSecurityException ex) {
- assertTrue(ex.getErrorCode() == WSSecurityException.INVALID_SECURITY);
+ assertTrue(ex.getErrorCode() == WSSecurityException.ErrorCode.INVALID_SECURITY);
}
}
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/RequireSignedEncryptedDataElementsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/RequireSignedEncryptedDataElementsTest.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/RequireSignedEncryptedDataElementsTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/RequireSignedEncryptedDataElementsTest.java Fri Aug 17 15:40:59 2012
@@ -31,12 +31,12 @@ import javax.security.auth.callback.Call
import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSSecurityEngineResult;
-import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.common.CustomHandler;
import org.apache.ws.security.common.KeystoreCallbackHandler;
import org.apache.ws.security.common.SOAPUtil;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoFactory;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoFactory;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.handler.WSHandlerConstants;
import org.apache.ws.security.util.WSSecurityUtil;
@@ -53,7 +53,7 @@ import org.w3c.dom.Element;
public class RequireSignedEncryptedDataElementsTest extends org.junit.Assert {
private static final org.apache.commons.logging.Log LOG =
org.apache.commons.logging.LogFactory.getLog(RequireSignedEncryptedDataElementsTest.class);
- private static ResourceBundle resources = ResourceBundle.getBundle("org.apache.ws.security.errors");
+ private static ResourceBundle resources = ResourceBundle.getBundle("messages.wss4j_errors");
private static final String SOAPMSG =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+ "<SOAP-ENV:Envelope "
@@ -228,7 +228,7 @@ public class RequireSignedEncryptedDataE
private static void checkFailure(Element attackElement, WSSecurityException e) {
final String mex = MessageFormat.format(resources.getString("requiredElementNotSigned"), attackElement);
assertTrue(e.getMessage().contains(mex));
- assertEquals(WSSecurityException.FAILED_CHECK, e.getErrorCode());
+ assertEquals(WSSecurityException.ErrorCode.FAILED_CHECK, e.getErrorCode());
}
private RequestData getRequestData(boolean reqSignedEncData) throws WSSecurityException {
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SKISignatureTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SKISignatureTest.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SKISignatureTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SKISignatureTest.java Fri Aug 17 15:40:59 2012
@@ -26,8 +26,8 @@ import org.apache.ws.security.WSSecurity
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSecurityEngineResult;
import org.apache.ws.security.common.SOAPUtil;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoFactory;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoFactory;
import org.apache.ws.security.str.STRParser.REFERENCE_TYPE;
import org.apache.ws.security.util.WSSecurityUtil;
import org.w3c.dom.Document;
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/STRSignatureTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/STRSignatureTest.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/STRSignatureTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/STRSignatureTest.java Fri Aug 17 15:40:59 2012
@@ -26,8 +26,8 @@ import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.util.WSSecurityUtil;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.common.SOAPUtil;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoFactory;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoFactory;
import org.w3c.dom.Document;
import java.util.List;
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SecurityContextTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SecurityContextTokenTest.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SecurityContextTokenTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SecurityContextTokenTest.java Fri Aug 17 15:40:59 2012
@@ -28,8 +28,8 @@ import org.apache.ws.security.WSSecurity
import org.apache.ws.security.WSSecurityEngineResult;
import org.apache.ws.security.common.SecretKeyCallbackHandler;
import org.apache.ws.security.common.SOAPUtil;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoFactory;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoFactory;
import org.apache.ws.security.conversation.ConversationConstants;
import org.apache.ws.security.message.token.SecurityContextToken;
import org.apache.ws.security.util.WSSecurityUtil;
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SignatureCRLTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SignatureCRLTest.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SignatureCRLTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SignatureCRLTest.java Fri Aug 17 15:40:59 2012
@@ -23,10 +23,10 @@ import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSecurityEngineResult;
-import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.common.SOAPUtil;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoFactory;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoFactory;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.util.WSSecurityUtil;
import org.w3c.dom.Document;
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SignatureCertConstraintsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SignatureCertConstraintsTest.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SignatureCertConstraintsTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SignatureCertConstraintsTest.java Fri Aug 17 15:40:59 2012
@@ -27,10 +27,10 @@ import org.apache.ws.security.WSConstant
import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSSecurityEngineResult;
-import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.common.SOAPUtil;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoFactory;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoFactory;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.util.WSSecurityUtil;
import org.w3c.dom.Document;
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SignatureCertTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SignatureCertTest.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SignatureCertTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SignatureCertTest.java Fri Aug 17 15:40:59 2012
@@ -23,11 +23,11 @@ import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSecurityEngineResult;
-import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.common.CustomHandler;
import org.apache.ws.security.common.SOAPUtil;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoFactory;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoFactory;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.handler.WSHandlerConstants;
import org.apache.ws.security.util.WSSecurityUtil;
@@ -217,7 +217,7 @@ public class SignatureCertTest extends o
verify(signedDoc, cryptoCA);
fail("Failure expected on issuer serial");
} catch (WSSecurityException ex) {
- assertTrue(ex.getErrorCode() == WSSecurityException.FAILED_CHECK);
+ assertTrue(ex.getErrorCode() == WSSecurityException.ErrorCode.FAILED_CHECK);
// expected
}
}
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SignatureEncryptionTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SignatureEncryptionTest.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SignatureEncryptionTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SignatureEncryptionTest.java Fri Aug 17 15:40:59 2012
@@ -28,8 +28,8 @@ import org.apache.ws.security.WSSecurity
import org.apache.ws.security.common.KeystoreCallbackHandler;
import org.apache.ws.security.common.SOAPUtil;
import org.apache.ws.security.common.SecretKeyCallbackHandler;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoFactory;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoFactory;
import org.apache.ws.security.util.WSSecurityUtil;
import org.w3c.dom.Document;
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SignatureKeyValueTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SignatureKeyValueTest.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SignatureKeyValueTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SignatureKeyValueTest.java Fri Aug 17 15:40:59 2012
@@ -25,8 +25,8 @@ import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSSecurityEngineResult;
import org.apache.ws.security.common.SOAPUtil;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoFactory;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoFactory;
import org.apache.ws.security.util.WSSecurityUtil;
import org.w3c.dom.Document;
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SignaturePartsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SignaturePartsTest.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SignaturePartsTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SignaturePartsTest.java Fri Aug 17 15:40:59 2012
@@ -26,19 +26,19 @@ import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSecurityEngineResult;
-import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.common.SAML1CallbackHandler;
import org.apache.ws.security.common.SOAPUtil;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoFactory;
-import org.apache.ws.security.components.crypto.Merlin;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoFactory;
+import org.apache.ws.security.common.crypto.Merlin;
+import org.apache.ws.security.common.ext.WSSecurityException;
+import org.apache.ws.security.common.util.Loader;
import org.apache.ws.security.saml.SAMLIssuer;
import org.apache.ws.security.saml.SAMLIssuerImpl;
import org.apache.ws.security.saml.SignedSamlTokenHOKTest;
import org.apache.ws.security.saml.WSSecSignatureSAML;
import org.apache.ws.security.saml.ext.AssertionWrapper;
import org.apache.ws.security.saml.ext.builder.SAML1Constants;
-import org.apache.ws.security.util.Loader;
import org.apache.ws.security.util.WSSecurityUtil;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SignatureTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SignatureTest.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SignatureTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SignatureTest.java Fri Aug 17 15:40:59 2012
@@ -29,12 +29,12 @@ import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSecurityEngineResult;
-import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.common.CustomHandler;
import org.apache.ws.security.common.KeystoreCallbackHandler;
import org.apache.ws.security.common.SOAPUtil;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoFactory;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoFactory;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.handler.WSHandlerConstants;
import org.apache.ws.security.message.token.Reference;
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SignedBSTTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SignedBSTTest.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SignedBSTTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SignedBSTTest.java Fri Aug 17 15:40:59 2012
@@ -29,9 +29,9 @@ import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSSecurityEngineResult;
import org.apache.ws.security.common.SOAPUtil;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoFactory;
-import org.apache.ws.security.components.crypto.CryptoType;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoFactory;
+import org.apache.ws.security.common.crypto.CryptoType;
import org.apache.ws.security.message.token.X509Security;
import org.apache.ws.security.util.WSSecurityUtil;
import org.w3c.dom.Document;
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SymmetricSignatureTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SymmetricSignatureTest.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SymmetricSignatureTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SymmetricSignatureTest.java Fri Aug 17 15:40:59 2012
@@ -29,15 +29,15 @@ import javax.security.auth.callback.Unsu
import javax.xml.crypto.dsig.SignatureMethod;
import org.apache.ws.security.WSConstants;
-import org.apache.ws.security.WSPasswordCallback;
import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngine;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoFactory;
import org.apache.ws.security.common.CustomHandler;
import org.apache.ws.security.common.KeystoreCallbackHandler;
import org.apache.ws.security.common.SOAPUtil;
import org.apache.ws.security.common.SecretKeyCallbackHandler;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoFactory;
+import org.apache.ws.security.common.ext.WSPasswordCallback;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.handler.WSHandlerConstants;
import org.apache.ws.security.util.Base64;
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/TimestampTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/TimestampTest.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/TimestampTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/TimestampTest.java Fri Aug 17 15:40:59 2012
@@ -22,9 +22,9 @@ package org.apache.ws.security.message;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngineResult;
-import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.common.SOAPUtil;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.message.token.Timestamp;
import org.apache.ws.security.util.WSSecurityUtil;
import org.apache.ws.security.util.XmlSchemaDateFormat;
@@ -139,7 +139,7 @@ public class TimestampTest extends org.j
verify(createdDoc, WSSConfig.getNewInstance());
fail("Expected failure on an expired timestamp");
} catch (WSSecurityException ex) {
- assertTrue(ex.getErrorCode() == WSSecurityException.MESSAGE_EXPIRED);
+ assertTrue(ex.getErrorCode() == WSSecurityException.ErrorCode.MESSAGE_EXPIRED);
}
}
@@ -173,7 +173,7 @@ public class TimestampTest extends org.j
verify(createdDoc, wssConfig);
fail("The timestamp validation should have failed");
} catch (WSSecurityException ex) {
- assertTrue(ex.getErrorCode() == WSSecurityException.MESSAGE_EXPIRED);
+ assertTrue(ex.getErrorCode() == WSSecurityException.ErrorCode.MESSAGE_EXPIRED);
}
}
@@ -223,7 +223,7 @@ public class TimestampTest extends org.j
verify(doc, config);
fail("The timestamp validation should have failed");
} catch (WSSecurityException ex) {
- assertTrue(ex.getErrorCode() == WSSecurityException.MESSAGE_EXPIRED);
+ assertTrue(ex.getErrorCode() == WSSecurityException.ErrorCode.MESSAGE_EXPIRED);
}
}
@@ -269,7 +269,7 @@ public class TimestampTest extends org.j
verify(doc, config);
fail("The timestamp validation should have failed");
} catch (WSSecurityException ex) {
- assertTrue(ex.getErrorCode() == WSSecurityException.MESSAGE_EXPIRED);
+ assertTrue(ex.getErrorCode() == WSSecurityException.ErrorCode.MESSAGE_EXPIRED);
}
}
@@ -325,7 +325,7 @@ public class TimestampTest extends org.j
verify(doc, WSSConfig.getNewInstance());
fail("The timestamp validation should have failed");
} catch (WSSecurityException ex) {
- assertTrue(ex.getErrorCode() == WSSecurityException.MESSAGE_EXPIRED);
+ assertTrue(ex.getErrorCode() == WSSecurityException.ErrorCode.MESSAGE_EXPIRED);
}
}
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/UTDerivedKeyTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/UTDerivedKeyTest.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/UTDerivedKeyTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/UTDerivedKeyTest.java Fri Aug 17 15:40:59 2012
@@ -22,13 +22,13 @@ package org.apache.ws.security.message;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngineResult;
-import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.common.EncodedPasswordCallbackHandler;
import org.apache.ws.security.common.SOAPUtil;
import org.apache.ws.security.common.UsernamePasswordCallbackHandler;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoFactory;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoFactory;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.message.token.SecurityTokenReference;
import org.apache.ws.security.message.token.UsernameToken;
import org.apache.ws.security.util.Base64;
@@ -255,7 +255,7 @@ public class UTDerivedKeyTest extends or
verify(encryptedDoc);
fail("Failure expected on a bad derived encryption");
} catch (WSSecurityException ex) {
- assertTrue(ex.getErrorCode() == WSSecurityException.FAILED_CHECK);
+ assertTrue(ex.getErrorCode() == WSSecurityException.ErrorCode.FAILED_CHECK);
// expected
}
}
@@ -306,7 +306,7 @@ public class UTDerivedKeyTest extends or
verify(encryptedDoc);
fail("Failure expected on a bad derived encryption");
} catch (WSSecurityException ex) {
- assertTrue(ex.getErrorCode() == WSSecurityException.FAILED_AUTHENTICATION);
+ assertTrue(ex.getErrorCode() == WSSecurityException.ErrorCode.FAILED_AUTHENTICATION);
// expected
}
}
@@ -457,7 +457,7 @@ public class UTDerivedKeyTest extends or
verify(signedDoc);
fail("Failure expected on a bad derived signature");
} catch (WSSecurityException ex) {
- assertTrue(ex.getErrorCode() == WSSecurityException.FAILED_CHECK);
+ assertTrue(ex.getErrorCode() == WSSecurityException.ErrorCode.FAILED_CHECK);
// expected
}
}
@@ -503,7 +503,7 @@ public class UTDerivedKeyTest extends or
verify(signedDoc);
fail("Failure expected on a bad derived signature");
} catch (WSSecurityException ex) {
- assertTrue(ex.getErrorCode() == WSSecurityException.FAILED_AUTHENTICATION);
+ assertTrue(ex.getErrorCode() == WSSecurityException.ErrorCode.FAILED_AUTHENTICATION);
// expected
}
}
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/UTSignatureTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/UTSignatureTest.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/UTSignatureTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/UTSignatureTest.java Fri Aug 17 15:40:59 2012
@@ -22,13 +22,13 @@ package org.apache.ws.security.message;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngineResult;
-import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.common.CustomHandler;
import org.apache.ws.security.common.SOAPUtil;
import org.apache.ws.security.common.UsernamePasswordCallbackHandler;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoFactory;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoFactory;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.handler.WSHandlerConstants;
import org.apache.ws.security.util.WSSecurityUtil;
@@ -135,7 +135,7 @@ public class UTSignatureTest extends org
verify(signedDoc);
fail("Failure expected on a bad derived signature");
} catch (WSSecurityException ex) {
- assertTrue(ex.getErrorCode() == WSSecurityException.FAILED_AUTHENTICATION);
+ assertTrue(ex.getErrorCode() == WSSecurityException.ErrorCode.FAILED_AUTHENTICATION);
// expected
}
}
Modified: webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/UsernameTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/UsernameTokenTest.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/UsernameTokenTest.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/UsernameTokenTest.java Fri Aug 17 15:40:59 2012
@@ -20,8 +20,6 @@
package org.apache.ws.security.message;
import org.apache.ws.security.WSSecurityEngineResult;
-import org.apache.ws.security.WSSecurityException;
-import org.apache.ws.security.WSPasswordCallback;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSConfig;
@@ -29,6 +27,8 @@ import org.apache.ws.security.common.Cus
import org.apache.ws.security.common.EncodedPasswordCallbackHandler;
import org.apache.ws.security.common.UsernamePasswordCallbackHandler;
import org.apache.ws.security.common.SOAPUtil;
+import org.apache.ws.security.common.ext.WSPasswordCallback;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.handler.WSHandlerConstants;
import org.apache.ws.security.message.token.UsernameToken;
@@ -208,7 +208,7 @@ public class UsernameTokenTest extends o
} catch (WSSecurityException ex) {
String message = ex.getMessage();
assertTrue(message.indexOf("badusername") == -1);
- assertTrue(ex.getErrorCode() == WSSecurityException.FAILED_AUTHENTICATION);
+ assertTrue(ex.getErrorCode() == WSSecurityException.ErrorCode.FAILED_AUTHENTICATION);
// expected
}
}
@@ -237,7 +237,7 @@ public class UsernameTokenTest extends o
verify(signedDoc);
fail("Failure expected on a bad password digest");
} catch (WSSecurityException ex) {
- assertTrue(ex.getErrorCode() == WSSecurityException.FAILED_AUTHENTICATION);
+ assertTrue(ex.getErrorCode() == WSSecurityException.ErrorCode.FAILED_AUTHENTICATION);
// expected
}
}
@@ -328,7 +328,7 @@ public class UsernameTokenTest extends o
verify(signedDoc);
fail("Failure expected on a bad password text");
} catch (WSSecurityException ex) {
- assertTrue(ex.getErrorCode() == WSSecurityException.FAILED_AUTHENTICATION);
+ assertTrue(ex.getErrorCode() == WSSecurityException.ErrorCode.FAILED_AUTHENTICATION);
// expected
}
}
@@ -379,7 +379,7 @@ public class UsernameTokenTest extends o
verify(doc);
fail("Failure expected on no password");
} catch (WSSecurityException ex) {
- assertTrue(ex.getErrorCode() == WSSecurityException.FAILED_AUTHENTICATION);
+ assertTrue(ex.getErrorCode() == WSSecurityException.ErrorCode.FAILED_AUTHENTICATION);
// expected
}
}
@@ -473,7 +473,7 @@ public class UsernameTokenTest extends o
secEngine.processSecurityHeader(signedDoc, null, this, null);
fail("Custom token types are not permitted");
} catch (WSSecurityException ex) {
- assertTrue(ex.getErrorCode() == WSSecurityException.FAILED_AUTHENTICATION);
+ assertTrue(ex.getErrorCode() == WSSecurityException.ErrorCode.FAILED_AUTHENTICATION);
// expected
}
}
@@ -554,7 +554,7 @@ public class UsernameTokenTest extends o
verify(utDoc);
fail("Expected failure due to a bad password");
} catch (WSSecurityException ex) {
- assertTrue(ex.getErrorCode() == WSSecurityException.FAILED_AUTHENTICATION);
+ assertTrue(ex.getErrorCode() == WSSecurityException.ErrorCode.FAILED_AUTHENTICATION);
// expected
}
}
@@ -597,7 +597,7 @@ public class UsernameTokenTest extends o
verify(utDoc);
fail("Expected failure due to a bad password");
} catch (WSSecurityException ex) {
- assertTrue(ex.getErrorCode() == WSSecurityException.FAILED_AUTHENTICATION);
+ assertTrue(ex.getErrorCode() == WSSecurityException.ErrorCode.FAILED_AUTHENTICATION);
// expected
}
}
@@ -889,7 +889,7 @@ public class UsernameTokenTest extends o
for (int i = 0; i < callbacks.length; i++) {
if (callbacks[i] instanceof WSPasswordCallback) {
WSPasswordCallback pc = (WSPasswordCallback) callbacks[i];
- if (pc.getUsage() == WSPasswordCallback.USERNAME_TOKEN) {
+ if (pc.getUsage() == WSPasswordCallback.Usage.USERNAME_TOKEN) {
if ("emptyuser".equals(pc.getIdentifier())) {
pc.setPassword("");
} else if ("customUser".equals(pc.getIdentifier())) {