From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 28 Feb 2009 11:13:26 +0000 (+0000)
Subject: Adapt to OSGi on the server side
X-Git-Tag: argeo-slc-2.1.7~2101
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=2ad1acc6a405415f6456c5547ad6ec2a87438fec;p=gpl%2Fargeo-slc.git

Adapt to OSGi on the server side

git-svn-id: https://svn.argeo.org/slc/trunk@2204 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/demo/org.argeo.slc.demo.manager/pom.xml b/demo/org.argeo.slc.demo.manager/pom.xml
index a4caecfc9..dfb9204e7 100644
--- a/demo/org.argeo.slc.demo.manager/pom.xml
+++ b/demo/org.argeo.slc.demo.manager/pom.xml
@@ -21,7 +21,7 @@
 				<configuration>
 					<instructions>
 						<Import-Package>org.apache.commons.logging,org.springframework.beans.factory.config</Import-Package>
-						<Require-Bundle>org.springframework.jms,com.springsource.org.castor,com.springsource.org.apache.xbean.spring,com.springsource.org.apache.activemq,org.argeo.slc.support.equinox,org.argeo.slc.support.activemq,org.argeo.slc.specs,org.argeo.slc.support.simple,org.springframework.aop,org.springframework.oxm,com.springsource.net.sf.cglib,com.springsource.org.aopalliance</Require-Bundle>
+						<Require-Bundle>org.springframework.jms,com.springsource.org.castor,org.argeo.dep.osgi.activemq,org.argeo.slc.support.equinox,org.argeo.slc.support.activemq,org.argeo.slc.specs,org.argeo.slc.support.simple,org.springframework.aop,org.springframework.oxm,com.springsource.net.sf.cglib,com.springsource.org.aopalliance</Require-Bundle>
 						<Spring-Context>conf/*</Spring-Context>
 					</instructions>
 				</configuration>
diff --git a/org.argeo.slc.detached.launcher/pom.xml b/org.argeo.slc.detached.launcher/pom.xml
index 813a0cc1b..b101f93dc 100644
--- a/org.argeo.slc.detached.launcher/pom.xml
+++ b/org.argeo.slc.detached.launcher/pom.xml
@@ -77,12 +77,12 @@
 			<groupId>org.eclipse.osgi</groupId>
 			<artifactId>org.eclipse.osgi</artifactId>
 		</dependency>
-
+<!-- 
 		<dependency>
 			<groupId>org.springframework.osgi</groupId>
 			<artifactId>org.springframework.osgi.extender</artifactId>
 		</dependency>
-
+ -->
 
 		<!--
 			Old <dependency> <groupId>org.springframework</groupId>
@@ -99,12 +99,12 @@
 			<artifactId>org.argeo.slc.detached.ext.log4j</artifactId>
 			<version>0.11.2</version> </dependency>
 		-->
-		<!-- Spring -->
+		<!-- Spring
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>org.springframework.context</artifactId>
 		</dependency>
-
+ -->
 		<!--
 			<dependency> <groupId>org.apache.xerces</groupId>
 			<artifactId>com.springsource.org.apache.xerces</artifactId>
@@ -115,6 +115,7 @@
 			com.springsource.edu.emory.mathcs.backport </artifactId>
 			</dependency>
 		-->
+		<!-- 
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>
@@ -128,7 +129,7 @@
 		<dependency>
 			<groupId>org.apache.log4j</groupId>
 			<artifactId>com.springsource.org.apache.log4j</artifactId>
-		</dependency>
+		</dependency> -->
 		<!--
 			<dependency> <groupId>org.slf4j</groupId>
 			<artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
diff --git a/org.argeo.slc.detached.launcher/src/main/java/org/argeo/slc/detached/launcher/Main.java b/org.argeo.slc.detached.launcher/src/main/java/org/argeo/slc/detached/launcher/Main.java
index 17b5f139e..131975088 100644
--- a/org.argeo.slc.detached.launcher/src/main/java/org/argeo/slc/detached/launcher/Main.java
+++ b/org.argeo.slc.detached.launcher/src/main/java/org/argeo/slc/detached/launcher/Main.java
@@ -79,6 +79,7 @@ public class Main {
 	}
 
 	public static void startEquinox(Properties config) throws Exception {
+		info("java.home=" + System.getProperty("java.home"));
 		info("java.class.path=" + System.getProperty("java.class.path"));
 
 		File baseDir = new File(System.getProperty("user.dir"))
@@ -109,7 +110,8 @@ public class Main {
 					String url = "reference:file:"
 							+ new File(path).getCanonicalPath();
 					Bundle bundle = context.installBundle(url);
-					installBundleNames.add(bundle.getSymbolicName());
+					if (bundle.getSymbolicName() != null)
+						installBundleNames.add(bundle.getSymbolicName());
 					info("Installed from classpath " + url);
 				} catch (Exception e) {
 					bundleInstallWarn(e.getMessage());
@@ -157,12 +159,15 @@ public class Main {
 
 		if (bundleStart.trim().equals("*")) {
 			for (int i = 0; i < installBundleNames.size(); i++) {
-				String bundleSymbolicName = installBundleNames.get(i)
-						.toString();
-				try {
-					startBundle(context, bundleSymbolicName);
-				} catch (Exception e) {
-					bundleInstallWarn(e.getMessage());
+				Object obj = installBundleNames.get(i);
+				if (obj != null) {
+					String bundleSymbolicName = obj.toString();
+					try {
+						startBundle(context, bundleSymbolicName);
+					} catch (Exception e) {
+						bundleInstallWarn("Cannot start " + bundleSymbolicName
+								+ ": " + e.getMessage());
+					}
 				}
 			}
 		} else {
@@ -207,13 +212,14 @@ public class Main {
 		for (int i = 0; i < bundles.length; i++) {
 			Bundle bundle = bundles[i];
 			String bundleSymbolicName = bundle.getSymbolicName();
-			if (bundleSymbolicName == null)
-				throw new RuntimeException("Bundle " + bundle.getBundleId()
-						+ " (" + bundle.getLocation()
-						+ ") has no symbolic name.");
+			if (bundleSymbolicName != null) {
+				// throw new RuntimeException("Bundle " + bundle.getBundleId()
+				// + " (" + bundle.getLocation()
+				// + ") has no symbolic name.");
 
-			if (bundleSymbolicName.equals(symbolicName)) {
-				return bundle;
+				if (bundleSymbolicName.equals(symbolicName)) {
+					return bundle;
+				}
 			}
 		}
 		return null;
@@ -285,10 +291,11 @@ public class Main {
 	}
 
 	private static void info(Object obj) {
-		//System.out.println("[INFO] " + obj);
+		System.out.println("[INFO] " + obj);
 	}
 
 	private static void bundleInstallWarn(Object obj) {
 		System.err.println("[WARN] " + obj);
+		//Thread.dumpStack();
 	}
 }
diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index 1416cfd53..a0e05c728 100644
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -766,12 +766,12 @@ limitations under the License.
 			</dependency>
 
 			<!-- ActiveMQ -->
-			<dependency>
+			<!--  <dependency>
 				<groupId>org.apache.activemq</groupId>
 				<artifactId>com.springsource.org.apache.activemq</artifactId>
 				<version>${version.activemq}</version>
-			</dependency>
-			<dependency>
+			</dependency>-->
+			<!-- <dependency>
 				<groupId>org.apache.activemq</groupId>
 				<artifactId>com.springsource.org.apache.activemq.web</artifactId>
 				<version>${version.activemq}</version>
@@ -780,24 +780,16 @@ limitations under the License.
 				<groupId>org.apache.activemq</groupId>
 				<artifactId>com.springsource.org.apache.activemq.pool</artifactId>
 				<version>${version.activemq}</version>
-			</dependency>
-			<!--
-				<dependency> <groupId>org.apache.activemq</groupId>
-				<artifactId>activemq-pool</artifactId>
-				<version>${version.activemq}</version> </dependency> <dependency>
-				<groupId>org.apache.activemq</groupId>
-				<artifactId>activemq-optional</artifactId>
-				<version>${version.activemq}</version> </dependency>
-			-->
-			<dependency>
+			</dependency> -->
+			<!-- <dependency>
 				<groupId>org.apache.xbean</groupId>
 				<artifactId>com.springsource.org.apache.xbean.spring</artifactId>
 				<version>3.3.0</version>
-			</dependency>
+			</dependency>-->
 			<dependency>
 				<groupId>org.apache.camel</groupId>
 				<artifactId>com.springsource.org.apache.camel</artifactId>
-				<version>1.3.0</version>
+				<version>1.3.0</version> 
 			</dependency>
 
 		</dependencies>
diff --git a/runtime/org.argeo.slc.server/pom.xml b/runtime/org.argeo.slc.server/pom.xml
index e1d686aa3..4e2fcf708 100644
--- a/runtime/org.argeo.slc.server/pom.xml
+++ b/runtime/org.argeo.slc.server/pom.xml
@@ -112,11 +112,11 @@
 			<artifactId>com.springsource.javax.wsdl</artifactId>
 		</dependency>
 
-		<!-- ActiveMQ -->
+		<!-- ActiveMQ
 		<dependency>
 			<groupId>org.apache.activemq</groupId>
 			<artifactId>com.springsource.org.apache.activemq.web</artifactId>
-		</dependency>
+		</dependency> -->
 
 		<!-- Various -->
 		<dependency>
diff --git a/runtime/org.argeo.slc.support.activemq/pom.xml b/runtime/org.argeo.slc.support.activemq/pom.xml
index 97da097ad..e1894a788 100644
--- a/runtime/org.argeo.slc.support.activemq/pom.xml
+++ b/runtime/org.argeo.slc.support.activemq/pom.xml
@@ -105,7 +105,7 @@
 			<artifactId>com.springsource.javax.management.j2ee</artifactId>
 		</dependency>
 
-		<!-- ActiveMQ -->
+		<!-- ActiveMQ
 		<dependency>
 			<groupId>org.apache.activemq</groupId>
 			<artifactId>com.springsource.org.apache.activemq</artifactId>
@@ -113,6 +113,14 @@
 		<dependency>
 			<groupId>org.apache.xbean</groupId>
 			<artifactId>com.springsource.org.apache.xbean.spring</artifactId>
+			
+		</dependency>
+		 -->
+		 
+		<dependency>
+			<groupId>org.argeo.dep.osgi</groupId>
+			<artifactId>org.argeo.dep.osgi.activemq</artifactId>
+			<version>5.2.0</version>
 		</dependency>
 		<!--
 			<dependency> <groupId>org.apache.activemq</groupId>
@@ -146,6 +154,11 @@
 			<artifactId>com.springsource.javax.servlet</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.apache.camel</groupId>
+			<artifactId>com.springsource.org.apache.camel</artifactId>
+		</dependency>
+
 		
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/server/org.argeo.slc.siteserver/bundles/context.xml b/server/org.argeo.slc.siteserver/bundles/context.xml
new file mode 100644
index 000000000..7ec1a09a0
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/context.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!-- Local configuration of the Argeo SLC server -->
+<Context>
+
+	<!-- Default set of monitored resources -->
+	<WatchedResource>WEB-INF/web.xml</WatchedResource>
+
+	<!--  
+		<Resource name="jdbc/mainDs" auth="Container"
+		type="javax.sql.DataSource" maxActive="10" maxIdle="5" maxWait="10000"
+		username="root" password="" driverClassName="com.mysql.jdbc.Driver"
+		url="jdbc:mysql://localhost:3306/argeo_slc?autoReconnect=true" />
+		
+		<Parameter name="sessionFactoryParentBean"
+		value="slcServerDefault.sessionFactory.MySQL5" override="false" />
+	-->
+
+	<Resource name="jdbc/mainDs" auth="Container"
+		type="javax.sql.DataSource" maxActive="10" maxIdle="5" maxWait="10000"
+		username="sa" password="" driverClassName="org.hsqldb.jdbcDriver"
+		url="jdbc:hsqldb:mem:test" />
+
+</Context>
diff --git a/server/org.argeo.slc.siteserver/bundles/logging/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/logging/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..35ccf4646
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/logging/META-INF/MANIFEST.MF
@@ -0,0 +1,4 @@
+Bundle-Name: Log4j configuration bundle
+Bundle-SymbolicName: server.logging
+Fragment-Host: com.springsource.org.apache.log4j
+
diff --git a/server/org.argeo.slc.siteserver/bundles/logging/log4j.properties b/server/org.argeo.slc.siteserver/bundles/logging/log4j.properties
new file mode 100644
index 000000000..0c8ac58f9
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/logging/log4j.properties
@@ -0,0 +1,21 @@
+log4j.rootLogger=WARN, console
+
+## Levels
+log4j.logger.org.argeo=DEBUG
+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.springframework=WARN
+
+log4j.logger.org.apache.catalina=INFO
+
+## Appenders
+# console is set to be a ConsoleAppender.
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+
+# console uses PatternLayout.
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c%n
+
+testCase=002
\ 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
new file mode 100644
index 000000000..b3b78be1a
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.activemq/META-INF/MANIFEST.MF
@@ -0,0 +1,15 @@
+Bundle-SymbolicName: org.argeo.slc.server.activemq
+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
+Spring-Context: *;create-asynchronously:=false 
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
new file mode 100644
index 000000000..c8c8846ed
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.activemq/META-INF/spring/activemq.xml
@@ -0,0 +1,30 @@
+<?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:activemq-conf.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/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.activemq/activemq-conf.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.activemq/activemq-conf.xml
new file mode 100644
index 000000000..9ed5ed1cb
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.activemq/activemq-conf.xml
@@ -0,0 +1,23 @@
+<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.0.xsd
+  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core-5.2.xsd   
+  http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd">
+	
+	<broker xmlns="http://activemq.apache.org/schema/core"
+		brokerName="localhost" persistent="false">
+
+
+		<!-- Use the following to configure how ActiveMQ is exposed in JMX -->
+		<managementContext>
+			<managementContext createConnector="false" />
+		</managementContext>
+
+		<!-- The transport connectors ActiveMQ will listen to -->
+		<transportConnectors>
+			<transportConnector name="openwire" uri="tcp://localhost:61616"
+				discoveryUri="multicast://default" />
+		</transportConnectors>
+
+	</broker>
+</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
new file mode 100644
index 000000000..f79d00353
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/MANIFEST.MF
@@ -0,0 +1,14 @@
+Bundle-SymbolicName: org.argeo.slc.server.hibernate
+Bundle-Version: 0.1.0
+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 
+ 
\ 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
new file mode 100644
index 000000000..e04286679
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/spring/db-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 interface="org.argeo.slc.dao.test.tree.TreeTestResultDao"
+		ref="testResultDao" />
+	<service interface="org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao"
+		ref="testResultCollectionDao" />
+	<service interface="org.argeo.slc.dao.test.TestRunDescriptorDao"
+		ref="testRunDescriptorDao" />
+	<service interface="org.argeo.slc.dao.process.SlcExecutionDao"
+		ref="slcExecutionDao" />
+	<service interface="org.argeo.slc.dao.runtime.SlcAgentDescriptorDao"
+		ref="slcAgentDescriptorDao" />
+		 
+	<service interface="org.hibernate.SessionFactory"
+		ref="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
new file mode 100644
index 000000000..5e098a61f
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.server.hibernate/META-INF/spring/db.xml
@@ -0,0 +1,176 @@
+<?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"
+		/>
+	-->
+
+	<!--
+		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" />
+		<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>
+
+
+
+	<!-- IMPORTED -->
+	
+	<!-- 
+	<bean id="slcDefault.dataSource.inMemoryTestHSQL"
+		class="org.springframework.jdbc.datasource.SingleConnectionDataSource"
+		destroy-method="destroy">
+		<property name="driverClassName" value="org.hsqldb.jdbcDriver" />
+		<property name="url" value="jdbc:hsqldb:mem:test" />
+		<property name="username" value="sa" />
+		<property name="password" value="" />
+		<property name="suppressClose" value="true" />
+	</bean>
+ -->
+	<bean id="slcTemplates.sessionFactory.hibernateBasic" abstract="true"
+		class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
+		<property name="mappingResources">
+			<list>
+				<value>
+					org/argeo/slc/hibernate/structure/SimpleSElement.hbm.xml
+				</value>
+				<value>
+					org/argeo/slc/hibernate/test/SimpleResultPart.hbm.xml
+				</value>
+				<value>
+					org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml
+				</value>
+				<value>
+					org/argeo/slc/hibernate/test/tree/TreeTestResultCollection.hbm.xml
+				</value>
+				<value>
+					org/argeo/slc/hibernate/test/tree/PartSubList.hbm.xml
+				</value>
+				<value>
+					org/argeo/slc/hibernate/test/TestRunDescriptor.hbm.xml
+				</value>
+				<value>
+					org/argeo/slc/hibernate/process/SlcExecution.hbm.xml
+				</value>
+				<value>
+					org/argeo/slc/hibernate/process/SlcExecutionStep.hbm.xml
+				</value>
+				<value>
+					org/argeo/slc/hibernate/process/SlcExecutionSpec.hbm.xml
+				</value>
+				<value>
+					org/argeo/slc/hibernate/runtime/SlcAgentDescriptor.hbm.xml
+				</value>
+			</list>
+		</property>
+		<property name="cacheProvider" ref="slcDefault.cacheProvider.ehCache" />
+	</bean>
+
+	<bean id="slcDefault.cacheProvider.ehCache" class="net.sf.ehcache.hibernate.SingletonEhCacheProvider"
+		depends-on="slcDefault.cacheProvider.ehCacheManager">
+	</bean>
+
+	<bean id="slcDefault.cacheProvider.ehCacheManager"
+		class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean">
+		<property name="shared" value="true" />
+		<property name="configLocation"
+			value="classpath:/org/argeo/slc/hibernate/cache/ehcache.xml" />
+	</bean>
+<!-- 
+	<bean id="slcDefault.sessionFactory.hibernateTestHSQL" 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.current_session_context_class=thread
+			]]></value>
+		</property>
+	</bean>
+ -->
+	<bean id="slcTemplates.dao.testResultDao"
+		class="org.argeo.slc.hibernate.test.tree.TreeTestResultDaoHibernate"
+		abstract="true">
+	</bean>
+
+	<bean id="slcTemplates.dao.testResultCollectionDao"
+		class="org.argeo.slc.hibernate.test.tree.TreeTestResultCollectionDaoHibernate"
+		abstract="true">
+	</bean>
+
+	<bean id="slcTemplates.dao.testRunDescriptorDao"
+		class="org.argeo.slc.hibernate.test.TestRunDescriptorDaoHibernate"
+		abstract="true">
+	</bean>
+
+	<bean id="slcTemplates.dao.slcExecutionDao"
+		class="org.argeo.slc.hibernate.process.SlcExecutionDaoHibernate"
+		abstract="true">
+	</bean>
+
+	<bean id="slcTemplates.dao.slcAgentDescriptorDao"
+		class="org.argeo.slc.hibernate.runtime.SlcAgentDescriptorDaoHibernate"
+		abstract="true">
+	</bean>
+
+</beans>
\ No newline at end of file
diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..dd0b9fbd5
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF
@@ -0,0 +1,47 @@
+Web-ContextPath: org.argeo.slc.webapp
+Bundle-Name: SLC Webapp
+Bundle-SymbolicName: org.argeo.slc.webapp
+Bundle-Version: 1.0.0
+Bundle-ClassPath: WEB-INF/classes
+Import-Package: javax.servlet,
+ javax.servlet.http,
+ javax.servlet.resources,
+ javax.servlet.jsp,
+ javax.servlet.jsp.jstl.core,
+ javax.servlet.jsp.jstl.fmt,
+ javax.servlet.jsp.jstl.tlv,
+ org.apache.taglibs.standard.resources,
+ org.apache.taglibs.standard.tag.common.core,
+ org.apache.taglibs.standard.tag.rt.core,
+ org.apache.taglibs.standard.tei,
+ org.apache.taglibs.standard.tlv,
+ org.aopalliance.aop,
+ org.springframework.aop,
+ org.springframework.aop.framework,
+ org.springframework.osgi.web.context.support,
+ org.springframework.web.context,
+ org.springframework.web.util,
+ org.apache.naming.java,
+ com.sun.xml.messaging.saaj.soap
+Require-Bundle: org.argeo.slc.server,
+ org.argeo.slc.specs,
+ org.argeo.slc.support.simple,
+ org.argeo.slc.support.activemq,
+ org.springframework.web,
+ org.springframework.web.servlet,
+ org.springframework.orm,
+ org.springframework.jms,
+ org.springframework.oxm,
+ org.springframework.ws,
+ org.springframework.xml,
+ org.springframework.jdbc,
+ org.springframework.context,
+ org.springframework.context.support,
+ com.springsource.org.castor,
+ com.springsource.net.sf.ehcache,
+ com.springsource.org.hsqldb,
+ com.springsource.org.hibernate,
+ org.argeo.dep.osgi.activemq,
+ com.springsource.org.apache.camel,
+ com.springsource.org.mortbay.util
+ 
\ 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
new file mode 100644
index 000000000..61b8a81c0
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/applicationContext.xml
@@ -0,0 +1,98 @@
+<?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">
+	<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>
+	
+
+	<!--
+		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" />
+	</bean>
+-->
+
+	<!--  Properties -->
+	<bean
+		class="org.springframework.web.context.support.ServletContextPropertyPlaceholderConfigurer"
+		lazy-init="false">
+		<property name="contextOverride" value="true" />
+		<property name="properties">
+			<props>
+				<prop key="sessionFactoryParentBean">
+					slcServerDefault.sessionFactory.HSQL
+                </prop>
+			</props>
+		</property>
+		<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/classes/log4j.properties b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/classes/log4j.properties
new file mode 100644
index 000000000..34f682a8a
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/classes/log4j.properties
@@ -0,0 +1,35 @@
+# Set root logger level to DEBUG and its only appender to A1.
+log4j.rootLogger=WARN, console
+
+## Levels
+# Slc
+log4j.logger.org.argeo.slc=DEBUG
+
+# Spring
+log4j.logger.org.springframework=INFO
+log4j.logger.org.springframework.transaction=WARN
+log4j.logger.org.springframework.orm.hibernate3=WARN
+log4j.logger.org.springframework.orm.hibernate3.HibernateTransactionManager=WARN
+
+# Hibernate
+log4j.logger.org.hibernate=WARN
+log4j.logger.org.hibernate.stat=INFO
+log4j.logger.org.hibernate.SQL=WARN
+log4j.logger.org.hibernate.transaction=WARN
+#log4j.logger.org.hibernate.tool.hbm2ddl=TRACE
+#log4j.logger.org.hibernate.type=TRACE
+
+# Active MQ
+log4j.logger.org.apache.activemq.web.MessageListenerServlet=WARN
+
+# EhCache
+log4j.logger.net.sf.ehcache=WARN
+
+## Appenders
+# A1 is set to be a ConsoleAppender.
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+
+# A1 uses PatternLayout.
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c%n
+
diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/doc-servlet.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/doc-servlet.xml
new file mode 100644
index 000000000..3b1714fcc
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/doc-servlet.xml
@@ -0,0 +1,10 @@
+<?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"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-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/slc-doc-servlet.xml" />
+
+</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
new file mode 100644
index 000000000..6426dc9b7
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/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">
+
+	<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" />
+
+	<reference interface="org.hibernate.SessionFactory"
+		id="sessionFactory" />
+
+</beans:beans>
\ No newline at end of file
diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/slc-service-servlet.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/slc-service-servlet.xml
new file mode 100644
index 000000000..11ae5380d
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/slc-service-servlet.xml
@@ -0,0 +1,9 @@
+<?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"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-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/slc-service-servlet.xml" />
+</beans>
\ No newline at end of file
diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/slc-ws-servlet.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/slc-ws-servlet.xml
new file mode 100644
index 000000000..18dce9a8a
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/slc-ws-servlet.xml
@@ -0,0 +1,7 @@
+<?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/server/spring/slc-ws-servlet.xml"/>
+</beans>
\ No newline at end of file
diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/web.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/web.xml
new file mode 100644
index 000000000..ef74dca19
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/web.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+	version="2.5">
+
+	<display-name>SLC Web Application</display-name>
+
+	<!-- SERVICE servlet -->
+	<servlet>
+		<servlet-name>slc-service</servlet-name>
+		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+		<init-param>
+			<param-name>contextClass</param-name>
+			<param-value>org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext</param-value>
+		</init-param>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>slc-service</servlet-name>
+		<url-pattern>*.service</url-pattern>
+	</servlet-mapping>
+
+	<!-- WS servlet -->
+	<servlet>
+		<servlet-name>slc-ws</servlet-name>
+		<servlet-class>
+			org.springframework.ws.transport.http.MessageDispatcherServlet</servlet-class>
+		<init-param>
+			<param-name>contextClass</param-name>
+			<param-value>org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext</param-value>
+		</init-param>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>slc-ws</servlet-name>
+		<url-pattern>/slcService/*</url-pattern>
+	</servlet-mapping>
+
+	<!-- XSLT servlet -->
+	<servlet>
+		<servlet-name>xslt</servlet-name>
+		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+		<init-param>
+			<param-name>contextClass</param-name>
+			<param-value>org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext</param-value>
+		</init-param>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>xslt</servlet-name>
+		<url-pattern>*.xslt</url-pattern>
+	</servlet-mapping>
+
+	<!-- DOC servlet -->
+	<servlet>
+		<servlet-name>doc</servlet-name>
+		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+		<init-param>
+			<param-name>contextClass</param-name>
+			<param-value>org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext</param-value>
+		</init-param>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>doc</servlet-name>
+		<url-pattern>*.xls</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>doc</servlet-name>
+		<url-pattern>*.pdf</url-pattern>
+	</servlet-mapping>
+
+	<!-- General -->
+	<context-param>
+		<param-name>contextConfigLocation</param-name>
+		<param-value>/WEB-INF/applicationContext.xml</param-value>
+	</context-param>
+
+	<listener>
+		<display-name>Spring Context</display-name>
+		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+	</listener>
+	<context-param>
+		<param-name>contextClass</param-name>
+		<param-value>org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext</param-value>
+	</context-param>
+
+	<!-- Env refs
+	<resource-env-ref>
+		<resource-env-ref-name>jdbc/mainDs</resource-env-ref-name>
+		<resource-env-ref-type>javax.sql.DataSource</resource-env-ref-type>
+	</resource-env-ref> -->
+
+	<!-- Log4j configContext loader config -->
+	<listener>
+		<display-name>Log4j</display-name>
+		<listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
+	</listener>
+	<context-param>
+		<param-name>log4jConfigLocation</param-name>
+		<param-value>/WEB-INF/classes/log4j.properties</param-value>
+	</context-param>
+	<context-param>
+		<param-name>log4jRefreshInterval</param-name>
+		<param-value>5000</param-value>
+	</context-param>
+
+
+	<!-- Active MQ -->
+	<context-param>
+		<param-name>org.apache.activemq.brokerURL</param-name>
+		<param-value>vm://localhost</param-value>
+	</context-param>
+
+	<context-param>
+		<param-name>org.apache.activemq.embeddedBroker</param-name>
+		<param-value>false</param-value>
+	</context-param>
+
+	<servlet>
+		<servlet-name>MessageListenerServlet</servlet-name>
+		<servlet-class>org.apache.activemq.web.MessageListenerServlet</servlet-class>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>MessageListenerServlet</servlet-name>
+		<url-pattern>/amq/*</url-pattern>
+	</servlet-mapping>
+
+	<filter>
+		<filter-name>session</filter-name>
+		<filter-class>org.apache.activemq.web.SessionFilter</filter-class>
+	</filter>
+
+	<filter-mapping>
+		<filter-name>session</filter-name>
+		<url-pattern>/amq/*</url-pattern>
+	</filter-mapping>
+</web-app>
diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/xslt-servlet.xml b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/xslt-servlet.xml
new file mode 100644
index 000000000..ddfd925ce
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/xslt-servlet.xml
@@ -0,0 +1,29 @@
+<?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"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-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/slc-xslt-servlet.xml" />
+
+	<bean name="/resultView.xslt"
+		class="org.argeo.slc.web.mvc.result.GetResultController">
+		<constructor-arg ref="testResultDao" />
+		<property name="viewName" value="resultView" />
+	</bean>
+
+	<bean name="/resultViewXml.xslt"
+		class="org.argeo.slc.web.mvc.result.GetResultController">
+		<constructor-arg ref="testResultDao" />
+		<property name="viewName" value="viewXml" />
+	</bean>
+
+	<bean name="/resultCollectionViewXml.xslt"
+		class="org.argeo.slc.web.mvc.result.GetResultCollectionController">
+		<constructor-arg ref="testResultCollectionDao" />
+		<property name="viewName" value="viewXml" />
+	</bean>
+
+
+</beans>
\ No newline at end of file
diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/xslt/resultView.xsl b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/xslt/resultView.xsl
new file mode 100644
index 000000000..e9989bdbe
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/xslt/resultView.xsl
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0"
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	xmlns:slc="http://argeo.org/projects/slc/schemas"
+	exclude-result-prefixes="slc">
+
+	<xsl:output method="html" omit-xml-declaration="yes" />
+	
+
+	<xsl:template match="/">
+		<html>
+			<head>
+				<title>Result</title>
+			</head>
+			<body style="font-family: sans-serif">
+				<h1>
+					Result
+					<xsl:value-of select="slc:tree-test-result/@uuid" />
+				</h1>
+				<xsl:for-each
+					select="slc:tree-test-result/slc:result-parts/slc:result-part">
+					<h2>
+						<xsl:value-of select="@path" />
+					</h2>
+					<table>
+						<xsl:for-each
+							select="slc:part-sub-list/slc:parts/slc:simple-result-part">
+							<tr>
+								<xsl:choose>
+									<xsl:when
+										test="slc:status = 'PASSED' ">
+										<td style="color:green">
+											<xsl:value-of
+												select="slc:message" />
+										</td>
+									</xsl:when>
+									<xsl:otherwise>
+										<td style="color:red">
+											<xsl:value-of
+												select="slc:message" />
+										</td>
+									</xsl:otherwise>
+								</xsl:choose>
+							</tr>
+						</xsl:for-each>
+					</table>
+				</xsl:for-each>
+			</body>
+		</html>
+	</xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/xslt/viewXml.xsl b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/xslt/viewXml.xsl
new file mode 100644
index 000000000..87d63716f
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/WEB-INF/xslt/viewXml.xsl
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0"
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	xmlns:slc="http://argeo.org/projects/slc/schemas"
+	exclude-result-prefixes="slc">
+
+	<xsl:template match="/">
+		<xsl:copy-of select="*"/>
+	</xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/index.jsp b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/index.jsp
new file mode 100644
index 000000000..1c9726909
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/index.jsp
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<%@ page language="java" contentType="text/html"%>
+<%
+response.sendRedirect("argeo-ria/index.html");
+%>
diff --git a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/style.css b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/style.css
new file mode 100644
index 000000000..102b4eea1
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/style.css
@@ -0,0 +1,174 @@
+/* Generic Selectors */
+body {
+	font-family: sans-serif;
+	font-size: 12px;
+	color: black;
+	background-color: white;
+}
+
+li {
+	list-style-type: none;
+}
+
+h1 {
+	font-family: sans-serif;
+	font-size: 16px;
+	font-weight: bold;
+	color: #000000;
+	padding: 0px 0px 5px 0px;
+	margin: 0px;
+}
+
+h2 {
+	font-family: sans-serif;
+	font-size: 14px;
+	font-weight: bold;
+	color: #000000;
+	padding: 5px 0px 5px 0px;
+	margin: 0px;
+	margin-top: 5px;
+}
+
+/* Special titles */
+h3.executionStep{
+	font-family: sans-serif;
+	font-size: 10px;
+	font-style: italic;
+	color: #000000;
+	padding: 5px 0px 5px 0px;
+	margin: 0px;
+	margin-top: 5px;
+}
+
+table,form {
+	margin: 0px;
+}
+
+img {
+	border: none;
+}
+
+div {
+	font-size: 100%;
+}
+
+tr.list:hover {
+	background-color: lightgrey;
+}
+
+td.list {
+	border-top: 1px solid lighgrey;
+	padding: 2px 20px 2px 2px;
+	padding-right: 15px;
+}
+
+th {
+	font-size: 12px;
+	padding: 2px 20px 2px 2px;
+	vertical-align: top;
+	text-align: left;
+}
+
+td {
+	font-size: 12px;
+	padding: 1px;
+	vertical-align: middle;
+	text-align: left;
+}
+
+.passed {
+	color: green;
+}
+
+.failed {
+	color: red;
+}
+
+.error {
+	color: purple;
+}
+
+/**************** Navigation ****************/
+td.nav1 {
+	padding: 5px 0px 0px 0px;
+	font-size: 12px;
+	font-weight: bold;
+}
+
+td.nav2 {
+	padding: 0px 0px 0px 5px;
+	font-size: 12px;
+}
+
+/**************** Forms ****************/
+input.submit {
+	border: solid 1px grey;
+	background-color: lightgrey;
+	align: right;
+}
+
+input.submit:hover {
+	border: solid 1px #3399FF;
+	background-color: white;
+	color: #3399FF;
+}
+
+input.std {
+	border: solid 1px lightgrey;
+	padding: 1px;
+	margin: 2px;
+}
+
+.formError {
+	color: red;
+	padding: 1px;
+	margin: 2px;
+	font-weight: bold;
+}
+
+/**************** Pseudo classes ****************/
+a:link {
+	color: #0066CC;
+	text-decoration: none;
+}
+
+a:visited {
+	color: #0066CC;
+	text-decoration: none;
+}
+
+a:hover {
+	color: #3399FF;
+	text-decoration: none;
+}
+
+/************************* ID's *************************/
+#main {
+	position: absolute;
+	margin-left: 120px;
+	padding-top: 110px;
+}
+
+#navigation {
+	position: absolute;
+	width: 100px;
+	height: 800px;
+	border-right: 1px solid #0066CC;
+	font-weight: normal;
+	margin-top: 110px;
+	margin-left: 10px;
+}
+
+#banner {
+	position: absolute;
+	width: 400px;
+	height: 100px;
+}
+
+#upperRight {
+	position: absolute;
+	top: 0;
+	right: 0;
+	margin-top: 20px;
+	margin-right: 10px;
+}
\ No newline at end of file
diff --git a/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/META-INF/MANIFEST.MF b/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..a6623f905
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/META-INF/MANIFEST.MF
@@ -0,0 +1,19 @@
+Manifest-Version: 1.0
+Archiver-Version: Plexus Archiver
+Created-By: Apache Maven
+Built-By: mbaudier
+Build-Jdk: 1.6.0_0
+Web-ContextPath: simple-web-app
+Bundle-ManifestVersion: 2
+Bundle-Name: Simple OSGi War
+Bundle-SymbolicName: org.springframework.osgi.samples.simplewebapp
+Bundle-ClassPath: WEB-INF/classes
+Import-Package: javax.servlet,javax.servlet.http,
+ javax.servlet.resources,javax.servlet.jsp,
+ javax.servlet.jsp.jstl.core,javax.ser
+ vlet.jsp.jstl.fmt,javax.servlet.jsp.jstl.tlv,
+ org.apache.taglibs.standard.resources,org.apa
+ che.taglibs.standard.tag.common.core,org.apache.tagli
+ bs.standard.tag.rt.core,org.apache.taglibs.standard.t
+ ei,org.apache.taglibs.standard.tlv
+
diff --git a/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/WEB-INF/classes/log4j.properties b/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/WEB-INF/classes/log4j.properties
new file mode 100644
index 000000000..92f4b2541
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/WEB-INF/classes/log4j.properties
@@ -0,0 +1,9 @@
+log4j.rootCategory=WARN, stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout.ConversionPattern=%t %p [%c{2}] - %m%n
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.threshold=TRACE
+
+
+log4j.logger.org.springframework.osgi=INFO
+#log4j.logger.org.springframework=TRACE
diff --git a/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/WEB-INF/classes/org/springframework/osgi/samples/simplewebapp/servlet/HelloOsgiWorldServlet.class b/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/WEB-INF/classes/org/springframework/osgi/samples/simplewebapp/servlet/HelloOsgiWorldServlet.class
new file mode 100644
index 000000000..47bb07348
Binary files /dev/null and b/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/WEB-INF/classes/org/springframework/osgi/samples/simplewebapp/servlet/HelloOsgiWorldServlet.class differ
diff --git a/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/WEB-INF/classes/org/springframework/osgi/samples/simplewebapp/servlet/HelloOsgiWorldServlet.java b/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/WEB-INF/classes/org/springframework/osgi/samples/simplewebapp/servlet/HelloOsgiWorldServlet.java
new file mode 100644
index 000000000..af46db504
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/WEB-INF/classes/org/springframework/osgi/samples/simplewebapp/servlet/HelloOsgiWorldServlet.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2006-2008 the original author or authors.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.osgi.samples.simplewebapp.servlet;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * A simple, "hellow world" service running inside OSGi.
+ * 
+ * @author Costin Leau
+ * 
+ */
+public class HelloOsgiWorldServlet extends HttpServlet {
+
+	protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+		addHelloWorld(resp, req.getMethod());
+	}
+
+	protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+		addHelloWorld(resp, req.getMethod());
+	}
+
+	public String getServletInfo() {
+		return "Simple Osgi World Servlet";
+	}
+
+	private void addHelloWorld(HttpServletResponse response, String method) throws IOException {
+		response.setContentType("text/html");
+
+		ServletOutputStream out = response.getOutputStream();
+		out.println("<html>");
+		out.println("<head><title>Hello Osgi World</title></head>");
+		out.println("<body>");
+		out.println("<h1>Hello OSGi World</h1>");
+		out.println("<h2>http method used:" + method + "</h2>");
+		out.println("</body></html>");
+	}
+}
diff --git a/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/WEB-INF/classes/org/springframework/osgi/samples/simplewebapp/servlet/ResourceServingServlet.class b/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/WEB-INF/classes/org/springframework/osgi/samples/simplewebapp/servlet/ResourceServingServlet.class
new file mode 100644
index 000000000..54b531279
Binary files /dev/null and b/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/WEB-INF/classes/org/springframework/osgi/samples/simplewebapp/servlet/ResourceServingServlet.class differ
diff --git a/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/WEB-INF/classes/org/springframework/osgi/samples/simplewebapp/servlet/ResourceServingServlet.java b/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/WEB-INF/classes/org/springframework/osgi/samples/simplewebapp/servlet/ResourceServingServlet.java
new file mode 100644
index 000000000..8e7db7532
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/WEB-INF/classes/org/springframework/osgi/samples/simplewebapp/servlet/ResourceServingServlet.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright 2006-2008 the original author or authors.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.osgi.samples.simplewebapp.servlet;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.TreeSet;
+
+import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * Simple servlet that serves resources from its war.
+ * 
+ * @author Costin Leau
+ * 
+ */
+public class ResourceServingServlet extends HttpServlet {
+
+	private static final String SLASH = "/";
+	private static final String RESOURCE_PARAM = "resource";
+
+
+	protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+		serveResource(req, resp);
+	}
+
+	protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+		serveResource(req, resp);
+	}
+
+	public String getServletInfo() {
+		return "Resource Serving Servlet";
+	}
+
+	private void serveResource(HttpServletRequest request, HttpServletResponse response) throws IOException {
+
+		ServletOutputStream out = response.getOutputStream();
+
+		String resourceName = request.getParameter(RESOURCE_PARAM);
+		if (resourceName == null || resourceName.trim().length() < 1) {
+			out.println("No resource specified, returning the list of available resources...");
+			listAvailableResources(response);
+		}
+
+		else {
+
+			if (!resourceName.startsWith(SLASH))
+				resourceName = SLASH + resourceName;
+
+			URL sourceURL = getServletContext().getResource(resourceName);
+
+			if (sourceURL == null) {
+				out.println("Resource [" + resourceName + "] not found, returning the list of available resources...");
+				listAvailableResources(response);
+			}
+			else {
+				URLConnection connection = sourceURL.openConnection();
+				connection.setUseCaches(false);
+				response.setContentLength(connection.getContentLength());
+				response.setContentType(connection.getContentType());
+				sendStreamToClient(connection.getInputStream(), out);
+			}
+		}
+		out.close();
+	}
+
+	private void listAvailableResources(HttpServletResponse response) throws IOException {
+		Set sortedResources = new TreeSet();
+
+		discoverFolderContent(sortedResources, SLASH);
+		response.setContentType("text/plain");
+		ServletOutputStream out = response.getOutputStream();
+		for (Iterator iterator = sortedResources.iterator(); iterator.hasNext();) {
+			out.println((String) iterator.next());
+		}
+	}
+
+	private void discoverFolderContent(Set aggregatedContent, String path) {
+		Set resources = getServletContext().getResourcePaths(path);
+		for (Iterator resourceIterator = resources.iterator(); resourceIterator.hasNext();) {
+			String resource = (String) resourceIterator.next();
+			aggregatedContent.add(resource);
+			if (resource.endsWith(SLASH)) {
+				// recursively add folder
+				discoverFolderContent(aggregatedContent, resource);
+			}
+		}
+	}
+
+	/**
+	 * Copies the bytes from one {@link InputStream} to an {@link OutputStream}.
+	 * 
+	 * @param source
+	 * @param target
+	 * @throws IOException
+	 */
+	private void sendStreamToClient(InputStream source, OutputStream target) throws IOException {
+		try {
+			int i;
+			while ((i = source.read()) != -1)
+				target.write(i);
+			target.flush();
+		}
+		finally {
+			source.close();
+		}
+	}
+}
diff --git a/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/WEB-INF/web.xml b/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/WEB-INF/web.xml
new file mode 100644
index 000000000..3fb0b6a8c
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/WEB-INF/web.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+	version="2.4">
+
+	<display-name>Simple Osgi WebApp Bundle</display-name>
+	<description>Simple OSGi War</description>
+
+	<welcome-file-list>
+		<welcome-file>index.html</welcome-file>
+	</welcome-file-list>
+
+	<servlet>
+		<servlet-name>HelloOsgiWorldServlet</servlet-name>
+		<servlet-class>
+			org.springframework.osgi.samples.simplewebapp.servlet.HelloOsgiWorldServlet
+		</servlet-class>
+	</servlet>
+
+	<servlet>
+		<servlet-name>ResourceServlet</servlet-name>
+		<servlet-class>
+			org.springframework.osgi.samples.simplewebapp.servlet.ResourceServingServlet
+		</servlet-class>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>HelloOsgiWorldServlet</servlet-name>
+		<url-pattern>/helloWorldServlet</url-pattern>
+	</servlet-mapping>
+
+	<servlet-mapping>
+		<servlet-name>ResourceServlet</servlet-name>
+		<url-pattern>/resourceServlet</url-pattern>
+	</servlet-mapping>
+	
+</web-app>
diff --git a/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/hello-osgi-world.jsp b/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/hello-osgi-world.jsp
new file mode 100644
index 000000000..10f396e16
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/hello-osgi-world.jsp
@@ -0,0 +1,52 @@
+<%@ page info="a hello world example" %>
+<%@ page import="java.util.*,java.text.*"%>
+
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+	<link rel="stylesheet" href="styles/springsource.css" type="text/css" />
+	<title>Hello OSGi World</title>
+</head>
+
+<body>
+<div id="main_wrapper">
+<h1>Hello <%=request.getRemoteAddr()%>, from OSGi World!</h1>
+<p>This JSP page (if properly compiled), should display various information about the current HTTP session.
+
+  <h2>HTTP Session info</h2>
+  
+  <% 
+  	Format formatter = DateFormat.getDateTimeInstance();
+  %>
+  
+  <table>
+    <tr><td>Id: </td><td><%=session.getId()%></td></tr>
+    <tr><td>Creation Date:</td><td><%=formatter.format(new Date(session.getCreationTime()))%></td></tr>
+    <tr><td>MaxInactiveInterval:</td><td><%=session.getMaxInactiveInterval()%> sec </td></tr>
+  </table>
+  <h3>Session Attributes</h3>
+  <table>
+      <tr><th>Name</th><th>Value</th></tr>
+      
+      <%
+         for (Enumeration attributeNames = session.getAttributeNames(); attributeNames.hasMoreElements();) {
+			  String attributeName = (String) attributeNames.nextElement();
+			  Object attributeValue = session.getAttribute(attributeName);
+      %>
+      <tr><td><%=attributeName%></td><td><%=attributeValue%></td></tr>
+      
+      <%
+         }
+      %>
+  </table>
+  
+  <table class="footer">
+    <tr>
+      <td><a href="./">Home</a></td>
+      <td align="right"><img src="./images/springsource-logo.png"/></td>
+	</tr>
+  </table>
+
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/images/bullet.gif b/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/images/bullet.gif
new file mode 100644
index 000000000..5909c25b3
Binary files /dev/null and b/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/images/bullet.gif differ
diff --git a/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/images/springsource-logo.png b/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/images/springsource-logo.png
new file mode 100644
index 000000000..e170f8abf
Binary files /dev/null and b/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/images/springsource-logo.png differ
diff --git a/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/images/springsource_banner.png b/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/images/springsource_banner.png
new file mode 100644
index 000000000..e807f4e1f
Binary files /dev/null and b/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/images/springsource_banner.png differ
diff --git a/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/index.html b/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/index.html
new file mode 100644
index 000000000..b34144cb4
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/index.html
@@ -0,0 +1,110 @@
+<HTML><HEAD><TITLE>Spring-DM Samples: Simple WebApp</TITLE>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="stylesheet" href="styles/springsource.css" type="text/css" />
+<title>Hello OSGi World</title>
+</head>
+
+</HEAD>
+
+<BODY bgColor=white>
+<div id="main_wrapper">
+  <h1>
+  Spring-DM Simple OSGi Web Application
+  </h1>
+
+  <h2>Introduction</h2>
+	This application demonstrates the use of web applications (WARs)
+	inside OSGi through Spring Dynamic Modules.
+	You can view static resources (like this page), servlets and
+	JSPs. The next section describes the dynamic pages available in this WAR.
+ 
+  <h2>Sample content</h2>
+  
+  <p>You can select one of the following links to interact with the servlets and JSPs
+  available in this sample.
+  </p>
+  
+  <h3>Servlets</h3> 
+  
+  The application contains two servlets:
+  <ul>
+	  <li>Hello OSGi World servlet
+	  <p/>
+	  Simply click on the button below (which will send a
+	  a <tt>POST</tt> request to a hello world servlet).
+	  <form action="helloWorldServlet" method="POST">
+		<input type="submit" value="Call Hello World Servlet"/>
+	  </form>
+    </li>
+    <li>
+      A OSGi content serving servlet
+      
+      <p/> The servlet sends to the browser
+      the raw content of resources found inside the bundle. This main usage of this servlet
+      is to see, direclty from the web application, the servlet and JSP <a href="#sources">sources</a>.
+
+	  <!--
+      <h4>Tip</h4>
+            
+      The Content Servlet can serve <i>any</i> resource from the OSGi space through Spring-DM
+	  Spring-DM <tt>ResourceLoader</tt>. If no prefix is specified, resources are resolved from
+	  the servlet own bundle. However, by using <tt>classpath:</tt>, <tt>osgibundlejar:</tt> you can get access to the other <i>spaces</i>
+	  defined by OSGi (for more information, see OsgiBundleResourceLoader <a href="http://static.springframework.org/osgi/docs/current/api/org/springframework/osgi/io/OsgiBundleResourceLoader.html">javadoc</a>).
+	  <br/>
+	  
+	  <form action="contentServlet" method="GET">
+	    <input type="
+		<input type="submit" value="Get resource">
+	  </form>
+	  -->
+	  
+    </li>
+  </ul>
+  
+  <h3>Java Server Pages</h3>
+  The sample application provides two types of Java Server Pages:
+  <ul>
+     <li>A <a href="hello-osgi-world.jsp">bare-bone</a> page that accesses the session</li>
+     <li>A <a href="jsp-tag-osgi-world.jsp">tag-based</a> page that uses the standard taglib </li>
+  </ul>
+  
+ 
+  <p/>
+  While the servlets/pages are simplistic, they show the main functionality working inside an OSGi platform.
+  
+  <h2>Sources</h2><a name="sources"> </a>
+  To view the Servlet and JSP sources directly from the browser, use one of the links above. The content itself
+  is served through a Servlet (the Content Servlet below) that sends to the browser the content of the files 
+  found in its bundle classpath.
+  
+  <ul>
+	<li><a href="./resourceServlet?resource=/WEB-INF/classes/org/springframework/osgi/samples/simplewebapp/servlet/HelloOsgiWorldServlet.java">Hello World Servlet</a></li>
+	<li><a href="./resourceServlet?resource=/WEB-INF/classes/org/springframework/osgi/samples/simplewebapp/servlet/ResourceServingServlet.java">Resource Serving Servlet</a></li>
+	<li><a href="./resourceServlet?resource=/hello-osgi-world.jsp">bare-bone JSP</a></li>
+	<li><a href="./resourceServlet?resource=/jsp-tag-osgi-world.jsp">tag-based JSP</a></li>
+	<li><a href="./resourceServlet?resource=/WEB-INF/web.xml">Web application <tt>web.xml</tt></a></li>
+	<li><a href="./resourceServlet?resource=">WAR OSGi bundle content</a></li>
+  </ul>
+  
+  <h2>Requirements</h2> 
+  
+  This sample requires:
+  <ul>
+    <li>an OSGi 4.0+ platform</li>
+    <li>Spring-DM 1.1 + dependencies</li>
+    <li>Apache Tomcat 5.5.x+</li>
+    <li>Apache Jasper 2 Engine </li>
+  </ul>
+  
+  Note that all the dependencies are automatically downloaded when running the sample.
+  
+  <table class="footer">
+    <tr>
+      <td><a href="./">Home</a></td>
+      <td align="right"><img src="./images/springsource-logo.png"/></td>
+	</tr>
+  </table>
+ 
+</div>
+</BODY>
+</HTML>
\ No newline at end of file
diff --git a/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/jsp-tag-osgi-world.jsp b/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/jsp-tag-osgi-world.jsp
new file mode 100644
index 000000000..cf27a1478
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/jsp-tag-osgi-world.jsp
@@ -0,0 +1,52 @@
+<%@ page info="an OSGi JSP page with taglibs" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+	<link rel="stylesheet" href="styles/springsource.css" type="text/css" />
+	<title>Hello OSGi World</title>
+</head>
+
+<body>
+<div id="main_wrapper">
+<h1>JSP taglibs page</h1>
+
+<p>This JSP page uses the standard JSTL <a href="http://java.sun.com/jsp/jstl/core">core</a> taglib to display 
+the information about the user request. Since the WAR is deployed as an OSGi bundle, the taglib does not have to 
+be nested inside the WAR and can be deployed, as a stand alone bundle which is then imported.
+
+<h2>Browser Information</h2>
+<c:out value="${header['User-Agent']}"/>
+
+<h2>Header info:</h2>
+
+ <table>
+    <tr>
+    	<th>Name</th>
+    	<th>Value</th>
+    </tr>
+	<c:forEach var="head" items="${headerValues}">
+	  <tr>
+	  <td><c:out value="${head.key}"/></td>
+	  <c:forEach var="val" items="${head.value}">
+	  <td>
+	     <c:out value="${val}"/>
+	  </td>
+	  </c:forEach>
+	  </tr>
+	</c:forEach>
+  </table>
+  
+  
+  <table class="footer">
+    <tr>
+      <td><a href="./">Home</a></td>
+      <td align="right"><img src="./images/springsource-logo.png"/></td>
+	</tr>
+  </table>
+
+</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/styles/springsource.css b/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/styles/springsource.css
new file mode 100644
index 000000000..1757cdba2
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/bundles/simple-webapp.war/styles/springsource.css
@@ -0,0 +1,154 @@
+body, div, td {
+  font-family:Arial, Helvetica, sans-serif;
+  font-size:12px;
+  color:#666;
+}
+
+body {
+  background-color: #fff;
+  background-image: url(../images/springsource_banner.png);
+  background-position: top center;
+  background-repeat: no-repeat;
+  text-align:center;
+  min-width:600px;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+h1{
+  font-family:Helvetica, sans-serif;
+  color:#7db223;
+  font-size:20px;
+  line-height:40px;
+}
+
+h2{
+  font-family:Helvetica, sans-serif;
+  color:#7db223;
+  font-size:18px;
+  line-height:36px;
+}
+
+h3{
+  font-family:Helvetica, sans-serif;
+  color:#7db223;
+  font-size:15px;
+  line-height:32px;
+}
+
+a:link{color:#7db223; text-decoration:underline; font-size:13px;}
+a:hover{color:#456314; text-decoration:underline; font-size:13px;}
+a:active{color:#7db223; text-decoration:underline; font-size:13px;}
+a:visited{color:#7db223; text-decoration:underline; font-size:13px;}
+
+ul {
+  list-style: disc url(../images/bullet.gif);
+}
+
+li {
+  padding-top:5px;
+}
+
+li ul {
+  list-style: square url(images/sub-bullet.gif);
+}
+
+li ul li ul {
+  list-style: circle none;
+}
+
+#main_wrapper {
+  margin:0 auto;
+  position:relative;
+  top: 85px;
+  left:20px;
+  width:600px;
+  text-align:left;
+}
+
+table {
+  background:#e0e7d3;
+  margin: 0;
+  border: 4px solid #e0e7d3;
+  border-collapse: collapse;
+}
+
+table table {
+  margin: -5px 0;
+  border: 0px solid #e0e7d3;
+  width:100%;
+}
+
+table td, table th {
+  padding:8px;
+}
+
+table th {
+  font-size:12px;
+  text-align: left;
+  font-weight: bold;
+}
+
+table thead {
+  font-weight:bold;
+  font-style:italic;
+  background-color:#c9d3b8;
+}
+
+caption { 
+  caption-side: top; 
+  width: auto;
+  text-align: left;
+  font-size:12px;
+  color:#848f73;
+  padding-bottom:4px;
+}
+
+
+fieldset {
+  background:#e0e7d3;
+  padding:8px;
+  padding-bottom:22px;
+  border: none;
+  width:560px;
+}
+
+fieldset label {
+  width:70px;
+  float:left;
+  margin-top:1.7em;
+  margin-left:20px;
+}
+
+fieldset textfield {
+  margin:3px;
+  height:20px; 
+  background:#e4eadb;
+}
+
+fieldset textarea {
+  margin:3px;
+  height:165px;
+  background:#e4eadb;
+}
+
+fieldset input {
+  margin:3px;
+  height:20px;
+  background:#e4eadb;
+}
+
+fieldset table{width:100%;}
+fieldset th{padding-left:25px;}
+
+.footer {
+	background:#fff;
+	border:none;
+	margin-top:20px;
+	border-top:1px solid #999999;
+	width:100%;
+}
+
+.footer td {color:#999999;}
+
+.footer a:link {color: #7db223;}
\ 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 0d0a10979..28e3c033c 100644
--- a/server/org.argeo.slc.siteserver/pom.xml
+++ b/server/org.argeo.slc.siteserver/pom.xml
@@ -10,6 +10,10 @@
 	<artifactId>org.argeo.slc.siteserver</artifactId>
 	<packaging>pom</packaging>
 	<name>Argeo SLC Site server</name>
+	<properties>
+		<spring-osgi.version>1.1.3</spring-osgi.version>
+		<spring.version>2.5.5</spring.version>
+	</properties>
 	<build>
 		<plugins>
 			<plugin>
@@ -45,18 +49,264 @@
 
 				</configuration>
 			</plugin>
+
+			<plugin>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<configuration>
+					<tasks>
+						<property name="xmlcommons.jar"
+							location="${settings.localRepository}/org/apache/xmlcommons/com.springsource.org.apache.xmlcommons/1.3.3/com.springsource.org.apache.xmlcommons-1.3.3.jar" />
+						<property name="xerces.jar"
+							location="${settings.localRepository}/org/apache/xerces/com.springsource.org.apache.xerces/2.8.1/com.springsource.org.apache.xerces-2.8.1.jar" />
+						<property name="xalan.jar"
+							location="${settings.localRepository}/org/apache/xalan/com.springsource.org.apache.xalan/2.7.0/com.springsource.org.apache.xalan-2.7.0.jar" />
+
+						<echo message="${xmlcommons.jar}" />
+						<echo message="${xerces.jar}" />
+						<echo message="${xalan.jar}" />
+
+						<property name="bundles.dir" location="bundles" />
+
+						<java classname="org.argeo.slc.detached.launcher.Main" fork="true"
+							dir="exec" jvm="${java.home}/bin/java">
+							<jvmarg
+								value="-Xbootclasspath/p:${xmlcommons.jar}${path.separator}${xerces.jar}${path.separator}${xalan.jar}" />
+							<classpath>
+								<path refid="maven.compile.classpath" />
+							</classpath>
+							<sysproperty key="slc.osgi.scanClasspath" value="true" />
+							<sysproperty key="slc.osgi.start" value="*" />
+							<sysproperty key="slc.osgi.devbundle.logging"
+								value="reference:file:${bundles.dir}/logging" />
+							<sysproperty key="slc.osgi.devbundle.simple-webapp"
+								value="reference:file:${bundles.dir}/simple-webapp.war" />
+							<sysproperty key="slc.osgi.devbundle.org.argeo.slc.webapp"
+								value="reference:file:${bundles.dir}/org.argeo.slc.webapp.war" />
+							<sysproperty key="slc.osgi.devbundle.org.argeo.slc.server.hibernate"
+								value="reference:file:${bundles.dir}/org.argeo.slc.server.hibernate" />
+							<sysproperty key="slc.osgi.devbundle.org.argeo.slc.server.activemq"
+								value="reference:file:${bundles.dir}/org.argeo.slc.server.activemq" />
+							<sysproperty
+								key="slc.osgi.devbundle.com.springsource.org.objectweb.asm."
+								value="reference:file:${settings.localRepository}/org/objectweb/asm/com.springsource.org.objectweb.asm/2.2.0/com.springsource.org.objectweb.asm-2.2.0.jar" />
+							<sysproperty
+								key="slc.osgi.devbundle.com.springsource.org.objectweb.asm.attrs"
+								value="reference:file:${settings.localRepository}/org/objectweb/asm/com.springsource.org.objectweb.asm.attrs/1.5.3/com.springsource.org.objectweb.asm.attrs-1.5.3.jar" />
+						</java>
+					</tasks>
+				</configuration>
+			</plugin>
+
+
 		</plugins>
 	</build>
 	<dependencies>
+		<!--
+			<dependency> <groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.webapp</artifactId> <type>war</type>
+			</dependency> <dependency> <groupId>org.apache.archiva</groupId>
+			<artifactId>archiva-webapp</artifactId> <type>war</type>
+			</dependency>
+		-->
+
+		<!--  OSGI TESTS -->
+
 		<dependency>
-			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.webapp</artifactId>
-			<type>war</type>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.server</artifactId>
+		</dependency>
+
+
+		<dependency>
+			<groupId>org.hsqldb</groupId>
+			<artifactId>com.springsource.org.hsqldb</artifactId>
+		</dependency>
+
+		<!-- OSGi integration -->
+		<dependency>
+			<groupId>org.eclipse.osgi</groupId>
+			<artifactId>org.eclipse.osgi</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>javax.annotation</groupId>
+			<artifactId>com.springsource.javax.annotation</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>javax.persistence</groupId>
+			<artifactId>com.springsource.javax.persistence</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>javax.xml.ws</groupId>
+			<artifactId>com.springsource.javax.xml.ws</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>com.springsource.javax.xml.bind</artifactId>
+		</dependency>
+		<!--
+			<dependency> <groupId>org.springframework.osgi</groupId>
+			<artifactId>org.springframework.osgi.web.extender</artifactId>
+			</dependency> <dependency>
+			<groupId>org.springframework.osgi</groupId>
+			<artifactId>org.springframework.osgi.extender</artifactId>
+			</dependency> <dependency>
+			<groupId>org.springframework.osgi</groupId>
+			<artifactId>org.springframework.osgi.web</artifactId> </dependency>
+		-->
+
+		<!--
+			Using springsource repo <dependency>
+			<groupId>org.springframework.osgi</groupId>
+			<artifactId>org.springframework.osgi.web.extender</artifactId>
+			</dependency> <dependency>
+			<groupId>org.springframework.osgi</groupId>
+			<artifactId>org.springframework.osgi.extender</artifactId>
+			</dependency> <dependency>
+			<groupId>org.springframework.osgi</groupId>
+			<artifactId>org.springframework.osgi.web</artifactId> </dependency>
+			<dependency> <groupId>org.apache.catalina</groupId>
+			<artifactId>com.springsource.org.apache.catalina</artifactId>
+			</dependency> <dependency> <groupId>org.argeo.slc.dep.osgi</groupId>
+			<artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
+			</dependency> <dependency> <groupId>javax.servlet</groupId>
+			<artifactId>com.springsource.javax.servlet.jsp</artifactId>
+			</dependency> <dependency> <groupId>javax.el</groupId>
+			<artifactId>com.springsource.javax.el</artifactId> </dependency>
+			<dependency> <groupId>javax.servlet</groupId>
+			<artifactId>com.springsource.javax.servlet.jsp.jstl</artifactId>
+			</dependency> <dependency> <groupId>org.apache.taglibs</groupId>
+			<artifactId>com.springsource.org.apache.taglibs.standard</artifactId>
+			</dependency>
+		-->
+
+		<!-- Using spring osgi repo -->
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>com.springsource.org.apache.commons.logging</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.log4j</groupId>
+			<artifactId>
+					com.springsource.org.apache.log4j
+				</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.osgi</groupId>
+			<artifactId>catalina.osgi</artifactId>
+			<version>5.5.23-SNAPSHOT</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.osgi</groupId>
+			<artifactId>catalina.start.osgi</artifactId>
+			<version>1.0.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.osgi</groupId>
+			<artifactId>jasper.osgi</artifactId>
+			<version>5.5.23-SNAPSHOT</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.osgi</groupId>
+			<artifactId>commons-el.osgi</artifactId>
+			<version>1.0-SNAPSHOT</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.osgi</groupId>
+			<artifactId>jstl.osgi</artifactId>
+			<version>1.1.2-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.osgi</groupId>
+			<artifactId>servlet-api.osgi</artifactId>
+			<version>2.5-SNAPSHOT</version>
+			<type>jar</type>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.osgi</groupId>
+			<artifactId>jsp-api.osgi</artifactId>
+			<version>2.0-SNAPSHOT</version>
+			<type>jar</type>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.osgi</groupId>
+			<artifactId>spring-osgi-web</artifactId>
+			<version>${spring-osgi.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.osgi</groupId>
+			<artifactId>spring-osgi-web-extender</artifactId>
+			<version>${spring-osgi.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.osgi</groupId>
+			<artifactId>spring-osgi-extender</artifactId>
+			<version>${spring-osgi.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.aopalliance</groupId>
+			<artifactId>com.springsource.org.aopalliance</artifactId>
+			<version>1.0.0</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-web</artifactId>
+			<version>${spring.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.archiva</groupId>
-			<artifactId>archiva-webapp</artifactId>
-			<type>war</type>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+			<version>${spring.version}</version>
 		</dependency>
+
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-webmvc</artifactId>
+			<version>${spring.version}</version>
+		</dependency>
+
+
+		<!-- Required in JDK 1.5 -->
+		<dependency>
+			<groupId>com.sun.xml</groupId>
+			<artifactId>
+				com.springsource.com.sun.xml.messaging.saaj
+				</artifactId>
+		</dependency>
+
+		<!-- For ActiveMQ Ajax -->
+		<dependency>
+			<groupId>org.mortbay.jetty</groupId>
+			<artifactId>com.springsource.org.mortbay.util</artifactId>
+			<version>6.1.9</version>
+		</dependency>
+
+		<!-- To launch OSGi -->
+		<dependency>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.detached.launcher</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
 	</dependencies>
+
+	<repositories>
+		<repository>
+			<id>spring-osgified-artifacts</id>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<name>Springframework Maven OSGified Artifacts Repository</name>
+			<url>http://maven.springframework.org/osgi</url>
+		</repository>
+	</repositories>
 </project>
\ No newline at end of file