X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.init%2Fsrc%2Forg%2Fargeo%2Finit%2Fosgi%2FOsgiBoot.java;h=ae343f05b606a472e28beb492584cddfa4f7da01;hb=8321a31f879e6998ed4fe9c70f3cd3faa21e4a0f;hp=aeec0b7684ae16d1868017d225e4bca21ccd43d3;hpb=b7d8618ce593bbeca7e311d32a4d98988e27f877;p=lgpl%2Fargeo-commons.git
diff --git a/org.argeo.init/src/org/argeo/init/osgi/OsgiBoot.java b/org.argeo.init/src/org/argeo/init/osgi/OsgiBoot.java
index aeec0b768..ae343f05b 100644
--- a/org.argeo.init/src/org/argeo/init/osgi/OsgiBoot.java
+++ b/org.argeo.init/src/org/argeo/init/osgi/OsgiBoot.java
@@ -4,6 +4,8 @@ import static org.argeo.init.osgi.OsgiBootUtils.debug;
import static org.argeo.init.osgi.OsgiBootUtils.warn;
import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -57,11 +59,12 @@ public class OsgiBoot implements OsgiBootConstants {
public final static String DEFAULT_BASE_URL = "reference:file:";
// public final static String EXCLUDES_SVN_PATTERN = "**/.svn/**";
- // OSGi system properties
+ // OSGi standard properties
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";
+ final static String PROP_OSGI_INSTANCE_AREA = "osgi.instance.area";
+ final static String PROP_OSGI_CONFIGURATION_AREA = "osgi.configuration.area";
+ final static String PROP_OSGI_USE_SYSTEM_PROPERTIES = "osgi.framework.useSystemProperties";
// Symbolic names
public final static String SYMBOLIC_NAME_OSGI_BOOT = "org.argeo.osgi.boot";
@@ -73,9 +76,9 @@ public class OsgiBoot implements OsgiBootConstants {
// "false"))
// .booleanValue();
- /** Default is 10s */
- @Deprecated
- private long defaultTimeout = 10000l;
+// /** Default is 10s */
+// @Deprecated
+// private long defaultTimeout = 10000l;
private final BundleContext bundleContext;
private final String localCache;
@@ -100,10 +103,10 @@ public class OsgiBoot implements OsgiBootConstants {
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");
+ provisioningManager
+ .registerSource(A2Source.SCHEME_A2 + "://" + homePath.toString() + "/.local/share/a2");
+ provisioningManager.registerSource(A2Source.SCHEME_A2 + ":///usr/local/share/a2");
+ provisioningManager.registerSource(A2Source.SCHEME_A2 + ":///usr/share/a2");
} else {
provisioningManager.registerSource(source);
}
@@ -118,18 +121,55 @@ public class OsgiBoot implements OsgiBootConstants {
/*
* HIGH-LEVEL METHODS
*/
- /** Bootstraps the OSGi runtime */
- public void bootstrap() {
+ /**
+ * Bootstraps the OSGi runtime using these properties, which MUST be consistent
+ * with {@link BundleContext#getProperty(String)}. If these properties are
+ * null
, system properties are used instead.
+ */
+ public void bootstrap(Map properties) {
try {
long begin = System.currentTimeMillis();
+ // check properties
+ if (properties != null) {
+ for (String property : properties.keySet()) {
+ String value = properties.get(property);
+ String bcValue = bundleContext.getProperty(property);
+ if (PROP_OSGI_CONFIGURATION_AREA.equals(property) || PROP_OSGI_INSTANCE_AREA.equals(property)) {
+ try {
+ URL uri = new URL(value);
+ URL bcUri = new URL(bcValue);
+ if (!uri.equals(bcUri))
+ throw new IllegalArgumentException("Property " + property + "=" + uri
+ + " is inconsistent with bundle context : " + bcUri);
+ } catch (MalformedURLException e) {
+ throw new IllegalArgumentException("Malformed property " + property, e);
+ }
+
+ } else {
+ if (!value.equals(bcValue))
+ throw new IllegalArgumentException("Property " + property + "=" + value
+ + " is inconsistent with bundle context : " + bcValue);
+ }
+ }
+ } else {
+ String useSystemProperties = bundleContext.getProperty(PROP_OSGI_USE_SYSTEM_PROPERTIES);
+ if (useSystemProperties == null || !useSystemProperties.equals("true")) {
+ OsgiBootUtils.warn("No properties passed but " + PROP_OSGI_USE_SYSTEM_PROPERTIES + " is not set.");
+ }
+ }
+
+ // notify start
System.out.println();
- String osgiInstancePath = bundleContext.getProperty(INSTANCE_AREA_PROP);
+ String osgiInstancePath = bundleContext.getProperty(PROP_OSGI_INSTANCE_AREA);
OsgiBootUtils
.info("OSGi bootstrap starting" + (osgiInstancePath != null ? " (" + osgiInstancePath + ")" : ""));
installUrls(getBundlesUrls());
installUrls(getDistributionUrls());
provisioningManager.install(null);
- startBundles();
+ if (properties != null)
+ startBundles(properties);
+ else
+ startBundles();
long duration = System.currentTimeMillis() - begin;
OsgiBootUtils.info("OSGi bootstrap completed in " + Math.round(((double) duration) / 1000) + "s ("
+ duration + "ms), " + bundleContext.getBundles().length + " bundles");
@@ -139,7 +179,7 @@ public class OsgiBoot implements OsgiBootConstants {
}
// diagnostics
- if (OsgiBootUtils.debug) {
+ if (OsgiBootUtils.isDebug()) {
OsgiBootDiagnostics diagnostics = new OsgiBootDiagnostics(bundleContext);
diagnostics.checkUnresolved();
Map> duplicatePackages = diagnostics.findPackagesExportedTwice();
@@ -159,6 +199,16 @@ public class OsgiBoot implements OsgiBootConstants {
System.out.println();
}
+ /**
+ * Calls {@link #bootstrap(Map)} with null
.
+ *
+ * @see #bootstrap(Map)
+ */
+ @Deprecated
+ public void bootstrap() {
+ bootstrap(null);
+ }
+
public void update() {
provisioningManager.update();
}
@@ -189,11 +239,11 @@ public class OsgiBoot implements OsgiBootConstants {
try {
if (installedBundles.containsKey(url)) {
Bundle bundle = (Bundle) installedBundles.get(url);
- if (OsgiBootUtils.debug)
+ if (OsgiBootUtils.isDebug())
debug("Bundle " + bundle.getSymbolicName() + " already installed from " + url);
} else if (url.contains("/" + SYMBOLIC_NAME_EQUINOX + "/")
|| url.contains("/" + SYMBOLIC_NAME_OSGI_BOOT + "/")) {
- if (OsgiBootUtils.debug)
+ if (OsgiBootUtils.isDebug())
warn("Skip " + url);
return;
} else {
@@ -201,7 +251,7 @@ public class OsgiBoot implements OsgiBootConstants {
if (url.startsWith("http"))
OsgiBootUtils
.info("Installed " + bundle.getSymbolicName() + "-" + bundle.getVersion() + " from " + url);
- else if (OsgiBootUtils.debug)
+ else if (OsgiBootUtils.isDebug())
OsgiBootUtils.debug(
"Installed " + bundle.getSymbolicName() + "-" + bundle.getVersion() + " from " + url);
assert bundle.getSymbolicName() != null;
@@ -250,7 +300,7 @@ public class OsgiBoot implements OsgiBootConstants {
} else
OsgiBootUtils.warn("Could not install bundle from " + url + ": " + message);
}
- if (OsgiBootUtils.debug && !message.contains(ALREADY_INSTALLED))
+ if (OsgiBootUtils.isDebug() && !message.contains(ALREADY_INSTALLED))
e.printStackTrace();
}
}
@@ -258,11 +308,34 @@ public class OsgiBoot implements OsgiBootConstants {
/*
* START
*/
+ /**
+ * Start bundles based on system properties.
+ *
+ * @see OsgiBoot#startBundles(Map)
+ */
public void startBundles() {
- startBundles(System.getProperties());
+ Properties properties = System.getProperties();
+ startBundles(properties);
}
+ /**
+ * Start bundles based on these properties.
+ *
+ * @see OsgiBoot#startBundles(Map)
+ */
public void startBundles(Properties properties) {
+ Map map = new TreeMap<>();
+ for (Object key : properties.keySet()) {
+ String property = key.toString();
+ if (property.startsWith(PROP_ARGEO_OSGI_START)) {
+ map.put(property, properties.getProperty(property));
+ }
+ }
+ startBundles(map);
+ }
+
+ /** Start bundle based on keys starting with {@link #PROP_ARGEO_OSGI_START}. */
+ public void startBundles(Map properties) {
FrameworkStartLevel frameworkStartLevel = bundleContext.getBundle(0).adapt(FrameworkStartLevel.class);
// default and active start levels from System properties
@@ -289,13 +362,13 @@ public class OsgiBoot implements OsgiBootConstants {
} catch (BundleException e) {
OsgiBootUtils.error("Cannot mark " + bsn + " as started", e);
}
- if (getDebug())
+ if (OsgiBootUtils.isDebug())
OsgiBootUtils.debug(bsn + " starts at level " + level);
}
}
}
frameworkStartLevel.setStartLevel(activeStartLevel, (FrameworkEvent event) -> {
- if (getDebug())
+ if (OsgiBootUtils.isDebug())
OsgiBootUtils.debug("Framework event: " + event);
int initialStartLevel = frameworkStartLevel.getInitialBundleStartLevel();
int startLevel = frameworkStartLevel.getStartLevel();
@@ -303,17 +376,17 @@ public class OsgiBoot implements OsgiBootConstants {
});
}
- private static void computeStartLevels(SortedMap> startLevels, Properties properties,
+ private static void computeStartLevels(SortedMap> startLevels, Map properties,
Integer defaultStartLevel) {
// default (and previously, only behaviour)
- appendToStartLevels(startLevels, defaultStartLevel, properties.getProperty(PROP_ARGEO_OSGI_START, ""));
+ appendToStartLevels(startLevels, defaultStartLevel, properties.getOrDefault(PROP_ARGEO_OSGI_START, ""));
// list argeo.osgi.start.* system properties
- Iterator