IMPORTANT NOTE: With this commit, OrkWeb and OrkTrack are NO LONGER COMPATIBLE WITH PREVIOUS VERSIONS!

- Modified classes and underlying SQL table names by prefixing them with "ork". This allows oreka to run in any database without risk of collision with existing tables.
- Now using MySQLInnoDBDialect to access DB instead of MySQLMyISAMDialect.
- Fixed Browse page filtering to allow open-ended start and end dates 

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

3 files changed, 29 insertions, 29 deletions

diff --git a/orkbasej/java/net/sf/oreka/test/FillDatabase.java b/orkbasej/java/net/sf/oreka/test/FillDatabase.java
index 43f4d71..b1e1c8c 100644
--- a/orkbasej/java/net/sf/oreka/test/FillDatabase.java
+++ b/orkbasej/java/net/sf/oreka/test/FillDatabase.java
@@ -17,12 +17,12 @@ import java.util.Date;
 
 import net.sf.oreka.Direction;
 import net.sf.oreka.HibernateManager;
-import net.sf.oreka.persistent.LoginString;
-import net.sf.oreka.persistent.RecProgram;
-import net.sf.oreka.persistent.RecSegment;
-import net.sf.oreka.persistent.RecTape;
-import net.sf.oreka.persistent.Service;
-import net.sf.oreka.persistent.User;
+import net.sf.oreka.persistent.OrkLoginString;
+import net.sf.oreka.persistent.OrkProgram;
+import net.sf.oreka.persistent.OrkSegment;
+import net.sf.oreka.persistent.OrkTape;
+import net.sf.oreka.persistent.OrkService;
+import net.sf.oreka.persistent.OrkUser;
 
 import org.hibernate.Session;
 import org.hibernate.Transaction;
