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 b17159039c95aabf48b5896696378c43137345b4..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
@@ -6,10 +6,8 @@
        <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>
+                       <value>osgibundle:activemq.properties</value>
                </property>
        </bean>
 
@@ -25,16 +23,8 @@
                </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>