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 d0434549b9f613eb0ff8abbfcfaf051b49af3961..1f0afd9cd1b2488932b8e4fc4156d94ed1305d18 100644 (file)
--- 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>\r
        </bean>\r
 \r
-       <!-- <bean id="basic.ref" factory-bean="basic.spec" factory-method="createRef" \r
-               abstract="true" /> -->\r
-\r
        <bean id="basic.flowTemplate" parent="slcTemplate.simpleFlow"\r
                abstract="true">\r
                <constructor-arg ref="basic.spec" />\r
@@ -98,7 +95,6 @@
                <constructor-arg value="testData2" />\r
        </bean>\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
@@ -146,6 +142,4 @@
                <property name="executionContext" ref="executionContext" />\r
        </bean>\r
 \r
-\r
-\r
 </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 adf60c1db679539ed277f49779f8f894b6ec9921..29f9f44db550dc308fe8f213178091de9a167ed2 100644 (file)
--- 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" />\r
        </bean>\r
 \r
-\r
 </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 5d5f45ebb7ee81467068bfea813450eabf37509a..4172e93764a5947f1685d567fbda502ab29c4498 100644 (file)
--- 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" />\r
        </bean>\r
 \r
-\r
 </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 7c9785d92a23b7428cdc315a8913636b1630240f..a2ee7a2d7746c891f470fd82b8280d297d60310f 100644 (file)
--- 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">\r
                        <list>\r
                                <bean parent="task.echo">\r
-                                       <property name="message" value="No rg!" />\r
+                                       <property name="message" value="No arg!" />\r
                                </bean>\r
                        </list>\r
                </property>\r

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 c0767ecbbb786e30dbb65987b854267e68a1e2b7..610f5ee4b1201061a545dbfa8ad4385e4532fedd 100644 (file)
--- 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">\r
 \r
        <!-- Flow definition is simplified thanks to the 'flow:flow' element -->\r
-       <flow:flow id="flow" path="/namespace">\r
+       <flow:flow name="/namespace/flow" >\r
                <bean p:message="TEST in flow" class="org.argeo.slc.core.execution.tasks.Echo" />\r
                <ref bean="referencedRunnable" />\r
        </flow:flow>\r
@@ -29,7 +29,7 @@
                        isParameter="true" type="integer" />\r
        </flow:spec>\r
 \r
-       <flow:flow id="flowSpec" spec="namespaceSpec" path="/namespace">\r
+       <flow:flow name="/namespace/flowSpec" spec="namespaceSpec">\r
                <bean p:message="TEST in flow @{primitive}" class="org.argeo.slc.core.execution.tasks.Echo"\r
                        scope="execution">\r
                        <aop:scoped-proxy />\r