Use SLC Detached (aka. SLC AutoUI) as a bundle.

Move servers config to end bundle.

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

diff --git a/sandbox/argeo.slc.jemmytest/pom.xml b/sandbox/argeo.slc.jemmytest/pom.xml
index a78a89d8b260ba0714ffd8845328d0c53183d0e7..a41190c39860e1264a108c7d2bc588bed5eb2a83 100644 (file)
--- a/sandbox/argeo.slc.jemmytest/pom.xml
+++ b/sandbox/argeo.slc.jemmytest/pom.xml
@@ -7,16 +7,17 @@
        <name>SLC Sandbox JemmyTest</name>
        <version>0.1.2-SNAPSHOT</version>
        <packaging>bundle</packaging>
-       <build><!--
-               <resources>
+       <build>
+               <!--
+                       <resources>
                        <resource>
-                               <directory>src/main/slc</directory>
-                               <targetPath>META-INF/slc</targetPath>
-                               <includes>
-                                       <include>**/*</include>
-                               </includes>
+                       <directory>src/main/slc</directory>
+                       <targetPath>META-INF/slc</targetPath>
+                       <includes>
+                       <include>**/*</include>
+                       </includes>
                        </resource>
-               </resources>-->
+                       </resources>-->
                <plugins>
                        <plugin>
                                <groupId>org.apache.felix</groupId>
@@ -24,7 +25,9 @@
                                <version>1.4.3</version>
                                <extensions>true</extensions>
                                <configuration>
-                                       <manifestLocation>src/main/resources/META-INF</manifestLocation>
+                                       <manifestLocation>
+                                               src/main/resources/META-INF
+                                       </manifestLocation>
                                        <instructions>
                                                <Bundle-SymbolicName>
                                                        ${pom.artifactId}
@@ -38,6 +41,9 @@
                                                <Import-Package>
                                                        *,org.springframework.beans.factory.xml
                                                </Import-Package>
+                                               <Require-Bundle>
+                                                       org.argeo.slc.autoui
+                                               </Require-Bundle>
                                        </instructions>
                                </configuration>
                        </plugin>

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 cfadbd5bc978f32b0af818502858ca4a867fd55d..19e7b5dbe237172d40b2c97d035afd062b2dc3e6 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,25 +1,6 @@
 package org.argeo.slc.jemmytest;
 
-import java.util.Properties;
+import org.argeo.slc.autoui.SimpleDetachedActivator;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.slc.autoui.AbstractDetachedActivator;
-import org.argeo.slc.autoui.DetachedStep;
-import org.osgi.framework.BundleContext;
-
-public class JemmyTestActivator extends AbstractDetachedActivator {
-       private final Log log = LogFactory.getLog(getClass());
-       
-       protected void startAutoBundle(BundleContext context) throws Exception {
-//             Properties properties = new Properties();
-//             DummyStep applicationJemmy = (DummyStep) getStaticRef("jemmyTest");
-//             context.registerService(DetachedStep.class.getName(),
-//                             applicationJemmy, properties);
-               log.info("JemmyTest started");
-       }
-
-       public void stopAutoBundle(BundleContext context) throws Exception {
-               log.info("JemmyTest stopped");
-       }
+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 3bb370b9ca901827ca699d6ab8fe65445423ceab..a6cf2a802ad5a50c2dd39972e6f401e2e443190e 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,18 +1,19 @@
 Manifest-Version: 1.0\r
-Build-Jdk: 1.5.0\r
-Bnd-LastModified: 1222532363680\r
-Bundle-Name: SLC Sandbox JemmyTest\r
-Originally-Created-By: Apache Maven Bundle Plugin\r
-Bundle-SymbolicName: org.argeo.slc.sandbox.jemmytest\r
-Bundle-ManifestVersion: 2\r
-Bundle-Activator: org.argeo.slc.jemmytest.JemmyTestActivator\r
+Export-Package: org.argeo.slc.jemmytest;uses:="org.apache.commons.logg\r
+ ing,org.argeo.slc.autoui,org.netbeans.jemmy.operators"\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.autoui\r
+Build-Jdk: 1.6.0\r
 Bundle-Version: 0.1.2.SNAPSHOT\r
-Built-By: mbaudier\r
-Import-Package: org.apache.commons.logging,org.argeo.slc.autoui,org.arge\r
- o.slc.jemmytest,org.netbeans.jemmy.operators,org.osgi.framework;version\r
- ="1.4",org.springframework.beans.factory.xml\r
-Export-Package: org.argeo.slc.jemmytest;uses:="org.argeo.slc.autoui,org.\r
- osgi.framework,org.netbeans.jemmy.operators,org.apache.commons.logging"\r
+Bnd-LastModified: 1222605247862\r
+Bundle-ManifestVersion: 2\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-SymbolicName: org.argeo.slc.sandbox.jemmytest\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 aaa91ce0f15b8b4127aab5f7ec45fb2e525d107b..1369dda04424f32f18f2de3b0c913e670079d38a 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,4 +9,14 @@
                class="org.argeo.slc.jemmytest.DummyStep">
        </bean>
 
+       <bean id="executionServer"
+               class="org.argeo.slc.autoui.DetachedExecutionServerImpl">
+               <property name="driver" ref="driver"/>
+       </bean>
+       <bean id="driver"
+               class="org.argeo.slc.autoui.drivers.FileDriver">
+               <property name="requestDir" value="/home/mbaudier/dev/test/SLC/detachedRequests"/>
+       </bean>
+
+
 </beans>
\ No newline at end of file

diff --git a/sandbox/argeo.slc.jemmytest/src/main/slc/conf/applicationContext.xml b/sandbox/argeo.slc.jemmytest/src/main/slc/conf/applicationContext.xml
deleted file mode 100644 (file)
index 2736fd7..0000000
--- a/sandbox/argeo.slc.jemmytest/src/main/slc/conf/applicationContext.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="jemmyTest"
-               class="org.argeo.slc.jemmytest.DummyStep">
-       </bean>
-
-</beans>
\ No newline at end of file