You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by bi...@apache.org on 2015/12/15 17:26:22 UTC
[1/2] cxf git commit: Trivial .gitignore change,
mostly so that I can type:
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes bbfe35e46 -> 9f746c97a
Trivial .gitignore change, mostly so that I can type:
Closes #102.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6e2c3553
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6e2c3553
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6e2c3553
Branch: refs/heads/3.1.x-fixes
Commit: 6e2c3553816cecfa1fa009910b6cea0aabb3331a
Parents: 1dea643
Author: Benson Margulies <be...@basistech.com>
Authored: Mon Dec 14 13:00:06 2015 -0500
Committer: Benson Margulies <be...@basistech.com>
Committed: Mon Dec 14 13:00:06 2015 -0500
----------------------------------------------------------------------
.gitignore | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/6e2c3553/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 9329527..51c4cdd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
target/
velocity.log
bin/
+*~
[2/2] cxf git commit: Merge branch '3.1.x-fixes' of
https://git-wip-us.apache.org/repos/asf/cxf into 3.1.x-fixes
Posted by bi...@apache.org.
Merge branch '3.1.x-fixes' of https://git-wip-us.apache.org/repos/asf/cxf into 3.1.x-fixes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9f746c97
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9f746c97
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9f746c97
Branch: refs/heads/3.1.x-fixes
Commit: 9f746c97ad9566f5c9410c9d600df237c97beae0
Parents: 6e2c355 bbfe35e
Author: Benson Margulies <be...@basistech.com>
Authored: Tue Dec 15 18:26:17 2015 +0200
Committer: Benson Margulies <be...@basistech.com>
Committed: Tue Dec 15 18:26:17 2015 +0200
----------------------------------------------------------------------
.../cxf/rs/security/oidc/common/UserInfo.java | 7 ---
.../cxf/rs/security/oidc/rp/IdTokenContext.java | 25 +++++++++
.../oidc/rp/IdTokenContextProvider.java | 35 -------------
.../oidc/rp/OidcClientTokenContext.java | 7 +--
.../security/oidc/rp/OidcIdTokenProvider.java | 19 +++++--
.../oidc/rp/OidcIdTokenRequestFilter.java | 3 ++
.../oidc/rp/OidcRpAuthenticationFilter.java | 8 ++-
.../security/oidc/rp/OidcUserInfoProvider.java | 55 ++++++++++++++++++++
.../rs/security/oidc/rp/UserInfoContext.java | 25 +++++++++
.../oidc/rp/UserInfoContextProvider.java | 39 --------------
10 files changed, 131 insertions(+), 92 deletions(-)
----------------------------------------------------------------------