From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 4 Mar 2009 18:10:40 +0000 (+0000)
Subject: Integrate demo in web
X-Git-Tag: argeo-slc-2.1.7~2088
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=4810532845c8a54c04a850c7db3a9fe00e8ebc6a;hp=d95951ffda520440eea45647d0d672382e6d8171;p=gpl%2Fargeo-slc.git

Integrate demo in web

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

diff --git a/demo/org.argeo.slc.demo.basic/.classpath b/demo/org.argeo.slc.demo.basic/.classpath
index b5ef387af..624a6cfe1 100644
--- a/demo/org.argeo.slc.demo.basic/.classpath
+++ b/demo/org.argeo.slc.demo.basic/.classpath
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
diff --git a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/basic.xml b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/basic.xml
deleted file mode 100644
index a513e3f4f..000000000
--- a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/basic.xml
+++ /dev/null
@@ -1,65 +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:p="http://www.springframework.org/schema/p"
-	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/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd
-	http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
-
-	<bean id="basic.spec" parent="slcTemplate.simpleSpec">
-		<property name="attributes">
-			<map>
-				<entry key="testedComponentId">
-					<bean parent="specAttr.primitive" p:value="100" p:isParameter="true"
-						p:type="integer" />
-				</entry>
-				<entry key="testData1">
-					<bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"
-						p:isParameter="true" p:isFrozen="true" />
-				</entry>
-				<entry key="testData2">
-					<bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"
-						p:isParameter="true" p:isFrozen="true" />
-				</entry>
-			</map>
-		</property>
-	</bean>
-
-	<bean id="basic.ref" factory-bean="basic.spec" factory-method="createRef"
-		abstract="true" />
-
-	<bean id="basic.flowTemplate" parent="slcTemplate.simpleFlow"
-		abstract="true">
-		<property name="executionSpec" ref="basic.spec" />
-		<property name="executables">
-			<list>
-				<ref bean="echo1" />
-				<bean parent="testRun">
-					<property name="testDefinition" ref="testDef" />
-					<property name="testData">
-						<bean parent="basic.ref">
-							<constructor-arg value="testData1" />
-						</bean>
-					</property>
-				</bean>
-				<bean parent="testRun">
-					<property name="testDefinition" ref="testDef" />
-					<property name="testData" ref="ref1" />
-				</bean>
-			</list>
-		</property>
-	</bean>
-
-	<bean id="ref1" parent="basic.ref" scope="prototype">
-		<constructor-arg value="testData2" />
-	</bean>
-
-
-	<bean id="basic.testData" class="org.argeo.slc.core.test.BasicTestData">
-		<aop:scoped-proxy />
-		<property name="expected" value="tata" />
-		<property name="reached" value="tata" />
-	</bean>
-
-</beans>
\ No newline at end of file
diff --git a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/canonic.xml b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/canonic.xml
deleted file mode 100644
index ddc7acae5..000000000
--- a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/canonic.xml
+++ /dev/null
@@ -1,45 +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:p="http://www.springframework.org/schema/p"
-	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/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd
-	http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
-
-	<bean id="canonic.spec" parent="slcTemplate.simpleSpec">
-		<property name="attributes">
-			<map>
-				<entry key="parameterAtInstantiation">
-					<bean parent="specAttr.primitive" p:isParameter="true" p:type="integer" />
-				</entry>
-				<entry key="displayWithoutControl">
-					<bean parent="specAttr.primitive" p:value="100" p:isParameter="true"
-						p:isFrozen="true" p:type="integer" />
-				</entry>
-				<entry key="displayWithControl">
-					<bean parent="specAttr.primitive" p:value="200" p:isParameter="true"
-						p:isFrozen="false" p:type="integer" />
-				</entry>
-				<entry key="hide">
-					<bean parent="specAttr.primitive" p:value="300" p:isParameter="true"
-						p:isFrozen="false" p:isHidden="true" p:type="integer" />
-				</entry>
-			</map>
-		</property>
-	</bean>
-
-	<bean id="canonic.flowTemplate" parent="slcTemplate.simpleFlow"
-		abstract="true">
-		<property name="executionSpec" ref="canonic.spec" />
-		<property name="executables">
-			<list>
-				<bean parent="task.echo"
-					p:message="Canonical: displayWithControl=@{displayWithControl}, displayWithoutControl=@{displayWithoutControl}, hide=@{hide}"
-					scope="execution">
-					<aop:scoped-proxy />
-				</bean>
-			</list>
-		</property>
-	</bean>
-</beans>
\ No newline at end of file
diff --git a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/common.xml b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/common.xml
deleted file mode 100644
index 75f40055c..000000000
--- a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/common.xml
+++ /dev/null
@@ -1,17 +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"
-	xsi:schemaLocation="
-	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-
-	<bean id="testDef" class="org.argeo.slc.core.test.BasicTestDefinition"
-		scope="prototype" />
-
-	<bean id="testResult" parent="slcDefault.test.basicSimpleTestResult" />
-
-	<bean id="testRun" class="org.argeo.slc.core.test.SimpleTestRun"
-		abstract="true">
-		<property name="testResult" ref="testResult" />
-	</bean>
-
-</beans>
\ No newline at end of file
diff --git a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/imports.xml b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/imports.xml
deleted file mode 100644
index 6bff52fb1..000000000
--- a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/imports.xml
+++ /dev/null
@@ -1,12 +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"
-	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/core/execution/spring.xml" />
-
-	<import
-		resource="classpath:/org/argeo/slc/core/test/spring/applicationContext.xml" />
-
-</beans>
\ No newline at end of file
diff --git a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/main.xml b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/main.xml
deleted file mode 100644
index 5d849311e..000000000
--- a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/main.xml
+++ /dev/null
@@ -1,41 +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:p="http://www.springframework.org/schema/p"
-	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/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd
-	http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
-
-	<bean id="executionModule" class="org.argeo.slc.osgi.OsgiExecutionModule" />
-
-	<bean id="main" parent="slcTemplate.simpleFlow">
-		<property name="executionSpec">
-			<bean parent="slcTemplate.simpleSpec">
-				<property name="attributes">
-					<map>
-						<entry key="testKey">
-							<bean parent="specAttr.primitive" p:value="660" />
-						</entry>
-					</map>
-				</property>
-			</bean>
-		</property>
-		<property name="executables">
-			<list>
-				<ref local="echo1" />
-				<ref bean="basic.001" />
-				<ref bean="basic.001" />
-				<ref bean="basic.002" />
-				<ref bean="canonic.001" />
-				<ref bean="canonic.002" />
-			</list>
-		</property>
-	</bean>
-
-	<bean id="echo1" parent="task.echo" scope="execution">
-		<property name="message"
-			value="From main! @{testKey}, slc.flows=@{slc.flows}" />
-		<aop:scoped-proxy />
-	</bean>
-</beans>
\ No newline at end of file
diff --git a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/osgi.xml b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/osgi.xml
deleted file mode 100644
index ebc3364ba..000000000
--- a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/osgi.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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.execution.ExecutionModule"
-		ref="executionModule" />
-</beans:beans>
\ No newline at end of file
diff --git a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/testCases/basic-001.xml b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/testCases/basic-001.xml
deleted file mode 100644
index 7571fc957..000000000
--- a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/testCases/basic-001.xml
+++ /dev/null
@@ -1,35 +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:p="http://www.springframework.org/schema/p"
-	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/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd
-	http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
-
-	<bean id="basic.001" parent="basic.flowTemplate">
-		<constructor-arg>
-			<map>
-				<entry key="testData1" value-ref="basic.001.testData" />
-				<entry key="testData2">
-					<bean class="org.argeo.slc.core.test.BasicTestData" scope="execution">
-						<aop:scoped-proxy />
-						<property name="expected" value="tata101" />
-						<property name="reached" value="tata@{testKey}" />
-					</bean>
-				</entry>
-			</map>
-		</constructor-arg>
-	</bean>
-
-	<bean id="basic.001.testData" class="org.argeo.slc.core.test.BasicTestData"
-		scope="execution">
-		<aop:scoped-proxy />
-		<property name="expected" value="tata100" />
-		<property name="reached" value="tata@{testedComponentId}" />
-	</bean>
-
-	<bean id="basic.001.testData2" class="org.argeo.slc.core.test.context.DefaultContextTestData">
-	</bean>
-
-</beans>
\ No newline at end of file
diff --git a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/testCases/basic-002.xml b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/testCases/basic-002.xml
deleted file mode 100644
index 5720d9693..000000000
--- a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/testCases/basic-002.xml
+++ /dev/null
@@ -1,25 +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: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">
-
-	<bean id="basic.002" parent="basic.flowTemplate">
-		<constructor-arg>
-			<map>
-				<entry key="testData1">
-					<bean class="org.argeo.slc.core.test.BasicTestData">
-						<property name="expected" value="toto" />
-						<property name="reached" value="toto" />
-					</bean>
-				</entry>
-				<entry key="testData2">
-					<bean class="org.argeo.slc.core.test.BasicTestData">
-						<property name="expected" value="tata" />
-						<property name="reached" value="toto" />
-					</bean>
-				</entry>
-			</map>
-		</constructor-arg>
-	</bean>
-</beans>
\ No newline at end of file
diff --git a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/testCases/canonic-001.xml b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/testCases/canonic-001.xml
deleted file mode 100644
index 77d4fee64..000000000
--- a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/testCases/canonic-001.xml
+++ /dev/null
@@ -1,17 +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:p="http://www.springframework.org/schema/p"
-	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/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd
-	http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
-
-	<bean id="canonic.001" parent="canonic.flowTemplate">
-		<constructor-arg>
-			<map>
-				<entry key="parameterAtInstantiation" value="1" />
-			</map>
-		</constructor-arg>
-	</bean>
-</beans>
diff --git a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/testCases/canonic-002.xml b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/testCases/canonic-002.xml
deleted file mode 100644
index 5916c08e6..000000000
--- a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/testCases/canonic-002.xml
+++ /dev/null
@@ -1,20 +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:p="http://www.springframework.org/schema/p"
-	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/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd
-	http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
-
-	<bean id="canonic.002" parent="canonic.flowTemplate">
-		<constructor-arg>
-			<map>
-				<entry key="parameterAtInstantiation" value="2" />
-				<entry key="displayWithoutControl" value="102" />
-				<entry key="displayWithControl" value="202" />
-				<entry key="hide" value="202" />
-			</map>
-		</constructor-arg>
-	</bean>
-</beans>
diff --git a/demo/org.argeo.slc.demo.manager/.classpath b/demo/org.argeo.slc.demo.manager/.classpath
index b5ef387af..624a6cfe1 100644
--- a/demo/org.argeo.slc.demo.manager/.classpath
+++ b/demo/org.argeo.slc.demo.manager/.classpath
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
diff --git a/demo/org.argeo.slc.demo.manager/.springBeans b/demo/org.argeo.slc.demo.manager/.springBeans
index 15edcfdb8..c11d81486 100644
--- a/demo/org.argeo.slc.demo.manager/.springBeans
+++ b/demo/org.argeo.slc.demo.manager/.springBeans
@@ -7,9 +7,6 @@
 	</configSuffixes>
 	<enableImports><![CDATA[true]]></enableImports>
 	<configs>
