From 61cf879a296d5afdb5d0b6aaa7c6bea1eed9e442 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 28 Apr 2009 16:58:55 +0000 Subject: [PATCH] Fix issue with the ordering of event on the server side. git-svn-id: https://svn.argeo.org/slc/trunk@2391 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- demo/.classpath | 6 ++ demo/.project | 12 +++ demo/.settings/org.eclipse.jdt.core.prefs | 5 + demo/.settings/org.maven.ide.eclipse.prefs | 9 ++ demo/pom.xml | 10 +- .../org.argeo.slc.demo.log4j/log4j.properties | 6 +- .../org/argeo/slc/osgiboot/Activator.java | 9 +- .../argeo/slc/services/ServiceMsgHandler.java | 43 +++++++++ .../impl/runtime/AgentServiceImpl.java | 2 +- .../main/java/org/argeo/slc/jms/JmsAgent.java | 46 ++++----- .../java/org/argeo/slc/jms/JmsAgentProxy.java | 4 +- .../argeo/slc/jms/JmsExecutionHandler.java | 32 +++++++ .../slc/jms/JmsSlcExecutionNotifier.java | 15 ++- .../slc/jms/JmsTransferNewExecution.java | 7 ++ .../slc/jms/JmsTreeTestResultListener.java | 41 ++++---- .../org/argeo/slc/activemq/destinations.xml | 23 +++-- .../java/org/argeo/slc/msg/MsgHandler.java | 5 + .../META-INF/spring/jms.xml | 30 +++--- .../META-INF/spring/transport.xml | 16 +++- .../META-INF/spring/activemq.xml | 17 +++- .../META-INF/spring/transaction.xml | 6 +- .../META-INF/spring/jms.xml | 96 ++++++++++--------- .../services.properties | 2 +- 23 files changed, 303 insertions(+), 139 deletions(-) create mode 100644 demo/.classpath create mode 100644 demo/.settings/org.eclipse.jdt.core.prefs create mode 100644 demo/.settings/org.maven.ide.eclipse.prefs create mode 100644 runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/ServiceMsgHandler.java create mode 100644 runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsExecutionHandler.java create mode 100644 runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/msg/MsgHandler.java diff --git a/demo/.classpath b/demo/.classpath new file mode 100644 index 000000000..d0bec0f76 --- /dev/null +++ b/demo/.classpath @@ -0,0 +1,6 @@ + + + + + + diff --git a/demo/.project b/demo/.project index 46d39a88e..ba427f6cb 100644 --- a/demo/.project +++ b/demo/.project @@ -5,7 +5,19 @@ + + org.eclipse.jdt.core.javabuilder + + + + + org.maven.ide.eclipse.maven2Builder + + + + org.eclipse.jdt.core.javanature + org.maven.ide.eclipse.maven2Nature diff --git a/demo/.settings/org.eclipse.jdt.core.prefs b/demo/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..05f73168d --- /dev/null +++ b/demo/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +#Tue Apr 28 16:14:04 CEST 2009 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/demo/.settings/org.maven.ide.eclipse.prefs b/demo/.settings/org.maven.ide.eclipse.prefs new file mode 100644 index 000000000..74021b557 --- /dev/null +++ b/demo/.settings/org.maven.ide.eclipse.prefs @@ -0,0 +1,9 @@ +#Tue Apr 28 16:13:53 CEST 2009 +activeProfiles= +eclipse.preferences.version=1 +fullBuildGoals=process-test-resources +includeModules=false +resolveWorkspaceProjects=true +resourceFilterGoals=process-resources resources\:testResources +skipCompilerPlugin=true +version=1 diff --git a/demo/pom.xml b/demo/pom.xml index 7f39cced4..f2d0b19e9 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -58,10 +58,8 @@ target/exec/server -Xmx256m - + 0 org.argeo.dep.osgi.catalina.start, @@ -76,8 +74,7 @@ org.argeo.slc.webapp, org.argeo.slc.ria - 0 - true + @@ -104,8 +101,7 @@ org.springframework.osgi.extender, org.argeo.slc.support.equinox, org.argeo.slc.agent, - org.argeo.slc.demo.basic, - org.argeo.slc.demo.manager + org.argeo.slc.demo.basic diff --git a/demo/site/org.argeo.slc.demo.log4j/log4j.properties b/demo/site/org.argeo.slc.demo.log4j/log4j.properties index 3ee850471..65e3e963c 100644 --- a/demo/site/org.argeo.slc.demo.log4j/log4j.properties +++ b/demo/site/org.argeo.slc.demo.log4j/log4j.properties @@ -6,11 +6,15 @@ log4j.logger.org.argeo.slc.execution.ExecutionParameterPostProcessor=TRACE log4j.logger.org.argeo.slc.execution.ExecutionContext=DEBUG log4j.logger.org.argeo.slc.execution.SimpleExecutionSpec=DEBUG +log4j.logger.org.argeo.slc.services=DEBUG + log4j.logger.org.springframework=WARN +log4j.logger.org.springframework.jms=WARN log4j.logger.org.apache.activemq=WARN log4j.logger.org.apache.activemq.transport=WARN -log4j.logger.org.apache.activemq.selector=WARN +log4j.logger.org.apache.activemq.ActiveMQMessageConsumer=INFO +log4j.logger.org.apache.activemq.ActiveMQMessageProducer=INFO log4j.logger.org.apache.catalina=INFO log4j.logger.org.apache.coyote=INFO diff --git a/runtime/org.argeo.slc.osgiboot/src/main/java/org/argeo/slc/osgiboot/Activator.java b/runtime/org.argeo.slc.osgiboot/src/main/java/org/argeo/slc/osgiboot/Activator.java index 6d5a6ed02..4457a4c51 100644 --- a/runtime/org.argeo.slc.osgiboot/src/main/java/org/argeo/slc/osgiboot/Activator.java +++ b/runtime/org.argeo.slc.osgiboot/src/main/java/org/argeo/slc/osgiboot/Activator.java @@ -36,10 +36,10 @@ public class Activator implements BundleActivator { info("SLC OSGi bootstrap starting..."); // installUrls(bundleContext, getDevLocationsUrls()); - installUrls(bundleContext, getLocationsUrls()); - installUrls(bundleContext, getBundlesUrls()); + installUrls(bundleContext, getLocationsUrls()); + installUrls(bundleContext, getMavenUrls()); startBundles(bundleContext); @@ -62,8 +62,9 @@ public class Activator implements BundleActivator { if (installedBundles.containsKey(url)) { Bundle bundle = installedBundles.get(url); // bundle.update(); - info("Bundle " + bundle.getSymbolicName() - + " already installed from " + url); + if (debug) + debug("Bundle " + bundle.getSymbolicName() + + " already installed from " + url); } else { Bundle bundle = bundleContext.installBundle(url); if (debug) diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/ServiceMsgHandler.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/ServiceMsgHandler.java new file mode 100644 index 000000000..87579ea0f --- /dev/null +++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/ServiceMsgHandler.java @@ -0,0 +1,43 @@ +package org.argeo.slc.services; + +import org.argeo.slc.SlcException; +import org.argeo.slc.msg.MsgHandler; +import org.argeo.slc.msg.process.SlcExecutionStatusRequest; +import org.argeo.slc.msg.test.tree.CloseTreeTestResultRequest; +import org.argeo.slc.msg.test.tree.CreateTreeTestResultRequest; +import org.argeo.slc.msg.test.tree.ResultPartRequest; +import org.argeo.slc.process.SlcExecution; +import org.argeo.slc.services.process.SlcExecutionService; +import org.argeo.slc.services.test.TestManagerService; + +public class ServiceMsgHandler implements MsgHandler { + private TestManagerService testManagerService; + private SlcExecutionService slcExecutionService; + + public Object handleMsg(Object msg) { + if (msg instanceof SlcExecution) + slcExecutionService.newExecution((SlcExecution) msg); + else if (msg instanceof SlcExecutionStatusRequest) + slcExecutionService.updateStatus((SlcExecutionStatusRequest) msg); + else if (msg instanceof CreateTreeTestResultRequest) + testManagerService + .createTreeTestResult((CreateTreeTestResultRequest) msg); + else if (msg instanceof ResultPartRequest) + testManagerService.addResultPart((ResultPartRequest) msg); + else if (msg instanceof CloseTreeTestResultRequest) + testManagerService + .closeTreeTestResult((CloseTreeTestResultRequest) msg); + else + throw new SlcException("Unrecognized message type " + msg); + return null; + } + + public void setTestManagerService(TestManagerService testManagerService) { + this.testManagerService = testManagerService; + } + + public void setSlcExecutionService(SlcExecutionService slcExecutionService) { + this.slcExecutionService = slcExecutionService; + } + +} diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/runtime/AgentServiceImpl.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/runtime/AgentServiceImpl.java index fd3b42045..525719aa4 100644 --- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/runtime/AgentServiceImpl.java +++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/runtime/AgentServiceImpl.java @@ -63,7 +63,7 @@ public class AgentServiceImpl implements AgentService, InitializingBean, for (SlcAgentDescriptor ad : lst) agentIds.add(ad.getUuid()); - if (log.isDebugEnabled()) + if (log.isTraceEnabled()) log.debug("Ping " + agentIds.size() + " agent."); for (String agentId : agentIds) { SlcAgent agent = agentFactory.getAgent(agentId); diff --git a/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsAgent.java b/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsAgent.java index 90818a572..d7ca51117 100644 --- a/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsAgent.java +++ b/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsAgent.java @@ -134,29 +134,21 @@ public class JmsAgent extends AbstractAgent implements SlcAgent, destinationSend = responseDestination; } - new Thread() { - public void run() { - // Send response - jmsTemplate.convertAndSend(destinationSend, response, - new MessagePostProcessor() { - public Message postProcessMessage( - Message messageToSend) throws JMSException { - messageToSend.setStringProperty(PROPERTY_QUERY, - query); - messageToSend.setStringProperty( - PROPERTY_SLC_AGENT_ID, agentDescriptor - .getUuid()); - messageToSend - .setJMSCorrelationID(correlationId); - return messageToSend; - } - }); - if (log.isDebugEnabled()) - log.debug("Sent response to query '" + query - + "' with correlationId " + correlationId); - } - }.start(); - + // Send response + jmsTemplate.convertAndSend(destinationSend, response, + new MessagePostProcessor() { + public Message postProcessMessage(Message messageToSend) + throws JMSException { + messageToSend.setStringProperty(PROPERTY_QUERY, query); + messageToSend.setStringProperty(PROPERTY_SLC_AGENT_ID, + agentDescriptor.getUuid()); + messageToSend.setJMSCorrelationID(correlationId); + return messageToSend; + } + }); + if (log.isTraceEnabled()) + log.debug("Sent response to query '" + query + + "' with correlationId " + correlationId); } /** @return response */ @@ -174,8 +166,12 @@ public class JmsAgent extends AbstractAgent implements SlcAgent, agentDescriptorToSend.setModuleDescriptors(lst); return agentDescriptorToSend; } else if ("runSlcExecution".equals(query)) { - SlcExecution slcExecution = (SlcExecution) convertFrom(message); - runSlcExecution(slcExecution); + final SlcExecution slcExecution = (SlcExecution) convertFrom(message); + new Thread() { + public void run() { + runSlcExecution(slcExecution); + } + }.start(); return ExecutionAnswer.ok("Execution started on agent " + agentDescriptor.getUuid()); } else if ("ping".equals(query)) { diff --git a/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsAgentProxy.java b/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsAgentProxy.java index e70af24a8..b743f12e1 100644 --- a/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsAgentProxy.java +++ b/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsAgentProxy.java @@ -98,7 +98,7 @@ public class JmsAgentProxy implements SlcAgent { protected void send(AgentMC messageCreator) { jmsTemplate.send(requestDestination, messageCreator); - if (log.isDebugEnabled()) + if (log.isTraceEnabled()) log.debug("Sent query '" + messageCreator.getQuery() + "' with correlationId " + messageCreator.getCorrelationId() + " to agent " @@ -127,7 +127,7 @@ public class JmsAgentProxy implements SlcAgent { else return null; } - if (log.isDebugEnabled()) + if (log.isTraceEnabled()) log.debug("Received response for query '" + query + "' with correlationId " + correlationId + " from agent " + agentUuid); diff --git a/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsExecutionHandler.java b/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsExecutionHandler.java new file mode 100644 index 000000000..10bdba6e6 --- /dev/null +++ b/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsExecutionHandler.java @@ -0,0 +1,32 @@ +package org.argeo.slc.jms; + +import javax.jms.JMSException; +import javax.jms.Message; +import javax.jms.MessageListener; + +import org.argeo.slc.SlcException; +import org.argeo.slc.msg.MsgHandler; +import org.springframework.jms.support.converter.MessageConverter; + +public class JmsExecutionHandler implements MessageListener { + + private MessageConverter messageConverter; + private MsgHandler serviceMsgHandler; + + public void onMessage(Message message) { + try { + serviceMsgHandler.handleMsg(messageConverter.fromMessage(message)); + } catch (JMSException e) { + throw new SlcException("Could not interpret message " + message, e); + } + } + + public void setMessageConverter(MessageConverter messageConverter) { + this.messageConverter = messageConverter; + } + + public void setServiceMsgHandler(MsgHandler serviceMsgHandler) { + this.serviceMsgHandler = serviceMsgHandler; + } + +} diff --git a/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsSlcExecutionNotifier.java b/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsSlcExecutionNotifier.java index 5bdefc823..801c6fae3 100644 --- a/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsSlcExecutionNotifier.java +++ b/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsSlcExecutionNotifier.java @@ -16,13 +16,14 @@ public class JmsSlcExecutionNotifier implements SlcExecutionNotifier { private JmsTemplate jmsTemplate; - private Destination updateStatusDestination; + private Destination executionEventDestination; + //private Destination updateStatusDestination; public void updateStatus(SlcExecution slcExecution, String oldStatus, String newStatus) { SlcExecutionStatusRequest req = new SlcExecutionStatusRequest( slcExecution.getUuid(), newStatus); - jmsTemplate.convertAndSend(updateStatusDestination, req); + jmsTemplate.convertAndSend(executionEventDestination, req); } public void addSteps(SlcExecution slcExecution, @@ -42,8 +43,14 @@ public class JmsSlcExecutionNotifier implements SlcExecutionNotifier { this.jmsTemplate = jmsTemplate; } - public void setUpdateStatusDestination(Destination updateStatusDestination) { - this.updateStatusDestination = updateStatusDestination; + public void setExecutionEventDestination(Destination executionEventDestination) { + this.executionEventDestination = executionEventDestination; } + + +// public void setUpdateStatusDestination(Destination updateStatusDestination) { +// this.updateStatusDestination = updateStatusDestination; +// } + } diff --git a/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsTransferNewExecution.java b/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsTransferNewExecution.java index 28913aea8..74f1eb231 100644 --- a/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsTransferNewExecution.java +++ b/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsTransferNewExecution.java @@ -4,6 +4,7 @@ import javax.jms.Message; import javax.jms.MessageListener; import org.argeo.slc.SlcException; +import org.argeo.slc.msg.MsgHandler; import org.argeo.slc.process.SlcExecution; import org.argeo.slc.runtime.SlcAgent; import org.argeo.slc.runtime.SlcAgentFactory; @@ -13,6 +14,7 @@ import org.springframework.jms.support.converter.MessageConverter; public class JmsTransferNewExecution implements MessageListener { private MessageConverter messageConverter; private SlcAgentFactory agentFactory; + private MsgHandler serviceMsgHandler; public void onMessage(final Message message) { try { @@ -26,6 +28,7 @@ public class JmsTransferNewExecution implements MessageListener { agent.runSlcExecution(slcExecution); } }.start(); + serviceMsgHandler.handleMsg(slcExecution); } catch (Exception e) { throw new SlcException("Could not transfer new execution " + message, e); @@ -40,4 +43,8 @@ public class JmsTransferNewExecution implements MessageListener { this.agentFactory = agentFactory; } + public void setServiceMsgHandler(MsgHandler serviceMsgHandler) { + this.serviceMsgHandler = serviceMsgHandler; + } + } diff --git a/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsTreeTestResultListener.java b/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsTreeTestResultListener.java index b315c0143..20137826f 100644 --- a/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsTreeTestResultListener.java +++ b/runtime/org.argeo.slc.support.activemq/src/main/java/org/argeo/slc/jms/JmsTreeTestResultListener.java @@ -20,9 +20,10 @@ public class JmsTreeTestResultListener implements private Boolean onlyOnClose = false; private JmsTemplate jmsTemplate; - private Destination createDestination; - private Destination addResultPartDestination; - private Destination closeDestination; + private Destination executionEventDestination; +// private Destination createDestination; +// private Destination addResultPartDestination; +// private Destination closeDestination; public void resultPartAdded(TreeTestResult testResult, TestResultPart testResultPart) { @@ -40,7 +41,7 @@ public class JmsTreeTestResultListener implements log.debug("Send create result request for result " + testResult.getUuid()); - jmsTemplate.convertAndSend(createDestination, req); + jmsTemplate.convertAndSend(executionEventDestination, req); } else { ResultPartRequest req = new ResultPartRequest(testResult); @@ -48,7 +49,7 @@ public class JmsTreeTestResultListener implements log.debug("Send result parts for result " + testResult.getUuid()); - jmsTemplate.convertAndSend(addResultPartDestination, req); + jmsTemplate.convertAndSend(executionEventDestination, req); } } catch (Exception e) { throw new SlcException("Could not notify to JMS", e); @@ -65,7 +66,7 @@ public class JmsTreeTestResultListener implements log.debug("Send create result request for result " + testResult.getUuid()); - jmsTemplate.convertAndSend(createDestination, req); + jmsTemplate.convertAndSend(executionEventDestination, req); } else { CloseTreeTestResultRequest req = new CloseTreeTestResultRequest( testResult); @@ -74,7 +75,7 @@ public class JmsTreeTestResultListener implements log.debug("Send close result request for result " + testResult.getUuid()); - jmsTemplate.convertAndSend(closeDestination, req); + jmsTemplate.convertAndSend(executionEventDestination, req); } } catch (Exception e) { @@ -90,16 +91,22 @@ public class JmsTreeTestResultListener implements this.jmsTemplate = jmsTemplate; } - public void setCreateDestination(Destination createDestination) { - this.createDestination = createDestination; - } - - public void setAddResultPartDestination(Destination addResultPartDestination) { - this.addResultPartDestination = addResultPartDestination; - } - - public void setCloseDestination(Destination closeDestination) { - this.closeDestination = closeDestination; + public void setExecutionEventDestination(Destination executionEventDestination) { + this.executionEventDestination = executionEventDestination; } + + + +// public void setCreateDestination(Destination createDestination) { +// this.createDestination = createDestination; +// } +// +// public void setAddResultPartDestination(Destination addResultPartDestination) { +// this.addResultPartDestination = addResultPartDestination; +// } +// +// public void setCloseDestination(Destination closeDestination) { +// this.closeDestination = closeDestination; +// } } diff --git a/runtime/org.argeo.slc.support.activemq/src/main/resources/org/argeo/slc/activemq/destinations.xml b/runtime/org.argeo.slc.support.activemq/src/main/resources/org/argeo/slc/activemq/destinations.xml index 453b1ade4..eb84e02b0 100644 --- a/runtime/org.argeo.slc.support.activemq/src/main/resources/org/argeo/slc/activemq/destinations.xml +++ b/runtime/org.argeo.slc.support.activemq/src/main/resources/org/argeo/slc/activemq/destinations.xml @@ -14,24 +14,27 @@ + parent="slcJms.amQueue" /> + parent="slcJms.amQueue" /> - + + + + parent="slcJms.amQueue" /> + --> + diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/msg/MsgHandler.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/msg/MsgHandler.java new file mode 100644 index 000000000..2ab8f1d4c --- /dev/null +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/msg/MsgHandler.java @@ -0,0 +1,5 @@ +package org.argeo.slc.msg; + +public interface MsgHandler { + public Object handleMsg(Object msg); +} diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/spring/jms.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/spring/jms.xml index 7c95e7d2f..e69584456 100644 --- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/spring/jms.xml +++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/spring/jms.xml @@ -6,24 +6,16 @@ - - - + - - - - + - @@ -36,16 +28,18 @@ - + + - + + @@ -58,4 +52,14 @@ class="org.springframework.jms.connection.JmsTransactionManager"> + + + + + + + + \ No newline at end of file diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/spring/transport.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/spring/transport.xml index f6adfcf85..8e2c63248 100644 --- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/spring/transport.xml +++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/spring/transport.xml @@ -4,18 +4,30 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd" default-lazy-init="false"> + + + + + ${slc.server.jms.url} + + + + + + \ No newline at end of file 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 55165d84b..bb8384bf4 100644 --- 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 @@ -24,9 +24,10 @@ - - + + + vm://localhost @@ -35,6 +36,16 @@ + + diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/spring/transaction.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/spring/transaction.xml index 6051065e9..7d03b64e1 100644 --- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/spring/transaction.xml +++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/spring/transaction.xml @@ -46,7 +46,7 @@ - + \ No newline at end of file diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.jms/META-INF/spring/jms.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.jms/META-INF/spring/jms.xml index cb7cd2da2..d747ec676 100644 --- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.jms/META-INF/spring/jms.xml +++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.jms/META-INF/spring/jms.xml @@ -33,69 +33,73 @@ + + + + + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - - - - - - - + + - +