X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=demo%2Fsite%2Forg.argeo.slc.demo.basic%2Fconf%2Fcanonic.xml;h=5d5f45ebb7ee81467068bfea813450eabf37509a;hb=ef09eb1b5da582375639f0ff9fe6b0961ac7b3e9;hp=ddc7acae529fd9509e68d1fad1d4ff928194f741;hpb=4810532845c8a54c04a850c7db3a9fe00e8ebc6a;p=gpl%2Fargeo-slc.git

diff --git a/demo/site/org.argeo.slc.demo.basic/conf/canonic.xml b/demo/site/org.argeo.slc.demo.basic/conf/canonic.xml
index ddc7acae5..5d5f45ebb 100644
--- a/demo/site/org.argeo.slc.demo.basic/conf/canonic.xml
+++ b/demo/site/org.argeo.slc.demo.basic/conf/canonic.xml
@@ -8,30 +8,51 @@
 	http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
 
 	<bean id="canonic.spec" parent="slcTemplate.simpleSpec">
+		<description>Covers various combinations of specs</description>
 		<property name="attributes">
 			<map>
 				<entry key="parameterAtInstantiation">
 					<bean parent="specAttr.primitive" p:isParameter="true" p:type="integer" />
 				</entry>
 				<entry key="displayWithoutControl">
-					<bean parent="specAttr.primitive" p:value="100" p:isParameter="true"
+					<bean parent="specAttr.primitive" p:value="100" p:isParameter="false"
 						p:isFrozen="true" p:type="integer" />
 				</entry>
 				<entry key="displayWithControl">
-					<bean parent="specAttr.primitive" p:value="200" p:isParameter="true"
+					<bean parent="specAttr.primitive" p:value="200" p:isParameter="false"
 						p:isFrozen="false" p:type="integer" />
 				</entry>
 				<entry key="hide">
 					<bean parent="specAttr.primitive" p:value="300" p:isParameter="true"
 						p:isFrozen="false" p:isHidden="true" p:type="integer" />
 				</entry>
+				<entry key="refWithValue">
+					<bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"
+						p:value-ref="testDataNok" p:isParameter="true" p:isFrozen="false" />
+				</entry>
+				<entry key="refWithoutValue">
+					<bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"
+						p:isParameter="false" p:isFrozen="false" />
+				</entry>
+				<entry key="refWithoutValueFrozen">
+					<bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"
+						p:isParameter="true" p:isFrozen="true">
+						<property name="value">
+							<bean class="org.argeo.slc.core.test.BasicTestData">
+								<aop:scoped-proxy />
+								<property name="expected" value="tata" />
+								<property name="reached" value="tata" />
+							</bean>
+						</property>
+					</bean>
+				</entry>
 			</map>
 		</property>
 	</bean>
 
 	<bean id="canonic.flowTemplate" parent="slcTemplate.simpleFlow"
 		abstract="true">
-		<property name="executionSpec" ref="canonic.spec" />
+		<constructor-arg ref="canonic.spec" />
 		<property name="executables">
 			<list>
 				<bean parent="task.echo"
@@ -42,4 +63,18 @@
 			</list>
 		</property>
 	</bean>
+
+	<bean id="testDataOk" class="org.argeo.slc.core.test.BasicTestData">
+		<aop:scoped-proxy />
+		<property name="expected" value="tata" />
+		<property name="reached" value="tata" />
+	</bean>
+
+	<bean id="testDataNok" class="org.argeo.slc.core.test.BasicTestData">
+		<aop:scoped-proxy />
+		<property name="expected" value="tata" />
+		<property name="reached" value="toto" />
+	</bean>
+
+
 </beans>
\ No newline at end of file