-		<config>src/main/resources/conf/manager-osgi.xml</config>
-		<config>src/main/resources/conf/manager.xml</config>
-		<config>src/main/resources/conf/jms.xml</config>
 	</configs>
 	<configSets>
 	</configSets>
diff --git a/demo/org.argeo.slc.demo.manager/src/main/resources/conf/jms.xml b/demo/org.argeo.slc.demo.manager/src/main/resources/conf/jms.xml
deleted file mode 100644
index d0ab93c18..000000000
--- a/demo/org.argeo.slc.demo.manager/src/main/resources/conf/jms.xml
+++ /dev/null
@@ -1,32 +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"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
-	default-lazy-init="false">
-
-	<import resource="classpath:org/argeo/slc/activemq/spring.xml" />
-
-	<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/org.argeo.slc.demo.manager/src/main/resources/conf/manager-osgi.xml b/demo/org.argeo.slc.demo.manager/src/main/resources/conf/manager-osgi.xml
deleted file mode 100644
index 0b7c972df..000000000
--- a/demo/org.argeo.slc.demo.manager/src/main/resources/conf/manager-osgi.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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">
-
-	<list id="executionModules" interface="org.argeo.slc.execution.ExecutionModule"
-		cardinality="0..N" />
-		
-	
-</beans:beans>
\ No newline at end of file
diff --git a/demo/org.argeo.slc.demo.manager/src/main/resources/conf/manager.xml b/demo/org.argeo.slc.demo.manager/src/main/resources/conf/manager.xml
deleted file mode 100644
index 58c45b66d..000000000
--- a/demo/org.argeo.slc.demo.manager/src/main/resources/conf/manager.xml
+++ /dev/null
@@ -1,29 +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: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">
-
-	<bean id="modulesManager" class="org.argeo.slc.core.execution.ModulesManager">
-		<property name="executionModules" ref="executionModules" />
-	</bean>
-
-	<bean class="org.argeo.slc.osgi.BundlesManager" init-method="init">
-		<property name="urlsToInstall">
-			<bean class="org.argeo.slc.maven.MavenToUrl">
-				<property name="baseUrl" value="reference:file:${user.home}/.m2/repository/" />
-				<property name="mavenFiles">
-					<bean class="org.argeo.slc.maven.DependencyFileLoader">
-						<property name="dependenciesResource"
-							value="classpath:/META-INF/slc/dep/manager.maven" />
-					</bean>
-				</property>
-			</bean>
-		</property>
-	</bean>
-
-	<bean
-		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-		<property name="ignoreUnresolvablePlaceholders" value="true" />
-	</bean>
-</beans>
\ No newline at end of file
diff --git a/demo/org.argeo.slc.demo.manager/src/main/resources/conf/maven.xml b/demo/org.argeo.slc.demo.manager/src/main/resources/conf/maven.xml
deleted file mode 100644
index 0fb5c6a6b..000000000
--- a/demo/org.argeo.slc.demo.manager/src/main/resources/conf/maven.xml
+++ /dev/null
@@ -1,19 +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: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">
-<!-- 
-	<bean id="mavenManager" class="org.argeo.slc.maven.MavenManager"
-		init-method="init">
-		<property name="remoteRepositories">
-			<list>
-				<bean class="org.argeo.slc.maven.RemoteRepository">
-					<property name="id" value="central" />
-					<property name="url" value="http://repo1.maven.org/maven2" />
-				</bean>
-			</list>
-		</property>
-	</bean>
-	 -->
-</beans>
\ No newline at end of file
diff --git a/demo/site/.project b/demo/site/.project
new file mode 100644
index 000000000..3bc0b024e
--- /dev/null
+++ b/demo/site/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.argeo.slc.demo.site</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/demo/site/org.argeo.slc.demo.basic/META-INF/MANIFEST.MF b/demo/site/org.argeo.slc.demo.basic/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..b5326e558
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.basic/META-INF/MANIFEST.MF
@@ -0,0 +1,22 @@
+Manifest-Version: 1.0
+Archiver-Version: Plexus Archiver
+Created-By: 1.6.0_0 (Sun Microsystems Inc.)
+Built-By: mbaudier
+Build-Jdk: 1.6.0_0
+Export-Package: conf;version="0.11.3.SNAPSHOT",conf.testCases;version=
+ "0.11.3.SNAPSHOT"
+Tool: Bnd-0.0.255
+Bundle-Name: Argeo SLC Demo Basic Test Module
+Require-Bundle: org.argeo.slc.support.equinox,org.argeo.slc.specs,org.
+ argeo.slc.support.simple,org.springframework.aop,com.springsource.net
+ .sf.cglib,com.springsource.org.aopalliance
+Bundle-Vendor: Argeo
+Bundle-Version: 0.11.3.SNAPSHOT
+Spring-Context: conf/*,conf/testCases/*
+Bundle-ManifestVersion: 2
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Import-Package: org.apache.commons.logging;version="1.1",org.springfra
+ mework.beans.factory.config;version="2.5.6.A"
+Bundle-SymbolicName: org.argeo.slc.demo.basic
+Bundle-DocURL: http://www.argeo.org
+
diff --git a/demo/site/org.argeo.slc.demo.basic/conf/basic.xml b/demo/site/org.argeo.slc.demo.basic/conf/basic.xml
new file mode 100644
index 000000000..a513e3f4f
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.basic/conf/basic.xml
@@ -0,0 +1,65 @@
+<?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"
+	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/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd
+	http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
+
+	<bean id="basic.spec" parent="slcTemplate.simpleSpec">
+		<property name="attributes">
+			<map>
+				<entry key="testedComponentId">
+					<bean parent="specAttr.primitive" p:value="100" p:isParameter="true"
+						p:type="integer" />
+				</entry>
+				<entry key="testData1">
+					<bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"
+						p:isParameter="true" p:isFrozen="true" />
+				</entry>
+				<entry key="testData2">
+					<bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"
+						p:isParameter="true" p:isFrozen="true" />
+				</entry>
+			</map>
+		</property>
+	</bean>
+
+	<bean id="basic.ref" factory-bean="basic.spec" factory-method="createRef"
+		abstract="true" />
+
+	<bean id="basic.flowTemplate" parent="slcTemplate.simpleFlow"
+		abstract="true">
+		<property name="executionSpec" ref="basic.spec" />
+		<property name="executables">
+			<list>
+				<ref bean="echo1" />
+				<bean parent="testRun">
+					<property name="testDefinition" ref="testDef" />
+					<property name="testData">
+						<bean parent="basic.ref">
+							<constructor-arg value="testData1" />
+						</bean>
+					</property>
+				</bean>
+				<bean parent="testRun">
+					<property name="testDefinition" ref="testDef" />
+					<property name="testData" ref="ref1" />
+				</bean>
+			</list>
+		</property>
+	</bean>
+
+	<bean id="ref1" parent="basic.ref" scope="prototype">
+		<constructor-arg value="testData2" />
+	</bean>
+
+
+	<bean id="basic.testData" class="org.argeo.slc.core.test.BasicTestData">
+		<aop:scoped-proxy />
+		<property name="expected" value="tata" />
+		<property name="reached" value="tata" />
+	</bean>
+
+</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/conf/canonic.xml b/demo/site/org.argeo.slc.demo.basic/conf/canonic.xml
new file mode 100644
index 000000000..ddc7acae5
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.basic/conf/canonic.xml
@@ -0,0 +1,45 @@
+<?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"
+	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/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd
+	http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
+
+	<bean id="canonic.spec" parent="slcTemplate.simpleSpec">
+		<property name="attributes">
+			<map>
+				<entry key="parameterAtInstantiation">
+					<bean parent="specAttr.primitive" p:isParameter="true" p:type="integer" />
+				</entry>
+				<entry key="displayWithoutControl">
+					<bean parent="specAttr.primitive" p:value="100" p:isParameter="true"
+						p:isFrozen="true" p:type="integer" />
+				</entry>
+				<entry key="displayWithControl">
+					<bean parent="specAttr.primitive" p:value="200" p:isParameter="true"
+						p:isFrozen="false" p:type="integer" />
+				</entry>
+				<entry key="hide">
+					<bean parent="specAttr.primitive" p:value="300" p:isParameter="true"
+						p:isFrozen="false" p:isHidden="true" p:type="integer" />
+				</entry>
+			</map>
+		</property>
+	</bean>
+
+	<bean id="canonic.flowTemplate" parent="slcTemplate.simpleFlow"
+		abstract="true">
+		<property name="executionSpec" ref="canonic.spec" />
+		<property name="executables">
+			<list>
+				<bean parent="task.echo"
+					p:message="Canonical: displayWithControl=@{displayWithControl}, displayWithoutControl=@{displayWithoutControl}, hide=@{hide}"
+					scope="execution">
+					<aop:scoped-proxy />
+				</bean>
+			</list>
+		</property>
+	</bean>
+</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/conf/common.xml b/demo/site/org.argeo.slc.demo.basic/conf/common.xml
new file mode 100644
index 000000000..75f40055c
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.basic/conf/common.xml
@@ -0,0 +1,17 @@
+<?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">
+
+	<bean id="testDef" class="org.argeo.slc.core.test.BasicTestDefinition"
+		scope="prototype" />
+
+	<bean id="testResult" parent="slcDefault.test.basicSimpleTestResult" />
+
+	<bean id="testRun" class="org.argeo.slc.core.test.SimpleTestRun"
+		abstract="true">
+		<property name="testResult" ref="testResult" />
+	</bean>
+
+</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/conf/imports.xml b/demo/site/org.argeo.slc.demo.basic/conf/imports.xml
new file mode 100644
index 000000000..6bff52fb1
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.basic/conf/imports.xml
@@ -0,0 +1,12 @@
+<?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/core/execution/spring.xml" />
+
+	<import
+		resource="classpath:/org/argeo/slc/core/test/spring/applicationContext.xml" />
+
+</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/conf/main.xml b/demo/site/org.argeo.slc.demo.basic/conf/main.xml
new file mode 100644
index 000000000..5d849311e
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.basic/conf/main.xml
@@ -0,0 +1,41 @@
+<?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"
+	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/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd
+	http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
+
+	<bean id="executionModule" class="org.argeo.slc.osgi.OsgiExecutionModule" />
+
+	<bean id="main" parent="slcTemplate.simpleFlow">
+		<property name="executionSpec">
+			<bean parent="slcTemplate.simpleSpec">
+				<property name="attributes">
+					<map>
+						<entry key="testKey">
+							<bean parent="specAttr.primitive" p:value="660" />
+						</entry>
+					</map>
+				</property>
+			</bean>
+		</property>
+		<property name="executables">
+			<list>
+				<ref local="echo1" />
+				<ref bean="basic.001" />
+				<ref bean="basic.001" />
+				<ref bean="basic.002" />
+				<ref bean="canonic.001" />
+				<ref bean="canonic.002" />
+			</list>
+		</property>
+	</bean>
+
+	<bean id="echo1" parent="task.echo" scope="execution">
+		<property name="message"
+			value="From main! @{testKey}, slc.flows=@{slc.flows}" />
+		<aop:scoped-proxy />
+	</bean>
+</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/conf/osgi.xml b/demo/site/org.argeo.slc.demo.basic/conf/osgi.xml
new file mode 100644
index 000000000..ebc3364ba
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.basic/conf/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 interface="org.argeo.slc.execution.ExecutionModule"
+		ref="executionModule" />
+</beans:beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/conf/testCases/basic-001.xml b/demo/site/org.argeo.slc.demo.basic/conf/testCases/basic-001.xml
new file mode 100644
index 000000000..7571fc957
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.basic/conf/testCases/basic-001.xml
@@ -0,0 +1,35 @@
+<?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"
+	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/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd
+	http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
+
+	<bean id="basic.001" parent="basic.flowTemplate">
+		<constructor-arg>
+			<map>
+				<entry key="testData1" value-ref="basic.001.testData" />
+				<entry key="testData2">
+					<bean class="org.argeo.slc.core.test.BasicTestData" scope="execution">
+						<aop:scoped-proxy />
+						<property name="expected" value="tata101" />
+						<property name="reached" value="tata@{testKey}" />
+					</bean>
+				</entry>
+			</map>
+		</constructor-arg>
+	</bean>
+
+	<bean id="basic.001.testData" class="org.argeo.slc.core.test.BasicTestData"
+		scope="execution">
+		<aop:scoped-proxy />
+		<property name="expected" value="tata100" />
+		<property name="reached" value="tata@{testedComponentId}" />
+	</bean>
+
+	<bean id="basic.001.testData2" class="org.argeo.slc.core.test.context.DefaultContextTestData">
+	</bean>
+
+</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/conf/testCases/basic-002.xml b/demo/site/org.argeo.slc.demo.basic/conf/testCases/basic-002.xml
new file mode 100644
index 000000000..5720d9693
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.basic/conf/testCases/basic-002.xml
@@ -0,0 +1,25 @@
+<?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">
+
+	<bean id="basic.002" parent="basic.flowTemplate">
+		<constructor-arg>
+			<map>
+				<entry key="testData1">
+					<bean class="org.argeo.slc.core.test.BasicTestData">
+						<property name="expected" value="toto" />
+						<property name="reached" value="toto" />
+					</bean>
+				</entry>
+				<entry key="testData2">
+					<bean class="org.argeo.slc.core.test.BasicTestData">
+						<property name="expected" value="tata" />
+						<property name="reached" value="toto" />
+					</bean>
+				</entry>
+			</map>
+		</constructor-arg>
+	</bean>
+</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/conf/testCases/canonic-001.xml b/demo/site/org.argeo.slc.demo.basic/conf/testCases/canonic-001.xml
new file mode 100644
index 000000000..77d4fee64
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.basic/conf/testCases/canonic-001.xml
@@ -0,0 +1,17 @@
+<?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"
+	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/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd
+	http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
+
+	<bean id="canonic.001" parent="canonic.flowTemplate">
+		<constructor-arg>
+			<map>
+				<entry key="parameterAtInstantiation" value="1" />
+			</map>
+		</constructor-arg>
+	</bean>
+</beans>
diff --git a/demo/site/org.argeo.slc.demo.basic/conf/testCases/canonic-002.xml b/demo/site/org.argeo.slc.demo.basic/conf/testCases/canonic-002.xml
new file mode 100644
index 000000000..5916c08e6
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.basic/conf/testCases/canonic-002.xml
@@ -0,0 +1,20 @@
+<?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"
+	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/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd
+	http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
+
+	<bean id="canonic.002" parent="canonic.flowTemplate">
+		<constructor-arg>
+			<map>
+				<entry key="parameterAtInstantiation" value="2" />
+				<entry key="displayWithoutControl" value="102" />
+				<entry key="displayWithControl" value="202" />
+				<entry key="hide" value="202" />
+			</map>
+		</constructor-arg>
+	</bean>
+</beans>
diff --git a/demo/site/org.argeo.slc.demo.deploy/META-INF/MANIFEST.MF b/demo/site/org.argeo.slc.demo.deploy/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..f41bdfba5
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.deploy/META-INF/MANIFEST.MF
@@ -0,0 +1,4 @@
+Bundle-SymbolicName: org.argeo.slc.demo.deploy
+Bundle-Version: 1.0.0
+Require-Bundle: org.springframework.beans;bundle-version="2.5.6"
+Bundle-ManifestVersion: 2
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.deploy/META-INF/slc/dep/manager.maven b/demo/site/org.argeo.slc.demo.deploy/META-INF/slc/dep/manager.maven
new file mode 100644
index 000000000..b0ae3606e
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.deploy/META-INF/slc/dep/manager.maven
@@ -0,0 +1,59 @@
+
+The following files have been resolved:
+   com.jcraft.jzlib:com.springsource.com.jcraft.jzlib:jar:1.0.7:compile
+   com.thoughtworks.xstream:com.springsource.com.thoughtworks.xstream:jar:1.2.2:compile
+   javax.activation:com.springsource.javax.activation:jar:1.1.1:compile
+   javax.ejb:com.springsource.javax.ejb:jar:3.0.0:compile
+   javax.jms:com.springsource.javax.jms:jar:1.1.0:compile
+   javax.servlet:com.springsource.javax.servlet:jar:2.5.0:compile
+   javax.xml.rpc:com.springsource.javax.xml.rpc:jar:1.1.0:compile
+   javax.xml.soap:com.springsource.javax.xml.soap:jar:1.3.0:compile
+   javax.xml.stream:com.springsource.javax.xml.stream:jar:1.0.1:compile
+   net.sourceforge.cglib:com.springsource.net.sf.cglib:jar:2.1.3:compile
+   org.aopalliance:com.springsource.org.aopalliance:jar:1.0.0:compile
+   org.apache.bcel:com.springsource.org.apache.bcel:jar:5.1.0:compile
+   org.apache.camel:com.springsource.org.apache.camel:jar:1.3.0:compile
+   org.apache.commons:com.springsource.org.apache.commons.collections:jar:3.2.0:compile
+   org.apache.commons:com.springsource.org.apache.commons.io:jar:1.4.0:compile
+   org.apache.commons:com.springsource.org.apache.commons.lang:jar:2.1.0:compile
+   org.apache.commons:com.springsource.org.apache.commons.logging:jar:1.1.1:compile
+   org.apache.geronimo.specs:com.springsource.javax.management.j2ee:jar:1.0.1:compile
+   org.apache.log4j:com.springsource.org.apache.log4j:jar:1.2.15:compile
+   org.apache.regexp:com.springsource.org.apache.regexp:jar:1.5.0:compile
+   org.apache.ws:com.springsource.org.apache.ws.commons.schema:jar:1.3.2:compile
+   org.apache.xalan:com.springsource.org.apache.xalan:jar:2.7.0:compile
+   org.apache.xerces:com.springsource.org.apache.xerces:jar:2.8.1:compile
+   org.apache.xml:com.springsource.org.apache.xml.resolver:jar:1.2.0:compile
+   org.apache.xmlcommons:com.springsource.org.apache.xmlcommons:jar:1.3.3:compile
+   org.argeo.dep.osgi:org.argeo.dep.osgi.activemq:jar:5.2.0.argeo.2:compile
+   org.argeo.dep.osgi:org.argeo.dep.osgi.maven.embedder:jar:2.0.4.argeo.1-SNAPSHOT:compile
+   org.argeo.slc:org.argeo.slc.detached.launcher:jar:0.11.3-SNAPSHOT:compile
+   org.argeo.slc.demo:org.argeo.slc.demo.basic:jar:0.11.3-SNAPSHOT:compile
+   org.argeo.slc.demo:org.argeo.slc.demo.log4j:jar:0.11.3-SNAPSHOT:compile
+   org.argeo.slc.runtime:org.argeo.slc.specs:jar:0.11.3-SNAPSHOT:compile
+   org.argeo.slc.runtime:org.argeo.slc.support.activemq:jar:0.11.3-SNAPSHOT:compile
+   org.argeo.slc.runtime:org.argeo.slc.support.castor:jar:0.11.3-SNAPSHOT:compile
+   org.argeo.slc.runtime:org.argeo.slc.support.equinox:jar:0.11.3-SNAPSHOT:compile
+   org.argeo.slc.runtime:org.argeo.slc.support.maven:jar:0.11.3-SNAPSHOT:compile
+   org.argeo.slc.runtime:org.argeo.slc.support.simple:jar:0.11.3-SNAPSHOT:compile
+   org.aspectj:com.springsource.org.aspectj.runtime:jar:1.6.2.RELEASE:compile
+   org.aspectj:com.springsource.org.aspectj.weaver:jar:1.6.2.RELEASE:compile
+   org.codehaus.castor:com.springsource.org.castor:jar:1.2.0:compile
+   org.dbunit:com.springsource.org.dbunit:jar:2.2.0:compile
+   org.eclipse.osgi:org.eclipse.osgi:jar:3.4.2.R34x_v20080826-1230:compile
+   org.junit:com.springsource.junit:jar:3.8.2:compile
+   org.objectweb.asm:com.springsource.org.objectweb.asm:jar:2.2.0:compile
+   org.objectweb.asm:com.springsource.org.objectweb.asm.attrs:jar:2.2.0:compile
+   org.springframework:org.springframework.aop:jar:2.5.6.A:compile
+   org.springframework:org.springframework.beans:jar:2.5.6.A:compile
+   org.springframework:org.springframework.context:jar:2.5.6.A:compile
+   org.springframework:org.springframework.core:jar:2.5.6.A:compile
+   org.springframework:org.springframework.jms:jar:2.5.6.A:compile
+   org.springframework:org.springframework.transaction:jar:2.5.6.A:compile
+   org.springframework.osgi:org.springframework.osgi.core:jar:1.1.3.RELEASE:compile
+   org.springframework.osgi:org.springframework.osgi.extender:jar:1.1.3.RELEASE:compile
+   org.springframework.osgi:org.springframework.osgi.io:jar:1.1.3.RELEASE:compile
+   org.springframework.ws:org.springframework.oxm:jar:1.5.5.A:compile
+   org.springframework.ws:org.springframework.xml:jar:1.5.5.A:compile
+   org.xmlpull:com.springsource.org.xmlpull:jar:1.1.3.4-O:compile
+
diff --git a/demo/site/org.argeo.slc.demo.deploy/META-INF/spring/manager.xml b/demo/site/org.argeo.slc.demo.deploy/META-INF/spring/manager.xml
new file mode 100644
index 000000000..5a3b94a67
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.deploy/META-INF/spring/manager.xml
@@ -0,0 +1,25 @@
+<?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">
+
+	<bean class="org.argeo.slc.osgi.BundlesManager" init-method="init">
+		<property name="urlsToInstall">
+			<bean class="org.argeo.slc.maven.MavenToUrl">
+				<property name="baseUrl" value="reference:file:${user.home}/.m2/repository/" />
+				<property name="mavenFiles">
+					<bean class="org.argeo.slc.maven.DependencyFileLoader">
+						<property name="dependenciesResource"
+							value="classpath:/META-INF/slc/dep/manager.maven" />
+					</bean>
+				</property>
+			</bean>
+		</property>
+	</bean>
+
+	<bean
+		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+		<property name="ignoreUnresolvablePlaceholders" value="true" />
+	</bean>
+</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.deploy/pom.xml b/demo/site/org.argeo.slc.demo.deploy/pom.xml
new file mode 100644
index 000000000..6f56921e3
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.deploy/pom.xml
@@ -0,0 +1,152 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.argeo.slc</groupId>
+		<artifactId>argeo-slc-demo</artifactId>
+		<version>0.11.3-SNAPSHOT</version>
+		<relativePath>../..</relativePath>
+	</parent>
+	<groupId>org.argeo.slc.demo</groupId>
+	<artifactId>org.argeo.slc.demo.deploy</artifactId>
+	<name>Argeo SLC Demo Deploy</name>
+	<packaging>jar</packaging>
+	<properties></properties>
+	<build>
+		<resources>
+			<resource>
+				<directory>.</directory>
+				<includes>
+					<include>META-INF/**</include>
+				</includes>
+			</resource>
+		</resources>
+		<plugins>
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifestFile>META-INF/MANIFEST.MF</manifestFile>
+					</archive>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>manager</id>
+						<phase>initialize</phase>
+						<goals>
+							<goal>list</goal>
+						</goals>
+						<configuration>
+							<outputFile>META-INF/slc/dep/manager.maven</outputFile>
+						</configuration>
+					</execution>
+					<execution>
+						<id>copy</id>
+						<phase>initialize</phase>
+						<goals>
+							<goal>copy</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.build.directory}/equinox</outputDirectory>
+							<stripVersion>true</stripVersion>
+							<artifactItems>
+								<artifactItem>
+									<groupId>org.eclipse.osgi</groupId>
+									<artifactId>org.eclipse.osgi</artifactId>
+									<version>${version.equinox}</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.argeo.slc.runtime</groupId>
+									<artifactId>org.argeo.slc.osgiboot</artifactId>
+									<version>${project.version}</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.argeo.slc.runtime</groupId>
+									<artifactId>org.argeo.slc.osgiboot</artifactId>
+									<version>${project.version}</version>
+									<type>xml</type>
+									<classifier>osgiboot</classifier>
+								</artifactItem>
+							</artifactItems>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<configuration>
+					<tasks>
+						<property name="slc.osgi.locations" refid="maven.compile.classpath" />
+						<property name="slc.osgi.start"
+							value="org.springframework.osgi.extender,org.argeo.slc.demo.basic" />
+						<ant
+							antfile="${project.build.directory}/equinox/org.argeo.slc.osgiboot-osgiboot.xml" />
+
+					</tasks>
+				</configuration>
+			</plugin>
+
+		</plugins>
+	</build>
+	<dependencies>
+
+		<dependency>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.support.equinox</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.support.activemq</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.support.castor</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.support.maven</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.detached.launcher</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.argeo.slc.demo</groupId>
+			<artifactId>org.argeo.slc.demo.basic</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.demo</groupId>
+			<artifactId>org.argeo.slc.demo.log4j</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+
+		<dependency>
+			<groupId>com.thoughtworks.xstream</groupId>
+			<artifactId>com.springsource.com.thoughtworks.xstream</artifactId>
+			<version>1.2.2</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.xerces</groupId>
+			<artifactId>
+					com.springsource.org.apache.xerces
+				</artifactId>
+			<version>2.8.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.xmlcommons</groupId>
+			<artifactId>com.springsource.org.apache.xmlcommons</artifactId>
+			<version>1.3.3</version>
+		</dependency>
+
+	</dependencies>
+</project>
diff --git a/demo/site/org.argeo.slc.demo.manager/META-INF/MANIFEST.MF b/demo/site/org.argeo.slc.demo.manager/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..c4c968a76
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.manager/META-INF/MANIFEST.MF
@@ -0,0 +1,22 @@
+Manifest-Version: 1.0
+Export-Package: org.argeo.slc.demo.manager;uses:="org.apache.commons.l
+ ogging";version="0.11.3.SNAPSHOT"
+Tool: Bnd-0.0.255
+Bundle-Name: Argeo SLC Demo Manager
+Created-By: 1.6.0_0 (Sun Microsystems Inc.)
+Require-Bundle: org.springframework.jms,com.springsource.org.castor,or
+ g.argeo.dep.osgi.activemq,org.argeo.slc.support.equinox,org.argeo.slc
+ .support.activemq,org.argeo.slc.specs,org.argeo.slc.support.simple,or
+ g.springframework.aop,org.springframework.oxm,com.springsource.net.sf
+ .cglib,com.springsource.org.aopalliance,org.argeo.dep.osgi.maven.embe
+ dder
+Bundle-Vendor: Argeo
+Bundle-Version: 0.11.3.SNAPSHOT
+Spring-Context: conf/*
+Bundle-ManifestVersion: 2
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Import-Package: org.apache.commons.logging;version="1.1",org.springfra
+ mework.beans.factory.config;version="2.5.6.A"
+Bundle-SymbolicName: org.argeo.slc.demo.manager
+Bundle-DocURL: http://www.argeo.org
+
diff --git a/demo/site/org.argeo.slc.demo.manager/conf/jms.xml b/demo/site/org.argeo.slc.demo.manager/conf/jms.xml
new file mode 100644
index 000000000..d0ab93c18
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.manager/conf/jms.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"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
+	default-lazy-init="false">
+
+	<import resource="classpath:org/argeo/slc/activemq/spring.xml" />
+
+	<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.manager/conf/manager-osgi.xml b/demo/site/org.argeo.slc.demo.manager/conf/manager-osgi.xml
new file mode 100644
index 000000000..36419b408
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.manager/conf/manager-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">
+
+	<list id="executionModules" interface="org.argeo.slc.execution.ExecutionModule"
+		cardinality="0..N" />
+
+	<service ref="modulesManager" interface="org.argeo.slc.execution.ExecutionModulesManager" />
+</beans:beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.manager/conf/manager.xml b/demo/site/org.argeo.slc.demo.manager/conf/manager.xml
new file mode 100644
index 000000000..34b9c3da4
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.manager/conf/manager.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: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">
+
+	<bean id="modulesManager" class="org.argeo.slc.core.execution.DefaultModulesManager">
+		<property name="executionModules" ref="executionModules" />
+	</bean>
+<!-- 
+	<bean class="org.argeo.slc.osgi.BundlesManager" init-method="init">
+		<property name="urlsToInstall">
+			<bean class="org.argeo.slc.maven.MavenToUrl">
+				<property name="baseUrl" value="reference:file:${user.home}/.m2/repository/" />
+				<property name="mavenFiles">
+					<bean class="org.argeo.slc.maven.DependencyFileLoader">
+						<property name="dependenciesResource"
+							value="classpath:/META-INF/slc/dep/manager.maven" />
+					</bean>
+				</property>
+			</bean>
+		</property>
+	</bean>
+ -->
+	<bean
+		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+		<property name="ignoreUnresolvablePlaceholders" value="true" />
+	</bean>
+</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.manager/conf/maven.xml b/demo/site/org.argeo.slc.demo.manager/conf/maven.xml
new file mode 100644
index 000000000..0fb5c6a6b
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.manager/conf/maven.xml
@@ -0,0 +1,19 @@
+<?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">
+<!-- 
+	<bean id="mavenManager" class="org.argeo.slc.maven.MavenManager"
+		init-method="init">
+		<property name="remoteRepositories">
+			<list>
+				<bean class="org.argeo.slc.maven.RemoteRepository">
+					<property name="id" value="central" />
+					<property name="url" value="http://repo1.maven.org/maven2" />
+				</bean>
+			</list>
+		</property>
+	</bean>
+	 -->
+</beans>
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/META-INF/MANIFEST.MF b/org.argeo.slc.webapp/src/main/webapp/META-INF/MANIFEST.MF
index 2bd2fed58..dcd1e6c23 100644
--- a/org.argeo.slc.webapp/src/main/webapp/META-INF/MANIFEST.MF
+++ b/org.argeo.slc.webapp/src/main/webapp/META-INF/MANIFEST.MF
@@ -1,28 +1,4 @@
-Bundle-SymbolicName: org.argeo.slc.webapp
+Bundle-Name: SLC RIA
+Fragment-Host: org.argeo.slc.webapp
+Bundle-SymbolicName: org.argeo.slc.ria
 Bundle-Version: 1.0.0
-Import-Package: javax.servlet,
- javax.servlet.http,
- javax.servlet.resources,
- org.springframework.osgi.web.context.support,
- org.springframework.web.context,
- org.springframework.web.util,
- org.apache.naming.java
-Bundle-Classpath: .,
- WEB-INF/classes
-Require-Bundle: org.argeo.slc.server,
- 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.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,
- com.springsource.org.apache.activemq
- 
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml
deleted file mode 100644
index 97ca54365..000000000
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/applicationContext.xml
+++ /dev/null
@@ -1,21 +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">
-	<import resource="classpath:/org/argeo/slc/server/spring/servletContext.xml" />
-
-	<!--
-		<import resource="classpath:/org/argeo/slc/server/spring/jmx.xml" />
-	-->
-
-	<!--
-	<bean id="activemqBroker" class="org.apache.activemq.xbean.BrokerFactoryBean">
-		<property name="config" value="WEB-INF/activemq.xml" />
-		<property name="start" value="true" />
-	</bean>
--->
-</beans>
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/classes/log4j.properties b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/classes/log4j.properties
deleted file mode 100644
index 34f682a8a..000000000
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/classes/log4j.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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/org.argeo.slc.webapp/src/main/webapp/WEB-INF/doc-servlet.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/doc-servlet.xml
deleted file mode 100644
index 3b1714fcc..000000000
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/doc-servlet.xml
+++ /dev/null
@@ -1,10 +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"
-	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/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-service-servlet.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-service-servlet.xml
deleted file mode 100644
index 11ae5380d..000000000
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-service-servlet.xml
+++ /dev/null
@@ -1,9 +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"
-	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/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ws-servlet.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ws-servlet.xml
deleted file mode 100644
index 18dce9a8a..000000000
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ws-servlet.xml
+++ /dev/null
@@ -1,7 +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"
-	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/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web-osgi.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web-osgi.xml
deleted file mode 100644
index bd7bf353a..000000000
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web-osgi.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?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 config -->
-	<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 mappings -->
-	<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/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 9de9501a6..000000000
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?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>
-	</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>
-	</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>
-	</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>
-	</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>
-
-	<!-- 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 config -->
-    <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 mappings -->
-    <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/org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt-servlet.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt-servlet.xml
deleted file mode 100644
index ddfd925ce..000000000
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt-servlet.xml
+++ /dev/null
@@ -1,29 +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"
-	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/org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt/resultView.xsl b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt/resultView.xsl
deleted file mode 100644
index e9989bdbe..000000000
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt/resultView.xsl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?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/org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt/viewXml.xsl b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt/viewXml.xsl
deleted file mode 100644
index 87d63716f..000000000
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt/viewXml.xsl
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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/org.argeo.slc.webapp/src/main/webapp/index.jsp b/org.argeo.slc.webapp/src/main/webapp/index.jsp
index 1c9726909..f7bfec888 100644
--- a/org.argeo.slc.webapp/src/main/webapp/index.jsp
+++ b/org.argeo.slc.webapp/src/main/webapp/index.jsp
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
+<?xml version="1.0" encoding="ISO-8859-1" ?>
 <%@ page language="java" contentType="text/html"%>
+Hello World XX!
 <%
-response.sendRedirect("argeo-ria/index.html");
+//response.sendRedirect("argeo-ria/index.html");
 %>
diff --git a/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/applicationContext.xml b/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/applicationContext.xml
new file mode 100644
index 000000000..97ca54365
--- /dev/null
+++ b/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/applicationContext.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">
+	<import resource="classpath:/org/argeo/slc/server/spring/servletContext.xml" />
+
+	<!--
+		<import resource="classpath:/org/argeo/slc/server/spring/jmx.xml" />
+	-->
+
+	<!--
+	<bean id="activemqBroker" class="org.apache.activemq.xbean.BrokerFactoryBean">
+		<property name="config" value="WEB-INF/activemq.xml" />
+		<property name="start" value="true" />
+	</bean>
+-->
+</beans>
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/classes/log4j.properties b/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/classes/log4j.properties
new file mode 100644
index 000000000..34f682a8a
--- /dev/null
+++ b/org.argeo.slc.webapp/src/main/webapp/old/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/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/doc-servlet.xml b/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/doc-servlet.xml
new file mode 100644
index 000000000..3b1714fcc
--- /dev/null
+++ b/org.argeo.slc.webapp/src/main/webapp/old/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/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/slc-service-servlet.xml b/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/slc-service-servlet.xml
new file mode 100644
index 000000000..11ae5380d
--- /dev/null
+++ b/org.argeo.slc.webapp/src/main/webapp/old/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/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/slc-ws-servlet.xml b/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/slc-ws-servlet.xml
new file mode 100644
index 000000000..18dce9a8a
--- /dev/null
+++ b/org.argeo.slc.webapp/src/main/webapp/old/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/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/web-osgi.xml b/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/web-osgi.xml
new file mode 100644
index 000000000..bd7bf353a
--- /dev/null
+++ b/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/web-osgi.xml
@@ -0,0 +1,142 @@
+<?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 config -->
+	<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 mappings -->
+	<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/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/web.xml b/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/web.xml
new file mode 100644
index 000000000..9de9501a6
--- /dev/null
+++ b/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/web.xml
@@ -0,0 +1,122 @@
+<?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>
+	</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>
+	</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>
+	</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>
+	</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>
+
+	<!-- 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 config -->
+    <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 mappings -->
+    <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/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/xslt-servlet.xml b/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/xslt-servlet.xml
new file mode 100644
index 000000000..ddfd925ce
--- /dev/null
+++ b/org.argeo.slc.webapp/src/main/webapp/old/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/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/xslt/resultView.xsl b/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/xslt/resultView.xsl
new file mode 100644
index 000000000..e9989bdbe
--- /dev/null
+++ b/org.argeo.slc.webapp/src/main/webapp/old/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/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/xslt/viewXml.xsl b/org.argeo.slc.webapp/src/main/webapp/old/WEB-INF/xslt/viewXml.xsl
new file mode 100644
index 000000000..87d63716f
--- /dev/null
+++ b/org.argeo.slc.webapp/src/main/webapp/old/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/org.argeo.slc.webapp/src/main/webapp/old/style.css b/org.argeo.slc.webapp/src/main/webapp/old/style.css
new file mode 100644
index 000000000..102b4eea1
--- /dev/null
+++ b/org.argeo.slc.webapp/src/main/webapp/old/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/org.argeo.slc.webapp/src/main/webapp/old/test-amq/send.html b/org.argeo.slc.webapp/src/main/webapp/old/test-amq/send.html
new file mode 100644
index 000000000..4449fcbc5
--- /dev/null
+++ b/org.argeo.slc.webapp/src/main/webapp/old/test-amq/send.html
@@ -0,0 +1,7 @@
+<html>
+<head>
+<script type="text/javascript" src="../amq/amq.js"></script>
+<script type="text/javascript">amq.uri='../amq';</script>
+<script type="text/javascript" src="send.js"></script>
+</head>
+</html>
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/old/test-amq/send.js b/org.argeo.slc.webapp/src/main/webapp/old/test-amq/send.js
new file mode 100644
index 000000000..8210c6aef
--- /dev/null
+++ b/org.argeo.slc.webapp/src/main/webapp/old/test-amq/send.js
@@ -0,0 +1,3 @@
+amq.sendMessage('topic://agent.c6fb85cc-200e-41f1-9b63-fade5cad0f14.newExecution','<slc:slc-execution uuid="b0b68669-b598-4518-8ae3-c9c3190e87b4"><slc:status>STARTED</slc:status><slc:type>slcAnt</slc:type><slc:host>localhost</slc:host><slc:user>user</slc:user><slc:attributes><slc:attribute name="ant.file">/test</slc:attribute></slc:attributes></slc:slc-execution>');
+alert('Message sent!');
+document.write('Message sent');
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/style.css b/org.argeo.slc.webapp/src/main/webapp/style.css
deleted file mode 100644
index 102b4eea1..000000000
--- a/org.argeo.slc.webapp/src/main/webapp/style.css
+++ /dev/null
@@ -1,174 +0,0 @@
-/* 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/org.argeo.slc.webapp/src/main/webapp/test-amq/send.html b/org.argeo.slc.webapp/src/main/webapp/test-amq/send.html
deleted file mode 100644
index 4449fcbc5..000000000
--- a/org.argeo.slc.webapp/src/main/webapp/test-amq/send.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<head>
-<script type="text/javascript" src="../amq/amq.js"></script>
-<script type="text/javascript">amq.uri='../amq';</script>
-<script type="text/javascript" src="send.js"></script>
-</head>
-</html>
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/test-amq/send.js b/org.argeo.slc.webapp/src/main/webapp/test-amq/send.js
deleted file mode 100644
index 8210c6aef..000000000
--- a/org.argeo.slc.webapp/src/main/webapp/test-amq/send.js
+++ /dev/null
@@ -1,3 +0,0 @@
-amq.sendMessage('topic://agent.c6fb85cc-200e-41f1-9b63-fade5cad0f14.newExecution','<slc:slc-execution uuid="b0b68669-b598-4518-8ae3-c9c3190e87b4"><slc:status>STARTED</slc:status><slc:type>slcAnt</slc:type><slc:host>localhost</slc:host><slc:user>user</slc:user><slc:attributes><slc:attribute name="ant.file">/test</slc:attribute></slc:attributes></slc:slc-execution>');
-alert('Message sent!');
-document.write('Message sent');
\ No newline at end of file
diff --git a/runtime/org.argeo.slc.osgiboot/src/main/java/org/argeo/slc/osgiboot/Activator.java b/runtime/org.argeo.slc.osgiboot/src/main/java/org/argeo/slc/osgiboot/Activator.java
index 7b02c785a..c4b06be06 100644
--- a/runtime/org.argeo.slc.osgiboot/src/main/java/org/argeo/slc/osgiboot/Activator.java
+++ b/runtime/org.argeo.slc.osgiboot/src/main/java/org/argeo/slc/osgiboot/Activator.java
@@ -24,17 +24,25 @@ public class Activator implements BundleActivator {
 	public final static String PROP_SLC_OSGI_LOCATIONS = "slc.osgi.locations";
 	public final static String PROP_SLC_MAVEN_DEPENDENCY_FILE = "slc.maven.dependencyFile";
 
-	private static Boolean debug = true;
+	private static Boolean debug = false;
 
 	public void start(BundleContext bundleContext) throws Exception {
-		installUrls(bundleContext, getDevLocationsUrls());
+		try {
+			info("SLC OSGi bootstrap starting...");
+			installUrls(bundleContext, getDevLocationsUrls());
 
-		installUrls(bundleContext, getLocationsUrls());
+			installUrls(bundleContext, getLocationsUrls());
 
-		List<String> urls = getMavenUrls();
-		installUrls(bundleContext, urls);
+			List<String> urls = getMavenUrls();
+			installUrls(bundleContext, urls);
 
-		startBundles(bundleContext);
+			startBundles(bundleContext);
+
+			info("SLC OSGi bootstrap completed");
+		} catch (Exception e) {
+			e.printStackTrace();
+			throw e;
+		}
 	}
 
 	public void stop(BundleContext context) throws Exception {
@@ -49,12 +57,14 @@ public class Activator implements BundleActivator {
 				if (installedBundles.containsKey(url)) {
 					Bundle bundle = installedBundles.get(url);
 					// bundle.update();
-					info("Bundle " + bundle.getSymbolicName()
-							+ " already installed from " + url);
+					if (debug)
+						debug("Bundle " + bundle.getSymbolicName()
+								+ " already installed from " + url);
 				} else {
 					Bundle bundle = bundleContext.installBundle(url);
-					info("Installed bundle " + bundle.getSymbolicName()
-							+ " from " + url);
+					if (debug)
+						debug("Installed bundle " + bundle.getSymbolicName()
+								+ " from " + url);
 				}
 			} catch (BundleException e) {
 				warn("Could not install bundle from " + url + ": "
@@ -123,8 +133,16 @@ public class Activator implements BundleActivator {
 			String base, String currentPath, String pattern) {
 		if (currentPath == null) {
 			// Init
-			File[] files = new File(base.replace('/', File.separatorChar))
-					.listFiles();
+			File baseDir = new File(base.replace('/', File.separatorChar));
+			File[] files = baseDir.listFiles();
+
+			if (files == null) {
+				warn("Base dir " + baseDir + " has no children, exists="
+						+ baseDir.exists() + ", isDirectory="
+						+ baseDir.isDirectory());
+				return;
+			}
+
 			for (File file : files)
 				if (file.isDirectory())
 					match(matcher, matched, base, file.getName(), pattern);
@@ -152,8 +170,10 @@ public class Activator implements BundleActivator {
 							match(matcher, matched, base, newCurrentPath,
 									pattern);
 						} else {
-							debug(newCurrentPath
-									+ " does not start match with " + pattern);
+							if (debug)
+								debug(newCurrentPath
+										+ " does not start match with "
+										+ pattern);
 
 						}
 					}
@@ -181,7 +201,7 @@ public class Activator implements BundleActivator {
 
 				mavenFiles.add(convert(line));
 			} catch (Exception e) {
-				System.err.println("Could not load line " + line);
+				warn("Could not load line " + line);
 			}
 		}
 
@@ -260,15 +280,16 @@ public class Activator implements BundleActivator {
 	}
 
 	private static void info(Object obj) {
-		System.out.println("#INFO " + obj);
+		System.out.println("# INFO " + obj);
 	}
 
 	private static void debug(Object obj) {
-		System.out.println("#DBUG " + obj);
+		if (debug)
+			System.out.println("# DBUG " + obj);
 	}
 
 	private static void warn(Object obj) {
-		System.err.println("#WARN " + obj);
+		System.err.println("# WARN " + obj);
 	}
 
 	static class MavenFile {
diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/execution/GetModuleDescriptor.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/execution/GetModuleDescriptor.java
new file mode 100644
index 000000000..b6a64b2ef
--- /dev/null
+++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/execution/GetModuleDescriptor.java
@@ -0,0 +1,32 @@
+package org.argeo.slc.web.mvc.execution;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.argeo.slc.execution.ExecutionModuleDescriptor;
+import org.argeo.slc.execution.ExecutionModulesManager;
+import org.argeo.slc.web.mvc.AbstractServiceController;
+import org.springframework.web.servlet.ModelAndView;
+
+/** . */
+public class GetModuleDescriptor extends AbstractServiceController {
+	private ExecutionModulesManager modulesManager;
+
+	@Override
+	protected void handleServiceRequest(HttpServletRequest request,
+			HttpServletResponse response, ModelAndView modelAndView)
+			throws Exception {
+
+		String moduleName = request.getParameter("moduleName");
+		String version = request.getParameter("version");
+
+		ExecutionModuleDescriptor md = modulesManager
+				.getExecutionModuleDescriptor(moduleName, version);
+		modelAndView.addObject(md);
+	}
+
+	public void setModulesManager(ExecutionModulesManager modulesManager) {
+		this.modulesManager = modulesManager;
+	}
+
+}
diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/execution/ListModulesDescriptors.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/execution/ListModulesDescriptors.java
new file mode 100644
index 000000000..32cf1383e
--- /dev/null
+++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/execution/ListModulesDescriptors.java
@@ -0,0 +1,42 @@
+package org.argeo.slc.web.mvc.execution;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.argeo.slc.execution.ExecutionModule;
+import org.argeo.slc.execution.ExecutionModuleDescriptor;
+import org.argeo.slc.execution.ExecutionModulesManager;
+import org.argeo.slc.msg.ObjectList;
+import org.argeo.slc.web.mvc.AbstractServiceController;
+import org.springframework.web.servlet.ModelAndView;
+
+/** . */
+public class ListModulesDescriptors extends AbstractServiceController {
+	private ExecutionModulesManager modulesManager;
+
+	@Override
+	protected void handleServiceRequest(HttpServletRequest request,
+			HttpServletResponse response, ModelAndView modelAndView)
+			throws Exception {
+
+		List<ExecutionModule> modules = modulesManager.listExecutionModules();
+
+		List<ExecutionModuleDescriptor> descriptors = new ArrayList<ExecutionModuleDescriptor>();
+		for (ExecutionModule module : modules) {
+			ExecutionModuleDescriptor md = new ExecutionModuleDescriptor();
+			md.setName(module.getName());
+			md.setVersion(module.getVersion());
+			descriptors.add(md);
+		}
+
+		modelAndView.addObject(new ObjectList(descriptors));
+	}
+
+	public void setModulesManager(ExecutionModulesManager modulesManager) {
+		this.modulesManager = modulesManager;
+	}
+
+}
diff --git a/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-service-servlet.xml b/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-service-servlet.xml
index c245ecabd..7a8a88a8d 100644
--- a/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-service-servlet.xml
+++ b/runtime/org.argeo.slc.server/src/main/resources/org/argeo/slc/server/spring/slc-service-servlet.xml
@@ -53,6 +53,16 @@
 		<constructor-arg ref="slcExecutionDao" />
 	</bean>
 
