From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 31 Mar 2009 05:56:35 +0000 (+0000)
Subject: Adapt detached to new launcher
X-Git-Tag: argeo-slc-2.1.7~2008
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=bd4b487cc0b1841e7d42c84fa44f9e123a89b759;p=gpl%2Fargeo-slc.git

Adapt detached to new launcher

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

diff --git a/runtime/org.argeo.slc.detached/pom.xml b/runtime/org.argeo.slc.detached/pom.xml
index 0e0b20be8..d3b9b49fc 100644
--- a/runtime/org.argeo.slc.detached/pom.xml
+++ b/runtime/org.argeo.slc.detached/pom.xml
@@ -25,13 +25,15 @@
 							org.argeo.slc.detached.*
 						</Export-Package>
 						<Import-Package>
-							*,
+							org.w3c.dom;version="0.0.0",
+							javax.xml.*;version="0.0.0",
 							org.springframework.beans.factory;version="2.0",
 							org.springframework.beans.factory.support;version="2.0",
 							org.springframework.beans.factory.xml;version="2.0",
 							org.springframework.context;version="2.0",
 							org.springframework.context.support;version="2.0",
-							org.springframework.core.io;version="2.0"
+							org.springframework.core.io;version="2.0",
+							*
 						</Import-Package>
 						<Spring-Context>*;create-asynchronously:=false</Spring-Context>
 					</instructions>
diff --git a/runtime/org.argeo.slc.lib.detached/pom.xml b/runtime/org.argeo.slc.lib.detached/pom.xml
index b7a89af92..6d6f4c839 100644
--- a/runtime/org.argeo.slc.lib.detached/pom.xml
+++ b/runtime/org.argeo.slc.lib.detached/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.slc</groupId>
@@ -38,6 +39,7 @@
 						<Export-Package>
 							org.argeo.slc.*
 						</Export-Package>
+						<Import-Package>javax.xml.*;version="0.0.0",*</Import-Package>
 					</instructions>
 				</configuration>
 			</plugin>
diff --git a/runtime/org.argeo.slc.support.castor/pom.xml b/runtime/org.argeo.slc.support.castor/pom.xml
index a1c8fb791..3bcf7e254 100644
--- a/runtime/org.argeo.slc.support.castor/pom.xml
+++ b/runtime/org.argeo.slc.support.castor/pom.xml
@@ -48,7 +48,8 @@
 							org.argeo.slc.core.execution;resolution:=optional,
 							org.argeo.slc.msg;resolution:=optional,
 							org.argeo.slc.msg.process;resolution:=optional,
-							org.argeo.slc.msg.test.tree;resolution:=optional
+							org.argeo.slc.msg.test.tree;resolution:=optional,
+							org.argeo.slc.detached;resolution:=optional
 						</Import-Package>
 						<Fragment-Host>com.springsource.org.castor</Fragment-Host>
 						<!--
diff --git a/runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/ExecutionCommandProvider.java b/runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/ExecutionCommandProvider.java
index 3a9080780..ae064f652 100644
--- a/runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/ExecutionCommandProvider.java
+++ b/runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/ExecutionCommandProvider.java
@@ -4,6 +4,8 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.execution.ExecutionFlowDescriptor;
 import org.argeo.slc.execution.ExecutionModule;
@@ -17,6 +19,9 @@ import org.springframework.osgi.context.BundleContextAware;
 
 public class ExecutionCommandProvider implements CommandProvider,
 		BundleContextAware {
+	private final static Log log = LogFactory
+			.getLog(ExecutionCommandProvider.class);
+
 	private List<ExecutionModule> executionModules;
 	private BundleContext bundleContext;
 
@@ -47,24 +52,24 @@ public class ExecutionCommandProvider implements CommandProvider,
 
 		if (bundle != null) {
 			moduleName = bundle.getSymbolicName();
-//			try {
-//				bundle.stop();
-//				bundle.update();
-//				bundle.start();
-//
-//				// FIXME: potential infinite loop
-//				while (bundle.getState() == Bundle.STARTING) {
-//					try {
-//						Thread.sleep(500);
-//					} catch (InterruptedException e) {
-//						// silent
-//					}
-//				}
-//			} catch (BundleException e) {
-//				throw new SlcException(
-//						"Could not update the bundle for module " + moduleName,
-//						e);
-//			}
+			// try {
+			// bundle.stop();
+			// bundle.update();
+			// bundle.start();
+			//
+			// // FIXME: potential infinite loop
+			// while (bundle.getState() == Bundle.STARTING) {
+			// try {
+			// Thread.sleep(500);
+			// } catch (InterruptedException e) {
+			// // silent
+			// }
+			// }
+			// } catch (BundleException e) {
+			// throw new SlcException(
+			// "Could not update the bundle for module " + moduleName,
+			// e);
+			// }
 		}
 
 		// Find module
@@ -84,9 +89,12 @@ public class ExecutionCommandProvider implements CommandProvider,
 			ExecutionFlowDescriptor descriptor = new ExecutionFlowDescriptor();
 			descriptor.setName(executionName);
 			module.execute(descriptor);
-			return "Executed " + executionName + " from " + moduleName;
+			log.info("Executed " + executionName + " from " + moduleName);
 		} else
