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/04/22 15:02:38 UTC
cxf git commit: Updating a token/grant relationship to Client as Many
to One
Repository: cxf
Updated Branches:
refs/heads/master 275d14dbf -> 7f73b4b67
Updating a token/grant relationship to Client as Many to One
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7f73b4b6
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7f73b4b6
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7f73b4b6
Branch: refs/heads/master
Commit: 7f73b4b67c24538207cce80ec2ba4118dd7a24a6
Parents: 275d14d
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Fri Apr 22 14:02:18 2016 +0100
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Fri Apr 22 14:02:18 2016 +0100
----------------------------------------------------------------------
.../apache/cxf/rs/security/oauth2/common/ServerAccessToken.java | 3 ++-
.../security/oauth2/grants/code/ServerAuthorizationCodeGrant.java | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/7f73b4b6/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/ServerAccessToken.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/ServerAccessToken.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/ServerAccessToken.java
index 903c864..406fa41 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/ServerAccessToken.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/ServerAccessToken.java
@@ -25,6 +25,7 @@ import java.util.Map;
import javax.persistence.ElementCollection;
import javax.persistence.ManyToMany;
+import javax.persistence.ManyToOne;
import javax.persistence.MapKeyColumn;
import javax.persistence.MappedSuperclass;
import javax.persistence.OneToOne;
@@ -94,7 +95,7 @@ public abstract class ServerAccessToken extends AccessToken {
* Returns the Client associated with this token
* @return the client
*/
- @OneToOne
+ @ManyToOne
public Client getClient() {
return client;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/7f73b4b6/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/ServerAuthorizationCodeGrant.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/ServerAuthorizationCodeGrant.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/ServerAuthorizationCodeGrant.java
index 50802d3..2c57304 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/ServerAuthorizationCodeGrant.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/code/ServerAuthorizationCodeGrant.java
@@ -25,6 +25,7 @@ import java.util.Map;
import javax.persistence.ElementCollection;
import javax.persistence.Entity;
+import javax.persistence.ManyToOne;
import javax.persistence.MapKeyColumn;
import javax.persistence.OneToOne;
@@ -100,7 +101,7 @@ public class ServerAuthorizationCodeGrant extends AuthorizationCodeGrant {
* Returns the reference to {@link Client}
* @return the client
*/
- @OneToOne
+ @ManyToOne
public Client getClient() {
return client;
}