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=9bc3f9e233eacdea683c5c96795f2627abf8eab6;hb=cffd700ca670610a1f81e021f82542dc6bf5c810;hp=fecb5178bd311d278ea39c4acb8196515345e1ee;hpb=d601802d5a50e4e30eb639a08eff5270b63fe599;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 fecb5178b..9bc3f9e23 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
@@ -33,15 +33,12 @@ import org.argeo.slc.msg.MsgConstants;
 import org.argeo.slc.msg.ReferenceList;
 import org.argeo.slc.process.SlcExecution;
 import org.argeo.slc.runtime.SlcAgentDescriptor;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.InitializingBean;
 import org.springframework.jms.JmsException;
 import org.springframework.jms.core.JmsTemplate;
 import org.springframework.jms.core.MessagePostProcessor;
 
-/** JMS based implementation of SLC Agent. */
-public class JmsAgent extends DefaultAgent implements InitializingBean,
-		DisposableBean, MessageListener {
+/** JMS based implementation of an SLC Agent. */
+public class JmsAgent extends DefaultAgent implements MessageListener {
 	public final static String PROPERTY_QUERY = "query";
 	public final static String QUERY_PING_ALL = "pingAll";
 
@@ -53,24 +50,25 @@ public class JmsAgent extends DefaultAgent implements InitializingBean,
 
 	private Destination responseDestination;
 
-	public void afterPropertiesSet() throws Exception {
+	public void init() {
+		super.init();
 		try {
 			jmsTemplate.convertAndSend(agentRegister, getAgentDescriptor());
 			log.info("Agent #" + getAgentUuid() + " registered to "
 					+ agentRegister);
 		} catch (JmsException e) {
-			log
-					.warn("Could not register agent "
-							+ getAgentDescriptor().getUuid()
-							+ " to server: "
-							+ e.getMessage()
-							+ ". The agent will stay offline but will keep listening for a ping all sent by server.");
+			log.warn("Could not register agent "
+					+ getAgentDescriptor().getUuid()
+					+ " to server: "
+					+ e.getMessage()
+					+ ". The agent will stay offline but will keep listening for a ping all sent by server.");
 			if (log.isTraceEnabled())
 				log.debug("Original error.", e);
 		}
 	}
 
-	public void destroy() throws Exception {
+	@Override
+	public void destroy() {
 		try {
 			jmsTemplate.convertAndSend(agentUnregister, getAgentDescriptor());
 			log.info("Agent #" + getAgentUuid() + " unregistered from "
@@ -81,6 +79,7 @@ public class JmsAgent extends DefaultAgent implements InitializingBean,
 			if (log.isTraceEnabled())
 				log.debug("Original error.", e);
 		}
+		super.destroy();
 	}
 
 	public void setAgentRegister(Destination agentRegister) {
@@ -164,7 +163,7 @@ public class JmsAgent extends DefaultAgent implements InitializingBean,
 				final SlcExecution slcExecution = (SlcExecution) convertFrom(message);
 				new Thread() {
 					public void run() {
-						runSlcExecution(slcExecution);
+						process(slcExecution);
 					}
 				}.start();
 				return ExecutionAnswer.ok("Execution started on agent "