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 2016/01/07 17:50:13 UTC
cxf git commit: Updating to use WSS4J SNAPSHOT
Repository: cxf
Updated Branches:
refs/heads/master e35cfb946 -> 8a4e85b24
Updating to use WSS4J SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8a4e85b2
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8a4e85b2
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8a4e85b2
Branch: refs/heads/master
Commit: 8a4e85b24d6d5b438ceb28257c53773d46b5816d
Parents: e35cfb9
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Jan 7 16:49:30 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Jan 7 16:49:56 2016 +0000
----------------------------------------------------------------------
parent/pom.xml | 4 ++--
.../policy/custom/DefaultAlgorithmSuiteLoader.java | 12 ++++++------
.../cxf/xkms/crypto/provider/XkmsCryptoProvider.java | 7 +++++++
.../java/org/apache/cxf/systest/ws/fault/FaultTest.java | 2 --
.../cxf/systest/ws/fault/ModifiedRequestTest.java | 4 ++--
.../cxf/systest/ws/gcm/MGF256AlgorithmSuiteLoader.java | 6 +++---
.../ws/wssec11/RestrictedAlgorithmSuiteLoader.java | 6 +++---
7 files changed, 23 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/8a4e85b2/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 925b08f..b92e77e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -82,7 +82,7 @@
<cxf.commons-lang3.version>3.4</cxf.commons-lang3.version>
<cxf.derby.version>10.2.2.0</cxf.derby.version>
<cxf.dropwizard.version>3.1.2</cxf.dropwizard.version>
- <cxf.ehcache.version>2.9.0</cxf.ehcache.version>
+ <cxf.ehcache.version>2.10.1</cxf.ehcache.version>
<cxf.fastinfoset.bundle.version>1.2.13_1</cxf.fastinfoset.bundle.version>
<cxf.guava.version>18.0</cxf.guava.version>
<cxf.hazelcast.version>1.9.4</cxf.hazelcast.version>
@@ -151,7 +151,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.1.4</cxf.wss4j.version>
+ <cxf.wss4j.version>2.2.0-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/8a4e85b2/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/custom/DefaultAlgorithmSuiteLoader.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/custom/DefaultAlgorithmSuiteLoader.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/custom/DefaultAlgorithmSuiteLoader.java
index d7cea7b..15b3959 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/custom/DefaultAlgorithmSuiteLoader.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/custom/DefaultAlgorithmSuiteLoader.java
@@ -71,7 +71,7 @@ public class DefaultAlgorithmSuiteLoader implements AlgorithmSuiteLoader {
public static class GCMAlgorithmSuite extends AlgorithmSuite {
static {
- algorithmSuiteTypes.put(
+ ALGORITHM_SUITE_TYPES.put(
"Basic128GCM",
new AlgorithmSuiteType(
"Basic128GCM",
@@ -85,7 +85,7 @@ public class DefaultAlgorithmSuiteLoader implements AlgorithmSuiteLoader {
)
);
- algorithmSuiteTypes.put(
+ ALGORITHM_SUITE_TYPES.put(
"Basic192GCM",
new AlgorithmSuiteType(
"Basic192GCM",
@@ -99,7 +99,7 @@ public class DefaultAlgorithmSuiteLoader implements AlgorithmSuiteLoader {
)
);
- algorithmSuiteTypes.put(
+ ALGORITHM_SUITE_TYPES.put(
"Basic256GCM",
new AlgorithmSuiteType(
"Basic256GCM",
@@ -132,13 +132,13 @@ public class DefaultAlgorithmSuiteLoader implements AlgorithmSuiteLoader {
}
if ("Basic128GCM".equals(assertionName)) {
- setAlgorithmSuiteType(algorithmSuiteTypes.get("Basic128GCM"));
+ setAlgorithmSuiteType(ALGORITHM_SUITE_TYPES.get("Basic128GCM"));
getAlgorithmSuiteType().setNamespace(assertionNamespace);
} else if ("Basic192GCM".equals(assertionName)) {
- setAlgorithmSuiteType(algorithmSuiteTypes.get("Basic192GCM"));
+ setAlgorithmSuiteType(ALGORITHM_SUITE_TYPES.get("Basic192GCM"));
getAlgorithmSuiteType().setNamespace(assertionNamespace);
} else if ("Basic256GCM".equals(assertionName)) {
- setAlgorithmSuiteType(algorithmSuiteTypes.get("Basic256GCM"));
+ setAlgorithmSuiteType(ALGORITHM_SUITE_TYPES.get("Basic256GCM"));
getAlgorithmSuiteType().setNamespace(assertionNamespace);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8a4e85b2/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/XkmsCryptoProvider.java
----------------------------------------------------------------------
diff --git a/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/XkmsCryptoProvider.java b/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/XkmsCryptoProvider.java
index cad78bc..cb6dadd 100644
--- a/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/XkmsCryptoProvider.java
+++ b/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/XkmsCryptoProvider.java
@@ -107,6 +107,13 @@ public class XkmsCryptoProvider extends CryptoBase {
}
@Override
+ public PrivateKey getPrivateKey(PublicKey publicKey, CallbackHandler callbackHandler)
+ throws WSSecurityException {
+ assertDefaultCryptoProvider();
+ return fallbackCrypto.getPrivateKey(publicKey, callbackHandler);
+ }
+
+ @Override
public PrivateKey getPrivateKey(String identifier, String password) throws WSSecurityException {
assertDefaultCryptoProvider();
return fallbackCrypto.getPrivateKey(identifier, password);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8a4e85b2/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
index 9a27fc5..1e18f29 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java
@@ -135,9 +135,7 @@ public class FaultTest extends AbstractBusClientServerTestBase {
bus.shutdown(true);
}
- // TODO
@org.junit.Test
- @org.junit.Ignore
public void testSoap12Mtom() throws Exception {
SpringBusFactory bf = new SpringBusFactory();
URL busFile = FaultTest.class.getResource("client.xml");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8a4e85b2/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/ModifiedRequestTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/ModifiedRequestTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/ModifiedRequestTest.java
index e569a62..4e1cf50 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/ModifiedRequestTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/ModifiedRequestTest.java
@@ -316,9 +316,9 @@ public class ModifiedRequestTest extends AbstractBusClientServerTestBase {
DateFormat zulu = new XmlSchemaDateFormat();
XMLGregorianCalendar createdCalendar =
- WSSConfig.datatypeFactory.newXMLGregorianCalendar(createdValue.getTextContent());
+ WSSConfig.DATATYPE_FACTORY.newXMLGregorianCalendar(createdValue.getTextContent());
// Add 5 seconds
- Duration duration = WSSConfig.datatypeFactory.newDuration(5000L);
+ Duration duration = WSSConfig.DATATYPE_FACTORY.newDuration(5000L);
createdCalendar.add(duration);
Date createdDate = createdCalendar.toGregorianCalendar().getTime();
createdValue.setTextContent(zulu.format(createdDate));
http://git-wip-us.apache.org/repos/asf/cxf/blob/8a4e85b2/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/MGF256AlgorithmSuiteLoader.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/MGF256AlgorithmSuiteLoader.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/MGF256AlgorithmSuiteLoader.java
index 9e64b4c..6b05a2a 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/MGF256AlgorithmSuiteLoader.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/MGF256AlgorithmSuiteLoader.java
@@ -73,7 +73,7 @@ public class MGF256AlgorithmSuiteLoader implements AlgorithmSuiteLoader {
public static class GCMAlgorithmSuite extends AlgorithmSuite {
static {
- algorithmSuiteTypes.put(
+ ALGORITHM_SUITE_TYPES.put(
"Basic256GCMMGFSHA256",
new AlgorithmSuiteType(
"Basic256GCMMGFSHA256",
@@ -86,7 +86,7 @@ public class MGF256AlgorithmSuiteLoader implements AlgorithmSuiteLoader {
256, 192, 256, 256, 1024, 4096
)
);
- algorithmSuiteTypes.get("Basic256GCMMGFSHA256").setMGFAlgo(WSConstants.MGF_SHA256);
+ ALGORITHM_SUITE_TYPES.get("Basic256GCMMGFSHA256").setMGFAlgo(WSConstants.MGF_SHA256);
}
GCMAlgorithmSuite(SPConstants.SPVersion version, Policy nestedPolicy) {
@@ -107,7 +107,7 @@ public class MGF256AlgorithmSuiteLoader implements AlgorithmSuiteLoader {
}
if ("Basic256GCMMGFSHA256".equals(assertionName)) {
- setAlgorithmSuiteType(algorithmSuiteTypes.get("Basic256GCMMGFSHA256"));
+ setAlgorithmSuiteType(ALGORITHM_SUITE_TYPES.get("Basic256GCMMGFSHA256"));
getAlgorithmSuiteType().setNamespace(assertionNamespace);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8a4e85b2/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/RestrictedAlgorithmSuiteLoader.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/RestrictedAlgorithmSuiteLoader.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/RestrictedAlgorithmSuiteLoader.java
index 157d4e9..2c734d5 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/RestrictedAlgorithmSuiteLoader.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/RestrictedAlgorithmSuiteLoader.java
@@ -43,8 +43,8 @@ public class RestrictedAlgorithmSuiteLoader implements AlgorithmSuiteLoader {
CustomAlgorithmSuite(SPConstants.SPVersion version, Policy nestedPolicy) {
super(version, nestedPolicy);
- for (String key : algorithmSuiteTypes.keySet()) {
- AlgorithmSuiteType algSuite = algorithmSuiteTypes.get(key);
+ for (String key : ALGORITHM_SUITE_TYPES.keySet()) {
+ AlgorithmSuiteType algSuite = ALGORITHM_SUITE_TYPES.get(key);
AlgorithmSuiteType newAlgSuite =
new AlgorithmSuiteType(algSuite.getName(), algSuite.getDigest(),
algSuite.getEncryption(), algSuite.getSymmetricKeyWrap(),
@@ -55,7 +55,7 @@ public class RestrictedAlgorithmSuiteLoader implements AlgorithmSuiteLoader {
algSuite.getMinimumSymmetricKeyLength(),
algSuite.getMaximumSymmetricKeyLength(), 512,
algSuite.getMaximumAsymmetricKeyLength());
- algorithmSuiteTypes.put(key, newAlgSuite);
+ ALGORITHM_SUITE_TYPES.put(key, newAlgSuite);
}
}