From 1b19cac6a92c31d9119fc2986e7aaf3df98b2393 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 25 Feb 2009 14:10:23 +0000
Subject: [PATCH] Restructure execution packages

git-svn-id: https://svn.argeo.org/slc/trunk@2174 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../src/main/resources/conf/basic.xml         |  4 +--
 .../src/main/resources/conf/common.xml        |  4 +--
 .../src/main/resources/conf/imports.xml       |  2 +-
 .../src/main/resources/conf/main.xml          | 10 +++----
 demo/org.argeo.slc.demo.manager/pom.xml       | 25 -----------------
 .../src/main/resources/conf/manager.xml       |  2 +-
 .../org.eclipse.osgi/.manager/.fileTable.1    |  4 +++
 .../org.eclipse.osgi/.manager/.fileTable.2    |  5 ++++
 .../org.eclipse.osgi/.manager/.fileTableLock  |  0
 org.argeo.slc/pom.xml                         | 13 +++++++++
 runtime/org.argeo.slc.execution/pom.xml       | 14 +++-------
 .../ExecutionCommandProvider.java             |  3 ++-
 .../slc/execution/{ => old}/EfLauncher.java   |  6 ++++-
 .../{ => old}/ExecutionFlowFactory.java       |  4 ++-
 .../{ => old}/ExecutionTargetSource.java      |  3 ++-
 .../slc/execution/{ => old}/TestLaunch.java   |  3 ++-
 .../OsgiExecutionModule.java                  |  3 ++-
 .../main/resources/META-INF/spring/osgi.xml   |  2 +-
 .../argeo/slc/execution/ExecutionFlow.java    |  2 --
 .../execution/ExecutionFlowDescriptor.java    |  0
 .../argeo/slc/execution/ExecutionModule.java  |  0
 .../execution/ExecutionModuleDescriptor.java  |  0
 .../argeo/slc/execution/ExecutionSpec.java    |  0
 .../slc/execution/ExecutionSpecAttribute.java |  0
 .../test/IncompatibleTestDataException.java   |  4 +--
 .../org.argeo.slc.support.activemq/pom.xml    | 27 +++++++++++++++++++
 runtime/org.argeo.slc.support.castor/pom.xml  |  3 ++-
 .../org/argeo/slc/castor/execution.xml        |  8 +++---
 runtime/org.argeo.slc.support.simple/pom.xml  |  9 +++++++
 .../execution/AbstractSpecAttribute.java      |  4 ++-
 .../AbstractSpringExecutionModule.java        |  8 +++++-
 .../execution/ConsoleContextDescriber.java    |  2 +-
 .../slc/core}/execution/ContextDescriber.java |  2 +-
 .../slc/core}/execution/ExecutionAspect.java  |  3 ++-
 .../slc/core}/execution/ExecutionContext.java |  4 ++-
 .../execution/ExecutionFinishedEvent.java     |  2 +-
 .../ExecutionParameterPostProcessor.java      |  2 +-
 .../slc/core}/execution/ExecutionScope.java   |  2 +-
 .../argeo/slc/core}/execution/Executor.java   |  3 ++-
 .../execution/InstantiationPostProcessor.java |  3 ++-
 .../slc/core}/execution/ModulesManager.java   |  4 ++-
 .../core}/execution/NewExecutionEvent.java    |  2 +-
 .../slc/core}/execution/RefSpecAttribute.java |  2 +-
 .../core}/execution/SimpleExecutionFlow.java  |  5 +++-
 .../core}/execution/SimpleExecutionSpec.java  |  5 +++-
 .../core}/execution/SimpleSpecAttribute.java  |  2 +-
 .../argeo/slc/core}/execution/tasks/Echo.java |  2 +-
 .../org/argeo/slc/core}/execution/spring.xml  | 10 +++----
 48 files changed, 141 insertions(+), 86 deletions(-)
 create mode 100644 org.argeo.slc.detached.launcher/slc-detached/equinoxConfiguration/org.eclipse.osgi/.manager/.fileTable.1
 create mode 100644 org.argeo.slc.detached.launcher/slc-detached/equinoxConfiguration/org.eclipse.osgi/.manager/.fileTable.2
 create mode 100644 org.argeo.slc.detached.launcher/slc-detached/equinoxConfiguration/org.eclipse.osgi/.manager/.fileTableLock
 rename runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/{execution => equinox}/ExecutionCommandProvider.java (93%)
 rename runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/{ => old}/EfLauncher.java (93%)
 rename runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/{ => old}/ExecutionFlowFactory.java (79%)
 rename runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/{ => old}/ExecutionTargetSource.java (92%)
 rename runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/{ => old}/TestLaunch.java (90%)
 rename runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/{execution => osgi}/OsgiExecutionModule.java (85%)
 rename runtime/{org.argeo.slc.execution => org.argeo.slc.specs}/src/main/java/org/argeo/slc/execution/ExecutionFlow.java (91%)
 rename runtime/{org.argeo.slc.execution => org.argeo.slc.specs}/src/main/java/org/argeo/slc/execution/ExecutionFlowDescriptor.java (100%)
 rename runtime/{org.argeo.slc.execution => org.argeo.slc.specs}/src/main/java/org/argeo/slc/execution/ExecutionModule.java (100%)
 rename runtime/{org.argeo.slc.execution => org.argeo.slc.specs}/src/main/java/org/argeo/slc/execution/ExecutionModuleDescriptor.java (100%)
 rename runtime/{org.argeo.slc.execution => org.argeo.slc.specs}/src/main/java/org/argeo/slc/execution/ExecutionSpec.java (100%)
 rename runtime/{org.argeo.slc.execution => org.argeo.slc.specs}/src/main/java/org/argeo/slc/execution/ExecutionSpecAttribute.java (100%)
 rename runtime/{org.argeo.slc.execution/src/main/java/org/argeo/slc => org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core}/execution/AbstractSpecAttribute.java (74%)
 rename runtime/{org.argeo.slc.execution/src/main/java/org/argeo/slc => org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core}/execution/AbstractSpringExecutionModule.java (86%)
 rename runtime/{org.argeo.slc.execution/src/main/java/org/argeo/slc => org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core}/execution/ConsoleContextDescriber.java (97%)
 rename runtime/{org.argeo.slc.execution/src/main/java/org/argeo/slc => org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core}/execution/ContextDescriber.java (88%)
 rename runtime/{org.argeo.slc.execution/src/main/java/org/argeo/slc => org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core}/execution/ExecutionAspect.java (93%)
 rename runtime/{org.argeo.slc.execution/src/main/java/org/argeo/slc => org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core}/execution/ExecutionContext.java (97%)
 rename runtime/{org.argeo.slc.execution/src/main/java/org/argeo/slc => org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core}/execution/ExecutionFinishedEvent.java (92%)
 rename runtime/{org.argeo.slc.execution/src/main/java/org/argeo/slc => org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core}/execution/ExecutionParameterPostProcessor.java (99%)
 rename runtime/{org.argeo.slc.execution/src/main/java/org/argeo/slc => org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core}/execution/ExecutionScope.java (97%)
 rename runtime/{org.argeo.slc.execution/src/main/java/org/argeo/slc => org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core}/execution/Executor.java (96%)
 rename runtime/{org.argeo.slc.execution/src/main/java/org/argeo/slc => org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core}/execution/InstantiationPostProcessor.java (91%)
 rename runtime/{org.argeo.slc.execution/src/main/java/org/argeo/slc => org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core}/execution/ModulesManager.java (83%)
 rename runtime/{org.argeo.slc.execution/src/main/java/org/argeo/slc => org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core}/execution/NewExecutionEvent.java (92%)
 rename runtime/{org.argeo.slc.execution/src/main/java/org/argeo/slc => org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core}/execution/RefSpecAttribute.java (93%)
 rename runtime/{org.argeo.slc.execution/src/main/java/org/argeo/slc => org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core}/execution/SimpleExecutionFlow.java (94%)
 rename runtime/{org.argeo.slc.execution/src/main/java/org/argeo/slc => org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core}/execution/SimpleExecutionSpec.java (93%)
 rename runtime/{org.argeo.slc.execution/src/main/java/org/argeo/slc => org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core}/execution/SimpleSpecAttribute.java (84%)
 rename runtime/{org.argeo.slc.execution/src/main/java/org/argeo/slc => org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core}/execution/tasks/Echo.java (92%)
 rename runtime/{org.argeo.slc.execution/src/main/resources/org/argeo/slc => org.argeo.slc.support.simple/src/main/resources/org/argeo/slc/core}/execution/spring.xml (73%)

