X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.support.activemq%2Fsrc%2Fmain%2Fresources%2Forg%2Fargeo%2Fslc%2Factivemq%2Fspring.xml;h=83c5ac9dc6f3037813ae686dfd19bce444945b6a;hb=618d5c6b4736835ce6b727f2644debc20d00158d;hp=05d439db74cb0cf2dc2babaf772edc463658b6de;hpb=ab459c7e28f29c0695d159f7971337e3b5884c6e;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 05d439db7..83c5ac9dc 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,8 +1,7 @@
 <?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.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" />
@@ -12,9 +11,15 @@
 		<property name="unmarshaller" ref="slcDefault.castor.marshaller" />
 	</bean>
 
-	<amq:connectionFactory id="slcDefault.jms.amqConnectionFactory"
+	<bean id="slcDefault.jms.amqConnectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
+		<property name="brokerURL">
+			<value>tcp://localhost:61616</value>
+		</property>
+	</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">
@@ -22,17 +27,32 @@
 		</property>
 	</bean>
 
-	<bean id="slcDefault.jms.jmsTemplate" class="org.springframework.jms.core.JmsTemplate">
+	<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.register"
+		physicalName="agent.register" /> <amq:topic
+		id="slcJms.destination.agent.unregister"
+		physicalName="agent.unregister" /> <amq:topic
+		id="slcJms.destination.agent.newExecution"
+		physicalName="agent.newExecution" />
+	-->
+	<bean id="slcJms.destination.agent.register" p:physicalName="agent.register"
+		parent="slcJms.amTopic" />
+	<bean id="slcJms.destination.agent.unregister" p:physicalName="agent.unregister"
+		parent="slcJms.amTopic" />
+	<bean id="slcJms.destination.agent.newExecution" p:physicalName="agent.newExecution"
+		parent="slcJms.amTopic" />
+
+	<bean id="slcJms.destination.modulesManager.request"
+		p:physicalName="modulesManager.request" parent="slcJms.amQueue" />
+	<bean id="slcJms.destination.modulesManager.response"
+		p:physicalName="modulesManager.response" parent="slcJms.amQueue" />
 
 	<!-- Templates -->
 	<bean id="slcTemplate.jms.listenerContainer"
@@ -41,9 +61,15 @@
 		<property name="connectionFactory" ref="slcDefault.jms.connectionFactory" />
 	</bean>
 
-	<bean id="slcTemplate.jms.listenerAdapter"
+	<bean id="slcTemplate.jms.listenerAdapterCastor"
 		class="org.springframework.jms.listener.adapter.MessageListenerAdapter"
 		abstract="true">
 		<property name="messageConverter" ref="slcDefault.jms.castorMessageConverter" />
 	</bean>
+
+	<bean id="slcJms.amQueue" class="org.apache.activemq.command.ActiveMQQueue"
+		abstract="true" />
+	<bean id="slcJms.amTopic" class="org.apache.activemq.command.ActiveMQTopic"
+		abstract="true" />
+
 </beans>
\ No newline at end of file