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

diff --git a/sandbox/argeo.slc.jemmytest/server-old.policy b/sandbox/argeo.slc.jemmytest/server-old.policy
deleted file mode 100644 (file)
index de837a5..0000000
--- a/sandbox/argeo.slc.jemmytest/server-old.policy
+++ /dev/null
@@ -1,11 +0,0 @@
-grant codeBase "file:/home/mbaudier/dev/src/slc/sandbox/argeo.slc.jemmytest/bin/" {
-    permission java.security.AllPermission;
-};
-
-grant codeBase "file:/home/mbaudier/dev/src/slc/sandbox/argeo.slc.jemmytest/local/autouiserver.jar" {
-    permission java.security.AllPermission;
-};
-
-grant codeBase "file:/home/mbaudier/.m2/repository/org/netbeans/jemmy/2.2.7.5/jemmy-2.2.7.5.jar" {
-    permission java.security.AllPermission;
-};

diff --git a/sandbox/argeo.slc.jemmytest/server.policy b/sandbox/argeo.slc.jemmytest/server.policy
deleted file mode 100644 (file)
index abf7847..0000000
--- a/sandbox/argeo.slc.jemmytest/server.policy
+++ /dev/null
@@ -1,4 +0,0 @@
-grant {
-       // Allow everything for now
-       permission java.security.AllPermission;
-};

diff --git a/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/DummyStep.java b/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/DummyStep.java
index 48fdd122f6defcfc1ac2aa7f3d7a6a2902462075..7f644983f598ece4be08c15f0f6aa31bc8f28a93 100644 (file)
--- a/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/DummyStep.java
+++ b/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/DummyStep.java
@@ -2,7 +2,6 @@ package org.argeo.slc.jemmytest;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.slc.detached.AutoUiActivator;
 import org.argeo.slc.detached.DetachedContext;
 import org.argeo.slc.detached.DetachedStep;
 import org.argeo.slc.detached.DetachedStepAnswer;

diff --git a/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/slc/conf/applicationContext.xml b/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/slc/conf/applicationContext.xml
deleted file mode 100644 (file)
index 01cc306..0000000
--- a/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/slc/conf/applicationContext.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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="common/import.xml" />
-
-       <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" class="org.argeo.slc.detached.drivers.FileDriver">
-               <property name="requestDir" value="file:${user.dir}/../sandbox/argeo.slc.jemmytest/local/detachedRequests"/>
-       </bean>
-
-
-</beans>
\ No newline at end of file

diff --git a/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/slc/conf/common/import.xml b/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/slc/conf/common/import.xml
deleted file mode 100644 (file)
index b895c21..0000000
--- a/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/slc/conf/common/import.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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">
-
-       <bean id="jemmyTest2"
-               class="org.argeo.slc.jemmytest.DummyStep">
-       </bean>
-
-</beans>
\ No newline at end of file

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
new file mode 100644 (file)
index 0000000..7c830ed
--- /dev/null
+++ b/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/spring/slc-detached.xml
@@ -0,0 +1,20 @@
+<?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">
+
+       <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"
+               class="org.argeo.slc.detached.drivers.FileDriver">
+               <property name="requestDir"
+                       value="file:${user.dir}/../sandbox/argeo.slc.jemmytest/local/detachedRequests" />
+       </bean>
+
+</beans>
\ No newline at end of file