From 0f26a1ac2596c4f949973028af21bc0f951b7b7a Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 15 Mar 2009 08:33:53 +0000
Subject: [PATCH] Improve server structure

git-svn-id: https://svn.argeo.org/slc/trunk@2268 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../META-INF/MANIFEST.MF                      |  18 +--
 .../META-INF/spring/jms.xml                   |  59 +++-----
 .../META-INF/spring/osgi.xml                  |   6 +-
 .../impl/runtime/AgentServiceImpl.java        |   3 +-
 .../slc/services/runtime/AgentService.java    |   2 +
 .../argeo/slc/server/spring/activemq-osgi.xml |  30 ----
 .../org/argeo/slc/server/spring/db-osgi.xml   | 136 ------------------
 .../main/java/org/argeo/slc/jms/JmsAgent.java |  19 ++-
 .../org/argeo/slc/activemq/destinations.xml   |  21 +++
 .../org/argeo/slc/activemq/spring.xml         |  63 +-------
 .../META-INF/MANIFEST.MF                      |   1 -
 .../META-INF/spring/activemq-osgi.xml         |  11 ++
 .../META-INF/spring/activemq.xml              |  30 ++--
 .../META-INF/MANIFEST.MF                      |  20 +--
 .../META-INF/spring/db-osgi.xml               |   7 +-
 .../META-INF/spring/db.xml                    |  37 +----
 .../META-INF/spring/transaction.xml           |  64 +++++++++
 .../META-INF/MANIFEST.MF                      |  12 ++
 .../META-INF/spring/hsqldb-osgi.xml           |  11 ++
 .../META-INF/spring/hsqldb.xml                |  32 +++++
 .../META-INF/MANIFEST.MF                      |  14 ++
 .../META-INF/spring/jms-osgi.xml              |  13 ++
 .../META-INF/spring/jms.xml                   |  44 ++++++
 .../META-INF/MANIFEST.MF                      |   7 +
 .../META-INF/spring/services-osgi.xml         |  23 +++
 .../META-INF/spring/services.xml              |  21 +++
 .../WEB-INF/applicationContext.xml            |  73 +---------
 .../org.argeo.slc.webapp.war/WEB-INF/osgi.xml |   7 +-
 server/org.argeo.slc.siteserver/pom.xml       |   4 +
 29 files changed, 369 insertions(+), 419 deletions(-)
 delete mode 100644 runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/activemq-osgi.xml
 delete mode 100644 runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/db-osgi.xml
 create mode 100644 runtime/org.argeo.slc.support.activemq/src/main/resources/org/argeo/slc/activemq/destinations.xml
 create mode 100644 server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.activemq/META-INF/spring/activemq-osgi.xml
 create mode 100644 server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/spring/transaction.xml
 create mode 100644 server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hsqldb/META-INF/MANIFEST.MF
 create mode 100644 server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hsqldb/META-INF/spring/hsqldb-osgi.xml
 create mode 100644 server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hsqldb/META-INF/spring/hsqldb.xml
 create mode 100644 server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.jms/META-INF/MANIFEST.MF
 create mode 100644 server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.jms/META-INF/spring/jms-osgi.xml
 create mode 100644 server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.jms/META-INF/spring/jms.xml
 create mode 100644 server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.services/META-INF/MANIFEST.MF
 create mode 100644 server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.services/META-INF/spring/services-osgi.xml
 create mode 100644 server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.services/META-INF/spring/services.xml

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 3f39bfa95..b166dcc16 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,14 +1,14 @@
+Bundle-SymbolicName: org.argeo.slc.demo.agent
+Bundle-Version: 0.11.3.SNAPSHOT
 Bundle-Name: Argeo SLC Demo Agent
-Require-Bundle: org.springframework.jms,
- com.springsource.org.castor,
- org.argeo.dep.osgi.activemq,
+Import-Package: 
+ javax.jms,
+ org.apache.activemq.command,
+ org.springframework.jms.listener,
+ org.springframework.oxm.castor
+Require-Bundle: 
  org.argeo.slc.support.activemq,
  org.argeo.slc.specs,
  org.argeo.slc.support.simple,
- org.springframework.oxm,
- com.springsource.net.sf.cglib,
- com.springsource.org.aopalliance
-Bundle-Vendor: Argeo
-Bundle-Version: 0.11.3.SNAPSHOT
-Bundle-SymbolicName: org.argeo.slc.demo.agent
+ 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
index c4163c20a..448ac8ebb 100644
--- 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
@@ -5,55 +5,32 @@
 	default-lazy-init="false">
 
 	<import resource="classpath:org/argeo/slc/activemq/spring.xml" />
-	
-	
-	<bean id="slcDefault.jms.listener.newExecution" parent="slcTemplate.jms.listenerContainer">
-		<property name="connectionFactory" ref="slcDefault.jms.connectionFactory" />
+
+
+	<bean id="jmsAgent.listener.newExecution"
+		class="org.springframework.jms.listener.DefaultMessageListenerContainer">
+		<property name="connectionFactory" ref="jmsConnectionFactory" />
 		<property name="destination" ref="slcJms.destination.agent.newExecution" />
-		<property name="messageListener" ref="slcDefault.jms.agent">
-<!-- 			<bean parent="slcTemplate.jms.listenerAdapterCastor">
-				<constructor-arg ref="slcDefault.jms.agent" />
-				<property name="defaultListenerMethod" value="newExecution" />
-			</bean> -->
+		<property name="messageListener" ref="jmsAgent">
+			<!--
+				<bean parent="slcTemplate.jms.listenerAdapterCastor">
+				<constructor-arg ref="slcDefault.jms.agent" /> <property
+				name="defaultListenerMethod" value="newExecution" /> </bean>
+			-->
 		</property>
