From b88f396633bee00a9046d66f54af1f6d9cc51616 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 21 Sep 2008 13:33:54 +0000
Subject: [PATCH 1/1] Simplify projects

git-svn-id: https://svn.argeo.org/slc/trunk@1609 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 org.argeo.slc.autoui/pom.xml                  | 18 ++++-----
 .../argeo/slc/autoui/AutoUiApplication.java   |  2 +-
 .../org/argeo/slc/autoui/{ => main}/Main.java | 38 ++++++-------------
 3 files changed, 20 insertions(+), 38 deletions(-)
 rename org.argeo.slc.autoui/src/main/java/org/argeo/slc/autoui/{ => main}/Main.java (86%)

diff --git a/org.argeo.slc.autoui/pom.xml b/org.argeo.slc.autoui/pom.xml
index 9722210ba..80eb87779 100644
--- a/org.argeo.slc.autoui/pom.xml
+++ b/org.argeo.slc.autoui/pom.xml
@@ -29,12 +29,8 @@
 							org.argeo.slc.autoui.AutoUiActivator
 						</Bundle-Activator>
 						<Export-Package>
-							org.argeo.slc.autoui.*
+							org.argeo.slc.autoui
 						</Export-Package>
-						<!-- 
-							<Export-Service>
-							org.argeo.slc.autoui.AutoUiApplication
-							</Export-Service> -->
 					</instructions>
 				</configuration>
 			</plugin>
@@ -43,7 +39,7 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
 					<source>1.3</source>
-					<target>1.1</target>
+					<target>1.3</target>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -73,15 +69,15 @@
 		</dependency>
 
 		<!-- OSGi 
-		<dependency>
+			<dependency>
 			<groupId>org.apache.felix</groupId>
 			<artifactId>org.osgi.core</artifactId>
 			<version>1.0.0</version>
-		</dependency>-->
-		
-			<dependency>
+			</dependency>-->
+
+		<dependency>
 			<groupId>org.apache.felix</groupId>
 			<artifactId>org.apache.felix.main</artifactId>
-			</dependency> 
+		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/org.argeo.slc.autoui/src/main/java/org/argeo/slc/autoui/AutoUiApplication.java b/org.argeo.slc.autoui/src/main/java/org/argeo/slc/autoui/AutoUiApplication.java
index 203843edc..cca0006c5 100644
--- a/org.argeo.slc.autoui/src/main/java/org/argeo/slc/autoui/AutoUiApplication.java
+++ b/org.argeo.slc.autoui/src/main/java/org/argeo/slc/autoui/AutoUiApplication.java
@@ -1,5 +1,5 @@
 package org.argeo.slc.autoui;
 
-public interface AutoUiApplication extends Runnable{
+public interface AutoUiApplication {
 	public Object execute(Object object) throws Exception;
 }
diff --git a/org.argeo.slc.autoui/src/main/java/org/argeo/slc/autoui/Main.java b/org.argeo.slc.autoui/src/main/java/org/argeo/slc/autoui/main/Main.java
similarity index 86%
rename from org.argeo.slc.autoui/src/main/java/org/argeo/slc/autoui/Main.java
rename to org.argeo.slc.autoui/src/main/java/org/argeo/slc/autoui/main/Main.java
index 735cb1fdf..0d10170f9 100644
--- a/org.argeo.slc.autoui/src/main/java/org/argeo/slc/autoui/Main.java
+++ b/org.argeo.slc.autoui/src/main/java/org/argeo/slc/autoui/main/Main.java
@@ -1,11 +1,9 @@
-package org.argeo.slc.autoui;
+package org.argeo.slc.autoui.main;
 
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Properties;
@@ -14,38 +12,27 @@ import java.util.Vector;
 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.netbeans.jemmy.ClassReference;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 
 public class Main {
-	private final Felix felix;
-	private final BundleContext context;
-
-	public Main(Felix felix) {
-		this.felix = felix;
-		context = felix.getBundleContext();
-	}
-
-	public Felix getFelix() {
-		return felix;
-	}
-
-	public BundleContext getContext() {
-		return context;
-	}
 
 	public static void main(String[] args) {
 		try {
 			// Start OSGi system
 			Properties config = prepareConfig();
-			Main main = startSystem(config);
+			Felix felix = startSystem(config);
 
 			// Start UI (in main class loader)
 			startUi(config);
 
 			// Automate
-			automateUi(main.getContext());
+			automateUi(felix.getBundleContext());
+			
+			felix.stop();
 		} catch (Exception e) {
 			e.printStackTrace();
 			System.exit(-1);
@@ -94,7 +81,7 @@ public class Main {
 		return cachedir;
 	}
 
-	public static Main startSystem(Properties config) throws Exception {
+	public static Felix startSystem(Properties config) throws Exception {
 		// Create list to hold custom framework activators.
 		List list = new ArrayList();
 		// Add activator to process auto-start/install properties.
@@ -106,7 +93,7 @@ public class Main {
 		Felix felix = new Felix(config, list);
 		felix.start();
 
-		return new Main(felix);
+		return felix;
 	}
 
 	public static void startUi(Properties config) throws Exception {
@@ -135,9 +122,8 @@ public class Main {
 	 */
 	private static String[] readArgumentsFromLine(String lineOrig) {
 
-		String line = lineOrig.trim();// make sure there are no trailing
-		// spaces
-		System.out.println("line=" + line);
+		String line = lineOrig.trim();// remove trailing spaces
+		// System.out.println("line=" + line);
 		List args = new Vector();
 		StringBuffer curr = new StringBuffer("");
 		boolean inQuote = false;
@@ -171,7 +157,7 @@ public class Main {
 		String[] res = new String[args.size()];
 		for (int i = 0; i < args.size(); i++) {
 			res[i] = args.get(i).toString();
-			System.out.println("res[i]=" + res[i]);
+			// System.out.println("res[i]=" + res[i]);
 		}
 		return res;
 	}
-- 
2.39.2