From 04322c762f1704f0510f972ecd81c53b632899b3 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 26 Apr 2009 09:41:11 +0000
Subject: [PATCH] Solve issue with selectors

git-svn-id: https://svn.argeo.org/slc/trunk@2371 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 demo/pom.xml                                  |  8 ++--
 .../META-INF/MANIFEST.MF                      |  1 +
 .../META-INF/spring/jms.xml                   | 21 +++++-----
 demo/site/pom.xml                             |  1 -
 org.argeo.slc/pom.xml                         |  5 +++
 .../org.argeo.slc.support.activemq/pom.xml    | 11 ++++++
 .../main/java/org/argeo/slc/jms/JmsAgent.java | 38 ++++++++-----------
 .../org/argeo/slc/activemq/spring.xml         |  6 +++
 .../class/org/argeo/slc/ria/LauncherApplet.js |  2 +-
 .../org/argeo/slc/ria/NewLauncherApplet.js    |  2 +-
 .../org.argeo.slc.siteserver/bundles/pom.xml  |  1 -
 11 files changed, 55 insertions(+), 41 deletions(-)

diff --git a/demo/pom.xml b/demo/pom.xml
index 6f1eeaea0..4b4edb608 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -58,9 +58,7 @@
 							<execDir>target/exec/server</execDir>
 							<jvmArgs>
 								<jvmArg>-Xmx256m</jvmArg>
-								<!--
-									<jvmArg>-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000</jvmArg>
-								-->
+								<!-- <jvmArg>-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000</jvmArg>-->
 							</jvmArgs>
 							<systemProperties>
 								<slc.osgi.start>
@@ -94,6 +92,10 @@
 						<artifactId>maven-argeo-osgi-plugin</artifactId>
 						<configuration>
 							<execDir>target/exec/agent</execDir>
+							<jvmArgs>
+								<jvmArg>-Xmx128m</jvmArg>
+								<!-- <jvmArg>-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8001</jvmArg> -->
+							</jvmArgs>
 							<systemProperties>
 								<slc.osgi.start>
 									org.springframework.osgi.extender,
diff --git a/demo/site/org.argeo.slc.demo.agent/META-INF/MANIFEST.MF b/demo/site/org.argeo.slc.demo.agent/META-INF/MANIFEST.MF
index 00dfd500f..b5f6657f4 100644
--- a/demo/site/org.argeo.slc.demo.agent/META-INF/MANIFEST.MF
+++ b/demo/site/org.argeo.slc.demo.agent/META-INF/MANIFEST.MF
@@ -8,6 +8,7 @@ Import-Package:
  org.springframework.jms.connection,
  org.springframework.jms.core,
  org.springframework.jms.listener,
+ org.springframework.jms.listener.adapter,
  org.springframework.oxm.castor
 Require-Bundle: 
  org.argeo.slc.support.activemq,
diff --git a/demo/site/org.argeo.slc.demo.agent/META-INF/spring/jms.xml b/demo/site/org.argeo.slc.demo.agent/META-INF/spring/jms.xml
index 705e6e9c8..06efcebfe 100644
--- a/demo/site/org.argeo.slc.demo.agent/META-INF/spring/jms.xml
+++ b/demo/site/org.argeo.slc.demo.agent/META-INF/spring/jms.xml
@@ -11,18 +11,15 @@
 		class="org.springframework.jms.listener.DefaultMessageListenerContainer">
 		<property name="connectionFactory" ref="jmsConnectionFactory" />
 		<property name="destination" ref="slcJms.destination.agent.newExecution" />
-		<property name="messageListener" ref="jmsAgent">
-			<!--
-				<bean parent="slcTemplate.jms.listenerAdapterCastor">
-				<constructor-arg ref="slcDefault.jms.agent" /> <property
-				name="defaultListenerMethod" value="newExecution" /> </bean>
-			-->
+		<property name="messageListener">
+			<bean parent="slcTemplate.jms.listenerAdapterCastor">
+				<constructor-arg ref="jmsAgent" />
+				<property name="defaultListenerMethod" value="runSlcExecution" />
+			</bean>
+		</property>
+		<property name="messageSelector">
+			<bean factory-bean="jmsAgent" factory-method="getMessageSelector" />
 		</property>
-		<!--
-			<property name="messageSelector"> <bean
-			factory-bean="slcDefault.jms.agent"
-			factory-method="getMessageSelector"/> </property>
-		-->
 	</bean>
 
 	<bean id="jmsAgent" class="org.argeo.slc.jms.JmsAgent">
@@ -45,7 +42,7 @@
 			</bean>
 		</property>
 	</bean>
-	
+
 	<!-- SLC Execution Listener -->
 	<bean id="slcExecutionListener" class="org.argeo.slc.jms.JmsSlcExecutionNotifier">
 		<property name="updateStatusDestination" ref="slcJms.destination.slcExecution.updateStatus" />
diff --git a/demo/site/pom.xml b/demo/site/pom.xml
index 3b720b468..58cc83730 100644
--- a/demo/site/pom.xml
+++ b/demo/site/pom.xml
@@ -16,7 +16,6 @@
 			<plugin>
 				<groupId>org.argeo.slc.maven</groupId>
 				<artifactId>maven-argeo-osgi-plugin</artifactId>
-				<version>0.1.6</version>
 				<extensions>true</extensions>
 			</plugin>
 		</plugins>
diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index 67cbe8968..2f974db10 100644
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -274,6 +274,11 @@ limitations under the License.
 				<artifactId>org.argeo.slc.server</artifactId>
 				<version>${project.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.argeo.slc.runtime</groupId>
+				<artifactId>org.argeo.slc.osgiboot</artifactId>
+				<version>${project.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.support.equinox</artifactId>
diff --git a/runtime/org.argeo.slc.support.activemq/pom.xml b/runtime/org.argeo.slc.support.activemq/pom.xml
index d01416511..54f896eb6 100644
--- a/runtime/org.argeo.slc.support.activemq/pom.xml
+++ b/runtime/org.argeo.slc.support.activemq/pom.xml
@@ -97,5 +97,16 @@
 			<groupId>javax.xml.soap</groupId>
 			<artifactId>com.springsource.javax.xml.soap</artifactId>
 		</dependency>
+		
+		<!--
+		<dependency>
+			<groupId>javax.xml.stream</groupId>
+			<artifactId>com.springsource.javax.xml.stream</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.xalan</groupId>
+			<artifactId>com.springsource.org.apache.xalan</artifactId>
+		</dependency>
+  -->
 	</dependencies>
 </project>
\ No newline at end of file
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 e8d3cd83c..8678c1705 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
@@ -6,15 +6,11 @@ import java.util.UUID;
 
 import javax.jms.ConnectionFactory;
 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;
 import org.springframework.beans.factory.DisposableBean;
@@ -24,7 +20,7 @@ import org.springframework.jms.support.converter.MessageConverter;
 
 /** JMS based implementation of SLC Agent. */
 public class JmsAgent extends AbstractAgent implements SlcAgent,
-		InitializingBean, DisposableBean, MessageListener {
+		InitializingBean, DisposableBean {
 	private final static Log log = LogFactory.getLog(JmsAgent.class);
 
 	private final SlcAgentDescriptor agentDescriptor;
@@ -69,27 +65,25 @@ public class JmsAgent extends AbstractAgent implements SlcAgent,
 		this.agentUnregister = agentUnregister;
 	}
 
-	public void onMessage(Message message) {
-		// FIXME: we filter the messages on the client side,
-		// because of a weird problem with selector since moving to OSGi
-		try {
-			if (message.getStringProperty("slc-agentId").equals(
-					agentDescriptor.getUuid())) {
-				runSlcExecution((SlcExecution) messageConverter
-						.fromMessage(message));
-			}
-		} catch (JMSException e) {
-			throw new SlcException("Cannot convert message " + message, e);
-		}
-
-	}
+	/*
+	 * public void onMessage(Message message) { // FIXME: we filter the messages
+	 * on the client side, // because of a weird problem with selector since
+	 * moving to OSGi try { if (message.getStringProperty("slc-agentId").equals(
+	 * agentDescriptor.getUuid())) { runSlcExecution((SlcExecution)
+	 * messageConverter .fromMessage(message)); } else { if
+	 * (log.isDebugEnabled()) log.debug("Filtered out message " + message); } }
+	 * catch (JMSException e) { throw new SlcException("Cannot convert message "
+	 * + message, e); }
+	 * 
+	 * }
+	 */
 
 	public String getMessageSelector() {
-		String messageSelector = "slc-agentId=" + agentDescriptor.getUuid()
-				+ "";
+		String messageSelector = "slc_agentId='" + agentDescriptor.getUuid()
+				+ "'";
 		// String messageSelector = "slc-agentId LIKE '%'";
 		if (log.isDebugEnabled())
-			log.debug("Message selector: '" + messageSelector + "'");
+			log.debug("Message selector: " + messageSelector);
 		return messageSelector;
 	}
 
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 429e76f28..3525591ca 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
@@ -13,4 +13,10 @@
 		<property name="unmarshaller" ref="slcDefault.castor.marshaller" />
 	</bean>
 
+	<bean id="slcTemplate.jms.listenerAdapterCastor"
+		class="org.springframework.jms.listener.adapter.MessageListenerAdapter"
+		abstract="true">
+		<property name="messageConverter" ref="slcDefault.jms.castorMessageConverter" />
+	</bean>
+
 </beans>
\ No newline at end of file
diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/LauncherApplet.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/LauncherApplet.js
index 03ec8cc98..3236e689a 100644
--- a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/LauncherApplet.js
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/LauncherApplet.js
@@ -465,7 +465,7 @@ qx.Class.define("org.argeo.slc.ria.LauncherApplet",
 		this._amqClient.sendMessage(
 			"topic://agent.newExecution", 
 			slcExec.toXml(), 
-			{"slc-agentId":currentUuid}
+			{"slc_agentId":currentUuid}
 		);
 		// Force logs refresh right now!
 		qx.event.Timer.once(function(){
diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/NewLauncherApplet.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/NewLauncherApplet.js
index 6f3076657..6e232ff3a 100644
--- a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/NewLauncherApplet.js
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/NewLauncherApplet.js
@@ -641,7 +641,7 @@ qx.Class.define("org.argeo.slc.ria.NewLauncherApplet",
 		this._amqClient.sendMessage(
 			"topic://agent.newExecution", 
 			slcExecMessage.toXml(), 
-			{"slc-agentId":agentUuid}
+			{"slc_agentId":agentUuid}
 		);
 		// Force logs refresh right now!
 		qx.event.Timer.once(function(){
diff --git a/server/org.argeo.slc.siteserver/bundles/pom.xml b/server/org.argeo.slc.siteserver/bundles/pom.xml
index 3e5a4d80e..d2c3520fa 100644
--- a/server/org.argeo.slc.siteserver/bundles/pom.xml
+++ b/server/org.argeo.slc.siteserver/bundles/pom.xml
@@ -16,7 +16,6 @@
 			<plugin>
 				<groupId>org.argeo.slc.maven</groupId>
 				<artifactId>maven-argeo-osgi-plugin</artifactId>
-				<version>0.1.6</version>
 				<extensions>true</extensions>
 			</plugin>
 		</plugins>
-- 
2.39.2