Rename packages

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

diff --git a/sandbox/argeo.slc.jemmytest/pom.xml b/sandbox/argeo.slc.jemmytest/pom.xml
index 8c8758448e538fcc36fa858d7c1767fccb16664e..17638e5b5b7b14c940622c266320d8bfce8a0dec 100644 (file)
--- a/sandbox/argeo.slc.jemmytest/pom.xml
+++ b/sandbox/argeo.slc.jemmytest/pom.xml
@@ -80,6 +80,12 @@
                        <version>${project.version}</version>
                </dependency>
 
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-context</artifactId>
+                       <version>2.0.8</version>
+               </dependency>
+
                <dependency>
                        <groupId>org.apache.felix</groupId>
                        <artifactId>org.osgi.core</artifactId>

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 6213dd2a4ea04700185624c771fdb0d50465999c..48fdd122f6defcfc1ac2aa7f3d7a6a2902462075 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,11 +2,11 @@ package org.argeo.slc.jemmytest;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.slc.autoui.AutoUiActivator;
-import org.argeo.slc.autoui.DetachedContext;
-import org.argeo.slc.autoui.DetachedStep;
-import org.argeo.slc.autoui.DetachedStepAnswer;
-import org.argeo.slc.autoui.DetachedStepRequest;
+import org.argeo.slc.detached.AutoUiActivator;
+import org.argeo.slc.detached.DetachedContext;
+import org.argeo.slc.detached.DetachedStep;
+import org.argeo.slc.detached.DetachedStepAnswer;
+import org.argeo.slc.detached.DetachedStepRequest;
 import org.netbeans.jemmy.operators.JButtonOperator;
 import org.netbeans.jemmy.operators.JFrameOperator;
 import org.netbeans.jemmy.operators.JLabelOperator;

diff --git a/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/JemmyTestActivator.java b/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/JemmyTestActivator.java
index 19e7b5dbe237172d40b2c97d035afd062b2dc3e6..6a3ad60048bf4e4c43bb279a7c5e087fd48ba66a 100644 (file)
--- a/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/JemmyTestActivator.java
+++ b/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/JemmyTestActivator.java
@@ -1,6 +1,6 @@
 package org.argeo.slc.jemmytest;
 
-import org.argeo.slc.autoui.SimpleDetachedActivator;
+import org.argeo.slc.detached.SimpleDetachedActivator;
 
 public class JemmyTestActivator extends SimpleDetachedActivator {
 }

diff --git a/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/MANIFEST.MF b/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/MANIFEST.MF
index 5e3c9221216d4910c874e703d20beb8e6318f7dc..9264ae3eb95bfa8fdad6e1f0c0d21b0b433b87fc 100644 (file)
--- a/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/MANIFEST.MF
+++ b/sandbox/argeo.slc.jemmytest/src/main/resources/META-INF/MANIFEST.MF
@@ -1,19 +1,23 @@
 Manifest-Version: 1.0\r
 Export-Package: org.argeo.slc.jemmytest;uses:="org.apache.commons.logg\r
- ing,org.argeo.slc.autoui,org.netbeans.jemmy.operators"\r
+ ing,org.netbeans.jemmy.operators,org.argeo.slc.detached"\r
 Built-By: mbaudier\r
 Tool: Bnd-0.0.255\r
 Bundle-Name: SLC Sandbox JemmyTest\r
 Created-By: Apache Maven Bundle Plugin\r
 Require-Bundle: org.argeo.slc.detached\r
+Bundle-Vendor: Argeo\r
 Build-Jdk: 1.6.0\r
-Bundle-Version: 0.1.2.SNAPSHOT\r
-Bnd-LastModified: 1222608014886\r
-Bundle-ManifestVersion: 2\r
+Bundle-Version: 0.11.1.SNAPSHOT\r
+Bnd-LastModified: 1222615501820\r
 Bundle-Activator: org.argeo.slc.jemmytest.JemmyTestActivator\r
