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=25213a9b559c1bfaa42aaaf9e7da822258a85f40;hb=2f0d706c736e883156d3edd7cf9c49428d85bc59;hp=83c5ac9dc6f3037813ae686dfd19bce444945b6a;hpb=618d5c6b4736835ce6b727f2644debc20d00158d;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 83c5ac9dc..25213a9b5 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,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+            http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+
 <beans xmlns="http://www.springframework.org/schema/beans"
 	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"
@@ -6,70 +24,17 @@
 
 	<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>
 
-	<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">
-			<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" />
-	-->
-	<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"
-		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>
 
-	<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