X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=modules%2Fserver%2Forg.argeo.slc.server.activemq%2FMETA-INF%2Fspring%2Factivemq.xml;h=57ad1970fa3af2070b2fb9e190599c03bbefb7cc;hb=ffe7754e421f8ad5d3a336f54a498f67c6d72839;hp=f76c9ab34addac324c989c851f57fe4d5862d9e9;hpb=c52850184216516bf630ee5a65f3bbff4a06c394;p=gpl%2Fargeo-slc.git

diff --git a/modules/server/org.argeo.slc.server.activemq/META-INF/spring/activemq.xml b/modules/server/org.argeo.slc.server.activemq/META-INF/spring/activemq.xml
index f76c9ab34..57ad1970f 100644
--- a/modules/server/org.argeo.slc.server.activemq/META-INF/spring/activemq.xml
+++ b/modules/server/org.argeo.slc.server.activemq/META-INF/spring/activemq.xml
@@ -1,69 +1,33 @@
 <?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">
-
-	<import resource="classpath:org/argeo/slc/activemq/spring.xml" />
+	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">
 
 	<bean
 		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
 		<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
 		<property name="ignoreUnresolvablePlaceholders" value="true" />
 		<property name="locations">
-			<value>osgibundle:activemq.properties
-			</value>
+			<value>osgibundle:activemq.properties</value>
 		</property>
 	</bean>
 
-	<!-- Embedded broker -->
-	<amq:broker id="broker" useJmx="false" persistent="false">
-		<amq:transportConnectors>
-			<amq:transportConnector uri="${slc.server.jms.url}" />
-		</amq:transportConnectors>
-	</amq:broker>
-
 	<!-- Connection Factory -->
-	<!---->
 	<bean id="jmsConnectionFactory"
 		class="org.springframework.jms.connection.CachingConnectionFactory">
 		<property name="targetConnectionFactory">
 			<bean class="org.apache.activemq.ActiveMQConnectionFactory">
 				<property name="brokerURL">
-					<value>vm://localhost</value>
+					<value>${slc.server.jms.url}</value>
 				</property>
 			</bean>
 		</property>
 	</bean>
 
-
-	<!--
-		<bean id="jmsConnectionFactory"
-		class="org.apache.activemq.pool.PooledConnectionFactory"
-		destroy-method="stop" depends-on="broker"> <property
-		name="connectionFactory"> <bean
-		class="org.apache.activemq.ActiveMQConnectionFactory"> <property
-		name="brokerURL"> <value>vm://localhost</value> </property> </bean>
-		</property> </bean>
-	-->
-
-	<bean id="jmsTransactionManager"
-		class="org.springframework.jms.connection.JmsTransactionManager">
-		<property name="connectionFactory" ref="jmsConnectionFactory" />
-	</bean>
-
-	<!-- Agent Factory -->
-	<bean id="agentFactory" class="org.argeo.slc.jms.JmsAgentProxyFactory">
-		<property name="jmsTemplate">
-			<bean class="org.springframework.jms.core.JmsTemplate">
-				<property name="connectionFactory" ref="jmsConnectionFactory" />
-				<property name="messageConverter" ref="slcDefault.jms.castorMessageConverter" />
-				<property name="receiveTimeout" value="${slc.server.jms.agentProxy.timeout}" />
-			</bean>
-		</property>
-		<property name="requestDestination" ref="slcJms.destination.agent.request" />
-		<property name="responseDestination" ref="slcJms.destination.agent.response" />
-		<property name="pingAllDestination" ref="slcJms.destination.agent.pingAll" />
+	<bean id="jmsCastorMessageConverter" class="org.argeo.slc.jms.MarshallerMessageConverter">
+		<property name="disableMarshalling" value="${slc.server.jms.disableMarshalling}" />
+		<property name="marshaller" ref="marshaller" />
+		<property name="unmarshaller" ref="unmarshaller" />
 	</bean>