From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 2 Oct 2008 14:01:15 +0000 (+0000)
Subject: Restrcuture the location of the execution server
X-Git-Tag: argeo-slc-2.1.7~2506
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=bc87e55ca2e75b0135d0d24fbe9a1f0cfb5e247e;p=gpl%2Fargeo-slc.git

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 1a962228f..45480d5b1 100644
--- 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 2f5ae780b..0d4e3d8ca 100644
--- 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 62673d70c..181335b83 100644
--- 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>