now using the simplified user management interface.

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

diff --git a/security/impl/src/main/java/org/wamblee/security/authorization/UserCondition.java b/security/impl/src/main/java/org/wamblee/security/authorization/UserCondition.java
index 293869b45edc00daaf26670a1f8f9016bdeb4fee..76387276280ab29fda7c576ab746c823ad0e6ee6 100644 (file)
--- a/security/impl/src/main/java/org/wamblee/security/authorization/UserCondition.java
+++ b/security/impl/src/main/java/org/wamblee/security/authorization/UserCondition.java
@@ -15,48 +15,23 @@
  */ 
 package org.wamblee.security.authorization;
 
-import javax.persistence.DiscriminatorColumn;
-import javax.persistence.DiscriminatorType;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.Table;
-import javax.persistence.Version;
-
-import org.wamblee.persistence.Persistent;
-
-import org.wamblee.usermgt.User;
+import org.wamblee.security.authentication.User;
+import org.wamblee.security.authentication.UserAdminInitializer;
+import org.wamblee.security.authentication.UserAdministration;
 
 /**
  * Condition used to match a user against a specified set of users.
  * 
  * @author Erik Brakkee
  */
-@Entity
-@Table(name = "SEC_USER_CONDITION")
-@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
-@DiscriminatorColumn(name = "TYPE")
-public abstract class UserCondition {
+public interface UserCondition {
     
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private Long primaryKey;
+    /**
+     * Sets the user administration object. 
+     * @param aAdmin User administration.
+     */
+    void setUserAdmin(UserAdministration aAdmin);
 
-    @Version
-    private int version;
-    
-    public UserCondition() { 
-        // Empty.
-    }
-    
-    public UserCondition(UserCondition aCondition) { 
-        primaryKey = aCondition.primaryKey;
-        version = aCondition.version;
-    }
-    
     /**
      * Determines if the condition matches.
      * 
@@ -65,5 +40,6 @@ public abstract class UserCondition {
      * 
      * @return True if the condition matches, false otherwise.
      */
-    public abstract boolean matches(User aUser);
-}
+    boolean matches(String aUser);
+
+}
\ No newline at end of file