diff --git a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/basic.xml b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/basic.xml
index 1ec671cb4..168a56c9a 100644
--- a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/basic.xml
+++ b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/basic.xml
@@ -7,7 +7,7 @@
 	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.execution.SimpleExecutionSpec">
+	<bean id="basic.executionSpec" class="org.argeo.slc.core.execution.SimpleExecutionSpec">
 		<property name="attributes">
 			<map>
 				<entry key="testedComponentId">
@@ -26,7 +26,7 @@
 	<bean id="basic.ref" factory-bean="basic.executionSpec"
 		factory-method="createRef" abstract="true" />
 
-	<bean id="basic.executionFlowTemplate" class="org.argeo.slc.execution.SimpleExecutionFlow"
+	<bean id="basic.executionFlowTemplate" class="org.argeo.slc.core.execution.SimpleExecutionFlow"
 		abstract="true">
 		<property name="executionSpec" ref="basic.executionSpec" />
 		<property name="executables">
diff --git a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/common.xml b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/common.xml
index 4495b2f83..4ed1362f7 100644
--- a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/common.xml
+++ b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/common.xml
@@ -10,10 +10,10 @@
 	<import
 		resource="classpath:/org/argeo/slc/core/test/spring/applicationContext.xml" />
 
-	<bean id="specAttribute" class="org.argeo.slc.execution.SimpleSpecAttribute"
+	<bean id="specAttribute" class="org.argeo.slc.core.execution.SimpleSpecAttribute"
 		abstract="true" />
 
-	<bean id="refAttribute" class="org.argeo.slc.execution.RefSpecAttribute"
+	<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.basic/src/main/resources/conf/imports.xml b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/imports.xml
index 2a7fc71b1..68316a1b9 100644
--- a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/imports.xml
+++ b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/imports.xml
@@ -4,6 +4,6 @@
 	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/execution/spring.xml" />
+	<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.basic/src/main/resources/conf/main.xml b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/main.xml
index b57522999..6b943dc7f 100644
--- a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/main.xml
+++ b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/main.xml
@@ -8,15 +8,15 @@
 	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.TestLaunch"
