cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [2/5] cxf git commit: Revert "Finishing backport"
Date Mon, 14 Mar 2016 17:06:25 GMT
Revert "Finishing backport"

This reverts commit 21fa41390dfb58655e5f32acd929fc85b402426c.


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/45f56285
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/45f56285
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/45f56285

Branch: refs/heads/3.0.x-fixes
Commit: 45f562858a9c294739448fbb14019448245b8d5a
Parents: ad8c918
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Mon Mar 14 17:06:02 2016 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Mon Mar 14 17:06:02 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/45f56285/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 5d9d541..af38d6e 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.DATATYPE_FACTORY.newXMLGregorianCalendar(createdValue.getTextContent());
+                    WSSConfig.datatypeFactory.newXMLGregorianCalendar(createdValue.getTextContent());
                 // Add 5 seconds
-                Duration duration = WSSConfig.DATATYPE_FACTORY.newDuration(5000L);
+                Duration duration = WSSConfig.datatypeFactory.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/45f56285/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 2c734d5..157d4e9 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 : ALGORITHM_SUITE_TYPES.keySet()) {
-                AlgorithmSuiteType algSuite = ALGORITHM_SUITE_TYPES.get(key);
+            for (String key : algorithmSuiteTypes.keySet()) {
+                AlgorithmSuiteType algSuite = algorithmSuiteTypes.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());
-                ALGORITHM_SUITE_TYPES.put(key, newAlgSuite);
+                algorithmSuiteTypes.put(key, newAlgSuite);
             }
         }
 


Mime
View raw message