Repository: cxf Updated Branches: refs/heads/3.0.x-fixes cdb742bac -> c6f1a8f07
Fixing a merge issue Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c6f1a8f0 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c6f1a8f0 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c6f1a8f0 Branch: refs/heads/3.0.x-fixes Commit: c6f1a8f0714e4d8591be14b381edcabeba86ec9c Parents: cdb742b Author: Sergey Beryozkin <[email protected]> Authored: Wed Dec 24 15:24:26 2014 +0000 Committer: Sergey Beryozkin <[email protected]> Committed: Wed Dec 24 15:24:26 2014 +0000 ---------------------------------------------------------------------- .../cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java | 6 ------ 1 file changed, 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/c6f1a8f0/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java index a71f644..976e6c5 100644 --- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java +++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/ClientCodeRequestFilter.java @@ -55,15 +55,9 @@ public class ClientCodeRequestFilter implements ContainerRequestFilter { private String relRedirectUri; private String startUri; private String authorizationServiceUri; -<<<<<<< HEAD private OAuthClientUtils.Consumer consumer; - private ClientCodeStateProvider clientStateProvider; - private ClientCodeRequestProvider clientRequestProvider; -======= - private Consumer consumer; private ClientCodeStateManager clientStateManager; private ClientTokenContextManager clientTokenContextManager; ->>>>>>> 27c1bb5... Refactoring the OAuth2 client code filter code, adapting it to OIDC private WebClient accessTokenService; @Override