-		<!-- 
-		<property name="messageSelector">
-			<bean factory-bean="slcDefault.jms.agent" factory-method="getMessageSelector"/>
-		</property>
-		 -->
+		<!--
+			<property name="messageSelector"> <bean
+			factory-bean="slcDefault.jms.agent"
+			factory-method="getMessageSelector"/> </property>
+		-->
 	</bean>
 
-	<bean id="slcDefault.jms.agent" class="org.argeo.slc.jms.JmsAgent">
-		<property name="jmsTemplate" ref="slcDefault.jms.jmsTemplateCastor" />
+	<bean id="jmsAgent" class="org.argeo.slc.jms.JmsAgent">
+		<property name="connectionFactory" ref="jmsConnectionFactory" />
 		<property name="agentRegister" ref="slcJms.destination.agent.register" />
 		<property name="agentUnregister" ref="slcJms.destination.agent.unregister" />
 		<property name="messageConverter" ref="slcDefault.jms.castorMessageConverter" />
 		<property name="modulesManager" ref="modulesManager" />
 	</bean>
 
-	
-<!-- 
-	<bean id="modulesManager.listenerContainer" parent="slcTemplate.jms.listenerContainer">
-		<property name="destination" ref="slcJms.destination.modulesManager.request" />
-		<property name="messageListener">
-			<bean class="org.argeo.slc.jms.ServiceMessageListenerAdapter">
-				<property name="methodArguments">
-					<map>
-						<entry key="getExecutionModuleDescriptor">
-							<list>
-								<value>name</value>
-								<value>version</value>
-							</list>
-						</entry>
-					</map>
-				</property>
-
-				<property name="delegate" ref="modulesManager" />
-				<property name="defaultResponseDestination" ref="slcJms.destination.modulesManager.response" />
-				<property name="messageConverter" ref="slcDefault.jms.castorMessageConverter" />
-			</bean>
-		</property>
-	</bean>
- -->
-
 </beans>
\ 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
index 9cfa235ed..450b60f4a 100644
--- 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
@@ -6,7 +6,9 @@
        http://www.springframework.org/schema/beans   
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-	<reference interface="org.argeo.slc.execution.ExecutionModulesManager"
-		id="modulesManager" />
+	<reference id="modulesManager"
+		interface="org.argeo.slc.execution.ExecutionModulesManager" />
+
+	<reference id="jmsConnectionFactory" interface="javax.jms.ConnectionFactory" />
 
 </beans:beans>
\ No newline at end of file
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 f6566c828..0f127269f 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
@@ -4,8 +4,9 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.dao.runtime.SlcAgentDescriptorDao;
 import org.argeo.slc.runtime.SlcAgentDescriptor;
+import org.argeo.slc.services.runtime.AgentService;
 
