Enums now employ uppercase values

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

6 files changed, 14 insertions, 12 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());