Fixing build
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/46d84ce1 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/46d84ce1 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/46d84ce1 Branch: refs/heads/2.7.x-fixes Commit: 46d84ce19914ff75e99fc2a06757fc324441d0c9 Parents: 971527e Author: Colm O hEigeartaigh <[email protected]> Authored: Mon May 19 12:00:41 2014 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Mon May 19 12:00:41 2014 +0100 ---------------------------------------------------------------------- .../policyhandlers/AbstractBindingBuilder.java | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/46d84ce1/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java index 35c678a..d8edb4b 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java @@ -1577,17 +1577,13 @@ public abstract class AbstractBindingBuilder { policyAsserted(wrapper); if (!tokenTypeSet) { -<<<<<<< HEAD - if (token.getInclusion() == SPConstants.IncludeTokenType.INCLUDE_TOKEN_NEVER) { -======= boolean requestor = isRequestor(); - if (token.getIncludeTokenType() == IncludeTokenType.INCLUDE_TOKEN_NEVER + if (token.getInclusion() == SPConstants.IncludeTokenType.INCLUDE_TOKEN_NEVER || token instanceof X509Token - && ((token.getIncludeTokenType() == IncludeTokenType.INCLUDE_TOKEN_ALWAYS_TO_RECIPIENT + && ((token.getInclusion() == SPConstants.IncludeTokenType.INCLUDE_TOKEN_ALWAYS_TO_RECIPIENT && !requestor) - || (token.getIncludeTokenType() == IncludeTokenType.INCLUDE_TOKEN_ALWAYS_TO_INITIATOR + || (token.getInclusion() == SPConstants.IncludeTokenType.INCLUDE_TOKEN_ALWAYS_TO_INITIATOR && requestor))) { ->>>>>>> 1091ca3... Minor changes to how tokens are referenced Wss10 wss = getWss10(); policyAsserted(wss); if (wss == null || wss.isMustSupportRefKeyIdentifier()) { @@ -1599,15 +1595,6 @@ public abstract class AbstractBindingBuilder { } else { secBase.setKeyIdentifierType(WSConstants.ISSUER_SERIAL); } -<<<<<<< HEAD - } else if (token.getInclusion() == SPConstants.IncludeTokenType.INCLUDE_TOKEN_ALWAYS_TO_RECIPIENT - && !isRequestor() && token instanceof X509Token) { - secBase.setKeyIdentifierType(WSConstants.ISSUER_SERIAL); - } else if (token.getInclusion() == SPConstants.IncludeTokenType.INCLUDE_TOKEN_ALWAYS_TO_INITIATOR - && isRequestor() && token instanceof X509Token) { - secBase.setKeyIdentifierType(WSConstants.ISSUER_SERIAL); -======= ->>>>>>> 1091ca3... Minor changes to how tokens are referenced } else { secBase.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE); }