-public class AgentServiceImpl {
+public class AgentServiceImpl implements AgentService {
 	private final static Log log = LogFactory.getLog(AgentServiceImpl.class);
 
 	private final SlcAgentDescriptorDao slcAgentDescriptorDao;
diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/runtime/AgentService.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/runtime/AgentService.java
index c4bf2c05d..33da18a50 100644
--- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/runtime/AgentService.java
+++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/runtime/AgentService.java
@@ -4,4 +4,6 @@ import org.argeo.slc.runtime.SlcAgentDescriptor;
 
 public interface AgentService {
 	public void register(SlcAgentDescriptor slcAgentDescriptor);
+
+	public void unregister(SlcAgentDescriptor slcAgentDescriptor);
 }
diff --git a/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/activemq-osgi.xml b/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/activemq-osgi.xml
deleted file mode 100644
index 370a9d186..000000000
--- a/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/activemq-osgi.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-	http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
-
-	<import resource="classpath:org/argeo/slc/activemq/spring.xml" />
-
-	<!--
-		Create embedded broker <amq:broker useJmx="false" persistent="false">
-		<amq:transportConnectors> <amq:transportConnector
-		uri="tcp://localhost:61616" /> </amq:transportConnectors>
-		</amq:broker>
-	-->
-
-	<bean id="broker" class="org.apache.activemq.xbean.BrokerFactoryBean">
-		<property name="config" value="classpath:org/argeo/slc/server/activemq.xml" />
-		<property name="start" value="true" />
-	</bean>
-
-
-	<bean id="template.jms.listenerContainer" parent="slcTemplate.jms.listenerContainer"
-		abstract="true">
-	</bean>
-
-	<bean id="template.jms.listenerAdapter" parent="slcTemplate.jms.listenerAdapterCastor"
-		abstract="true">
-	</bean>
-
-</beans>
\ No newline at end of file
diff --git a/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/db-osgi.xml b/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/db-osgi.xml
deleted file mode 100644
index e51c1714c..000000000
--- a/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/db-osgi.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:tx="http://www.springframework.org/schema/tx"
-	xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-       http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd"
-	default-lazy-init="true">
-
-	<import
-		resource="classpath:/org/argeo/slc/hibernate/spring/applicationContext.xml" />
-
-	<!--
-		Use session factories <bean id="sessionFactory"
-		parent="${sessionFactoryParentBean}" />
-	-->
-	<bean id="sessionFactory" parent="slcTemplates.sessionFactory.hibernateBasic">
-		<property name="dataSource" ref="slcDefault.dataSource.inMemoryTestHSQL" />
-		<property name="hibernateProperties">
-			<value><![CDATA[
-				hibernate.dialect=org.hibernate.dialect.HSQLDialect
-				hibernate.hbm2ddl.auto=create
-				hibernate.generate_statistics=true
-				hibernate.connection.autocommit=false
-			]]></value>
-		</property>
-	</bean>
-
-
-	<!--  JNDI data source  -->
-	<bean id="slcDefault.jndiTemplate" class="org.springframework.jndi.JndiTemplate">
-	</bean>
-
-	<bean id="slcDefaut.dataSourceJndi" class="org.springframework.jndi.JndiObjectFactoryBean">
-		<property name="jndiTemplate" ref="slcDefault.jndiTemplate" />
-		<property name="jndiName" value="java:comp/env/jdbc/mainDs" />
-	</bean>
-
-	<!-- DB types -->
-	<bean id="slcServerDefault.sessionFactory.HSQL" parent="slcTemplates.sessionFactory.hibernateBasic">
-		<property name="dataSource" ref="slcDefaut.dataSourceJndi" />
-		<property name="hibernateProperties">
-			<value><![CDATA[
-				hibernate.dialect=org.hibernate.dialect.HSQLDialect
-				hibernate.hbm2ddl.auto=update
-				hibernate.connection.autocommit=false
-			]]></value>
-		</property>
-	</bean>
-
-	<bean id="slcServerDefault.sessionFactory.HSQLTest" parent="slcTemplates.sessionFactory.hibernateBasic">
-		<property name="dataSource" ref="slcDefaut.dataSourceJndi" />
-		<property name="hibernateProperties">
-			<value><![CDATA[
-				hibernate.dialect=org.hibernate.dialect.HSQLDialect
-				hibernate.hbm2ddl.auto=create
-				hibernate.generate_statistics=true
-				hibernate.connection.autocommit=false
-			]]></value>
-		</property>
-	</bean>
-
-	<bean id="slcServerDefault.sessionFactory.MySQL" parent="slcTemplates.sessionFactory.hibernateBasic">
-		<property name="dataSource" ref="slcDefaut.dataSourceJndi" />
-		<property name="hibernateProperties">
-			<value><![CDATA[
-				hibernate.dialect=org.hibernate.dialect.MySQLDialect
-				hibernate.hbm2ddl.auto=update
-				hibernate.connection.autocommit=false
-			]]></value>
-		</property>
-	</bean>
-
-	<bean id="slcServerDefault.sessionFactory.MySQL5" parent="slcTemplates.sessionFactory.hibernateBasic">
-		<property name="dataSource" ref="slcDefaut.dataSourceJndi" />
-		<property name="hibernateProperties">
-			<value><![CDATA[
-                hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
-                hibernate.hbm2ddl.auto=update
-                hibernate.connection.autocommit=false
-            ]]></value>
-		</property>
-	</bean>
-
-	<bean id="slcServerDefault.sessionFactory.Sybase" parent="slcTemplates.sessionFactory.hibernateBasic">
-		<property name="dataSource" ref="slcDefaut.dataSourceJndi" />
-		<property name="hibernateProperties">
-			<value><![CDATA[
-                hibernate.dialect=org.hibernate.dialect.SybaseDialect
-                hibernate.hbm2ddl.auto=update
-                hibernate.connection.autocommit=false
-            ]]></value>
-		</property>
-	</bean>
-
-	<!-- DAOs -->
-	<bean id="hibernateTemplate" class="org.springframework.orm.hibernate3.HibernateTemplate">
-		<property name="sessionFactory" ref="sessionFactory" />
-		<property name="allowCreate" value="false" />
-	</bean>
-
-	<bean id="testResultDao" parent="slcTemplates.dao.testResultDao">
-		<property name="hibernateTemplate" ref="hibernateTemplate" />
-	</bean>
-
-	<bean id="testResultCollectionDao" parent="slcTemplates.dao.testResultCollectionDao">
-		<property name="hibernateTemplate" ref="hibernateTemplate" />
-	</bean>
-
-	<bean id="testRunDescriptorDao" parent="slcTemplates.dao.testRunDescriptorDao">
-		<property name="hibernateTemplate" ref="hibernateTemplate" />
-	</bean>
-
-	<bean id="slcExecutionDao" parent="slcTemplates.dao.slcExecutionDao">
-		<property name="hibernateTemplate" ref="hibernateTemplate" />
-	</bean>
-
-	<bean id="slcAgentDescriptorDao" parent="slcTemplates.dao.slcAgentDescriptorDao">
-		<property name="hibernateTemplate" ref="hibernateTemplate" />
-	</bean>
-
-	<!-- Hibernate instrumentation -->
-	<bean id="osivInterceptor"
-		class="org.springframework.orm.hibernate3.support.OpenSessionInViewInterceptor">
-		<property name="sessionFactory" ref="sessionFactory" />
-	</bean>
-
-	<!-- Transaction -->
-	<bean id="transactionManager"
-		class="org.springframework.orm.hibernate3.HibernateTransactionManager"
-		lazy-init="false">
-		<property name="sessionFactory" ref="sessionFactory" />
-	</bean>
-
-</beans>
\ 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 6d79a662c..e8d3cd83c 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
@@ -4,6 +4,7 @@ import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.UUID;
 
+import javax.jms.ConnectionFactory;
 import javax.jms.Destination;
 import javax.jms.JMSException;
 import javax.jms.Message;
@@ -27,6 +28,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 JmsTemplate jmsTemplate;
 	private Destination agentRegister;
 	private Destination agentUnregister;
@@ -44,6 +46,10 @@ public class JmsAgent extends AbstractAgent implements SlcAgent,
 	}
 
 	public void afterPropertiesSet() throws Exception {
+		// Initialize JMS Template
+		jmsTemplate = new JmsTemplate(connectionFactory);
+		jmsTemplate.setMessageConverter(messageConverter);
+
 		jmsTemplate.convertAndSend(agentRegister, agentDescriptor);
 		log.info("Agent #" + agentDescriptor.getUuid() + " registered to "
 				+ agentRegister);
@@ -55,10 +61,6 @@ public class JmsAgent extends AbstractAgent implements SlcAgent,
 				+ agentUnregister);
 	}
 
