X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=runtime%2Forg.argeo.slc.support.activemq%2Fsrc%2Fmain%2Fresources%2Forg%2Fargeo%2Fslc%2Factivemq%2Fspring.xml;h=3525591ca1738e8179a345648bc1933dafbdf281;hb=04322c762f1704f0510f972ecd81c53b632899b3;hp=f2a9848b2773f073a2baeedb1af543ddc316f4f8;hpb=237c2da124703a91c64cf0106d293f77821010e1;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.support.activemq/src/main/resources/org/argeo/slc/activemq/spring.xml b/runtime/org.argeo.slc.support.activemq/src/main/resources/org/argeo/slc/activemq/spring.xml
index f2a9848b2..3525591ca 100644
--- a/runtime/org.argeo.slc.support.activemq/src/main/resources/org/argeo/slc/activemq/spring.xml
+++ b/runtime/org.argeo.slc.support.activemq/src/main/resources/org/argeo/slc/activemq/spring.xml
@@ -1,56 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-	http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.2.0.xsd"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
 	default-lazy-init="false">
 
 	<import resource="classpath:org/argeo/slc/castor/spring.xml" />
 
+	<import resource="destinations.xml" />
+
 	<bean id="slcDefault.jms.castorMessageConverter" class="org.argeo.slc.jms.MarshallerMessageConverter">
 		<property name="marshaller" ref="slcDefault.castor.marshaller" />
 		<property name="unmarshaller" ref="slcDefault.castor.marshaller" />
 	</bean>
 
-	<amq:connectionFactory id="slcDefault.jms.amqConnectionFactory"
-		brokerURL="${org.apache.activemq.brokerURL}" />
-
-	<bean id="slcDefault.jms.connectionFactory"
-		class="org.springframework.jms.connection.SingleConnectionFactory">
-		<property name="targetConnectionFactory">
-			<ref local="slcDefault.jms.amqConnectionFactory" />
-		</property>
-	</bean>
-
-	<bean id="slcDefault.jms.jmsTemplateCastor" class="org.springframework.jms.core.JmsTemplate">
-		<property name="connectionFactory" ref="slcDefault.jms.connectionFactory" />
-		<property name="messageConverter" ref="slcDefault.jms.castorMessageConverter" />
-	</bean>
-
-
-	<!-- Destinations -->
-	<amq:topic id="slcJms.destination.agent.register"
-		physicalName="agent.register" />
-	<amq:topic id="slcJms.destination.agent.unregister"
-		physicalName="agent.unregister" />
-	<amq:topic id="slcJms.destination.agent.newExecution"
-		physicalName="agent.newExecution" />
-
-	<amq:queue id="slcJms.destination.modulesManager.request"
-		physicalName="modulesManager.request" />
-	<amq:topic id="slcJms.destination.modulesManager.response"
-		physicalName="modulesManager.response" />
-
-	<!-- Templates -->
-	<bean id="slcTemplate.jms.listenerContainer"
-		class="org.springframework.jms.listener.DefaultMessageListenerContainer"
-		abstract="true">
-		<property name="connectionFactory" ref="slcDefault.jms.connectionFactory" />
-	</bean>
-
 	<bean id="slcTemplate.jms.listenerAdapterCastor"
 		class="org.springframework.jms.listener.adapter.MessageListenerAdapter"
 		abstract="true">
 		<property name="messageConverter" ref="slcDefault.jms.castorMessageConverter" />
 	</bean>
+
 </beans>
\ No newline at end of file