Update to new structure

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

diff --git a/demo/site/org.argeo.slc.demo.basic/conf/basic.xml b/demo/site/org.argeo.slc.demo.basic/conf/basic.xml
index 975b93f0bf48e87503940b4368867642e69c3f66..25ff40583e5a7b911a109a0f7b7b44520d1f0466 100644 (file)
--- a/demo/site/org.argeo.slc.demo.basic/conf/basic.xml
+++ b/demo/site/org.argeo.slc.demo.basic/conf/basic.xml
@@ -31,7 +31,8 @@
 \r
        <bean id="basic.flowTemplate" parent="slcTemplate.simpleFlow"\r
                abstract="true">\r
-               <property name="executionSpec" ref="basic.spec" />\r
+               <constructor-arg ref="basic.spec" />\r
+               <property name="path" value="/test/basic" />\r
                <property name="executables">\r
                        <list>\r
                                <bean parent="task.echo" scope="execution">\r
@@ -39,7 +40,6 @@
                                        <aop:scoped-proxy />\r
                                </bean>\r
                                <bean parent="testRun">\r
-                                       <property name="path" value="/test/basic" />\r
                                        <property name="testDefinition" ref="testDef" />\r
                                        <property name="testData">\r
                                                <bean parent="basic.ref">\r

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 ddc7acae529fd9509e68d1fad1d4ff928194f741..7754734d28ea410779a8a41914dc5d59637541b4 100644 (file)
--- a/demo/site/org.argeo.slc.demo.basic/conf/canonic.xml
+++ b/demo/site/org.argeo.slc.demo.basic/conf/canonic.xml
@@ -31,7 +31,7 @@
 \r
        <bean id="canonic.flowTemplate" parent="slcTemplate.simpleFlow"\r
                abstract="true">\r
-               <property name="executionSpec" ref="canonic.spec" />\r
+               <constructor-arg ref="basic.spec" />\r
                <property name="executables">\r
                        <list>\r
                                <bean parent="task.echo"\r

diff --git a/demo/site/org.argeo.slc.demo.basic/conf/common.xml b/demo/site/org.argeo.slc.demo.basic/conf/common.xml
index f2d252b3c236db1b4ca76ab38f86f2c08f3e73cd..e7dcd635c22934e6173f10675e34076e3d45a1c4 100644 (file)
--- a/demo/site/org.argeo.slc.demo.basic/conf/common.xml
+++ b/demo/site/org.argeo.slc.demo.basic/conf/common.xml
@@ -8,7 +8,7 @@
                scope="prototype" />
 
        <bean id="testResult" parent="slcDefault.test.basicTreeTestResult">
-               <property name="listeners" ref="resultListeners" />
+               <!-- <property name="listeners" ref="resultListeners" /> -->
        </bean>
 
        <bean id="testRun" class="org.argeo.slc.core.test.SimpleTestRun"

diff --git a/demo/site/org.argeo.slc.demo.basic/conf/main.xml b/demo/site/org.argeo.slc.demo.basic/conf/main.xml
index 2f2ff243287567ccb33e9c8baced16b89bbbfe05..91123fc9654ffbd5bc1d99c7a099a26f925371da 100644 (file)
--- a/demo/site/org.argeo.slc.demo.basic/conf/main.xml
+++ b/demo/site/org.argeo.slc.demo.basic/conf/main.xml
@@ -14,7 +14,7 @@
        </bean>\r
                \r
        <bean id="main" parent="slcTemplate.simpleFlow">\r
-               <property name="executionSpec">\r
+               <constructor-arg>\r
                        <bean parent="slcTemplate.simpleSpec">\r
                                <property name="attributes">\r
                                        <map>\r
@@ -24,7 +24,7 @@
                                        </map>\r
                                </property>\r
                        </bean>\r
-               </property>\r
+               </constructor-arg>\r
                <property name="executables">\r
                        <list>\r
                                <ref local="echo1" />\r

diff --git a/demo/site/org.argeo.slc.demo.basic/conf/osgi.xml b/demo/site/org.argeo.slc.demo.basic/conf/osgi.xml
index 050e4c771dd6939083a81f9aa903ea6c60118306..94ae50a67539ead80e82d1e9d14c0b4252a9f27d 100644 (file)
--- a/demo/site/org.argeo.slc.demo.basic/conf/osgi.xml
+++ b/demo/site/org.argeo.slc.demo.basic/conf/osgi.xml
@@ -9,5 +9,5 @@
        <service interface="org.argeo.slc.execution.ExecutionModule"\r
                ref="executionModule" />\r
 \r
-       <list id="resultListeners" interface="org.argeo.slc.test.TestResultListener" />\r
+       <!-- <list id="resultListeners" interface="org.argeo.slc.test.TestResultListener" /> -->\r
 </beans:beans>
\ No newline at end of file