X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=sandbox%2Fargeo.slc.jemmytest%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fjemmytest%2FJemmyTestActivator.java;h=a67dc5ab2a82e7ebf730addeba8e40c937723697;hb=654695911785352c5c1a635157997c8277c869a5;hp=c8c0e357c3cf4ee4407661a0d33c6fb6a9b63c2d;hpb=b2f23cc85abe3bc31711c04746b80244b43bd442;p=gpl%2Fargeo-slc.git

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 c8c0e357c..a67dc5ab2 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
@@ -2,57 +2,20 @@ package org.argeo.slc.jemmytest;
 
 import java.util.Properties;
 
-import org.argeo.slc.autoui.AutoUiApplication;
-import org.osgi.framework.BundleActivator;
+import org.argeo.slc.autoui.AbstractDetachedActivator;
+import org.argeo.slc.autoui.DetachedStep;
 import org.osgi.framework.BundleContext;
-import org.springframework.context.support.AbstractApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-public class JemmyTestActivator implements BundleActivator {
-	private AbstractApplicationContext applicationContext;
-
-	public void start(BundleContext context) throws Exception {
-		ClassLoader classLoader = getClass().getClassLoader();
-
-		Thread cur = Thread.currentThread();
-		ClassLoader save = cur.getContextClassLoader();
-		cur.setContextClassLoader(classLoader);
-
-		try {
-			// FIXME: make it more generic
-			applicationContext = new ClassPathXmlApplicationContext(
-					"/slc/conf/applicationContext.xml");
-		} catch (Exception e) {
-			e.printStackTrace();
-			throw new Exception("Could not initialize application context");
-		} finally {
-			cur.setContextClassLoader(save);
-		}
-
-		// applicationContext = new GenericApplicationContext();
-		// XmlBeanDefinitionReader xmlReader = new XmlBeanDefinitionReader(
-		// (BeanDefinitionRegistry) applicationContext);
-		// Bundle bundle = context.getBundle();
-		//
-		// URL url = bundle
-		// .getResource("META-INF/slc/conf/applicationContext.xml");
-		// if (url != null) {
-		// System.out.println("Loads application context from bundle "
-		// + bundle.getSymbolicName());
-		// xmlReader.loadBeanDefinitions(new UrlResource(url));
-		// }
 
+public class JemmyTestActivator extends AbstractDetachedActivator {
+	protected void startAutoBundle(BundleContext context) throws Exception {
 		Properties properties = new Properties();
-		// AutoUiApplicationJemmy applicationJemmy = new
-		// AutoUiApplicationJemmy();
-		AutoUiApplicationJemmy applicationJemmy = (AutoUiApplicationJemmy) applicationContext
-				.getBean("jemmyTest");
-		context.registerService(AutoUiApplication.class.getName(),
+		DummyStep applicationJemmy = (DummyStep) getStaticRef("jemmyTest");
+		context.registerService(DetachedStep.class.getName(),
 				applicationJemmy, properties);
 		stdOut("JemmyTest started");
 	}
 
-	public void stop(BundleContext context) throws Exception {
+	public void stopAutoBundle(BundleContext context) throws Exception {
 		stdOut("JemmyTest stopped");
 	}