git://wamblee.org
/
utils
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(no commit message)
[utils]
/
security
/
impl
/
src
/
main
/
java
/
org
/
wamblee
/
security
/
authentication
/
User.java
diff --git
a/security/impl/src/main/java/org/wamblee/security/authentication/User.java
b/security/impl/src/main/java/org/wamblee/security/authentication/User.java
index 82a77303f6432b0dbedef95bfc6dbbd8fcfa0bc2..12db71a3de98ebf65d1e29ac3718032aa0194a59 100644
(file)
--- a/
security/impl/src/main/java/org/wamblee/security/authentication/User.java
+++ b/
security/impl/src/main/java/org/wamblee/security/authentication/User.java
@@
-25,6
+25,8
@@
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
import javax.persistence.ManyToMany;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.ManyToMany;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
@@
-58,7
+60,7
@@
public class User implements Serializable, Comparable {
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
- private Long
primaryKey
;
+ private Long
id
;
@Version
private int version;
@Version
private int version;
@@
-77,6
+79,7
@@
public class User implements Serializable, Comparable {
* Groups the user belongs to.
*/
@ManyToMany(cascade = CascadeType.MERGE, fetch = FetchType.EAGER)
* Groups the user belongs to.
*/
@ManyToMany(cascade = CascadeType.MERGE, fetch = FetchType.EAGER)
+ @JoinTable(name = "SEC_USER_GROUP", joinColumns = { @JoinColumn(name = "USER_ID") }, inverseJoinColumns = { @JoinColumn(name = "GROUP_ID") })
private Set<Group> groups;
/**
private Set<Group> groups;
/**
@@
-115,7
+118,7
@@
public class User implements Serializable, Comparable {
*
*/
public User(User aUser) {
*
*/
public User(User aUser) {
-
primaryKey = aUser.primaryKey
;
+
id = aUser.id
;
version = aUser.version;
name = aUser.name;
password = aUser.password;
version = aUser.version;
name = aUser.name;
password = aUser.password;
@@
-393,6
+396,6
@@
public class User implements Serializable, Comparable {
}
public Long getPrimaryKey() {
}
public Long getPrimaryKey() {
- return
primaryKey
;
+ return
id
;
}
}
}
}