Improve execution specs

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

diff --git a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/basic.xml b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/basic.xml
index 168a56c9a55806f803f824587f75d3df1c352e28..a513e3f4fb77b4b579bc6fd37a8027e7c5309c06 100644 (file)
--- a/demo/org.argeo.slc.demo.basic/src/main/resources/conf/basic.xml
+++ b/demo/org.argeo.slc.demo.basic/src/main/resources/conf/basic.xml
@@ -7,28 +7,31 @@
        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
-       <bean id="basic.executionSpec" class="org.argeo.slc.core.execution.SimpleExecutionSpec">\r
+       <bean id="basic.spec" parent="slcTemplate.simpleSpec">\r
                <property name="attributes">\r
                        <map>\r
                                <entry key="testedComponentId">\r
-                                       <bean parent="specAttribute" p:value="100" p:isParameter="true"/>\r
+                                       <bean parent="specAttr.primitive" p:value="100" p:isParameter="true"\r
+                                               p:type="integer" />\r
                                </entry>\r
                                <entry key="testData1">\r
-                                       <bean parent="refAttribute" p:targetClass="org.argeo.slc.core.test.BasicTestData" />\r
+                                       <bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"\r
+                                               p:isParameter="true" p:isFrozen="true" />\r
                                </entry>\r
                                <entry key="testData2">\r
-                                       <bean parent="refAttribute" p:targetClass="org.argeo.slc.core.test.BasicTestData" />\r
+                                       <bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"\r
+                                               p:isParameter="true" p:isFrozen="true" />\r
                                </entry>\r
                        </map>\r
                </property>\r
        </bean>\r
 \r
-       <bean id="basic.ref" factory-bean="basic.executionSpec"\r
-               factory-method="createRef" abstract="true" />\r
+       <bean id="basic.ref" factory-bean="basic.spec" factory-method="createRef"\r
+               abstract="true" />\r
 \r
-       <bean id="basic.executionFlowTemplate" class="org.argeo.slc.core.execution.SimpleExecutionFlow"\r
+       <bean id="basic.flowTemplate" parent="slcTemplate.simpleFlow"\r
                abstract="true">\r
-               <property name="executionSpec" ref="basic.executionSpec" />\r
+               <property name="executionSpec" ref="basic.spec" />\r
                <property name="executables">\r
                        <list>\r
                                <ref bean="echo1" />\r
@@ -52,34 +55,11 @@
                <constructor-arg value="testData2" />\r
        </bean>\r
 \r
- \r
-       <bean id="basic.testData" class="org.argeo.slc.core.test.BasicTestData"\r
-               >\r
+\r
+       <bean id="basic.testData" class="org.argeo.slc.core.test.BasicTestData">\r
                <aop:scoped-proxy />\r
                <property name="expected" value="tata" />\r
                <property name="reached" value="tata" />\r
        </bean>\r
- \r
- \r
-       <bean id="testDef" class="org.argeo.slc.core.test.BasicTestDefinition"\r
-               scope="prototype" />\r
-\r
-       <bean id="testResult" parent="slcDefault.test.basicSimpleTestResult" />\r
-\r
-       <bean id="testRun" class="org.argeo.slc.core.test.SimpleTestRun"\r
-               abstract="true">\r
-               <property name="testResult" ref="testResult" />\r
-       </bean>\r
-\r
-       <!--\r
-               <bean class="org.springframework.aop.framework.ProxyFactoryBean">\r
-               <property name="targetClass"\r
-               value="org.argeo.slc.core.test.BasicTestData" /> <property\r
-               name="targetSource"> <bean\r
-               class="org.argeo.slc.executionflow.ExecutionTargetSource"> <property\r
-               name="name" value="testData" /> <property name="targetClass"\r
-               value="org.argeo.slc.core.test.BasicTestData" /> </bean> </property>\r
-               <property name="proxyTargetClass" value="true" /> </bean>\r
-       -->\r
 \r
 </beans>
\ No newline at end of file