X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.autoui.launcher%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fautoui%2Flauncher%2FMain.java;fp=org.argeo.slc.autoui.launcher%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fautoui%2Flauncher%2FMain.java;h=0aa79afa327a5e8d77d9a9879964fc1a8ae065c5;hb=21a5dac39be4c3f786a9f9146a46d383939ec171;hp=e7bba09c881843bfa26d7dbf76513879ae8d43c2;hpb=60e78665964756bdcf403fd5c85631396f1d4690;p=gpl%2Fargeo-slc.git diff --git a/org.argeo.slc.autoui.launcher/src/main/java/org/argeo/slc/autoui/launcher/Main.java b/org.argeo.slc.autoui.launcher/src/main/java/org/argeo/slc/autoui/launcher/Main.java index e7bba09c8..0aa79afa3 100644 --- a/org.argeo.slc.autoui.launcher/src/main/java/org/argeo/slc/autoui/launcher/Main.java +++ b/org.argeo.slc.autoui.launcher/src/main/java/org/argeo/slc/autoui/launcher/Main.java @@ -14,7 +14,7 @@ import org.apache.felix.framework.Felix; import org.apache.felix.framework.cache.BundleCache; import org.apache.felix.main.AutoActivator; import org.argeo.slc.autoui.AutoUiActivator; -import org.argeo.slc.autoui.AutoUiApplication; +import org.argeo.slc.autoui.DetachedStep; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; @@ -24,7 +24,7 @@ public class Main { try { // Load properties Properties config = prepareConfig(); - + // Start UI (in main class loader) startUi(config); @@ -110,22 +110,18 @@ public class Main { // mainArgs[0] = Class.forName("[Ljava.lang.String;"); Method mainMethod = clss.getMethod("main", mainArgsClasses); mainMethod.invoke(null, mainArgs); - - // ClassReference classReference = new ClassReference(className); - // classReference.startApplication(uiArgs); } protected static void automateUi(BundleContext bundleContext) throws Exception { // Retrieve service and execute it ServiceReference ref = bundleContext - .getServiceReference("org.argeo.slc.autoui.AutoUiApplication"); + .getServiceReference("org.argeo.slc.autoui.DetachedStep"); Object service = bundleContext.getService(ref); - // Object service = applicationContext.getBean("jemmyTest"); AutoUiActivator.stdOut("service.class=" + service.getClass()); - AutoUiApplication app = (AutoUiApplication) service; - app.execute(null); + DetachedStep app = (DetachedStep) service; + app.execute(null, null); } /* UTILITIES */