X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=modules%2Fserver%2Forg.argeo.slc.server.jms%2FMETA-INF%2Fspring%2Fjms.xml;h=cd4f23d1fa9342a678e200d92da364df095f3531;hb=331ed178b4b5ee277a5c62477d4892f8f089a8b9;hp=d50dfda608be604b21fe409d1e729ae7ff4429a2;hpb=09ff0d0df8ec9de2ebcb3dc475e7b03aa4f47059;p=gpl%2Fargeo-slc.git

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 d50dfda60..cd4f23d1f 100644
--- 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"