From 2401fec9d1374a1e7b9ebeb85dfd4d967a7a3e68 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 27 Jan 2009 14:49:47 +0000
Subject: [PATCH] New notification structure for agents

git-svn-id: https://svn.argeo.org/slc/trunk@2141 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../src/main/webapp/WEB-INF/web.xml           | 31 ++-----------
 .../argeo/slc/cli/spring-agent-default.xml    | 11 -----
 .../org/argeo/slc/server/spring/activemq.xml  |  4 ++
 .../slc/server/spring/servletContext.xml      |  4 +-
 .../argeo/slc/jms/AgentListenerContainer.java | 43 -------------------
 .../main/java/org/argeo/slc/jms/JmsAgent.java | 24 +++--------
 .../org/argeo/slc/activemq/spring-agent.xml   | 21 ++++++---
 .../org/argeo/slc/activemq/spring.xml         |  6 ++-
 8 files changed, 33 insertions(+), 111 deletions(-)
 delete mode 100644 runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/AgentListenerContainer.java

diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml
index 812a662f8..9de9501a6 100644
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml
@@ -99,38 +99,17 @@
     </context-param>
 
     <!-- servlet mappings -->
-    
-    <!-- the subscription REST servlet -->
-    <servlet>
-        <servlet-name>AjaxServlet</servlet-name>
-        <servlet-class>org.apache.activemq.web.AjaxServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
     <servlet>
-        <servlet-name>MessageServlet</servlet-name>
-        <servlet-class>org.apache.activemq.web.MessageServlet</servlet-class>
+        <servlet-name>MessageListenerServlet</servlet-name>
+        <servlet-class>org.apache.activemq.web.MessageListenerServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
-        <!--
-        Uncomment this parameter if you plan to use multiple consumers over REST
-        <init-param>
-                <param-name>destinationOptions</param-name>
-                <param-value>consumer.prefetchSize=1</param-value>
-        </init-param> 
-        -->
-
     </servlet>
 
     <servlet-mapping>
