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 6695820832d20f1ba41784464ec15bc49da22a34..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
@@ -45,18 +45,11 @@
                </property>
        </bean>
 
-
-       <!--
-               <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="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="20000" />
+                               <property name="receiveTimeout" value="${slc.server.jms.agentProxy.timeout}" />
                        </bean>
                </property>
                <property name="messageConverter" ref="slcDefault.jms.castorMessageConverter" />