From: Bruno Sinou <bsinou@argeo.org>
Date: Tue, 29 Oct 2013 16:21:08 +0000 (+0000)
Subject: Correct some typos and refactore some deprecated calls when reviewing code.
X-Git-Tag: argeo-slc-2.1.7~298
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=c34e2d164d97dff0f4e8f87946fb8c9778dff035;p=gpl%2Fargeo-slc.git

Correct some typos and refactore some deprecated calls when reviewing code.

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

diff --git a/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/basic.xml b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/basic.xml
index d0434549b..1f0afd9cd 100644
--- a/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/basic.xml
+++ b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/basic.xml
@@ -27,9 +27,6 @@
 		</property>
 	</bean>
 
-	<!-- <bean id="basic.ref" factory-bean="basic.spec" factory-method="createRef" 
-		abstract="true" /> -->
-
 	<bean id="basic.flowTemplate" parent="slcTemplate.simpleFlow"
 		abstract="true">
 		<constructor-arg ref="basic.spec" />
@@ -98,7 +95,6 @@
 		<constructor-arg value="testData2" />
 	</bean>
 
-
 	<bean id="basic.testData" class="org.argeo.slc.core.test.BasicTestData">
 		<aop:scoped-proxy />
 		<property name="expected" value="tata" />
@@ -146,6 +142,4 @@
 		<property name="executionContext" ref="executionContext" />
 	</bean>
 
-
-
 </beans>
\ No newline at end of file
diff --git a/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/canonic-ns.xml b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/canonic-ns.xml
index adf60c1db..29f9f44db 100644
--- a/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/canonic-ns.xml
+++ b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/canonic-ns.xml
@@ -53,5 +53,4 @@
 		<property name="reached" value="toto" />
 	</bean>
 
-
 </beans>
\ No newline at end of file
diff --git a/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/canonic.xml b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/canonic.xml
index 5d5f45ebb..4172e9376 100644
--- a/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/canonic.xml
+++ b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/canonic.xml
@@ -76,5 +76,4 @@
 		<property name="reached" value="toto" />
 	</bean>
 
-
 </beans>
\ No newline at end of file
diff --git a/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/main.xml b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/main.xml
index 7c9785d92..a2ee7a2d7 100644
--- a/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/main.xml
+++ b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/main.xml
@@ -36,7 +36,7 @@
 		<property name="executables">
 			<list>
 				<bean parent="task.echo">
-					<property name="message" value="No rg!" />
+					<property name="message" value="No arg!" />
 				</bean>
 			</list>
 		</property>
diff --git a/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/namespace.xml b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/namespace.xml
index c0767ecbb..610f5ee4b 100644
--- a/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/namespace.xml
+++ b/demo/modules/org.argeo.slc.demo.basic/META-INF/spring/namespace.xml
@@ -8,7 +8,7 @@
 	http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">
 
 	<!-- Flow definition is simplified thanks to the 'flow:flow' element -->
-	<flow:flow id="flow" path="/namespace">
+	<flow:flow name="/namespace/flow" >
 		<bean p:message="TEST in flow" class="org.argeo.slc.core.execution.tasks.Echo" />
 		<ref bean="referencedRunnable" />
 	</flow:flow>
@@ -29,7 +29,7 @@
 			isParameter="true" type="integer" />
 	</flow:spec>
 
-	<flow:flow id="flowSpec" spec="namespaceSpec" path="/namespace">
+	<flow:flow name="/namespace/flowSpec" spec="namespaceSpec">
 		<bean p:message="TEST in flow @{primitive}" class="org.argeo.slc.core.execution.tasks.Echo"
 			scope="execution">
 			<aop:scoped-proxy />