NEW - bug 11: Introduce a simplified launch for RCP

[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 d50dfda608be604b21fe409d1e729ae7ff4429a2..cd4f23d1fa9342a678e200d92da364df095f3531 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">
@@ -27,8 +34,9 @@
                        -->
                        <bean class="org.apache.activemq.ActiveMQConnectionFactory">
                                <property name="brokerURL">
-                                       <value>vm://localhost</value>
-                               </property>
+                                       <value>${slc.server.jms.url}</value>
+                                       <!--<value>vm://localhost</value>
+                               --></property>
                        </bean>
                </property>
                <property name="eventsDestination" ref="slcJms.destination.events" />
@@ -90,6 +98,11 @@
                <!--
                        <property name="transactionManager" ref="jmsTransactionManager" />
                -->
+               <property name="taskExecutor">
+                       <bean class="org.argeo.security.core.SystemAuthenticatedTaskExecutor">
+                               <property name="securityService" ref="securityService" />
+                       </bean>
+               </property>
        </bean>
 
        <bean id="listenerAdapterCastor"