JPA mapping updates

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

diff --git a/security/impl/src/main/java/org/wamblee/security/authorization/AbstractAuthorizationRule.java b/security/impl/src/main/java/org/wamblee/security/authorization/AbstractAuthorizationRule.java
index 69d51b9ff28d728128dc544446b28f98a6bcce28..14ce434089b18163472428540101e8484b15c385 100644 (file)
--- a/security/impl/src/main/java/org/wamblee/security/authorization/AbstractAuthorizationRule.java
+++ b/security/impl/src/main/java/org/wamblee/security/authorization/AbstractAuthorizationRule.java
@@ -23,9 +23,11 @@ import javax.persistence.Id;
 import javax.persistence.Inheritance;
 import javax.persistence.InheritanceType;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import javax.persistence.Version;
 
 import org.wamblee.security.authentication.User;
+import org.wamblee.security.authentication.UserAdministration;
 
 /**
  * Represents an authorization rule to determine whether an operation is allowed
@@ -41,7 +43,7 @@ public abstract class AbstractAuthorizationRule implements AuthorizationRule {
     
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
-    private Long primaryKey;
+    private Long id;
 
     @Version
     private int version;
@@ -51,7 +53,7 @@ public abstract class AbstractAuthorizationRule implements AuthorizationRule {
     }
     
     public AbstractAuthorizationRule(AbstractAuthorizationRule aRule) { 
-        primaryKey = aRule.primaryKey;
+        id = aRule.id;
         version = aRule.version;
     }
 }