cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [3/3] cxf git commit: Fix backmerge + Ignore test until we pick up WSS4J 2.0.4
Date Tue, 07 Apr 2015 10:05:49 GMT
Fix backmerge + Ignore test until we pick up WSS4J 2.0.4


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

Branch: refs/heads/3.0.x-fixes
Commit: 35747417a61fb60cb5db70e631e82f13f5e02f20
Parents: 6b1feed
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Tue Apr 7 11:05:12 2015 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Tue Apr 7 11:05:12 2015 +0100

----------------------------------------------------------------------
 .../wss4j/policyvalidators/AlgorithmSuitePolicyValidator.java | 7 +------
 .../apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java    | 4 +++-
 2 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/35747417/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AlgorithmSuitePolicyValidator.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AlgorithmSuitePolicyValidator.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AlgorithmSuitePolicyValidator.java
index 7bdeb0f..c405233 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AlgorithmSuitePolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AlgorithmSuitePolicyValidator.java
@@ -34,11 +34,7 @@ import org.w3c.dom.Element;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.ws.policy.AssertionInfo;
-<<<<<<< HEAD
 import org.apache.cxf.ws.policy.AssertionInfoMap;
-=======
-import org.apache.cxf.ws.security.policy.PolicyUtils;
->>>>>>> dbc4a26... [CXF-6333] - Support Inclusive C14N via security
policy
 import org.apache.wss4j.common.principal.WSDerivedKeyTokenPrincipal;
 import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.WSDataRef;
@@ -90,8 +86,7 @@ public class AlgorithmSuitePolicyValidator extends AbstractTokenPolicyValidator
                     }
                 }
                 
-                PolicyUtils.assertPolicy(parameters.getAssertionInfoMap(), 
-                                         new QName(algorithmSuite.getName().getNamespaceURI(),

+                assertPolicy(aim, new QName(algorithmSuite.getName().getNamespaceURI(), 
                                                    algorithmSuite.getC14n().name()));
             } else if (!valid && ai.isAsserted()) {
                 ai.setNotAsserted("Error in validating AlgorithmSuite policy");

http://git-wip-us.apache.org/repos/asf/cxf/blob/35747417/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java
index 1580c22..527fc8d 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java
@@ -258,7 +258,9 @@ public class AlgorithmSuiteTest extends AbstractBusClientServerTestBase
{
         bus.shutdown(true);
     }
     
+    // TODO Unignore when we pick up WSS4J 2.0.4
     @org.junit.Test
+    @org.junit.Ignore
     public void testInclusiveC14NPolicy() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
@@ -310,4 +312,4 @@ public class AlgorithmSuiteTest extends AbstractBusClientServerTestBase
{
         bus.shutdown(true);
     }
     
-}
\ No newline at end of file
+}


Mime
View raw message