From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 28 Sep 2008 12:41:43 +0000 (+0000)
Subject: Use SLC Detached (aka. SLC AutoUI) as a bundle.
X-Git-Tag: argeo-slc-2.1.7~2541
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;ds=sidebyside;h=4bafe4b45c92437f769495c038203a048a4e793a;p=gpl%2Fargeo-slc.git

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 a78a89d8b..a41190c39 100644
--- 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 cfadbd5bc..19e7b5dbe 100644
--- 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 3bb370b9c..a6cf2a802 100644
--- 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
-Build-Jdk: 1.5.0
-Bnd-LastModified: 1222532363680
-Bundle-Name: SLC Sandbox JemmyTest
-Originally-Created-By: Apache Maven Bundle Plugin
-Bundle-SymbolicName: org.argeo.slc.sandbox.jemmytest
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.argeo.slc.jemmytest.JemmyTestActivator
+Export-Package: org.argeo.slc.jemmytest;uses:="org.apache.commons.logg
+ ing,org.argeo.slc.autoui,org.netbeans.jemmy.operators"
+Built-By: mbaudier
 Tool: Bnd-0.0.255
+Bundle-Name: SLC Sandbox JemmyTest
 Created-By: Apache Maven Bundle Plugin
+Require-Bundle: org.argeo.slc.autoui
+Build-Jdk: 1.6.0
 Bundle-Version: 0.1.2.SNAPSHOT
-Built-By: mbaudier
-Import-Package: org.apache.commons.logging,org.argeo.slc.autoui,org.arge
- o.slc.jemmytest,org.netbeans.jemmy.operators,org.osgi.framework;version
- ="1.4",org.springframework.beans.factory.xml
-Export-Package: org.argeo.slc.jemmytest;uses:="org.argeo.slc.autoui,org.
- osgi.framework,org.netbeans.jemmy.operators,org.apache.commons.logging"
+Bnd-LastModified: 1222605247862
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.argeo.slc.jemmytest.JemmyTestActivator
+Import-Package: org.apache.commons.logging,org.argeo.slc.autoui,org.ar
+ geo.slc.jemmytest,org.netbeans.jemmy.operators,org.springframework.be
+ ans.factory.xml
+Bundle-SymbolicName: org.argeo.slc.sandbox.jemmytest
+Originally-Created-By: Apache Maven Bundle Plugin
 
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 aaa91ce0f..1369dda04 100644
--- 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
index 2736fd7c4..000000000
--- 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