X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=demo%2Forg.argeo.slc.demo.basic%2Fsrc%2Fmain%2Fresources%2Fconf%2Fbasic.xml;h=a513e3f4fb77b4b579bc6fd37a8027e7c5309c06;hb=743ecb28b3c0236bc91a5d0993f70477236d96fd;hp=1ec671cb41dcb876d087d804366a8fec4340138e;hpb=237c2da124703a91c64cf0106d293f77821010e1;p=gpl%2Fargeo-slc.git

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 1ec671cb4..a513e3f4f 100644
--- 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
 	http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
 
-	<bean id="basic.executionSpec" class="org.argeo.slc.execution.SimpleExecutionSpec">
+	<bean id="basic.spec" parent="slcTemplate.simpleSpec">
 		<property name="attributes">
 			<map>
 				<entry key="testedComponentId">
-					<bean parent="specAttribute" p:value="100" p:isParameter="true"/>
+					<bean parent="specAttr.primitive" p:value="100" p:isParameter="true"
+						p:type="integer" />
 				</entry>
 				<entry key="testData1">
-					<bean parent="refAttribute" p:targetClass="org.argeo.slc.core.test.BasicTestData" />
+					<bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"
+						p:isParameter="true" p:isFrozen="true" />
 				</entry>
 				<entry key="testData2">
-					<bean parent="refAttribute" p:targetClass="org.argeo.slc.core.test.BasicTestData" />
+					<bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"
+						p:isParameter="true" p:isFrozen="true" />
 				</entry>
 			</map>
 		</property>
 	</bean>
 
-	<bean id="basic.ref" factory-bean="basic.executionSpec"
-		factory-method="createRef" abstract="true" />
+	<bean id="basic.ref" factory-bean="basic.spec" factory-method="createRef"
+		abstract="true" />
 
-	<bean id="basic.executionFlowTemplate" class="org.argeo.slc.execution.SimpleExecutionFlow"
+	<bean id="basic.flowTemplate" parent="slcTemplate.simpleFlow"
 		abstract="true">
-		<property name="executionSpec" ref="basic.executionSpec" />
+		<property name="executionSpec" ref="basic.spec" />
 		<property name="executables">
 			<list>
 				<ref bean="echo1" />
@@ -52,34 +55,11 @@
 		<constructor-arg value="testData2" />
 	</bean>
 
- 
- 	<bean id="basic.testData" class="org.argeo.slc.core.test.BasicTestData"
-		>
+
+	<bean id="basic.testData" class="org.argeo.slc.core.test.BasicTestData">
 		<aop:scoped-proxy />
 		<property name="expected" value="tata" />
 		<property name="reached" value="tata" />
 	</bean>
- 
- 
-	<bean id="testDef" class="org.argeo.slc.core.test.BasicTestDefinition"
-		scope="prototype" />
-
-	<bean id="testResult" parent="slcDefault.test.basicSimpleTestResult" />
-
-	<bean id="testRun" class="org.argeo.slc.core.test.SimpleTestRun"
-		abstract="true">
-		<property name="testResult" ref="testResult" />
-	</bean>
-
-	<!--
-		<bean class="org.springframework.aop.framework.ProxyFactoryBean">
-		<property name="targetClass"
-		value="org.argeo.slc.core.test.BasicTestData" /> <property
-		name="targetSource"> <bean
-		class="org.argeo.slc.executionflow.ExecutionTargetSource"> <property
-		name="name" value="testData" /> <property name="targetClass"
-		value="org.argeo.slc.core.test.BasicTestData" /> </bean> </property>
-		<property name="proxyTargetClass" value="true" /> </bean>
-	-->
 
 </beans>
\ No newline at end of file