cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [1/3] cxf git commit: Fixing WS-Addressing + WS-Security test
Date Thu, 02 Feb 2017 11:47:52 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 3f57636a4 -> 211a8fb43


Fixing WS-Addressing + WS-Security test


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

Branch: refs/heads/3.1.x-fixes
Commit: ec7484e1af89f822eee103e24916ca560a7c5756
Parents: 3f57636
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Thu Feb 2 11:05:27 2017 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Thu Feb 2 11:06:29 2017 +0000

----------------------------------------------------------------------
 .../policyvalidators/AbstractSupportingTokenPolicyValidator.java | 3 ++-
 .../wss4j/policyvalidators/SecuredPartsPolicyValidator.java      | 4 ++--
 .../test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java  | 1 -
 3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/ec7484e1/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java
index 3e79904..fcc5c8f 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java
@@ -58,6 +58,7 @@ import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
 import org.apache.wss4j.dom.handler.WSHandlerResult;
 import org.apache.wss4j.dom.message.token.KerberosSecurity;
 import org.apache.wss4j.policy.SPConstants;
+import org.apache.wss4j.policy.model.AbstractSecuredParts;
 import org.apache.wss4j.policy.model.AbstractSecurityAssertion;
 import org.apache.wss4j.policy.model.EncryptedElements;
 import org.apache.wss4j.policy.model.EncryptedParts;
@@ -611,7 +612,7 @@ public abstract class AbstractSupportingTokenPolicyValidator extends AbstractSec
      * Validate the SignedParts or EncryptedParts policies
      */
     private boolean validateSignedEncryptedParts(
-        SignedParts parts,
+        AbstractSecuredParts parts,
         boolean content,
         List<WSSecurityEngineResult> protResults,
         List<WSSecurityEngineResult> tokenResults,

http://git-wip-us.apache.org/repos/asf/cxf/blob/ec7484e1/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecuredPartsPolicyValidator.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecuredPartsPolicyValidator.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecuredPartsPolicyValidator.java
index a9a0346..523a9bf 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecuredPartsPolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecuredPartsPolicyValidator.java
@@ -35,9 +35,9 @@ import org.apache.wss4j.dom.WSDataRef;
 import org.apache.wss4j.policy.SP11Constants;
 import org.apache.wss4j.policy.SP12Constants;
 import org.apache.wss4j.policy.SPConstants;
+import org.apache.wss4j.policy.model.AbstractSecuredParts;
 import org.apache.wss4j.policy.model.Attachments;
 import org.apache.wss4j.policy.model.Header;
-import org.apache.wss4j.policy.model.SignedParts;
 
 /**
  * Validate either a SignedParts or EncryptedParts policy
@@ -86,7 +86,7 @@ public class SecuredPartsPolicyValidator implements SecurityPolicyValidator
{
                 // they are a child of a SupportingToken
                 continue;
             }
-            SignedParts p = (SignedParts)ai.getAssertion();
+            AbstractSecuredParts p = (AbstractSecuredParts)ai.getAssertion();
             ai.setAsserted(true);
             
             if (p.isBody()) {

http://git-wip-us.apache.org/repos/asf/cxf/blob/ec7484e1/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
index a958d3b..f902fe6 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
@@ -1572,7 +1572,6 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
     }
     
     @org.junit.Test
-    @org.junit.Ignore
     public void testSymmetricWithOptionalAddressing() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();


Mime
View raw message