From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 20 Mar 2009 12:21:02 +0000 (+0000)
Subject: Update to new structure
X-Git-Tag: argeo-slc-2.1.7~2019
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=5a12db56207774d4e083be98eaa6ee6485de95d9;p=gpl%2Fargeo-slc.git

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 975b93f0b..25ff40583 100644
--- 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 @@
 
 	<bean id="basic.flowTemplate" parent="slcTemplate.simpleFlow"
 		abstract="true">
-		<property name="executionSpec" ref="basic.spec" />
+		<constructor-arg ref="basic.spec" />
+		<property name="path" value="/test/basic" />
 		<property name="executables">
 			<list>
 				<bean parent="task.echo" scope="execution">
@@ -39,7 +40,6 @@
 					<aop:scoped-proxy />
 				</bean>
 				<bean parent="testRun">
-					<property name="path" value="/test/basic" />
 					<property name="testDefinition" ref="testDef" />
 					<property name="testData">
 						<bean parent="basic.ref">
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..7754734d2 100644
--- 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 @@
 
 	<bean id="canonic.flowTemplate" parent="slcTemplate.simpleFlow"
 		abstract="true">
-		<property name="executionSpec" ref="canonic.spec" />
+		<constructor-arg ref="basic.spec" />
 		<property name="executables">
 			<list>
 				<bean parent="task.echo"
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 f2d252b3c..e7dcd635c 100644
--- 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 2f2ff2432..91123fc96 100644
--- 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>
 		
 	<bean id="main" parent="slcTemplate.simpleFlow">
-		<property name="executionSpec">
+		<constructor-arg>
 			<bean parent="slcTemplate.simpleSpec">
 				<property name="attributes">
 					<map>
@@ -24,7 +24,7 @@
 					</map>
 				</property>
 			</bean>
-		</property>
+		</constructor-arg>
 		<property name="executables">
 			<list>
 				<ref local="echo1" />
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 050e4c771..94ae50a67 100644
--- 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"
 		ref="executionModule" />
 
-	<list id="resultListeners" interface="org.argeo.slc.test.TestResultListener" />
+	<!-- <list id="resultListeners" interface="org.argeo.slc.test.TestResultListener" /> -->
 </beans:beans>
\ No newline at end of file