Restrcuture the location of the execution server

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

diff --git a/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/spring/slc-detached.xml b/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/spring/slc-detached.xml
index 1a962228f350a22ea797632d9c2924c013f4d162..45480d5b1a3dddf7d571e4a65767fa7bdc0df0f8 100644 (file)
--- a/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/spring/slc-detached.xml
+++ b/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/spring/slc-detached.xml
@@ -8,12 +8,7 @@
     <bean id="jemmyTest" class="org.argeo.slc.jemmytest.DummyStep">
     </bean>
 
-    <bean id="executionServer"
-        class="org.argeo.slc.detached.DetachedExecutionServerImpl">
-        <property name="driver" ref="driver" />
-    </bean>
-
-    <bean id="driver"
+    <bean id="slcDetached.driver"
         class="org.argeo.slc.detached.drivers.FileDriver">
         <property name="baseDir" value="file:${slc.workDir}/detached" />
     </bean>

diff --git a/sandbox/argeo.slc.jemmytest/src/main/slc/conf/applicationContext.xml b/sandbox/argeo.slc.jemmytest/src/main/slc/conf/applicationContext.xml
index 2f5ae780b50258b6475308cc0473957a71ac44b0..0d4e3d8ca7ca14df35fbfb1b1340308af33bc29e 100644 (file)
--- a/sandbox/argeo.slc.jemmytest/src/main/slc/conf/applicationContext.xml
+++ b/sandbox/argeo.slc.jemmytest/src/main/slc/conf/applicationContext.xml
@@ -7,7 +7,7 @@
 
     <bean id="detachedTestDef"
         class="org.argeo.slc.lib.detached.DetachedTestDefinition">
-        <property name="client" ref="driver" />
+        <property name="client" ref="slcDetached.driver" />
         <property name="step" ref="jemmyTest" />
     </bean>
 

diff --git a/sandbox/argeo.slc.jemmytest/src/main/slc/root/jemmyTest/build.xml b/sandbox/argeo.slc.jemmytest/src/main/slc/root/jemmyTest/build.xml
index 62673d70cb48214664ad73d7b7f2ec667d2ed052..181335b834dfb9cfa154c53bd6b90aa7ad201072 100644 (file)
--- a/sandbox/argeo.slc.jemmytest/src/main/slc/root/jemmyTest/build.xml
+++ b/sandbox/argeo.slc.jemmytest/src/main/slc/root/jemmyTest/build.xml
@@ -1,8 +1,12 @@
 <project default="steps">
 
        <target name="steps">
-               <slc.detached action="slcDefault.detached.admin.openSession"
-                             client="driver" />
+               <slc.detached action="slcDefault.detached.admin.openSession">
+                       <properties>
+                               <entry key="slc.detached.refreshedBundles"
+                                      value="org.argeo.slc.sandbox.jemmytest" />
+                       </properties>
+               </slc.detached>
 
                <slc.test>
                        <testDefinition bean="detachedTestDef" />
@@ -13,8 +17,7 @@
                        <testData bean="detachedTestData2" />
                </slc.test>
 
-               <slc.detached action="slcDefault.detached.admin.closeSession"
-                             client="driver" />
+               <slc.detached action="slcDefault.detached.admin.closeSession" />
 
        </target>