DevLauncher supports Maven settings.xml

AsyncCollection can receive an error
add GUIDUtil
fix ExtensionPoints

Author: lecousin

core.javaee/.classpath

@@ -21,6 +21,7 @@
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>

core.javaee/.settings/org.eclipse.jdt.core.prefs

@@ -5,4 +5,5 @@ org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8

net.lecousin.core/.classpath

@@ -10,6 +10,7 @@
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
@@ -42,6 +43,7 @@
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>

net.lecousin.core/.settings/org.eclipse.jdt.core.prefs

@@ -5,4 +5,5 @@ org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8

net.lecousin.core/src/main/java/net/lecousin/framework/application/LCCore.java

@@ -88,12 +88,8 @@ public static synchronized void start() {
 		started = true;
 
 		// init logging system if not specified
-		if (System.getProperty("org.apache.commons.logging.Log") == null) {
-			try {
-				LCCore.class.getClassLoader().loadClass("net.lecousin.framework.log.bridges.ApacheCommonsLogging");
-				System.setProperty("org.apache.commons.logging.Log", "net.lecousin.framework.log.bridges.ApacheCommonsLogging");
-			} catch (Throwable t) { /* ignore */ }
-		}
+		if (System.getProperty("org.apache.commons.logging.Log") == null)
+			System.setProperty("org.apache.commons.logging.Log", "net.lecousin.framework.log.bridges.ApacheCommonsLogging");
 
 		// register protocols
 		String protocols = System.getProperty("java.protocol.handler.pkgs");

net.lecousin.core/src/main/java/net/lecousin/framework/application/launcher/AppLauncher.java

@@ -94,6 +94,7 @@ else if (args[i].startsWith("-maven-repository=")) {
 					pomLoader.addRepository(repo);
 					repositories.add(repo);
 				}
+				// TODO should we really use the local repository (and so we need to parse settings.xml), or it should be given ?
 
 				// load configuration file
 				File cfgFile = null;

net.lecousin.core/src/main/java/net/lecousin/framework/application/launcher/DevLauncher.java

@@ -16,6 +16,7 @@
 import net.lecousin.framework.application.libraries.artifacts.LibraryDescriptorLoader;
 import net.lecousin.framework.application.libraries.artifacts.maven.MavenLocalRepository;
 import net.lecousin.framework.application.libraries.artifacts.maven.MavenPOMLoader;
+import net.lecousin.framework.application.libraries.artifacts.maven.MavenSettings;
 import net.lecousin.framework.concurrent.Task;
 import net.lecousin.framework.concurrent.synch.ISynchronizationPoint;
 import net.lecousin.framework.util.Triple;
@@ -95,6 +96,7 @@ else if (args[i].startsWith("-maven-repository=")) {
 				else if (projects == null) System.err.println("Missing projects parameter in command line");
 				else stop = false;
 				if (stop) {
+					printUsage();
 					LCCore.stop(true);
 					return;
 				}
@@ -119,7 +121,19 @@ else if (args[i].startsWith("-maven-repository=")) {
 				File appDir = cfgFile.getParentFile();
 
 				// add local maven repository
-				File dir = new File(System.getProperty("user.home") + "/.m2/repository");
+				File settings = new File(System.getProperty("user.home") + "/.m2/settings.xml");
+				String localRepo = System.getProperty("user.home") + "/.m2/repository";
+				if (settings.exists()) {
+					try {
+						MavenSettings ms = MavenSettings.load(settings);
+						if (ms.localRepository != null)
+							localRepo = ms.localRepository;
+					} catch (Exception e) {
+						System.err.println("Error reading Maven settings.xml");
+						e.printStackTrace(System.err);
+					}
+				}
+				File dir = new File(localRepo);
 				if (dir.exists())
 					pomLoader.addRepository(new MavenLocalRepository(dir, true, true));
 

net.lecousin.core/src/main/java/net/lecousin/framework/application/libraries/artifacts/maven/MavenSettings.java

@@ -0,0 +1,56 @@
+package net.lecousin.framework.application.libraries.artifacts.maven;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.ArrayList;
+
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamReader;
+
+public class MavenSettings {
+
+	public String localRepository = null;
+	public ArrayList<String> activeProfiles = new ArrayList<>();
+	
+	public static MavenSettings load(File file) throws Exception {
+		try (FileInputStream input = new FileInputStream(file)) {
+			return load(input);
+		}
+	}
+	
+	public static MavenSettings load(InputStream input) throws Exception {
+		XMLStreamReader xml = XMLInputFactory.newFactory().createXMLStreamReader(input);
+		while (xml.hasNext()) {
+			xml.next();
+			if (xml.getEventType() == XMLStreamConstants.START_ELEMENT) {
+				if (!"settings".equals(xml.getLocalName()))
+					throw new Exception("Root element of a Maven settings.xml file must be <settings>");
+				MavenSettings settings = new MavenSettings();
+				while (xml.hasNext()) {
+					xml.next();
+					if (xml.getEventType() == XMLStreamConstants.START_ELEMENT) {
+						if ("localRepository".equals(xml.getLocalName())) {
+							settings.localRepository = xml.getElementText().trim();
+						} else if ("activeProfiles".equals(xml.getLocalName())) {
+							while (xml.hasNext()) {
+								xml.next();
+								if (xml.getEventType() == XMLStreamConstants.START_ELEMENT) {
+									if ("activeProfile".equals(xml.getLocalName()))
+										settings.activeProfiles.add(xml.getElementText().trim());
+								} else if (xml.getEventType() == XMLStreamConstants.END_ELEMENT)
+									break;
+							}
+						}
+					} else if (xml.getEventType() == XMLStreamConstants.END_ELEMENT)
+						break;
+				}
+				settings.activeProfiles.trimToSize();
+				return settings;
+			}
+		}
+		return new MavenSettings();
+	}
+	
+}

net.lecousin.core/src/main/java/net/lecousin/framework/collections/AsyncCollection.java

@@ -17,26 +17,35 @@ public interface AsyncCollection<T> {
 	/** Called when new elements are ready. */
 	public void newElements(Collection<T> elements);
 
-	/** Called when no more elements will come. */
+	/** Called when no more elements will come, and no error was encountered. */
 	public void done();
 
 	/** Return true if the method done has been called already. */
 	public boolean isDone();
 
+	/** Called if an error occured before all elements have been retrieved. */
+	public void error(Exception error);
+	
+	/** Return true if the method error has been called. */
+	public boolean hasError();
+	
 	/**
 	 * Simple implementation with a listener on both operations: newElements and done.
 	 * @param <T> type of elements
 	 */
 	public static class Listen<T> implements AsyncCollection<T> {
 		/** Constructor. */
-		public Listen(Listener<Collection<T>> onElementsReady, Runnable onDone) {
+		public Listen(Listener<Collection<T>> onElementsReady, Runnable onDone, Listener<Exception> onError) {
 			this.onElementsReady = onElementsReady;
 			this.onDone = onDone;
+			this.onError = onError;
 		}
 
 		private Listener<Collection<T>> onElementsReady;
 		private Runnable onDone;
 		private boolean isDone = false;
+		private Listener<Exception> onError;
+		private boolean hasError = false;
 
 		@Override
 		public void newElements(Collection<T> elements) {
@@ -53,6 +62,17 @@ public void done() {
 		public boolean isDone() {
 			return isDone;
 		}
+		
+		@Override
+		public void error(Exception error) {
+			if (onError != null) onError.fire(error);
+			hasError = true;
+		}
+		
+		@Override
+		public boolean hasError() {
+			return hasError;
+		}
 	}
 
 	/**
@@ -80,13 +100,23 @@ public synchronized void newElements(Collection<T> elements) {
 
 		@Override
 		public synchronized void done() {
-			if (--remainingDone == 0)
+			if (--remainingDone == 0 && !collection.hasError())
 				collection.done();
 		}
 
 		@Override
 		public boolean isDone() {
-			return remainingDone == 0;
+			return remainingDone == 0 && !collection.hasError();
+		}
+		
+		@Override
+		public void error(Exception error) {
+			collection.error(error);
+		}
+		
+		@Override
+		public boolean hasError() {
+			return collection.hasError();
 		}
 	}
 
@@ -101,6 +131,9 @@ public static interface OneByOne<T> {
 		/** Called when no more element will come. */
 		public void done();
 
+		/** Called when an error occured while retrieving elements. */
+		public void error(Exception error);
+		
 		/** A refreshable collection is a collection that can be restarted, with new elements coming and replacing the previous ones.
 		 * @param <T> type of elements
 		 */
@@ -116,8 +149,10 @@ public static interface Refreshable<T> extends OneByOne<T> {
 	public static class Keep<T> implements AsyncCollection<T> {
 		private LinkedArrayList<T> list = new LinkedArrayList<T>(10);
 		private boolean done = false;
+		private Exception error = null;
 		private ArrayList<AsyncCollection<T>> listeners = new ArrayList<>(5);
 		private ArrayList<Runnable> doneListeners = new ArrayList<>(2);
+		private ArrayList<Listener<Exception>> errorListeners = new ArrayList<>(2);
 
 		@Override
 		public void newElements(Collection<T> elements) {
@@ -161,6 +196,37 @@ public void ondone(Runnable listener) {
 			listener.run();
 		}
 
+		@Override
+		public void error(Exception error) {
+			synchronized (this) {
+				this.error = error;
+			}
+			for (AsyncCollection<T> col : listeners)
+				col.error(error);
+			listeners = null;
+			for (Listener<Exception> r : errorListeners)
+				r.fire(error);
+			errorListeners = null;
+		}
+		
+		@Override
+		public boolean hasError() {
+			return error != null;
+		}
+		
+		/** Add a listener to be called when the error method is called.
+		 * If the error method has been already called, the listener is immediately called.
+		 */
+		public void onerror(Listener<Exception> listener) {
+			synchronized (this) {
+				if (error == null) {
+					errorListeners.add(listener);
+					return;
+				}
+			}
+			listener.fire(error);
+		}
+				
 		/** Send the elements of this collection to the given collection.
 		 * All elements already present in this collection are immediately given by calling the method newElements.
 		 * If the method done has been called already on this collection, the method done is also called
@@ -169,7 +235,7 @@ public void ondone(Runnable listener) {
 		public void provideTo(AsyncCollection<T> col) {
 			ArrayList<T> already = null;
 			synchronized (this) {
-				if (!done) {
+				if (!done && error == null) {
 					already = new ArrayList<>(list);
 					listeners.add(col);
 				}
@@ -179,7 +245,10 @@ public void provideTo(AsyncCollection<T> col) {
 				return;
 			}
 			col.newElements(list);
-			col.done();
+			if (error == null)
+				col.done();
+			else
+				col.error(error);
 		}
 
 		/** Return the list containing the elements kept so far. */

net.lecousin.core/src/main/java/net/lecousin/framework/plugins/ExtensionPoint.java

@@ -25,7 +25,10 @@ public interface ExtensionPoint<PluginClass extends Plugin> {
 	default void printInfo(StringBuilder s) {
 		s.append(getClass().getName()).append(":");
 		for (PluginClass pi : getPlugins()) {
-			s.append("\r\n\t- ").append(pi.getClass().getName());
+			if (pi != null)
+				s.append("\r\n\t- ").append(pi.getClass().getName());
+			else
+				s.append("\r\n\tNULL !!!");
 		}
 	}