-Import-Package: org.apache.commons.logging,org.argeo.slc.autoui,org.ar\r
- geo.slc.jemmytest,org.netbeans.jemmy.operators,org.springframework.be\r
- ans.factory.xml\r
+Bundle-ManifestVersion: 2\r
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Bundle-Description: SLC Distribution\r
+Import-Package: org.apache.commons.logging,org.argeo.slc.detached,org.\r
+ argeo.slc.jemmytest,org.netbeans.jemmy.operators,org.springframework.\r
+ beans.factory.xml\r
 Bundle-SymbolicName: org.argeo.slc.sandbox.jemmytest\r
+Bundle-DocURL: http://www.argeo.org\r
 Originally-Created-By: Apache Maven Bundle Plugin\r
 \r

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
index fe65baa4d29e0fb15de146eea21a192018b69bfa..01cc306a720123c288549541dc7ae5fa6bd6e9ec 100644 (file)
--- 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
@@ -9,10 +9,10 @@
        </bean>
 
        <bean id="executionServer"
-               class="org.argeo.slc.autoui.DetachedExecutionServerImpl">
+               class="org.argeo.slc.detached.DetachedExecutionServerImpl">
                <property name="driver" ref="driver" />
        </bean>
-       <bean id="driver" class="org.argeo.slc.autoui.drivers.FileDriver">
+       <bean id="driver" class="org.argeo.slc.detached.drivers.FileDriver">
                <property name="requestDir" value="file:${user.dir}/../sandbox/argeo.slc.jemmytest/local/detachedRequests"/>
        </bean>
 

diff --git a/sandbox/argeo.slc.jemmytest/src/test/java/org/argeo/slc/detached/DetachedTest.java b/sandbox/argeo.slc.jemmytest/src/test/java/org/argeo/slc/detached/DetachedTest.java
deleted file mode 100644 (file)
index 8a95ab1..0000000
--- a/sandbox/argeo.slc.jemmytest/src/test/java/org/argeo/slc/detached/DetachedTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.argeo.slc.detached;
-
-import java.io.File;
-import java.util.UUID;
-
-import junit.framework.TestCase;
-
-import org.argeo.slc.autoui.DetachedStepRequest;
-import org.argeo.slc.autoui.drivers.FileDriver;
-
-public class DetachedTest extends TestCase {
-       public void testSendRequest() throws Exception {
-               FileDriver client = new FileDriver();
-               File requestDir = new File("local/detachedRequests");
-               requestDir.mkdirs();
-               client.setRequestDir(requestDir);
-
-               DetachedStepRequest request = new DetachedStepRequest();
-               request.setUuid(UUID.randomUUID().toString());
-               request.setStepRef("jemmyTest");
-
-               client.sendRequest(request);
-       }
-}

diff --git a/sandbox/argeo.slc.jemmytest/src/test/java/org/argeo/slc/jemmytest/DetachedTest.java b/sandbox/argeo.slc.jemmytest/src/test/java/org/argeo/slc/jemmytest/DetachedTest.java
new file mode 100644 (file)
index 0000000..4f55c3d
--- /dev/null
+++ b/sandbox/argeo.slc.jemmytest/src/test/java/org/argeo/slc/jemmytest/DetachedTest.java
@@ -0,0 +1,24 @@
+package org.argeo.slc.jemmytest;
+
+import java.io.File;
+import java.util.UUID;
+
+import junit.framework.TestCase;
+
+import org.argeo.slc.detached.DetachedStepRequest;
+import org.argeo.slc.detached.drivers.FileDriver;
+
+public class DetachedTest extends TestCase {
+       public void testSendRequest() throws Exception {
+               FileDriver client = new FileDriver();
+               File requestDir = new File("local/detachedRequests");
+               requestDir.mkdirs();
+               client.setRequestDir(requestDir);
+
+               DetachedStepRequest request = new DetachedStepRequest();
+               request.setUuid(UUID.randomUUID().toString());
+               request.setStepRef("jemmyTest");
+
+               client.sendRequest(request);
+       }
+}