Improve execution specs

[gpl/argeo-slc.git] / demo / org.argeo.slc.demo.basic / src / main / resources / conf / main.xml

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 6b943dc7fdbc1a75d21c2f099edf835b0585c09a..5d849311ebfef33a407dcbcdf10e631828abf6c0 100644 (file)
--- 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
@@ -7,20 +7,15 @@
        http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd\r
        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">\r
 \r
-<!-- \r
-       <bean id="testLaunch" class="org.argeo.slc.execution.old.TestLaunch"\r
-               p:flowName="main" init-method="launch" />\r
--->\r
-\r
        <bean id="executionModule" class="org.argeo.slc.osgi.OsgiExecutionModule" />\r
 \r
-       <bean id="main" class="org.argeo.slc.core.execution.SimpleExecutionFlow">\r
+       <bean id="main" parent="slcTemplate.simpleFlow">\r
                <property name="executionSpec">\r
-                       <bean class="org.argeo.slc.core.execution.SimpleExecutionSpec">\r
+                       <bean parent="slcTemplate.simpleSpec">\r
                                <property name="attributes">\r
                                        <map>\r
                                                <entry key="testKey">\r
-                                                       <bean parent="specAttribute" p:value="660" />\r
+                                                       <bean parent="specAttr.primitive" p:value="660" />\r
                                                </entry>\r
                                        </map>\r
                                </property>\r
@@ -32,18 +27,15 @@
                                <ref bean="basic.001" />\r
                                <ref bean="basic.001" />\r
                                <ref bean="basic.002" />\r
+                               <ref bean="canonic.001" />\r
+                               <ref bean="canonic.002" />\r
                        </list>\r
                </property>\r
        </bean>\r
 \r
-       <bean id="echo1" parent="echoTemplate" scope="execution">\r
+       <bean id="echo1" parent="task.echo" scope="execution">\r
                <property name="message"\r
                        value="From main! @{testKey}, slc.flows=@{slc.flows}" />\r
                <aop:scoped-proxy />\r
        </bean>\r
-\r
-       <bean id="echoTemplate" class="org.argeo.slc.core.execution.tasks.Echo"\r
-               abstract="true">\r
-       </bean>\r
-\r
 </beans>
\ No newline at end of file