X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=server%2Forg.argeo.slc.siteserver%2Fbundles%2Forg.argeo.slc.server.activemq%2FMETA-INF%2Fspring%2Factivemq.xml;h=f76c9ab34addac324c989c851f57fe4d5862d9e9;hb=bda30d5125ac9f568d159e9ea5e34440863139c3;hp=2ef51f341954e81a90cf07f6de7ec37fe6c36f01;hpb=0f26a1ac2596c4f949973028af21bc0f951b7b7a;p=gpl%2Fargeo-slc.git

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.activemq/META-INF/spring/activemq.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.activemq/META-INF/spring/activemq.xml
index 2ef51f341..f76c9ab34 100644
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.activemq/META-INF/spring/activemq.xml
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.activemq/META-INF/spring/activemq.xml
@@ -6,20 +6,31 @@
 
 	<import resource="classpath:org/argeo/slc/activemq/spring.xml" />
 
+	<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>
+		</property>
+	</bean>
+
 	<!-- Embedded broker -->
-	<amq:broker useJmx="false" persistent="false">
+	<amq:broker id="broker" useJmx="false" persistent="false">
 		<amq:transportConnectors>
-			<amq:transportConnector uri="tcp://localhost:61616" />
+			<amq:transportConnector uri="${slc.server.jms.url}" />
 		</amq:transportConnectors>
 	</amq:broker>
 
 	<!-- Connection Factory -->
+	<!---->
 	<bean id="jmsConnectionFactory"
-		class="org.springframework.jms.connection.SingleConnectionFactory">
+		class="org.springframework.jms.connection.CachingConnectionFactory">
 		<property name="targetConnectionFactory">
-			<bean id="slcDefault.jms.amqConnectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
+			<bean class="org.apache.activemq.ActiveMQConnectionFactory">
 				<property name="brokerURL">
-					<value>tcp://localhost:61616</value>
+					<value>vm://localhost</value>
 				</property>
 			</bean>
 		</property>
@@ -27,8 +38,33 @@
 
 
 	<!--
-		<bean id="broker" class="org.apache.activemq.xbean.BrokerFactoryBean">
-		<property name="config" value="classpath:activemq-conf.xml" />
-		<property name="start" value="true" /> </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>
+
+
 </beans>
\ No newline at end of file