From ec9fe3774f157092d748b0844dbbb55e29a67481 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 27 Apr 2009 08:20:10 +0000 Subject: [PATCH] Change bundle structure git-svn-id: https://svn.argeo.org/slc/trunk@2378 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- demo/pom.xml | 7 +- .../META-INF/MANIFEST.MF | 15 +---- .../META-INF/spring/jms.xml | 67 ------------------- .../META-INF/spring/osgi.xml | 15 ----- .../META-INF/spring/transport.xml | 18 ----- demo/site/org.argeo.slc.demo.manager/.project | 22 ------ .../.settings/org.eclipse.pde.core.prefs | 5 -- .../META-INF/MANIFEST.MF | 7 -- .../build.properties | 1 - .../conf/manager-osgi.xml | 19 ------ org.argeo.slc/pom.xml | 32 +++------ .../org.argeo.slc.support.activemq/pom.xml | 21 +++--- .../main/java/org/argeo/slc/jms/JmsAgent.java | 43 ++++++------ .../org.argeo.slc.agent/META-INF/MANIFEST.MF | 7 +- .../META-INF/spring/common.xml | 16 +++++ .../META-INF/spring/jms.xml | 30 ++++----- .../META-INF/spring}/manager.xml | 0 .../META-INF/spring/osgi.xml | 14 +++- .../META-INF/spring/transport.xml | 14 +++- .../org.argeo.slc.agent/agent.properties | 1 + .../META-INF/MANIFEST.MF | 4 +- .../META-INF/spring/activemq.xml | 27 +++++++- .../activemq.properties | 1 + .../META-INF/MANIFEST.MF | 3 +- .../META-INF/spring/hsqldb.xml | 23 +++++-- .../hsqldb.properties | 1 + .../META-INF/spring/jms.xml | 2 +- .../org.argeo.slc.webapp.war/WEB-INF/osgi.xml | 3 +- 28 files changed, 161 insertions(+), 257 deletions(-) delete mode 100644 demo/site/org.argeo.slc.demo.agent/META-INF/spring/jms.xml delete mode 100644 demo/site/org.argeo.slc.demo.agent/META-INF/spring/osgi.xml delete mode 100644 demo/site/org.argeo.slc.demo.agent/META-INF/spring/transport.xml delete mode 100644 demo/site/org.argeo.slc.demo.manager/.project delete mode 100644 demo/site/org.argeo.slc.demo.manager/.settings/org.eclipse.pde.core.prefs delete mode 100644 demo/site/org.argeo.slc.demo.manager/META-INF/MANIFEST.MF delete mode 100644 demo/site/org.argeo.slc.demo.manager/build.properties delete mode 100644 demo/site/org.argeo.slc.demo.manager/conf/manager-osgi.xml create mode 100644 server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/spring/common.xml rename {demo/site/org.argeo.slc.demo.manager/conf => server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/spring}/manager.xml (100%) create mode 100644 server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/agent.properties create mode 100644 server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.activemq/activemq.properties create mode 100644 server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hsqldb/hsqldb.properties diff --git a/demo/pom.xml b/demo/pom.xml index 1ba3ac654..e4f569132 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -72,10 +72,7 @@ org.argeo.slc.server.services, org.argeo.slc.server.jms, org.argeo.slc.webapp, - org.argeo.slc.ria, - org.argeo.slc.support.equinox, - org.argeo.slc.demo.basic, - org.argeo.slc.demo.manager + org.argeo.slc.ria @@ -100,8 +97,8 @@ org.springframework.osgi.extender, org.argeo.slc.support.equinox, + org.argeo.slc.agent, org.argeo.slc.demo.basic, - org.argeo.slc.demo.agent, org.argeo.slc.demo.manager diff --git a/demo/site/org.argeo.slc.demo.agent/META-INF/MANIFEST.MF b/demo/site/org.argeo.slc.demo.agent/META-INF/MANIFEST.MF index b5f6657f4..6b47a465b 100644 --- a/demo/site/org.argeo.slc.demo.agent/META-INF/MANIFEST.MF +++ b/demo/site/org.argeo.slc.demo.agent/META-INF/MANIFEST.MF @@ -1,17 +1,4 @@ Bundle-SymbolicName: org.argeo.slc.demo.agent Bundle-Version: 0.11.3.qualifier +Fragment-Host: org.argeo.slc.agent Bundle-Name: Argeo SLC Demo Agent -Import-Package: - javax.jms, - org.apache.activemq, - org.apache.activemq.command, - org.springframework.jms.connection, - org.springframework.jms.core, - org.springframework.jms.listener, - org.springframework.jms.listener.adapter, - org.springframework.oxm.castor -Require-Bundle: - org.argeo.slc.support.activemq, - org.argeo.slc.specs, - org.argeo.slc.support.simple, - com.springsource.org.castor diff --git a/demo/site/org.argeo.slc.demo.agent/META-INF/spring/jms.xml b/demo/site/org.argeo.slc.demo.agent/META-INF/spring/jms.xml deleted file mode 100644 index 16060cc69..000000000 --- a/demo/site/org.argeo.slc.demo.agent/META-INF/spring/jms.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/demo/site/org.argeo.slc.demo.agent/META-INF/spring/osgi.xml b/demo/site/org.argeo.slc.demo.agent/META-INF/spring/osgi.xml deleted file mode 100644 index 92ac64e32..000000000 --- a/demo/site/org.argeo.slc.demo.agent/META-INF/spring/osgi.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/demo/site/org.argeo.slc.demo.agent/META-INF/spring/transport.xml b/demo/site/org.argeo.slc.demo.agent/META-INF/spring/transport.xml deleted file mode 100644 index 708a6198c..000000000 --- a/demo/site/org.argeo.slc.demo.agent/META-INF/spring/transport.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - tcp://localhost:61616 - - - - - - \ No newline at end of file diff --git a/demo/site/org.argeo.slc.demo.manager/.project b/demo/site/org.argeo.slc.demo.manager/.project deleted file mode 100644 index 86280b2ee..000000000 --- a/demo/site/org.argeo.slc.demo.manager/.project +++ /dev/null @@ -1,22 +0,0 @@ - - - org.argeo.slc.demo.manager - - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - - diff --git a/demo/site/org.argeo.slc.demo.manager/.settings/org.eclipse.pde.core.prefs b/demo/site/org.argeo.slc.demo.manager/.settings/org.eclipse.pde.core.prefs deleted file mode 100644 index cfc761f33..000000000 --- a/demo/site/org.argeo.slc.demo.manager/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -#Fri Mar 13 15:28:46 CET 2009 -eclipse.preferences.version=1 -pluginProject.equinox=false -pluginProject.extensions=false -resolve.requirebundle=false diff --git a/demo/site/org.argeo.slc.demo.manager/META-INF/MANIFEST.MF b/demo/site/org.argeo.slc.demo.manager/META-INF/MANIFEST.MF deleted file mode 100644 index 51febcd8b..000000000 --- a/demo/site/org.argeo.slc.demo.manager/META-INF/MANIFEST.MF +++ /dev/null @@ -1,7 +0,0 @@ -Bundle-Name: Manager Plug-in -Bundle-SymbolicName: org.argeo.slc.demo.manager -Bundle-Version: 0.11.3.qualifier -Spring-Context: conf/* -Require-Bundle: - org.argeo.slc.specs, - org.argeo.slc.support.simple diff --git a/demo/site/org.argeo.slc.demo.manager/build.properties b/demo/site/org.argeo.slc.demo.manager/build.properties deleted file mode 100644 index 5f22cdd44..000000000 --- a/demo/site/org.argeo.slc.demo.manager/build.properties +++ /dev/null @@ -1 +0,0 @@ -bin.includes = META-INF/ diff --git a/demo/site/org.argeo.slc.demo.manager/conf/manager-osgi.xml b/demo/site/org.argeo.slc.demo.manager/conf/manager-osgi.xml deleted file mode 100644 index 34bc15da5..000000000 --- a/demo/site/org.argeo.slc.demo.manager/conf/manager-osgi.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml index 2f974db10..7dbcd53cd 100644 --- a/org.argeo.slc/pom.xml +++ b/org.argeo.slc/pom.xml @@ -159,27 +159,6 @@ limitations under the License. com.springsource.javax.mail 1.4.1 - @@ -579,7 +558,11 @@ limitations under the License. org.argeo.dep.osgi.commons.cli 1.1 - + + org.apache.commons + com.springsource.org.apache.commons.pool + 1.4.0 + org.hsqldb @@ -767,6 +750,11 @@ limitations under the License. org.argeo.dep.osgi.activemq ${version.activemq} + + org.apache.activemq + com.springsource.org.apache.activemq.pool + 5.2.0 + org.argeo.dep.osgi org.argeo.dep.osgi.activemq.web diff --git a/runtime/org.argeo.slc.support.activemq/pom.xml b/runtime/org.argeo.slc.support.activemq/pom.xml index 54f896eb6..006fd0ebf 100644 --- a/runtime/org.argeo.slc.support.activemq/pom.xml +++ b/runtime/org.argeo.slc.support.activemq/pom.xml @@ -73,6 +73,14 @@ org.argeo.dep.osgi org.argeo.dep.osgi.activemq + + org.apache.activemq + com.springsource.org.apache.activemq.pool + + + org.apache.commons + com.springsource.org.apache.commons.pool + org.apache.geronimo.specs com.springsource.javax.management.j2ee @@ -97,16 +105,13 @@ javax.xml.soap com.springsource.javax.xml.soap - + + + --> \ No newline at end of file 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 78e93481b..4b031f947 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 @@ -6,7 +6,6 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; -import javax.jms.ConnectionFactory; import javax.jms.Destination; import javax.jms.JMSException; import javax.jms.Message; @@ -20,14 +19,14 @@ import org.argeo.slc.SlcException; import org.argeo.slc.core.runtime.AbstractAgent; import org.argeo.slc.execution.ExecutionModule; import org.argeo.slc.execution.ExecutionModuleDescriptor; -import org.argeo.slc.msg.ObjectList; +import org.argeo.slc.process.SlcExecution; import org.argeo.slc.runtime.SlcAgent; import org.argeo.slc.runtime.SlcAgentDescriptor; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.InitializingBean; import org.springframework.jms.core.JmsTemplate; import org.springframework.jms.listener.SessionAwareMessageListener; -import org.springframework.jms.support.converter.MessageConverter; +import org.springframework.jms.support.converter.MessageConversionException; /** JMS based implementation of SLC Agent. */ public class JmsAgent extends AbstractAgent implements SlcAgent, @@ -35,7 +34,7 @@ public class JmsAgent extends AbstractAgent implements SlcAgent, private final static Log log = LogFactory.getLog(JmsAgent.class); private final SlcAgentDescriptor agentDescriptor; - private ConnectionFactory connectionFactory; + // private ConnectionFactory connectionFactory; private JmsTemplate jmsTemplate; private Destination agentRegister; private Destination agentUnregister; @@ -43,7 +42,7 @@ public class JmsAgent extends AbstractAgent implements SlcAgent, // private Destination requestDestination; private Destination responseDestination; - private MessageConverter messageConverter; + // private MessageConverter messageConverter; public JmsAgent() { try { @@ -57,8 +56,8 @@ public class JmsAgent extends AbstractAgent implements SlcAgent, public void afterPropertiesSet() throws Exception { // Initialize JMS Template - jmsTemplate = new JmsTemplate(connectionFactory); - jmsTemplate.setMessageConverter(messageConverter); + // jmsTemplate = new JmsTemplate(connectionFactory); + // jmsTemplate.setMessageConverter(messageConverter); jmsTemplate.convertAndSend(agentRegister, agentDescriptor); log.info("Agent #" + agentDescriptor.getUuid() + " registered to " @@ -114,17 +113,27 @@ public class JmsAgent extends AbstractAgent implements SlcAgent, String version = message.getStringProperty("version"); ExecutionModuleDescriptor emd = getExecutionModuleDescriptor( moduleName, version); - responseMsg = messageConverter.toMessage(emd, session); + responseMsg = jmsTemplate.getMessageConverter().toMessage(emd, + session); } else if ("listExecutionModuleDescriptors".equals(query)) { List lst = listExecutionModuleDescriptors(); SlcAgentDescriptor agentDescriptorToSend = new SlcAgentDescriptor( agentDescriptor); agentDescriptorToSend.setModuleDescriptors(lst); - responseMsg = messageConverter.toMessage(agentDescriptorToSend, - session); + responseMsg = jmsTemplate.getMessageConverter().toMessage( + agentDescriptorToSend, session); } else { - throw new SlcException("Unsupported query " + query); + try { + //FIXME: generalize + SlcExecution slcExecution = (SlcExecution) jmsTemplate + .getMessageConverter().fromMessage(message); + runSlcExecution(slcExecution); + } catch (MessageConversionException e) { + if (log.isDebugEnabled()) + log.debug("Unsupported query " + query, e); + } + return; } if (responseMsg != null) { @@ -138,14 +147,6 @@ public class JmsAgent extends AbstractAgent implements SlcAgent, } - public void setMessageConverter(MessageConverter messageConverter) { - this.messageConverter = messageConverter; - } - - public void setConnectionFactory(ConnectionFactory connectionFactory) { - this.connectionFactory = connectionFactory; - } - public ExecutionModuleDescriptor getExecutionModuleDescriptor( String moduleName, String version) { return getModulesManager().getExecutionModuleDescriptor(moduleName, @@ -170,4 +171,8 @@ public class JmsAgent extends AbstractAgent implements SlcAgent, this.responseDestination = responseDestination; } + public void setJmsTemplate(JmsTemplate jmsTemplate) { + this.jmsTemplate = jmsTemplate; + } + } diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/MANIFEST.MF index b5f6657f4..ec56b1878 100644 --- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/MANIFEST.MF +++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/MANIFEST.MF @@ -1,10 +1,13 @@ -Bundle-SymbolicName: org.argeo.slc.demo.agent +Bundle-SymbolicName: org.argeo.slc.agent Bundle-Version: 0.11.3.qualifier -Bundle-Name: Argeo SLC Demo Agent +Bundle-Name: Argeo SLC Agent Import-Package: javax.jms, org.apache.activemq, org.apache.activemq.command, + org.apache.activemq.pool, + org.apache.commons.pool, + org.springframework.beans.factory.config, org.springframework.jms.connection, org.springframework.jms.core, org.springframework.jms.listener, diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/spring/common.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/spring/common.xml new file mode 100644 index 000000000..6e170a134 --- /dev/null +++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/spring/common.xml @@ -0,0 +1,16 @@ + + + + + + + + osgibundle:agent.properties + + + + \ No newline at end of file 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 16060cc69..a60b28d54 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 @@ -21,24 +21,24 @@ class="org.springframework.jms.listener.DefaultMessageListenerContainer"> - + + - - + @@ -46,22 +46,20 @@ - - - - - - + - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/demo/site/org.argeo.slc.demo.manager/conf/manager.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/spring/manager.xml similarity index 100% rename from demo/site/org.argeo.slc.demo.manager/conf/manager.xml rename to server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/spring/manager.xml diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/spring/osgi.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/spring/osgi.xml index 92ac64e32..5f6423aba 100644 --- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/spring/osgi.xml +++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/META-INF/spring/osgi.xml @@ -9,7 +9,17 @@ - + + + + + + + + + + \ 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 708a6198c..f6adfcf85 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,12 +4,24 @@ 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} diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/agent.properties b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/agent.properties new file mode 100644 index 000000000..d1afbfa54 --- /dev/null +++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.agent/agent.properties @@ -0,0 +1 @@ +slc.server.jms.url=tcp://localhost:61616 \ No newline at end of file diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.activemq/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.activemq/META-INF/MANIFEST.MF index 17689e2bc..08b00f5f4 100644 --- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.activemq/META-INF/MANIFEST.MF +++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.activemq/META-INF/MANIFEST.MF @@ -2,7 +2,9 @@ Bundle-SymbolicName: org.argeo.slc.server.activemq Bundle-Version: 0.11.3.qualifier Import-Package: javax.jms, javax.management.j2ee.statistics, - org.apache.commons.logging + org.apache.commons.logging, + org.apache.activemq.pool, + org.apache.commons.pool Require-Bundle: org.argeo.slc.server, org.argeo.slc.support.activemq, org.springframework.core, 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 2ef51f341..ef27997d3 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 @@ -6,20 +6,41 @@ + + + + + osgibundle:activemq.properties + + + + - + - - tcp://localhost:61616 + vm://localhost + + + + --> + + + + + + vm://localhost diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.activemq/activemq.properties b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.activemq/activemq.properties new file mode 100644 index 000000000..fea137cf6 --- /dev/null +++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.activemq/activemq.properties @@ -0,0 +1 @@ +slc.server.jms.url=tcp://localhost:61616 diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hsqldb/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hsqldb/META-INF/MANIFEST.MF index 319630a1e..fbb0e4fee 100644 --- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hsqldb/META-INF/MANIFEST.MF +++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hsqldb/META-INF/MANIFEST.MF @@ -8,4 +8,5 @@ Import-Package: org.springframework.cache.ehcache, net.sf.ehcache.hibernate, org.hsqldb.jdbc, - org.hibernate + org.hibernate, + org.springframework.beans.factory.config diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hsqldb/META-INF/spring/hsqldb.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hsqldb/META-INF/spring/hsqldb.xml index 0be5483c7..26f0a054d 100644 --- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hsqldb/META-INF/spring/hsqldb.xml +++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hsqldb/META-INF/spring/hsqldb.xml @@ -8,9 +8,18 @@ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd" default-lazy-init="false"> - + + + + + + + osgibundle:hsqldb.properties + + + @@ -24,9 +33,9 @@ - - - - + + + + \ No newline at end of file diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hsqldb/hsqldb.properties b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hsqldb/hsqldb.properties new file mode 100644 index 000000000..72dd57905 --- /dev/null +++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hsqldb/hsqldb.properties @@ -0,0 +1 @@ +slc.server.hsqldb.url=jdbc:hsqldb:mem:test \ 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 a44c6e43d..da5e2c388 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 @@ -10,7 +10,7 @@ - + diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/osgi.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/osgi.xml index e60afa165..e0d51a803 100644 --- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/osgi.xml +++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/osgi.xml @@ -19,9 +19,10 @@ + -- 2.39.2