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

8 files changed, 45 insertions, 37 deletions

diff --git a/orkweb/context/WEB-INF/RecSegments.html b/orkweb/context/WEB-INF/RecSegments.html
index 75c5263..93ccfdb 100644
--- a/orkweb/context/WEB-INF/RecSegments.html
+++ b/orkweb/context/WEB-INF/RecSegments.html
@@ -124,13 +124,13 @@
 											    </td>
 											    <td><span jwcid="@Insert" value="ognl:item.recSegment.remoteParty">remote party</span></td>
 											    <td>
-											    	<span jwcid="@If" condition="ognl:item.recSegment.recTape != null">
-											      		<span jwcid="@Insert" value="ognl:item.recSegment.recTape.id">tape id</span>
+											    	<span jwcid="@If" condition="ognl:item.recSegment.tape != null">
+											      		<span jwcid="@Insert" value="ognl:item.recSegment.tape.id">tape id</span>
 											      	</span>
 											    </td>
 											    <td>
-											    	<span jwcid="@If" condition="ognl:item.recSegment.recTape != null">
-											      		<a jwcid="@Any" href="ognl:item.recSegment.recTape.playUrl"><img jwcid="@Image" image="asset:play" alt="Play"/></a>
+											    	<span jwcid="@If" condition="ognl:item.recSegment.tape != null">
+											      		<a jwcid="@Any" href="ognl:item.recSegment.tape.playUrl"><img jwcid="@Image" image="asset:play" alt="Play"/></a>
 											      	</span>											    
 											    </td>
 											</tr>
diff --git a/orkweb/context/WEB-INF/RecSegments.properties b/orkweb/context/WEB-INF/RecSegments.properties
index a8606db..1adb6a6 100644
--- a/orkweb/context/WEB-INF/RecSegments.properties
+++ b/orkweb/context/WEB-INF/RecSegments.properties
@@ -15,4 +15,4 @@ lastPage=>>
 previousPage=<
 nextPage=>
 
-NoResults=There was no results
\ No newline at end of file
+NoResults=There were no results
\ No newline at end of file
diff --git a/orkweb/src/net/sf/oreka/pages/HomePage.java b/orkweb/src/net/sf/oreka/pages/HomePage.java
index dc32314..b22ae18 100644
--- a/orkweb/src/net/sf/oreka/pages/HomePage.java
+++ b/orkweb/src/net/sf/oreka/pages/HomePage.java
@@ -15,7 +15,7 @@
 package net.sf.oreka.pages;
 
 import net.sf.oreka.orkweb.ContextListener;
-import net.sf.oreka.persistent.User;
+import net.sf.oreka.persistent.OrkUser;
 import net.sf.oreka.services.UserServiceHbn;
 
 import org.apache.tapestry.IRequestCycle;
@@ -49,7 +49,7 @@ public abstract class HomePage extends OrkPage implements PageBeginRenderListene
 			setUsername("admin");
 		}
 		
