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=681d41a73eee9696b30a3745ef3b0fd32a8c22e7;hp=8c3054dff2356db0b362e967a7b204cac97de4f8;hpb=c52850184216516bf630ee5a65f3bbff4a06c394;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 8c3054dff..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
@@ -4,10 +4,17 @@
 	xsi:schemaLocation="
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-	<import resource="classpath:org/argeo/slc/activemq/spring.xml" />
+	<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,12 +34,13 @@
 			-->
 			<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" />
-		<property name="messageConverter" ref="slcDefault.jms.castorMessageConverter" />
+		<property name="messageConverter" ref="jmsMessageConverter" />
 	</bean>
 
 	<bean id="jmsEventPublisher" class="org.argeo.slc.jms.JmsSlcEventPublisher">
@@ -65,7 +73,7 @@
 		<property name="destination" ref="slcJms.destination.execution.event" />
 		<property name="messageListener">
 			<bean class="org.argeo.slc.jms.JmsExecutionHandler">
-				<property name="messageConverter" ref="slcDefault.jms.castorMessageConverter" />
+				<property name="messageConverter" ref="jmsMessageConverter" />
 				<property name="serviceMsgHandler">
 					<bean class="org.argeo.slc.services.ServiceMsgHandler">
 						<property name="slcExecutionService" ref="slcExecutionService" />
@@ -76,44 +84,9 @@
 		</property>
 	</bean>
 
-
-	<!--
-		Test Manager Service <bean parent="listenerContainer"> <property
-		name="destination" ref="slcJms.destination.test.create" /> <property
-		name="messageListener"> <bean parent="listenerAdapterCastor">
-		<constructor-arg ref="testManagerService" /> <property
-		name="defaultListenerMethod" value="createTreeTestResult" /> </bean>
-		</property> </bean> <bean parent="listenerContainer"> <property
-		name="destination" ref="slcJms.destination.test.addResultPart" />
-		<property name="messageListener"> <bean
-		parent="listenerAdapterCastor"> <constructor-arg
-		ref="testManagerService" /> <property name="defaultListenerMethod"
-		value="addResultPart" /> </bean> </property> </bean> <bean
-		parent="listenerContainer"> <property name="destination"
-		ref="slcJms.destination.test.close" /> <property
-		name="messageListener"> <bean parent="listenerAdapterCastor">
-		<constructor-arg ref="testManagerService" /> <property
-		name="defaultListenerMethod" value="closeTreeTestResult" /> </bean>
-		</property> </bean>
-	-->
-	<!--
-		SLC Execution Service <bean parent="listenerContainer"> <property
-		name="destination" ref="slcJms.destination.agent.newExecution" />
-		<property name="messageListener"> <bean
-		parent="listenerAdapterCastor"> <constructor-arg
-		ref="slcExecutionService" /> <property name="defaultListenerMethod"
-		value="newExecution" /> </bean> </property> </bean> <bean
-		parent="listenerContainer"> <property name="destination"
-		ref="slcJms.destination.slcExecution.updateStatus" /> <property
-		name="messageListener"> <bean parent="listenerAdapterCastor">
-		<constructor-arg ref="slcExecutionService" /> <property
-		name="defaultListenerMethod" value="updateStatus" /> </bean>
-		</property> </bean>
-	-->
-
 	<!-- Common -->
 	<bean id="jmsTemplate" class="org.springframework.jms.core.JmsTemplate">
-		<property name="messageConverter" ref="slcDefault.jms.castorMessageConverter" />
+		<property name="messageConverter" ref="jmsMessageConverter" />
 		<property name="connectionFactory" ref="jmsConnectionFactory" />
 	</bean>
 
@@ -125,12 +98,17 @@
 		<!--
 			<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"
 		class="org.springframework.jms.listener.adapter.MessageListenerAdapter"
 		abstract="true">
-		<property name="messageConverter" ref="slcDefault.jms.castorMessageConverter" />
+		<property name="messageConverter" ref="jmsMessageConverter" />
 	</bean>
 
 </beans>
\ No newline at end of file