Fixing backmerge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ef5751ee Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ef5751ee Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ef5751ee Branch: refs/heads/3.0.x-fixes Commit: ef5751eef7c3ed7fcf962acf630974f46613ecb9 Parents: 7dabade Author: Colm O hEigeartaigh <[email protected]> Authored: Wed Jun 3 15:32:00 2015 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Wed Jun 3 15:32:00 2015 +0100 ---------------------------------------------------------------------- .../token/provider/DefaultSubjectProvider.java | 28 +------------------- 1 file changed, 1 insertion(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/ef5751ee/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/DefaultSubjectProvider.java ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/DefaultSubjectProvider.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/DefaultSubjectProvider.java index c4e54f8..f6f1846 100644 --- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/DefaultSubjectProvider.java +++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/provider/DefaultSubjectProvider.java @@ -175,28 +175,6 @@ public class DefaultSubjectProvider implements SubjectProvider { } /** - * Get the SubjectConfirmation method given a tokenType and keyType - */ - protected String getSubjectConfirmationMethod(String tokenType, String keyType) { - if (WSConstants.WSS_SAML_TOKEN_TYPE.equals(tokenType) - || WSConstants.SAML_NS.equals(tokenType)) { - if (STSConstants.SYMMETRIC_KEY_KEYTYPE.equals(keyType) - || STSConstants.PUBLIC_KEY_KEYTYPE.equals(keyType)) { - return SAML1Constants.CONF_HOLDER_KEY; - } else { - return SAML1Constants.CONF_BEARER; - } - } else { - if (STSConstants.SYMMETRIC_KEY_KEYTYPE.equals(keyType) - || STSConstants.PUBLIC_KEY_KEYTYPE.equals(keyType)) { - return SAML2Constants.CONF_HOLDER_KEY; - } else { - return SAML2Constants.CONF_BEARER; - } - } - } - - /** * Create and return the KeyInfoBean to be inserted into the SubjectBean */ protected KeyInfoBean createKeyInfo( @@ -276,8 +254,7 @@ public class DefaultSubjectProvider implements SubjectProvider { return createPublicKeyKeyInfo(receivedKey.getX509Cert(), receivedKey.getPublicKey()); } -<<<<<<< HEAD - return subjectBean; + return null; } /** @@ -300,9 +277,6 @@ public class DefaultSubjectProvider implements SubjectProvider { return SAML1Constants.CONF_BEARER; } } -======= - return null; ->>>>>>> 3348a29... Refactor DefaultSubjectProvider to make it easier to subclass bits of functionality } /**
