From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 14 Jan 2010 21:18:24 +0000 (+0000)
Subject: Almost complete implementation of the flow namespace
X-Git-Tag: argeo-slc-2.1.7~1467
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=31d3f0e2c2f8ac0833293ec0c34164e1005038a0;p=gpl%2Fargeo-slc.git

Almost complete implementation of the flow namespace

git-svn-id: https://svn.argeo.org/slc/trunk@3287 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/demo/site/org.argeo.slc.demo.basic/conf/canonic-ns.xml b/demo/site/org.argeo.slc.demo.basic/conf/canonic-ns.xml
new file mode 100644
index 000000000..978d10776
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.basic/conf/canonic-ns.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+	xmlns:aop="http://www.springframework.org/schema/aop" xmlns:flow="http://www.argeo.org/schema/slc-flow"
+	xsi:schemaLocation="
+	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+	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
+	http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">
+
+	<flow:spec id="canonic-ns.spec">
+		<flow:primitive name="parameterAtInstantiation"
+			isParameter="true" type="integer" />
+		<flow:primitive name="displayWithoutControl" value="100"
+			isParameter="true" type="integer" isFrozen="true" />
+		<flow:primitive name="displayWithControl" value="200"
+			isParameter="true" type="integer" />
+		<flow:primitive name="hide" value="300" isParameter="true"
+			type="integer" isHidden="true" />
+		<flow:ref name="refWithValue" targetClass="org.argeo.slc.core.test.BasicTestData"
+			isParameter="true" value-ref="testDataNok" />
+		<flow:ref name="refWithoutValue" targetClass="org.argeo.slc.core.test.BasicTestData" />
+		<flow:ref name="refWithoutValueFrozen" targetClass="org.argeo.slc.core.test.BasicTestData"
+			isParameter="true" isFrozen="true">
+			<flow:value>
+				<bean class="org.argeo.slc.core.test.BasicTestData">
+					<aop:scoped-proxy />
+					<property name="expected" value="tata" />
+					<property name="reached" value="tata" />
+				</bean>
+			</flow:value>
+		</flow:ref>
+	</flow:spec>
+
+	<flow:flow id="canonic-ns.flowTemplate" abstract="true"
+		spec="canonic-ns.spec">
+		<bean parent="task.echo"
+			p:message="Canonical: displayWithControl=@{displayWithControl}, displayWithoutControl=@{displayWithoutControl}, hide=@{hide}"
+			scope="execution">
+			<aop:scoped-proxy />
+		</bean>
+	</flow:flow>
+
+	<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
diff --git a/demo/site/org.argeo.slc.demo.basic/conf/namespace.xml b/demo/site/org.argeo.slc.demo.basic/conf/namespace.xml
index 48ab91054..c0767ecbb 100644
--- a/demo/site/org.argeo.slc.demo.basic/conf/namespace.xml
+++ b/demo/site/org.argeo.slc.demo.basic/conf/namespace.xml
@@ -22,4 +22,19 @@
 	-->
 	<bean id="standaloneRunnable" flow:as-flow="implicitFlow"
 		p:message="TEST in implicit flow" class="org.argeo.slc.core.execution.tasks.Echo" />
+
+	<!-- Specs definition is also simplified -->
+	<flow:spec id="namespaceSpec">
+		<flow:primitive name="primitive" value="100"
+			isParameter="true" type="integer" />
+	</flow:spec>
+
+	<flow:flow id="flowSpec" spec="namespaceSpec" path="/namespace">
+		<bean p:message="TEST in flow @{primitive}" class="org.argeo.slc.core.execution.tasks.Echo"
+			scope="execution">
+			<aop:scoped-proxy />
+		</bean>
+		<ref bean="referencedRunnable" />
+	</flow:flow>
+
 </beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/conf/testCases/canonic-ns-001.xml b/demo/site/org.argeo.slc.demo.basic/conf/testCases/canonic-ns-001.xml
new file mode 100644
index 000000000..5b1dbf6dc
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.basic/conf/testCases/canonic-ns-001.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+	xmlns:aop="http://www.springframework.org/schema/aop"
+	xsi:schemaLocation="
+	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+	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="canonic-ns.001" parent="canonic-ns.flowTemplate">
+		<description>Canonic 001</description>
+		<constructor-arg>
+			<map>
+				<entry key="parameterAtInstantiation" value="1" />
+			</map>
+		</constructor-arg>
+	</bean>
+</beans>
diff --git a/demo/site/org.argeo.slc.demo.basic/conf/testCases/canonic-ns-002.xml b/demo/site/org.argeo.slc.demo.basic/conf/testCases/canonic-ns-002.xml
new file mode 100644
index 000000000..b1c47135d
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.basic/conf/testCases/canonic-ns-002.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+	xmlns:aop="http://www.springframework.org/schema/aop" xmlns:flow="http://www.argeo.org/schema/slc-flow"
+	xsi:schemaLocation="
+	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+	http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
+	http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">
+
+	<flow:flow id="canonic-ns.002" parent="canonic.flowTemplate">
+		<flow:arg name="parameterAtInstantiation" value="2" />
+		<flow:arg name="displayWithoutControl" value="102" />
+		<flow:arg name="displayWithControl" value="202" />
+		<flow:arg name="hide" value="202" />
+	</flow:flow>
+</beans>