You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2016/02/09 13:24:45 UTC

[1/2] cxf-fediz git commit: Updating FedizSubjectCreator

Repository: cxf-fediz
Updated Branches:
  refs/heads/master c535a50a2 -> 5ee1964ab


Updating FedizSubjectCreator


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/0a4641ef
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/0a4641ef
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/0a4641ef

Branch: refs/heads/master
Commit: 0a4641efa8e0315ab7d4ef2f48933427c18246a4
Parents: 6e1c0dd
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Tue Feb 9 12:24:06 2016 +0000
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Tue Feb 9 12:24:06 2016 +0000

----------------------------------------------------------------------
 .../org/apache/cxf/fediz/service/oidc/FedizSubjectCreator.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/0a4641ef/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/FedizSubjectCreator.java
----------------------------------------------------------------------
diff --git a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/FedizSubjectCreator.java b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/FedizSubjectCreator.java
index 4502816..fb4ecb6 100644
--- a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/FedizSubjectCreator.java
+++ b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/FedizSubjectCreator.java
@@ -20,6 +20,8 @@ package org.apache.cxf.fediz.service.oidc;
 
 import java.security.Principal;
 
+import javax.ws.rs.core.MultivaluedMap;
+
 import org.w3c.dom.Element;
 
 import org.apache.cxf.fediz.core.Claim;
@@ -47,7 +49,9 @@ public class FedizSubjectCreator implements SubjectCreator {
     
     
     @Override
-    public UserSubject createUserSubject(MessageContext mc, Client client) throws OAuthServiceException {
+    public UserSubject createUserSubject(MessageContext mc, 
+                                         Client client,
+                                         MultivaluedMap<String, String> params) throws OAuthServiceException {
         Principal principal = mc.getSecurityContext().getUserPrincipal();
         
         if (!(principal instanceof FedizPrincipal)) {

[2/2] cxf-fediz git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf-fediz

Posted by se...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf-fediz


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/5ee1964a
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/5ee1964a
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/5ee1964a

Branch: refs/heads/master
Commit: 5ee1964abd4a72902b163f329aa57cb11a6ecf4e
Parents: 0a4641e c535a50
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Tue Feb 9 12:24:32 2016 +0000
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Tue Feb 9 12:24:32 2016 +0000

----------------------------------------------------------------------
 pom.xml                 |  9 ++++++++-
 systests/spring/pom.xml | 18 ------------------
 2 files changed, 8 insertions(+), 19 deletions(-)
----------------------------------------------------------------------