Attachments management

[gpl/argeo-slc.git] / server / org.argeo.slc.siteserver / bundles / org.argeo.slc.server.jms / META-INF / spring / jms.xml

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 d141b7f8799e7a1e9fa29808f97fe18de083fc5f..8c3054dff2356db0b362e967a7b204cac97de4f8 100644 (file)
--- 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">