Introduce SLC Execution otification via JMS

[gpl/argeo-slc.git] / runtime / org.argeo.slc.support.activemq / src / main / resources / org / argeo / slc / activemq / spring-agent.xml

diff --git a/runtime/org.argeo.slc.support.activemq/src/main/resources/org/argeo/slc/activemq/spring-agent.xml b/runtime/org.argeo.slc.support.activemq/src/main/resources/org/argeo/slc/activemq/spring-agent.xml
index 32aa12fe03a9428133d5f82390cb4768df17c4bd..a6492a546be643d9524d98e2629f721f1c3be9f8 100644 (file)
--- a/runtime/org.argeo.slc.support.activemq/src/main/resources/org/argeo/slc/activemq/spring-agent.xml
+++ b/runtime/org.argeo.slc.support.activemq/src/main/resources/org/argeo/slc/activemq/spring-agent.xml
@@ -5,41 +5,28 @@
        http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd"
        default-lazy-init="false">
 
-       <bean
-               class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"
-               lazy-init="false">
-               <property name="properties">
-                       <props>
-                               <prop key="org.apache.activemq.brokerURL">
-                                       tcp://localhost:61616
-                </prop>
-                       </props>
-               </property>
-               <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
-               <property name="ignoreUnresolvablePlaceholders" value="true" />
-       </bean>
-
        <import resource="classpath:org/argeo/slc/activemq/spring.xml" />
 
-       <bean id="slcDefault.jms.agent" class="org.argeo.slc.jms.JmsAgent">
-               <property name="jmsTemplate" ref="slcDefault.jms.jmsTemplate" />
+       <bean id="slcDefault.jms.agent" class="org.argeo.slc.jms.JmsAgent"
+               autowire="byType">
+               <property name="jmsTemplate" ref="slcDefault.jms.jmsTemplateCastor" />
                <property name="agentRegister" ref="slcJms.destination.agent.register" />
                <property name="agentUnregister" ref="slcJms.destination.agent.unregister" />
        </bean>
 
-       <bean id="slcTemplate.jms.agentListenerContainer.newExecution"
-               parent="slcTemplate.jms.agentListenerContainer">
-               <property name="action" value="newExecution" />
-       </bean>
-
        <!-- Templates -->
-       <bean id="slcTemplate.jms.agentListenerContainer" class="org.argeo.slc.jms.AgentListenerContainer"
-               abstract="true">
-               <property name="jmsAgent" ref="slcDefault.jms.agent" />
+       <bean id="slcDefault.jms.listener.newExecution" parent="slcTemplate.jms.listenerContainer">
                <property name="connectionFactory" ref="slcDefault.jms.connectionFactory" />
-               <property name="messageConverter" ref="slcDefault.jms.castorMessageConverter" />
-               <property name="pubSubDomain" value="true" />
+               <property name="destination" ref="slcJms.destination.agent.newExecution" />
+               <property name="messageListener">
+                       <bean parent="slcTemplate.jms.listenerAdapterCastor">
+                               <constructor-arg ref="slcDefault.jms.agent" />
+                               <property name="defaultListenerMethod" value="newExecution" />
+                       </bean>
+               </property>
+               <property name="messageSelector">
+                       <bean factory-bean="slcDefault.jms.agent" factory-method="getMessageSelector"/>
+               </property>
        </bean>
 
-
 </beans>
\ No newline at end of file