From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 29 Mar 2012 12:14:20 +0000 (+0000)
Subject: Refactor demo
X-Git-Tag: argeo-slc-2.1.7~748
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=71c6047de9cceebf948dc4e1febbd698fb4c5293;p=gpl%2Fargeo-slc.git

Refactor demo

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

diff --git a/demo/site/org.argeo.slc.demo.ant/META-INF/MANIFEST.MF b/demo/site/org.argeo.slc.demo.ant/META-INF/MANIFEST.MF
index b3bcd3344..2fa564335 100644
--- a/demo/site/org.argeo.slc.demo.ant/META-INF/MANIFEST.MF
+++ b/demo/site/org.argeo.slc.demo.ant/META-INF/MANIFEST.MF
@@ -1,8 +1,22 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: SLC Demo Ant
-Bundle-SymbolicName: org.argeo.slc.demo.ant
-Bundle-Version: 0.13.2.SNAPSHOT
-Spring-Context: conf/*,conf/testCases/*
-Import-Package: org.aopalliance.aop,org.argeo.slc.ant,org.argeo.slc.core.execution,org.argeo.slc.execution,org.argeo.slc.osgi,org.springframework.aop,org.springframework.aop.framework,org.springframework.aop.scope,org.springframework.beans.factory.config,org.springframework.core.io
-Bundle-Description: Demonstrate Ant support
+Manifest-Version: 1.0
+Bnd-LastModified: 1333023158098
+Build-Jdk: 1.6.0_22
+Built-By: mbaudier
+Bundle-Description: Generic layers integrating free / open source techno
+ logies in order to quickly develop custom enterprise systems: security,
+  JCR, user interface, monitoring
+Bundle-DocURL: http://www.argeo.org
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-ManifestVersion: 2
+Bundle-Name: SLC Demo Ant
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-SymbolicName: org.argeo.slc.demo.ant
+Bundle-Vendor: Argeo
+Bundle-Version: 0.13.2.SNAPSHOT-r120329_1412
+Created-By: Apache Maven Bundle Plugin
+Import-Package: org.aopalliance.aop,org.argeo.slc.ant,org.argeo.slc.core
+ .execution,org.argeo.slc.core.execution.tasks,org.argeo.slc.execution,o
+ rg.argeo.slc.osgi,org.springframework.aop,org.springframework.aop.frame
+ work,org.springframework.aop.scope,org.springframework.beans.factory.co
+ nfig,org.springframework.core.io
+Tool: Bnd-1.50.0
diff --git a/demo/site/org.argeo.slc.demo.ant/META-INF/spring/ant.xml b/demo/site/org.argeo.slc.demo.ant/META-INF/spring/ant.xml
new file mode 100644
index 000000000..3cff3b49f
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.ant/META-INF/spring/ant.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"
+	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="main" class="org.argeo.slc.core.execution.DefaultExecutionFlow">
+		<property name="executables">
+			<list>
+				<bean class="org.argeo.slc.ant.AntRun">
+					<property name="buildFile" value="osgibundle:/ant/hello/build.xml" />
+				</bean>
+			</list>
+		</property>
+	</bean>
+</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.ant/META-INF/spring/flowGenerator.xml b/demo/site/org.argeo.slc.demo.ant/META-INF/spring/flowGenerator.xml
new file mode 100644
index 000000000..d25caf9de
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.ant/META-INF/spring/flowGenerator.xml
@@ -0,0 +1,18 @@
+<?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 class="org.argeo.slc.ant.AntFlowGenerator">
+		<property name="antFiles">
+			<list>
+				<value>osgibundle:/ant/hello/build.xml
+				</value>
+			</list>
+		</property>
+	</bean>
+</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.ant/META-INF/spring/imports.xml b/demo/site/org.argeo.slc.demo.ant/META-INF/spring/imports.xml
new file mode 100644
index 000000000..3428e8b85
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.ant/META-INF/spring/imports.xml
@@ -0,0 +1,8 @@
+<?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/simple.xml" />
+</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.ant/META-INF/spring/osgi.xml b/demo/site/org.argeo.slc.demo.ant/META-INF/spring/osgi.xml
new file mode 100644
index 000000000..f50522973
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.ant/META-INF/spring/osgi.xml
@@ -0,0 +1,10 @@
+<?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">
+
+	<beans:import resource="classpath:org/argeo/slc/osgi/execution.xml" />
+</beans:beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.ant/conf/ant.xml b/demo/site/org.argeo.slc.demo.ant/conf/ant.xml
deleted file mode 100644
index 3cff3b49f..000000000
--- a/demo/site/org.argeo.slc.demo.ant/conf/ant.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"
-	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="main" class="org.argeo.slc.core.execution.DefaultExecutionFlow">
-		<property name="executables">
-			<list>
-				<bean class="org.argeo.slc.ant.AntRun">
-					<property name="buildFile" value="osgibundle:/ant/hello/build.xml" />
-				</bean>
-			</list>
-		</property>
-	</bean>
-</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.ant/conf/flowGenerator.xml b/demo/site/org.argeo.slc.demo.ant/conf/flowGenerator.xml
deleted file mode 100644
index d25caf9de..000000000
--- a/demo/site/org.argeo.slc.demo.ant/conf/flowGenerator.xml
+++ /dev/null
@@ -1,18 +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 class="org.argeo.slc.ant.AntFlowGenerator">
-		<property name="antFiles">
-			<list>
-				<value>osgibundle:/ant/hello/build.xml
-				</value>
-			</list>
-		</property>
-	</bean>
-</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.ant/conf/imports.xml b/demo/site/org.argeo.slc.demo.ant/conf/imports.xml
deleted file mode 100644
index 3428e8b85..000000000
--- a/demo/site/org.argeo.slc.demo.ant/conf/imports.xml
+++ /dev/null
@@ -1,8 +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/simple.xml" />
-</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.ant/conf/osgi.xml b/demo/site/org.argeo.slc.demo.ant/conf/osgi.xml
deleted file mode 100644
index f50522973..000000000
--- a/demo/site/org.argeo.slc.demo.ant/conf/osgi.xml
+++ /dev/null
@@ -1,10 +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">
-
-	<beans:import resource="classpath:org/argeo/slc/osgi/execution.xml" />
-</beans:beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.ant/pom.xml b/demo/site/org.argeo.slc.demo.ant/pom.xml
new file mode 100644
index 000000000..e6acbfb8d
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.ant/pom.xml
@@ -0,0 +1,12 @@
+<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.demo</groupId>
+		<artifactId>modules</artifactId>
+		<version>0.13.2-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>org.argeo.slc.demo.ant</artifactId>
+	<name>SLC Demo Ant</name>
+</project>
\ No newline at end of file
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
index a7b301a36..696ce9a7c 100644
--- a/demo/site/org.argeo.slc.demo.basic/META-INF/MANIFEST.MF
+++ b/demo/site/org.argeo.slc.demo.basic/META-INF/MANIFEST.MF
@@ -1,28 +1,23 @@
-Manifest-Version: 1.0
-Bundle-SymbolicName: org.argeo.slc.demo.basic
-Bundle-Version: 0.13.2.SNAPSHOT
-Bundle-Name: SLC Demo Basic
-Bundle-Description: Test of basic features
-Spring-Context: conf/*,conf/testCases/*
-Import-Package: net.sf.cglib.core,
- net.sf.cglib.proxy,
- net.sf.cglib.reflect,
- org.aopalliance.aop,
- org.argeo.slc.core.attachment,
- org.argeo.slc.core.execution,
- org.argeo.slc.core.execution.tasks,
- org.argeo.slc.core.structure.tree,
- org.argeo.slc.core.test,
- org.argeo.slc.core.test.context,
- org.argeo.slc.core.test.tree,
- org.argeo.slc.execution,
- org.argeo.slc.jsch,
- org.argeo.slc.jsch.swing,
- org.argeo.slc.osgi,
- org.argeo.slc.structure,
- org.argeo.slc.test,
- org.springframework.aop,
- org.springframework.aop.framework,
- org.springframework.aop.scope,
- org.springframework.beans.factory.config,
- org.springframework.core.io
+Manifest-Version: 1.0
+Bnd-LastModified: 1333023158958
+Build-Jdk: 1.6.0_22
+Built-By: mbaudier
+Bundle-Description: Generic layers integrating free / open source techno
+ logies in order to quickly develop custom enterprise systems: security,
+  JCR, user interface, monitoring
+Bundle-DocURL: http://www.argeo.org
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-ManifestVersion: 2
+Bundle-Name: SLC Demo Basic
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-SymbolicName: org.argeo.slc.demo.basic
+Bundle-Vendor: Argeo
+Bundle-Version: 0.13.2.SNAPSHOT-r120329_1412
+Created-By: Apache Maven Bundle Plugin
+Import-Package: org.aopalliance.aop,org.argeo.slc.core.attachment,org.ar
+ geo.slc.core.execution,org.argeo.slc.core.execution.tasks,org.argeo.slc
+ .core.test,org.argeo.slc.core.test.tree,org.argeo.slc.execution,org.arg
+ eo.slc.jsch,org.argeo.slc.jsch.swing,org.argeo.slc.osgi,org.springframe
+ work.aop,org.springframework.aop.framework,org.springframework.aop.scop
+ e,org.springframework.beans.factory.config,org.springframework.core.io
+Tool: Bnd-1.50.0
diff --git a/demo/site/org.argeo.slc.demo.basic/META-INF/spring/basic.xml b/demo/site/org.argeo.slc.demo.basic/META-INF/spring/basic.xml
new file mode 100644
index 000000000..bc48b51d6
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.basic/META-INF/spring/basic.xml
@@ -0,0 +1,127 @@
+<?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">
+		<constructor-arg ref="basic.spec" />
+		<property name="path" value="/test/basic" />
+		<property name="executables">
+			<list>
+				<bean parent="task.echo" scope="execution">
+					<property name="message" value="From basic @{testedComponentId}" />
+					<aop:scoped-proxy />
+				</bean>
+				<bean parent="basic.testRun">
+					<property name="testDefinition" ref="basic.testDef" />
+					<property name="testData">
+						<bean parent="parameterRef">
+							<constructor-arg value="testData1" />
+						</bean>
+					</property>
+				</bean>
+				<bean parent="basic.testRun">
+					<property name="testDefinition" ref="basic.testDef" />
+					<property name="testData" ref="ref1" />
+				</bean>
+
+				<!-- Attachments -->
+				<bean parent="task.echo">
+					<property name="message" value="DATA" />
+					<property name="writeTo" ref="basic.writeTo" />
+				</bean>
+
+				<bean parent="task.uploadAttachments">
+					<property name="attachmentUploader" ref="attachmentUploader" />
+					<property name="attachment">
+						<bean parent="taskArg.attachment">
+							<property name="name" value="myAttachment.txt" />
+						</bean>
+					</property>
+					<property name="resource" ref="basic.writeTo" />
+					<property name="attachTo">
+						<list>
+							<ref bean="basic.testResult" />
+						</list>
+					</property>
+				</bean>
+
+				<bean parent="task.closeTestResult" scope="execution">
+					<property name="testResult" ref="basic.testResult" />
+				</bean>
+			</list>
+		</property>
+	</bean>
+
+	<bean id="ref1" parent="parameterRef" 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>
+
+	<bean id="basic.testDef" class="org.argeo.slc.core.test.BasicTestDefinition"
+		scope="prototype" />
+
+	<bean id="basic.testResult" parent="slcDefault.test.basicTreeTestResult"
+		scope="execution">
+		<property name="listeners" ref="resultListeners" />
+		<property name="attributes">
+			<map>
+				<entry key="testedComponentId" value="@{testedComponentId}" />
+			</map>
+		</property>
+		<aop:scoped-proxy />
+	</bean>
+
+	<bean id="basic.testRun" class="org.argeo.slc.core.test.SimpleTestRun"
+		abstract="true">
+		<property name="testResult" ref="basic.testResult" />
+	</bean>
+
+	<bean id="basic.writeTo" factory-bean="basic.resourcesManager"
+		factory-method="getWritableResource" scope="execution">
+		<constructor-arg value="subdir/writeTo" />
+		<aop:scoped-proxy />
+	</bean>
+
+	<bean id="basic.resourcesManager" parent="slcTemplate.fileResources">
+		<property name="executionContext" ref="executionContext" />
+	</bean>
+
+
+
+</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/META-INF/spring/canonic-ns.xml b/demo/site/org.argeo.slc.demo.basic/META-INF/spring/canonic-ns.xml
new file mode 100644
index 000000000..adf60c1db
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.basic/META-INF/spring/canonic-ns.xml
@@ -0,0 +1,57 @@
+<?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" xmlns:flow="http://www.argeo.org/schema/slc-flow"
+	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
+	http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">
+
+	<flow:spec id="canonic-ns.spec">
+		<flow:primitive name="parameterAtInstantiation"
+			isParameter="true" type="integer" />
+		<flow:primitive name="displayWithoutControl" value="100"
+			isParameter="true" type="integer" isFrozen="true" />
+		<flow:primitive name="displayWithControl" value="200"
+			isParameter="true" type="integer" />
+		<flow:primitive name="hide" value="300" isParameter="true"
+			type="integer" isHidden="true" />
+		<flow:ref name="refWithValue" targetClass="org.argeo.slc.core.test.BasicTestData"
+			isParameter="true" ref="testDataNok" />
+		<flow:ref name="refWithoutValue" targetClass="org.argeo.slc.core.test.BasicTestData" />
+		<flow:ref name="refWithoutValueFrozen" targetClass="org.argeo.slc.core.test.BasicTestData"
+			isParameter="true" isFrozen="true">
+			<flow:value>
+				<bean class="org.argeo.slc.core.test.BasicTestData">
+					<aop:scoped-proxy />
+					<property name="expected" value="tata" />
+					<property name="reached" value="tata" />
+				</bean>
+			</flow:value>
+		</flow:ref>
+	</flow:spec>
+
+	<flow:flow id="canonic-ns.flowTemplate" abstract="true"
+		spec="canonic-ns.spec">
+		<bean parent="task.echo"
+			p:message="Canonical: displayWithControl=@{displayWithControl}, displayWithoutControl=@{displayWithoutControl}, hide=@{hide}"
+			scope="execution">
+			<aop:scoped-proxy />
+		</bean>
+	</flow:flow>
+
+	<bean id="testDataOk" class="org.argeo.slc.core.test.BasicTestData">
+		<aop:scoped-proxy />
+		<property name="expected" value="tata" />
+		<property name="reached" value="tata" />
+	</bean>
+
+	<bean id="testDataNok" class="org.argeo.slc.core.test.BasicTestData">
+		<aop:scoped-proxy />
+		<property name="expected" value="tata" />
+		<property name="reached" value="toto" />
+	</bean>
+
+
+</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/META-INF/spring/canonic.xml b/demo/site/org.argeo.slc.demo.basic/META-INF/spring/canonic.xml
new file mode 100644
index 000000000..5d5f45ebb
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.basic/META-INF/spring/canonic.xml
@@ -0,0 +1,80 @@
+<?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">
+		<description>Covers various combinations of specs</description>
+		<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="false"
+						p:isFrozen="true" p:type="integer" />
+				</entry>
+				<entry key="displayWithControl">
+					<bean parent="specAttr.primitive" p:value="200" p:isParameter="false"
+						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>
+				<entry key="refWithValue">
+					<bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"
+						p:value-ref="testDataNok" p:isParameter="true" p:isFrozen="false" />
+				</entry>
+				<entry key="refWithoutValue">
+					<bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"
+						p:isParameter="false" p:isFrozen="false" />
+				</entry>
+				<entry key="refWithoutValueFrozen">
+					<bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"
+						p:isParameter="true" p:isFrozen="true">
+						<property name="value">
+							<bean class="org.argeo.slc.core.test.BasicTestData">
+								<aop:scoped-proxy />
+								<property name="expected" value="tata" />
+								<property name="reached" value="tata" />
+							</bean>
+						</property>
+					</bean>
+				</entry>
+			</map>
+		</property>
+	</bean>
+
+	<bean id="canonic.flowTemplate" parent="slcTemplate.simpleFlow"
+		abstract="true">
+		<constructor-arg 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>
+
+	<bean id="testDataOk" class="org.argeo.slc.core.test.BasicTestData">
+		<aop:scoped-proxy />
+		<property name="expected" value="tata" />
+		<property name="reached" value="tata" />
+	</bean>
+
+	<bean id="testDataNok" class="org.argeo.slc.core.test.BasicTestData">
+		<aop:scoped-proxy />
+		<property name="expected" value="tata" />
+		<property name="reached" value="toto" />
+	</bean>
+
+
+</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/META-INF/spring/imports.xml b/demo/site/org.argeo.slc.demo.basic/META-INF/spring/imports.xml
new file mode 100644
index 000000000..dc44a31c3
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.basic/META-INF/spring/imports.xml
@@ -0,0 +1,11 @@
+<?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.xml" />
+
+</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/META-INF/spring/main.xml b/demo/site/org.argeo.slc.demo.basic/META-INF/spring/main.xml
new file mode 100644
index 000000000..7c9785d92
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.basic/META-INF/spring/main.xml
@@ -0,0 +1,49 @@
+<?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="main" parent="slcTemplate.simpleFlow">
+		<description>The Main Flow</description>
+		<constructor-arg>
+			<bean parent="slcTemplate.simpleSpec">
+				<property name="attributes">
+					<map>
+						<entry key="testKey">
+							<bean parent="specAttr.primitive" p:value="660" />
+						</entry>
+					</map>
+				</property>
+			</bean>
+		</constructor-arg>
+		<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="noArg" parent="slcTemplate.simpleFlow">
+		<property name="executables">
+			<list>
+				<bean parent="task.echo">
+					<property name="message" value="No rg!" />
+				</bean>
+			</list>
+		</property>
+	</bean>
+
+	<bean id="echo1" parent="task.echo" scope="execution">
+		<property name="message" value="From main! @{testKey}" />
+		<aop:scoped-proxy />
+	</bean>
+</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/META-INF/spring/namespace.xml b/demo/site/org.argeo.slc.demo.basic/META-INF/spring/namespace.xml
new file mode 100644
index 000000000..c0767ecbb
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.basic/META-INF/spring/namespace.xml
@@ -0,0 +1,40 @@
+<?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" xmlns:flow="http://www.argeo.org/schema/slc-flow"
+	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
+	http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">
+
+	<!-- Flow definition is simplified thanks to the 'flow:flow' element -->
+	<flow:flow id="flow" path="/namespace">
+		<bean p:message="TEST in flow" class="org.argeo.slc.core.execution.tasks.Echo" />
+		<ref bean="referencedRunnable" />
+	</flow:flow>
+
+	<bean id="referencedRunnable" p:message="TEST in referenced Runnable"
+		class="org.argeo.slc.core.execution.tasks.Echo" />
+
+	<!--
+		Standalone beans implementing Runnable can be exposed as flows via the
+		'flow:as-flow' attribute
+	-->
+	<bean id="standaloneRunnable" flow:as-flow="implicitFlow"
+		p:message="TEST in implicit flow" class="org.argeo.slc.core.execution.tasks.Echo" />
+
+	<!-- Specs definition is also simplified -->
+	<flow:spec id="namespaceSpec">
+		<flow:primitive name="primitive" value="100"
+			isParameter="true" type="integer" />
+	</flow:spec>
+
+	<flow:flow id="flowSpec" spec="namespaceSpec" path="/namespace">
+		<bean p:message="TEST in flow @{primitive}" class="org.argeo.slc.core.execution.tasks.Echo"
+			scope="execution">
+			<aop:scoped-proxy />
+		</bean>
+		<ref bean="referencedRunnable" />
+	</flow:flow>
+
+</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/META-INF/spring/osgi.xml b/demo/site/org.argeo.slc.demo.basic/META-INF/spring/osgi.xml
new file mode 100644
index 000000000..e7390c312
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.basic/META-INF/spring/osgi.xml
@@ -0,0 +1,17 @@
+<?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">
+
+	<beans:import resource="classpath:org/argeo/slc/osgi/execution.xml" />
+
+	<reference id="attachmentUploader"
+		interface="org.argeo.slc.core.attachment.AttachmentUploader"
+		cardinality="0..1" />
+
+	<list id="resultListeners" interface="org.argeo.slc.core.test.tree.TreeTestResultListener"
+		cardinality="0..N" />
+</beans:beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/META-INF/spring/systemCall.xml b/demo/site/org.argeo.slc.demo.basic/META-INF/spring/systemCall.xml
new file mode 100644
index 000000000..bb5f79fb6
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.basic/META-INF/spring/systemCall.xml
@@ -0,0 +1,46 @@
+<?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" xmlns:flow="http://www.argeo.org/schema/slc-flow"
+	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
+	http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">
+
+	<!-- Basic echo, should work on all OSs -->
+	<flow:flow name="os/systemCall">
+		<bean p:cmd="echo Hello World!" class="org.argeo.slc.core.execution.tasks.SystemCall" />
+	</flow:flow>
+
+	<!-- Must disable requiretty in sudoers file -->
+	<flow:flow name="os/sudo">
+		<bean p:cmd="sudo id" class="org.argeo.slc.core.execution.tasks.SystemCall">
+			<property name="environmentVariables">
+				<map>
+					<entry key="SUDO_ASKPASS" value="/usr/libexec/openssh/gnome-ssh-askpass" />
+				</map>
+			</property>
+		</bean>
+	</flow:flow>
+
+	<!-- SSH -->
+	<flow:flow name="os/ssh">
+		<bean p:cmd="ls /etc" class="org.argeo.slc.core.execution.tasks.SystemCall">
+			<property name="executor" ref="sshExecutor" />
+		</bean>
+	</flow:flow>
+
+	<bean name="sshExecutor" class="org.argeo.slc.jsch.JschExecutor">
+		<property name="sshTarget">
+			<bean p:host="localhost" p:port="22" p:user="${user.name}"
+				p:localPrivateKey="${user.home}/.ssh/id_rsa" class="org.argeo.slc.jsch.SshTarget">
+				<property name="userInfo">
+					<bean class="org.argeo.slc.jsch.swing.SwingUserInfo" />
+				</property>
+			</bean>
+		</property>
+	</bean>
+
+
+
+</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/META-INF/spring/testCases/basic-001.xml b/demo/site/org.argeo.slc.demo.basic/META-INF/spring/testCases/basic-001.xml
new file mode 100644
index 000000000..c68414a9b
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.basic/META-INF/spring/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@{testedComponentId}" />
+					</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/META-INF/spring/testCases/basic-002.xml b/demo/site/org.argeo.slc.demo.basic/META-INF/spring/testCases/basic-002.xml
new file mode 100644
index 000000000..5720d9693
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.basic/META-INF/spring/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/META-INF/spring/testCases/canonic-001.xml b/demo/site/org.argeo.slc.demo.basic/META-INF/spring/testCases/canonic-001.xml
new file mode 100644
index 000000000..181e3e760
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.basic/META-INF/spring/testCases/canonic-001.xml
@@ -0,0 +1,18 @@
+<?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">
+		<description>Canonic 001</description>
+		<constructor-arg>
+			<map>
+				<entry key="parameterAtInstantiation" value="1" />
+			</map>
+		</constructor-arg>
+	</bean>
+</beans>
diff --git a/demo/site/org.argeo.slc.demo.basic/META-INF/spring/testCases/canonic-002.xml b/demo/site/org.argeo.slc.demo.basic/META-INF/spring/testCases/canonic-002.xml
new file mode 100644
index 000000000..5916c08e6
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.basic/META-INF/spring/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.basic/META-INF/spring/testCases/canonic-ns-001.xml b/demo/site/org.argeo.slc.demo.basic/META-INF/spring/testCases/canonic-ns-001.xml
new file mode 100644
index 000000000..5b1dbf6dc
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.basic/META-INF/spring/testCases/canonic-ns-001.xml
@@ -0,0 +1,18 @@
+<?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-ns.001" parent="canonic-ns.flowTemplate">
+		<description>Canonic 001</description>
+		<constructor-arg>
+			<map>
+				<entry key="parameterAtInstantiation" value="1" />
+			</map>
+		</constructor-arg>
+	</bean>
+</beans>
diff --git a/demo/site/org.argeo.slc.demo.basic/META-INF/spring/testCases/canonic-ns-002.xml b/demo/site/org.argeo.slc.demo.basic/META-INF/spring/testCases/canonic-ns-002.xml
new file mode 100644
index 000000000..991f67f6f
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.basic/META-INF/spring/testCases/canonic-ns-002.xml
@@ -0,0 +1,16 @@
+<?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" xmlns:flow="http://www.argeo.org/schema/slc-flow"
+	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
+	http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">
+
+	<flow:flow id="canonic-ns.002" parent="canonic-ns.flowTemplate">
+		<flow:arg name="parameterAtInstantiation" value="2" />
+		<flow:arg name="displayWithoutControl" value="102" />
+		<flow:arg name="displayWithControl" value="202" />
+		<flow:arg name="hide" value="202" />
+	</flow:flow>
+</beans>
diff --git a/demo/site/org.argeo.slc.demo.basic/conf/basic.xml b/demo/site/org.argeo.slc.demo.basic/conf/basic.xml
deleted file mode 100644
index bc48b51d6..000000000
--- a/demo/site/org.argeo.slc.demo.basic/conf/basic.xml
+++ /dev/null
@@ -1,127 +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">
-		<constructor-arg ref="basic.spec" />
-		<property name="path" value="/test/basic" />
-		<property name="executables">
-			<list>
-				<bean parent="task.echo" scope="execution">
-					<property name="message" value="From basic @{testedComponentId}" />
-					<aop:scoped-proxy />
-				</bean>
-				<bean parent="basic.testRun">
-					<property name="testDefinition" ref="basic.testDef" />
-					<property name="testData">
-						<bean parent="parameterRef">
-							<constructor-arg value="testData1" />
-						</bean>
-					</property>
-				</bean>
-				<bean parent="basic.testRun">
-					<property name="testDefinition" ref="basic.testDef" />
-					<property name="testData" ref="ref1" />
-				</bean>
-
-				<!-- Attachments -->
-				<bean parent="task.echo">
-					<property name="message" value="DATA" />
-					<property name="writeTo" ref="basic.writeTo" />
-				</bean>
-
-				<bean parent="task.uploadAttachments">
-					<property name="attachmentUploader" ref="attachmentUploader" />
-					<property name="attachment">
-						<bean parent="taskArg.attachment">
-							<property name="name" value="myAttachment.txt" />
-						</bean>
-					</property>
-					<property name="resource" ref="basic.writeTo" />
-					<property name="attachTo">
-						<list>
-							<ref bean="basic.testResult" />
-						</list>
-					</property>
-				</bean>
-
-				<bean parent="task.closeTestResult" scope="execution">
-					<property name="testResult" ref="basic.testResult" />
-				</bean>
-			</list>
-		</property>
-	</bean>
-
-	<bean id="ref1" parent="parameterRef" 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>
-
-	<bean id="basic.testDef" class="org.argeo.slc.core.test.BasicTestDefinition"
-		scope="prototype" />
-
-	<bean id="basic.testResult" parent="slcDefault.test.basicTreeTestResult"
-		scope="execution">
-		<property name="listeners" ref="resultListeners" />
-		<property name="attributes">
-			<map>
-				<entry key="testedComponentId" value="@{testedComponentId}" />
-			</map>
-		</property>
-		<aop:scoped-proxy />
-	</bean>
-
-	<bean id="basic.testRun" class="org.argeo.slc.core.test.SimpleTestRun"
-		abstract="true">
-		<property name="testResult" ref="basic.testResult" />
-	</bean>
-
-	<bean id="basic.writeTo" factory-bean="basic.resourcesManager"
-		factory-method="getWritableResource" scope="execution">
-		<constructor-arg value="subdir/writeTo" />
-		<aop:scoped-proxy />
-	</bean>
-
-	<bean id="basic.resourcesManager" parent="slcTemplate.fileResources">
-		<property name="executionContext" ref="executionContext" />
-	</bean>
-
-
-
-</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/conf/canonic-ns.xml b/demo/site/org.argeo.slc.demo.basic/conf/canonic-ns.xml
deleted file mode 100644
index adf60c1db..000000000
--- a/demo/site/org.argeo.slc.demo.basic/conf/canonic-ns.xml
+++ /dev/null
@@ -1,57 +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" xmlns:flow="http://www.argeo.org/schema/slc-flow"
-	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
-	http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">
-
-	<flow:spec id="canonic-ns.spec">
-		<flow:primitive name="parameterAtInstantiation"
-			isParameter="true" type="integer" />
-		<flow:primitive name="displayWithoutControl" value="100"
-			isParameter="true" type="integer" isFrozen="true" />
-		<flow:primitive name="displayWithControl" value="200"
-			isParameter="true" type="integer" />
-		<flow:primitive name="hide" value="300" isParameter="true"
-			type="integer" isHidden="true" />
-		<flow:ref name="refWithValue" targetClass="org.argeo.slc.core.test.BasicTestData"
-			isParameter="true" ref="testDataNok" />
-		<flow:ref name="refWithoutValue" targetClass="org.argeo.slc.core.test.BasicTestData" />
-		<flow:ref name="refWithoutValueFrozen" targetClass="org.argeo.slc.core.test.BasicTestData"
-			isParameter="true" isFrozen="true">
-			<flow:value>
-				<bean class="org.argeo.slc.core.test.BasicTestData">
-					<aop:scoped-proxy />
-					<property name="expected" value="tata" />
-					<property name="reached" value="tata" />
-				</bean>
-			</flow:value>
-		</flow:ref>
-	</flow:spec>
-
-	<flow:flow id="canonic-ns.flowTemplate" abstract="true"
-		spec="canonic-ns.spec">
-		<bean parent="task.echo"
-			p:message="Canonical: displayWithControl=@{displayWithControl}, displayWithoutControl=@{displayWithoutControl}, hide=@{hide}"
-			scope="execution">
-			<aop:scoped-proxy />
-		</bean>
-	</flow:flow>
-
-	<bean id="testDataOk" class="org.argeo.slc.core.test.BasicTestData">
-		<aop:scoped-proxy />
-		<property name="expected" value="tata" />
-		<property name="reached" value="tata" />
-	</bean>
-
-	<bean id="testDataNok" class="org.argeo.slc.core.test.BasicTestData">
-		<aop:scoped-proxy />
-		<property name="expected" value="tata" />
-		<property name="reached" value="toto" />
-	</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
deleted file mode 100644
index 5d5f45ebb..000000000
--- a/demo/site/org.argeo.slc.demo.basic/conf/canonic.xml
+++ /dev/null
@@ -1,80 +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">
-		<description>Covers various combinations of specs</description>
-		<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="false"
-						p:isFrozen="true" p:type="integer" />
-				</entry>
-				<entry key="displayWithControl">
-					<bean parent="specAttr.primitive" p:value="200" p:isParameter="false"
-						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>
-				<entry key="refWithValue">
-					<bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"
-						p:value-ref="testDataNok" p:isParameter="true" p:isFrozen="false" />
-				</entry>
-				<entry key="refWithoutValue">
-					<bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"
-						p:isParameter="false" p:isFrozen="false" />
-				</entry>
-				<entry key="refWithoutValueFrozen">
-					<bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"
-						p:isParameter="true" p:isFrozen="true">
-						<property name="value">
-							<bean class="org.argeo.slc.core.test.BasicTestData">
-								<aop:scoped-proxy />
-								<property name="expected" value="tata" />
-								<property name="reached" value="tata" />
-							</bean>
-						</property>
-					</bean>
-				</entry>
-			</map>
-		</property>
-	</bean>
-
-	<bean id="canonic.flowTemplate" parent="slcTemplate.simpleFlow"
-		abstract="true">
-		<constructor-arg 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>
-
-	<bean id="testDataOk" class="org.argeo.slc.core.test.BasicTestData">
-		<aop:scoped-proxy />
-		<property name="expected" value="tata" />
-		<property name="reached" value="tata" />
-	</bean>
-
-	<bean id="testDataNok" class="org.argeo.slc.core.test.BasicTestData">
-		<aop:scoped-proxy />
-		<property name="expected" value="tata" />
-		<property name="reached" value="toto" />
-	</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
deleted file mode 100644
index dc44a31c3..000000000
--- a/demo/site/org.argeo.slc.demo.basic/conf/imports.xml
+++ /dev/null
@@ -1,11 +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.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
deleted file mode 100644
index 7c9785d92..000000000
--- a/demo/site/org.argeo.slc.demo.basic/conf/main.xml
+++ /dev/null
@@ -1,49 +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="main" parent="slcTemplate.simpleFlow">
-		<description>The Main Flow</description>
-		<constructor-arg>
-			<bean parent="slcTemplate.simpleSpec">
-				<property name="attributes">
-					<map>
-						<entry key="testKey">
-							<bean parent="specAttr.primitive" p:value="660" />
-						</entry>
-					</map>
-				</property>
-			</bean>
-		</constructor-arg>
-		<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="noArg" parent="slcTemplate.simpleFlow">
-		<property name="executables">
-			<list>
-				<bean parent="task.echo">
-					<property name="message" value="No rg!" />
-				</bean>
-			</list>
-		</property>
-	</bean>
-
-	<bean id="echo1" parent="task.echo" scope="execution">
-		<property name="message" value="From main! @{testKey}" />
-		<aop:scoped-proxy />
-	</bean>
-</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/conf/namespace.xml b/demo/site/org.argeo.slc.demo.basic/conf/namespace.xml
deleted file mode 100644
index c0767ecbb..000000000
--- a/demo/site/org.argeo.slc.demo.basic/conf/namespace.xml
+++ /dev/null
@@ -1,40 +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" xmlns:flow="http://www.argeo.org/schema/slc-flow"
-	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
-	http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">
-
-	<!-- Flow definition is simplified thanks to the 'flow:flow' element -->
-	<flow:flow id="flow" path="/namespace">
-		<bean p:message="TEST in flow" class="org.argeo.slc.core.execution.tasks.Echo" />
-		<ref bean="referencedRunnable" />
-	</flow:flow>
-
-	<bean id="referencedRunnable" p:message="TEST in referenced Runnable"
-		class="org.argeo.slc.core.execution.tasks.Echo" />
-
-	<!--
-		Standalone beans implementing Runnable can be exposed as flows via the
-		'flow:as-flow' attribute
-	-->
-	<bean id="standaloneRunnable" flow:as-flow="implicitFlow"
-		p:message="TEST in implicit flow" class="org.argeo.slc.core.execution.tasks.Echo" />
-
-	<!-- Specs definition is also simplified -->
-	<flow:spec id="namespaceSpec">
-		<flow:primitive name="primitive" value="100"
-			isParameter="true" type="integer" />
-	</flow:spec>
-
-	<flow:flow id="flowSpec" spec="namespaceSpec" path="/namespace">
-		<bean p:message="TEST in flow @{primitive}" class="org.argeo.slc.core.execution.tasks.Echo"
-			scope="execution">
-			<aop:scoped-proxy />
-		</bean>
-		<ref bean="referencedRunnable" />
-	</flow:flow>
-
-</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
deleted file mode 100644
index e7390c312..000000000
--- a/demo/site/org.argeo.slc.demo.basic/conf/osgi.xml
+++ /dev/null
@@ -1,17 +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">
-
-	<beans:import resource="classpath:org/argeo/slc/osgi/execution.xml" />
-
-	<reference id="attachmentUploader"
-		interface="org.argeo.slc.core.attachment.AttachmentUploader"
-		cardinality="0..1" />
-
-	<list id="resultListeners" interface="org.argeo.slc.core.test.tree.TreeTestResultListener"
-		cardinality="0..N" />
-</beans:beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/conf/systemCall.xml b/demo/site/org.argeo.slc.demo.basic/conf/systemCall.xml
deleted file mode 100644
index bb5f79fb6..000000000
--- a/demo/site/org.argeo.slc.demo.basic/conf/systemCall.xml
+++ /dev/null
@@ -1,46 +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" xmlns:flow="http://www.argeo.org/schema/slc-flow"
-	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
-	http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">
-
-	<!-- Basic echo, should work on all OSs -->
-	<flow:flow name="os/systemCall">
-		<bean p:cmd="echo Hello World!" class="org.argeo.slc.core.execution.tasks.SystemCall" />
-	</flow:flow>
-
-	<!-- Must disable requiretty in sudoers file -->
-	<flow:flow name="os/sudo">
-		<bean p:cmd="sudo id" class="org.argeo.slc.core.execution.tasks.SystemCall">
-			<property name="environmentVariables">
-				<map>
-					<entry key="SUDO_ASKPASS" value="/usr/libexec/openssh/gnome-ssh-askpass" />
-				</map>
-			</property>
-		</bean>
-	</flow:flow>
-
-	<!-- SSH -->
-	<flow:flow name="os/ssh">
-		<bean p:cmd="ls /etc" class="org.argeo.slc.core.execution.tasks.SystemCall">
-			<property name="executor" ref="sshExecutor" />
-		</bean>
-	</flow:flow>
-
-	<bean name="sshExecutor" class="org.argeo.slc.jsch.JschExecutor">
-		<property name="sshTarget">
-			<bean p:host="localhost" p:port="22" p:user="${user.name}"
-				p:localPrivateKey="${user.home}/.ssh/id_rsa" class="org.argeo.slc.jsch.SshTarget">
-				<property name="userInfo">
-					<bean class="org.argeo.slc.jsch.swing.SwingUserInfo" />
-				</property>
-			</bean>
-		</property>
-	</bean>
-
-
-
-</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
deleted file mode 100644
index c68414a9b..000000000
--- a/demo/site/org.argeo.slc.demo.basic/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@{testedComponentId}" />
-					</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
deleted file mode 100644
index 5720d9693..000000000
--- a/demo/site/org.argeo.slc.demo.basic/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/site/org.argeo.slc.demo.basic/conf/testCases/canonic-001.xml b/demo/site/org.argeo.slc.demo.basic/conf/testCases/canonic-001.xml
deleted file mode 100644
index 181e3e760..000000000
--- a/demo/site/org.argeo.slc.demo.basic/conf/testCases/canonic-001.xml
+++ /dev/null
@@ -1,18 +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">
-		<description>Canonic 001</description>
-		<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
deleted file mode 100644
index 5916c08e6..000000000
--- a/demo/site/org.argeo.slc.demo.basic/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/site/org.argeo.slc.demo.basic/conf/testCases/canonic-ns-001.xml b/demo/site/org.argeo.slc.demo.basic/conf/testCases/canonic-ns-001.xml
deleted file mode 100644
index 5b1dbf6dc..000000000
--- a/demo/site/org.argeo.slc.demo.basic/conf/testCases/canonic-ns-001.xml
+++ /dev/null
@@ -1,18 +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-ns.001" parent="canonic-ns.flowTemplate">
-		<description>Canonic 001</description>
-		<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-ns-002.xml b/demo/site/org.argeo.slc.demo.basic/conf/testCases/canonic-ns-002.xml
deleted file mode 100644
index 991f67f6f..000000000
--- a/demo/site/org.argeo.slc.demo.basic/conf/testCases/canonic-ns-002.xml
+++ /dev/null
@@ -1,16 +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" xmlns:flow="http://www.argeo.org/schema/slc-flow"
-	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
-	http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">
-
-	<flow:flow id="canonic-ns.002" parent="canonic-ns.flowTemplate">
-		<flow:arg name="parameterAtInstantiation" value="2" />
-		<flow:arg name="displayWithoutControl" value="102" />
-		<flow:arg name="displayWithControl" value="202" />
-		<flow:arg name="hide" value="202" />
-	</flow:flow>
-</beans>
diff --git a/demo/site/org.argeo.slc.demo.basic/pom.xml b/demo/site/org.argeo.slc.demo.basic/pom.xml
new file mode 100644
index 000000000..0c45539ca
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.basic/pom.xml
@@ -0,0 +1,12 @@
+<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.demo</groupId>
+		<artifactId>modules</artifactId>
+		<version>0.13.2-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>org.argeo.slc.demo.basic</artifactId>
+	<name>SLC Demo Basic</name>
+</project>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.det/META-INF/MANIFEST.MF b/demo/site/org.argeo.slc.demo.det/META-INF/MANIFEST.MF
index 3654d400a..e6a00677f 100644
--- a/demo/site/org.argeo.slc.demo.det/META-INF/MANIFEST.MF
+++ b/demo/site/org.argeo.slc.demo.det/META-INF/MANIFEST.MF
@@ -1,8 +1,22 @@
-Manifest-Version: 1.0
-Bundle-Version: 0.13.2.SNAPSHOT
-Bundle-Name: SLC Demo Detached (Detached Bundle)
-Bundle-Description: Detached Bundle
-Import-Package: org.argeo.slc.detached,org.argeo.slc.detached.admin,or
- g.springframework.beans.factory.config,org.argeo.slc.detached.drivers
- ,org.apache.xerces.jaxp,org.w3c.dom;version="0.0.0"
-Bundle-SymbolicName: org.argeo.slc.demo.det
+Manifest-Version: 1.0
+Bnd-LastModified: 1333023159410
+Build-Jdk: 1.6.0_22
+Built-By: mbaudier
+Bundle-Description: Generic layers integrating free / open source techno
+ logies in order to quickly develop custom enterprise systems: security,
+  JCR, user interface, monitoring
+Bundle-DocURL: http://www.argeo.org
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-ManifestVersion: 2
+Bundle-Name: SLC Demo Det(ached)
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-SymbolicName: org.argeo.slc.demo.det
+Bundle-Vendor: Argeo
+Bundle-Version: 0.13.2.SNAPSHOT-r120329_1412
+Created-By: Apache Maven Bundle Plugin
+Import-Package: org.aopalliance.aop,org.argeo.slc.core.execution,org.arg
+ eo.slc.core.execution.tasks,org.argeo.slc.detached,org.argeo.slc.execut
+ ion,org.argeo.slc.osgi,org.springframework.aop,org.springframework.aop.
+ framework,org.springframework.aop.scope,org.springframework.beans.facto
+ ry.config,org.springframework.core.io
+Tool: Bnd-1.50.0
diff --git a/demo/site/org.argeo.slc.demo.det/pom.xml b/demo/site/org.argeo.slc.demo.det/pom.xml
new file mode 100644
index 000000000..efbd30ce2
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.det/pom.xml
@@ -0,0 +1,12 @@
+<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.demo</groupId>
+		<artifactId>modules</artifactId>
+		<version>0.13.2-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>org.argeo.slc.demo.det</artifactId>
+	<name>SLC Demo Det(ached)</name>
+</project>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.detached/META-INF/MANIFEST.MF b/demo/site/org.argeo.slc.demo.detached/META-INF/MANIFEST.MF
index 8634bca42..8a9e57465 100644
--- a/demo/site/org.argeo.slc.demo.detached/META-INF/MANIFEST.MF
+++ b/demo/site/org.argeo.slc.demo.detached/META-INF/MANIFEST.MF
@@ -1,28 +1,23 @@
-Manifest-Version: 1.0
-Bundle-SymbolicName: org.argeo.slc.demo.detached
-Bundle-Version: 0.13.2.SNAPSHOT
-Bundle-Name: SLC Demo Detached (Test)
-Import-Package: net.sf.cglib.core,
- net.sf.cglib.proxy,
- net.sf.cglib.reflect,
- org.aopalliance.aop,
- org.argeo.slc.core.attachment,
- org.argeo.slc.core.execution,
- org.argeo.slc.core.execution.tasks,
- org.argeo.slc.core.structure.tree,
- org.argeo.slc.core.test,
- org.argeo.slc.core.test.context,
- org.argeo.slc.core.test.tree,
- org.argeo.slc.detached,
- org.argeo.slc.detached.drivers,
- org.argeo.slc.execution,
- org.argeo.slc.lib.detached,
- org.argeo.slc.osgi,
- org.argeo.slc.structure,
- org.argeo.slc.test,
- org.springframework.aop,
- org.springframework.aop.framework,
- org.springframework.aop.scope,
- org.springframework.beans.factory.config,
- org.springframework.core.io,
- org.springframework.oxm.castor
+Manifest-Version: 1.0
+Bnd-LastModified: 1333023159802
+Build-Jdk: 1.6.0_22
+Built-By: mbaudier
+Bundle-Description: Generic layers integrating free / open source techno
+ logies in order to quickly develop custom enterprise systems: security,
+  JCR, user interface, monitoring
+Bundle-DocURL: http://www.argeo.org
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-ManifestVersion: 2
+Bundle-Name: SLC Demo Detached
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-SymbolicName: org.argeo.slc.demo.detached
+Bundle-Vendor: Argeo
+Bundle-Version: 0.13.2.SNAPSHOT-r120329_1412
+Created-By: Apache Maven Bundle Plugin
+Import-Package: org.aopalliance.aop,org.argeo.slc.core.execution,org.arg
+ eo.slc.core.execution.tasks,org.argeo.slc.core.test,org.argeo.slc.core.
+ test.tree,org.argeo.slc.detached.drivers,org.argeo.slc.execution,org.ar
+ geo.slc.lib.detached,org.argeo.slc.osgi,org.springframework.aop,org.spr
+ ingframework.aop.framework,org.springframework.aop.scope,org.springfram
+ ework.beans.factory.config,org.springframework.core.io
+Tool: Bnd-1.50.0
diff --git a/demo/site/org.argeo.slc.demo.detached/pom.xml b/demo/site/org.argeo.slc.demo.detached/pom.xml
new file mode 100644
index 000000000..a61b8b6c8
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.detached/pom.xml
@@ -0,0 +1,12 @@
+<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.demo</groupId>
+		<artifactId>modules</artifactId>
+		<version>0.13.2-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>org.argeo.slc.demo.detached</artifactId>
+	<name>SLC Demo Detached</name>
+</project>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.maven/META-INF/MANIFEST.MF b/demo/site/org.argeo.slc.demo.maven/META-INF/MANIFEST.MF
index e2bd67bf0..803c62842 100644
--- a/demo/site/org.argeo.slc.demo.maven/META-INF/MANIFEST.MF
+++ b/demo/site/org.argeo.slc.demo.maven/META-INF/MANIFEST.MF
@@ -1,16 +1,22 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: SLC Demo Maven
-Bundle-SymbolicName: org.argeo.slc.demo.maven
-Bundle-Version: 0.13.2.SNAPSHOT
-Bundle-Description: Demonstrate Maven support
-Import-Package: org.aopalliance.aop,
- org.argeo.slc.core.execution,
- org.argeo.slc.execution,
- org.argeo.slc.maven,
- org.argeo.slc.osgi,
- org.springframework.aop,
- org.springframework.aop.framework,
- org.springframework.aop.scope,
- org.springframework.beans.factory.config,
- org.springframework.osgi.util
+Manifest-Version: 1.0
+Bnd-LastModified: 1333023160185
+Build-Jdk: 1.6.0_22
+Built-By: mbaudier
+Bundle-Description: Generic layers integrating free / open source techno
+ logies in order to quickly develop custom enterprise systems: security,
+  JCR, user interface, monitoring
+Bundle-DocURL: http://www.argeo.org
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-ManifestVersion: 2
+Bundle-Name: SLC Demo Maven
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-SymbolicName: org.argeo.slc.demo.maven
+Bundle-Vendor: Argeo
+Bundle-Version: 0.13.2.SNAPSHOT-r120329_1412
+Created-By: Apache Maven Bundle Plugin
+Import-Package: org.aopalliance.aop,org.argeo.slc.core.execution,org.arg
+ eo.slc.core.execution.tasks,org.argeo.slc.execution,org.argeo.slc.maven
+ ,org.argeo.slc.osgi,org.springframework.aop,org.springframework.aop.fra
+ mework,org.springframework.aop.scope,org.springframework.beans.factory.
+ config,org.springframework.core.io
+Tool: Bnd-1.50.0
diff --git a/demo/site/org.argeo.slc.demo.maven/pom.xml b/demo/site/org.argeo.slc.demo.maven/pom.xml
new file mode 100644
index 000000000..97357d156
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.maven/pom.xml
@@ -0,0 +1,12 @@
+<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.demo</groupId>
+		<artifactId>modules</artifactId>
+		<version>0.13.2-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>org.argeo.slc.demo.maven</artifactId>
+	<name>SLC Demo Maven</name>
+</project>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.minimal/META-INF/MANIFEST.MF b/demo/site/org.argeo.slc.demo.minimal/META-INF/MANIFEST.MF
index 214ba0f88..c3d3aa6dd 100644
--- a/demo/site/org.argeo.slc.demo.minimal/META-INF/MANIFEST.MF
+++ b/demo/site/org.argeo.slc.demo.minimal/META-INF/MANIFEST.MF
@@ -1,15 +1,22 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.argeo.slc.demo.minimal
-Bundle-Version: 0.13.2.SNAPSHOT
-Bundle-Name: SLC Demo Minimal
-Bundle-Description: Minimal execution module to be used as a template
-Import-Package: org.aopalliance.aop,
- org.argeo.slc.core.execution,
- org.argeo.slc.core.execution.tasks,
- org.argeo.slc.execution,
- org.argeo.slc.osgi,
- org.springframework.aop,
- org.springframework.aop.framework,
- org.springframework.aop.scope,
- org.springframework.beans.factory.config
+Manifest-Version: 1.0
+Bnd-LastModified: 1333023160612
+Build-Jdk: 1.6.0_22
+Built-By: mbaudier
+Bundle-Description: Generic layers integrating free / open source techno
+ logies in order to quickly develop custom enterprise systems: security,
+  JCR, user interface, monitoring
+Bundle-DocURL: http://www.argeo.org
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-ManifestVersion: 2
+Bundle-Name: SLC Demo Minimal
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-SymbolicName: org.argeo.slc.demo.minimal
+Bundle-Vendor: Argeo
+Bundle-Version: 0.13.2.SNAPSHOT-r120329_1412
+Created-By: Apache Maven Bundle Plugin
+Import-Package: org.aopalliance.aop,org.argeo.slc.core.execution,org.arg
+ eo.slc.core.execution.tasks,org.argeo.slc.execution,org.argeo.slc.osgi,
+ org.springframework.aop,org.springframework.aop.framework,org.springfra
+ mework.aop.scope,org.springframework.beans.factory.config,org.springfra
+ mework.core.io
+Tool: Bnd-1.50.0
diff --git a/demo/site/org.argeo.slc.demo.minimal/pom.xml b/demo/site/org.argeo.slc.demo.minimal/pom.xml
new file mode 100644
index 000000000..f59a64b32
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.minimal/pom.xml
@@ -0,0 +1,12 @@
+<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.demo</groupId>
+		<artifactId>modules</artifactId>
+		<version>0.13.2-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>org.argeo.slc.demo.minimal</artifactId>
+	<name>SLC Demo Minimal</name>
+</project>
\ No newline at end of file
diff --git a/demo/site/pom.xml b/demo/site/pom.xml
index a4c5e499e..a25e3035d 100644
--- a/demo/site/pom.xml
+++ b/demo/site/pom.xml
@@ -1,23 +1,76 @@
-<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">
+<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>demo</artifactId>
+		<groupId>org.argeo.slc</groupId>
+		<artifactId>demo</artifactId>
 		<version>0.13.2-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.argeo.slc.demo</groupId>
-	<artifactId>org.argeo.slc.demo.bundles</artifactId>
-	<packaging>bundles</packaging>
-	<name>SLC Demo Bundles</name>
+	<artifactId>modules</artifactId>
+	<packaging>pom</packaging>
+	<name>SLC Demo Modules</name>
+	<modules>
+		<module>org.argeo.slc.demo.ant</module>
+		<module>org.argeo.slc.demo.basic</module>
+		<module>org.argeo.slc.demo.det</module>
+		<module>org.argeo.slc.demo.detached</module>
+		<module>org.argeo.slc.demo.maven</module>
+		<module>org.argeo.slc.demo.minimal</module>
+	</modules>
 	<build>
+		<resources>
+			<resource>
+				<directory>.</directory>
+				<includes>
+					<include>**</include>
+				</includes>
+				<excludes>
+					<exclude>.*</exclude>
+					<exclude>pom.xml</exclude>
+					<exclude>build.properties</exclude>
+				</excludes>
+			</resource>
+		</resources>
 		<plugins>
 			<plugin>
-				<groupId>org.argeo.maven.plugins</groupId>
-				<artifactId>maven-argeo-osgi-plugin</artifactId>
-				<extensions>true</extensions>
+				<artifactId>maven-clean-plugin</artifactId>
 				<configuration>
-					<buildNumber>${timestamp}</buildNumber>
+					<filesets>
+						<fileset>
+							<directory>META-INF</directory>
+							<includes>
+								<include>MANIFEST.MF</include>
+							</includes>
+						</fileset>
+					</filesets>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<configuration>
+					<instructions>
+						<!-- Minimal imports -->
+						<Import-Package>
+							*,
+							org.aopalliance.aop,
+							org.argeo.slc.core.execution,
+							org.argeo.slc.core.execution.tasks,
+							org.argeo.slc.execution,
+							org.argeo.slc.osgi,
+							org.springframework.aop,
+							org.springframework.aop.framework,
+							org.springframework.aop.scope,
+							org.springframework.beans.factory.config,
+							org.springframework.core.io,						
+						</Import-Package>
+					</instructions>
 				</configuration>
 			</plugin>
 		</plugins>