-		User user = srv.login(getUsername(), getPassword());
+		OrkUser user = srv.login(getUsername(), getPassword());
 		if (user != null) {
 			getSessionStateObject().setUser(user);
 			cycle.activate("RecSegments");
diff --git a/orkweb/src/net/sf/oreka/pages/SessionStateObject.java b/orkweb/src/net/sf/oreka/pages/SessionStateObject.java
index aba5f29..5b63a9b 100644
--- a/orkweb/src/net/sf/oreka/pages/SessionStateObject.java
+++ b/orkweb/src/net/sf/oreka/pages/SessionStateObject.java
@@ -1,10 +1,10 @@
 package net.sf.oreka.pages;
 
-import net.sf.oreka.persistent.User;
+import net.sf.oreka.persistent.OrkUser;
 
 public class SessionStateObject {
 
-	private User user = null;
+	private OrkUser user = null;
 	
 	public boolean isUserLoggedIn() {
 		if(user == null) {
@@ -13,12 +13,12 @@ public class SessionStateObject {
 		return true;
 	}
 
-	public User getUser() {
+	public OrkUser getUser() {
 		return user;
 	}
 	
 
-	public void setUser(User user) {
+	public void setUser(OrkUser user) {
 		this.user = user;
 	}
 	
diff --git a/orkweb/src/net/sf/oreka/services/RecSegmentResult.java b/orkweb/src/net/sf/oreka/services/RecSegmentResult.java
index fd43ad5..804d940 100644
--- a/orkweb/src/net/sf/oreka/services/RecSegmentResult.java
+++ b/orkweb/src/net/sf/oreka/services/RecSegmentResult.java
@@ -21,20 +21,20 @@ import net.sf.oreka.persistent.*;
 
 public class RecSegmentResult {
 
-	private RecSegment RecSegment;
-	private RecTape RecTape;
+	private OrkSegment RecSegment;
+	private OrkTape RecTape;
 	
 	private String foo = "henri";
 
 	public RecSegmentResult() {
-		RecSegment = new RecSegment();
-		RecTape = new RecTape();
+		RecSegment = new OrkSegment();
+		RecTape = new OrkTape();
 	}
 
 	/**
 	 * @return Returns the recSegment.
 	 */
-	public RecSegment getRecSegment() {
+	public OrkSegment getRecSegment() {
 		return RecSegment;
 	}
 	
@@ -42,14 +42,14 @@ public class RecSegmentResult {
 	/**
 	 * @param recSegment The recSegment to set.
 	 */
-	public void setRecSegment(RecSegment recSegment) {
+	public void setRecSegment(OrkSegment recSegment) {
 		RecSegment = recSegment;
 	}
 
 	/**
 	 * @return Returns the recTape.
 	 */
-	public RecTape getRecTape() {
+	public OrkTape getRecTape() {
 		return RecTape;
 	}
 	
@@ -57,7 +57,7 @@ public class RecSegmentResult {
 	/**
 	 * @param recTape The recTape to set.
 	 */
-	public void setRecTape(RecTape recTape) {
+	public void setRecTape(OrkTape recTape) {
 		RecTape = recTape;
 	}
 
diff --git a/orkweb/src/net/sf/oreka/services/RecSegmentServiceHbn.java b/orkweb/src/net/sf/oreka/services/RecSegmentServiceHbn.java
index 03289f0..e76d8ea 100644
--- a/orkweb/src/net/sf/oreka/services/RecSegmentServiceHbn.java
+++ b/orkweb/src/net/sf/oreka/services/RecSegmentServiceHbn.java
@@ -21,7 +21,7 @@ import java.util.List;
 
 import net.sf.oreka.Direction;
 import net.sf.oreka.orkweb.OrkWeb;
-import net.sf.oreka.persistent.RecSegment;
+import net.sf.oreka.persistent.OrkSegment;
 
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
@@ -94,12 +94,17 @@ public class RecSegmentServiceHbn implements RecSegmentService{
 		{
 			session = OrkWeb.hibernateManager.getSession();
 
-			StringBuffer queryString = new StringBuffer("from RecSegment as seg left join seg.recTape as tape left join tape.service as srv ");
+			StringBuffer queryString = new StringBuffer("from OrkSegment as seg left join seg.tape as tape left join tape.service as srv ");
 			//StringBuffer queryString = new StringBuffer("from RecSegment as seg ");
 
 			//boolean firstCriterium = false;
 			
-			queryString.append(" where seg.timestamp between :startDate and :endDate ");
+			if (filter.getStartDate() != null && filter.getEndDate() != null)
+				queryString.append(" where seg.timestamp between :startDate and :endDate ");
+			else if (filter.getStartDate() != null)
+				queryString.append(" where seg.timestamp > :startDate ");
+			else if (filter.getEndDate() != null)
+				queryString.append(" where seg.timestamp < :endDate ");
 			
 			if(filter.getLocalParty().length() > 0) {
 				queryString.append(" and seg.localParty=:localParty ");
@@ -132,11 +137,14 @@ public class RecSegmentServiceHbn implements RecSegmentService{
 			Query query = session.createQuery(queryString.toString());
 			
 			SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
-			logger.debug("Filter start date:" + dateFormat.format(filter.getStartDate()));
-			query.setTimestamp("startDate", filter.getStartDate());
-			logger.debug("Filter end date:" + dateFormat.format(filter.getEndDate()));
-			query.setTimestamp("endDate", filter.getEndDate());
-			
+			if (filter.getStartDate() != null) {
+				logger.debug("Filter start date:" + dateFormat.format(filter.getStartDate()));
+				query.setTimestamp("startDate", filter.getStartDate());
+			}	
+			if (filter.getEndDate() != null) {
+				logger.debug("Filter end date:" + dateFormat.format(filter.getEndDate()));
+				query.setTimestamp("endDate", filter.getEndDate());
+			}	
 			
 			if(filter.getLocalParty().length() > 0) {
 				query.setString("localParty", filter.getLocalParty());
@@ -174,7 +182,7 @@ public class RecSegmentServiceHbn implements RecSegmentService{
 			while (scrollDocs.get()!= null && rowsSoFar<number)
 			{
 				rowsSoFar++;
-				RecSegment seg = (RecSegment)scrollDocs.get(0);
+				OrkSegment seg = (OrkSegment)scrollDocs.get(0);
 				
 				//logger.log(Level.ERROR, seg.getRecTape().getUrl());
 				
diff --git a/orkweb/src/net/sf/oreka/services/UserService.java b/orkweb/src/net/sf/oreka/services/UserService.java
index 2ac4ff8..b52e701 100644
--- a/orkweb/src/net/sf/oreka/services/UserService.java
+++ b/orkweb/src/net/sf/oreka/services/UserService.java
@@ -1,10 +1,10 @@
 package net.sf.oreka.services;
 
-import net.sf.oreka.persistent.User;
+import net.sf.oreka.persistent.OrkUser;
 
 public interface UserService {
 
-	public User login(String username, String password);
+	public OrkUser login(String username, String password);
 	public boolean changePassword(int userId, String oldPassword, String newPassword);
 	
 }
diff --git a/orkweb/src/net/sf/oreka/services/UserServiceHbn.java b/orkweb/src/net/sf/oreka/services/UserServiceHbn.java
index f78947d..78467cb 100644
--- a/orkweb/src/net/sf/oreka/services/UserServiceHbn.java
+++ b/orkweb/src/net/sf/oreka/services/UserServiceHbn.java
@@ -5,7 +5,7 @@ import java.util.ArrayList;
 import net.sf.oreka.HibernateManager;
 import net.sf.oreka.orkweb.ContextListener;
 import net.sf.oreka.orkweb.OrkWeb;
-import net.sf.oreka.persistent.User;
+import net.sf.oreka.persistent.OrkUser;
 
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
@@ -18,10 +18,10 @@ public class UserServiceHbn implements UserService {
 
 	static Logger logger = Logger.getLogger(UserServiceHbn.class);	
 	
-	public User login(String username, String password) {
+	public OrkUser login(String username, String password) {
 		
 		Session hbnSession = null;
-		User user = null;
+		OrkUser user = null;
 		
 		logger.debug("Trying to login user:" + username + " with passwd:" + password);
 		
@@ -29,7 +29,7 @@ public class UserServiceHbn implements UserService {
 		{
 			hbnSession = OrkWeb.hibernateManager.getSession();
 			
-			String queryString = new String("from LoginString as ls left join ls.user as user where ls.loginString=:ls");
+			String queryString = new String("from OrkLoginString as ls left join ls.user as user where ls.loginString=:ls");
 			if (ContextListener.debugSwitch == false) {
 				queryString = queryString + " and user.password=:password";
 			}
@@ -41,7 +41,7 @@ public class UserServiceHbn implements UserService {
 			ArrayList results = (ArrayList)query.list();
 			Object[] row = (Object[])query.uniqueResult();
 			if (row != null) {
-				user = (User)row[1];
+				user = (OrkUser)row[1];
 				logger.debug("Found userid:" + user.getId() + " for login string:" + username);
 			}
 		}
@@ -62,7 +62,7 @@ public class UserServiceHbn implements UserService {
 		
 		Session hbnSession = null;
 		Transaction tx = null;
-		User user = null;
+		OrkUser user = null;
 		boolean success = false;
 		
 		logger.debug("Trying to change password for userid:" + userId);
@@ -72,7 +72,7 @@ public class UserServiceHbn implements UserService {
 			hbnSession = OrkWeb.hibernateManager.getSession();
 
 			
-			user = (User)hbnSession.get(User.class, userId);
+			user = (OrkUser)hbnSession.get(OrkUser.class, userId);
 			if(user == null) {
 				logger.warn("Userid:" + userId + " does not exist");
 			}