From 47ac61a1d8b3d6db956ac5007a05238b2f506b2e Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 25 Feb 2009 15:25:24 +0000
Subject: [PATCH] Facilitate OSGi deployment

git-svn-id: https://svn.argeo.org/slc/trunk@2178 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 demo/org.argeo.slc.demo.basic/pom.xml         |   6 +-
 .../main/resources/BasicExecutionFlow.groovy  |  12 --
 .../src/main/resources/test.xml               | 105 ------------------
 demo/org.argeo.slc.demo.log4j/.project        |   8 +-
 demo/org.argeo.slc.demo.log4j/.springBeans    |  13 ---
 demo/org.argeo.slc.demo.log4j/pom.xml         |  20 ++--
 .../main/resources/BasicExecutionFlow.groovy  |  12 --
 .../src/main/resources/conf/basic.xml         |  85 --------------
 .../src/main/resources/conf/common.xml        |  19 ----
 .../src/main/resources/conf/imports.xml       |   9 --
 .../src/main/resources/conf/main.xml          |  49 --------
 .../src/main/resources/conf/osgi.xml          |  11 --
 .../resources/conf/testCases/basic-001.xml    |  35 ------
 .../resources/conf/testCases/basic-002.xml    |  25 -----
 .../src/main/resources/log4j.properties}      |   7 +-
 .../src/main/resources/slc.properties         |  16 ---
 .../src/main/resources/test.xml               | 105 ------------------
 demo/org.argeo.slc.demo.manager/.springBeans  |   1 +
 demo/org.argeo.slc.demo.manager/pom.xml       |  69 ++++++------
 .../org/argeo/slc/detached/launcher/Main.java |  34 ++++--
 org.argeo.slc/pom.xml                         |  10 ++
 .../.settings/org.eclipse.jdt.core.prefs      |  12 ++
 runtime/org.argeo.slc.support.equinox/pom.xml |  17 +--
 23 files changed, 111 insertions(+), 569 deletions(-)
 delete mode 100644 demo/org.argeo.slc.demo.basic/src/main/resources/BasicExecutionFlow.groovy
 delete mode 100644 demo/org.argeo.slc.demo.basic/src/main/resources/test.xml
 delete mode 100644 demo/org.argeo.slc.demo.log4j/.springBeans
 delete mode 100644 demo/org.argeo.slc.demo.log4j/src/main/resources/BasicExecutionFlow.groovy
 delete mode 100644 demo/org.argeo.slc.demo.log4j/src/main/resources/conf/basic.xml
 delete mode 100644 demo/org.argeo.slc.demo.log4j/src/main/resources/conf/common.xml
 delete mode 100644 demo/org.argeo.slc.demo.log4j/src/main/resources/conf/imports.xml
 delete mode 100644 demo/org.argeo.slc.demo.log4j/src/main/resources/conf/main.xml
 delete mode 100644 demo/org.argeo.slc.demo.log4j/src/main/resources/conf/osgi.xml
 delete mode 100644 demo/org.argeo.slc.demo.log4j/src/main/resources/conf/testCases/basic-001.xml
 delete mode 100644 demo/org.argeo.slc.demo.log4j/src/main/resources/conf/testCases/basic-002.xml
 rename demo/{org.argeo.slc.demo.basic/src/main/resources/slc.properties => org.argeo.slc.demo.log4j/src/main/resources/log4j.properties} (58%)
 delete mode 100644 demo/org.argeo.slc.demo.log4j/src/main/resources/slc.properties
 delete mode 100644 demo/org.argeo.slc.demo.log4j/src/main/resources/test.xml
 create mode 100644 runtime/org.argeo.slc.support.equinox/.settings/org.eclipse.jdt.core.prefs

diff --git a/demo/org.argeo.slc.demo.basic/pom.xml b/demo/org.argeo.slc.demo.basic/pom.xml
index 81f29a762..fc6367884 100644
--- a/demo/org.argeo.slc.demo.basic/pom.xml
+++ b/demo/org.argeo.slc.demo.basic/pom.xml
@@ -3,13 +3,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.slc</groupId>
-		<artifactId>argeo-slc</artifactId>
+		<artifactId>argeo-slc-demo</artifactId>
 		<version>0.11.3-SNAPSHOT</version>
-		<relativePath>../../org.argeo.slc</relativePath>
+		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.argeo.slc.demo</groupId>
 	<artifactId>org.argeo.slc.demo.basic</artifactId>
