Enums now employ uppercase values

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

13 files changed, 55 insertions, 40 deletions

diff --git a/orkbasej/java/net/sf/oreka/Cycle.java b/orkbasej/java/net/sf/oreka/Cycle.java
index 1d48893..392c90a 100644
--- a/orkbasej/java/net/sf/oreka/Cycle.java
+++ b/orkbasej/java/net/sf/oreka/Cycle.java
@@ -13,4 +13,4 @@
 
 package net.sf.oreka;
 
-public enum Cycle {permanent, hourly, daily, weekly, monthly, unknown}
+public enum Cycle {PERMANENT, HOURLY, DAILY, WEEKLY, MONTHLY, UNKN}
diff --git a/orkbasej/java/net/sf/oreka/ServiceClass.java b/orkbasej/java/net/sf/oreka/ServiceClass.java
index 6e8abde..bb44b8c 100644
--- a/orkbasej/java/net/sf/oreka/ServiceClass.java
+++ b/orkbasej/java/net/sf/oreka/ServiceClass.java
@@ -13,4 +13,4 @@
 
 package net.sf.oreka;
 
-public enum ServiceClass {unkn, audio, cti}
+public enum ServiceClass {UNKN, AUDIO, CTI}
diff --git a/orkbasej/java/net/sf/oreka/persistent/RecProgram.java b/orkbasej/java/net/sf/oreka/persistent/RecProgram.java
index 48d8bdb..55f152f 100644
--- a/orkbasej/java/net/sf/oreka/persistent/RecProgram.java
+++ b/orkbasej/java/net/sf/oreka/persistent/RecProgram.java
@@ -49,7 +49,7 @@ public class RecProgram {
 	private int minDuration = 0;
 	private int maxDuration = 0;
 	private double randomPercent = 0.0;
-	private Cycle cycle = Cycle.permanent;
+	private Cycle cycle = Cycle.PERMANENT;
 	private int startDay = 0;
 	private int stopDay = 0;
 	private Date startTime;
diff --git a/orkbasej/java/net/sf/oreka/persistent/Service.java b/orkbasej/java/net/sf/oreka/persistent/Service.java
index 361676a..6eac75a 100644
--- a/orkbasej/java/net/sf/oreka/persistent/Service.java
+++ b/orkbasej/java/net/sf/oreka/persistent/Service.java
@@ -42,7 +42,7 @@ public class Service {
 	 * 
 	 */
 	public Service() {
-		serviceClass = ServiceClass.unkn;
+		serviceClass = ServiceClass.UNKN;
 	}
 	
 	/**
diff --git a/orkbasej/java/net/sf/oreka/serializers/OrkSerializer.java b/orkbasej/java/net/sf/oreka/serializers/OrkSerializer.java
index f4b0d54..4640df0 100644
--- a/orkbasej/java/net/sf/oreka/serializers/OrkSerializer.java
+++ b/orkbasej/java/net/sf/oreka/serializers/OrkSerializer.java
@@ -221,7 +221,7 @@ public abstract class OrkSerializer {
 		}
 		else
 		{
-			stringValue = stringValue.toLowerCase();
+			stringValue = stringValue.toUpperCase();
 			Class valueClass = oldValue.getClass();
 			try
 			{
diff --git a/orkbasej/java/net/sf/oreka/serializers/ServletRequestSerializer.java b/orkbasej/java/net/sf/oreka/serializers/ServletRequestSerializer.java
index 8eded74..84650bd 100644
--- a/orkbasej/java/net/sf/oreka/serializers/ServletRequestSerializer.java
+++ b/orkbasej/java/net/sf/oreka/serializers/ServletRequestSerializer.java
@@ -22,7 +22,6 @@ import net.sf.oreka.OrkObjectFactory;
 public class ServletRequestSerializer extends OrkSerializer {
 
 	HttpServletRequest request = null;
-	final String classMarker = "cmd";
 	
 	public OrkObject deSerialize(HttpServletRequest request) throws OrkException
 	{
@@ -30,14 +29,17 @@ public class ServletRequestSerializer extends OrkSerializer {
 		deserialize = true;		// Set DeSerialize mode
 		
 		// Instanciate the right object
-		String classMarker2 = (String)request.getParameterNames().nextElement();
+		//String classMarker = (String)request.getParameterNames().nextElement();
 		String orkClass = null;
-		if(classMarker2 != null)
-		{	
-			orkClass = request.getParameter(classMarker2);
-		}
+		orkClass = request.getParameter("class");
 		if(orkClass == null) {
-			throw (new OrkException("ServletRequestSerializer.deSerialize: where is the command in:" + request.getQueryString()));
+			orkClass = request.getParameter("cmd");
+			if(orkClass == null) {
+				orkClass = request.getParameter("type");
+			}
+			else {
+				throw (new OrkException("ServletRequestSerializer.deSerialize: where is the command in:" + request.getQueryString()));			
+			}
 		}
 
 		OrkObject obj = OrkObjectFactory.instance().newOrkObject(orkClass.toLowerCase());
diff --git a/orktrack/src/net/sf/oreka/orktrack/CommandServlet.java b/orktrack/src/net/sf/oreka/orktrack/CommandServlet.java
index cf8fc1a..5a4dddd 100644
--- a/orktrack/src/net/sf/oreka/orktrack/CommandServlet.java
+++ b/orktrack/src/net/sf/oreka/orktrack/CommandServlet.java
@@ -39,7 +39,7 @@ public class CommandServlet extends HttpServlet {
     public void doGet(HttpServletRequest request, HttpServletResponse response)
     throws IOException, ServletException
     {
-		OrkObjectFactory.instance().registerOrkObject(new TestMessage());
+		//#####OrkObjectFactory.instance().registerOrkObject(new TestMessage());
 		
 		ServletRequestSerializer ser = new ServletRequestSerializer();
 		
@@ -47,20 +47,27 @@ public class CommandServlet extends HttpServlet {
 			SyncMessage obj = (SyncMessage)ser.deSerialize(request);
 			AsyncMessage rsp = obj.process();
 			SingleLineSerializer ser2 = new SingleLineSerializer();
+			String req = ser2.serialize(obj);
+			logger.debug("Request: " + req);			
 			PrintWriter out = response.getWriter();
-			out.println(ser2.serialize(rsp));
+			String resp = ser2.serialize(rsp);
+			logger.debug("Reponse: " + resp);
+			out.println(resp);
 		}
 		catch (Exception e) {
+			logger.debug("Request: " + request.getQueryString());
 			SimpleResponseMessage rsp = new SimpleResponseMessage();
 			rsp.setComment(e.getMessage());
 			rsp.setSuccess(false);
 			SingleLineSerializer ser2 = new SingleLineSerializer();
 			PrintWriter out = response.getWriter();
 			try {
-				out.println(ser2.serialize(rsp));
+				String resp = ser2.serialize(rsp);
+				logger.debug("Reponse: " + resp);
+				out.println(resp);
 			}
 			catch (OrkException ae) {
-				out.println("Error:" + ae.getMessage());
+				logger.error("Error:" + ae.getMessage());
 			}
 		}
 		
diff --git a/orktrack/src/net/sf/oreka/orktrack/Port.java b/orktrack/src/net/sf/oreka/orktrack/Port.java
index 5831841..e786c75 100644
--- a/orktrack/src/net/sf/oreka/orktrack/Port.java
+++ b/orktrack/src/net/sf/oreka/orktrack/Port.java
@@ -138,17 +138,17 @@ public class Port {
 		long duration = 0;
 		Date startDate = null;
 		
-		if (metadataMessage.getStage() == TapeMessage.CaptureStage.start) {
+		if (metadataMessage.getStage() == TapeMessage.CaptureStage.START) {
 			lastMetadataMessage = metadataMessage;
 		}
-		else if (metadataMessage.getStage() == TapeMessage.CaptureStage.stop) {
+		else if (metadataMessage.getStage() == TapeMessage.CaptureStage.STOP) {
 			
 			if (lastMetadataMessage != null) {
 				duration = ((long)metadataMessage.getTimestamp() - (long)lastMetadataMessage.getTimestamp())*1000;
 				startDate = new Date((long)lastMetadataMessage.getTimestamp()*1000);
 			}
 		}
-		else if (metadataMessage.getStage() == TapeMessage.CaptureStage.complete) {
+		else if (metadataMessage.getStage() == TapeMessage.CaptureStage.COMPLETE) {
 			duration = (long)metadataMessage.getDuration()*1000;
 			startDate = new Date(metadataMessage.getTimestamp()*1000);
 		}
@@ -188,7 +188,7 @@ public class Port {
 	
 	public void notifyTapeMessage(TapeMessage tapeMessage, Session hbnSession, Service srv) {
 		
-		if (tapeMessage.getStage() == TapeMessage.CaptureStage.start) {
+		if (tapeMessage.getStage() == TapeMessage.CaptureStage.START) {
 			lastTapeMessage = tapeMessage;
 		}
 		else {
@@ -196,10 +196,10 @@ public class Port {
 			if (lastTapeMessage == null) {
 				log.warn("Port: notifyTapeMessage: stop without a previous tape message");
 			}
-			else if (lastTapeMessage.getStage() != TapeMessage.CaptureStage.start) {
+			else if (lastTapeMessage.getStage() != TapeMessage.CaptureStage.START) {
 				log.warn("Port: notifyTapeMessage: stop without a start");	
 			}
-			else if (tapeMessage.getStage() == TapeMessage.CaptureStage.stop){
+			else if (tapeMessage.getStage() == TapeMessage.CaptureStage.STOP){
 				boolean generateSegment = false;
 				if (portFaces.size() == 1 || srv.isRecordMaster()) {
 					generateSegment = true;
diff --git a/orktrack/src/net/sf/oreka/orktrack/ProgramManager.java b/orktrack/src/net/sf/oreka/orktrack/ProgramManager.java
index 6b8a54c..e95a238 100644
--- a/orktrack/src/net/sf/oreka/orktrack/ProgramManager.java
+++ b/orktrack/src/net/sf/oreka/orktrack/ProgramManager.java
@@ -81,9 +81,15 @@ public class ProgramManager {
 		boolean result = false;
 		// Iterate over programs
 		ArrayList<RecProgram> progs = recPrograms;
-		for(int i=0; i<progs.size(); i++) {
-			if(filterSegmentAgainstProgram(seg, progs.get(i), hbnSession)) {
-				result = true;
+		if(recPrograms.size() == 0) {
+			// If there are no programs specified, keep everything
+			result = true;
+		}
+		else {
+			for(int i=0; i<progs.size(); i++) {
+				if(filterSegmentAgainstProgram(seg, progs.get(i), hbnSession)) {
+					result = true;
+				}
 			}
 		}
 		return result;
diff --git a/orktrack/src/net/sf/oreka/orktrack/messages/MetadataMessage.java b/orktrack/src/net/sf/oreka/orktrack/messages/MetadataMessage.java
index d6a2062..e8847ba 100644
--- a/orktrack/src/net/sf/oreka/orktrack/messages/MetadataMessage.java
+++ b/orktrack/src/net/sf/oreka/orktrack/messages/MetadataMessage.java
@@ -36,7 +36,7 @@ public class MetadataMessage  extends SyncMessage {
 
 	Logger log = null;
 	
-	CaptureStage stage = CaptureStage.unkn;
+	CaptureStage stage = CaptureStage.UNKN;
 	int timestamp = 0;
 	int duration = 0;
 	String capturePort = "";
diff --git a/orktrack/src/net/sf/oreka/orktrack/messages/TapeMessage.java b/orktrack/src/net/sf/oreka/orktrack/messages/TapeMessage.java
index 12c66b2..982f707 100644
--- a/orktrack/src/net/sf/oreka/orktrack/messages/TapeMessage.java
+++ b/orktrack/src/net/sf/oreka/orktrack/messages/TapeMessage.java
@@ -33,11 +33,11 @@ import org.hibernate.Transaction;
 
 public class TapeMessage extends SyncMessage {
 
-	public enum CaptureStage {start , stop, complete, unkn};
+	public enum CaptureStage {START , STOP, COMPLETE, UNKN};
 	
 	Logger log = null;
 	
-	CaptureStage stage = CaptureStage.unkn;
+	CaptureStage stage = CaptureStage.UNKN;
 	int timestamp = 0;
 	int duration = 0;
 	String filename = "";
@@ -101,10 +101,10 @@ public class TapeMessage extends SyncMessage {
 		timestamp = serializer.intValue("timestamp", timestamp, true);
 		duration = serializer.intValue("duration", duration, true);		
 		filename = serializer.stringValue("filename", filename, true);
-		capturePort = serializer.stringValue("capturePort", capturePort, true);
-		localParty = serializer.stringValue("localParty", localParty, false);
-		localEntryPoint = serializer.stringValue("localEntryPoint", localEntryPoint, false);
-		remoteParty = serializer.stringValue("remoteParty", remoteParty, false);
+		capturePort = serializer.stringValue("captureport", capturePort, true);
+		localParty = serializer.stringValue("localparty", localParty, false);
+		localEntryPoint = serializer.stringValue("localentrypoint", localEntryPoint, false);
+		remoteParty = serializer.stringValue("remoteparty", remoteParty, false);
 		direction = (Direction)serializer.enumValue("direction", direction, false);
 		loginString = serializer.stringValue("loginString", loginString, false);
 		service = serializer.stringValue("service", service, true);
diff --git a/orktrack/src/net/sf/oreka/orktrack/messages/UserStateMessage.java b/orktrack/src/net/sf/oreka/orktrack/messages/UserStateMessage.java
index 9800e24..1e2da84 100644
--- a/orktrack/src/net/sf/oreka/orktrack/messages/UserStateMessage.java
+++ b/orktrack/src/net/sf/oreka/orktrack/messages/UserStateMessage.java
@@ -31,11 +31,11 @@ import org.hibernate.Transaction;
 
 public class UserStateMessage extends SyncMessage {
 
-	public enum UserState {login, logout, unkn};
+	public enum UserState {LOGIN, LOGOUT, UNKN};
 	
 	private Logger log = null;
 	
-	private UserState userState = UserState.unkn;
+	private UserState userState = UserState.UNKN;
 	private String loginString = "";
 	private String recPort = "";
 	
@@ -69,12 +69,12 @@ public class UserStateMessage extends SyncMessage {
 		        	log.warn(comment);
 	        	}
 	        	else {
-	        		if(userState == UserState.login) {
+	        		if(userState == UserState.LOGIN) {
 	        			port.setUser(user);
 	        			UserManager.instance().setUserLocation(user, port);
 	        			log.info("user:" + loginString + " logging onto:" + recPort);
 	        		}
-	        		else if (userState == UserState.logout) {
+	        		else if (userState == UserState.LOGOUT) {
 	        			port.setUser(null);
 	        			UserManager.instance().setUserLocation(user, null);
 	        			log.info("user:" + loginString + " logging out of:" + recPort);
diff --git a/orktrack/src/net/sf/oreka/orktrack/test/PortTest.java b/orktrack/src/net/sf/oreka/orktrack/test/PortTest.java
index 2c16784..ca08581 100644
--- a/orktrack/src/net/sf/oreka/orktrack/test/PortTest.java
+++ b/orktrack/src/net/sf/oreka/orktrack/test/PortTest.java
@@ -219,7 +219,7 @@ public class PortTest extends TestCase {
 		TapeMessage startMsg = new TapeMessage();
 		startMsg.setCapturePort("recport");
 		startMsg.setService("recservice");
-		startMsg.setStage(TapeMessage.CaptureStage.start);
+		startMsg.setStage(TapeMessage.CaptureStage.START);
 		long startTime = new Date().getTime();
 		int startTimestamp = (int)(startTime/1000);
 		startMsg.setTimestamp(startTimestamp);
@@ -234,14 +234,14 @@ public class PortTest extends TestCase {
 		stopMsg.setLocalEntryPoint("dnis1");
 		stopMsg.setLocalParty("9833");
 		stopMsg.setRemoteParty("514-425-5678");
-		stopMsg.setStage(TapeMessage.CaptureStage.stop);
+		stopMsg.setStage(TapeMessage.CaptureStage.STOP);
 		stopMsg.setTimestamp(startTimestamp + 10);
 		
 		stopMsg.process();
 		
 		// Generate metadata start and stop messages
 		MetadataMessage mdStartMsg = new MetadataMessage();
-		mdStartMsg.setStage(TapeMessage.CaptureStage.start);
+		mdStartMsg.setStage(TapeMessage.CaptureStage.START);
 		mdStartMsg.setTimestamp(startTimestamp + 3);
 		mdStartMsg.setCapturePort("ctiport");
 		mdStartMsg.setService("ctiservice");
@@ -249,7 +249,7 @@ public class PortTest extends TestCase {
 		mdStartMsg.process();
 		
 		MetadataMessage mdStopMsg = new MetadataMessage();
-		mdStopMsg.setStage(TapeMessage.CaptureStage.stop);
+		mdStopMsg.setStage(TapeMessage.CaptureStage.STOP);
 		mdStopMsg.setLocalParty("1973");
 		mdStopMsg.setTimestamp(startTimestamp + 5);
 		mdStopMsg.setCapturePort("ctiport");