X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Forg.argeo.slc.siteserver%2Fbundles%2Forg.argeo.slc.server.activemq%2FMETA-INF%2Fspring%2Factivemq.xml;h=f76c9ab34addac324c989c851f57fe4d5862d9e9;hb=25faa15e49f30510b365ba75646128b7e5a74586;hp=6ea6b61c2434511253d040384fd453f44acd4186;hpb=b072c117f63f2bfc3ccdf1614bfbe03877ea15c1;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 6ea6b61c2..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,27 +6,65 @@
 
 	<import resource="classpath:org/argeo/slc/activemq/spring.xml" />
 
-	<!--
-		Create embedded broker-->
-	<amq:broker useJmx="false" persistent="false">
+	<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 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>
 
-<!-- 
-	<bean id="broker" class="org.apache.activemq.xbean.BrokerFactoryBean">
-		<property name="config" value="classpath:activemq-conf.xml" />
-		<property name="start" value="true" />
+	<!-- 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>
+				</property>
+			</bean>
+		</property>
 	</bean>
- -->
 
-	<bean id="template.jms.listenerContainer" parent="slcTemplate.jms.listenerContainer"
-		abstract="true">
+
+	<!--
+		<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>
 
-	<bean id="template.jms.listenerAdapter" parent="slcTemplate.jms.listenerAdapterCastor"
-		abstract="true">
+	<!-- 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