Fixing build
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c7828e8f Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c7828e8f Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c7828e8f Branch: refs/heads/2.7.x-fixes Commit: c7828e8fab170f6c8c7013547f2e4b092bceac9f Parents: 36c04fb Author: Colm O hEigeartaigh <[email protected]> Authored: Mon May 26 14:45:40 2014 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Mon May 26 14:45:40 2014 +0100 ---------------------------------------------------------------------- .../org/apache/cxf/sts/token/validator/X509TokenValidator.java | 4 ---- 1 file changed, 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/c7828e8f/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/X509TokenValidator.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/X509TokenValidator.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/X509TokenValidator.java index ff63a1d..ded4808 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/X509TokenValidator.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/X509TokenValidator.java @@ -32,11 +32,7 @@ import org.apache.cxf.helpers.DOMUtils; import org.apache.cxf.sts.STSPropertiesMBean; import org.apache.cxf.sts.request.ReceivedToken; import org.apache.cxf.sts.request.ReceivedToken.STATE; -<<<<<<< HEAD - -======= import org.apache.cxf.sts.token.realm.CertConstraintsParser; ->>>>>>> cf05755... Add certificate path validation for X.509 tokens in the STS import org.apache.cxf.ws.security.sts.provider.model.secext.BinarySecurityTokenType; import org.apache.ws.security.WSConstants;