+	<bean name="/getExecutionDescriptor.service"
+		class="org.argeo.slc.web.mvc.execution.GetModuleDescriptor">
+		<property name="modulesManager" ref="modulesManager" />
+	</bean>
+
+	<bean name="/listModulesDescriptors.service"
+		class="org.argeo.slc.web.mvc.execution.ListModulesDescriptors">
+		<property name="modulesManager" ref="modulesManager" />
+	</bean>
+
 	<bean id="handlerMapping"
 		class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping">
 		<property name="interceptors">
diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/ExecutionModulesManager.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/ExecutionModulesManager.java
new file mode 100644
index 000000000..8182f889d
--- /dev/null
+++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/ExecutionModulesManager.java
@@ -0,0 +1,10 @@
+package org.argeo.slc.execution;
+
+import java.util.List;
+
+public interface ExecutionModulesManager {
+	public ExecutionModuleDescriptor getExecutionModuleDescriptor(
+			String moduleName, String version);
+
+	public List<ExecutionModule> listExecutionModules();
+}
diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/DefaultModulesManager.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/DefaultModulesManager.java
new file mode 100644
index 000000000..b55a9c377
--- /dev/null
+++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/DefaultModulesManager.java
@@ -0,0 +1,42 @@
+package org.argeo.slc.core.execution;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.argeo.slc.execution.ExecutionModule;
+import org.argeo.slc.execution.ExecutionModuleDescriptor;
+import org.argeo.slc.execution.ExecutionModulesManager;
+import org.springframework.util.Assert;
+
+public class DefaultModulesManager implements ExecutionModulesManager {
+	private List<ExecutionModule> executionModules = new ArrayList<ExecutionModule>();
+
+	public ExecutionModuleDescriptor getExecutionModuleDescriptor(
+			String moduleName, String version) {
+		ExecutionModule module = null;
+		for (ExecutionModule moduleT : executionModules) {
+			if (moduleT.getName().equals(moduleName)) {
+				// TODO: check version
+				module = moduleT;
+				break;
+			}
+		}
+
+		Assert.notNull(module);
+
+		return module.getDescriptor();
+	}
+	
+	
+
+	public List<ExecutionModule> listExecutionModules() {
+		return executionModules;
+	}
+
+
+
+	public void setExecutionModules(List<ExecutionModule> executionModules) {
+		this.executionModules = executionModules;
+	}
+
+}
diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/ModulesManager.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/ModulesManager.java
deleted file mode 100644
index 0f677eb21..000000000
--- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/ModulesManager.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.argeo.slc.core.execution;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.argeo.slc.execution.ExecutionModule;
-import org.argeo.slc.execution.ExecutionModuleDescriptor;
-import org.springframework.util.Assert;
-
-public class ModulesManager {
-	private List<ExecutionModule> executionModules = new ArrayList<ExecutionModule>();
-
-	public ExecutionModuleDescriptor getExecutionModuleDescriptor(
-			String moduleName, String version) {
-		ExecutionModule module = null;
-		for (ExecutionModule moduleT : executionModules) {
-			if(moduleT.getName().equals(moduleName)){
-				// TODO: check version
-				module = moduleT;
-				break;
-			}
-		}
-		
-		Assert.notNull(module);
-		
-		return module.getDescriptor();
-	}
-
-	public void setExecutionModules(List<ExecutionModule> executionModules) {
-		this.executionModules = executionModules;
-	}
-
-}
diff --git a/server/org.argeo.slc.siteserver/bundles/logging/log4j.properties b/server/org.argeo.slc.siteserver/bundles/logging/log4j.properties
index 0bde8b4b2..6c4dd861a 100644
--- a/server/org.argeo.slc.siteserver/bundles/logging/log4j.properties
+++ b/server/org.argeo.slc.siteserver/bundles/logging/log4j.properties
@@ -6,9 +6,9 @@ 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=INFO
+log4j.logger.org.springframework=WARN
 
