X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=sandbox%2Fargeo.slc.executionflow%2Fsrc%2Fslc%2Fconf%2Fmain.xml;h=cd577729fc5a4987981fafe112483159fce44259;hb=b4c6dc33007637006991e66538ba08d88a8b99bc;hp=8c599f0c77d5fe40a090deda0fbab71c9ac326dd;hpb=f3797d5a7f833ecb183ce8d4a31a7897fbca4035;p=gpl%2Fargeo-slc.git

diff --git a/sandbox/argeo.slc.executionflow/src/slc/conf/main.xml b/sandbox/argeo.slc.executionflow/src/slc/conf/main.xml
index 8c599f0c7..cd577729f 100644
--- a/sandbox/argeo.slc.executionflow/src/slc/conf/main.xml
+++ b/sandbox/argeo.slc.executionflow/src/slc/conf/main.xml
@@ -8,12 +8,18 @@
 	http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
 	http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
 
+	<import resource="common.xml" />
+
+	<import resource="basic.xml" />
 	<import resource="testCases/basic-001.xml" />
 	<import resource="testCases/basic-002.xml" />
 
-	<bean id="main" class="org.argeo.slc.executionflow.SimpleExecutionFlow">
+	<bean id="testLaunch" class="org.argeo.slc.execution.old.TestLaunch"
+		p:flowName="main" init-method="launch"/>
+
+	<bean id="main" class="org.argeo.slc.core.execution.SimpleExecutionFlow">
 		<property name="executionSpec">
-			<bean class="org.argeo.slc.executionflow.SimpleExecutionSpec">
+			<bean class="org.argeo.slc.core.execution.SimpleExecutionSpec">
 				<property name="attributes">
 					<map>
 						<entry key="testKey">
@@ -34,23 +40,24 @@
 	</bean>
 
 	<bean id="echo1" parent="echoTemplate" scope="execution">
-		<property name="message" value="From main! @{testKey}" />
+		<property name="message"
+			value="From main! @{testKey}, slc.flows=@{slc.flows}" />
 		<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>
 
 	<context:annotation-config />
-	<bean class="org.argeo.slc.executionflow.ExecutionRegister" />
+	<bean class="org.argeo.slc.execution.ExecutionRegister" />
 
 
 	<bean class="org.springframework.beans.factory.config.CustomScopeConfigurer">
 		<property name="scopes">
 			<map>
 				<entry key="execution">
-					<bean class="org.argeo.slc.executionflow.ExecutionScope" />
+					<bean class="org.argeo.slc.core.execution.ExecutionScope" />
 				</entry>
 			</map>
 		</property>
@@ -58,11 +65,11 @@
 
 	<bean
 		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
-	<bean class="org.argeo.slc.executionflow.ExecutionParameterPostProcessor" />
-	<bean class="org.argeo.slc.executionflow.InstantiationPostProcessor" />
-	<bean class="org.argeo.slc.executionflow.Executor" />
+	<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.executionflow.ExecutionAspect"></bean>
+	<bean class="org.argeo.slc.core.execution.ExecutionAspect"></bean>
 	<aop:aspectj-autoproxy />
 
 </beans>
\ No newline at end of file