Made all persistent objects serializable - added user management stuff

git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@114 09dcff7a-b715-0410-9601-b79a96267cd0

10 files changed, 115 insertions, 10 deletions

diff --git a/orkbasej/java/net/sf/oreka/persistent/Domain.java b/orkbasej/java/net/sf/oreka/persistent/Domain.java
index edb463d..27e3716 100644
--- a/orkbasej/java/net/sf/oreka/persistent/Domain.java
+++ b/orkbasej/java/net/sf/oreka/persistent/Domain.java
@@ -15,6 +15,8 @@
  * 
  */
 package net.sf.oreka.persistent;
+import java.io.Serializable;
+
 import javax.persistence.Entity;
 import javax.persistence.GeneratorType;
 import javax.persistence.Id;
@@ -23,7 +25,7 @@ import javax.persistence.Id;
  * @hibernate.class
  */
 @Entity
-public class Domain {
+public class Domain implements Serializable {
 
 	private int id;
 	private String name = "";
diff --git a/orkbasej/java/net/sf/oreka/persistent/LoginString.java b/orkbasej/java/net/sf/oreka/persistent/LoginString.java
index ad44057..d3dc932 100644
--- a/orkbasej/java/net/sf/oreka/persistent/LoginString.java
+++ b/orkbasej/java/net/sf/oreka/persistent/LoginString.java
@@ -16,6 +16,8 @@
  */
 package net.sf.oreka.persistent;
 
+import java.io.Serializable;
+
 import javax.persistence.Entity;
 import javax.persistence.GeneratorType;
 import javax.persistence.Id;
@@ -25,7 +27,7 @@ import javax.persistence.ManyToOne;
  * @hibernate.class
  */
 @Entity
-public class LoginString {
+public class LoginString implements Serializable {
 
 	private int id;
 	private String loginString;
@@ -104,6 +106,10 @@ public class LoginString {
 		this.user = user;
 	}
 	
+	public void bidirSetUser(User user) {
+		this.user = user;
+		user.getLoginStrings().add(this);
+	}
 
 	/**
 	 * 
diff --git a/orkbasej/java/net/sf/oreka/persistent/RecPort.java b/orkbasej/java/net/sf/oreka/persistent/RecPort.java
index 9886bdc..83d6630 100644
--- a/orkbasej/java/net/sf/oreka/persistent/RecPort.java
+++ b/orkbasej/java/net/sf/oreka/persistent/RecPort.java
@@ -13,12 +13,14 @@
 
 package net.sf.oreka.persistent;
 
+import java.io.Serializable;
+
 import javax.persistence.Entity;
 import javax.persistence.GeneratorType;
 import javax.persistence.Id;
 
 @Entity
-public class RecPort {
+public class RecPort implements Serializable {
 
 	private int id;
 
diff --git a/orkbasej/java/net/sf/oreka/persistent/RecPortFace.java b/orkbasej/java/net/sf/oreka/persistent/RecPortFace.java
index 2824926..46350bc 100644
--- a/orkbasej/java/net/sf/oreka/persistent/RecPortFace.java
+++ b/orkbasej/java/net/sf/oreka/persistent/RecPortFace.java
@@ -13,12 +13,14 @@
 
 package net.sf.oreka.persistent;
 
+import java.io.Serializable;
+
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
 
 @Entity
-public class RecPortFace {
+public class RecPortFace implements Serializable {
 
 	private RecPort recPort;
 	private Service service;
diff --git a/orkbasej/java/net/sf/oreka/persistent/RecProgram.java b/orkbasej/java/net/sf/oreka/persistent/RecProgram.java
index fed2425..6b8da30 100644
--- a/orkbasej/java/net/sf/oreka/persistent/RecProgram.java
+++ b/orkbasej/java/net/sf/oreka/persistent/RecProgram.java
@@ -16,6 +16,7 @@
  */
 package net.sf.oreka.persistent;
 
+import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.Collection;
 import java.util.Date;
@@ -37,7 +38,7 @@ import net.sf.oreka.Direction;
  * @hibernate.class
  */
 @Entity
-public class RecProgram {
+public class RecProgram implements Serializable {
 
 	private int id;
 	private String name = "";
diff --git a/orkbasej/java/net/sf/oreka/persistent/RecSegment.java b/orkbasej/java/net/sf/oreka/persistent/RecSegment.java
index 30a848e..1091ff5 100644
--- a/orkbasej/java/net/sf/oreka/persistent/RecSegment.java
+++ b/orkbasej/java/net/sf/oreka/persistent/RecSegment.java
@@ -13,6 +13,7 @@
 
 package net.sf.oreka.persistent;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
@@ -33,7 +34,7 @@ import net.sf.oreka.Direction;
  * @hibernate.class
  */
 @Entity
-public class RecSegment {
+public class RecSegment implements Serializable {
 	
 	private int id;
 	private RecSession recSession;
diff --git a/orkbasej/java/net/sf/oreka/persistent/RecSession.java b/orkbasej/java/net/sf/oreka/persistent/RecSession.java
index 214f678..8e77bfb 100644
--- a/orkbasej/java/net/sf/oreka/persistent/RecSession.java
+++ b/orkbasej/java/net/sf/oreka/persistent/RecSession.java
@@ -13,6 +13,7 @@
 
 package net.sf.oreka.persistent;
 
+import java.io.Serializable;
 import java.util.Date;
 
 import javax.persistence.Entity;
@@ -24,7 +25,7 @@ import javax.persistence.Transient;
  * @hibernate.class
  */
 @Entity
-public class RecSession {
+public class RecSession implements Serializable {
 	private int id;
 	private Date timestamp = new Date(0);
 	private long duration;
diff --git a/orkbasej/java/net/sf/oreka/persistent/RecTape.java b/orkbasej/java/net/sf/oreka/persistent/RecTape.java
index 8278c29..193f105 100644
--- a/orkbasej/java/net/sf/oreka/persistent/RecTape.java
+++ b/orkbasej/java/net/sf/oreka/persistent/RecTape.java
@@ -13,6 +13,7 @@
 
 package net.sf.oreka.persistent;
 
+import java.io.Serializable;
 import java.util.Date;
 
 import javax.persistence.Entity;
@@ -27,7 +28,7 @@ import net.sf.oreka.Direction;
  * @hibernate.class
  */
 @Entity
-public class RecTape {
+public class RecTape implements Serializable {
 	
 	private int id;
 	private Date timestamp = new Date(0);
diff --git a/orkbasej/java/net/sf/oreka/persistent/Service.java b/orkbasej/java/net/sf/oreka/persistent/Service.java
index 6eac75a..5369365 100644
--- a/orkbasej/java/net/sf/oreka/persistent/Service.java
+++ b/orkbasej/java/net/sf/oreka/persistent/Service.java
@@ -16,6 +16,8 @@
  */
 package net.sf.oreka.persistent;
 
+import java.io.Serializable;
+
 import javax.persistence.Entity;
 import javax.persistence.GeneratorType;
 import javax.persistence.Id;
@@ -26,7 +28,7 @@ import net.sf.oreka.ServiceClass;
  * @hibernate.class
  */
 @Entity
-public class Service {
+public class Service implements Serializable {
 	
 	private int id;
 	private String name = "";
diff --git a/orkbasej/java/net/sf/oreka/persistent/User.java b/orkbasej/java/net/sf/oreka/persistent/User.java
index 45fa9ad..04ffc42 100644
--- a/orkbasej/java/net/sf/oreka/persistent/User.java
+++ b/orkbasej/java/net/sf/oreka/persistent/User.java
@@ -16,21 +16,35 @@
  */
 package net.sf.oreka.persistent;
 
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
+
 import javax.persistence.Entity;
+import javax.persistence.FetchType;
 import javax.persistence.GeneratorType;
 import javax.persistence.Id;
+import javax.persistence.OneToMany;
 
 /**
  * @hibernate.class
  */
 @Entity
-public class User {
+public class User implements Serializable {
 	
 	private int id = 0;
 	private String password = "";
 	private String firstname = "";
 	private String lastname = "";
 	private String email = "";
+	private boolean deleted = false;
+	private boolean disabled = false;
+	private Date dateCreated = new Date(0);
+	private Date dateDisabled = new Date(0);
+	private Date dateDeleted = new Date(0);
+	
+	private Set<LoginString> loginStrings;
 	  
 	/**
 	 * @hibernate.property
@@ -128,6 +142,79 @@ public class User {
 	 * 
 	 */
 	public User() {
+		loginStrings = new HashSet<LoginString>();
+	}
+
+	@OneToMany(fetch = FetchType.EAGER)
+	public Set<LoginString> getLoginStrings() {
+		return loginStrings;
 	}
 	
+
+
+	public void setLoginStrings(Set<LoginString> loginStrings) {
+		this.loginStrings = loginStrings;
+	}
+
+
+	public Date getDateCreated() {
+		return dateCreated;
+	}
+	
+
+
+	public void setDateCreated(Date dateCreated) {
+		this.dateCreated = dateCreated;
+	}
+	
+
+
+	public Date getDateDeleted() {
+		return dateDeleted;
+	}
+	
+
+
+	public void setDateDeleted(Date dateDeleted) {
+		this.dateDeleted = dateDeleted;
+	}
+	
+
+
+	public Date getDateDisabled() {
+		return dateDisabled;
+	}
+	
+
+
+	public void setDateDisabled(Date dateDisabled) {
+		this.dateDisabled = dateDisabled;
+	}
+	
+
+
+	public boolean isDeleted() {
+		return deleted;
+	}
+	
+
+
+	public void setDeleted(boolean deleted) {
+		this.deleted = deleted;
+	}
+	
+
+
+	public boolean isDisabled() {
+		return disabled;
+	}
+	
+
+
+	public void setDisabled(boolean disabled) {
+		this.disabled = disabled;
+	}
+	
+	
+	
 }