-	<name>SLC Demo Basic Test Module</name>
+	<name>Argeo SLC Demo Basic Test Module</name>
 	<packaging>jar</packaging>
 	<properties></properties>
 	<build>
diff --git a/demo/org.argeo.slc.demo.basic/src/main/resources/BasicExecutionFlow.groovy b/demo/org.argeo.slc.demo.basic/src/main/resources/BasicExecutionFlow.groovy
deleted file mode 100644
index da3926ef8..000000000
--- a/demo/org.argeo.slc.demo.basic/src/main/resources/BasicExecutionFlow.groovy
+++ /dev/null
@@ -1,12 +0,0 @@
-import org.argeo.slc.test.*;
-
-public class BasicExecutionFlow implements org.argeo.slc.executionflow.ExecutionFlow {
-
-	ExecutableTestRun firstSubTest = null;
-	ExecutableTestRun secondSubTest = null;
-
-	void execute(){
-		firstSubTest?.execute();
-		secondSubTest?.execute();
-	}
-}
diff --git a/demo/org.argeo.slc.demo.basic/src/main/resources/test.xml b/demo/org.argeo.slc.demo.basic/src/main/resources/test.xml
deleted file mode 100644
index 6cc40e80e..000000000
--- a/demo/org.argeo.slc.demo.basic/src/main/resources/test.xml
+++ /dev/null
@@ -1,105 +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:lang="http://www.springframework.org/schema/lang"
-	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
-	">
-
-	<import
-		resource="classpath:/org/argeo/slc/core/test/spring/applicationContext.xml" />
-
-	<import resource="testCases/basic-001.xml" />
-	<import resource="testCases/basic-002.xml" />
-
-	<bean id="executionFlow.basic1" class="org.argeo.slc.executionflow.SimpleExecutionFlow">
-		<meta key="meta1" value="mata1Value" />
-		<qualifier>
-			<attribute key="qual1" value="qual1value" />
-		</qualifier>
-		<property name="executables">
-			<list>
-				<ref local="testGroovyImpl" />
-				<ref local="testBshImpl" />
-				<bean parent="testRun" p:testDefinition-ref="testDef"
-					p:testData-ref="testData-${testCase}" />
-				<bean parent="testRun" p:testDefinition-ref="testDef"
-					p:testData-ref="testData-${testCase}" />
-			</list>
-		</property>
-	</bean>
-
-	<lang:groovy id="executionFlow.groovy1" script-source="src/slc/conf/BasicExecutionFlow.groovy">
-		<lang:property name="firstSubTest">
-			<bean parent="testRun" p:testDefinition-ref="testDef"
-				p:testData-ref="testData-${testCase}" />
-		</lang:property>
-	</lang:groovy>
-
-	<bean id="testGroovyImpl" parent="testGroovy">
-		<property name="message" value="Hello World! Groovy" />
-	</bean>
-	<bean id="testBshImpl" parent="testBsh">
-		<property name="message" value="Hello World! Beanshell" />
-	</bean>
-
-	<bean id="testDef" class="org.argeo.slc.core.test.BasicTestDefinition"
-		scope="prototype" />
-
-	<bean
-		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
-
-	<bean id="testResult" parent="slcDefault.test.basicSimpleTestResult">
-	</bean>
-
-	<bean id="testRun" class="org.argeo.slc.core.test.SimpleTestRun"
-		abstract="true">
-		<property name="testResult" ref="testResult" />
-	</bean>
-
-	<lang:groovy id="testGroovyBean">
-		<lang:inline-script><![CDATA[
-		class Message {
-		String message = 'test'
-		
-		public String getMessage(){
-			return message;
-		}
-		}
-		]]></lang:inline-script>
-	</lang:groovy>
-
-	<lang:groovy id="testGroovy">
-		<lang:inline-script><![CDATA[
-		class GroovyMessenger extends org.argeo.slc.core.test.SimpleTestRun {
-	
-		String message = 'test'
-	
-			void execute(){
-				println(message);
-			}
-		}
-		]]></lang:inline-script>
-	</lang:groovy>
-
-	<lang:bsh id="testBsh" script-interfaces="org.argeo.slc.test.ExecutableTestRun">
-		<lang:inline-script><![CDATA[
-		setStrictJava(true);
-
-		class BshMessenger extends org.argeo.slc.core.test.SimpleTestRun {
-
-			String message = "test";
-
-			public void execute(){
-				System.out.println(message);
-			}
-			
-			public void setMessage(String message){
-				this.message = message;
-			}
-		}
-		]]></lang:inline-script>
-	</lang:bsh>
-
-</beans>
\ No newline at end of file
diff --git a/demo/org.argeo.slc.demo.log4j/.project b/demo/org.argeo.slc.demo.log4j/.project
index 6a65410fd..7101391d2 100644
--- a/demo/org.argeo.slc.demo.log4j/.project
+++ b/demo/org.argeo.slc.demo.log4j/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.argeo.slc.demo.basic</name>
+	<name>org.argeo.slc.demo.log4j</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -15,14 +15,8 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.springframework.ide.eclipse.core.springnature</nature>
 		<nature>org.maven.ide.eclipse.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