-log4j.logger.org.apache.catalina=INFO
+log4j.logger.org.apache.catalina=WARN
 
 ## Appenders
 # console is set to be a ConsoleAppender.
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 6426dc9b7..002e6d9a7 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
@@ -20,4 +20,7 @@
 	<reference interface="org.hibernate.SessionFactory"
 		id="sessionFactory" />
 
+	<reference interface="org.argeo.slc.execution.ExecutionModulesManager"
+		id="modulesManager" />
+
 </beans:beans>
\ 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
deleted file mode 100644
index 1c9726909..000000000
--- a/server/org.argeo.slc.siteserver/bundles/org.argeo.slc.webapp.war/index.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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/pom.xml b/server/org.argeo.slc.siteserver/pom.xml
index e81a74800..6611adab2 100644
--- a/server/org.argeo.slc.siteserver/pom.xml
+++ b/server/org.argeo.slc.siteserver/pom.xml
@@ -80,6 +80,17 @@
 									<type>xml</type>
 									<classifier>osgiboot</classifier>
 								</artifactItem>
+								<!--  For Hibernate -->
+								<artifactItem>
+									<groupId>org.objectweb.asm</groupId>
+									<artifactId>com.springsource.org.objectweb.asm</artifactId>
+									<version>1.5.3</version>
+								</artifactItem>
+								<artifactItem>
+									<groupId>org.objectweb.asm</groupId>
+									<artifactId>com.springsource.org.objectweb.asm.attrs</artifactId>
+									<version>1.5.3</version>
+								</artifactItem>
 							</artifactItems>
 						</configuration>
 					</execution>