+	<bean id="testLaunch" class="org.argeo.slc.execution.old.TestLaunch"
 		p:flowName="main" init-method="launch" />
 -->
 
-	<bean id="executionModule" class="org.argeo.slc.execution.OsgiExecutionModule" />
+	<bean id="executionModule" class="org.argeo.slc.osgi.OsgiExecutionModule" />
 
-	<bean id="main" class="org.argeo.slc.execution.SimpleExecutionFlow">
+	<bean id="main" class="org.argeo.slc.core.execution.SimpleExecutionFlow">
 		<property name="executionSpec">
-			<bean class="org.argeo.slc.execution.SimpleExecutionSpec">
+			<bean class="org.argeo.slc.core.execution.SimpleExecutionSpec">
 				<property name="attributes">
 					<map>
 						<entry key="testKey">
@@ -42,7 +42,7 @@
 		<aop:scoped-proxy />
 	</bean>
 
-	<bean id="echoTemplate" class="org.argeo.slc.execution.tasks.Echo"
+	<bean id="echoTemplate" class="org.argeo.slc.core.execution.tasks.Echo"
 		abstract="true">
 	</bean>
 
diff --git a/demo/org.argeo.slc.demo.manager/pom.xml b/demo/org.argeo.slc.demo.manager/pom.xml
index d1b8d37d0..77d18dd84 100644
--- a/demo/org.argeo.slc.demo.manager/pom.xml
+++ b/demo/org.argeo.slc.demo.manager/pom.xml
@@ -67,31 +67,6 @@
 			<artifactId>com.springsource.org.castor</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>javax.ejb</groupId>
-			<artifactId>com.springsource.javax.ejb</artifactId>
-			<version>3.0.0</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.xml.rpc</groupId>
-			<artifactId>com.springsource.javax.xml.rpc</artifactId>
-			<version>1.1.0</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.xml.soap</groupId>
-			<artifactId>com.springsource.javax.xml.soap</artifactId>
-			<version>1.3.0</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.activation</groupId>
-			<artifactId>com.springsource.javax.activation</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>com.springsource.javax.servlet</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.detached.launcher</artifactId>
diff --git a/demo/org.argeo.slc.demo.manager/src/main/resources/conf/manager.xml b/demo/org.argeo.slc.demo.manager/src/main/resources/conf/manager.xml
index a1996f3b0..0d5e7fd14 100644
--- a/demo/org.argeo.slc.demo.manager/src/main/resources/conf/manager.xml
+++ b/demo/org.argeo.slc.demo.manager/src/main/resources/conf/manager.xml
@@ -4,7 +4,7 @@
 	xsi:schemaLocation="
 	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-	<bean id="modulesManager" class="org.argeo.slc.execution.ModulesManager">
+	<bean id="modulesManager" class="org.argeo.slc.core.execution.ModulesManager">
 		<property name="executionModules" ref="executionModules" />
 	</bean>
 </beans>
\ No newline at end of file
diff --git a/org.argeo.slc.detached.launcher/slc-detached/equinoxConfiguration/org.eclipse.osgi/.manager/.fileTable.1 b/org.argeo.slc.detached.launcher/slc-detached/equinoxConfiguration/org.eclipse.osgi/.manager/.fileTable.1
new file mode 100644
index 000000000..bc534bcc4
--- /dev/null
+++ b/org.argeo.slc.detached.launcher/slc-detached/equinoxConfiguration/org.eclipse.osgi/.manager/.fileTable.1
@@ -0,0 +1,4 @@
+#safe table
+#Sat Feb 21 15:16:18 CET 2009
+.state=0
+.crc31e76cd2.v1
diff --git a/org.argeo.slc.detached.launcher/slc-detached/equinoxConfiguration/org.eclipse.osgi/.manager/.fileTable.2 b/org.argeo.slc.detached.launcher/slc-detached/equinoxConfiguration/org.eclipse.osgi/.manager/.fileTable.2
new file mode 100644
index 000000000..292c7208b
--- /dev/null
+++ b/org.argeo.slc.detached.launcher/slc-detached/equinoxConfiguration/org.eclipse.osgi/.manager/.fileTable.2
@@ -0,0 +1,5 @@
+#safe table
+#Sat Feb 21 15:16:18 CET 2009
+.state=0
+.lazy=0
+.crc2f3b06c9.v1
diff --git a/org.argeo.slc.detached.launcher/slc-detached/equinoxConfiguration/org.eclipse.osgi/.manager/.fileTableLock b/org.argeo.slc.detached.launcher/slc-detached/equinoxConfiguration/org.eclipse.osgi/.manager/.fileTableLock
new file mode 100644
index 000000000..e69de29bb
diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index 33b4d3afd..1ce433a9c 100644
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -397,6 +397,7 @@ limitations under the License.
 				<artifactId>com.springsource.slf4j.org.apache.log4j</artifactId>
 				<version>1.5.3</version>
 			</dependency>
+
 			<!-- Spring -->
 			<dependency>
 				<groupId>org.springframework</groupId>
@@ -478,6 +479,18 @@ limitations under the License.
 				<version>${version.spring-osgi}</version>
 			</dependency>
 