-        <servlet-name>AjaxServlet</servlet-name>
+        <servlet-name>MessageListenerServlet</servlet-name>
         <url-pattern>/amq/*</url-pattern>
     </servlet-mapping>
     
-    <servlet-mapping>
-        <servlet-name>MessageServlet</servlet-name>
-        <url-pattern>/amqMessage/*</url-pattern>
-    </servlet-mapping>
-
     <filter>
       <filter-name>session</filter-name>
       <filter-class>org.apache.activemq.web.SessionFilter</filter-class>
@@ -140,8 +119,4 @@
       <filter-name>session</filter-name>
       <url-pattern>/amq/*</url-pattern>
     </filter-mapping>
-    <filter-mapping>
-      <filter-name>session</filter-name>
-      <url-pattern>/amqMessage/*</url-pattern>
-    </filter-mapping>
 </web-app>
diff --git a/runtime/org.argeo.slc.launcher/src/main/resources/org/argeo/slc/cli/spring-agent-default.xml b/runtime/org.argeo.slc.launcher/src/main/resources/org/argeo/slc/cli/spring-agent-default.xml
index a61538cea..320e2da44 100644
--- a/runtime/org.argeo.slc.launcher/src/main/resources/org/argeo/slc/cli/spring-agent-default.xml
+++ b/runtime/org.argeo.slc.launcher/src/main/resources/org/argeo/slc/cli/spring-agent-default.xml
@@ -22,17 +22,6 @@
 
 	<import resource="classpath:org/argeo/slc/activemq/spring-agent.xml" />
 
-	<bean id="slcDefault.cli.agent" parent="slcDefault.jms.agent">
-		<property name="slcApplication" ref="slcDefault.cli.slcApplication" />
-	</bean>
-
-	<bean id="slcDefault.cli.jms.agentListenerContainer.newExecution"
-		parent="slcTemplate.jms.agentListenerContainer">
-		<property name="action" value="newExecution" />
-		<property name="jmsAgent" ref="slcDefault.cli.agent" />
-	</bean>
-
-
 	<bean id="slcDefault.cli.slcApplication" class="org.argeo.slc.ant.AntSlcApplication"
 		init-method="initFromSlcRootFile">
 		<property name="slcRootFile" value="${slc.rootFile}" />
diff --git a/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/activemq.xml b/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/activemq.xml
index a512b3e9a..71dfbedc7 100644
--- a/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/activemq.xml
+++ b/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/activemq.xml
@@ -17,4 +17,8 @@
 		abstract="true">
 	</bean>
 
+	<bean id="template.jms.listenerAdapter" parent="slcTemplate.jms.listenerAdapterCastor"
+		abstract="true">
+	</bean>
+
 </beans>
\ No newline at end of file
diff --git a/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/servletContext.xml b/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/servletContext.xml
index a39c6d112..bb28fd6cd 100644
--- a/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/servletContext.xml
+++ b/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/servletContext.xml
@@ -42,7 +42,7 @@
 	<bean id="agentService.jmsContainer.register" parent="template.jms.listenerContainer">
 		<property name="destination" ref="slcJms.destination.agent.register" />
 		<property name="messageListener">
-			<bean parent="slcTemplate.jms.listenerAdapter">
+			<bean parent="template.jms.listenerAdapter">
 				<constructor-arg ref="agentService" />
 				<property name="defaultListenerMethod" value="register" />
 			</bean>
@@ -52,7 +52,7 @@
 	<bean id="agentService.jmsContainer.unregister" parent="template.jms.listenerContainer">
 		<property name="destination" ref="slcJms.destination.agent.unregister" />
 		<property name="messageListener">
-			<bean parent="slcTemplate.jms.listenerAdapter">
+			<bean parent="template.jms.listenerAdapter">
 				<constructor-arg ref="agentService" />
 				<property name="defaultListenerMethod" value="unregister" />
 			</bean>
diff --git a/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/AgentListenerContainer.java b/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/AgentListenerContainer.java
deleted file mode 100644
index 659b4f5b7..000000000
--- a/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/AgentListenerContainer.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.argeo.slc.jms;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.jms.listener.DefaultMessageListenerContainer;
-import org.springframework.jms.listener.adapter.MessageListenerAdapter;
-import org.springframework.jms.support.converter.MessageConverter;
-
-public class AgentListenerContainer extends DefaultMessageListenerContainer
-		implements InitializingBean {
-	private final static Log log = LogFactory.getLog(AgentListenerContainer.class);
-	
-	private JmsAgent jmsAgent;
-	private String action;
-	private MessageConverter messageConverter;
-
-	@Override
-	public void afterPropertiesSet() {
-		MessageListenerAdapter messageListenerAdapter = new MessageListenerAdapter(
-				jmsAgent);
-		messageListenerAdapter.setDefaultListenerMethod(action);
-		messageListenerAdapter.setMessageConverter(messageConverter);
-		setMessageListener(messageListenerAdapter);
-		setDestinationName(jmsAgent.actionDestinationName(action));
-		super.afterPropertiesSet();
-		
-		log.info("Listening to "+getDestinationName());
-	}
-
-	public void setJmsAgent(JmsAgent jmsAgent) {
-		this.jmsAgent = jmsAgent;
-	}
-
-	public void setAction(String action) {
-		this.action = action;
-	}
-
-	public void setMessageConverter(MessageConverter messageConverter) {
-		this.messageConverter = messageConverter;
-	}
-
-}
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 099498caa..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,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();
 	}
-
 }
diff --git a/runtime/org.argeo.slc.support.activemq/src/main/resources/org/argeo/slc/activemq/spring-agent.xml b/runtime/org.argeo.slc.support.activemq/src/main/resources/org/argeo/slc/activemq/spring-agent.xml
index 3802ecc04..a6492a546 100644
--- a/runtime/org.argeo.slc.support.activemq/src/main/resources/org/argeo/slc/activemq/spring-agent.xml
+++ b/runtime/org.argeo.slc.support.activemq/src/main/resources/org/argeo/slc/activemq/spring-agent.xml
@@ -7,19 +7,26 @@
 
 	<import resource="classpath:org/argeo/slc/activemq/spring.xml" />
 
-	<bean id="slcDefault.jms.agent" class="org.argeo.slc.jms.JmsAgent" abstract="true">
-		<property name="jmsTemplate" ref="slcDefault.jms.jmsTemplate" />
+	<bean id="slcDefault.jms.agent" class="org.argeo.slc.jms.JmsAgent"
+		autowire="byType">
+		<property name="jmsTemplate" ref="slcDefault.jms.jmsTemplateCastor" />
 		<property name="agentRegister" ref="slcJms.destination.agent.register" />
 		<property name="agentUnregister" ref="slcJms.destination.agent.unregister" />
 	</bean>
 
 	<!-- Templates -->
-	<bean id="slcTemplate.jms.agentListenerContainer" class="org.argeo.slc.jms.AgentListenerContainer"
-		abstract="true">
+	<bean id="slcDefault.jms.listener.newExecution" parent="slcTemplate.jms.listenerContainer">
 		<property name="connectionFactory" ref="slcDefault.jms.connectionFactory" />
-		<property name="messageConverter" ref="slcDefault.jms.castorMessageConverter" />
-		<property name="pubSubDomain" value="true" />
+		<property name="destination" ref="slcJms.destination.agent.newExecution" />
+		<property name="messageListener">
+			<bean parent="slcTemplate.jms.listenerAdapterCastor">
+				<constructor-arg ref="slcDefault.jms.agent" />
+				<property name="defaultListenerMethod" value="newExecution" />
+			</bean>
+		</property>
+		<property name="messageSelector">
+			<bean factory-bean="slcDefault.jms.agent" factory-method="getMessageSelector"/>
+		</property>
 	</bean>
 
-
 </beans>
\ No newline at end of file
diff --git a/runtime/org.argeo.slc.support.activemq/src/main/resources/org/argeo/slc/activemq/spring.xml b/runtime/org.argeo.slc.support.activemq/src/main/resources/org/argeo/slc/activemq/spring.xml
index 05d439db7..14dde19c4 100644
--- a/runtime/org.argeo.slc.support.activemq/src/main/resources/org/argeo/slc/activemq/spring.xml
+++ b/runtime/org.argeo.slc.support.activemq/src/main/resources/org/argeo/slc/activemq/spring.xml
@@ -22,7 +22,7 @@
 		</property>
 	</bean>
 
-	<bean id="slcDefault.jms.jmsTemplate" class="org.springframework.jms.core.JmsTemplate">
+	<bean id="slcDefault.jms.jmsTemplateCastor" class="org.springframework.jms.core.JmsTemplate">
 		<property name="connectionFactory" ref="slcDefault.jms.connectionFactory" />
 		<property name="messageConverter" ref="slcDefault.jms.castorMessageConverter" />
 	</bean>
@@ -33,6 +33,8 @@
 		physicalName="agent.register" />
 	<amq:topic id="slcJms.destination.agent.unregister"
 		physicalName="agent.unregister" />
+	<amq:topic id="slcJms.destination.agent.newExecution"
+		physicalName="agent.newExecution" />
 
 	<!-- Templates -->
 	<bean id="slcTemplate.jms.listenerContainer"
@@ -41,7 +43,7 @@
 		<property name="connectionFactory" ref="slcDefault.jms.connectionFactory" />
 	</bean>
 
-	<bean id="slcTemplate.jms.listenerAdapter"
+	<bean id="slcTemplate.jms.listenerAdapterCastor"
 		class="org.springframework.jms.listener.adapter.MessageListenerAdapter"
 		abstract="true">
 		<property name="messageConverter" ref="slcDefault.jms.castorMessageConverter" />
-- 
2.39.2