X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=security%2Fimpl%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsecurity%2Fauthentication%2FUser.java;h=5e6666b7be9027520440e390c8fd6d4c9ab5d90d;hb=8ed6d8daa3b10e79c4ad4233166b5fffd5701509;hp=82a77303f6432b0dbedef95bfc6dbbd8fcfa0bc2;hpb=fb7a92c206c85b6714d498bc7406db49fbec37a6;p=utils

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 82a77303..5e6666b7 100644
--- a/security/impl/src/main/java/org/wamblee/security/authentication/User.java
+++ b/security/impl/src/main/java/org/wamblee/security/authentication/User.java
@@ -20,11 +20,14 @@ import java.util.Set;
 import java.util.TreeSet;
 
 import javax.persistence.CascadeType;
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 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;
@@ -58,7 +61,7 @@ public class User implements Serializable, Comparable {
 
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
-    private Long primaryKey;
+    private Long id;
 
     @Version
     private int version;
@@ -77,6 +80,7 @@ public class User implements Serializable, Comparable {
      * 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;
 
     /**
@@ -115,7 +119,7 @@ public class User implements Serializable, Comparable {
      * 
      */
     public User(User aUser) {
-        primaryKey = aUser.primaryKey;
+        id = aUser.id;
         version = aUser.version;
         name = aUser.name;
         password = aUser.password;
@@ -393,6 +397,6 @@ public class User implements Serializable, Comparable {
     }
 
     public Long getPrimaryKey() {
-        return primaryKey;
+        return id;
     }
 }