+			<!-- AOP -->
+			<dependency>
+				<groupId>org.aspectj</groupId>
+				<artifactId>com.springsource.org.aspectj.runtime</artifactId>
+				<version>1.6.2.RELEASE</version>
+			</dependency>
+			<dependency>
+				<groupId>org.aspectj</groupId>
+				<artifactId>com.springsource.org.aspectj.weaver</artifactId>
+				<version>1.6.2.RELEASE</version>
+			</dependency>
+
 			<!-- Ant -->
 			<dependency>
 				<groupId>org.argeo.dep.osgi</groupId>
diff --git a/runtime/org.argeo.slc.execution/pom.xml b/runtime/org.argeo.slc.execution/pom.xml
index a56307711..8844d3a17 100644
--- a/runtime/org.argeo.slc.execution/pom.xml
+++ b/runtime/org.argeo.slc.execution/pom.xml
@@ -24,7 +24,7 @@
 				<configuration>
 					<instructions>
 						<Export-Package>
-							org.argeo.slc.execution.*
+							org.argeo.slc.*
 						</Export-Package>
 					</instructions>
 				</configuration>
@@ -48,21 +48,13 @@
 			<artifactId>org.springframework.osgi.core</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.aspectj</groupId>
-			<artifactId>com.springsource.org.aspectj.runtime</artifactId>
-			<version>1.6.2.RELEASE</version>
-		</dependency>
-		<dependency>
-			<groupId>org.aspectj</groupId>
-			<artifactId>com.springsource.org.aspectj.weaver</artifactId>
-			<version>1.6.2.RELEASE</version>
-		</dependency>
+<!-- 
 		<dependency>
 			<groupId>org.codehaus.groovy</groupId>
 			<artifactId>com.springsource.org.codehaus.groovy</artifactId>
 			<version>1.5.7</version>
 		</dependency>
+		 -->
 		<dependency>
 			<groupId>net.sourceforge.cglib</groupId>
 			<artifactId>com.springsource.net.sf.cglib</artifactId>
diff --git a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ExecutionCommandProvider.java b/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/equinox/ExecutionCommandProvider.java
similarity index 93%
rename from runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ExecutionCommandProvider.java
rename to runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/equinox/ExecutionCommandProvider.java
index ad71a4d61..ca49e8fdc 100644
--- a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ExecutionCommandProvider.java
+++ b/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/equinox/ExecutionCommandProvider.java
@@ -1,7 +1,8 @@
-package org.argeo.slc.execution;
+package org.argeo.slc.equinox;
 
 import java.util.List;
 
+import org.argeo.slc.execution.ExecutionModule;
 import org.argeo.slc.process.SlcExecution;
 import org.eclipse.osgi.framework.console.CommandInterpreter;
 import org.eclipse.osgi.framework.console.CommandProvider;
diff --git a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/EfLauncher.java b/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/old/EfLauncher.java
similarity index 93%
rename from runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/EfLauncher.java
rename to runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/old/EfLauncher.java
index 56d89ec39..b3937b78d 100644
--- a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/EfLauncher.java
+++ b/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/old/EfLauncher.java
@@ -1,4 +1,4 @@
-package org.argeo.slc.execution;
+package org.argeo.slc.execution.old;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -10,6 +10,10 @@ import java.util.Properties;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.argeo.slc.core.execution.ConsoleContextDescriber;
+import org.argeo.slc.core.execution.ExecutionContext;
+import org.argeo.slc.core.execution.ExecutionFinishedEvent;
+import org.argeo.slc.core.execution.NewExecutionEvent;
 import org.argeo.slc.logging.Log4jUtils;
 import org.argeo.slc.process.SlcExecution;
 import org.springframework.beans.MutablePropertyValues;
