cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [1/2] cxf git commit: Fixing build following WSS4J changes
Date Fri, 19 Jun 2015 11:29:09 GMT
Repository: cxf
Updated Branches:
  refs/heads/master e25a917dd -> 99f4092de


Fixing build following WSS4J changes


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

Branch: refs/heads/master
Commit: 99f4092de01d60b8369ff84036d543e9d20ecefc
Parents: ff95690
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Fri Jun 19 12:28:51 2015 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Fri Jun 19 12:29:05 2015 +0100

----------------------------------------------------------------------
 .../cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java    | 4 ++--
 .../java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/99f4092d/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
index 8bc0849..342ba5a 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
@@ -137,10 +137,10 @@ public class PolicyBasedWSS4JOutInterceptor extends AbstractPhaseInterceptor<Soa
             }
 
             if (binding != null) {
-                WSSecHeader secHeader = new WSSecHeader(actor, mustUnderstand);
+                WSSecHeader secHeader = new WSSecHeader(actor, mustUnderstand, saaj.getSOAPPart());
                 Element el = null;
                 try {
-                    el = secHeader.insertSecurityHeader(saaj.getSOAPPart());
+                    el = secHeader.insertSecurityHeader();
                 } catch (WSSecurityException e) {
                     throw new SoapFault(
                         new Message("SECURITY_FAILED", LOG), e, message.getVersion().getSender()

http://git-wip-us.apache.org/repos/asf/cxf/blob/99f4092d/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java
index 82d650a..75ae9f6 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java
@@ -189,7 +189,7 @@ public class SAMLTokenRenewer extends AbstractSAMLTokenProvider implements
Token
             // Validate the Assertion
             validateAssertion(assertion, tokenToRenew, cachedToken, tokenParameters);
             
-            SamlAssertionWrapper renewedAssertion = new SamlAssertionWrapper(assertion.getXmlObject());
+            SamlAssertionWrapper renewedAssertion = new SamlAssertionWrapper(assertion.getSamlObject());
             String oldId = createNewId(renewedAssertion);
             // Remove the previous token (now expired) from the cache
             tokenStore.remove(oldId);


Mime
View raw message