New notification structure for agents

[gpl/argeo-slc.git] / runtime / org.argeo.slc.support.activemq / src / main / java / org / argeo / slc / jms / JmsAgent.java

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 099498caa28409cf2225578057c8dfe5d6d65d17..7623e79f0651767c8295dd03b9edc14f9c60800c 100644 (file)
--- 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,9 +5,6 @@ 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;
@@ -21,7 +18,8 @@ import org.springframework.beans.factory.InitializingBean;
 import org.springframework.jms.core.JmsTemplate;
 
 /** JMS based implementation of SLC Agent. */
-public class JmsAgent extends AbstractAgent 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;
@@ -29,9 +27,6 @@ public class JmsAgent extends AbstractAgent implements SlcAgent, InitializingBea
        private Destination agentRegister;
        private Destination agentUnregister;
 
-       private String agentDestinationPrefix = "agent.";
-       private String agentDestinationBase;
-
        public JmsAgent() {
                try {
                        agentDescriptor = new SlcAgentDescriptor();
@@ -43,8 +38,6 @@ public class JmsAgent extends AbstractAgent implements SlcAgent, InitializingBea
        }
 
        public void afterPropertiesSet() throws Exception {
-               agentDestinationBase = agentDestinationPrefix
-                               + agentDescriptor.getUuid() + ".";
                jmsTemplate.convertAndSend(agentRegister, agentDescriptor);
                log.info("Agent #" + agentDescriptor.getUuid() + " registered to "
                                + agentRegister);
@@ -52,12 +45,8 @@ public class JmsAgent extends AbstractAgent implements SlcAgent, InitializingBea
 
        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) {
@@ -77,8 +66,7 @@ public class JmsAgent extends AbstractAgent implements SlcAgent, InitializingBea
                this.agentUnregister = agentUnregister;
        }
 
-       public void setAgentDestinationPrefix(String agentDestinationPrefix) {
-               this.agentDestinationPrefix = agentDestinationPrefix;
+       public String getMessageSelector() {
+               return "slc-agentId=" + agentDescriptor.getUuid();
        }
-
 }