Move server modules

[gpl/argeo-slc.git] / server / org.argeo.slc.siteserver / bundles / org.argeo.slc.server.activemq / META-INF / spring / activemq.xml

diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.activemq/META-INF/spring/activemq.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.activemq/META-INF/spring/activemq.xml
index 6695820832d20f1ba41784464ec15bc49da22a34..f76c9ab34addac324c989c851f57fe4d5862d9e9 100644 (file)
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.activemq/META-INF/spring/activemq.xml
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.activemq/META-INF/spring/activemq.xml
@@ -17,26 +17,17 @@
        </bean>
 
        <!-- Embedded broker -->
-       <amq:broker useJmx="false" persistent="false">
+       <amq:broker id="broker" useJmx="false" persistent="false">
                <amq:transportConnectors>
                        <amq:transportConnector uri="${slc.server.jms.url}" />
                </amq:transportConnectors>
        </amq:broker>
 
        <!-- Connection Factory -->
-       <!--
-               <bean id="jmsConnectionFactory"
-               class="org.springframework.jms.connection.SingleConnectionFactory">
-               <property name="targetConnectionFactory"> <bean
-               id="slcDefault.jms.amqConnectionFactory"
-               class="org.apache.activemq.ActiveMQConnectionFactory"> <property
-               name="brokerURL"> <value>vm://localhost</value> </property> </bean>
-               </property> </bean>
-       -->
-
-       <bean id="jmsConnectionFactory" class="org.apache.activemq.pool.PooledConnectionFactory"
-               destroy-method="stop">
-               <property name="connectionFactory">
+       <!---->
+       <bean id="jmsConnectionFactory"
+               class="org.springframework.jms.connection.CachingConnectionFactory">
+               <property name="targetConnectionFactory">
                        <bean class="org.apache.activemq.ActiveMQConnectionFactory">
                                <property name="brokerURL">
                                        <value>vm://localhost</value>
@@ -47,21 +38,32 @@
 
 
        <!--
-               <bean id="broker" class="org.apache.activemq.xbean.BrokerFactoryBean">
-               <property name="config" value="classpath:activemq-conf.xml" />
-               <property name="start" value="true" /> </bean>
+               <bean id="jmsConnectionFactory"
+               class="org.apache.activemq.pool.PooledConnectionFactory"
+               destroy-method="stop" depends-on="broker"> <property
+               name="connectionFactory"> <bean
+               class="org.apache.activemq.ActiveMQConnectionFactory"> <property
+               name="brokerURL"> <value>vm://localhost</value> </property> </bean>
+               </property> </bean>
        -->
 
+       <bean id="jmsTransactionManager"
+               class="org.springframework.jms.connection.JmsTransactionManager">
+               <property name="connectionFactory" ref="jmsConnectionFactory" />
+       </bean>
+
+       <!-- Agent Factory -->
        <bean id="agentFactory" class="org.argeo.slc.jms.JmsAgentProxyFactory">
                <property name="jmsTemplate">
                        <bean class="org.springframework.jms.core.JmsTemplate">
                                <property name="connectionFactory" ref="jmsConnectionFactory" />
-                               <property name="receiveTimeout" value="20000" />
+                               <property name="messageConverter" ref="slcDefault.jms.castorMessageConverter" />
+                               <property name="receiveTimeout" value="${slc.server.jms.agentProxy.timeout}" />
                        </bean>
                </property>
-               <property name="messageConverter" ref="slcDefault.jms.castorMessageConverter" />
                <property name="requestDestination" ref="slcJms.destination.agent.request" />
                <property name="responseDestination" ref="slcJms.destination.agent.response" />
+               <property name="pingAllDestination" ref="slcJms.destination.agent.pingAll" />
        </bean>