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 17:54:51 UTC
cxf git commit: Update a relationship from Client/Token/Grant to
UserSubject as ManyToOne
Repository: cxf
Updated Branches:
refs/heads/master 2ed0f4352 -> a00cdee0e
Update a relationship from Client/Token/Grant to UserSubject as ManyToOne
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a00cdee0
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a00cdee0
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a00cdee0
Branch: refs/heads/master
Commit: a00cdee0eb6179ee5ec4f0f1ae303ca1449056e0
Parents: 2ed0f43
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Fri Apr 22 16:54:36 2016 +0100
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Fri Apr 22 16:54:36 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/cxf/rs/security/oauth2/common/Client.java | 3 ++-
.../apache/cxf/rs/security/oauth2/common/ServerAccessToken.java | 3 +--
.../security/oauth2/grants/code/ServerAuthorizationCodeGrant.java | 3 +--
3 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/a00cdee0/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Client.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Client.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Client.java
index 02d4d26..c465d40 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Client.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Client.java
@@ -27,6 +27,7 @@ import java.util.Map;
import javax.persistence.ElementCollection;
import javax.persistence.Entity;
import javax.persistence.Id;
+import javax.persistence.ManyToOne;
import javax.persistence.MapKeyColumn;
import javax.persistence.OneToOne;
@@ -278,7 +279,7 @@ public class Client implements Serializable {
* who has registered this client
* @return the resource owner user subject
*/
- @OneToOne
+ @ManyToOne
public UserSubject getResourceOwnerSubject() {
return resourceOwnerSubject;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/a00cdee0/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 406fa41..e3b8b05 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
@@ -28,7 +28,6 @@ import javax.persistence.ManyToMany;
import javax.persistence.ManyToOne;
import javax.persistence.MapKeyColumn;
import javax.persistence.MappedSuperclass;
-import javax.persistence.OneToOne;
import org.apache.cxf.rs.security.oauth2.provider.OAuthServiceException;
import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
@@ -137,7 +136,7 @@ public abstract class ServerAccessToken extends AccessToken {
* when authorizing a given client request
* @return UserSubject
*/
- @OneToOne
+ @ManyToOne
public UserSubject getSubject() {
return subject;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/a00cdee0/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 2c57304..eee307d 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
@@ -27,7 +27,6 @@ import javax.persistence.ElementCollection;
import javax.persistence.Entity;
import javax.persistence.ManyToOne;
import javax.persistence.MapKeyColumn;
-import javax.persistence.OneToOne;
import org.apache.cxf.rs.security.oauth2.common.Client;
import org.apache.cxf.rs.security.oauth2.common.UserSubject;
@@ -142,7 +141,7 @@ public class ServerAuthorizationCodeGrant extends AuthorizationCodeGrant {
* Gets the user subject representing the end user
* @return the subject
*/
- @OneToOne
+ @ManyToOne
public UserSubject getSubject() {
return subject;
}