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=e2c8dbea0634fe158ba9de8472c9801ee695a809;hpb=5ae68ecbb5176b7924d279cd8d96a0b650abcf2c;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 e2c8dbea0..cd577729f 100644
--- a/sandbox/argeo.slc.executionflow/src/slc/conf/main.xml
+++ b/sandbox/argeo.slc.executionflow/src/slc/conf/main.xml
@@ -1,18 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:aop="http://www.springframework.org/schema/aop"
+	xmlns:aop="http://www.springframework.org/schema/aop" xmlns:context="http://www.springframework.org/schema/context"
 	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/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.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" />
@@ -20,11 +39,25 @@
 		</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>
+
+	<context:annotation-config />
+	<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>
@@ -32,9 +65,11 @@
 
 	<bean
 		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
-	<bean class="org.argeo.slc.executionflow.ExecutionParameterPostProcessor" />
+	<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