Make some properties externally configurable

[gpl/argeo-slc.git] / server / org.argeo.slc.siteserver / bundles / org.argeo.slc.server.activemq / META-INF / spring / activemq.xml

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 2ef51f341954e81a90cf07f6de7ec37fe6c36f01..f3c4b3194b2186b96740b5e02dba817c634f9a18 100644 (file)
--- 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,29 +6,56 @@
 
        <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:transportConnectors>
-                       <amq:transportConnector uri="tcp://localhost:61616" />
+                       <amq:transportConnector uri="${slc.server.jms.url}" />
                </amq:transportConnectors>
        </amq:broker>
 
        <!-- Connection Factory -->
-       <bean id="jmsConnectionFactory"
+       <!--
+               <bean id="jmsConnectionFactory"
                class="org.springframework.jms.connection.SingleConnectionFactory">
-               <property name="targetConnectionFactory">
-                       <bean id="slcDefault.jms.amqConnectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
+               <property name="targetConnectionFactory"> <bean
+               id="slcDefault.jms.amqConnectionFactory"
+               class="org.apache.activemq.ActiveMQConnectionFactory"> <property
+               name="brokerURL"> <value>vm://localhost</value> </property> </bean>
+               </property> </bean>
+       -->
+
+       <bean id="jmsConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactory"
+               destroy-method="stop">
+               <property name="connectionFactory">
+                       <bean class="org.apache.activemq.ActiveMQConnectionFactory">
                                <property name="brokerURL">
-                                       <value>tcp://localhost:61616</value>
+                                       <value>vm://localhost</value>
                                </property>
                        </bean>
                </property>
        </bean>
 
+       <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="receiveTimeout" value="${slc.server.jms.agentProxy.timeout}" />
+                       </bean>
+               </property>
+               <property name="messageConverter" ref="slcDefault.jms.castorMessageConverter" />
+               <property name="requestDestination" ref="slcJms.destination.agent.request" />
+               <property name="responseDestination" ref="slcJms.destination.agent.response" />
+       </bean>
+
 
-       <!--
-               <bean id="broker" class="org.apache.activemq.xbean.BrokerFactoryBean">
-               <property name="config" value="classpath:activemq-conf.xml" />
-               <property name="start" value="true" /> </bean>
-       -->
 </beans>
\ No newline at end of file