Introduce runtime selection

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

diff --git a/org.argeo.slc.example/exampleSlcAppli/conf/applicationContext.xml b/org.argeo.slc.example/exampleSlcAppli/conf/applicationContext.xml
index 73c83fbec20c3739b16984bc1c7957cb33e6fd7d..68dbbadcb8d24a33151521cb091aa8f27a6e7692 100644 (file)
--- a/org.argeo.slc.example/exampleSlcAppli/conf/applicationContext.xml
+++ b/org.argeo.slc.example/exampleSlcAppli/conf/applicationContext.xml
@@ -1,12 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans xmlns="http://www.springframework.org/schema/beans"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">\r
-\r
-       <import resource="runtime/default.xml" />\r
-       <import resource="environments/environments.xml" />\r
-
-       <import resource="test/testDatas.xml" />\r
-       <import resource="test/testDefinitions.xml" />\r
-       <import resource="test/contextTests.xml" />\r
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+
+       <import resource="environments/environments.xml" />
+
+       <import resource="test/testDatas.xml" />
+       <import resource="test/testDefinitions.xml" />
+       <import resource="test/contextTests.xml" />
+
+       <bean id="defaultTestRun"
+               class="org.argeo.slc.core.test.SimpleTestRun" scope="prototype">
+               <property name="testResult" ref="testResult" />
+               <property name="deployedSystem" ref="exampleDeployedSystem" />
+       </bean>
+
+       <bean id="otherTestRun"
+               class="org.argeo.slc.core.test.SimpleTestRun" scope="prototype">
+               <property name="testResult" ref="testResult2" />
+               <property name="deployedSystem" ref="exampleDeployedSystem" />
+       </bean>
+
+
 </beans>
\ No newline at end of file

diff --git a/org.argeo.slc.example/exampleSlcAppli/conf/runtime/default.xml b/org.argeo.slc.example/exampleSlcAppli/conf/runtime/default.xml
index 7764b7012ce8916797195dd44dbd39b4dcf851fb..b50d44571cd5a134de0447c8d17c651b07e10c5e 100644 (file)
--- a/org.argeo.slc.example/exampleSlcAppli/conf/runtime/default.xml
+++ b/org.argeo.slc.example/exampleSlcAppli/conf/runtime/default.xml
@@ -8,18 +8,6 @@
        <import
                resource="classpath:/org/argeo/slc/core/process/spring/applicationContext.xml" />
 
-       <bean id="defaultTestRun"
-               class="org.argeo.slc.core.test.SimpleTestRun" scope="prototype">
-               <property name="testResult" ref="testResult" />
-               <property name="deployedSystem" ref="exampleDeployedSystem" />
-       </bean>
-
-       <bean id="otherTestRun"
-               class="org.argeo.slc.core.test.SimpleTestRun" scope="prototype">
-               <property name="testResult" ref="testResult2" />
-               <property name="deployedSystem" ref="exampleDeployedSystem" />
-       </bean>
-
        <bean id="testResult"
                class="org.argeo.slc.core.test.tree.TreeTestResult">
                <property name="uuid" value="1" />

diff --git a/org.argeo.slc.example/src/test/java/org/argeo/slc/example/ExecutionTest.java b/org.argeo.slc.example/src/test/java/org/argeo/slc/example/ExecutionTest.java
index 94a2888e61da6ac6f63187b868e8238b52a2472f..4f5588e2ef807dafbe8105237e6ddf419d34919f 100644 (file)
--- a/org.argeo.slc.example/src/test/java/org/argeo/slc/example/ExecutionTest.java
+++ b/org.argeo.slc.example/src/test/java/org/argeo/slc/example/ExecutionTest.java
@@ -7,7 +7,8 @@ import junit.framework.TestCase;
 public class ExecutionTest extends TestCase {
        public void testSimpleRun() {
                String[] args = { "--mode", "single", "--script",
-                               "exampleSlcAppli/root/Category1/SubCategory2/build.xml" };
+                               "exampleSlcAppli/root/Category1/SubCategory2/build.xml",
+                               "--runtime", "default" };
                SlcMain.main(args);
        }
 }