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

11 files changed, 139 insertions, 139 deletions

diff --git a/orktrack/src/net/sf/oreka/orktrack/Port.java b/orktrack/src/net/sf/oreka/orktrack/Port.java
index 72a82fb..e14b127 100644
--- a/orktrack/src/net/sf/oreka/orktrack/Port.java
+++ b/orktrack/src/net/sf/oreka/orktrack/Port.java
@@ -20,34 +20,34 @@ import java.util.LinkedList;
 
 import net.sf.oreka.orktrack.messages.MetadataMessage;
 import net.sf.oreka.orktrack.messages.TapeMessage;
-import net.sf.oreka.persistent.RecPort;
-import net.sf.oreka.persistent.RecPortFace;
-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.OrkPort;
+import net.sf.oreka.persistent.OrkPortFace;
+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.apache.log4j.Logger;
 import org.hibernate.Session;
 
 public class Port {
 
-	public ArrayList<RecPortFace> portFaces = new ArrayList<RecPortFace>();
-	private RecPort recPort = null;
+	public ArrayList<OrkPortFace> portFaces = new ArrayList<OrkPortFace>();
+	private OrkPort recPort = null;
 	private TapeMessage lastTapeMessage = null;
 	private MetadataMessage lastMetadataMessage = null;
-	private User user = null;
+	private OrkUser user = null;
 	
-	private LinkedList<RecSegment> recSegments = new LinkedList<RecSegment> ();
-	private LinkedList<RecTape> recTapes = new LinkedList<RecTape> ();
+	private LinkedList<OrkSegment> recSegments = new LinkedList<OrkSegment> ();
+	private LinkedList<OrkTape> recTapes = new LinkedList<OrkTape> ();
 	
 	static Logger logger = Logger.getLogger(ProgramManager.class);
 	
-	public Port(RecPort recPort) {
+	public Port(OrkPort recPort) {
 		this.recPort = recPort;
 	}
 	
-	private synchronized void addTapeToLocalCache(RecTape tape) {
+	private synchronized void addTapeToLocalCache(OrkTape tape) {
 		
 		if (recTapes.size() > 50) {
 			recTapes.removeLast();
@@ -55,7 +55,7 @@ public class Port {
 		recTapes.addFirst(tape);
 	}
 	
-	private synchronized void addSegmentToLocalCache(RecSegment seg) {
+	private synchronized void addSegmentToLocalCache(OrkSegment seg) {
 		
 		if (recSegments.size() > 50) {
 			recSegments.removeLast();
@@ -63,7 +63,7 @@ public class Port {
 		recSegments.addFirst(seg);
 	}
 	
-	private boolean areTogether(RecTape tape, RecSegment seg) {
+	private boolean areTogether(OrkTape tape, OrkSegment seg) {
 		
 		boolean result = false;
 		long segStartTime = seg.getTimestamp().getTime();
@@ -83,21 +83,21 @@ public class Port {
 		return result;
 	}
 	
-	private void joinTogether(RecTape tape, RecSegment seg, Session hbnSession) {
+	private void joinTogether(OrkTape tape, OrkSegment seg, Session hbnSession) {
 
-		seg.setRecTape(tape);
-		seg.setRecTapeOffset(seg.getTimestamp().getTime() - tape.getTimestamp().getTime());
+		seg.setTape(tape);
+		seg.setTapeOffset(seg.getTimestamp().getTime() - tape.getTimestamp().getTime());
 		hbnSession.save(seg);
 	}
 	
-	private synchronized void findAndAssociateTape(RecSegment segment, Session hbnSession) {
+	private synchronized void findAndAssociateTape(OrkSegment segment, Session hbnSession) {
 		
 		// Iterate over tapes and find the ones corresponding to this segment
-		Iterator<RecTape> it = recTapes.iterator();
+		Iterator<OrkTape> it = recTapes.iterator();
 		boolean foundOne = false;
 		boolean done = false;
 		while (it.hasNext() && !done) {
-			RecTape tape = it.next();
+			OrkTape tape = it.next();
 			if (areTogether(tape, segment)) {
 				joinTogether(tape, segment, hbnSession);
 				logger.info("#" + recPort.getId() + ": associating segment:" + segment.getId() + " with tape:" + tape.getId());
@@ -111,14 +111,14 @@ public class Port {
 		}
 	}
 	
-	private synchronized void findAndAssociateSegment(RecTape tape, Session hbnSession) {
+	private synchronized void findAndAssociateSegment(OrkTape tape, Session hbnSession) {
 		
 		// Iterate over segments and find the ones corresponding to this tape
-		Iterator<RecSegment> it = recSegments.iterator();
+		Iterator<OrkSegment> it = recSegments.iterator();
 		boolean foundOne = false;
 		boolean done = false;
 		while (it.hasNext() && !done) {
-			RecSegment segment = it.next();
+			OrkSegment segment = it.next();
 			if (areTogether(tape, segment)) {
 				joinTogether(tape, segment, hbnSession);
 				logger.info("#" + recPort.getId() + ": associating segment:" + segment.getId() + " with tape:" + tape.getId());
@@ -132,7 +132,7 @@ public class Port {
 		}
 	}
 	
-	public void notifyMetadataMessage(MetadataMessage metadataMessage, Session hbnSession, Service srv) {
+	public void notifyMetadataMessage(MetadataMessage metadataMessage, Session hbnSession, OrkService srv) {
 		
 		long duration = 0;
 		Date startDate = null;
@@ -156,17 +156,17 @@ public class Port {
 			
 			if (srv.isRecordMaster()) {
 				// create segment
-				RecSegment recSegment = new RecSegment();
+				OrkSegment recSegment = new OrkSegment();
 				recSegment.setTimestamp(startDate);
 				recSegment.setDirection(metadataMessage.getDirection());
 				recSegment.setDuration(duration);
 				recSegment.setLocalParty(metadataMessage.getLocalParty());
 				recSegment.setLocalEntryPoint(metadataMessage.getLocalEntryPoint());
-				recSegment.setRecSessionOffset(0);
-				recSegment.setRecPort(recPort);
+				recSegment.setSessionOffset(0);
+				recSegment.setPort(recPort);
 				
 				if(metadataMessage.getLocalParty() != "") {
-					User user = UserManager.instance().getByLoginString(metadataMessage.getLocalParty(), hbnSession);
+					OrkUser user = UserManager.instance().getByLoginString(metadataMessage.getLocalParty(), hbnSession);
 					recSegment.setUser(user);
 				}
 				
@@ -185,7 +185,7 @@ public class Port {
 		}
 	}
 	
-	public void notifyTapeMessage(TapeMessage tapeMessage, Session hbnSession, Service srv) {
+	public void notifyTapeMessage(TapeMessage tapeMessage, Session hbnSession, OrkService srv) {
 		
 		if (tapeMessage.getStage() == TapeMessage.CaptureStage.START) {
 			lastTapeMessage = tapeMessage;
@@ -212,13 +212,13 @@ public class Port {
 				Date timestamp = new Date(date);
 	            
 				// create a new tape record
-				RecTape recTape = new RecTape();
+				OrkTape recTape = new OrkTape();
 				recTape.setDirection(stopMessage.getDirection());
 				recTape.setDuration(duration);
 				recTape.setExpiryTimestamp(new Date());
 				recTape.setFilename(stopMessage.getFilename());
 				recTape.setLocalParty(stopMessage.getLocalParty());
-				recTape.setRecPort(recPort);
+				recTape.setPort(recPort);
 				recTape.setRemoteParty(stopMessage.getRemoteParty());
 				recTape.setTimestamp(timestamp);
 				recTape.setService(srv);
@@ -226,18 +226,18 @@ public class Port {
 				logger.info("#" + tapeMessage.getCapturePort() + ": written tape " + recTape.getId());
 				
 				if (generateSegment) {
-					RecSegment recSegment = new RecSegment();
+					OrkSegment recSegment = new OrkSegment();
 					recSegment.setTimestamp(timestamp);
 					recSegment.setDirection(stopMessage.getDirection());
 					recSegment.setDuration(duration);
 					recSegment.setRemoteParty(stopMessage.getRemoteParty());
 					recSegment.setLocalParty(stopMessage.getLocalParty());
 					recSegment.setLocalEntryPoint(stopMessage.getLocalEntryPoint());
-					recSegment.setRecTape(recTape);
-					recSegment.setRecPort(recPort);
+					recSegment.setTape(recTape);
+					recSegment.setPort(recPort);
 					
 					if(stopMessage.getLocalParty() != "") {
-						User user = UserManager.instance().getByLoginString(stopMessage.getLocalParty(), hbnSession);
+						OrkUser user = UserManager.instance().getByLoginString(stopMessage.getLocalParty(), hbnSession);
 						recSegment.setUser(user);
 					}
 					if (ProgramManager.instance().filterSegmentAgainstAllPrograms(recSegment, hbnSession)) {
@@ -256,19 +256,19 @@ public class Port {
 		}
 	}
 
-	public RecPort getRecPort() {
+	public OrkPort getRecPort() {
 		return recPort;
 	}
 
-	public void setRecPort(RecPort recPort) {
+	public void setRecPort(OrkPort recPort) {
 		this.recPort = recPort;
 	}
 
-	public User getUser() {
+	public OrkUser getUser() {
 		return user;
 	}
 
-	public void setUser(User user) {
+	public void setUser(OrkUser user) {
 		this.user = user;
 	}
 	
diff --git a/orktrack/src/net/sf/oreka/orktrack/PortManager.java b/orktrack/src/net/sf/oreka/orktrack/PortManager.java
index 60a40c0..f7a4a2f 100644
--- a/orktrack/src/net/sf/oreka/orktrack/PortManager.java
+++ b/orktrack/src/net/sf/oreka/orktrack/PortManager.java
@@ -17,9 +17,9 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 
-import net.sf.oreka.persistent.RecPort;
-import net.sf.oreka.persistent.RecPortFace;
-import net.sf.oreka.persistent.Service;
+import net.sf.oreka.persistent.OrkPort;
+import net.sf.oreka.persistent.OrkPortFace;
+import net.sf.oreka.persistent.OrkService;
 
 import org.apache.log4j.Logger;
 import org.hibernate.Session;
@@ -49,7 +49,7 @@ public class PortManager {
 		return portByName.get(name);
 	}
 	
-	public Port getAndCreatePort(String name, Session hbnSession, Service service) {
+	public Port getAndCreatePort(String name, Session hbnSession, OrkService service) {
 		
 		Port port = portByName.get(name);
 		if (port == null) {
@@ -59,24 +59,24 @@ public class PortManager {
 		return port; 
 	}
 	
-	public synchronized Port createPort(String name, Session hbnSession, Service service) {
+	public synchronized Port createPort(String name, Session hbnSession, OrkService service) {
 		
-		RecPort recPort = null;
+		OrkPort recPort = null;
 
-		RecPortFace portFace = (RecPortFace)hbnSession.get(RecPortFace.class, name);
+		OrkPortFace portFace = (OrkPortFace)hbnSession.get(OrkPortFace.class, name);
 		if (portFace == null) {
-			portFace  = new RecPortFace();
+			portFace  = new OrkPortFace();
 			portFace.setName(name);
-			portFace.setRecPort(recPort);
+			portFace.setPort(recPort);
 			portFace.setService(service);
 			
-			recPort = new RecPort();
-			portFace.setRecPort(recPort);
+			recPort = new OrkPort();
+			portFace.setPort(recPort);
 		}
 		else {
-			portFace.setRecPort(recPort);
+			portFace.setPort(recPort);
 			portFace.setService(service);
-			recPort = portFace.getRecPort();
+			recPort = portFace.getPort();
 		}
 		
 		hbnSession.save(recPort);
@@ -94,14 +94,14 @@ public class PortManager {
 	// for testing purposes
 	public void addPort(String face1, String face2, Session hbnSession) {
 		
-		RecPort recPort = new RecPort();
+		OrkPort recPort = new OrkPort();
 		Port port = new Port(recPort);
-		RecPortFace portFace1 = new RecPortFace();
+		OrkPortFace portFace1 = new OrkPortFace();
 		portFace1.setName(face1);
-		portFace1.setRecPort(recPort);
-		RecPortFace portFace2 = new RecPortFace();
+		portFace1.setPort(recPort);
+		OrkPortFace portFace2 = new OrkPortFace();
 		portFace2.setName(face2);
-		portFace2.setRecPort(recPort);
+		portFace2.setPort(recPort);
 		
 		hbnSession.save(recPort);
 		hbnSession.save(portFace1);
@@ -123,17 +123,17 @@ public class PortManager {
 			Transaction tx = hbnSession.beginTransaction();
 			
 			Iterator portFaces = hbnSession.createQuery(
-        	"from RecPortFace")
+        	"from OrkPortFace")
         	.list()
         	.iterator();
 
 			while ( portFaces.hasNext() ) {
-			    RecPortFace portFace = (RecPortFace)portFaces.next();
+			    OrkPortFace portFace = (OrkPortFace)portFaces.next();
 			    
-			    int portId = portFace.getRecPort().getId();
+			    int portId = portFace.getPort().getId();
 			    Port port = portById.get(portId);
 			    if(port == null) {
-			    	RecPort recPort = (RecPort)hbnSession.get(RecPort.class, portId);
+			    	OrkPort recPort = (OrkPort)hbnSession.get(OrkPort.class, portId);
 			    	if (recPort != null) {
 				    	port = new Port(recPort);
 				    	portById.put(portId, port);
@@ -154,16 +154,16 @@ public class PortManager {
 		return success;
 	}
 	
-	public RecPort getRecPortByFace(String face, Session hbnSession) {
-		RecPort port = null;
+	public OrkPort getRecPortByFace(String face, Session hbnSession) {
+		OrkPort port = null;
 		List ports = hbnSession.createQuery(
-	    "from RecPortFace as pf join pf.recPort as p where pf.name=:face")
+	    "from OrkPortFace as pf join pf.port as p where pf.name=:face")
 	    .setString("face", face)
 	    .list();
 		if (ports.size() > 0) {
 			Object[] row =  (Object[])ports.get(0);
 			if (row.length > 1) {
-				port = (RecPort)row[1];
+				port = (OrkPort)row[1];
 			}
 		}
 		return port;
diff --git a/orktrack/src/net/sf/oreka/orktrack/ProgramManager.java b/orktrack/src/net/sf/oreka/orktrack/ProgramManager.java
index b7b78bd..6e30d73 100644
--- a/orktrack/src/net/sf/oreka/orktrack/ProgramManager.java
+++ b/orktrack/src/net/sf/oreka/orktrack/ProgramManager.java
@@ -20,8 +20,8 @@ import java.util.List;
 import net.sf.oreka.Cycle;
 import net.sf.oreka.Direction;
 import net.sf.oreka.HibernateManager;
-import net.sf.oreka.persistent.RecProgram;
-import net.sf.oreka.persistent.RecSegment;
+import net.sf.oreka.persistent.OrkProgram;
+import net.sf.oreka.persistent.OrkSegment;
 
 import org.apache.log4j.Logger;
 import org.hibernate.Session;
@@ -32,7 +32,7 @@ public class ProgramManager {
 	static Logger logger = Logger.getLogger(ProgramManager.class);
 	
 	private static ProgramManager programManager = null;
-	private ArrayList<RecProgram> recPrograms = new ArrayList<RecProgram>();
+	private ArrayList<OrkProgram> recPrograms = new ArrayList<OrkProgram>();
 	
 	private ProgramManager() {
 	}
@@ -56,12 +56,12 @@ public class ProgramManager {
 			tx = hbnSession.beginTransaction();
 			
 			List progs = hbnSession.createQuery(
-		    "from RecProgram as prg where prg.active=:active and prg.discarded=:discarded")
+		    "from OrkProgram as prg where prg.active=:active and prg.discarded=:discarded")
 		    .setBoolean("active", true)
 		    .setBoolean("discarded", false)
 		    .list();
 			
-			recPrograms = new ArrayList<RecProgram>(progs);
+			recPrograms = new ArrayList<OrkProgram>(progs);
 			tx.commit();
 			success = true;
 		}
@@ -74,16 +74,16 @@ public class ProgramManager {
 		return success;
 	}
 	
-	public void addProgram(RecProgram prog) {
+	public void addProgram(OrkProgram prog) {
 		
 		recPrograms.add(prog);
 	}
 	
-	public boolean filterSegmentAgainstAllPrograms(RecSegment seg, Session hbnSession) {
+	public boolean filterSegmentAgainstAllPrograms(OrkSegment seg, Session hbnSession) {
 		
 		boolean result = false;
 		// Iterate over programs
-		ArrayList<RecProgram> progs = recPrograms;
+		ArrayList<OrkProgram> progs = recPrograms;
 		if(recPrograms.size() == 0) {
 			// If there are no programs specified, keep everything
 			result = true;
@@ -98,7 +98,7 @@ public class ProgramManager {
 		return result;
 	}
 	
-	public boolean filterSegmentAgainstProgram(RecSegment seg, RecProgram prog, Session hbnSession) {
+	public boolean filterSegmentAgainstProgram(OrkSegment seg, OrkProgram prog, Session hbnSession) {
 		
 		boolean drop = false;
 		boolean result = false;
@@ -151,7 +151,7 @@ public class ProgramManager {
 		
 		if (	!drop &&
 				(prog.getTargetPort() != null) &&
-				(seg.getRecPort().getId() != prog.getTargetPort().getId())   ) {
+				(seg.getPort().getId() != prog.getTargetPort().getId())   ) {
 			dropReason = "Target Port";
 			drop = true;
 		}
@@ -184,7 +184,7 @@ public class ProgramManager {
 		return result;
 	}
 	
-	public boolean filterSegmentAgainstProgramSchedule(RecSegment seg, RecProgram prog) {
+	public boolean filterSegmentAgainstProgramSchedule(OrkSegment seg, OrkProgram prog) {
 		
 		if(prog.getCycle() == Cycle.PERMANENT) {
 			return true;
diff --git a/orktrack/src/net/sf/oreka/orktrack/ServiceManager.java b/orktrack/src/net/sf/oreka/orktrack/ServiceManager.java
index d52a0eb..df3bb7d 100644
--- a/orktrack/src/net/sf/oreka/orktrack/ServiceManager.java
+++ b/orktrack/src/net/sf/oreka/orktrack/ServiceManager.java
@@ -15,7 +15,7 @@ package net.sf.oreka.orktrack;
 
 import java.util.List;
 
-import net.sf.oreka.persistent.Service;
+import net.sf.oreka.persistent.OrkService;
 
 import org.apache.log4j.Logger;
 import org.hibernate.Session;
@@ -24,11 +24,11 @@ public class ServiceManager {
 	
 	static Logger logger = Logger.getLogger(ServiceManager.class);
 	
-	public static Service retrieveOrCreate(String name, String hostname, Session hbnSession) {
-		Service service = retrieveByName(name, hbnSession);
+	public static OrkService retrieveOrCreate(String name, String hostname, Session hbnSession) {
+		OrkService service = retrieveByName(name, hbnSession);
 		if (service == null) {
 			logger.info("Creating service:" + name + " on host:" + hostname );
-			service = new Service();
+			service = new OrkService();
 			service.setName(name);
 			service.setHostname(hostname);
 			service.setFileServeProtocol("http");
@@ -42,15 +42,15 @@ public class ServiceManager {
 		return service;
 	}
 	
-	public static Service retrieveByName(String name, Session hbnSession) {
+	public static OrkService retrieveByName(String name, Session hbnSession) {
 		
-		Service service = null;
+		OrkService service = null;
 		List services = hbnSession.createQuery(
-	    "from Service as srv where srv.name=:name")
+	    "from OrkService as srv where srv.name=:name")
 	    .setString("name", name)
 	    .list();
 		if (services.size() > 0) {
-			service =  (Service)services.get(0);
+			service =  (OrkService)services.get(0);
 		}
 		return service;
 	}
diff --git a/orktrack/src/net/sf/oreka/orktrack/TapeManager.java b/orktrack/src/net/sf/oreka/orktrack/TapeManager.java
index 66e15ae..483fc4a 100644
--- a/orktrack/src/net/sf/oreka/orktrack/TapeManager.java
+++ b/orktrack/src/net/sf/oreka/orktrack/TapeManager.java
@@ -3,10 +3,10 @@ package net.sf.oreka.orktrack;
 import java.util.Date;
 
 import net.sf.oreka.orktrack.messages.TapeMessage;
-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.OrkSegment;
+import net.sf.oreka.persistent.OrkTape;
+import net.sf.oreka.persistent.OrkService;
+import net.sf.oreka.persistent.OrkUser;
 
 import org.apache.log4j.Logger;
 import org.hibernate.Session;
@@ -33,7 +33,7 @@ public class TapeManager {
 	 * @param srv
 	 * @return	false if the tape is rejected and should be deleted, otherwise true
 	 */
-	public boolean notifyTapeMessage(TapeMessage tapeMessage, Session hbnSession, Service srv) {
+	public boolean notifyTapeMessage(TapeMessage tapeMessage, Session hbnSession, OrkService srv) {
 		
 		boolean keepTape = true;
 		
@@ -46,31 +46,31 @@ public class TapeManager {
 			Date timestamp = new Date(date);
             
 			// create a new tape record
-			RecTape recTape = new RecTape();
+			OrkTape recTape = new OrkTape();
 			recTape.setDirection(tapeMessage.getDirection());
 			recTape.setDuration(tapeMessage.getDuration());
 			recTape.setExpiryTimestamp(new Date());
 			recTape.setFilename(tapeMessage.getFilename());
 			recTape.setLocalParty(tapeMessage.getLocalParty());
-			recTape.setRecPortName(tapeMessage.getCapturePort());
+			recTape.setPortName(tapeMessage.getCapturePort());
 			recTape.setRemoteParty(tapeMessage.getRemoteParty());
 			recTape.setTimestamp(timestamp);
 			recTape.setService(srv);
 			hbnSession.save(recTape);
 			logger.info("Written tape:" + tapeMessage.getRecId() + " as " + recTape.getId());
 			
-			RecSegment recSegment = new RecSegment();
+			OrkSegment recSegment = new OrkSegment();
 			recSegment.setTimestamp(timestamp);
 			recSegment.setDirection(tapeMessage.getDirection());
 			recSegment.setDuration(tapeMessage.getDuration());
 			recSegment.setRemoteParty(tapeMessage.getRemoteParty());
 			recSegment.setLocalParty(tapeMessage.getLocalParty());
 			recSegment.setLocalEntryPoint(tapeMessage.getLocalEntryPoint());
-			recSegment.setRecTape(recTape);
-			recSegment.setRecPortName(recTape.getRecPortName());
+			recSegment.setTape(recTape);
+			recSegment.setPortName(recTape.getPortName());
 			
 			if(tapeMessage.getLocalParty() != "") {
-				User user = UserManager.instance().getByLoginString(tapeMessage.getLocalParty(), hbnSession);
+				OrkUser user = UserManager.instance().getByLoginString(tapeMessage.getLocalParty(), hbnSession);
 				recSegment.setUser(user);
 			}
 			if (ProgramManager.instance().filterSegmentAgainstAllPrograms(recSegment, hbnSession)) {
diff --git a/orktrack/src/net/sf/oreka/orktrack/UserManager.java b/orktrack/src/net/sf/oreka/orktrack/UserManager.java
index 4c5ce02..22f490c 100644
--- a/orktrack/src/net/sf/oreka/orktrack/UserManager.java
+++ b/orktrack/src/net/sf/oreka/orktrack/UserManager.java
@@ -16,7 +16,7 @@ package net.sf.oreka.orktrack;
 import java.util.HashMap;
 import java.util.List;
 
-import net.sf.oreka.persistent.User;
+import net.sf.oreka.persistent.OrkUser;
 
 import org.apache.log4j.Logger;
 import org.hibernate.Session;
@@ -26,7 +26,7 @@ public class UserManager {
 	private static Logger log = null;
 	private static UserManager userManager = null;
 	
-	private HashMap<User, Port> userLocations = new HashMap<User, Port>();
+	private HashMap<OrkUser, Port> userLocations = new HashMap<OrkUser, Port>();
 	
 	private UserManager() {
 		log = LogManager.getInstance().getUserLogger();
@@ -40,27 +40,27 @@ public class UserManager {
 		return userManager;
 	}
 	
-	public User getByLoginString(String loginString, Session hbnSession) {
+	public OrkUser getByLoginString(String loginString, Session hbnSession) {
 		
-		User user = null;
+		OrkUser user = null;
 		List users = hbnSession.createQuery(
-	    "from LoginString as ls join ls.user as usr where ls.loginString=:loginstring")
+	    "from OrkLoginString as ls join ls.user as usr where ls.loginString=:loginstring")
 	    .setString("loginstring", loginString)
 	    .list();
 		if (users.size() > 0) {
 			Object[] row =  (Object[])users.get(0);
 			if (row.length > 1) {
-				user = (User)row[1];
+				user = (OrkUser)row[1];
 			}
 		}
 		return user;
 	}
 	
-	public synchronized void setUserLocation(User user, Port port) {
+	public synchronized void setUserLocation(OrkUser user, Port port) {
 		userLocations.put(user, port);
 	}
 	
-	public synchronized Port getUserLocation(User user) {
+	public synchronized Port getUserLocation(OrkUser user) {
 		return userLocations.get(user);
 	}
 }
diff --git a/orktrack/src/net/sf/oreka/orktrack/messages/MetadataMessage.java b/orktrack/src/net/sf/oreka/orktrack/messages/MetadataMessage.java
index abf37e4..c815d4c 100644
--- a/orktrack/src/net/sf/oreka/orktrack/messages/MetadataMessage.java
+++ b/orktrack/src/net/sf/oreka/orktrack/messages/MetadataMessage.java
@@ -24,7 +24,7 @@ import net.sf.oreka.orktrack.Port;
 import net.sf.oreka.orktrack.PortManager;
 import net.sf.oreka.orktrack.ServiceManager;
 import net.sf.oreka.orktrack.messages.TapeMessage.CaptureStage;
-import net.sf.oreka.persistent.Service;
+import net.sf.oreka.persistent.OrkService;
 import net.sf.oreka.serializers.OrkSerializer;
 import net.sf.oreka.serializers.SingleLineSerializer;
 
@@ -65,7 +65,7 @@ public class MetadataMessage  extends SyncMessage {
 	        SingleLineSerializer ser = new SingleLineSerializer();
 	        log.info("Message: " + ser.serialize(this));
 	        
-			Service service = ServiceManager.retrieveByName(this.service, session);
+			OrkService service = ServiceManager.retrieveByName(this.service, session);
 			
 			if (service != null) {
 				Port port = PortManager.instance().getAndCreatePort(this.getCapturePort(), session, service);
diff --git a/orktrack/src/net/sf/oreka/orktrack/messages/TapeMessage.java b/orktrack/src/net/sf/oreka/orktrack/messages/TapeMessage.java
index aede055..7ca5c2e 100644
--- a/orktrack/src/net/sf/oreka/orktrack/messages/TapeMessage.java
+++ b/orktrack/src/net/sf/oreka/orktrack/messages/TapeMessage.java
@@ -22,7 +22,7 @@ import net.sf.oreka.orktrack.LogManager;
 import net.sf.oreka.orktrack.OrkTrack;
 import net.sf.oreka.orktrack.ServiceManager;
 import net.sf.oreka.orktrack.TapeManager;
-import net.sf.oreka.persistent.Service;
+import net.sf.oreka.persistent.OrkService;
 import net.sf.oreka.serializers.OrkSerializer;
 import net.sf.oreka.serializers.SingleLineSerializer;
 
@@ -81,7 +81,7 @@ public class TapeMessage extends SyncMessage {
 	        SingleLineSerializer ser = new SingleLineSerializer();
 	        logger.info("Message: " + ser.serialize(this));
 	        
-			Service service = ServiceManager.retrieveOrCreate(this.service, this.getHostname(), session);
+			OrkService service = ServiceManager.retrieveOrCreate(this.service, this.getHostname(), session);
 			
 			//Port port = PortManager.instance().getAndCreatePort(this.getCapturePort(), session, service);
 			//port.notifyTapeMessage(this, session, service);
diff --git a/orktrack/src/net/sf/oreka/orktrack/messages/UserStateMessage.java b/orktrack/src/net/sf/oreka/orktrack/messages/UserStateMessage.java
index e6cdf12..886d8ed 100644
--- a/orktrack/src/net/sf/oreka/orktrack/messages/UserStateMessage.java
+++ b/orktrack/src/net/sf/oreka/orktrack/messages/UserStateMessage.java
@@ -23,7 +23,7 @@ import net.sf.oreka.orktrack.OrkTrack;
 import net.sf.oreka.orktrack.Port;
 import net.sf.oreka.orktrack.PortManager;
 import net.sf.oreka.orktrack.UserManager;
-import net.sf.oreka.persistent.User;
+import net.sf.oreka.persistent.OrkUser;
 import net.sf.oreka.serializers.OrkSerializer;
 
 import org.apache.log4j.Logger;
@@ -57,7 +57,7 @@ public class UserStateMessage extends SyncMessage {
 			hbnSession = OrkTrack.hibernateManager.getSession();
 	        tx = hbnSession.beginTransaction();
 	        // find out user
-	        User user = UserManager.instance().getByLoginString(loginString, hbnSession);
+	        OrkUser user = UserManager.instance().getByLoginString(loginString, hbnSession);
 	        if (user == null) {
 	        	comment = "Could not find user for login string:" + loginString;
 	        	log.warn(comment);
diff --git a/orktrack/src/net/sf/oreka/orktrack/test/PortTest.java b/orktrack/src/net/sf/oreka/orktrack/test/PortTest.java
index 9359ffb..7ab17d7 100644
--- a/orktrack/src/net/sf/oreka/orktrack/test/PortTest.java
+++ b/orktrack/src/net/sf/oreka/orktrack/test/PortTest.java
@@ -28,12 +28,12 @@ import net.sf.oreka.orktrack.ProgramManager;
 import net.sf.oreka.orktrack.ServiceManager;
 import net.sf.oreka.orktrack.messages.MetadataMessage;
 import net.sf.oreka.orktrack.messages.TapeMessage;
-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;
@@ -190,14 +190,14 @@ public class PortTest extends TestCase {
 		
 		Session hbnSession = OrkTrack.hibernateManager.getSession();
 		Transaction tx = hbnSession.beginTransaction();
-		Service recService = ServiceManager.retrieveOrCreate("recservice", "localhost", hbnSession);
-		Service ctiService = ServiceManager.retrieveOrCreate("ctiservice", "localhost", hbnSession);		
+		OrkService recService = ServiceManager.retrieveOrCreate("recservice", "localhost", hbnSession);
+		OrkService ctiService = ServiceManager.retrieveOrCreate("ctiservice", "localhost", hbnSession);		
 		ctiService.setRecordMaster(true);
 		hbnSession.save(recService);
 		
-		User user = new User();
+		OrkUser user = new OrkUser();
 		user.setFirstname("salisse");
-		LoginString ls = new LoginString();
+		OrkLoginString ls = new OrkLoginString();
 		ls.setUser(user);
 		ls.setLoginString("1973");
 		hbnSession.save(user);
@@ -206,7 +206,7 @@ public class PortTest extends TestCase {
 		PortManager.instance().addPort("recport", "ctiport", hbnSession);
 		
 		// create program that does not filter anything
-		RecProgram prog1 = new RecProgram();
+		OrkProgram prog1 = new OrkProgram();
 		hbnSession.save(prog1);
 		ProgramManager.instance().addProgram(prog1);
 		
@@ -264,21 +264,21 @@ public class PortTest extends TestCase {
 		GregorianCalendar cal = new GregorianCalendar();
 		cal.setTimeInMillis(time);
 			
-		RecSegment seg = null;
+		OrkSegment seg = null;
 		Iterator segments = hbnSession.createQuery(
 	    	"from RecSegment as seg where seg.timestamp=:date")
 	    	.setCalendar("date", cal)
 	    	.list()
 	    	.iterator();
 		if(segments.hasNext()) {
-			seg = (RecSegment)segments.next();
+			seg = (OrkSegment)segments.next();
 			assertTrue(seg.getLocalParty().equals("1973"));
-			assertTrue(seg.getRecTapeOffset() == 3000);
+			assertTrue(seg.getTapeOffset() == 3000);
 			
-			RecTape tape = seg.getRecTape();
+			OrkTape tape = seg.getTape();
 			assertTrue(tape.getFilename().equals("test.wav"));
 			
-			User user2 = seg.getUser();
+			OrkUser user2 = seg.getUser();
 			assertTrue(user.getId() == user2.getId());
 		}
 		else {
diff --git a/orktrack/src/net/sf/oreka/orktrack/test/ProgramTest.java b/orktrack/src/net/sf/oreka/orktrack/test/ProgramTest.java
index 26325eb..7274e32 100644
--- a/orktrack/src/net/sf/oreka/orktrack/test/ProgramTest.java
+++ b/orktrack/src/net/sf/oreka/orktrack/test/ProgramTest.java
@@ -26,10 +26,10 @@ import net.sf.oreka.Direction;
 import net.sf.oreka.HibernateManager;
 import net.sf.oreka.orktrack.OrkTrack;
 import net.sf.oreka.orktrack.ProgramManager;
-import net.sf.oreka.persistent.LoginString;
-import net.sf.oreka.persistent.RecProgram;
-import net.sf.oreka.persistent.RecSegment;
-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.OrkUser;
 
 import org.hibernate.Session;
 import org.hibernate.Transaction;
@@ -53,16 +53,16 @@ public class ProgramTest extends TestCase {
 		Transaction tx = hbnSession.beginTransaction();
 	
 		// create a user
-		User user = new User();
+		OrkUser user = new OrkUser();
 		user.setFirstname("mawagade");
 		hbnSession.save(user);
-		LoginString ls = new LoginString();
+		OrkLoginString ls = new OrkLoginString();
 		ls.setLoginString("1234");
 		ls.setUser(user);
 		hbnSession.save(ls);
 		
 		// create a program
-		RecProgram prog1 = new RecProgram();
+		OrkProgram prog1 = new OrkProgram();
 		prog1.setDirection(Direction.IN);
 		prog1.setTargetUser(user);
 		hbnSession.save(prog1);
@@ -73,7 +73,7 @@ public class ProgramTest extends TestCase {
 		ProgramManager.instance().load();
 		
 		// segment 1: should pass
-		RecSegment seg = new RecSegment();
+		OrkSegment seg = new OrkSegment();
 		seg.setDirection(Direction.IN);
 		seg.setUser(user);
 		
@@ -88,9 +88,9 @@ public class ProgramTest extends TestCase {
 
 		hbnSession = OrkTrack.hibernateManager.getSession();
 		tx = hbnSession.beginTransaction();
-		RecProgram prog = (RecProgram)hbnSession.load(RecProgram.class, prog1.getId());
+		OrkProgram prog = (OrkProgram)hbnSession.load(OrkProgram.class, prog1.getId());
 		assertTrue(prog.getRecordedSoFar() == 1);
-		Iterator<RecSegment> it = prog.getRecSegments().iterator();
+		Iterator<OrkSegment> it = prog.getRecSegments().iterator();
 		assertTrue(it.next().getId() == seg.getId());
 		tx.commit();
 		hbnSession.close();
@@ -99,14 +99,14 @@ public class ProgramTest extends TestCase {
 	public void testSchedule() throws Exception {
 		
 		// create a "daily" program
-		RecProgram progDaily = new RecProgram();
+		OrkProgram progDaily = new OrkProgram();
 		progDaily.setDirection(Direction.ALL);
 		progDaily.setCycle(Cycle.DAILY);
 		progDaily.setStartTime(new Date(10*3600*1000));	// 10:00 am
 		progDaily.setStopTime(new Date(11*3600*1000));  // 11:00 am
 		
 		// create a "weekly" program
-		RecProgram progWeekly = new RecProgram();
+		OrkProgram progWeekly = new OrkProgram();
 		progWeekly.setDirection(Direction.ALL);
 		progWeekly.setCycle(Cycle.WEEKLY);
 		progWeekly.setStartDay(Day.TUESDAY);
@@ -116,7 +116,7 @@ public class ProgramTest extends TestCase {
 
 
 		// segment 1: should pass
-		RecSegment seg = new RecSegment();
+		OrkSegment seg = new OrkSegment();
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		Date segTimestamp = sdf.parse("2005-11-29 10:30:00");
 		seg.setTimestamp(segTimestamp);  // 10:30