You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2015/05/27 12:18:26 UTC
cxf git commit: Picking up WSS4J 2.0.5-SNAPSHOT
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes c175b954a -> ffc599764
Picking up WSS4J 2.0.5-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ffc59976
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ffc59976
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ffc59976
Branch: refs/heads/3.0.x-fixes
Commit: ffc599764b94bab2c053915fd884e2c49a998a71
Parents: c175b95
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed May 27 11:18:14 2015 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed May 27 11:18:14 2015 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
.../java/org/apache/cxf/rs/security/xml/EncryptionUtils.java | 8 ++++----
.../org/apache/cxf/rs/security/xml/XmlEncOutInterceptor.java | 8 ++++----
.../org/apache/cxf/ws/security/trust/AbstractSTSClient.java | 2 +-
.../apache/cxf/ws/security/trust/STSStaxTokenValidator.java | 4 ++--
.../org/apache/cxf/ws/security/trust/STSTokenValidator.java | 4 ++--
.../apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java | 2 +-
7 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/ffc59976/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 0836a68..710973c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -160,7 +160,7 @@
<cxf.woodstox.core.version>4.4.1</cxf.woodstox.core.version>
<cxf.woodstox.stax2-api.version>3.1.4</cxf.woodstox.stax2-api.version>
<cxf.wsdl4j.version>1.6.3</cxf.wsdl4j.version>
- <cxf.wss4j.version>2.0.4</cxf.wss4j.version>
+ <cxf.wss4j.version>2.0.5-SNAPSHOT</cxf.wss4j.version>
<cxf.xerces.version>2.11.0</cxf.xerces.version>
<cxf.xmlbeans.version>2.6.0</cxf.xmlbeans.version>
<cxf.xmlschema.version>2.2.1</cxf.xmlschema.version>
http://git-wip-us.apache.org/repos/asf/cxf/blob/ffc59976/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/EncryptionUtils.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/EncryptionUtils.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/EncryptionUtils.java
index 94c9590..0878515 100644
--- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/EncryptionUtils.java
+++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/EncryptionUtils.java
@@ -64,11 +64,11 @@ public final class EncryptionUtils {
}
} catch (InvalidKeyException e) {
throw new WSSecurityException(
- WSSecurityException.ErrorCode.FAILED_ENCRYPTION, null, null, e
+ WSSecurityException.ErrorCode.FAILED_ENCRYPTION, e
);
} catch (InvalidAlgorithmParameterException e) {
throw new WSSecurityException(
- WSSecurityException.ErrorCode.FAILED_ENCRYPTION, null, null, e
+ WSSecurityException.ErrorCode.FAILED_ENCRYPTION, e
);
}
return cipher;
@@ -94,11 +94,11 @@ public final class EncryptionUtils {
}
} catch (InvalidKeyException e) {
throw new WSSecurityException(
- WSSecurityException.ErrorCode.FAILED_ENCRYPTION, null, null, e
+ WSSecurityException.ErrorCode.FAILED_ENCRYPTION, e
);
} catch (InvalidAlgorithmParameterException e) {
throw new WSSecurityException(
- WSSecurityException.ErrorCode.FAILED_ENCRYPTION, null, null, e
+ WSSecurityException.ErrorCode.FAILED_ENCRYPTION, e
);
}
return cipher;
http://git-wip-us.apache.org/repos/asf/cxf/blob/ffc59976/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlEncOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlEncOutInterceptor.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlEncOutInterceptor.java
index 6635c3d..568b1ef 100644
--- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlEncOutInterceptor.java
+++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlEncOutInterceptor.java
@@ -229,15 +229,15 @@ public class XmlEncOutInterceptor extends AbstractXmlSecOutInterceptor {
encryptedEphemeralKey = cipher.doFinal(keyBytes);
} catch (IllegalStateException ex) {
throw new WSSecurityException(
- WSSecurityException.ErrorCode.FAILED_ENCRYPTION, null, null, ex
+ WSSecurityException.ErrorCode.FAILED_ENCRYPTION, ex
);
} catch (IllegalBlockSizeException ex) {
throw new WSSecurityException(
- WSSecurityException.ErrorCode.FAILED_ENCRYPTION, null, null, ex
+ WSSecurityException.ErrorCode.FAILED_ENCRYPTION, ex
);
} catch (BadPaddingException ex) {
throw new WSSecurityException(
- WSSecurityException.ErrorCode.FAILED_ENCRYPTION, null, null, ex
+ WSSecurityException.ErrorCode.FAILED_ENCRYPTION, ex
);
}
@@ -307,7 +307,7 @@ public class XmlEncOutInterceptor extends AbstractXmlSecOutInterceptor {
data = remoteCert.getEncoded();
} catch (CertificateEncodingException e) {
throw new WSSecurityException(
- WSSecurityException.ErrorCode.SECURITY_TOKEN_UNAVAILABLE, "encodeError", e
+ WSSecurityException.ErrorCode.SECURITY_TOKEN_UNAVAILABLE, e, "encodeError"
);
}
Text text = encryptedDataDoc.createTextNode(Base64.encode(data));
http://git-wip-us.apache.org/repos/asf/cxf/blob/ffc59976/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
----------------------------------------------------------------------
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 f7bb885..02695eb 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
@@ -124,8 +124,8 @@ import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.message.token.BinarySecurity;
import org.apache.wss4j.dom.message.token.Reference;
import org.apache.wss4j.dom.processor.EncryptedKeyProcessor;
-import org.apache.wss4j.dom.processor.X509Util;
import org.apache.wss4j.dom.util.WSSecurityUtil;
+import org.apache.wss4j.dom.util.X509Util;
import org.apache.wss4j.dom.util.XmlSchemaDateFormat;
import org.apache.wss4j.policy.SPConstants;
import org.apache.wss4j.policy.SPConstants.SPVersion;
http://git-wip-us.apache.org/repos/asf/cxf/blob/ffc59976/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSStaxTokenValidator.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSStaxTokenValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSStaxTokenValidator.java
index b2d3844..f454ffb 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSStaxTokenValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSStaxTokenValidator.java
@@ -417,7 +417,7 @@ public class STSStaxTokenValidator
) {
throw new WSSecurityException(
WSSecurityException.ErrorCode.INVALID_SECURITY_TOKEN, "badEncoding",
- binarySecurityTokenType.getEncodingType());
+ new Object[] {binarySecurityTokenType.getEncodingType()});
}
final byte[] securityTokenData = Base64.decodeBase64(binarySecurityTokenType.getValue());
@@ -522,7 +522,7 @@ public class STSStaxTokenValidator
} else {
throw new WSSecurityException(
WSSecurityException.ErrorCode.INVALID_SECURITY_TOKEN, "invalidValueType",
- binarySecurityTokenType.getValueType());
+ new Object[] {binarySecurityTokenType.getValueType()});
}
} catch (XMLSecurityException e) {
throw new WSSecurityException(WSSecurityException.ErrorCode.INVALID_SECURITY_TOKEN, e);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ffc59976/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSTokenValidator.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSTokenValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSTokenValidator.java
index 2a76672..6f6b0c7 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSTokenValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/STSTokenValidator.java
@@ -167,7 +167,7 @@ public class STSTokenValidator implements Validator {
} catch (RuntimeException e) {
throw e;
} catch (Exception e) {
- throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "invalidSAMLsecurity", e);
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, e, "invalidSAMLsecurity");
}
}
@@ -206,7 +206,7 @@ public class STSTokenValidator implements Validator {
} catch (RuntimeException e) {
throw e;
} catch (Exception e) {
- throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "invalidSAMLsecurity", e);
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, e, "invalidSAMLsecurity");
}
}
return false;
http://git-wip-us.apache.org/repos/asf/cxf/blob/ffc59976/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java
index b21fb8e..28bc615 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java
@@ -103,8 +103,8 @@ import org.apache.wss4j.dom.handler.RequestData;
import org.apache.wss4j.dom.message.token.BinarySecurity;
import org.apache.wss4j.dom.message.token.Reference;
import org.apache.wss4j.dom.processor.EncryptedKeyProcessor;
-import org.apache.wss4j.dom.processor.X509Util;
import org.apache.wss4j.dom.util.WSSecurityUtil;
+import org.apache.wss4j.dom.util.X509Util;
import org.apache.wss4j.dom.util.XmlSchemaDateFormat;
import org.apache.wss4j.policy.model.AbstractBinding;
import org.apache.wss4j.policy.model.AlgorithmSuite;