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=33584bb00ca30d9f56544020dbd4bf448d7ef6a8;hb=548235484edd6b48de5ddc3bbca318e0e49cb57b;hp=f5472b0e5937d6a8626605cbaad2d7eaf499072b;hpb=0bcca59c19e554f94ec03af0dc7c44047a2eade7;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 f5472b0e5..33584bb00 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
@@ -16,10 +16,7 @@
 
 package org.argeo.slc.jms;
 
-import java.net.InetAddress;
-import java.net.UnknownHostException;
 import java.util.List;
-import java.util.UUID;
 
 import javax.jms.Destination;
 import javax.jms.JMSException;
@@ -36,65 +33,52 @@ 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";
 
 	private final static Log log = LogFactory.getLog(JmsAgent.class);
 
-	private final SlcAgentDescriptor agentDescriptor;
 	private JmsTemplate jmsTemplate;
 	private Destination agentRegister;
 	private Destination agentUnregister;
 
 	private Destination responseDestination;
 
-	public JmsAgent() {
+	public void init() {
+		super.init();
 		try {
-			agentDescriptor = new SlcAgentDescriptor();
-			agentDescriptor.setUuid(UUID.randomUUID().toString());
-			agentDescriptor.setHost(InetAddress.getLocalHost().getHostName());
-		} catch (UnknownHostException e) {
-			throw new SlcException("Unable to create agent descriptor.", e);
-		}
-	}
-
-	public void afterPropertiesSet() throws Exception {
-		try {
-			jmsTemplate.convertAndSend(agentRegister, agentDescriptor);
-			log.info("Agent #" + agentDescriptor.getUuid() + " registered to "
+			jmsTemplate.convertAndSend(agentRegister, getAgentDescriptor());
+			log.info("Agent #" + getAgentUuid() + " registered to "
 					+ agentRegister);
 		} catch (JmsException e) {
-			log
-					.warn("Could not register agent "
-							+ agentDescriptor.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 {
+	public void dispose() {
 		try {
-			jmsTemplate.convertAndSend(agentUnregister, agentDescriptor);
-			log.info("Agent #" + agentDescriptor.getUuid()
-					+ " unregistered from " + agentUnregister);
+			jmsTemplate.convertAndSend(agentUnregister, getAgentDescriptor());
+			log.info("Agent #" + getAgentUuid() + " unregistered from "
+					+ agentUnregister);
 		} catch (JmsException e) {
-			log.warn("Could not unregister agent " + agentDescriptor.getUuid()
-					+ ": " + e.getMessage());
+			log.warn("Could not unregister agent " + getAgentUuid() + ": "
+					+ e.getMessage());
 			if (log.isTraceEnabled())
 				log.debug("Original error.", e);
 		}
+		super.dispose();
 	}
 
 	public void setAgentRegister(Destination agentRegister) {
@@ -106,8 +90,7 @@ public class JmsAgent extends DefaultAgent implements InitializingBean,
 	}
 
 	public String getMessageSelector() {
-		String messageSelector = "slc_agentId='" + agentDescriptor.getUuid()
-				+ "'";
+		String messageSelector = "slc_agentId='" + getAgentUuid() + "'";
 		// if (log.isDebugEnabled())
 		// log.debug("Message selector: " + messageSelector);
 		return messageSelector;
@@ -127,12 +110,12 @@ public class JmsAgent extends DefaultAgent implements InitializingBean,
 		final Destination destinationSend;
 		if (QUERY_PING_ALL.equals(query)) {
 			ReferenceList refList = (ReferenceList) convertFrom(message);
-			if (!refList.getReferences().contains(agentDescriptor.getUuid())) {
-				response = agentDescriptor;
+			if (!refList.getReferences().contains(getAgentUuid())) {
+				response = getAgentDescriptor();
 				destinationSend = agentRegister;
-				log.info("Agent #" + agentDescriptor.getUuid()
-						+ " registering to " + agentRegister
-						+ " in reply to a " + QUERY_PING_ALL + " query");
+				log.info("Agent #" + getAgentUuid() + " registering to "
+						+ agentRegister + " in reply to a " + QUERY_PING_ALL
+						+ " query");
 			} else {
 				return;
 			}
@@ -151,7 +134,7 @@ public class JmsAgent extends DefaultAgent implements InitializingBean,
 						messageToSend.setStringProperty(PROPERTY_QUERY, query);
 						messageToSend.setStringProperty(
 								MsgConstants.PROPERTY_SLC_AGENT_ID,
-								agentDescriptor.getUuid());
+								getAgentUuid());
 						messageToSend.setJMSCorrelationID(correlationId);
 						return messageToSend;
 					}
@@ -172,7 +155,7 @@ public class JmsAgent extends DefaultAgent implements InitializingBean,
 
 				List<ExecutionModuleDescriptor> lst = listExecutionModuleDescriptors();
 				SlcAgentDescriptor agentDescriptorToSend = new SlcAgentDescriptor(
-						agentDescriptor);
+						getAgentDescriptor());
 				agentDescriptorToSend.setModuleDescriptors(lst);
 				return agentDescriptorToSend;
 			} else if ("runSlcExecution".equals(query)) {
@@ -183,9 +166,9 @@ public class JmsAgent extends DefaultAgent implements InitializingBean,
 					}
 				}.start();
 				return ExecutionAnswer.ok("Execution started on agent "
-						+ agentDescriptor.getUuid());
+						+ getAgentUuid());
 			} else if ("ping".equals(query)) {
-				return ExecutionAnswer.ok("Agent " + agentDescriptor.getUuid()
+				return ExecutionAnswer.ok("Agent " + getAgentUuid()
 						+ " is alive.");
 			} else {
 				throw new SlcException("Unsupported query " + query);