1 files changed, 35 insertions, 9 deletions
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/User.java b/proxy/code/src/org/fedoraproject/candlepin/model/User.java
index cbe2395..33a6ab5 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/User.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/model/User.java
@@ -16,6 +16,12 @@ package org.fedoraproject.candlepin.model;
 
 import java.util.Formatter;
 
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
@@ -23,28 +29,48 @@ import javax.xml.bind.annotation.XmlTransient;
 
 /**
  * Represents the user.
- * TODO: how does this differ from an Owner.
+ *
+ * A user is more akin to an account within an owner. (i.e. organization)
  */
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.PROPERTY)
-public class User extends BaseModel {
+@Entity
+@Table(name="cp_user")
+public class User {
     
+    @Id
+    @GeneratedValue(strategy=GenerationType.AUTO)
+    private Long id;
+
+    @ManyToOne
     private Owner owner;
+
     private String login;
+
+    // TODO: Hash!
     private String password;
 
+    public User() {
+    }
+
+    public User(Owner ownerIn, String loginIn, String passwordIn) {
+        owner = ownerIn;
+        login = loginIn;
+        password = passwordIn;
+    }
+
     /**
-     * @param uuid unique id
+     * @return the id
      */
-    public User(String uuid) {
-        super(uuid);
+    public Long getId() {
+        return id;
     }
-    
+
     /**
-     * Default ctor
+     * @param id the id to set
      */
-    public User() {
-        this(null);
+    public void setId(Long id) {
+        this.id = id;
     }
 
     /**