Adapt to changes in Commons

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

diff --git a/modules/server/org.argeo.slc.server.jms/META-INF/spring/jms.xml b/modules/server/org.argeo.slc.server.jms/META-INF/spring/jms.xml
index bd412575e67324ae9d1eae60154a147427477730..b7e379129a5c665d8073db0e3bf62b3aa153a92e 100644 (file)
--- a/modules/server/org.argeo.slc.server.jms/META-INF/spring/jms.xml
+++ b/modules/server/org.argeo.slc.server.jms/META-INF/spring/jms.xml
@@ -6,8 +6,15 @@
 
        <import resource="classpath:org/argeo/slc/activemq/destinations.xml" />
 
-       <!-- Attachments -->
+       <bean
+               class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+               <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
+               <property name="locations">
+                       <value>osgibundle:jms.properties</value>
+               </property>
+       </bean>
 
+       <!-- Attachments -->
        <bean id="attachmentStorage.jmsContainer.add" parent="listenerContainer">
                <property name="destination" ref="slcJms.destination.attachment.add" />
                <property name="messageListener">
@@ -21,13 +28,12 @@
        <bean id="jmsEventListener" class="org.argeo.slc.jms.JmsSlcEventListener"
                init-method="init" destroy-method="close">
                <property name="jmsConnectionFactory">
-                       <!--
-                               Need its own connection factory in order to set client ids (not
-                               possible on pool)
-                       -->
+                       <!-- Need its own connection factory in order to set client ids (not possible 
+                               on pool) -->
                        <bean class="org.apache.activemq.ActiveMQConnectionFactory">
                                <property name="brokerURL">
-                                       <value>vm://localhost</value>
+                                       <value>${slc.server.jms.url}</value>
+                                       <!--<value>vm://localhost</value> -->
                                </property>
                        </bean>
                </property>
@@ -87,12 +93,10 @@
                class="org.springframework.jms.listener.DefaultMessageListenerContainer"
                abstract="true">
                <property name="connectionFactory" ref="jmsConnectionFactory" />
-               <!--
-                       <property name="transactionManager" ref="jmsTransactionManager" />
-               -->
+               <!-- <property name="transactionManager" ref="jmsTransactionManager" /> -->
                <property name="taskExecutor">
-                       <bean class="org.argeo.security.core.SystemAuthenticatedTaskExecutor">
-                               <property name="securityService" ref="securityService" />
+                       <bean class="org.argeo.security.core.AsyncSystemTaskExecutor">
+                               <property name="systemExecutionService" ref="systemExecutionService" />
                        </bean>
                </property>
        </bean>