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 aab3785e2eb6ebc5f1f2caa6a07308550487bace..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
@@ -1,29 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <beans xmlns="http://www.springframework.org/schema/beans"\r
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"\r
-       xmlns:aop="http://www.springframework.org/schema/aop" xmlns:context="http://www.springframework.org/schema/context"\r
+       xmlns:aop="http://www.springframework.org/schema/aop"\r
        xsi:schemaLocation="\r
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd\r
        http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd\r
-       http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd\r
        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">\r
 \r
-       <import resource="common.xml" />\r
+       <bean id="executionModule" class="org.argeo.slc.osgi.OsgiExecutionModule" />\r
 \r
-       <import resource="basic.xml" />\r
-       <import resource="testCases/basic-001.xml" />\r
-       <import resource="testCases/basic-002.xml" />\r
-\r
-       <bean id="testLaunch" class="org.argeo.slc.execution.TestLaunch"\r
-               p:flowName="main" init-method="launch"/>\r
-\r
-       <bean id="main" class="org.argeo.slc.execution.SimpleExecutionFlow">\r
+       <bean id="main" parent="slcTemplate.simpleFlow">\r
                <property name="executionSpec">\r
-                       <bean class="org.argeo.slc.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
@@ -35,41 +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.execution.tasks.Echo"\r
-               abstract="true">\r
-       </bean>\r
-\r
-       <context:annotation-config />\r
-       <bean class="org.argeo.slc.execution.ExecutionRegister" />\r
-\r
-\r
-       <bean class="org.springframework.beans.factory.config.CustomScopeConfigurer">\r
-               <property name="scopes">\r
-                       <map>\r
-                               <entry key="execution">\r
-                                       <bean class="org.argeo.slc.execution.ExecutionScope" />\r
-                               </entry>\r
-                       </map>\r
-               </property>\r
-       </bean>\r
-\r
-       <bean\r
-               class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />\r
-       <bean class="org.argeo.slc.execution.ExecutionParameterPostProcessor" />\r
-       <bean class="org.argeo.slc.execution.InstantiationPostProcessor" />\r
-       <bean class="org.argeo.slc.execution.Executor" />\r
-\r
-       <bean class="org.argeo.slc.execution.ExecutionAspect"></bean>\r
-       <aop:aspectj-autoproxy />\r
-\r
 </beans>
\ No newline at end of file