@@ -90,22 +101,31 @@
 				<configuration>
 					<tasks>
 					
+						<property name="equinoxDir" location="${project.build.directory}/equinox" />
+						
 						<property name="mavenClasspath" refid="maven.compile.classpath" />
+						<!--  
 						<property name="jar.asm.153" location="${user.home}/.m2/repository/org/objectweb/asm/com.springsource.org.objectweb.asm/1.5.3/com.springsource.org.objectweb.asm-1.5.3.jar" />
 						<property name="jar.asm.attrs.153" location="${user.home}/.m2/repository/org/objectweb/asm/com.springsource.org.objectweb.asm.attrs/1.5.3/com.springsource.org.objectweb.asm.attrs-1.5.3.jar" />
-						<property name="slc.osgi.locations" value="${jar.asm.153}${path.separator}${jar.asm.attrs.153}${path.separator}${mavenClasspath}" />
+						-->
+						<property name="jar.asm.153" location="${equinoxDir}/com.springsource.org.objectweb.asm.jar" />
+						<property name="jar.asm.attrs.153" location="${equinoxDir}/com.springsource.org.objectweb.asm.attrs.jar" />
+						
+						<property name="bundle.argeo.ria" location="../../org.argeo.slc.webapp/src/main/webapp" />
+				
+						<property name="slc.osgi.locations" value="${bundle.argeo.ria}${path.separator}${jar.asm.153}${path.separator}${jar.asm.attrs.153}${path.separator}${mavenClasspath}" />
 						
 						<property name="slc.osgi.devBases"
