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=25213a9b559c1bfaa42aaaf9e7da822258a85f40;hb=2f0d706c736e883156d3edd7cf9c49428d85bc59;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..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,51 +1,34 @@
 <?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"
-	default-lazy-init="false">
+<!--
 
-	<import resource="classpath:org/argeo/slc/castor/spring.xml" />
+    Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
 
-	<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>
+    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
 
-	<amq:connectionFactory id="slcDefault.jms.amqConnectionFactory"
-		brokerURL="${org.apache.activemq.brokerURL}" />
+            http://www.apache.org/licenses/LICENSE-2.0
 
-	<bean id="slcDefault.jms.connectionFactory"
-		class="org.springframework.jms.connection.SingleConnectionFactory">
-		<property name="targetConnectionFactory">
-			<ref local="slcDefault.jms.amqConnectionFactory" />
-		</property>
-	</bean>
+    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.
 
-	<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>
+-->
 
+<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"
+	default-lazy-init="false">
 
-	<!-- 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" />
+	<import resource="classpath:org/argeo/slc/castor/spring.xml" />
 
-	<amq:queue id="slcJms.destination.modulesManager.request"
-		physicalName="modulesManager.request" />
-	<amq:topic id="slcJms.destination.modulesManager.response"
-		physicalName="modulesManager.response" />
+	<import resource="destinations.xml" />
 
-	<!-- Templates -->
-	<bean id="slcTemplate.jms.listenerContainer"
-		class="org.springframework.jms.listener.DefaultMessageListenerContainer"
-		abstract="true">
-		<property name="connectionFactory" ref="slcDefault.jms.connectionFactory" />
+	<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="slcTemplate.jms.listenerAdapterCastor"
@@ -53,4 +36,5 @@
 		abstract="true">
 		<property name="messageConverter" ref="slcDefault.jms.castorMessageConverter" />
 	</bean>
+
 </beans>
\ No newline at end of file