X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fserver%2Forg.argeo.slc.server.activemq%2FMETA-INF%2Fspring%2Factivemq.xml;h=ef5f43ceb3471d9bf600ff7238d737140387a580;hb=306b4417e8258aa195ba6cfeac6f4d2b66ce3231;hp=b17159039c95aabf48b5896696378c43137345b4;hpb=09ff0d0df8ec9de2ebcb3dc475e7b03aa4f47059;p=gpl%2Fargeo-slc.git

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 b17159039..ef5f43ceb 100644
--- 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>