X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.osgi.boot%2Fsrc%2Forg%2Fargeo%2Fosgi%2Fboot%2FOsgiBoot.java;h=b49e7200125e72d69cc4666425f5e7e787de79b8;hb=25a31ea46e5de6ce0de366fdb999588c6788c540;hp=effdcf3baf3bc7daf3e46d0692855a667e93001a;hpb=40af4cc6795ab669ec9432d1444f0779f9594952;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 effdcf3ba..b49e72001 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
@@ -1,24 +1,11 @@
-/*
- * Copyright (C) 2007-2012 Argeo GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.argeo.osgi.boot;
 
 import static org.argeo.osgi.boot.OsgiBootUtils.debug;
 import static org.argeo.osgi.boot.OsgiBootUtils.warn;
 
 import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -31,6 +18,8 @@ import java.util.SortedMap;
 import java.util.StringTokenizer;
 import java.util.TreeMap;
 
+import org.argeo.osgi.a2.A2Source;
+import org.argeo.osgi.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;
@@ -50,6 +39,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";
@@ -90,14 +81,39 @@ 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;
-		String homeUri = Paths.get(System.getProperty("user.home")).toUri().toString();
+		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)) {
+					if (Files.exists(homePath))
+						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;
 	}
 
 	/*
@@ -113,6 +129,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 ("
@@ -143,6 +160,10 @@ public class OsgiBoot implements OsgiBootConstants {
 		System.out.println();
 	}
 
+	public void update() {
+		provisioningManager.update();
+	}
+
 	/*
 	 * INSTALLATION
 	 */