-			return "Could not find any execution module matching these requirements.";
+			log
+					.warn("Could not find any execution module matching these requirements.");
+
+		return null;
 	}
 
 	public String getHelp() {
diff --git a/sandbox/argeo.slc.jemmytest/execdir/slc-detached.properties b/sandbox/argeo.slc.jemmytest/execdir/slc-detached.properties
index 74383d228..321161a8d 100644
--- a/sandbox/argeo.slc.jemmytest/execdir/slc-detached.properties
+++ b/sandbox/argeo.slc.jemmytest/execdir/slc-detached.properties
@@ -1 +1,2 @@
-slc.osgi.start=org.springframework.osgi.extender,org.argeo.slc.detached,org.argeo.slc.sandbox.jemmytest
\ No newline at end of file
+slc.osgi.start=org.springframework.osgi.extender,org.argeo.slc.detached,org.argeo.slc.sandbox.jemmytest
+slc.osgi.scanClasspath=true
\ No newline at end of file
diff --git a/sandbox/argeo.slc.jemmytest/modules/org.argeo.slc.jemmytest.log4j/META-INF/MANIFEST.MF b/sandbox/argeo.slc.jemmytest/modules/org.argeo.slc.jemmytest.log4j/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..0c3c5d261
--- /dev/null
+++ b/sandbox/argeo.slc.jemmytest/modules/org.argeo.slc.jemmytest.log4j/META-INF/MANIFEST.MF
@@ -0,0 +1,5 @@
+Bundle-Name: Log4j Configuration
+Bundle-SymbolicName: org.argeo.slc.jemmytest.log4j
+Bundle-Version: 1.0.0
+Fragment-Host: com.springsource.org.apache.log4j
+
diff --git a/sandbox/argeo.slc.jemmytest/modules/org.argeo.slc.jemmytest.log4j/log4j.properties b/sandbox/argeo.slc.jemmytest/modules/org.argeo.slc.jemmytest.log4j/log4j.properties
new file mode 100644
index 000000000..3ee850471
--- /dev/null
+++ b/sandbox/argeo.slc.jemmytest/modules/org.argeo.slc.jemmytest.log4j/log4j.properties
@@ -0,0 +1,25 @@
+log4j.rootLogger=WARN, console
+
+## Levels
+log4j.logger.org.argeo=DEBUG
+log4j.logger.org.argeo.slc.execution.ExecutionParameterPostProcessor=TRACE
+log4j.logger.org.argeo.slc.execution.ExecutionContext=DEBUG
+log4j.logger.org.argeo.slc.execution.SimpleExecutionSpec=DEBUG
+
+log4j.logger.org.springframework=WARN
+
+log4j.logger.org.apache.activemq=WARN
+log4j.logger.org.apache.activemq.transport=WARN
+log4j.logger.org.apache.activemq.selector=WARN
+
+log4j.logger.org.apache.catalina=INFO
+log4j.logger.org.apache.coyote=INFO
+log4j.logger.org.apache.tomcat=INFO
+
+## Appenders
+# console is set to be a ConsoleAppender.
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+
+# console uses PatternLayout.
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c%n
diff --git a/sandbox/argeo.slc.jemmytest/modules/org.argeo.slc.jemmytest.mxlaunch/META-INF/MANIFEST.MF b/sandbox/argeo.slc.jemmytest/modules/org.argeo.slc.jemmytest.mxlaunch/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..5af2943cd
--- /dev/null
+++ b/sandbox/argeo.slc.jemmytest/modules/org.argeo.slc.jemmytest.mxlaunch/META-INF/MANIFEST.MF
@@ -0,0 +1,24 @@
+Bundle-Name: Mx Launch
+Bundle-SymbolicName: org.argeo.slc.jemmytest.mxlaunch
+Bundle-Version: 1.0.0
+Bundle-Name: Sparta Mx Client Launcher
+Import-Package: org.argeo.slc.detached,
+ javax.swing,
+ javax.swing.border,
+ javax.swing.colorchooser,
+ javax.swing.event,
+ javax.swing.filechooser,
+ javax.swing.plaf,
+ javax.swing.plaf.basic,
+ javax.swing.plaf.metal,
+ javax.swing.plaf.multi,
+ javax.swing.plaf.synth,
+ javax.swing.table,
+ javax.swing.text,
+ javax.swing.text.html,
+ javax.swing.text.html.parser,
+ javax.swing.text.rtf,
+ javax.swing.tree,
+ javax.swing.undo
+Bundle-ClassPath: lib/mxjboot.jar
+
diff --git a/sandbox/argeo.slc.jemmytest/modules/org.argeo.slc.jemmytest.mxlaunch/META-INF/spring/mxClientLauncher.xml b/sandbox/argeo.slc.jemmytest/modules/org.argeo.slc.jemmytest.mxlaunch/META-INF/spring/mxClientLauncher.xml
new file mode 100644
index 000000000..5fecd46b4
--- /dev/null
+++ b/sandbox/argeo.slc.jemmytest/modules/org.argeo.slc.jemmytest.mxlaunch/META-INF/spring/mxClientLauncher.xml
@@ -0,0 +1,25 @@
+<?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.5.xsd">
+
+	<bean id="mxClientLauncher" class="org.argeo.slc.detached.AppLauncher"
+		init-method="launch">
+		<!-- <property name="mainClass" value="murex.rmi.loader.RmiLoader" />-->
+		<property name="mainClass" value="org.argeo.slc.testui.SwingTestUi" />
+		<property name="systemProperties">
+			<props>
+				<prop key="java.rmi.server.codebase">http://FS_URL/murex.download.guiclient.download
+				</prop>
+			</props>
+		</property>
+		<property name="arguments">
+			<list>
+				<value>/MXJ_CLASS_NAME:murex.gui.xml.XmlGuiClientBoot
+				</value>
+				<value>/MXJ_SITE_NAME:site1</value>
+			</list>
+		</property>
+	</bean>
+
+</beans>
\ No newline at end of file
diff --git a/sandbox/argeo.slc.jemmytest/modules/org.argeo.slc.jemmytest.tests/META-INF/MANIFEST.MF b/sandbox/argeo.slc.jemmytest/modules/org.argeo.slc.jemmytest.tests/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..0a6e3b569
--- /dev/null
+++ b/sandbox/argeo.slc.jemmytest/modules/org.argeo.slc.jemmytest.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,23 @@
+Bundle-SymbolicName: org.argeo.slc.sandbox.jemmytest.tests
+Fragment-Host: org.argeo.slc.sandbox.jemmytest
+Bundle-Version: 0.11.3.SNAPSHOT
+Bundle-Name: SLC Sandbox JemmyTest Tests
+Require-Bundle: org.argeo.slc.detached,
+ org.argeo.slc.lib.detached,
+ org.argeo.slc.support.equinox,
+ org.argeo.slc.specs,
+ org.argeo.slc.support.simple
+Import-Package: org.springframework.oxm,
+ org.springframework.oxm.castor,
+ org.springframework.xml.xsd,
+ net.sf.cglib.core,
+ net.sf.cglib.proxy,
+ net.sf.cglib.reflect,
+ org.aopalliance.aop,
+ org.apache.commons.logging,
+ org.springframework.aop,
+ org.springframework.aop.framework,
+ org.springframework.aop.scope,
+ org.springframework.beans.factory.config,
+ org.springframework.core.io
+ 
diff --git a/sandbox/argeo.slc.jemmytest/modules/org.argeo.slc.jemmytest.tests/META-INF/spring/fromAnt.xml b/sandbox/argeo.slc.jemmytest/modules/org.argeo.slc.jemmytest.tests/META-INF/spring/fromAnt.xml
new file mode 100644
index 000000000..332835731
--- /dev/null
+++ b/sandbox/argeo.slc.jemmytest/modules/org.argeo.slc.jemmytest.tests/META-INF/spring/fromAnt.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+	xmlns:aop="http://www.springframework.org/schema/aop"
+	xsi:schemaLocation="
+	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+	http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd
+	http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
+
+	<bean id="jemmyTest" parent="slcTemplate.simpleFlow">
+		<property name="path" value="/autoui/testcases" />
+		<property name="executables">
+			<list>
+				<bean parent="task.echo" scope="execution">
+					<property name="message" value="Executing step" />
+					<aop:scoped-proxy />
+				</bean>
+
+				<bean class="org.argeo.slc.core.test.SimpleTestRun">
+					<property name="testDefinition" ref="detachedTestDef" />
+					<property name="testData" ref="testData.mainFrameLabel1" />
+					<property name="testResult" ref="testResult" />
+				</bean>
+
+			</list>
+		</property>
+	</bean>
+
+	<bean id="testResult" parent="slcDefault.test.basicTreeTestResult">
+		<property name="listeners">
+			<list>
+				<bean class="org.argeo.slc.core.test.tree.TreeTestResultLogger" />
+			</list>
+		</property>
+	</bean>
+</beans>
\ No newline at end of file
diff --git a/sandbox/argeo.slc.jemmytest/modules/org.argeo.slc.jemmytest.tests/META-INF/spring/imports.xml b/sandbox/argeo.slc.jemmytest/modules/org.argeo.slc.jemmytest.tests/META-INF/spring/imports.xml
new file mode 100644
index 000000000..9ac7e5350
--- /dev/null
+++ b/sandbox/argeo.slc.jemmytest/modules/org.argeo.slc.jemmytest.tests/META-INF/spring/imports.xml
@@ -0,0 +1,10 @@
+<?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.5.xsd">
+
+	<import resource="classpath:/org/argeo/slc/core/execution/spring.xml" />
+	<import resource="classpath:/org/argeo/slc/core/test/spring/applicationContext.xml" />
+
+</beans>
\ No newline at end of file
diff --git a/sandbox/argeo.slc.jemmytest/modules/org.argeo.slc.jemmytest.tests/META-INF/spring/osgi.xml b/sandbox/argeo.slc.jemmytest/modules/org.argeo.slc.jemmytest.tests/META-INF/spring/osgi.xml
new file mode 100644
index 000000000..8beb99ba5
--- /dev/null
+++ b/sandbox/argeo.slc.jemmytest/modules/org.argeo.slc.jemmytest.tests/META-INF/spring/osgi.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/osgi"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
+	xsi:schemaLocation="http://www.springframework.org/schema/osgi  
+       http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd
+       http://www.springframework.org/schema/beans   
+       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+	<service interface="org.argeo.slc.execution.ExecutionModule">
+		<beans:bean class="org.argeo.slc.osgi.OsgiExecutionModule">
+			<beans:property name="executionContext" ref="executionContext" />
+		</beans:bean>
+	</service>
+
+
+</beans:beans>
\ No newline at end of file
diff --git a/sandbox/argeo.slc.jemmytest/modules/org.argeo.slc.jemmytest.tests/META-INF/spring/tests.xml b/sandbox/argeo.slc.jemmytest/modules/org.argeo.slc.jemmytest.tests/META-INF/spring/tests.xml
new file mode 100644
index 000000000..6320236b4
--- /dev/null
+++ b/sandbox/argeo.slc.jemmytest/modules/org.argeo.slc.jemmytest.tests/META-INF/spring/tests.xml
@@ -0,0 +1,62 @@
+<?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.5.xsd">
+
+    <import resource="classpath:/org/argeo/slc/lib/detached/spring.xml" />
+
+    <import resource="classpath:/META-INF/spring/slc-detached.xml" />
+
+    <bean id="detachedTestDef"
+        parent="slcTemplate.detached.testDefinition"
+        scope="prototype">
+        <property name="client" ref="slcDetached.driver" />
+    </bean>
+
+    <bean id="slcDetached.driver"
+        class="org.argeo.slc.detached.drivers.FileDriver" init-method="cleanPreviousRuns">
+        <property name="baseDir" value="${user.dir}/local/detached" />
+        <property name="xmlConverter"
+            ref="slcDefault.detached.xmlConverterCastor" />
+    </bean>
+
+    <bean id="testData.mainFrameLabel1"
+        class="org.argeo.slc.lib.detached.DetachedTestData"
+        scope="prototype">
+        <property name="values">
+            <map>
+                <entry key="jemmyTest.label" value="Hello World" />
+            </map>
+        </property>
+        <property name="expectedValues">
+            <map>
+                <entry key="jemmyTest.label" value="Pressed!!" />
+            </map>
+        </property>
+    </bean>
+
+    <bean id="testData.mainFrameLabel2"
+        class="org.argeo.slc.lib.detached.DetachedTestData"
+        scope="prototype">
+        <property name="values">
+            <map>
+                <entry key="jemmyTest.label" value="Pressed!!" />
+            </map>
+        </property>
+        <property name="expectedValues">
+            <map>
+                <entry key="jemmyTest.label" value="Hello World" />
+            </map>
+        </property>
+    </bean>
+
+    <bean id="testData.testDialogLabel"
+        class="org.argeo.slc.lib.detached.DetachedTestData"
+        scope="prototype">
+        <property name="expectedValues">
+            <map>
+                <entry key="jemmyTest.labelDialog" value="Dialog open" />
+            </map>
+        </property>
+    </bean>
+</beans>
\ No newline at end of file
diff --git a/sandbox/argeo.slc.jemmytest/pom.xml b/sandbox/argeo.slc.jemmytest/pom.xml
index f1e2acfcf..c324c166c 100644
--- a/sandbox/argeo.slc.jemmytest/pom.xml
+++ b/sandbox/argeo.slc.jemmytest/pom.xml
@@ -11,7 +11,14 @@
 	<artifactId>org.argeo.slc.sandbox.jemmytest</artifactId>
 	<name>SLC Sandbox JemmyTest</name>
 	<packaging>jar</packaging>
-	<properties></properties>
+	<properties>
+		<bundlesToStart>
+			org.springframework.osgi.extender,
+			org.argeo.slc.detached,
+			org.argeo.slc.sandbox.jemmytest,
+			org.argeo.slc.support.equinox
+		</bundlesToStart>
+	</properties>
 	<build>
 		<plugins>
 			<plugin>
@@ -63,6 +70,51 @@
 				<artifactId>maven-surefire-plugin</artifactId>
 				<configuration></configuration>
 			</plugin>
+			<plugin>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>unpack</goal>
+						</goals>
+						<phase>initialize</phase>
+						<configuration>
+							<outputDirectory>target/equinox</outputDirectory>
+							<artifactItems>
+								<artifactItem>
+									<groupId>org.argeo.slc.runtime</groupId>
+									<artifactId>org.argeo.slc.osgiboot</artifactId>
+									<version>${project.version}</version>
+									<type>tar.gz</type>
+									<classifier>osgiboot</classifier>
+								</artifactItem>
+							</artifactItems>
+						</configuration>
+					</execution>
+				</executions>
+
+			</plugin>
+			<plugin>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<configuration>
+					<tasks>
+						<path id="slc.osgi.locations.raw">
+							<dirset dir="${user.dir}/modules">
+								<include name="*" />
+								<exclude name=".svn" />
+							</dirset>
+							<path refid="maven.compile.classpath" />
+						</path>
+						<pathconvert dirsep="/" property="slc.osgi.locations"
+							refid="slc.osgi.locations.raw" />
+
+						<property name="slc.osgi.start" value="${bundlesToStart}" />
+						<ant antfile="target/equinox/osgiboot.xml" />
+
+					</tasks>
+				</configuration>
+			</plugin>
+
 		</plugins>
 	</build>
 	<profiles></profiles>
@@ -90,6 +142,16 @@
 			<version>${project.version}</version>
 		</dependency>
 
+		<dependency>
+			<groupId>org.springframework.osgi</groupId>
+			<artifactId>org.springframework.osgi.extender</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.support.equinox</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
 		<!--
 			<dependency> <groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.detached</artifactId>
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 622d959c4..5facf3b59 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
@@ -44,7 +44,7 @@
 	<!-- Runtime -->
 	<bean id="slcDetached.driver" parent="slcTemplate.detached.fileDriver"
 		init-method="start" destroy-method="stop">
-		<property name="baseDir" value="${slc.workDir}/detached" />
+		<property name="baseDir" value="${user.dir}/local/detached" />
 		<property name="xmlConverter" ref="slcDefault.detached.xmlConverterCompat" />
 		<property name="executionServer" ref="executionServer.serviceref" />
 	</bean>
diff --git a/sandbox/argeo.slc.testui/pom.xml b/sandbox/argeo.slc.testui/pom.xml
index d1b588f3a..78225d7a2 100644
--- a/sandbox/argeo.slc.testui/pom.xml
+++ b/sandbox/argeo.slc.testui/pom.xml
@@ -14,7 +14,7 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
 					<source>1.4</source>
-					<target>1.2</target>
+					<target>1.4</target>
 				</configuration>
 			</plugin>
 			<plugin>