JPA mapping updates

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

diff --git a/security/impl/src/main/java/org/wamblee/security/AbstractPersistent.java b/security/impl/src/main/java/org/wamblee/security/AbstractPersistent.java
index cd2837dd389187902af5345f40284aaad1a28cec..ced29a3f4c11d670816100971185f1d1ffb5df2c 100644 (file)
--- a/security/impl/src/main/java/org/wamblee/security/AbstractPersistent.java
+++ b/security/impl/src/main/java/org/wamblee/security/AbstractPersistent.java
@@ -26,12 +26,12 @@ import org.wamblee.persistence.Persistent;
  */
 public abstract class AbstractPersistent implements Persistent {
    
-    private Serializable primaryKey;
+    private Serializable id;
 
     private Number version;
 
     protected AbstractPersistent() {
-        primaryKey = null;
+        id = null;
         version = -1;
     }
 
@@ -42,7 +42,7 @@ public abstract class AbstractPersistent implements Persistent {
      *            Object to copy.
      */
     protected AbstractPersistent(AbstractPersistent aPersistent) {
-        primaryKey = aPersistent.primaryKey;
+        id = aPersistent.id;
         version = aPersistent.version;
     }
 
@@ -53,7 +53,7 @@ public abstract class AbstractPersistent implements Persistent {
      */
     @Override
     public Serializable getPrimaryKey() {
-        return primaryKey;
+        return id;
     }
 
     /*
@@ -64,7 +64,7 @@ public abstract class AbstractPersistent implements Persistent {
      */
     @Override
     public void setPrimaryKey(Serializable aKey) {
-        primaryKey = aKey;
+        id = aKey;
     }
 
     /*