Start introducing the interfaces

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

diff --git a/org.argeo.slc.autoui.launcher/pom.xml b/org.argeo.slc.autoui.launcher/pom.xml
index 1785af18744987dc97da894dd2165fa5dcc4cf59..69e3f1df487d048897776f8c102601be02aa263f 100644 (file)
--- a/org.argeo.slc.autoui.launcher/pom.xml
+++ b/org.argeo.slc.autoui.launcher/pom.xml
@@ -38,25 +38,15 @@
                        <artifactId>org.apache.felix.main</artifactId>
                </dependency>
                <!-- Spring -->
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-core</artifactId>
-                       <version>2.0.8</version>
-               </dependency>
                <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>spring-context</artifactId>
                        <version>2.0.8</version>
                </dependency>
+
                <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-beans</artifactId>
-                       <version>2.0.8</version>
+                       <groupId>xerces</groupId>
+                       <artifactId>xercesImpl</artifactId>
                </dependency>
-
-                       <dependency>
-                               <groupId>xerces</groupId>
-                               <artifactId>xercesImpl</artifactId>
-                       </dependency>
        </dependencies>
 </project>
\ No newline at end of file

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 e7bba09c881843bfa26d7dbf76513879ae8d43c2..0aa79afa327a5e8d77d9a9879964fc1a8ae065c5 100644 (file)
--- 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 */