X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Forg.argeo.slc.siteserver%2Fbundles%2Forg.argeo.slc.agent%2FMETA-INF%2Fspring%2Fjms.xml;h=3349c30125eacfbdf8d20d12b6ac1d549c38e598;hb=7a3b9a150bbd8f6e7110b61fd85594e1a3fb9c53;hp=a60b28d543e9b9c359ea8bad81938988d9ae1975;hpb=ec9fe3774f157092d748b0844dbbb55e29a67481;p=gpl%2Fargeo-slc.git

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/spring/jms.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/spring/jms.xml
index a60b28d54..3349c3012 100644
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/spring/jms.xml
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/spring/jms.xml
@@ -6,31 +6,21 @@
 
 	<import resource="classpath:org/argeo/slc/activemq/spring.xml" />
 
-
-	<bean
-		class="org.springframework.jms.listener.DefaultMessageListenerContainer">
-		<property name="connectionFactory" ref="jmsConnectionFactory" />
+	<bean id="jmsAgent.listener.request" parent="jmsAgent.listener.template">
 		<property name="destination" ref="slcJms.destination.agent.request" />
-		<property name="messageListener" ref="jmsAgent" />
 		<property name="messageSelector">
 			<bean factory-bean="jmsAgent" factory-method="getMessageSelector" />
 		</property>
 	</bean>
 
-	<bean id="jmsAgent.listener.newExecution"
-		class="org.springframework.jms.listener.DefaultMessageListenerContainer">
-		<property name="connectionFactory" ref="jmsConnectionFactory" />
-		<property name="destination" ref="slcJms.destination.agent.newExecution" />
+	<bean id="jmsAgent.attachmentUploader" class="org.argeo.slc.jms.JmsAttachmentUploader">
+		<property name="destination" ref="slcJms.destination.attachment.add" />
+		<property name="jmsTemplate" ref="jmsTemplate" />
+	</bean>
+
+	<bean id="jmsAgent.listener.pingAll" parent="jmsAgent.listener.template">
+		<property name="destination" ref="slcJms.destination.agent.pingAll" />
 		<property name="messageListener" ref="jmsAgent" />
-		<!-- <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>
 	</bean>
 
 	<bean id="jmsAgent" class="org.argeo.slc.jms.JmsAgent">
@@ -43,16 +33,20 @@
 
 	<!-- TreeTestResult Listener -->
 	<bean id="resultListener" class="org.argeo.slc.jms.JmsTreeTestResultListener">
-		<property name="createDestination" ref="slcJms.destination.test.create" />
+		<!-- <property name="createDestination" ref="slcJms.destination.test.create" />
 		<property name="addResultPartDestination" ref="slcJms.destination.test.addResultPart" />
 		<property name="closeDestination" ref="slcJms.destination.test.close" />
+-->
+		<property name="executionEventDestination" ref="slcJms.destination.execution.event" />
 		<property name="jmsTemplate" ref="jmsTemplate" />
 	</bean>
 
 	<!-- SLC Execution Listener -->
 	<bean id="slcExecutionListener" class="org.argeo.slc.jms.JmsSlcExecutionNotifier">
-		<property name="updateStatusDestination" ref="slcJms.destination.slcExecution.updateStatus" />
+		<!-- <property name="updateStatusDestination" ref="slcJms.destination.slcExecution.updateStatus" />
+-->
 		<property name="jmsTemplate" ref="jmsTemplate" />
+		<property name="executionEventDestination" ref="slcJms.destination.execution.event" />
 	</bean>
 
 	<!-- Common -->
@@ -61,5 +55,18 @@
 		<property name="connectionFactory" ref="jmsConnectionFactory" />
 	</bean>
 
+	<bean id="jmsTransactionManager"
+		class="org.springframework.jms.connection.JmsTransactionManager">
+		<property name="connectionFactory" ref="jmsConnectionFactory" />
+	</bean>
+
+	<bean id="jmsAgent.listener.template"
+		class="org.springframework.jms.listener.DefaultMessageListenerContainer"
+		abstract="true">
+		<property name="connectionFactory" ref="jmsConnectionFactory" />
+		<property name="messageListener" ref="jmsAgent" />
+		<property name="transactionManager" ref="jmsTransactionManager" />
+	</bean>
+
 
 </beans>
\ No newline at end of file