Finishing backport # Conflicts: # systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/MGF256AlgorithmSuiteLoader.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/21fa4139 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/21fa4139 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/21fa4139 Branch: refs/heads/3.0.x-fixes Commit: 21fa41390dfb58655e5f32acd929fc85b402426c Parents: 2e2351a Author: Colm O hEigeartaigh <[email protected]> Authored: Mon Mar 14 16:40:40 2016 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Mon Mar 14 16:48:30 2016 +0000 ---------------------------------------------------------------------- .../org/apache/cxf/systest/ws/fault/ModifiedRequestTest.java | 4 ++-- .../cxf/systest/ws/wssec11/RestrictedAlgorithmSuiteLoader.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/21fa4139/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 af38d6e..5d9d541 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 @@ -317,9 +317,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/21fa4139/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); } }
