diff options
3 files changed, 61 insertions, 7 deletions
diff --git a/orkbasej/java/net/sf/oreka/serializers/ServletRequestSerializer.java b/orkbasej/java/net/sf/oreka/serializers/ServletRequestSerializer.java index 84650bd..1a2226a 100644 --- a/orkbasej/java/net/sf/oreka/serializers/ServletRequestSerializer.java +++ b/orkbasej/java/net/sf/oreka/serializers/ServletRequestSerializer.java @@ -29,16 +29,15 @@ public class ServletRequestSerializer extends OrkSerializer { deserialize = true; // Set DeSerialize mode // Instanciate the right object - //String classMarker = (String)request.getParameterNames().nextElement(); String orkClass = null; - orkClass = request.getParameter("class"); + orkClass = request.getParameter("cmd"); if(orkClass == null) { - orkClass = request.getParameter("cmd"); + orkClass = request.getParameter("class"); if(orkClass == null) { orkClass = request.getParameter("type"); - } - else { - throw (new OrkException("ServletRequestSerializer.deSerialize: where is the command in:" + request.getQueryString())); + if(orkClass == null) { + throw (new OrkException("ServletRequestSerializer.deSerialize: where is the command in:" + request.getQueryString())); + } } } diff --git a/orktrack/src/net/sf/oreka/orktrack/OrkTrack.java b/orktrack/src/net/sf/oreka/orktrack/OrkTrack.java index c4aacea..83038a8 100644 --- a/orktrack/src/net/sf/oreka/orktrack/OrkTrack.java +++ b/orktrack/src/net/sf/oreka/orktrack/OrkTrack.java @@ -21,6 +21,7 @@ import java.util.Date; import net.sf.oreka.HibernateManager; import net.sf.oreka.OrkObjectFactory; import net.sf.oreka.orktrack.messages.MetadataMessage; +import net.sf.oreka.orktrack.messages.PingMessage; import net.sf.oreka.orktrack.messages.TapeMessage; import net.sf.oreka.orktrack.messages.UserStateMessage; @@ -52,7 +53,8 @@ public class OrkTrack { OrkObjectFactory.instance().registerOrkObject(new OrkTrackConfig()); OrkObjectFactory.instance().registerOrkObject(new MetadataMessage()); OrkObjectFactory.instance().registerOrkObject(new TapeMessage()); - OrkObjectFactory.instance().registerOrkObject(new UserStateMessage()); + OrkObjectFactory.instance().registerOrkObject(new UserStateMessage()); + OrkObjectFactory.instance().registerOrkObject(new PingMessage()); ConfigManager.getInstance().load(configFile); diff --git a/orktrack/src/net/sf/oreka/orktrack/messages/PingMessage.java b/orktrack/src/net/sf/oreka/orktrack/messages/PingMessage.java new file mode 100644 index 0000000..9c53cf2 --- /dev/null +++ b/orktrack/src/net/sf/oreka/orktrack/messages/PingMessage.java @@ -0,0 +1,53 @@ +/* + * Oreka -- A media capture and retrieval platform + * + * Copyright (C) 2005, orecx LLC + * + * http://www.orecx.com + * + * This program is free software, distributed under the terms of + * the GNU General Public License. + * Please refer to http://www.gnu.org/copyleft/gpl.html + * + */ + +package net.sf.oreka.orktrack.messages; + +import net.sf.oreka.OrkException; +import net.sf.oreka.messages.AsyncMessage; +import net.sf.oreka.messages.SimpleResponseMessage; +import net.sf.oreka.messages.SyncMessage; +import net.sf.oreka.serializers.OrkSerializer; + +import org.apache.log4j.Logger; + +public class PingMessage extends SyncMessage { + + static Logger logger = Logger.getLogger(PingMessage.class); + + + public PingMessage() { + } + + @Override + public AsyncMessage process() { + + SimpleResponseMessage response = new SimpleResponseMessage(); + response.setSuccess(true); + return response; + } + + public void define(OrkSerializer serializer) throws OrkException { + + } + + public String getOrkClassName() { + return "ping"; + } + + public void validate() { + // TODO Auto-generated method stub + + } + +}
\ No newline at end of file |