X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.support.activemq%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fjms%2FJmsAgentProxy.java;h=8c08519371afdfe06c246c96775b3fbbaf892ef7;hb=cffd700ca670610a1f81e021f82542dc6bf5c810;hp=2ab9a38f869b893df6e6994355c33fe0cf16772e;hpb=ffe7754e421f8ad5d3a336f54a498f67c6d72839;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsAgentProxy.java b/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsAgentProxy.java
index 2ab9a38f8..8c0851937 100644
--- a/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsAgentProxy.java
+++ b/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsAgentProxy.java
@@ -29,6 +29,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.execution.ExecutionModuleDescriptor;
+import org.argeo.slc.execution.ExecutionProcess;
 import org.argeo.slc.msg.ExecutionAnswer;
 import org.argeo.slc.msg.MsgConstants;
 import org.argeo.slc.process.SlcExecution;
@@ -53,6 +54,10 @@ public class JmsAgentProxy implements SlcAgent {
 		this.jmsTemplate = jmsTemplate;
 	}
 
+	public String getAgentUuid() {
+		return agentUuid;
+	}
+
 	public ExecutionModuleDescriptor getExecutionModuleDescriptor(
 			final String moduleName, final String version) {
 		return (ExecutionModuleDescriptor) sendReceive(new AgentMC(
@@ -70,7 +75,15 @@ public class JmsAgentProxy implements SlcAgent {
 	}
 
 	public void runSlcExecution(SlcExecution slcExecution) {
-		sendReceive(new AgentMC("runSlcExecution", slcExecution));
+		process(slcExecution);
+	}
+
+	public void process(ExecutionProcess executionProcess) {
+		if (!(executionProcess instanceof SlcExecution))
+			throw new SlcException("Unsupported process type "
+					+ executionProcess.getClass());
+		sendReceive(new AgentMC("runSlcExecution",
+				(SlcExecution) executionProcess));
 	}
 
 	public boolean ping() {
@@ -83,6 +96,10 @@ public class JmsAgentProxy implements SlcAgent {
 		}
 	}
 
+	public void kill(ExecutionProcess process) {
+		throw new UnsupportedOperationException();
+	}
+
 	protected Object sendReceive(AgentMC messageCreator) {
 		long begin = System.currentTimeMillis();
 		Object res;
@@ -194,9 +211,7 @@ public class JmsAgentProxy implements SlcAgent {
 				msg = session.createTextMessage();
 			else
 				msg = toMessage(body, session);
-			msg
-					.setStringProperty(MsgConstants.PROPERTY_SLC_AGENT_ID,
-							agentUuid);
+			msg.setStringProperty(MsgConstants.PROPERTY_SLC_AGENT_ID, agentUuid);
 			msg.setStringProperty(JmsAgent.PROPERTY_QUERY, query);
 			msg.setJMSCorrelationID(correlationId);
 			setArguments(msg);