X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=demo%2Forg.argeo.slc.demo.basic%2Fsrc%2Fmain%2Fresources%2Fconf%2Fmain.xml;h=5d849311ebfef33a407dcbcdf10e631828abf6c0;hb=743ecb28b3c0236bc91a5d0993f70477236d96fd;hp=aab3785e2eb6ebc5f1f2caa6a07308550487bace;hpb=79662e616d94dcc2af363bc2d38c5fe7293ce0ca;p=gpl%2Fargeo-slc.git

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 aab3785e2..5d849311e 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
@@ -1,29 +1,21 @@
 <?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:context="http://www.springframework.org/schema/context"
+	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/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" />
+	<bean id="executionModule" class="org.argeo.slc.osgi.OsgiExecutionModule" />
 
-	<import resource="basic.xml" />
-	<import resource="testCases/basic-001.xml" />
-	<import resource="testCases/basic-002.xml" />
-
-	<bean id="testLaunch" class="org.argeo.slc.execution.TestLaunch"
-		p:flowName="main" init-method="launch"/>
-
-	<bean id="main" class="org.argeo.slc.execution.SimpleExecutionFlow">
+	<bean id="main" parent="slcTemplate.simpleFlow">
 		<property name="executionSpec">
-			<bean class="org.argeo.slc.execution.SimpleExecutionSpec">
+			<bean parent="slcTemplate.simpleSpec">
 				<property name="attributes">
 					<map>
 						<entry key="testKey">
-							<bean parent="specAttribute" p:value="660" />
+							<bean parent="specAttr.primitive" p:value="660" />
 						</entry>
 					</map>
 				</property>
@@ -35,41 +27,15 @@
 				<ref bean="basic.001" />
 				<ref bean="basic.001" />
 				<ref bean="basic.002" />
+				<ref bean="canonic.001" />
+				<ref bean="canonic.002" />
 			</list>
 		</property>
 	</bean>
 
-	<bean id="echo1" parent="echoTemplate" scope="execution">
+	<bean id="echo1" parent="task.echo" scope="execution">
 		<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"
-		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.execution.ExecutionScope" />
-				</entry>
-			</map>
-		</property>
-	</bean>
-
-	<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>
-	<aop:aspectj-autoproxy />
-
 </beans>
\ No newline at end of file