This commit was manufactured by cvs2svn to create tag 'OREKA-0-5-10'.v0-5-10

git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/tags/OREKA-0-5-10@223 09dcff7a-b715-0410-9601-b79a96267cd0

12 files changed, 23 insertions, 66 deletions

diff --git a/orkbasej/java/net/sf/oreka/persistent/Domain.java b/orkbasej/java/net/sf/oreka/persistent/Domain.java
index 7a0926b..27e3716 100644
--- a/orkbasej/java/net/sf/oreka/persistent/Domain.java
+++ b/orkbasej/java/net/sf/oreka/persistent/Domain.java
@@ -20,13 +20,11 @@ import java.io.Serializable;
 import javax.persistence.Entity;
 import javax.persistence.GeneratorType;
 import javax.persistence.Id;
-import javax.persistence.Table;
 
 /**
  * @hibernate.class
  */
 @Entity
-@Table(name = "domain")
 public class Domain implements Serializable {
 
 	private int id;
diff --git a/orkbasej/java/net/sf/oreka/persistent/LoginString.java b/orkbasej/java/net/sf/oreka/persistent/LoginString.java
index c650859..b8f092e 100644
--- a/orkbasej/java/net/sf/oreka/persistent/LoginString.java
+++ b/orkbasej/java/net/sf/oreka/persistent/LoginString.java
@@ -22,13 +22,11 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratorType;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
-import javax.persistence.Table;
 
 /**
  * @hibernate.class
  */
 @Entity
-@Table(name = "loginstring")
 public class LoginString implements Serializable {
 
 	private int id;
diff --git a/orkbasej/java/net/sf/oreka/persistent/RecPort.java b/orkbasej/java/net/sf/oreka/persistent/RecPort.java
index ebd83d0..83d6630 100644
--- a/orkbasej/java/net/sf/oreka/persistent/RecPort.java
+++ b/orkbasej/java/net/sf/oreka/persistent/RecPort.java
@@ -18,10 +18,8 @@ import java.io.Serializable;
 import javax.persistence.Entity;
 import javax.persistence.GeneratorType;
 import javax.persistence.Id;
-import javax.persistence.Table;
 
 @Entity
-@Table(name = "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 e1671d6..46350bc 100644
--- a/orkbasej/java/net/sf/oreka/persistent/RecPortFace.java
+++ b/orkbasej/java/net/sf/oreka/persistent/RecPortFace.java
@@ -18,10 +18,8 @@ import java.io.Serializable;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
-import javax.persistence.Table;
 
 @Entity
-@Table(name = "recportface")
 public class RecPortFace implements Serializable {
 
 	private RecPort recPort;
diff --git a/orkbasej/java/net/sf/oreka/persistent/RecProgram.java b/orkbasej/java/net/sf/oreka/persistent/RecProgram.java
index 206ff69..6b8da30 100644
--- a/orkbasej/java/net/sf/oreka/persistent/RecProgram.java
+++ b/orkbasej/java/net/sf/oreka/persistent/RecProgram.java
@@ -38,7 +38,6 @@ import net.sf.oreka.Direction;
  * @hibernate.class
  */
 @Entity
-@Table(name = "recprogram")
 public class RecProgram implements Serializable {
 
 	private int id;
@@ -84,7 +83,7 @@ public class RecProgram implements Serializable {
 //    		targetEntity="net.sf.oreka.persistent.RecSegment"
 //    )
     @JoinTable(
-    		table=@Table(name="progtoseg"),
+    		table=@Table(name="ProgToSeg"),
     		joinColumns={@JoinColumn(name="ProgId")},
     		inverseJoinColumns={@JoinColumn(name="SegId")}
     )
diff --git a/orkbasej/java/net/sf/oreka/persistent/RecSegment.java b/orkbasej/java/net/sf/oreka/persistent/RecSegment.java
index 4ab9a1e..1091ff5 100644
--- a/orkbasej/java/net/sf/oreka/persistent/RecSegment.java
+++ b/orkbasej/java/net/sf/oreka/persistent/RecSegment.java
@@ -34,7 +34,6 @@ import net.sf.oreka.Direction;
  * @hibernate.class
  */
 @Entity
-@Table(name = "recsegment")
 public class RecSegment implements Serializable {
 	
 	private int id;
@@ -263,7 +262,7 @@ public class RecSegment implements Serializable {
 	 */
 	@ManyToMany
     @JoinTable(
-    		table=@Table(name="progtoseg"),
+    		table=@Table(name="ProgToSeg"),
     		joinColumns={@JoinColumn(name="SegId")},
     		inverseJoinColumns={@JoinColumn(name="ProgId")}
     )
diff --git a/orkbasej/java/net/sf/oreka/persistent/RecSession.java b/orkbasej/java/net/sf/oreka/persistent/RecSession.java
index eff8417..8e77bfb 100644
--- a/orkbasej/java/net/sf/oreka/persistent/RecSession.java
+++ b/orkbasej/java/net/sf/oreka/persistent/RecSession.java
@@ -19,14 +19,12 @@ import java.util.Date;
 import javax.persistence.Entity;
 import javax.persistence.GeneratorType;
 import javax.persistence.Id;
-import javax.persistence.Table;
 import javax.persistence.Transient;
 
 /**
  * @hibernate.class
  */
 @Entity
-@Table(name = "recsession")
 public class RecSession implements Serializable {
 	private int id;
 	private Date timestamp = new Date(0);
diff --git a/orkbasej/java/net/sf/oreka/persistent/RecTape.java b/orkbasej/java/net/sf/oreka/persistent/RecTape.java
index 66d796d..193f105 100644
--- a/orkbasej/java/net/sf/oreka/persistent/RecTape.java
+++ b/orkbasej/java/net/sf/oreka/persistent/RecTape.java
@@ -20,7 +20,6 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratorType;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
-import javax.persistence.Table;
 import javax.persistence.Transient;
 
 import net.sf.oreka.Direction;
@@ -29,7 +28,6 @@ import net.sf.oreka.Direction;
  * @hibernate.class
  */
 @Entity
-@Table(name = "rectape")
 public class RecTape implements Serializable {
 	
 	private int id;
diff --git a/orkbasej/java/net/sf/oreka/persistent/Service.java b/orkbasej/java/net/sf/oreka/persistent/Service.java
index 701948e..5369365 100644
--- a/orkbasej/java/net/sf/oreka/persistent/Service.java
+++ b/orkbasej/java/net/sf/oreka/persistent/Service.java
@@ -21,7 +21,6 @@ import java.io.Serializable;
 import javax.persistence.Entity;
 import javax.persistence.GeneratorType;
 import javax.persistence.Id;
-import javax.persistence.Table;
 
 import net.sf.oreka.ServiceClass;
 
@@ -29,7 +28,6 @@ import net.sf.oreka.ServiceClass;
  * @hibernate.class
  */
 @Entity
-@Table(name = "service")
 public class Service implements Serializable {
 	
 	private int id;
diff --git a/orkbasej/java/net/sf/oreka/persistent/User.java b/orkbasej/java/net/sf/oreka/persistent/User.java
index 2ce404f..26cf656 100644
--- a/orkbasej/java/net/sf/oreka/persistent/User.java
+++ b/orkbasej/java/net/sf/oreka/persistent/User.java
@@ -26,13 +26,11 @@ import javax.persistence.FetchType;
 import javax.persistence.GeneratorType;
 import javax.persistence.Id;
 import javax.persistence.OneToMany;
-import javax.persistence.Table;
 
 /**
  * @hibernate.class
  */
 @Entity
-@Table(name = "user")
 public class User implements Serializable {
 	
 	private int id = 0;
@@ -147,6 +145,18 @@ public class User implements Serializable {
 		//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;
 	}
diff --git a/orkbasej/java/net/sf/oreka/test/FillDatabase.java b/orkbasej/java/net/sf/oreka/test/FillDatabase.java
index 43f4d71..d997de5 100644
--- a/orkbasej/java/net/sf/oreka/test/FillDatabase.java
+++ b/orkbasej/java/net/sf/oreka/test/FillDatabase.java
@@ -49,41 +49,23 @@ public class FillDatabase {
 		
 		// user 1
 		User user = new User();
-		user.setFirstname("Raymond");
-		user.setLastname("Stein");
-		user.setPassword("raymond");
+		user.setFirstname("salisse");
+		user.setPassword("salisse");
 		LoginString ls = new LoginString();
 		ls.setUser(user);
-		ls.setLoginString("2005");
-		LoginString lsA = new LoginString();
-		lsA.setUser(user);
-		lsA.setLoginString("2006");
-		LoginString lsB = new LoginString();
-		lsB.setUser(user);
-		lsB.setLoginString("raymond");
+		ls.setLoginString("1973");
 		hbnSession.save(user);
 		hbnSession.save(ls);
-		hbnSession.save(lsA);
-		hbnSession.save(lsB);
 		
 		// user 2
 		User user2 = new User();
-		user2.setFirstname("Bert");
-		user2.setLastname("Nolte");		
-		user2.setPassword("bert");
+		user2.setFirstname("zapata");
+		user2.setPassword("zapata");
 		LoginString ls2 = new LoginString();
 		ls2.setUser(user2);
-		ls2.setLoginString("2000");
-		LoginString ls2A = new LoginString();
-		ls2A.setUser(user2);
-		ls2A.setLoginString("2001");
-		LoginString ls2B = new LoginString();
-		ls2B.setUser(user2);
-		ls2B.setLoginString("bert");
+		ls2.setLoginString("1974");
 		hbnSession.save(user2);
 		hbnSession.save(ls2);
-		hbnSession.save(ls2A);
-		hbnSession.save(ls2B);
 		
 		// create program that does not filter anything
 		RecProgram prog1 = new RecProgram();
@@ -106,31 +88,12 @@ public class FillDatabase {
 			
 			String randomString = "" + generator.nextInt();
 			randomString = randomString.replace("-", "a");
+			seg.setLocalParty(randomString);
+			seg.setUser(user);
 			seg.setRemoteParty(lastParty);
 			lastParty = randomString;
 			
 			float randomDirection = generator.nextFloat();
-			
-			if(randomDirection > .8){
-				if(randomDirection > .95) {
-					seg.setLocalParty(ls.getLoginString());
-				}
-				else {
-					seg.setLocalParty(lsA.getLoginString());					
-				}
-				seg.setUser(user);
-			}
-			else {
-				if(randomDirection > .3) {
-					seg.setLocalParty(ls2.getLoginString());
-				}
-				else {
-					seg.setLocalParty(ls2A.getLoginString());
-				}
-				seg.setUser(user2);
-			}
-			
-			randomDirection = generator.nextFloat();
 			if(randomDirection > .5){
 				seg.setDirection(Direction.IN);
 			}
diff --git a/orktrack/src/net/sf/oreka/orktrack/ServiceManager.java b/orktrack/src/net/sf/oreka/orktrack/ServiceManager.java
index 51a9723..7a8d0f4 100644
--- a/orktrack/src/net/sf/oreka/orktrack/ServiceManager.java
+++ b/orktrack/src/net/sf/oreka/orktrack/ServiceManager.java
@@ -36,7 +36,7 @@ public class ServiceManager {
 			service.setRecordMaster(true);
 		}
 		else {
-			//service.setHostname(hostname);	// update hostname in case it has changed
+			service.setHostname(hostname);	// update hostname in case it has changed
 		}
 		hbnSession.save(service);
 		return service;