diff --git a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ExecutionFlowFactory.java b/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/old/ExecutionFlowFactory.java
similarity index 79%
rename from runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ExecutionFlowFactory.java
rename to runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/old/ExecutionFlowFactory.java
index 8631ac74f..c8da41a90 100644
--- a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ExecutionFlowFactory.java
+++ b/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/old/ExecutionFlowFactory.java
@@ -1,9 +1,11 @@
-package org.argeo.slc.execution;
+package org.argeo.slc.execution.old;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.argeo.slc.core.execution.SimpleExecutionFlow;
+import org.argeo.slc.execution.ExecutionFlow;
 import org.argeo.slc.process.Executable;
 
 public class ExecutionFlowFactory {
diff --git a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ExecutionTargetSource.java b/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/old/ExecutionTargetSource.java
similarity index 92%
rename from runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ExecutionTargetSource.java
rename to runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/old/ExecutionTargetSource.java
index 422abeca7..063da14b2 100644
--- a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ExecutionTargetSource.java
+++ b/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/old/ExecutionTargetSource.java
@@ -1,7 +1,8 @@
-package org.argeo.slc.execution;
+package org.argeo.slc.execution.old;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.argeo.slc.execution.ExecutionFlow;
 import org.springframework.aop.TargetSource;
 
 public class ExecutionTargetSource implements TargetSource {
diff --git a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/TestLaunch.java b/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/old/TestLaunch.java
similarity index 90%
rename from runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/TestLaunch.java
rename to runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/old/TestLaunch.java
index c65c8538c..91e8d93a9 100644
--- a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/TestLaunch.java
+++ b/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/old/TestLaunch.java
@@ -1,5 +1,6 @@
-package org.argeo.slc.execution;
+package org.argeo.slc.execution.old;
 
+import org.argeo.slc.core.execution.NewExecutionEvent;
 import org.argeo.slc.process.SlcExecution;
 import org.springframework.beans.factory.annotation.Required;
 import org.springframework.context.ApplicationEventPublisher;
diff --git a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/OsgiExecutionModule.java b/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/osgi/OsgiExecutionModule.java
similarity index 85%
rename from runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/OsgiExecutionModule.java
rename to runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/osgi/OsgiExecutionModule.java
index 570635ec6..1708240e9 100644
--- a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/OsgiExecutionModule.java
+++ b/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/osgi/OsgiExecutionModule.java
@@ -1,5 +1,6 @@
-package org.argeo.slc.execution;
+package org.argeo.slc.osgi;
 
+import org.argeo.slc.core.execution.AbstractSpringExecutionModule;
 import org.osgi.framework.BundleContext;
 import org.springframework.osgi.context.BundleContextAware;
 
diff --git a/runtime/org.argeo.slc.execution/src/main/resources/META-INF/spring/osgi.xml b/runtime/org.argeo.slc.execution/src/main/resources/META-INF/spring/osgi.xml
index ef9d141b7..84312c535 100644
--- a/runtime/org.argeo.slc.execution/src/main/resources/META-INF/spring/osgi.xml
+++ b/runtime/org.argeo.slc.execution/src/main/resources/META-INF/spring/osgi.xml
@@ -7,7 +7,7 @@
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 	<service interface="org.eclipse.osgi.framework.console.CommandProvider">
-		<beans:bean class="org.argeo.slc.execution.ExecutionCommandProvider">
+		<beans:bean class="org.argeo.slc.equinox.ExecutionCommandProvider">
 			<beans:property name="executionModules" ref="executionModules" />
 		</beans:bean>
 	</service>
diff --git a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ExecutionFlow.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/ExecutionFlow.java
similarity index 91%
rename from runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ExecutionFlow.java
rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/ExecutionFlow.java
index 0cbd741c7..ede2bf153 100644
--- a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ExecutionFlow.java
+++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/ExecutionFlow.java
@@ -1,7 +1,5 @@
 package org.argeo.slc.execution;
 
-import java.util.Map;
-
 import org.argeo.slc.process.Executable;
 
 public interface ExecutionFlow extends Executable{
diff --git a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ExecutionFlowDescriptor.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/ExecutionFlowDescriptor.java
similarity index 100%
rename from runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ExecutionFlowDescriptor.java
rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/ExecutionFlowDescriptor.java
diff --git a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ExecutionModule.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/ExecutionModule.java
similarity index 100%
rename from runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ExecutionModule.java
rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/ExecutionModule.java
diff --git a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ExecutionModuleDescriptor.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/ExecutionModuleDescriptor.java
similarity index 100%
rename from runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ExecutionModuleDescriptor.java
rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/ExecutionModuleDescriptor.java
diff --git a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ExecutionSpec.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/ExecutionSpec.java
similarity index 100%
rename from runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ExecutionSpec.java
rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/ExecutionSpec.java
diff --git a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ExecutionSpecAttribute.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/ExecutionSpecAttribute.java
similarity index 100%
rename from runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ExecutionSpecAttribute.java
rename to runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/execution/ExecutionSpecAttribute.java
diff --git a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/IncompatibleTestDataException.java b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/IncompatibleTestDataException.java
index 44c3aa65e..de5d900af 100644
--- a/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/IncompatibleTestDataException.java
+++ b/runtime/org.argeo.slc.specs/src/main/java/org/argeo/slc/test/IncompatibleTestDataException.java
@@ -17,8 +17,8 @@ public class IncompatibleTestDataException extends SlcException {
 	}
 
 	public IncompatibleTestDataException(TestRun testRun) {
-		super("TestData " + testRun.getTestData().getClass()
+		super("TestData " + ((TestData) testRun.getTestData()).getClass()
 				+ " is not compatible with TestDefinition "
-				+ testRun.getTestDefinition().getClass());
+				+ ((TestDefinition) testRun.getTestDefinition()).getClass());
 	}
 }
diff --git a/runtime/org.argeo.slc.support.activemq/pom.xml b/runtime/org.argeo.slc.support.activemq/pom.xml
index 21a9b0548..97da097ad 100644
--- a/runtime/org.argeo.slc.support.activemq/pom.xml
+++ b/runtime/org.argeo.slc.support.activemq/pom.xml
@@ -120,5 +120,32 @@
 			<groupId>org.apache.activemq</groupId>
 			<artifactId>activemq-optional</artifactId> </dependency>
 		-->
+		
+				<dependency>
+			<groupId>javax.ejb</groupId>
+			<artifactId>com.springsource.javax.ejb</artifactId>
+			<version>3.0.0</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.xml.rpc</groupId>
+			<artifactId>com.springsource.javax.xml.rpc</artifactId>
+			<version>1.1.0</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.xml.soap</groupId>
+			<artifactId>com.springsource.javax.xml.soap</artifactId>
+			<version>1.3.0</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.activation</groupId>
+			<artifactId>com.springsource.javax.activation</artifactId>
+			<version>1.1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>com.springsource.javax.servlet</artifactId>
+		</dependency>
+
+		
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/runtime/org.argeo.slc.support.castor/pom.xml b/runtime/org.argeo.slc.support.castor/pom.xml
index d8091bacb..263bf7d70 100644
--- a/runtime/org.argeo.slc.support.castor/pom.xml
+++ b/runtime/org.argeo.slc.support.castor/pom.xml
@@ -38,12 +38,13 @@
 							org.argeo.slc.*
 						</Export-Package>
 						<Import-Package>org.argeo.slc.*;resolution:=optional,
+						org.argeo.slc.execution;resolution:=optional,
 						org.argeo.slc.core.structure;resolution:=optional,
 						org.argeo.slc.core.structure.tree;resolution:=optional,
 						org.argeo.slc.core.test;resolution:=optional,
 						org.argeo.slc.core.test.tree;resolution:=optional,
 						org.argeo.slc.runtime;resolution:=optional,
-						org.argeo.slc.execution;resolution:=optional,
+						org.argeo.slc.core.execution;resolution:=optional,
 						org.argeo.slc.msg;resolution:=optional,
 						org.argeo.slc.msg.process;resolution:=optional,
 						org.argeo.slc.msg.test.tree;resolution:=optional
diff --git a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/execution.xml b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/execution.xml
index 7e6499fd9..1cce65d94 100644
--- a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/execution.xml
+++ b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/execution.xml
@@ -45,7 +45,7 @@
 		</field>
 	</class>
 
-	<class name="org.argeo.slc.execution.SimpleExecutionSpec">
+	<class name="org.argeo.slc.core.execution.SimpleExecutionSpec">
 		<map-to ns-uri="http://argeo.org/projects/slc/schemas"
 			ns-prefix="slc" />
 		<field name="name" identity="true">
@@ -67,7 +67,7 @@
 		</field>
 	</class>
 
-	<class name="org.argeo.slc.execution.AbstractSpecAttribute">
+	<class name="org.argeo.slc.core.execution.AbstractSpecAttribute">
 		<map-to ns-uri="http://argeo.org/projects/slc/schemas"
 			ns-prefix="slc" />
 		<field name="isParameter">
@@ -75,14 +75,14 @@
 		</field>
 	</class>
 
-	<class name="org.argeo.slc.execution.SimpleSpecAttribute"
+	<class name="org.argeo.slc.core.execution.SimpleSpecAttribute"
 		extends="org.argeo.slc.execution.AbstractSpecAttribute">
 		<map-to ns-uri="http://argeo.org/projects/slc/schemas"
 			ns-prefix="slc" />
 		<field name="value" />
 	</class>
 
-	<class name="org.argeo.slc.execution.RefSpecAttribute" extends="org.argeo.slc.execution.AbstractSpecAttribute">
+	<class name="org.argeo.slc.core.execution.RefSpecAttribute" extends="org.argeo.slc.execution.AbstractSpecAttribute">
 		<map-to ns-uri="http://argeo.org/projects/slc/schemas"
 			ns-prefix="slc" />
 		<field name="targetClassName">
diff --git a/runtime/org.argeo.slc.support.simple/pom.xml b/runtime/org.argeo.slc.support.simple/pom.xml
index cf50f1e23..2e7c091f5 100644
--- a/runtime/org.argeo.slc.support.simple/pom.xml
+++ b/runtime/org.argeo.slc.support.simple/pom.xml
@@ -56,6 +56,15 @@
 			<artifactId>org.argeo.slc.specs</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>com.springsource.org.aspectj.runtime</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>com.springsource.org.aspectj.weaver</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>com.springsource.org.apache.commons.logging</artifactId>
diff --git a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/AbstractSpecAttribute.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/AbstractSpecAttribute.java
similarity index 74%
rename from runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/AbstractSpecAttribute.java
rename to runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/AbstractSpecAttribute.java
index 74c2a6bef..b8a599bdb 100644
--- a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/AbstractSpecAttribute.java
+++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/AbstractSpecAttribute.java
@@ -1,4 +1,6 @@
-package org.argeo.slc.execution;
+package org.argeo.slc.core.execution;
+
+import org.argeo.slc.execution.ExecutionSpecAttribute;
 
 public abstract class AbstractSpecAttribute implements ExecutionSpecAttribute {
 	private Boolean isParameter = true;
diff --git a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/AbstractSpringExecutionModule.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/AbstractSpringExecutionModule.java
similarity index 86%
rename from runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/AbstractSpringExecutionModule.java
rename to runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/AbstractSpringExecutionModule.java
index c39343b96..fa42917fd 100644
--- a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/AbstractSpringExecutionModule.java
+++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/AbstractSpringExecutionModule.java
@@ -1,8 +1,14 @@
-package org.argeo.slc.execution;
+package org.argeo.slc.core.execution;
 
 import java.util.HashMap;
 import java.util.Map;
 
+import org.argeo.slc.execution.ExecutionFlow;
+import org.argeo.slc.execution.ExecutionFlowDescriptor;
+import org.argeo.slc.execution.ExecutionModule;
+import org.argeo.slc.execution.ExecutionModuleDescriptor;
+import org.argeo.slc.execution.ExecutionSpec;
+import org.argeo.slc.execution.ExecutionSpecAttribute;
 import org.argeo.slc.process.SlcExecution;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.generic.GenericBeanFactoryAccessor;
diff --git a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ConsoleContextDescriber.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/ConsoleContextDescriber.java
similarity index 97%
rename from runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ConsoleContextDescriber.java
rename to runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/ConsoleContextDescriber.java
index 43f544351..4ebbe4262 100644
--- a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ConsoleContextDescriber.java
+++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/ConsoleContextDescriber.java
@@ -1,4 +1,4 @@
-package org.argeo.slc.execution;
+package org.argeo.slc.core.execution;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ContextDescriber.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/ContextDescriber.java
similarity index 88%
rename from runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ContextDescriber.java
rename to runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/ContextDescriber.java
index 289a53769..ce6f340cd 100644
--- a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ContextDescriber.java
+++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/ContextDescriber.java
@@ -1,4 +1,4 @@
-package org.argeo.slc.execution;
+package org.argeo.slc.core.execution;
 
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
diff --git a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ExecutionAspect.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/ExecutionAspect.java
similarity index 93%
rename from runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ExecutionAspect.java
rename to runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/ExecutionAspect.java
index 5a366cfed..aae2e80c6 100644
--- a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ExecutionAspect.java
+++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/ExecutionAspect.java
@@ -1,7 +1,8 @@
-package org.argeo.slc.execution;
+package org.argeo.slc.core.execution;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.argeo.slc.execution.ExecutionFlow;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.After;
diff --git a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ExecutionContext.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/ExecutionContext.java
similarity index 97%
rename from runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ExecutionContext.java
rename to runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/ExecutionContext.java
index c6d8e2c33..97f7268b6 100644
--- a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ExecutionContext.java
+++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/ExecutionContext.java
@@ -1,4 +1,4 @@
-package org.argeo.slc.execution;
+package org.argeo.slc.core.execution;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -8,6 +8,8 @@ import java.util.UUID;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.execution.ExecutionFlow;
+import org.argeo.slc.execution.ExecutionSpecAttribute;
 import org.argeo.slc.process.SlcExecution;
 import org.springframework.beans.factory.ObjectFactory;
 
diff --git a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ExecutionFinishedEvent.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/ExecutionFinishedEvent.java
similarity index 92%
rename from runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ExecutionFinishedEvent.java
rename to runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/ExecutionFinishedEvent.java
index 7aacd50b6..11f9b3278 100644
--- a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ExecutionFinishedEvent.java
+++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/ExecutionFinishedEvent.java
@@ -1,4 +1,4 @@
-package org.argeo.slc.execution;
+package org.argeo.slc.core.execution;
 
 import org.springframework.context.ApplicationEvent;
 
diff --git a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ExecutionParameterPostProcessor.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/ExecutionParameterPostProcessor.java
similarity index 99%
rename from runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ExecutionParameterPostProcessor.java
rename to runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/ExecutionParameterPostProcessor.java
index 3f741d9a7..d393d774f 100644
--- a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ExecutionParameterPostProcessor.java
+++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/ExecutionParameterPostProcessor.java
@@ -1,4 +1,4 @@
-package org.argeo.slc.execution;
+package org.argeo.slc.core.execution;
 
 import java.beans.PropertyDescriptor;
 import java.util.HashSet;
diff --git a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ExecutionScope.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/ExecutionScope.java
similarity index 97%
rename from runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ExecutionScope.java
rename to runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/ExecutionScope.java
index 936c6307c..adbf18aed 100644
--- a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ExecutionScope.java
+++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/ExecutionScope.java
@@ -1,4 +1,4 @@
-package org.argeo.slc.execution;
+package org.argeo.slc.core.execution;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/Executor.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/Executor.java
similarity index 96%
rename from runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/Executor.java
rename to runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/Executor.java
index a39480309..92e2f5e30 100644
--- a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/Executor.java
+++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/Executor.java
@@ -1,7 +1,8 @@
-package org.argeo.slc.execution;
+package org.argeo.slc.core.execution;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.argeo.slc.execution.ExecutionFlow;
 import org.argeo.slc.process.SlcExecution;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
diff --git a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/InstantiationPostProcessor.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/InstantiationPostProcessor.java
similarity index 91%
rename from runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/InstantiationPostProcessor.java
rename to runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/InstantiationPostProcessor.java
index 4873c56f7..d9ff3d521 100644
--- a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/InstantiationPostProcessor.java
+++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/InstantiationPostProcessor.java
@@ -1,7 +1,8 @@
-package org.argeo.slc.execution;
+package org.argeo.slc.core.execution;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.argeo.slc.execution.ExecutionFlow;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.InstantiationAwareBeanPostProcessorAdapter;
 
diff --git a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ModulesManager.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/ModulesManager.java
similarity index 83%
rename from runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ModulesManager.java
rename to runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/ModulesManager.java
index 4dd262301..0f677eb21 100644
--- a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/ModulesManager.java
+++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/ModulesManager.java
@@ -1,8 +1,10 @@
-package org.argeo.slc.execution;
+package org.argeo.slc.core.execution;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import org.argeo.slc.execution.ExecutionModule;
+import org.argeo.slc.execution.ExecutionModuleDescriptor;
 import org.springframework.util.Assert;
 
 public class ModulesManager {
diff --git a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/NewExecutionEvent.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/NewExecutionEvent.java
similarity index 92%
rename from runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/NewExecutionEvent.java
rename to runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/NewExecutionEvent.java
index ced38a848..ce37fe852 100644
--- a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/NewExecutionEvent.java
+++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/NewExecutionEvent.java
@@ -1,4 +1,4 @@
-package org.argeo.slc.execution;
+package org.argeo.slc.core.execution;
 
 import org.argeo.slc.process.SlcExecution;
 import org.springframework.context.ApplicationEvent;
diff --git a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/RefSpecAttribute.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/RefSpecAttribute.java
similarity index 93%
rename from runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/RefSpecAttribute.java
rename to runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/RefSpecAttribute.java
index e9ce3ef17..61ac0871c 100644
--- a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/RefSpecAttribute.java
+++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/RefSpecAttribute.java
@@ -1,4 +1,4 @@
-package org.argeo.slc.execution;
+package org.argeo.slc.core.execution;
 
 public class RefSpecAttribute extends AbstractSpecAttribute {
 	private Class targetClass;
diff --git a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/SimpleExecutionFlow.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/SimpleExecutionFlow.java
similarity index 94%
rename from runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/SimpleExecutionFlow.java
rename to runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/SimpleExecutionFlow.java
index 79f900d02..2f351fbd5 100644
--- a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/SimpleExecutionFlow.java
+++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/SimpleExecutionFlow.java
@@ -1,4 +1,4 @@
-package org.argeo.slc.execution;
+package org.argeo.slc.core.execution;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -8,6 +8,9 @@ import java.util.UUID;
 
 import org.apache.commons.lang.math.RandomUtils;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.execution.ExecutionFlow;
+import org.argeo.slc.execution.ExecutionSpec;
+import org.argeo.slc.execution.ExecutionSpecAttribute;
 import org.argeo.slc.process.Executable;
 import org.argeo.slc.test.ExecutableTestRun;
 import org.springframework.beans.factory.BeanNameAware;
diff --git a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/SimpleExecutionSpec.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/SimpleExecutionSpec.java
similarity index 93%
rename from runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/SimpleExecutionSpec.java
rename to runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/SimpleExecutionSpec.java
index d6d051880..ed1b76bc1 100644
--- a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/SimpleExecutionSpec.java
+++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/SimpleExecutionSpec.java
@@ -1,4 +1,4 @@
-package org.argeo.slc.execution;
+package org.argeo.slc.core.execution;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -6,6 +6,9 @@ import java.util.Map;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.execution.ExecutionFlow;
+import org.argeo.slc.execution.ExecutionSpec;
+import org.argeo.slc.execution.ExecutionSpecAttribute;
 import org.springframework.beans.factory.BeanNameAware;
 
 public class SimpleExecutionSpec implements ExecutionSpec, BeanNameAware {
diff --git a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/SimpleSpecAttribute.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/SimpleSpecAttribute.java
similarity index 84%
rename from runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/SimpleSpecAttribute.java
rename to runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/SimpleSpecAttribute.java
index 75019cb8a..0985375ed 100644
--- a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/SimpleSpecAttribute.java
+++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/SimpleSpecAttribute.java
@@ -1,4 +1,4 @@
-package org.argeo.slc.execution;
+package org.argeo.slc.core.execution;
 
 public class SimpleSpecAttribute extends AbstractSpecAttribute {
 	private Object value = null;
diff --git a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/tasks/Echo.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/tasks/Echo.java
similarity index 92%
rename from runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/tasks/Echo.java
rename to runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/tasks/Echo.java
index e904153e7..51e06602f 100644
--- a/runtime/org.argeo.slc.execution/src/main/java/org/argeo/slc/execution/tasks/Echo.java
+++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/tasks/Echo.java
@@ -1,4 +1,4 @@
-package org.argeo.slc.execution.tasks;
+package org.argeo.slc.core.execution.tasks;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/runtime/org.argeo.slc.execution/src/main/resources/org/argeo/slc/execution/spring.xml b/runtime/org.argeo.slc.support.simple/src/main/resources/org/argeo/slc/core/execution/spring.xml
similarity index 73%
rename from runtime/org.argeo.slc.execution/src/main/resources/org/argeo/slc/execution/spring.xml
rename to runtime/org.argeo.slc.support.simple/src/main/resources/org/argeo/slc/core/execution/spring.xml
index 81e177f22..5d684fb39 100644
--- a/runtime/org.argeo.slc.execution/src/main/resources/org/argeo/slc/execution/spring.xml
+++ b/runtime/org.argeo.slc.support.simple/src/main/resources/org/argeo/slc/core/execution/spring.xml
@@ -11,7 +11,7 @@
 		<property name="scopes">
 			<map>
 				<entry key="execution">
-					<bean class="org.argeo.slc.execution.ExecutionScope" />
+					<bean class="org.argeo.slc.core.execution.ExecutionScope" />
 				</entry>
 			</map>
 		</property>
@@ -20,10 +20,10 @@
 	<bean
 		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
 
-	<bean class="org.argeo.slc.execution.ExecutionParameterPostProcessor" />
-	<bean class="org.argeo.slc.execution.InstantiationPostProcessor" />
-	<bean class="org.argeo.slc.execution.Executor" />
-	<bean class="org.argeo.slc.execution.ExecutionAspect"/>
+	<bean class="org.argeo.slc.core.execution.ExecutionParameterPostProcessor" />
+	<bean class="org.argeo.slc.core.execution.InstantiationPostProcessor" />
+	<bean class="org.argeo.slc.core.execution.Executor" />
+	<bean class="org.argeo.slc.core.execution.ExecutionAspect"/>
 
 	<aop:aspectj-autoproxy />
 
-- 
2.39.2