diff --git a/demo/org.argeo.slc.demo.log4j/.springBeans b/demo/org.argeo.slc.demo.log4j/.springBeans
deleted file mode 100644
index c11d81486..000000000
--- a/demo/org.argeo.slc.demo.log4j/.springBeans
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beansProjectDescription>
-	<version>1</version>
-	<pluginVersion><![CDATA[2.2.1.v200811281800]]></pluginVersion>
-	<configSuffixes>
-		<configSuffix><![CDATA[xml]]></configSuffix>
-	</configSuffixes>
-	<enableImports><![CDATA[true]]></enableImports>
-	<configs>
-	</configs>
-	<configSets>
-	</configSets>
-</beansProjectDescription>
diff --git a/demo/org.argeo.slc.demo.log4j/pom.xml b/demo/org.argeo.slc.demo.log4j/pom.xml
index 81f29a762..d6babe9ad 100644
--- a/demo/org.argeo.slc.demo.log4j/pom.xml
+++ b/demo/org.argeo.slc.demo.log4j/pom.xml
@@ -3,13 +3,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.slc</groupId>
-		<artifactId>argeo-slc</artifactId>
+		<artifactId>argeo-slc-demo</artifactId>
 		<version>0.11.3-SNAPSHOT</version>
-		<relativePath>../../org.argeo.slc</relativePath>
+		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.argeo.slc.demo</groupId>
-	<artifactId>org.argeo.slc.demo.basic</artifactId>
-	<name>SLC Demo Basic Test Module</name>
+	<artifactId>org.argeo.slc.demo.log4j</artifactId>
+	<name>Argeo SLC Demo Logging</name>
 	<packaging>jar</packaging>
 	<properties></properties>
 	<build>
@@ -23,9 +23,7 @@
 				<version>${version.maven-bundle-plugin}</version>
 				<configuration>
 					<instructions>
