X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.support.activemq%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fjms%2FJmsAgent.java;h=7623e79f0651767c8295dd03b9edc14f9c60800c;hb=2401fec9d1374a1e7b9ebeb85dfd4d967a7a3e68;hp=66c0718fc946c29f6a8199990123496357f3633d;hpb=ab459c7e28f29c0695d159f7971337e3b5884c6e;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsAgent.java b/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsAgent.java
index 66c0718fc..7623e79f0 100644
--- a/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsAgent.java
+++ b/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsAgent.java
@@ -5,13 +5,11 @@ import java.net.UnknownHostException;
 import java.util.UUID;
 
 import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageListener;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.core.runtime.AbstractAgent;
 import org.argeo.slc.process.SlcExecution;
 import org.argeo.slc.runtime.SlcAgent;
 import org.argeo.slc.runtime.SlcAgentDescriptor;
@@ -20,7 +18,8 @@ import org.springframework.beans.factory.InitializingBean;
 import org.springframework.jms.core.JmsTemplate;
 
 /** JMS based implementation of SLC Agent. */
-public class JmsAgent implements SlcAgent, InitializingBean, DisposableBean {
+public class JmsAgent extends AbstractAgent implements SlcAgent,
+		InitializingBean, DisposableBean {
 	private final static Log log = LogFactory.getLog(JmsAgent.class);
 
 	private final SlcAgentDescriptor agentDescriptor;
@@ -28,9 +27,6 @@ public class JmsAgent implements SlcAgent, InitializingBean, DisposableBean {
 	private Destination agentRegister;
 	private Destination agentUnregister;
 
-	private String agentDestinationPrefix = "agent.";
-	private String agentDestinationBase;
-
 	public JmsAgent() {
 		try {
 			agentDescriptor = new SlcAgentDescriptor();
@@ -42,8 +38,6 @@ public class JmsAgent implements SlcAgent, InitializingBean, DisposableBean {
 	}
 
 	public void afterPropertiesSet() throws Exception {
-		agentDestinationBase = agentDestinationPrefix
-				+ agentDescriptor.getUuid() + ".";
 		jmsTemplate.convertAndSend(agentRegister, agentDescriptor);
 		log.info("Agent #" + agentDescriptor.getUuid() + " registered to "
 				+ agentRegister);
@@ -51,16 +45,13 @@ public class JmsAgent implements SlcAgent, InitializingBean, DisposableBean {
 
 	public void destroy() throws Exception {
 		jmsTemplate.convertAndSend(agentUnregister, agentDescriptor);
-		log.info("Agent #" + agentDescriptor.getUuid() + " unregistered to "
-				+ agentRegister);
-	}
-
-	public String actionDestinationName(String action) {
-		return agentDestinationBase + action;
+		log.info("Agent #" + agentDescriptor.getUuid() + " unregistered from "
+				+ agentUnregister);
 	}
 
 	public void newExecution(SlcExecution slcExecution) {
-		log.info("Would execute SlcExecution :" + slcExecution);
+		log.info("Execute SlcExecution :" + slcExecution);
+		runSlcExecution(slcExecution);
 	}
 
 	public void setJmsTemplate(JmsTemplate jmsTemplate) {
@@ -75,8 +66,7 @@ public class JmsAgent implements SlcAgent, InitializingBean, DisposableBean {
 		this.agentUnregister = agentUnregister;
 	}
 
-	public void setAgentDestinationPrefix(String agentDestinationPrefix) {
-		this.agentDestinationPrefix = agentDestinationPrefix;
+	public String getMessageSelector() {
+		return "slc-agentId=" + agentDescriptor.getUuid();
 	}
-
 }