X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Forg.argeo.slc.siteserver%2Fbundles%2Forg.argeo.slc.server.jms%2FMETA-INF%2Fspring%2Fjms.xml;h=8c3054dff2356db0b362e967a7b204cac97de4f8;hb=ad602245885ef5a89fa056d33848dc6538b56f34;hp=d141b7f8799e7a1e9fa29808f97fe18de083fc5f;hpb=87efa1cdb79eeaf3f203cc9bf4f3d9f8d0a299f8;p=gpl%2Fargeo-slc.git

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.jms/META-INF/spring/jms.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.jms/META-INF/spring/jms.xml
index d141b7f87..8c3054dff 100644
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.jms/META-INF/spring/jms.xml
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.jms/META-INF/spring/jms.xml
@@ -6,9 +6,31 @@
 
 	<import resource="classpath:org/argeo/slc/activemq/spring.xml" />
 
+	<!-- Attachments -->
+
+	<bean id="attachmentStorage.jmsContainer.add" parent="listenerContainer">
+		<property name="destination" ref="slcJms.destination.attachment.add" />
+		<property name="messageListener">
+			<bean class="org.argeo.slc.jms.JmsAttachmentListener">
+				<property name="attachmentsStorage" ref="attachmentsStorage" />
+			</bean>
+		</property>
+	</bean>
+
 	<!-- Events -->
-	<bean id="jmsEventListener" class="org.argeo.slc.jms.JmsSlcEventListener">
-		<property name="jmsConnectionFactory" ref="jmsConnectionFactory" />
+	<bean id="jmsEventListener" class="org.argeo.slc.jms.JmsSlcEventListener"
+		init-method="init" destroy-method="close">
+		<property name="jmsConnectionFactory">
+			<!--
+				Need its own connection factory in order to set client ids (not
+				possible on pool)
+			-->
+			<bean class="org.apache.activemq.ActiveMQConnectionFactory">
+				<property name="brokerURL">
+					<value>vm://localhost</value>
+				</property>
+			</bean>
+		</property>
 		<property name="eventsDestination" ref="slcJms.destination.events" />
 		<property name="messageConverter" ref="slcDefault.jms.castorMessageConverter" />
 	</bean>
@@ -39,21 +61,6 @@
 		</property>
 	</bean>
 
-	<bean id="agentService.jmsContainer.newExecution" parent="listenerContainer">
-		<property name="destination" ref="slcJms.destination.agent.newExecution" />
-		<property name="messageListener">
-			<bean class="org.argeo.slc.jms.JmsTransferNewExecution">
-				<property name="messageConverter" ref="slcDefault.jms.castorMessageConverter" />
-				<property name="agentFactory" ref="agentFactory" />
-				<property name="serviceMsgHandler">
-					<bean class="org.argeo.slc.services.ServiceMsgHandler">
-						<property name="slcExecutionService" ref="slcExecutionService" />
-					</bean>
-				</property>
-			</bean>
-		</property>
-	</bean>
-
 	<bean parent="listenerContainer">
 		<property name="destination" ref="slcJms.destination.execution.event" />
 		<property name="messageListener">