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;
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;
*/
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";
// public final static String EXCLUDES_SVN_PATTERN = "**/.svn/**";
// OSGi system properties
- public final static String PROP_OSGI_BUNDLES_DEFAULTSTARTLEVEL = "osgi.bundles.defaultStartLevel";
- public final static String PROP_OSGI_STARTLEVEL = "osgi.startLevel";
- public final static String INSTANCE_AREA_PROP = "osgi.instance.area";
+ final static String PROP_OSGI_BUNDLES_DEFAULTSTARTLEVEL = "osgi.bundles.defaultStartLevel";
+ final static String PROP_OSGI_STARTLEVEL = "osgi.startLevel";
+ final static String INSTANCE_AREA_PROP = "osgi.instance.area";
+ final static String CONFIGURATION_AREA_PROP = "osgi.configuration.area";
// Symbolic names
public final static String SYMBOLIC_NAME_OSGI_BOOT = "org.argeo.osgi.boot";
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;
}
/*
.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 ("
System.out.println();
}
+ public void update() {
+ provisioningManager.update();
+ }
+
/*
* INSTALLATION
*/
}
}
} 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();
}
}
});
}
- public static void computeStartLevels(SortedMap<Integer, List<String>> startLevels, Properties properties,
+ private static void computeStartLevels(SortedMap<Integer, List<String>> startLevels, Properties properties,
Integer defaultStartLevel) {
// default (and previously, only behaviour)
* BUNDLE PATTERNS INSTALLATION
*/
/**
- * Computes a list of URLs based on Ant-like include/exclude patterns
- * defined by ${argeo.osgi.bundles} with the following format:<br>
+ * Computes a list of URLs based on Ant-like include/exclude patterns defined by
+ * ${argeo.osgi.bundles} with the following format:<br>
* <code>/base/directory;in=*.jar;in=**;ex=org.eclipse.osgi_*;jar</code><br>
* WARNING: <code>/base/directory;in=*.jar,\</code> at the end of a file,
- * without a new line causes a '.' to be appended with unexpected side
- * effects.
+ * without a new line causes a '.' to be appended with unexpected side effects.
*/
public List<String> getBundlesUrls() {
String bundlePatterns = getProperty(PROP_ARGEO_OSGI_BUNDLES);
}
/**
- * Compute alist of URLs to install based on the provided patterns, with
+ * Compute a list of URLs to install based on the provided patterns, with
* default base url
*/
public List<String> getBundlesUrls(String bundlePatterns) {
}
/** Implements the path matching logic */
- List<String> getBundlesUrls(String baseUrl, String bundlePatterns) {
+ public List<String> getBundlesUrls(String baseUrl, String bundlePatterns) {
List<String> urls = new ArrayList<String>();
if (bundlePatterns == null)
return urls;
return urls;
DistributionBundle distributionBundle;
- if (baseUrl != null && !(distributionUrl.startsWith("http") || distributionUrl.startsWith("file"))) {
- // relative url
- distributionBundle = new DistributionBundle(baseUrl, distributionUrl, localCache);
- } else {
+ if (distributionUrl.startsWith("http") || distributionUrl.startsWith("file")) {
distributionBundle = new DistributionBundle(distributionUrl);
if (baseUrl != null)
distributionBundle.setBaseUrl(baseUrl);
+ } else {
+ // relative url
+ if (baseUrl == null) {
+ baseUrl = localCache;
+ }
+ if (distributionUrl.contains(":")) {
+ // TODO make it safer
+ String[] parts = distributionUrl.trim().split(":");
+ String[] categoryParts = parts[0].split("\\.");
+ String artifactId = parts[1];
+ String version = parts[2];
+ StringBuilder sb = new StringBuilder();
+ for (String categoryPart : categoryParts) {
+ sb.append(categoryPart).append('/');
+ }
+ sb.append(artifactId).append('/');
+ sb.append(version).append('/');
+ sb.append(artifactId).append('-').append(version).append(".jar");
+ distributionUrl = sb.toString();
+ }
+
+ distributionBundle = new DistributionBundle(baseUrl, distributionUrl, localCache);
}
+ // if (baseUrl != null && !(distributionUrl.startsWith("http") ||
+ // distributionUrl.startsWith("file"))) {
+ // // relative url
+ // distributionBundle = new DistributionBundle(baseUrl, distributionUrl,
+ // localCache);
+ // } else {
+ // distributionBundle = new DistributionBundle(distributionUrl);
+ // if (baseUrl != null)
+ // distributionBundle.setBaseUrl(baseUrl);
+ // }
distributionBundle.processUrl();
return distributionBundle.listUrls();
}
return bundleContext;
}
+ public String getLocalCache() {
+ return localCache;
+ }
+
// public void setDefaultTimeout(long defaultTimeout) {
// this.defaultTimeout = defaultTimeout;
// }
projects / lgpl / argeo-commons.git / blobdiff