Fix issue with the ordering of event on the server side.

[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 cb7cd2da287a8887acf7070701e0554854eb4544..d747ec676669483a0b8cdecfd1fa43c5dba9ff54 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
@@ -33,69 +33,73 @@
                        <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>
 
-       <!-- Test Manager Service -->
        <bean parent="listenerContainer">
-               <property name="destination" ref="slcJms.destination.test.create" />
+               <property name="destination" ref="slcJms.destination.execution.event" />
                <property name="messageListener">
-                       <bean parent="listenerAdapterCastor">
-                               <constructor-arg ref="testManagerService" />
-                               <property name="defaultListenerMethod" value="createTreeTestResult" />
-                       </bean>
-               </property>
-       </bean>
-
-       <bean parent="listenerContainer">
-               <property name="destination" ref="slcJms.destination.test.addResultPart" />
-               <property name="messageListener">
-                       <bean parent="listenerAdapterCastor">
-                               <constructor-arg ref="testManagerService" />
-                               <property name="defaultListenerMethod" value="addResultPart" />
-                       </bean>
-               </property>
-       </bean>
-
-       <bean parent="listenerContainer">
-               <property name="destination" ref="slcJms.destination.test.close" />
-               <property name="messageListener">
-                       <bean parent="listenerAdapterCastor">
-                               <constructor-arg ref="testManagerService" />
-                               <property name="defaultListenerMethod" value="closeTreeTestResult" />
-                       </bean>
-               </property>
-       </bean>
-
-       <!-- SLC Execution Service -->
-       <bean parent="listenerContainer">
-               <property name="destination" ref="slcJms.destination.agent.newExecution" />
-               <property name="messageListener">
-                       <bean parent="listenerAdapterCastor">
-                               <constructor-arg ref="slcExecutionService" />
-                               <property name="defaultListenerMethod" value="newExecution" />
+                       <bean class="org.argeo.slc.jms.JmsExecutionHandler">
+                               <property name="messageConverter" ref="slcDefault.jms.castorMessageConverter" />
+                               <property name="serviceMsgHandler">
+                                       <bean class="org.argeo.slc.services.ServiceMsgHandler">
+                                               <property name="slcExecutionService" ref="slcExecutionService" />
+                                               <property name="testManagerService" ref="testManagerService" />
+                                       </bean>
+                               </property>
                        </bean>
                </property>
        </bean>
 
-       <bean parent="listenerContainer">
-               <property name="destination" ref="slcJms.destination.slcExecution.updateStatus" />
-               <property name="messageListener">
-                       <bean parent="listenerAdapterCastor">
-                               <constructor-arg ref="slcExecutionService" />
-                               <property name="defaultListenerMethod" value="updateStatus" />
-                       </bean>
-               </property>
-       </bean>
 
+       <!--
+               Test Manager Service <bean parent="listenerContainer"> <property
+               name="destination" ref="slcJms.destination.test.create" /> <property
+               name="messageListener"> <bean parent="listenerAdapterCastor">
+               <constructor-arg ref="testManagerService" /> <property
+               name="defaultListenerMethod" value="createTreeTestResult" /> </bean>
+               </property> </bean> <bean parent="listenerContainer"> <property
+               name="destination" ref="slcJms.destination.test.addResultPart" />
+               <property name="messageListener"> <bean
+               parent="listenerAdapterCastor"> <constructor-arg
+               ref="testManagerService" /> <property name="defaultListenerMethod"
+               value="addResultPart" /> </bean> </property> </bean> <bean
+               parent="listenerContainer"> <property name="destination"
+               ref="slcJms.destination.test.close" /> <property
+               name="messageListener"> <bean parent="listenerAdapterCastor">
+               <constructor-arg ref="testManagerService" /> <property
+               name="defaultListenerMethod" value="closeTreeTestResult" /> </bean>
+               </property> </bean>
+       -->
+       <!--
+               SLC Execution Service <bean parent="listenerContainer"> <property
+               name="destination" ref="slcJms.destination.agent.newExecution" />
+               <property name="messageListener"> <bean
+               parent="listenerAdapterCastor"> <constructor-arg
+               ref="slcExecutionService" /> <property name="defaultListenerMethod"
+               value="newExecution" /> </bean> </property> </bean> <bean
+               parent="listenerContainer"> <property name="destination"
+               ref="slcJms.destination.slcExecution.updateStatus" /> <property
+               name="messageListener"> <bean parent="listenerAdapterCastor">
+               <constructor-arg ref="slcExecutionService" /> <property
+               name="defaultListenerMethod" value="updateStatus" /> </bean>
+               </property> </bean>
+       -->
 
        <!-- Templates -->
        <bean id="listenerContainer"
                class="org.springframework.jms.listener.DefaultMessageListenerContainer"
                abstract="true">
                <property name="connectionFactory" ref="jmsConnectionFactory" />
-               <property name="transactionManager" ref="jmsTransactionManager" />
+               <!--
+                       <property name="transactionManager" ref="jmsTransactionManager" />
+               -->
        </bean>
 
        <bean id="listenerAdapterCastor"