Finishing backport
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/69c28ad3 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/69c28ad3 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/69c28ad3 Branch: refs/heads/3.1.x-fixes Commit: 69c28ad3faee6e0ef5b341460bbea224a3f6c3a2 Parents: ff99505 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:40:40 2016 +0000 ---------------------------------------------------------------------- .../org/apache/cxf/systest/ws/fault/ModifiedRequestTest.java | 4 ++-- .../cxf/systest/ws/gcm/MGF256AlgorithmSuiteLoader.java | 8 ++++---- .../systest/ws/wssec11/RestrictedAlgorithmSuiteLoader.java | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/69c28ad3/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/69c28ad3/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..434b760 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,20 +73,20 @@ public class MGF256AlgorithmSuiteLoader implements AlgorithmSuiteLoader { public static class GCMAlgorithmSuite extends AlgorithmSuite { static { - algorithmSuiteTypes.put( + ALGORITHM_SUITE_TYPES.put( "Basic256GCMMGFSHA256", new AlgorithmSuiteType( "Basic256GCMMGFSHA256", SPConstants.SHA1, "http://www.w3.org/2009/xmlenc11#aes256-gcm";, SPConstants.KW_AES256, - WSConstants.KEYTRANSPORT_RSAOEP_XENC11, + WSConstants.KEYTRANSPORT_RSAOAEP_XENC11, SPConstants.P_SHA1_L256, SPConstants.P_SHA1_L192, 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/69c28ad3/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); } }
