Improve configuration

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

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 59c02446e6444b4953d66c0c97cf467aac689e40..ef5f43ceb3471d9bf600ff7238d737140387a580 100644 (file)
--- 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
@@ -3,28 +3,28 @@
        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="locations">
+                       <value>osgibundle:activemq.properties</value>
+               </property>
+       </bean>
+
        <!-- 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="jmsTransactionManager"
-               class="org.springframework.jms.connection.JmsTransactionManager">
-               <property name="connectionFactory" ref="jmsConnectionFactory" />
-               </bean>
-       -->
-
-
        <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>