@@ -38,7 +38,7 @@ public class FillDatabase {
 		Session hbnSession = hibernateManager.getSession();
 		Transaction tx = hbnSession.beginTransaction();
 		
-		Service service = new Service();
+		OrkService service = new OrkService();
 		service.setFileServePath("");
 		service.setFileServeProtocol("http");
 		service.setFileServeTcpPort(8080);
@@ -48,17 +48,17 @@ public class FillDatabase {
 		hbnSession.save(service);
 		
 		// user 1
-		User user = new User();
+		OrkUser user = new OrkUser();
 		user.setFirstname("Raymond");
 		user.setLastname("Stein");
 		user.setPassword("raymond");
-		LoginString ls = new LoginString();
+		OrkLoginString ls = new OrkLoginString();
 		ls.setUser(user);
 		ls.setLoginString("2005");
-		LoginString lsA = new LoginString();
+		OrkLoginString lsA = new OrkLoginString();
 		lsA.setUser(user);
 		lsA.setLoginString("2006");
-		LoginString lsB = new LoginString();
+		OrkLoginString lsB = new OrkLoginString();
 		lsB.setUser(user);
 		lsB.setLoginString("raymond");
 		hbnSession.save(user);
@@ -67,17 +67,17 @@ public class FillDatabase {
 		hbnSession.save(lsB);
 		
 		// user 2
-		User user2 = new User();
+		OrkUser user2 = new OrkUser();
 		user2.setFirstname("Bert");
 		user2.setLastname("Nolte");		
 		user2.setPassword("bert");
-		LoginString ls2 = new LoginString();
+		OrkLoginString ls2 = new OrkLoginString();
 		ls2.setUser(user2);
 		ls2.setLoginString("2000");
-		LoginString ls2A = new LoginString();
+		OrkLoginString ls2A = new OrkLoginString();
 		ls2A.setUser(user2);
 		ls2A.setLoginString("2001");
-		LoginString ls2B = new LoginString();
+		OrkLoginString ls2B = new OrkLoginString();
 		ls2B.setUser(user2);
 		ls2B.setLoginString("bert");
 		hbnSession.save(user2);
@@ -86,7 +86,7 @@ public class FillDatabase {
 		hbnSession.save(ls2B);
 		
 		// create program that does not filter anything
-		RecProgram prog1 = new RecProgram();
+		OrkProgram prog1 = new OrkProgram();
 		prog1.setName("Test program");
 		hbnSession.save(prog1);
 		
@@ -94,8 +94,8 @@ public class FillDatabase {
 		String lastParty = "123-234-5678";
 		java.util.Random generator = new java.util.Random();
 		for(int i=0; i<500; i++) {
-			RecSegment seg = new RecSegment();
-			RecTape tape = new RecTape();
+			OrkSegment seg = new OrkSegment();
+			OrkTape tape = new OrkTape();
 			
 			tape.setService(service);
 			tape.setFilename("f1.mp3");
@@ -142,7 +142,7 @@ public class FillDatabase {
 			seg.setDuration(duration);
 			tape.setDuration(duration+1);
 			
-			seg.setRecTape(tape);
+			seg.setTape(tape);
 			hbnSession.save(tape);
 			hbnSession.save(seg);
 		}
diff --git a/orkbasej/java/net/sf/oreka/test/FillDatabaseProgram.java b/orkbasej/java/net/sf/oreka/test/FillDatabaseProgram.java
index 8d980bc..b57c26e 100644
--- a/orkbasej/java/net/sf/oreka/test/FillDatabaseProgram.java
+++ b/orkbasej/java/net/sf/oreka/test/FillDatabaseProgram.java
@@ -3,7 +3,7 @@ package net.sf.oreka.test;
 import java.util.List;
 
 import net.sf.oreka.HibernateManager;
-import net.sf.oreka.persistent.RecProgram;
+import net.sf.oreka.persistent.OrkProgram;
 
 import org.hibernate.Criteria;
 import org.hibernate.Session;
@@ -20,12 +20,12 @@ public class FillDatabaseProgram {
 		Session hbnSession = hibernateManager.getSession();
 		Transaction tx = hbnSession.beginTransaction();
 		
-		RecProgram prg = new RecProgram();
+		OrkProgram prg = new OrkProgram();
 		prg.setDescription("my program 1");
 		prg.setName("myprog1");
 		hbnSession.save(prg);
 		
-		prg = new RecProgram();
+		prg = new OrkProgram();
 		prg.setDescription("my program 2");
 		prg.setName("myprog2");
 		hbnSession.save(prg);
@@ -33,7 +33,7 @@ public class FillDatabaseProgram {
 		tx.commit();
 		
 		List recPrograms;
-		Criteria crit = hbnSession.createCriteria(RecProgram.class);
+		Criteria crit = hbnSession.createCriteria(OrkProgram.class);
 		//crit.add( Expression.eq( "color", eg.Color.BLACK ) );
 		//crit.setMaxResults(10);
 		recPrograms = crit.list();
diff --git a/orkbasej/java/net/sf/oreka/test/FillDatabaseUser.java b/orkbasej/java/net/sf/oreka/test/FillDatabaseUser.java
index 6942312..6b14114 100644
--- a/orkbasej/java/net/sf/oreka/test/FillDatabaseUser.java
+++ b/orkbasej/java/net/sf/oreka/test/FillDatabaseUser.java
@@ -4,8 +4,8 @@ import java.util.Collection;
 import java.util.Iterator;
 
 import net.sf.oreka.HibernateManager;
-import net.sf.oreka.persistent.LoginString;
-import net.sf.oreka.persistent.User;
+import net.sf.oreka.persistent.OrkLoginString;
+import net.sf.oreka.persistent.OrkUser;
 
 import org.apache.log4j.PropertyConfigurator;
 import org.hibernate.Session;
@@ -17,7 +17,7 @@ public class FillDatabaseUser {
 	
 	public static void main(String args[]) throws Exception
 	{
-		User usr = null;
+		OrkUser usr = null;
 		
 		try {
 			PropertyConfigurator.configure("c:/oreka/test/log4j.properties");
@@ -28,19 +28,19 @@ public class FillDatabaseUser {
 			Transaction tx = hbnSession.beginTransaction();
 			
 			for(int i=0; i<100; i++) {
-				User user = new User();
+				OrkUser user = new OrkUser();
 				user.setFirstname("fn" + i);
 				user.setLastname("ln" + i);
 				user.setPassword("password");
 				hbnSession.save(user);
 				
-				LoginString ls = new LoginString();
+				OrkLoginString ls = new OrkLoginString();
 				ls.setLoginString("ls" + i);
 				//ls.bidirSetUser(user);
 				ls.setUser(user);
 				hbnSession.save(ls);
 				
-				LoginString ls2 = new LoginString();
+				OrkLoginString ls2 = new OrkLoginString();
 				ls2.setLoginString("ls2" + i);
 				//ls2.bidirSetUser(user);
 				ls2.setUser(user);