X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=security%2Fimpl%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fsecurity%2Fauthorization%2FAbstractUserCondition.java;h=96952075c69370a3214e47ed6093a107b32bb55b;hb=a0e5219a62cafc60127bcbb9ea2b7c3f8c403ccb;hp=30e174f7e988bdc8826b9f94d5df08535652461a;hpb=a0ce32a7a71799300bbf300cf71e76e1782392d3;p=utils

diff --git a/security/impl/src/main/java/org/wamblee/security/authorization/AbstractUserCondition.java b/security/impl/src/main/java/org/wamblee/security/authorization/AbstractUserCondition.java
index 30e174f7..96952075 100644
--- a/security/impl/src/main/java/org/wamblee/security/authorization/AbstractUserCondition.java
+++ b/security/impl/src/main/java/org/wamblee/security/authorization/AbstractUserCondition.java
@@ -25,7 +25,7 @@ import javax.persistence.InheritanceType;
 import javax.persistence.Table;
 import javax.persistence.Version;
 
-import org.wamblee.usermgt.User;
+import org.wamblee.security.authentication.User;
 
 /**
  * Condition used to match a user against a specified set of users.
@@ -40,7 +40,7 @@ public abstract class AbstractUserCondition implements UserCondition {
     
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
-    private Long primaryKey;
+    private Long id;
 
     @Version
     private int version;
@@ -50,7 +50,7 @@ public abstract class AbstractUserCondition implements UserCondition {
     }
     
     public AbstractUserCondition(AbstractUserCondition aCondition) { 
-        primaryKey = aCondition.primaryKey;
+        id = aCondition.id;
         version = aCondition.version;
     }
 }