-	public void setJmsTemplate(JmsTemplate jmsTemplate) {
-		this.jmsTemplate = jmsTemplate;
-	}
-
 	public void setAgentRegister(Destination agentRegister) {
 		this.agentRegister = agentRegister;
 	}
@@ -68,7 +70,7 @@ public class JmsAgent extends AbstractAgent implements SlcAgent,
 	}
 
 	public void onMessage(Message message) {
-		// FIXME: we filter the messages on the client side, 
+		// FIXME: we filter the messages on the client side,
 		// because of a weird problem with selector since moving to OSGi
 		try {
 			if (message.getStringProperty("slc-agentId").equals(
@@ -94,6 +96,9 @@ public class JmsAgent extends AbstractAgent implements SlcAgent,
 	public void setMessageConverter(MessageConverter messageConverter) {
 		this.messageConverter = messageConverter;
 	}
-	
-	
+
+	public void setConnectionFactory(ConnectionFactory connectionFactory) {
+		this.connectionFactory = connectionFactory;
+	}
+
 }
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
new file mode 100644
index 000000000..764711cb6
--- /dev/null
+++ b/runtime/org.argeo.slc.support.activemq/src/main/resources/org/argeo/slc/activemq/destinations.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
+	default-lazy-init="false">
+
+	<!-- Destinations -->
+	<bean id="slcJms.destination.agent.register" p:physicalName="agent.register"
+		parent="slcJms.amTopic" />
+	<bean id="slcJms.destination.agent.unregister" p:physicalName="agent.unregister"
+		parent="slcJms.amTopic" />
+	<bean id="slcJms.destination.agent.newExecution" p:physicalName="agent.newExecution"
+		parent="slcJms.amTopic" />
+
+	<!-- Templates -->
+	<bean id="slcJms.amQueue" class="org.apache.activemq.command.ActiveMQQueue"
+		abstract="true" />
+	<bean id="slcJms.amTopic" class="org.apache.activemq.command.ActiveMQTopic"
+		abstract="true" />
+
+</beans>
\ No newline at end of file
diff --git a/runtime/org.argeo.slc.support.activemq/src/main/resources/org/argeo/slc/activemq/spring.xml b/runtime/org.argeo.slc.support.activemq/src/main/resources/org/argeo/slc/activemq/spring.xml
index 83c5ac9dc..429e76f28 100644
--- a/runtime/org.argeo.slc.support.activemq/src/main/resources/org/argeo/slc/activemq/spring.xml
+++ b/runtime/org.argeo.slc.support.activemq/src/main/resources/org/argeo/slc/activemq/spring.xml
@@ -6,70 +6,11 @@
 
 	<import resource="classpath:org/argeo/slc/castor/spring.xml" />
 
+	<import resource="destinations.xml" />
+
 	<bean id="slcDefault.jms.castorMessageConverter" class="org.argeo.slc.jms.MarshallerMessageConverter">
 		<property name="marshaller" ref="slcDefault.castor.marshaller" />
 		<property name="unmarshaller" ref="slcDefault.castor.marshaller" />
 	</bean>
 
-	<bean id="slcDefault.jms.amqConnectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
-		<property name="brokerURL">
-			<value>tcp://localhost:61616</value>
-		</property>
-	</bean>
-	<!--
-		<amq:connectionFactory id="slcDefault.jms.amqConnectionFactory"
-		brokerURL="${org.apache.activemq.brokerURL}" />
-	-->
-	<bean id="slcDefault.jms.connectionFactory"
-		class="org.springframework.jms.connection.SingleConnectionFactory">
-		<property name="targetConnectionFactory">
-			<ref local="slcDefault.jms.amqConnectionFactory" />
-		</property>
-	</bean>
-
-	<bean id="slcDefault.jms.jmsTemplateCastor" class="org.springframework.jms.core.JmsTemplate">
-		<property name="connectionFactory" ref="slcDefault.jms.connectionFactory" />
-		<property name="messageConverter" ref="slcDefault.jms.castorMessageConverter" />
-	</bean>
-
-
-	<!-- Destinations -->
-	<!--
-		<amq:topic id="slcJms.destination.agent.register"
-		physicalName="agent.register" /> <amq:topic
-		id="slcJms.destination.agent.unregister"
-		physicalName="agent.unregister" /> <amq:topic
-		id="slcJms.destination.agent.newExecution"
-		physicalName="agent.newExecution" />
-	-->
-	<bean id="slcJms.destination.agent.register" p:physicalName="agent.register"
-		parent="slcJms.amTopic" />
-	<bean id="slcJms.destination.agent.unregister" p:physicalName="agent.unregister"
-		parent="slcJms.amTopic" />
-	<bean id="slcJms.destination.agent.newExecution" p:physicalName="agent.newExecution"
-		parent="slcJms.amTopic" />
-
-	<bean id="slcJms.destination.modulesManager.request"
-		p:physicalName="modulesManager.request" parent="slcJms.amQueue" />
-	<bean id="slcJms.destination.modulesManager.response"
-		p:physicalName="modulesManager.response" parent="slcJms.amQueue" />
-
-	<!-- Templates -->
-	<bean id="slcTemplate.jms.listenerContainer"
-		class="org.springframework.jms.listener.DefaultMessageListenerContainer"
-		abstract="true">
-		<property name="connectionFactory" ref="slcDefault.jms.connectionFactory" />
-	</bean>
-
-	<bean id="slcTemplate.jms.listenerAdapterCastor"
-		class="org.springframework.jms.listener.adapter.MessageListenerAdapter"
-		abstract="true">
-		<property name="messageConverter" ref="slcDefault.jms.castorMessageConverter" />
-	</bean>
-
-	<bean id="slcJms.amQueue" class="org.apache.activemq.command.ActiveMQQueue"
-		abstract="true" />
-	<bean id="slcJms.amTopic" class="org.apache.activemq.command.ActiveMQTopic"
-		abstract="true" />
-
 </beans>
\ 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 b3b78be1a..778c94e75 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
@@ -12,4 +12,3 @@ Require-Bundle: org.argeo.slc.server,
  org.springframework.jms,
  com.springsource.org.castor,
  org.argeo.dep.osgi.activemq
-Spring-Context: *;create-asynchronously:=false 
diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.activemq/META-INF/spring/activemq-osgi.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.activemq/META-INF/spring/activemq-osgi.xml
new file mode 100644
index 000000000..789db5f62
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.activemq/META-INF/spring/activemq-osgi.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/osgi"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
+	xsi:schemaLocation="http://www.springframework.org/schema/osgi  
+       http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd
+       http://www.springframework.org/schema/beans   
+       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+	<service ref="jmsConnectionFactory" interface="javax.jms.ConnectionFactory" />
+
+</beans:beans>
\ 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 6ea6b61c2..2ef51f341 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,27 +6,29 @@
 
 	<import resource="classpath:org/argeo/slc/activemq/spring.xml" />
 
-	<!--
-		Create embedded broker-->
+	<!-- Embedded broker -->
 	<amq:broker useJmx="false" persistent="false">
 		<amq:transportConnectors>
 			<amq:transportConnector uri="tcp://localhost:61616" />
 		</amq:transportConnectors>
 	</amq:broker>
 
-<!-- 
-	<bean id="broker" class="org.apache.activemq.xbean.BrokerFactoryBean">
-		<property name="config" value="classpath:activemq-conf.xml" />
-		<property name="start" value="true" />
+	<!-- 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>tcp://localhost:61616</value>
+				</property>
+			</bean>
+		</property>
 	</bean>
- -->
 
-	<bean id="template.jms.listenerContainer" parent="slcTemplate.jms.listenerContainer"
-		abstract="true">
-	</bean>
-
-	<bean id="template.jms.listenerAdapter" parent="slcTemplate.jms.listenerAdapterCastor"
-		abstract="true">
-	</bean>
 
+	<!--
+		<bean id="broker" class="org.apache.activemq.xbean.BrokerFactoryBean">
+		<property name="config" value="classpath:activemq-conf.xml" />
+		<property name="start" value="true" /> </bean>
+	-->
 </beans>
\ No newline at end of file
diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/MANIFEST.MF
index f79d00353..cd721650f 100644
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/MANIFEST.MF
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
 Bundle-SymbolicName: org.argeo.slc.server.hibernate
 Bundle-Version: 0.1.0
-Require-Bundle: org.argeo.slc.server,
+Import-Package: 
+ org.hibernate,
+ org.springframework.orm.hibernate3,
+ org.springframework.aop,
+ org.springframework.aop.framework,
+ org.aopalliance.aop,
+ org.hibernate.jdbc
+Require-Bundle: 
+ org.argeo.slc.server,
  org.argeo.slc.specs,
- org.argeo.slc.support.simple,
- org.springframework.orm,
- org.springframework.jdbc,
- org.springframework.context,
- org.springframework.context.support,
- com.springsource.net.sf.ehcache,
- com.springsource.org.hsqldb,
- com.springsource.org.hibernate
-Spring-Context: *;create-asynchronously:=false 
+ org.argeo.slc.support.simple
  
\ No newline at end of file
diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/spring/db-osgi.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/spring/db-osgi.xml
index e04286679..381fae864 100644
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/spring/db-osgi.xml
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/spring/db-osgi.xml
@@ -16,8 +16,7 @@
 		ref="slcExecutionDao" />
 	<service interface="org.argeo.slc.dao.runtime.SlcAgentDescriptorDao"
 		ref="slcAgentDescriptorDao" />
-		 
-	<service interface="org.hibernate.SessionFactory"
-		ref="sessionFactory" />
-		 
+
+	<reference id="sessionFactory" interface="org.hibernate.SessionFactory" />
+
 </beans:beans>
\ No newline at end of file
diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/spring/db.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/spring/db.xml
index 39070f397..4a08a84d3 100644
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/spring/db.xml
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/spring/db.xml
@@ -8,42 +8,9 @@
        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd"
 	default-lazy-init="false">
 
-		<import
-		resource="classpath:/org/argeo/slc/hibernate/spring/applicationContext.xml"
-		/>
+	<import
+		resource="classpath:/org/argeo/slc/hibernate/spring/applicationContext.xml" />
 
-	<!--
-		Use session factories <bean id="sessionFactory"
-		parent="${sessionFactoryParentBean}" />
-	-->
-
-	<!--
-		<bean id="sessionFactory"
-		parent="slcTemplates.sessionFactory.hibernateBasic" lazy-init="false">
-		<property name="dataSource"
-		ref="slcDefault.dataSource.inMemoryTestHSQL" /> <property
-		name="hibernateProperties"> <value><![CDATA[
-		hibernate.dialect=org.hibernate.dialect.HSQLDialect
-		hibernate.hbm2ddl.auto=create hibernate.generate_statistics=true
-		hibernate.connection.autocommit=false ]]></value> </property> </bean>
-	-->
-	<bean id="sessionFactory" parent="slcTemplates.sessionFactory.hibernateBasic">
-		<property name="dataSource" ref="dataSource" />
-		<property name="hibernateProperties">
-			<value><![CDATA[
-				hibernate.dialect=org.hibernate.dialect.HSQLDialect
-				hibernate.hbm2ddl.auto=create
-				hibernate.current_session_context_class=thread
-			]]></value>
-		</property>
-	</bean>
-
-	<bean id="dataSource" class="org.hsqldb.jdbc.jdbcDataSource">
-		<property name="database" value="jdbc:hsqldb:mem:test"/>
-		<property name="user" value="sa"/>
-		<property name="password" value=""/>
-		
-	</bean>
 	<!-- DAOs -->
 	<bean id="hibernateTemplate" class="org.springframework.orm.hibernate3.HibernateTemplate">
 		<property name="sessionFactory" ref="sessionFactory" />
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
new file mode 100644
index 000000000..7e6d0ad5c
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/spring/transaction.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop"
+	xmlns:tx="http://www.springframework.org/schema/tx"
+	xsi:schemaLocation="
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+       http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
+       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
+
+	<!-- Transaction -->
+	<bean id="transactionManager"
+		class="org.springframework.orm.hibernate3.HibernateTransactionManager"
+		lazy-init="false">
+		<property name="sessionFactory" ref="sessionFactory" />
+	</bean>
+
+	<!-- DAO transactions -->
+	<aop:config>
+		<aop:pointcut id="daoProcessMethods"
+			expression="execution(* org.argeo.slc.dao.process.*.*(..))" />
+		<aop:advisor advice-ref="daoAdvice" pointcut-ref="daoProcessMethods" />
+	</aop:config>
+
+	<aop:config>
+		<aop:pointcut id="daoRuntimeMethods"
+			expression="execution(* org.argeo.slc.dao.runtime.*.*(..))" />
+		<aop:advisor advice-ref="daoAdvice" pointcut-ref="daoRuntimeMethods" />
+	</aop:config>
+
+	<aop:config>
+		<aop:pointcut id="daoTestMethods"
+			expression="execution(* org.argeo.slc.dao.test.*.*(..))" />
+		<aop:advisor advice-ref="daoAdvice" pointcut-ref="daoTestMethods" />
+	</aop:config>
+
+	<aop:config>
+		<aop:pointcut id="daoTestTreeMethods"
+			expression="execution(* org.argeo.slc.dao.test.tree.*.*(..))" />
+		<aop:advisor advice-ref="daoAdvice" pointcut-ref="daoTestTreeMethods" />
+	</aop:config>
+
+	<tx:advice id="daoAdvice" transaction-manager="transactionManager">
+		<tx:attributes>
+			<tx:method name="get*" propagation="REQUIRED" read-only="true" />
+			<tx:method name="list*" propagation="REQUIRED" read-only="true" />
+			<tx:method name="*" propagation="REQUIRED" />
+		</tx:attributes>
+	</tx:advice>
+<!-- 
+	<aop:config>
+		<aop:pointcut id="pointcut.services.allMethods"
+			expression="execution(* org.argeo.slc.services.*.*.*(..))" />
+		<aop:advisor advice-ref="advice.allMethodsRequired"
+			pointcut-ref="pointcut.services.allMethods" />
+	</aop:config>
+
+	<tx:advice id="advice.allMethodsRequired"
+		transaction-manager="transactionManager">
+		<tx:attributes>
+			<tx:method name="*" propagation="REQUIRED" />
+		</tx:attributes>
+	</tx:advice>
+ -->
+</beans>
\ No newline at end of file
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
new file mode 100644
index 000000000..f3bd1fe3e
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hsqldb/META-INF/MANIFEST.MF
@@ -0,0 +1,12 @@
+Bundle-SymbolicName: org.argeo.slc.server.hsqldb
+Bundle-Version: 0.1.0
+Import-Package: 
+ org.springframework.orm.hibernate3,
+ org.springframework.cache.ehcache,
+ net.sf.ehcache.hibernate,
+ org.hsqldb.jdbc,
+ org.hibernate
+Require-Bundle: org.argeo.slc.server,
+ org.argeo.slc.specs,
+ org.argeo.slc.support.simple
+ 
\ No newline at end of file
diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hsqldb/META-INF/spring/hsqldb-osgi.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hsqldb/META-INF/spring/hsqldb-osgi.xml
new file mode 100644
index 000000000..6d7b0e6f1
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hsqldb/META-INF/spring/hsqldb-osgi.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/osgi"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
+	xsi:schemaLocation="http://www.springframework.org/schema/osgi  
+       http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd
+       http://www.springframework.org/schema/beans   
+       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+	<service ref="sessionFactory" interface="org.hibernate.SessionFactory" />
+
+</beans:beans>
\ No newline at end of file
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
new file mode 100644
index 000000000..0be5483c7
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hsqldb/META-INF/spring/hsqldb.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop"
+	xmlns:tx="http://www.springframework.org/schema/tx"
+	xsi:schemaLocation="
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+       http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
+       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd"
+	default-lazy-init="false">
+
+		<import
+		resource="classpath:/org/argeo/slc/hibernate/spring/applicationContext.xml"
+		/>
+
+	<bean id="sessionFactory" parent="slcTemplates.sessionFactory.hibernateBasic">
+		<property name="dataSource" ref="dataSource" />
+		<property name="hibernateProperties">
+			<value><![CDATA[
+				hibernate.dialect=org.hibernate.dialect.HSQLDialect
+				hibernate.hbm2ddl.auto=create
+				hibernate.current_session_context_class=thread
+			]]></value>
+		</property>
+	</bean>
+
+	<bean id="dataSource" class="org.hsqldb.jdbc.jdbcDataSource">
+		<property name="database" value="jdbc:hsqldb:mem:test"/>
+		<property name="user" value="sa"/>
+		<property name="password" value=""/>
+		
+	</bean>
+</beans>
\ No newline at end of file
diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.jms/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.jms/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..ef8372511
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.jms/META-INF/MANIFEST.MF
@@ -0,0 +1,14 @@
+Bundle-SymbolicName: org.argeo.slc.server.jms
+Bundle-Version: 0.1.0
+Import-Package: javax.jms,
+ javax.management.j2ee.statistics,
+ org.apache.commons.logging
+Require-Bundle: org.argeo.slc.server,
+ org.argeo.slc.support.activemq,
+ org.springframework.core,
+ org.springframework.context,
+ org.springframework.beans,
+ org.springframework.oxm,
+ org.springframework.jms,
+ com.springsource.org.castor,
+ org.argeo.dep.osgi.activemq
diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.jms/META-INF/spring/jms-osgi.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.jms/META-INF/spring/jms-osgi.xml
new file mode 100644
index 000000000..f3a61d1d5
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.jms/META-INF/spring/jms-osgi.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/osgi"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
+	xsi:schemaLocation="http://www.springframework.org/schema/osgi  
+       http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd
+       http://www.springframework.org/schema/beans   
+       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+	<reference id="agentService" interface="org.argeo.slc.services.runtime.AgentService" />
+
+	<reference id="jmsConnectionFactory" interface="javax.jms.ConnectionFactory" />
+
+</beans:beans>
\ 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
new file mode 100644
index 000000000..9d9af2262
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.jms/META-INF/spring/jms.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	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" />
+
+	<!-- Agent Service -->
+	<bean id="agentService.jmsContainer.register" parent="listenerContainer">
+		<property name="destination" ref="slcJms.destination.agent.register" />
+		<property name="messageListener">
+			<bean parent="listenerAdapterCastor">
+				<constructor-arg ref="agentService" />
+				<property name="defaultListenerMethod" value="register" />
+			</bean>
+		</property>
+		<property name="connectionFactory" ref="jmsConnectionFactory" />
+	</bean>
+
+	<bean id="agentService.jmsContainer.unregister" parent="listenerContainer">
+		<property name="destination" ref="slcJms.destination.agent.unregister" />
+		<property name="messageListener">
+			<bean parent="listenerAdapterCastor">
+				<constructor-arg ref="agentService" />
+				<property name="defaultListenerMethod" value="unregister" />
+			</bean>
+		</property>
+	</bean>
+
+	<!-- Templates -->
+	<bean id="listenerContainer"
+		class="org.springframework.jms.listener.DefaultMessageListenerContainer"
+		abstract="true">
+		<property name="connectionFactory" ref="jmsConnectionFactory" />
+	</bean>
+
+	<bean id="listenerAdapterCastor"
+		class="org.springframework.jms.listener.adapter.MessageListenerAdapter"
+		abstract="true">
+		<property name="messageConverter" ref="slcDefault.jms.castorMessageConverter" />
+	</bean>
+
+</beans>
\ No newline at end of file
diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.services/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.services/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..7039015d5
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.services/META-INF/MANIFEST.MF
@@ -0,0 +1,7 @@
+Bundle-Name: SLC Server Services
+Bundle-SymbolicName: org.argeo.slc.server.services
+Bundle-Version: 1.0.0
+Import-Package: org.hibernate.jdbc
+Require-Bundle: org.argeo.slc.server,
+ org.argeo.slc.specs,
+ org.argeo.slc.support.simple
diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.services/META-INF/spring/services-osgi.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.services/META-INF/spring/services-osgi.xml
new file mode 100644
index 000000000..5b2b6a5bb
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.services/META-INF/spring/services-osgi.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/osgi"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
+	xsi:schemaLocation="http://www.springframework.org/schema/osgi  
+       http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd
+       http://www.springframework.org/schema/beans   
+       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+	<service ref="testManagerService" interface="org.argeo.slc.services.test.TestManagerService" />
+	<service ref="agentService" interface="org.argeo.slc.services.runtime.AgentService" />
+
+	<reference interface="org.argeo.slc.dao.test.tree.TreeTestResultDao"
+		id="testResultDao" />
+	<reference interface="org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao"
+		id="testResultCollectionDao" />
+	<reference interface="org.argeo.slc.dao.test.TestRunDescriptorDao"
+		id="testRunDescriptorDao" />
+	<reference interface="org.argeo.slc.dao.process.SlcExecutionDao"
+		id="slcExecutionDao" />
+	<reference interface="org.argeo.slc.dao.runtime.SlcAgentDescriptorDao"
+		id="slcAgentDescriptorDao" />
+
+</beans:beans>
\ No newline at end of file
diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.services/META-INF/spring/services.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.services/META-INF/spring/services.xml
new file mode 100644
index 000000000..e96f1e0df
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.services/META-INF/spring/services.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop"
+	xmlns:tx="http://www.springframework.org/schema/tx"
+	xsi:schemaLocation="
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+       http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
+       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
+	
+	<!-- Services -->
+	<bean id="testManagerService" class="org.argeo.slc.services.impl.test.TestManagerServiceImpl">
+		<constructor-arg ref="testResultDao" />
+		<constructor-arg ref="testRunDescriptorDao" />
+		<constructor-arg ref="slcExecutionDao" />
+		<constructor-arg ref="testResultCollectionDao" />
+	</bean>
+
+	<bean id="agentService" class="org.argeo.slc.services.impl.runtime.AgentServiceImpl">
+		<constructor-arg ref="slcAgentDescriptorDao" />
+	</bean>
+</beans>
\ No newline at end of file
diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/applicationContext.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/applicationContext.xml
index 61b8a81c0..be36828d7 100644
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/applicationContext.xml
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/applicationContext.xml
@@ -6,34 +6,20 @@
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
        http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
-	<import resource="classpath:/org/argeo/slc/server/spring/transaction.xml" />
 
 	<!--
 		<import resource="classpath:/org/argeo/slc/server/spring/jmx.xml" />
 	-->
-	
-	<import resource="osgi.xml"/>
-	
-		<!--
-		Hibernate instrumentation--> <bean id="osivInterceptor"
-		class="org.springframework.orm.hibernate3.support.OpenSessionInViewInterceptor">
-		<property name="sessionFactory" ref="sessionFactory" /> </bean>
-	
+
+	<import resource="osgi.xml" />
 
 	<!--
-		Transaction --> <bean id="transactionManager"
-		class="org.springframework.orm.hibernate3.HibernateTransactionManager"
-		lazy-init="false"> <property name="sessionFactory"
-		ref="sessionFactory" /> </bean>
-	
-	
-	
-	<!--
-	<bean id="activemqBroker" class="org.apache.activemq.xbean.BrokerFactoryBean">
-		<property name="config" value="WEB-INF/activemq.xml" />
-		<property name="start" value="true" />
+		Hibernate instrumentation-->
+	<bean id="osivInterceptor"
+		class="org.springframework.orm.hibernate3.support.OpenSessionInViewInterceptor">
+		<property name="sessionFactory" ref="sessionFactory" />
 	</bean>
--->
+
 
 	<!--  Properties -->
 	<bean
@@ -50,49 +36,4 @@
 		<property name="ignoreUnresolvablePlaceholders" value="true" />
 	</bean>
 
-	<import resource="classpath:org/argeo/slc/activemq/spring.xml" />
-
-	<!-- ActiveMQ -->
-	<bean id="template.jms.listenerContainer" parent="slcTemplate.jms.listenerContainer"
-		abstract="true">
-	</bean>
-
-	<bean id="template.jms.listenerAdapter" parent="slcTemplate.jms.listenerAdapterCastor"
-		abstract="true">
-	</bean>
-
-
-	<!-- Services -->
-	<bean id="testManagerService" class="org.argeo.slc.services.impl.test.TestManagerServiceImpl">
-		<constructor-arg ref="testResultDao" />
-		<constructor-arg ref="testRunDescriptorDao" />
-		<constructor-arg ref="slcExecutionDao" />
-		<constructor-arg ref="testResultCollectionDao" />
-	</bean>
-
-	<bean id="agentService" class="org.argeo.slc.services.impl.runtime.AgentServiceImpl">
-		<constructor-arg ref="slcAgentDescriptorDao" />
-	</bean>
-
-	<bean id="agentService.jmsContainer.register" parent="template.jms.listenerContainer">
-		<property name="destination" ref="slcJms.destination.agent.register" />
-		<property name="messageListener">
-			<bean parent="template.jms.listenerAdapter">
-				<constructor-arg ref="agentService" />
-				<property name="defaultListenerMethod" value="register" />
-			</bean>
-		</property>
-	</bean>
-
-	<bean id="agentService.jmsContainer.unregister" parent="template.jms.listenerContainer">
-		<property name="destination" ref="slcJms.destination.agent.unregister" />
-		<property name="messageListener">
-			<bean parent="template.jms.listenerAdapter">
-				<constructor-arg ref="agentService" />
-				<property name="defaultListenerMethod" value="unregister" />
-			</bean>
-		</property>
-	</bean>
-
-
 </beans>
\ No newline at end of file
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 002e6d9a7..4a655bb6f 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
@@ -17,10 +17,13 @@
 	<reference interface="org.argeo.slc.dao.runtime.SlcAgentDescriptorDao"
 		id="slcAgentDescriptorDao" />
 
-	<reference interface="org.hibernate.SessionFactory"
-		id="sessionFactory" />
+	<reference interface="org.hibernate.SessionFactory" id="sessionFactory" />
 
 	<reference interface="org.argeo.slc.execution.ExecutionModulesManager"
 		id="modulesManager" />
 
+	<reference id="testManagerService"
+		interface="org.argeo.slc.services.test.TestManagerService" />
+	<reference id="agentService" interface="org.argeo.slc.services.runtime.AgentService" />
+
 </beans:beans>
\ No newline at end of file
diff --git a/server/org.argeo.slc.siteserver/pom.xml b/server/org.argeo.slc.siteserver/pom.xml
index 5d859019e..1f68b72b3 100644
--- a/server/org.argeo.slc.siteserver/pom.xml
+++ b/server/org.argeo.slc.siteserver/pom.xml
@@ -17,7 +17,10 @@
 			org.springframework.osgi.web.extender,
 			org.springframework.osgi.samples.simplewebapp,
 			org.argeo.slc.server.activemq,
+			org.argeo.slc.server.hsqldb,
 			org.argeo.slc.server.hibernate,
+			org.argeo.slc.server.services,
+			org.argeo.slc.server.jms,
 			org.argeo.slc.webapp,
 			org.argeo.slc.demo.basic,
 			org.argeo.slc.demo.manager
@@ -199,6 +202,7 @@
 			<groupId>org.argeo.slc.demo</groupId>
 			<artifactId>org.argeo.slc.demo.deploy</artifactId>
 			<version>${project.version}</version>
+			<type>pom</type>
 		</dependency>
 
 	</dependencies>
-- 
2.39.2