X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.osgi.boot%2Fsrc%2Forg%2Fargeo%2Fosgi%2Fboot%2FOsgiBoot.java;h=6824ecaf549c9c2c3a335c011cdfb1d6940838a5;hb=c155192cfcd5ca355eb933fa3f55dbad6d01b958;hp=bdf7134b85441df762d5ca3120e4e51b43e6f768;hpb=5dc0e30ff215c1604b1b0e7bf8c8699f6cd1257f;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/OsgiBoot.java b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/OsgiBoot.java
index bdf7134b8..6824ecaf5 100644
--- a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/OsgiBoot.java
+++ b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/OsgiBoot.java
@@ -19,6 +19,8 @@ import static org.argeo.osgi.boot.OsgiBootUtils.debug;
 import static org.argeo.osgi.boot.OsgiBootUtils.warn;
 
 import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -30,6 +32,8 @@ import java.util.SortedMap;
 import java.util.StringTokenizer;
 import java.util.TreeMap;
 
+import org.argeo.osgi.boot.a2.A2Source;
+import org.argeo.osgi.boot.a2.ProvisioningManager;
 import org.argeo.osgi.boot.internal.springutil.AntPathMatcher;
 import org.argeo.osgi.boot.internal.springutil.PathMatcher;
 import org.argeo.osgi.boot.internal.springutil.SystemPropertyUtils;
@@ -49,6 +53,8 @@ import org.osgi.framework.wiring.FrameworkWiring;
  */
 public class OsgiBoot implements OsgiBootConstants {
 	public final static String PROP_ARGEO_OSGI_START = "argeo.osgi.start";
+	public final static String PROP_ARGEO_OSGI_SOURCES = "argeo.osgi.sources";
+
 	public final static String PROP_ARGEO_OSGI_BUNDLES = "argeo.osgi.bundles";
 	public final static String PROP_ARGEO_OSGI_BASE_URL = "argeo.osgi.baseUrl";
 	public final static String PROP_ARGEO_OSGI_LOCAL_CACHE = "argeo.osgi.localCache";
@@ -89,14 +95,38 @@ public class OsgiBoot implements OsgiBootConstants {
 	private final BundleContext bundleContext;
 	private final String localCache;
 
+	private final ProvisioningManager provisioningManager;
+
 	/*
 	 * INITIALIZATION
 	 */
 	/** Constructor */
 	public OsgiBoot(BundleContext bundleContext) {
 		this.bundleContext = bundleContext;
-		localCache = getProperty(PROP_ARGEO_OSGI_LOCAL_CACHE,
-				"file://" + System.getProperty("user.home") + "/.m2/repository/");
+		Path homePath = Paths.get(System.getProperty("user.home")).toAbsolutePath();
+		String homeUri = homePath.toUri().toString();
+		localCache = getProperty(PROP_ARGEO_OSGI_LOCAL_CACHE, homeUri + ".m2/repository/");
+
+		provisioningManager = new ProvisioningManager(bundleContext);
+		String sources = getProperty(PROP_ARGEO_OSGI_SOURCES);
+		if (sources == null) {
+			provisioningManager.registerDefaultSource();
+		} else {
+			for (String source : sources.split(",")) {
+				if (source.trim().equals(A2Source.DEFAULT_A2_URI)) {
+					provisioningManager
+							.registerSource(A2Source.SCHEME_A2 + "://" + homePath.toString() + "/.local/share/osgi");
+					provisioningManager.registerSource(A2Source.SCHEME_A2 + ":///usr/local/share/osgi");
+					provisioningManager.registerSource(A2Source.SCHEME_A2 + ":///usr/share/osgi");
+				} else {
+					provisioningManager.registerSource(source);
+				}
+			}
+		}
+	}
+
+	ProvisioningManager getProvisioningManager() {
+		return provisioningManager;
 	}
 
 	/*
@@ -112,6 +142,7 @@ public class OsgiBoot implements OsgiBootConstants {
 					.info("OSGi bootstrap starting" + (osgiInstancePath != null ? " (" + osgiInstancePath + ")" : ""));
 			installUrls(getBundlesUrls());
 			installUrls(getDistributionUrls());
+			provisioningManager.install(null);
 			startBundles();
 			long duration = System.currentTimeMillis() - begin;
 			OsgiBootUtils.info("OSGi bootstrap completed in " + Math.round(((double) duration) / 1000) + "s ("
@@ -142,6 +173,10 @@ public class OsgiBoot implements OsgiBootConstants {
 		System.out.println();
 	}
 
+	public void update() {
+		provisioningManager.update();
+	}
+
 	/*
 	 * INSTALLATION
 	 */
@@ -215,16 +250,21 @@ public class OsgiBoot implements OsgiBootConstants {
 				}
 			}
 		} catch (BundleException e) {
+			final String ALREADY_INSTALLED = "is already installed";
 			String message = e.getMessage();
 			if ((message.contains("Bundle \"" + SYMBOLIC_NAME_OSGI_BOOT + "\"")
 					|| message.contains("Bundle \"" + SYMBOLIC_NAME_EQUINOX + "\""))
-					&& message.contains("is already installed")) {
+					&& message.contains(ALREADY_INSTALLED)) {
 				// silent, in order to avoid warnings: we know that both
 				// have already been installed...
 			} else {
-				OsgiBootUtils.warn("Could not install bundle from " + url + ": " + message);
+				if (message.contains(ALREADY_INSTALLED)) {
+					if (OsgiBootUtils.isDebug())
+						OsgiBootUtils.warn("Duplicate install from " + url + ": " + message);
+				} else
+					OsgiBootUtils.warn("Could not install bundle from " + url + ": " + message);
 			}
-			if (OsgiBootUtils.debug && !message.contains("is already installed"))
+			if (OsgiBootUtils.debug && !message.contains(ALREADY_INSTALLED))
 				e.printStackTrace();
 		}
 	}