JPA mapping updates

[utils] / security / impl / src / main / java / org / wamblee / security / authentication / Group.java

diff --git a/security/impl/src/main/java/org/wamblee/security/authentication/Group.java b/security/impl/src/main/java/org/wamblee/security/authentication/Group.java
index ca77582fcd8cefc96f3430d263b8719a30ac44c5..1cac00f80ef3a60aba61869f75a73ce2a4c0354c 100644 (file)
--- a/security/impl/src/main/java/org/wamblee/security/authentication/Group.java
+++ b/security/impl/src/main/java/org/wamblee/security/authentication/Group.java
@@ -48,7 +48,7 @@ public class Group implements Serializable, Comparable {
 
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
-    private Long primaryKey;
+    private Long id;
 
     @Version
     private int version;
@@ -74,7 +74,7 @@ public class Group implements Serializable, Comparable {
      * 
      */
     public Group(Group aGroup) {
-        primaryKey = aGroup.primaryKey;
+        id = aGroup.id;
         version = aGroup.version;
         name = aGroup.name;
     }
@@ -143,11 +143,11 @@ public class Group implements Serializable, Comparable {
     }
 
     public Long getPrimaryKey() {
-        return primaryKey;
+        return id;
     }
 
     public void setPrimaryKey(Long aKey) {
-        primaryKey = aKey;
+        id = aKey;
     }
 
     /*