-						<Import-Package>org.apache.commons.logging,org.springframework.beans.factory.config</Import-Package>
-						<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</Require-Bundle>
-						<Spring-Context>conf/*,conf/testCases/*</Spring-Context>
+						<Fragment-Host>com.springsource.org.apache.log4j</Fragment-Host>
 					</instructions>
 				</configuration>
 				<executions>
@@ -42,12 +40,8 @@
 	<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.simple</artifactId>
+			<groupId>org.apache.log4j</groupId>
+			<artifactId>com.springsource.org.apache.log4j</artifactId>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/demo/org.argeo.slc.demo.log4j/src/main/resources/BasicExecutionFlow.groovy b/demo/org.argeo.slc.demo.log4j/src/main/resources/BasicExecutionFlow.groovy
deleted file mode 100644
index da3926ef8..000000000
--- a/demo/org.argeo.slc.demo.log4j/src/main/resources/BasicExecutionFlow.groovy
+++ /dev/null
@@ -1,12 +0,0 @@
-import org.argeo.slc.test.*;
-
-public class BasicExecutionFlow implements org.argeo.slc.executionflow.ExecutionFlow {
-
-	ExecutableTestRun firstSubTest = null;
-	ExecutableTestRun secondSubTest = null;
-
-	void execute(){
-		firstSubTest?.execute();
-		secondSubTest?.execute();
-	}
-}
diff --git a/demo/org.argeo.slc.demo.log4j/src/main/resources/conf/basic.xml b/demo/org.argeo.slc.demo.log4j/src/main/resources/conf/basic.xml
deleted file mode 100644
index 168a56c9a..000000000
--- a/demo/org.argeo.slc.demo.log4j/src/main/resources/conf/basic.xml
+++ /dev/null
@@ -1,85 +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.executionSpec" class="org.argeo.slc.core.execution.SimpleExecutionSpec">
-		<property name="attributes">
-			<map>
-				<entry key="testedComponentId">
-					<bean parent="specAttribute" p:value="100" p:isParameter="true"/>
-				</entry>
-				<entry key="testData1">
-					<bean parent="refAttribute" p:targetClass="org.argeo.slc.core.test.BasicTestData" />
-				</entry>
-				<entry key="testData2">
-					<bean parent="refAttribute" p:targetClass="org.argeo.slc.core.test.BasicTestData" />
-				</entry>
-			</map>
-		</property>
-	</bean>
-
-	<bean id="basic.ref" factory-bean="basic.executionSpec"
-		factory-method="createRef" abstract="true" />
-
-	<bean id="basic.executionFlowTemplate" class="org.argeo.slc.core.execution.SimpleExecutionFlow"
-		abstract="true">
-		<property name="executionSpec" ref="basic.executionSpec" />
-		<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>
- 
- 
-	<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>
-
-	<!--
-		<bean class="org.springframework.aop.framework.ProxyFactoryBean">
-		<property name="targetClass"
-		value="org.argeo.slc.core.test.BasicTestData" /> <property
-		name="targetSource"> <bean
-		class="org.argeo.slc.executionflow.ExecutionTargetSource"> <property
-		name="name" value="testData" /> <property name="targetClass"
-		value="org.argeo.slc.core.test.BasicTestData" /> </bean> </property>
-		<property name="proxyTargetClass" value="true" /> </bean>
-	-->
-
-</beans>
\ No newline at end of file
diff --git a/demo/org.argeo.slc.demo.log4j/src/main/resources/conf/common.xml b/demo/org.argeo.slc.demo.log4j/src/main/resources/conf/common.xml
deleted file mode 100644
index 4ed1362f7..000000000
--- a/demo/org.argeo.slc.demo.log4j/src/main/resources/conf/common.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">
-
-	<import
-		resource="classpath:/org/argeo/slc/core/test/spring/applicationContext.xml" />
-
-	<bean id="specAttribute" class="org.argeo.slc.core.execution.SimpleSpecAttribute"
-		abstract="true" />
-
-	<bean id="refAttribute" class="org.argeo.slc.core.execution.RefSpecAttribute"
-		abstract="true" />
-
-</beans>
\ No newline at end of file
diff --git a/demo/org.argeo.slc.demo.log4j/src/main/resources/conf/imports.xml b/demo/org.argeo.slc.demo.log4j/src/main/resources/conf/imports.xml
deleted file mode 100644
index 68316a1b9..000000000
--- a/demo/org.argeo.slc.demo.log4j/src/main/resources/conf/imports.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"
-	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" />
-
-</beans>
\ No newline at end of file
diff --git a/demo/org.argeo.slc.demo.log4j/src/main/resources/conf/main.xml b/demo/org.argeo.slc.demo.log4j/src/main/resources/conf/main.xml
deleted file mode 100644
index 6b943dc7f..000000000
--- a/demo/org.argeo.slc.demo.log4j/src/main/resources/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="testLaunch" class="org.argeo.slc.execution.old.TestLaunch"
-		p:flowName="main" init-method="launch" />
--->
-
-	<bean id="executionModule" class="org.argeo.slc.osgi.OsgiExecutionModule" />
-
-	<bean id="main" class="org.argeo.slc.core.execution.SimpleExecutionFlow">
-		<property name="executionSpec">
-			<bean class="org.argeo.slc.core.execution.SimpleExecutionSpec">
-				<property name="attributes">
-					<map>
-						<entry key="testKey">
-							<bean parent="specAttribute" 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" />
-			</list>
-		</property>
-	</bean>
-
-	<bean id="echo1" parent="echoTemplate" scope="execution">
-		<property name="message"
-			value="From main! @{testKey}, slc.flows=@{slc.flows}" />
-		<aop:scoped-proxy />
-	</bean>
-
-	<bean id="echoTemplate" class="org.argeo.slc.core.execution.tasks.Echo"
-		abstract="true">
-	</bean>
-
-</beans>
\ No newline at end of file
diff --git a/demo/org.argeo.slc.demo.log4j/src/main/resources/conf/osgi.xml b/demo/org.argeo.slc.demo.log4j/src/main/resources/conf/osgi.xml
deleted file mode 100644
index ebc3364ba..000000000
--- a/demo/org.argeo.slc.demo.log4j/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.log4j/src/main/resources/conf/testCases/basic-001.xml b/demo/org.argeo.slc.demo.log4j/src/main/resources/conf/testCases/basic-001.xml
deleted file mode 100644
index a5426649e..000000000
--- a/demo/org.argeo.slc.demo.log4j/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.executionFlowTemplate">
-		<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.log4j/src/main/resources/conf/testCases/basic-002.xml b/demo/org.argeo.slc.demo.log4j/src/main/resources/conf/testCases/basic-002.xml
deleted file mode 100644
index c2946fdfb..000000000
--- a/demo/org.argeo.slc.demo.log4j/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.executionFlowTemplate">
-		<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/slc.properties b/demo/org.argeo.slc.demo.log4j/src/main/resources/log4j.properties
similarity index 58%
rename from demo/org.argeo.slc.demo.basic/src/main/resources/slc.properties
rename to demo/org.argeo.slc.demo.log4j/src/main/resources/log4j.properties
index b18dce171..6abb49079 100644
--- a/demo/org.argeo.slc.demo.basic/src/main/resources/slc.properties
+++ b/demo/org.argeo.slc.demo.log4j/src/main/resources/log4j.properties
@@ -2,8 +2,11 @@ log4j.rootLogger=WARN, console
 
 ## Levels
 log4j.logger.org.argeo=DEBUG
-log4j.logger.org.argeo.slc.executionflow.ExecutionParameterPostProcessor=TRACE
-log4j.logger.org.argeo.slc.executionflow.ExecutionContext=TRACE
+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.osgi=WARN
 
 ## Appenders
 # console is set to be a ConsoleAppender.
diff --git a/demo/org.argeo.slc.demo.log4j/src/main/resources/slc.properties b/demo/org.argeo.slc.demo.log4j/src/main/resources/slc.properties
deleted file mode 100644
index b18dce171..000000000
--- a/demo/org.argeo.slc.demo.log4j/src/main/resources/slc.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-log4j.rootLogger=WARN, console
-
-## Levels
-log4j.logger.org.argeo=DEBUG
-log4j.logger.org.argeo.slc.executionflow.ExecutionParameterPostProcessor=TRACE
-log4j.logger.org.argeo.slc.executionflow.ExecutionContext=TRACE
-
-## Appenders
-# console is set to be a ConsoleAppender.
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-
-# console uses PatternLayout.
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c%n
-
-testCase=002
\ No newline at end of file
diff --git a/demo/org.argeo.slc.demo.log4j/src/main/resources/test.xml b/demo/org.argeo.slc.demo.log4j/src/main/resources/test.xml
deleted file mode 100644
index 6cc40e80e..000000000
--- a/demo/org.argeo.slc.demo.log4j/src/main/resources/test.xml
+++ /dev/null
@@ -1,105 +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:lang="http://www.springframework.org/schema/lang"
-	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
-	">
-
-	<import
-		resource="classpath:/org/argeo/slc/core/test/spring/applicationContext.xml" />
-
-	<import resource="testCases/basic-001.xml" />
-	<import resource="testCases/basic-002.xml" />
-
-	<bean id="executionFlow.basic1" class="org.argeo.slc.executionflow.SimpleExecutionFlow">
-		<meta key="meta1" value="mata1Value" />
-		<qualifier>
-			<attribute key="qual1" value="qual1value" />
-		</qualifier>
-		<property name="executables">
-			<list>
-				<ref local="testGroovyImpl" />
-				<ref local="testBshImpl" />
-				<bean parent="testRun" p:testDefinition-ref="testDef"
-					p:testData-ref="testData-${testCase}" />
-				<bean parent="testRun" p:testDefinition-ref="testDef"
-					p:testData-ref="testData-${testCase}" />
-			</list>
-		</property>
-	</bean>
-
-	<lang:groovy id="executionFlow.groovy1" script-source="src/slc/conf/BasicExecutionFlow.groovy">
-		<lang:property name="firstSubTest">
-			<bean parent="testRun" p:testDefinition-ref="testDef"
-				p:testData-ref="testData-${testCase}" />
-		</lang:property>
-	</lang:groovy>
-
-	<bean id="testGroovyImpl" parent="testGroovy">
-		<property name="message" value="Hello World! Groovy" />
-	</bean>
-	<bean id="testBshImpl" parent="testBsh">
-		<property name="message" value="Hello World! Beanshell" />
-	</bean>
-
-	<bean id="testDef" class="org.argeo.slc.core.test.BasicTestDefinition"
-		scope="prototype" />
-
-	<bean
-		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
-
-	<bean id="testResult" parent="slcDefault.test.basicSimpleTestResult">
-	</bean>
-
-	<bean id="testRun" class="org.argeo.slc.core.test.SimpleTestRun"
-		abstract="true">
-		<property name="testResult" ref="testResult" />
-	</bean>
-
-	<lang:groovy id="testGroovyBean">
-		<lang:inline-script><![CDATA[
-		class Message {
-		String message = 'test'
-		
-		public String getMessage(){
-			return message;
-		}
-		}
-		]]></lang:inline-script>
-	</lang:groovy>
-
-	<lang:groovy id="testGroovy">
-		<lang:inline-script><![CDATA[
-		class GroovyMessenger extends org.argeo.slc.core.test.SimpleTestRun {
-	
-		String message = 'test'
-	
-			void execute(){
-				println(message);
-			}
-		}
-		]]></lang:inline-script>
-	</lang:groovy>
-
-	<lang:bsh id="testBsh" script-interfaces="org.argeo.slc.test.ExecutableTestRun">
-		<lang:inline-script><![CDATA[
-		setStrictJava(true);
-
-		class BshMessenger extends org.argeo.slc.core.test.SimpleTestRun {
-
-			String message = "test";
-
-			public void execute(){
-				System.out.println(message);
-			}
-			
-			public void setMessage(String message){
-				this.message = message;
-			}
-		}
-		]]></lang:inline-script>
-	</lang:bsh>
-
-</beans>
\ No newline at end of file
diff --git a/demo/org.argeo.slc.demo.manager/.springBeans b/demo/org.argeo.slc.demo.manager/.springBeans
index 2732929fe..15edcfdb8 100644
--- a/demo/org.argeo.slc.demo.manager/.springBeans
+++ b/demo/org.argeo.slc.demo.manager/.springBeans
@@ -9,6 +9,7 @@
 	<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/pom.xml b/demo/org.argeo.slc.demo.manager/pom.xml
index 3254fbf1e..62b0cd2d4 100644
--- a/demo/org.argeo.slc.demo.manager/pom.xml
+++ b/demo/org.argeo.slc.demo.manager/pom.xml
@@ -3,14 +3,14 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.slc</groupId>
-		<artifactId>argeo-slc</artifactId>
+		<artifactId>argeo-slc-demo</artifactId>
 		<version>0.11.3-SNAPSHOT</version>
-		<relativePath>../../org.argeo.slc</relativePath>
+		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.argeo.slc.demo</groupId>
 	<artifactId>org.argeo.slc.demo.manager</artifactId>
-	<name>SLC Demo Manager</name>
-	<packaging>bundle</packaging>
+	<name>Argeo SLC Demo Manager</name>
+	<packaging>jar</packaging>
 	<properties></properties>
 	<build>
 		<plugins>
@@ -23,28 +23,35 @@
 						<Import-Package>org.apache.commons.logging,org.springframework.beans.factory.config</Import-Package>
 						<Require-Bundle>org.springframework.jms,com.springsource.org.castor,com.springsource.org.apache.xbean.spring,com.springsource.org.apache.activemq,org.argeo.slc.support.equinox,org.argeo.slc.support.activemq,org.argeo.slc.specs,org.argeo.slc.support.simple,org.springframework.aop,org.springframework.oxm,com.springsource.net.sf.cglib,com.springsource.org.aopalliance</Require-Bundle>
 						<Spring-Context>conf/*</Spring-Context>
-						<!-- 
-						<Embed-Dependency>com.springsource.org.castor</Embed-Dependency>
-						<Embed-Transitive>true</Embed-Transitive>
-						<Import-Package>*,javax.xml.parsers;resolution:=optional,
-							javax.xml.transform;resolution:=optional,
-							javax.xml.transform.dom;resolution:=optional,
-							javax.xml.transform.stream;resolution:=optional,
-							org.w3c.dom;resolution:=optional,
-							org.xml.sax;resolution:=optional,
-							org.xml.sax.helpers;resolution:=optional,
-							netscape.ldap;resolution:=optional,
-							org.apache.oro.text.regex;resolution:=optional,
-							org.apache.xerces.utils.regex;resolution:=optional,
-							weblogic.apache.xml.serialize;resolution:=optional,
-							com.sun.org.apache.xml.internal.serialize;resolution:=optional
-						</Import-Package>
-						<Eclipse-RegisterBuddy>com.springsource.org.castor</Eclipse-RegisterBuddy>
-						 -->
-
 					</instructions>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>exec-maven-plugin</artifactId>
+				<version>1.1-beta-1</version>
+				<!--
+					<configuration>
+					<mainClass>org.argeo.slc.detached.launcher.Main</mainClass>
+					<systemProperties> <systemProperty>
+					<key>slc.osgi.scanClasspath</key> <value>true</value>
+					</systemProperty> <systemProperty> <key>slc.osgi.start</key>
+					<value>*</value> </systemProperty> </systemProperties>
+					<classpathScope>test</classpathScope> </configuration>
+				-->
+				<configuration>
+					<executable>${java.home}/bin/java</executable>
+					<arguments>
+						<argument>-Xbootclasspath/p:${settings.localRepository}/org/apache/xerces/com.springsource.org.apache.xerces/2.8.1/com.springsource.org.apache.xerces-2.8.1.jar:${settings.localRepository}/org/apache/xmlcommons/com.springsource.org.apache.xmlcommons/1.3.3/com.springsource.org.apache.xmlcommons-1.3.3.jar</argument>
+						<argument>-Dslc.osgi.scanClasspath=true</argument>
+						<argument>-Dslc.osgi.start=*</argument>
+						<argument>-classpath</argument>
+						<classpath />
+						<argument>org.argeo.slc.detached.launcher.Main</argument>
+					</arguments>
+					<workingDirectory>target</workingDirectory>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 	<dependencies>
@@ -62,11 +69,6 @@
 			<artifactId>org.argeo.slc.support.castor</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.codehaus.castor</groupId>
-			<artifactId>com.springsource.org.castor</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.detached.launcher</artifactId>
@@ -74,13 +76,14 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.eclipse.osgi</groupId>
-			<artifactId>org.eclipse.osgi</artifactId>
+			<groupId>org.argeo.slc.demo</groupId>
+			<artifactId>org.argeo.slc.demo.basic</artifactId>
+			<version>${project.version}</version>
 		</dependency>
-
 		<dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>org.springframework.osgi.extender</artifactId>
+			<groupId>org.argeo.slc.demo</groupId>
+			<artifactId>org.argeo.slc.demo.log4j</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 
 	</dependencies>
diff --git a/org.argeo.slc.detached.launcher/src/main/java/org/argeo/slc/detached/launcher/Main.java b/org.argeo.slc.detached.launcher/src/main/java/org/argeo/slc/detached/launcher/Main.java
index 96703a116..d7da1e673 100644
--- a/org.argeo.slc.detached.launcher/src/main/java/org/argeo/slc/detached/launcher/Main.java
+++ b/org.argeo.slc.detached.launcher/src/main/java/org/argeo/slc/detached/launcher/Main.java
@@ -4,6 +4,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
@@ -95,6 +96,8 @@ public class Main {
 
 		BundleContext context = EclipseStarter.startup(equinoxArgs, null);
 
+		List installBundleNames = new ArrayList();
+
 		// Load from class path (dev environment, maven)
 		if (config.getProperty(PROP_SLC_OSGI_SCAN_CLASSPATH, "false").equals(
 				"true")) {
@@ -105,7 +108,8 @@ public class Main {
 					String path = st.nextToken();
 					String url = "reference:file:"
 							+ new File(path).getCanonicalPath();
-					context.installBundle(url);
+					Bundle bundle = context.installBundle(url);
+					installBundleNames.add(bundle.getSymbolicName());
 					info("Installed from classpath " + url);
 				} catch (Exception e) {
 					bundleInstallWarn(e.getMessage());
@@ -120,7 +124,8 @@ public class Main {
 			try {
 				String bundleName = (String) devBundles.next();
 				String url = (String) devBundleUrls.get(bundleName);
-				context.installBundle(url);
+				Bundle bundle = context.installBundle(url);
+				installBundleNames.add(bundle.getSymbolicName());
 				info("Installed as dev bundle " + url);
 			} catch (Exception e) {
 				bundleInstallWarn(e.getMessage());
@@ -136,7 +141,8 @@ public class Main {
 				try {
 					String url = "reference:file:"
 							+ bundleFiles[i].getCanonicalPath();
-					context.installBundle(url);
+					Bundle bundle = context.installBundle(url);
+					installBundleNames.add(bundle.getSymbolicName());
 					info("INFO: Installed from SLC home " + url);
 				} catch (Exception e) {
 					bundleInstallWarn(e.getMessage());
@@ -148,10 +154,24 @@ public class Main {
 		// Start bundles
 		String bundleStart = config.getProperty(PROP_SLC_OSGI_START,
 				"org.springframework.osgi.extender,org.argeo.slc.detached");
-		StringTokenizer stBundleStart = new StringTokenizer(bundleStart, ",");
-		while (stBundleStart.hasMoreTokens()) {
-			String bundleSymbolicName = stBundleStart.nextToken();
-			startBundle(context, bundleSymbolicName);
+
+		if (bundleStart.trim().equals("*")) {
+			for (int i = 0; i < installBundleNames.size(); i++) {
+				String bundleSymbolicName = installBundleNames.get(i)
+						.toString();
+				try {
+					startBundle(context, bundleSymbolicName);
+				} catch (Exception e) {
+					bundleInstallWarn(e.getMessage());
+				}
+			}
+		} else {
+			StringTokenizer stBundleStart = new StringTokenizer(bundleStart,
+					",");
+			while (stBundleStart.hasMoreTokens()) {
+				String bundleSymbolicName = stBundleStart.nextToken();
+				startBundle(context, bundleSymbolicName);
+			}
 		}
 	}
 
diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index ec509c840..095d848bd 100644
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -490,6 +490,16 @@ limitations under the License.
 				<artifactId>com.springsource.org.aspectj.weaver</artifactId>
 				<version>1.6.2.RELEASE</version>
 			</dependency>
+			<dependency>
+				<groupId>net.sourceforge.cglib</groupId>
+				<artifactId>com.springsource.net.sf.cglib</artifactId>
+				<version>2.1.3</version>
+			</dependency>
+			<dependency>
+				<groupId>org.objectweb.asm</groupId>
+				<artifactId>com.springsource.org.objectweb.asm.attrs</artifactId>
+				<version>2.2.0</version>
+			</dependency>
 
 			<!-- Ant -->
 			<dependency>
diff --git a/runtime/org.argeo.slc.support.equinox/.settings/org.eclipse.jdt.core.prefs b/runtime/org.argeo.slc.support.equinox/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..b4180a1a1
--- /dev/null
+++ b/runtime/org.argeo.slc.support.equinox/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+#Wed Feb 25 15:37:16 CET 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/runtime/org.argeo.slc.support.equinox/pom.xml b/runtime/org.argeo.slc.support.equinox/pom.xml
index e089ee05d..cf6170b45 100644
--- a/runtime/org.argeo.slc.support.equinox/pom.xml
+++ b/runtime/org.argeo.slc.support.equinox/pom.xml
@@ -9,7 +9,7 @@
 	</parent>
 	<groupId>org.argeo.slc.runtime</groupId>
 	<artifactId>org.argeo.slc.support.equinox</artifactId>
-	<name>SLC Equinox OSGi Support</name>
+	<name>Argeo SLC Support Equinox OSGi</name>
 	<packaging>jar</packaging>
 	<properties></properties>
 	<build>
@@ -48,22 +48,23 @@
 			<artifactId>org.springframework.osgi.core</artifactId>
 		</dependency>
 
-<!-- 
 		<dependency>
-			<groupId>org.codehaus.groovy</groupId>
-			<artifactId>com.springsource.org.codehaus.groovy</artifactId>
-			<version>1.5.7</version>
+			<groupId>org.eclipse.osgi</groupId>
+			<artifactId>org.eclipse.osgi</artifactId>
 		</dependency>
-		 -->
+
+		<dependency>
+			<groupId>org.springframework.osgi</groupId>
+			<artifactId>org.springframework.osgi.extender</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>net.sourceforge.cglib</groupId>
 			<artifactId>com.springsource.net.sf.cglib</artifactId>
-			<version>2.1.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.objectweb.asm</groupId>
 			<artifactId>com.springsource.org.objectweb.asm.attrs</artifactId>
-			<version>2.2.0</version>
 		</dependency>
 	</dependencies>
 </project>
-- 
2.39.2