-							value="${user.dir}/bundles" />
+							value="${user.dir}/bundles,${user.dir}/../../demo/site" />
 						<property name="slc.osgi.devPatterns"
 							value="*" />
 						<property name="slc.osgi.start"
-							value="org.springframework.osgi.catalina.start.osgi,org.springframework.bundle.osgi.extender,org.springframework.bundle.osgi.web.extender,org.springframework.osgi.samples.simplewebapp,org.argeo.slc.server.activemq,org.argeo.slc.server.hibernate,org.argeo.slc.webapp" />
+							value="org.springframework.osgi.catalina.start.osgi,org.springframework.bundle.osgi.extender,org.springframework.bundle.osgi.web.extender,org.springframework.osgi.samples.simplewebapp,org.argeo.slc.server.activemq,org.argeo.slc.server.hibernate,org.argeo.slc.webapp,org.argeo.slc.demo.basic,org.argeo.slc.demo.manager" />
 
 						<property name="javaCommand"
 							location="${java.home}${file.separator}bin${file.separator}java" />
 						<ant
-							antfile="${project.build.directory}/equinox/org.argeo.slc.osgiboot-osgiboot.xml" />
+							antfile="${equinoxDir}/org.argeo.slc.osgiboot-osgiboot.xml" />
 
 					</tasks>
 				</configuration>
@@ -356,6 +376,26 @@
 			<version>${project.version}</version>
 		</dependency>
 
+
+	<!-- For demo -->
+			<dependency>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.support.equinox</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.support.activemq</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.support.castor</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.support.maven</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	
 	</dependencies>
 
 	<repositories>