X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.init%2Fsrc%2Forg%2Fargeo%2Finit%2Fosgi%2FOsgiBoot.java;h=003718785b82e37e13b9f203b51151193aca350b;hb=6211e86ec9bd6dfd4445fed12c1baa0e98314824;hp=8fbe4b2386f8577b37629a4d3020be185beb9a2f;hpb=ef0980ba1f409c4b1071f1efb2fc5ae3ac11534b;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 8fbe4b238..003718785 100644
--- a/org.argeo.init/src/org/argeo/init/osgi/OsgiBoot.java
+++ b/org.argeo.init/src/org/argeo/init/osgi/OsgiBoot.java
@@ -38,52 +38,45 @@ 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_MAX_START_LEVEL = "argeo.osgi.maxStartLevel";
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 PROP_ARGEO_OSGI_DISTRIBUTION_URL = "argeo.osgi.distributionUrl";
+ @Deprecated
+ final static String PROP_ARGEO_OSGI_BUNDLES = "argeo.osgi.bundles";
+ final static String PROP_ARGEO_OSGI_BASE_URL = "argeo.osgi.baseUrl";
+ final static String PROP_ARGEO_OSGI_LOCAL_CACHE = "argeo.osgi.localCache";
+ final static String PROP_ARGEO_OSGI_DISTRIBUTION_URL = "argeo.osgi.distributionUrl";
// booleans
- public final static String PROP_ARGEO_OSGI_BOOT_DEBUG = "argeo.osgi.boot.debug";
- // public final static String PROP_ARGEO_OSGI_BOOT_EXCLUDE_SVN =
- // "argeo.osgi.boot.excludeSvn";
+ @Deprecated
+ final static String PROP_ARGEO_OSGI_BOOT_DEBUG = "argeo.osgi.boot.debug";
- public final static String PROP_ARGEO_OSGI_BOOT_SYSTEM_PROPERTIES_FILE = "argeo.osgi.boot.systemPropertiesFile";
- public final static String PROP_ARGEO_OSGI_BOOT_APPCLASS = "argeo.osgi.boot.appclass";
- public final static String PROP_ARGEO_OSGI_BOOT_APPARGS = "argeo.osgi.boot.appargs";
+ final static String PROP_ARGEO_OSGI_BOOT_SYSTEM_PROPERTIES_FILE = "argeo.osgi.boot.systemPropertiesFile";
+ final static String PROP_ARGEO_OSGI_BOOT_APPCLASS = "argeo.osgi.boot.appclass";
+ final static String PROP_ARGEO_OSGI_BOOT_APPARGS = "argeo.osgi.boot.appargs";
+ @Deprecated
public final static String DEFAULT_BASE_URL = "reference:file:";
- // public final static String EXCLUDES_SVN_PATTERN = "**/.svn/**";
+ final static String DEFAULT_MAX_START_LEVEL = "32";
- // 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";
+ public final static String PROP_OSGI_INSTANCE_AREA = "osgi.instance.area";
+ public final static String PROP_OSGI_CONFIGURATION_AREA = "osgi.configuration.area";
+ public final static String PROP_OSGI_SHARED_CONFIGURATION_AREA = "osgi.sharedConfiguration.area";
+ public 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";
- public final static String SYMBOLIC_NAME_EQUINOX = "org.eclipse.osgi";
-
- /** Exclude svn metadata implicitely(a bit costly) */
- // private boolean excludeSvn =
- // Boolean.valueOf(System.getProperty(PROP_ARGEO_OSGI_BOOT_EXCLUDE_SVN,
- // "false"))
- // .booleanValue();
-
- /** Default is 10s */
- @Deprecated
- private long defaultTimeout = 10000l;
+ final static String SYMBOLIC_NAME_OSGI_BOOT = "org.argeo.init";
+ final static String SYMBOLIC_NAME_EQUINOX = "org.eclipse.osgi";
private final BundleContext bundleContext;
private final String localCache;
-
private final ProvisioningManager provisioningManager;
/*
- * INITIALIZATION
+ * INITIALISATION
*/
/** Constructor */
public OsgiBoot(BundleContext bundleContext) {
@@ -97,15 +90,22 @@ public class OsgiBoot implements OsgiBootConstants {
if (sources == null) {
provisioningManager.registerDefaultSource();
} else {
+// OsgiBootUtils.debug("Found sources " + sources);
for (String source : sources.split(",")) {
+ int qmIndex = source.lastIndexOf('?');
+ String queryPart = "";
+ if (qmIndex >= 0) {
+ queryPart = source.substring(qmIndex);
+ source = source.substring(0, qmIndex);
+ }
if (source.trim().equals(A2Source.DEFAULT_A2_URI)) {
if (Files.exists(homePath))
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");
+ A2Source.SCHEME_A2 + "://" + homePath.toString() + "/.local/share/a2" + queryPart);
+ provisioningManager.registerSource(A2Source.SCHEME_A2 + ":///usr/local/share/a2" + queryPart);
+ provisioningManager.registerSource(A2Source.SCHEME_A2 + ":///usr/share/a2" + queryPart);
} else {
- provisioningManager.registerSource(source);
+ provisioningManager.registerSource(source + queryPart);
}
}
}
@@ -118,18 +118,69 @@ 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();
- System.out.println();
- String osgiInstancePath = bundleContext.getProperty(INSTANCE_AREA_PROP);
- OsgiBootUtils
- .info("OSGi bootstrap starting" + (osgiInstancePath != null ? " (" + osgiInstancePath + ")" : ""));
+ // 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 {
+// if (value.startsWith("/"))
+// value = "file://" + value;
+// 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
+ String osgiInstancePath = getProperty(PROP_OSGI_INSTANCE_AREA);
+ String osgiConfigurationPath = getProperty(PROP_OSGI_CONFIGURATION_AREA);
+ String osgiSharedConfigurationPath = getProperty(PROP_OSGI_CONFIGURATION_AREA);
+ OsgiBootUtils.info("OSGi bootstrap starting" //
+ + (osgiInstancePath != null ? " data: " + osgiInstancePath + "" : "") //
+ + (osgiConfigurationPath != null ? " state: " + osgiConfigurationPath + "" : "") //
+ + (osgiSharedConfigurationPath != null ? " config: " + osgiSharedConfigurationPath + "" : "") //
+ );
+
+ // legacy install bundles
installUrls(getBundlesUrls());
installUrls(getDistributionUrls());
+
+ // A2 install bundles
provisioningManager.install(null);
- startBundles();
+
+ // start bundles
+// if (properties != null && !Boolean.parseBoolean(properties.get(PROP_OSGI_USE_SYSTEM_PROPERTIES)))
+ startBundles(properties);
+// else
+// startBundles();
+
+ // complete
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 +190,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 +210,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 +250,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 +262,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 +311,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 +319,68 @@ public class OsgiBoot implements OsgiBootConstants {
/*
* START
*/
- public void startBundles() {
- startBundles(System.getProperties());
+// /**
+// * Start bundles based on system properties.
+// *
+// * @see OsgiBoot#doStartBundles(Map)
+// */
+// public void startBundles() {
+// Properties properties = System.getProperties();
+// startBundles(properties);
+// }
+
+ /**
+ * Start bundles based on these properties.
+ *
+ * @see OsgiBoot#doStartBundles(Map)
+ */
+ public void startBundles(Map properties) {
+ Map map = new TreeMap<>();
+ // first use properties
+ if (properties != null) {
+ for (String key : properties.keySet()) {
+ String property = key;
+ if (property.startsWith(PROP_ARGEO_OSGI_START)) {
+ map.put(property, properties.get(property));
+ }
+ }
+ }
+ // then try all start level until a maximum
+ int maxStartLevel = Integer.parseInt(getProperty(PROP_ARGEO_OSGI_MAX_START_LEVEL, DEFAULT_MAX_START_LEVEL));
+ for (int i = 1; i <= maxStartLevel; i++) {
+ String key = PROP_ARGEO_OSGI_START + "." + i;
+ String value = getProperty(key);
+ if (value != null)
+ map.put(key, value);
+
+ }
+ // finally, override with system properties
+ for (Object key : System.getProperties().keySet()) {
+ if (key.toString().startsWith(PROP_ARGEO_OSGI_START)) {
+ map.put(key.toString(), System.getProperty(key.toString()));
+ }
+ }
+ // start
+ doStartBundles(map);
}
+ @Deprecated
public void startBundles(Properties properties) {
+ Map map = new TreeMap<>();
+ // first use properties
+ if (properties != null) {
+ for (Object key : properties.keySet()) {
+ String property = key.toString();
+ if (property.startsWith(PROP_ARGEO_OSGI_START)) {
+ map.put(property, properties.get(property).toString());
+ }
+ }
+ }
+ startBundles(map);
+ }
+
+ /** Start bundle based on keys starting with {@link #PROP_ARGEO_OSGI_START}. */
+ protected void doStartBundles(Map properties) {
FrameworkStartLevel frameworkStartLevel = bundleContext.getBundle(0).adapt(FrameworkStartLevel.class);
// default and active start levels from System properties
@@ -289,13 +407,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 +421,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