X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.init%2Fsrc%2Forg%2Fargeo%2Finit%2Fosgi%2FOsgiBoot.java;h=963bab4d495e4349bcc7ba409141deb7e2fa94b7;hb=b95462873703848193e56fcbe997693630db6121;hp=8fbe4b2386f8577b37629a4d3020be185beb9a2f;hpb=fba42be03bc7ec07d464f8942f7dfa2e5f0d6f17;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..963bab4d4 100644 --- a/org.argeo.init/src/org/argeo/init/osgi/OsgiBoot.java +++ b/org.argeo.init/src/org/argeo/init/osgi/OsgiBoot.java @@ -1,32 +1,41 @@ package org.argeo.init.osgi; -import static org.argeo.init.osgi.OsgiBootUtils.debug; -import static org.argeo.init.osgi.OsgiBootUtils.warn; +import static java.lang.System.Logger.Level.DEBUG; +import static java.lang.System.Logger.Level.ERROR; +import static java.lang.System.Logger.Level.TRACE; +import static java.lang.System.Logger.Level.WARNING; import java.io.File; +import java.lang.System.Logger; +import java.lang.System.Logger.Level; import java.nio.file.FileSystems; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.PathMatcher; import java.nio.file.Paths; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Properties; +import java.util.Optional; +import java.util.ServiceLoader; import java.util.Set; import java.util.SortedMap; import java.util.StringTokenizer; import java.util.TreeMap; -import org.argeo.init.a2.A2Source; -import org.argeo.init.a2.ProvisioningManager; +import org.argeo.api.a2.A2Source; +import org.argeo.api.a2.ProvisioningManager; +import org.argeo.api.init.InitConstants; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleException; import org.osgi.framework.FrameworkEvent; import org.osgi.framework.Version; +import org.osgi.framework.launch.Framework; +import org.osgi.framework.launch.FrameworkFactory; import org.osgi.framework.startlevel.BundleStartLevel; import org.osgi.framework.startlevel.FrameworkStartLevel; import org.osgi.framework.wiring.FrameworkWiring; @@ -36,54 +45,33 @@ import org.osgi.framework.wiring.FrameworkWiring; * properties. The approach is to generate list of URLs based on various * methods, configured via properties. */ -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 class OsgiBoot { + private final static Logger logger = System.getLogger(OsgiBoot.class.getName()); - 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"; - - 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"; - - public final static String DEFAULT_BASE_URL = "reference:file:"; - // public final static String EXCLUDES_SVN_PATTERN = "**/.svn/**"; - - // OSGi system 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"; - - // Symbolic names - public final static String SYMBOLIC_NAME_OSGI_BOOT = "org.argeo.osgi.boot"; - public final static String SYMBOLIC_NAME_EQUINOX = "org.eclipse.osgi"; + @Deprecated + final static String PROP_ARGEO_OSGI_BOOT_DEBUG = "argeo.osgi.boot.debug"; - /** Exclude svn metadata implicitely(a bit costly) */ - // private boolean excludeSvn = - // Boolean.valueOf(System.getProperty(PROP_ARGEO_OSGI_BOOT_EXCLUDE_SVN, - // "false")) - // .booleanValue(); + 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"; - /** Default is 10s */ @Deprecated - private long defaultTimeout = 10000l; + public final static String DEFAULT_BASE_URL = "reference:file:"; + final static String DEFAULT_MAX_START_LEVEL = "32"; private final BundleContext bundleContext; private final String localCache; - private final ProvisioningManager provisioningManager; /* - * INITIALIZATION + * INITIALISATION */ /** Constructor */ public OsgiBoot(BundleContext bundleContext) { @@ -93,19 +81,39 @@ public class OsgiBoot implements OsgiBootConstants { localCache = getProperty(PROP_ARGEO_OSGI_LOCAL_CACHE, homeUri + ".m2/repository/"); provisioningManager = new ProvisioningManager(bundleContext); - String sources = getProperty(PROP_ARGEO_OSGI_SOURCES); + String sources = getProperty(InitConstants.PROP_ARGEO_OSGI_SOURCES); 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); + } + // TODO centralise in A" package? 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/local/lib/a2" + queryPart); + provisioningManager.registerSource(A2Source.SCHEME_A2 + ":///usr/share/a2" + queryPart); +// provisioningManager.registerSource(A2Source.SCHEME_A2 + ":///usr/lib/a2" + queryPart); + } else if (source.trim().equals(A2Source.DEFAULT_A2_REFERENCE_URI)) { + if (Files.exists(homePath)) + provisioningManager.registerSource(A2Source.SCHEME_A2_REFERENCE + "://" + homePath.toString() + + "/.local/share/a2" + queryPart); + provisioningManager + .registerSource(A2Source.SCHEME_A2_REFERENCE + ":///usr/local/share/a2" + queryPart); +// provisioningManager +// .registerSource(A2Source.SCHEME_A2_REFERENCE + ":///usr/local/lib/a2" + queryPart); + provisioningManager.registerSource(A2Source.SCHEME_A2_REFERENCE + ":///usr/share/a2" + queryPart); +// provisioningManager.registerSource(A2Source.SCHEME_A2_REFERENCE + ":///usr/lib/a2" + queryPart); } else { - provisioningManager.registerSource(source); + provisioningManager.registerSource(source + queryPart); } } } @@ -118,47 +126,68 @@ public class OsgiBoot implements OsgiBootConstants { /* * HIGH-LEVEL METHODS */ - /** Bootstraps the OSGi runtime */ + /** + * 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() { try { long begin = System.currentTimeMillis(); - System.out.println(); - String osgiInstancePath = bundleContext.getProperty(INSTANCE_AREA_PROP); - OsgiBootUtils - .info("OSGi bootstrap starting" + (osgiInstancePath != null ? " (" + osgiInstancePath + ")" : "")); - installUrls(getBundlesUrls()); - installUrls(getDistributionUrls()); - provisioningManager.install(null); + // Install bundles + install(); + // Make sure fragments are properly considered by refreshing + refresh(); + // Start bundles startBundles(); long duration = System.currentTimeMillis() - begin; - OsgiBootUtils.info("OSGi bootstrap completed in " + Math.round(((double) duration) / 1000) + "s (" + logger.log(DEBUG, () -> "OSGi bootstrap completed in " + Math.round(((double) duration) / 1000) + "s (" + duration + "ms), " + bundleContext.getBundles().length + " bundles"); } catch (RuntimeException e) { - OsgiBootUtils.error("OSGi bootstrap FAILED", e); + logger.log(ERROR, "OSGi bootstrap FAILED", e); throw e; } // diagnostics - if (OsgiBootUtils.debug) { + if (logger.isLoggable(TRACE)) { OsgiBootDiagnostics diagnostics = new OsgiBootDiagnostics(bundleContext); diagnostics.checkUnresolved(); Map> duplicatePackages = diagnostics.findPackagesExportedTwice(); if (duplicatePackages.size() > 0) { - OsgiBootUtils.info("Packages exported twice:"); + logger.log(TRACE, "Packages exported twice:"); Iterator it = duplicatePackages.keySet().iterator(); while (it.hasNext()) { String pkgName = it.next(); - OsgiBootUtils.info(pkgName); + logger.log(TRACE, pkgName); Set bdles = duplicatePackages.get(pkgName); Iterator bdlesIt = bdles.iterator(); while (bdlesIt.hasNext()) - OsgiBootUtils.info(" " + bdlesIt.next()); + logger.log(TRACE, " " + bdlesIt.next()); } } } System.out.println(); } + public void install() { + String osgiInstancePath = getProperty(InitConstants.PROP_OSGI_INSTANCE_AREA); + String osgiConfigurationPath = getProperty(InitConstants.PROP_OSGI_CONFIGURATION_AREA); + String osgiSharedConfigurationPath = getProperty(InitConstants.PROP_OSGI_CONFIGURATION_AREA); + logger.log(DEBUG, () -> "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); + + } + public void update() { provisioningManager.update(); } @@ -181,7 +210,7 @@ public class OsgiBoot implements OsgiBootConstants { String url = (String) urls.get(i); installUrl(url, installedBundles); } - refreshFramework(); +// refreshFramework(); } /** Actually install the provided URL */ @@ -189,21 +218,20 @@ public class OsgiBoot implements OsgiBootConstants { try { if (installedBundles.containsKey(url)) { Bundle bundle = (Bundle) installedBundles.get(url); - if (OsgiBootUtils.debug) - debug("Bundle " + bundle.getSymbolicName() + " already installed from " + url); - } else if (url.contains("/" + SYMBOLIC_NAME_EQUINOX + "/") - || url.contains("/" + SYMBOLIC_NAME_OSGI_BOOT + "/")) { - if (OsgiBootUtils.debug) - warn("Skip " + url); + logger.log(TRACE, () -> "Bundle " + bundle.getSymbolicName() + " already installed from " + url); + } else if (url.contains("/" + InitConstants.SYMBOLIC_NAME_EQUINOX + "/") + || url.contains("/" + InitConstants.SYMBOLIC_NAME_INIT + "/")) { + if (logger.isLoggable(TRACE)) + logger.log(WARNING, "Skip " + url); return; } else { Bundle bundle = bundleContext.installBundle(url); if (url.startsWith("http")) - OsgiBootUtils - .info("Installed " + bundle.getSymbolicName() + "-" + bundle.getVersion() + " from " + url); - else if (OsgiBootUtils.debug) - OsgiBootUtils.debug( - "Installed " + bundle.getSymbolicName() + "-" + bundle.getVersion() + " from " + url); + logger.log(DEBUG, + () -> "Installed " + bundle.getSymbolicName() + "-" + bundle.getVersion() + " from " + url); + else + logger.log(TRACE, + () -> "Installed " + bundle.getSymbolicName() + "-" + bundle.getVersion() + " from " + url); assert bundle.getSymbolicName() != null; // uninstall previous versions bundles: for (Bundle b : bundleContext.getBundles()) { @@ -218,17 +246,17 @@ public class OsgiBoot implements OsgiBootConstants { if (bundleV.getMicro() > bV.getMicro()) { // uninstall older bundles b.uninstall(); - OsgiBootUtils.debug("Uninstalled " + b); + logger.log(TRACE, () -> "Uninstalled " + b); } else if (bundleV.getMicro() < bV.getMicro()) { // uninstall just installed bundle if newer bundle.uninstall(); - OsgiBootUtils.debug("Uninstalled " + bundle); + logger.log(TRACE, () -> "Uninstalled " + bundle); break bundles; } else { // uninstall any other with same major/minor if (!bundleV.getQualifier().equals(bV.getQualifier())) { b.uninstall(); - OsgiBootUtils.debug("Uninstalled " + b); + logger.log(TRACE, () -> "Uninstalled " + b); } } } @@ -238,19 +266,19 @@ 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 + "\"")) + if ((message.contains("Bundle \"" + InitConstants.SYMBOLIC_NAME_INIT + "\"") + || message.contains("Bundle \"" + InitConstants.SYMBOLIC_NAME_EQUINOX + "\"")) && message.contains(ALREADY_INSTALLED)) { // silent, in order to avoid warnings: we know that both // have already been installed... } else { if (message.contains(ALREADY_INSTALLED)) { - if (OsgiBootUtils.isDebug()) - OsgiBootUtils.warn("Duplicate install from " + url + ": " + message); + if (logger.isLoggable(TRACE)) + logger.log(WARNING, "Duplicate install from " + url + ": " + message); } else - OsgiBootUtils.warn("Could not install bundle from " + url + ": " + message); + logger.log(WARNING, "Could not install bundle from " + url + ": " + message); } - if (OsgiBootUtils.debug && !message.contains(ALREADY_INSTALLED)) + if (logger.isLoggable(TRACE) && !message.contains(ALREADY_INSTALLED)) e.printStackTrace(); } } @@ -258,16 +286,78 @@ public class OsgiBoot implements OsgiBootConstants { /* * START */ + + /** + * Start bundles based on these properties. + * + * @see OsgiBoot#doStartBundles(Map) + */ public void startBundles() { - startBundles(System.getProperties()); + Map map = new TreeMap<>(); + // first use properties +// if (properties != null) { +// for (String key : properties.keySet()) { +// String property = key; +// if (property.startsWith(InitConstants.PROP_ARGEO_OSGI_START)) { +// map.put(property, properties.get(property)); +// } +// } +// } + // then try all start level until a maximum + int maxStartLevel = Integer + .parseInt(getProperty(InitConstants.PROP_ARGEO_OSGI_MAX_START_LEVEL, DEFAULT_MAX_START_LEVEL)); + for (int i = 1; i <= maxStartLevel; i++) { + String key = InitConstants.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(InitConstants.PROP_ARGEO_OSGI_START)) { +// map.put(key.toString(), System.getProperty(key.toString())); +// } +// } + // start + doStartBundles(map); } - public void startBundles(Properties properties) { +// 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(InitConstants.PROP_ARGEO_OSGI_START)) { +// map.put(property, properties.get(property).toString()); +// } +// } +// } +// startBundles(map); +// } + + /** + * Start bundle based on keys starting with + * {@link InitConstants#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 - Integer defaultStartLevel = Integer.parseInt(getProperty(PROP_OSGI_BUNDLES_DEFAULTSTARTLEVEL, "4")); - Integer activeStartLevel = Integer.parseInt(getProperty(PROP_OSGI_STARTLEVEL, "6")); + int initialStartLevel = frameworkStartLevel.getInitialBundleStartLevel(); + int defaultStartLevel = Integer.parseInt(getProperty(InitConstants.PROP_OSGI_BUNDLES_DEFAULTSTARTLEVEL, "4")); + int activeStartLevel = Integer.parseInt(getProperty(InitConstants.PROP_OSGI_STARTLEVEL, "6")); + if (logger.isLoggable(TRACE)) { + logger.log(TRACE, + "OSGi default start level: " + + getProperty(InitConstants.PROP_OSGI_BUNDLES_DEFAULTSTARTLEVEL, "") + ", using " + + defaultStartLevel); + logger.log(TRACE, "OSGi active start level: " + getProperty(InitConstants.PROP_OSGI_STARTLEVEL, "") + + ", using " + activeStartLevel); + logger.log(TRACE, "Framework start level: " + frameworkStartLevel.getStartLevel() + " (initial: " + + initialStartLevel + ")"); + } SortedMap> startLevels = new TreeMap>(); computeStartLevels(startLevels, properties, defaultStartLevel); @@ -277,7 +367,23 @@ public class OsgiBoot implements OsgiBootConstants { for (String bsn : startLevels.get(level)) bundleStartLevels.put(bsn, level); } - for (Bundle bundle : bundleContext.getBundles()) { + + // keep only bundles with the highest version + Map startableBundles = new HashMap<>(); + bundles: for (Bundle bundle : bundleContext.getBundles()) { + if (bundle.getVersion() == null) + continue bundles; + String bsn = bundle.getSymbolicName(); + if (!startableBundles.containsKey(bsn)) { + startableBundles.put(bsn, bundle); + } else { + if (bundle.getVersion().compareTo(startableBundles.get(bsn).getVersion()) > 0) { + startableBundles.put(bsn, bundle); + } + } + } + + for (Bundle bundle : startableBundles.values()) { String bsn = bundle.getSymbolicName(); if (bundleStartLevels.containsKey(bsn)) { BundleStartLevel bundleStartLevel = bundle.adapt(BundleStartLevel.class); @@ -287,33 +393,58 @@ public class OsgiBoot implements OsgiBootConstants { try { bundle.start(); } catch (BundleException e) { - OsgiBootUtils.error("Cannot mark " + bsn + " as started", e); + logger.log(ERROR, "Cannot mark " + bsn + " as started", e); } - if (getDebug()) - OsgiBootUtils.debug(bsn + " starts at level " + level); + logger.log(TRACE, () -> bsn + " v" + bundle.getVersion() + " starts at level " + level); } } } + + logger.log(TRACE, () -> "About to set framework start level to " + activeStartLevel + " ..."); + frameworkStartLevel.setStartLevel(activeStartLevel, (FrameworkEvent event) -> { - if (getDebug()) - OsgiBootUtils.debug("Framework event: " + event); - int initialStartLevel = frameworkStartLevel.getInitialBundleStartLevel(); - int startLevel = frameworkStartLevel.getStartLevel(); - OsgiBootUtils.debug("Framework start level: " + startLevel + " (initial: " + initialStartLevel + ")"); + if (event.getType() == FrameworkEvent.ERROR) { + logger.log(ERROR, "Start sequence failed", event.getThrowable()); + } else { + logger.log(TRACE, () -> "Framework started at level " + frameworkStartLevel.getStartLevel()); + } }); + +// // Start the framework level after level +// int currentStartLevel = frameworkStartLevel.getStartLevel(); +// stages: for (int stage = currentStartLevel + 1; stage <= activeStartLevel; stage++) { +// if (OsgiBootUtils.isDebug()) +// OsgiBootUtils.debug("Starting stage " + stage + "..."); +// final int nextStage = stage; +// final CompletableFuture stageCompleted = new CompletableFuture<>(); +// frameworkStartLevel.setStartLevel(nextStage, (FrameworkEvent event) -> { +// stageCompleted.complete(event); +// }); +// FrameworkEvent event; +// try { +// event = stageCompleted.get(); +// } catch (InterruptedException | ExecutionException e) { +// throw new IllegalStateException("Cannot continue start", e); +// } +// if (event.getThrowable() != null) { +// OsgiBootUtils.error("Stage " + nextStage + " failed, aborting start.", event.getThrowable()); +// break stages; +// } +// } } - 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(InitConstants.PROP_ARGEO_OSGI_START, "")); // list argeo.osgi.start.* system properties - Iterator keys = properties.keySet().iterator(); - final String prefix = PROP_ARGEO_OSGI_START + "."; + Iterator keys = properties.keySet().iterator(); + final String prefix = InitConstants.PROP_ARGEO_OSGI_START + "."; while (keys.hasNext()) { - String key = keys.next().toString(); + String key = keys.next(); if (key.startsWith(prefix)) { Integer startLevel; String suffix = key.substring(prefix.length()); @@ -329,7 +460,7 @@ public class OsgiBoot implements OsgiBootConstants { startLevel = defaultStartLevel; // append bundle names - String bundleNames = properties.getProperty(key); + String bundleNames = properties.get(key); appendToStartLevels(startLevels, startLevel, bundleNames); } } @@ -350,109 +481,6 @@ public class OsgiBoot implements OsgiBootConstants { } } - /** - * Start the provided list of bundles - * - * @return whether all bundles are now in active state - * @deprecated - */ - @Deprecated - public boolean startBundles(List bundlesToStart) { - if (bundlesToStart.size() == 0) - return true; - - // used to monitor ACTIVE states - List startedBundles = new ArrayList(); - // used to log the bundles not found - List notFoundBundles = new ArrayList(bundlesToStart); - - Bundle[] bundles = bundleContext.getBundles(); - long startBegin = System.currentTimeMillis(); - for (int i = 0; i < bundles.length; i++) { - Bundle bundle = bundles[i]; - String symbolicName = bundle.getSymbolicName(); - if (bundlesToStart.contains(symbolicName)) - try { - try { - bundle.start(); - if (OsgiBootUtils.debug) - debug("Bundle " + symbolicName + " started"); - } catch (Exception e) { - OsgiBootUtils.warn("Start of bundle " + symbolicName + " failed because of " + e - + ", maybe bundle is not yet resolved," + " waiting and trying again."); - waitForBundleResolvedOrActive(startBegin, bundle); - bundle.start(); - startedBundles.add(bundle); - } - notFoundBundles.remove(symbolicName); - } catch (Exception e) { - OsgiBootUtils.warn("Bundle " + symbolicName + " cannot be started: " + e.getMessage()); - if (OsgiBootUtils.debug) - e.printStackTrace(); - // was found even if start failed - notFoundBundles.remove(symbolicName); - } - } - - for (int i = 0; i < notFoundBundles.size(); i++) - OsgiBootUtils.warn("Bundle '" + notFoundBundles.get(i) + "' not started because it was not found."); - - // monitors that all bundles are started - long beginMonitor = System.currentTimeMillis(); - boolean allStarted = !(startedBundles.size() > 0); - List notStarted = new ArrayList(); - while (!allStarted && (System.currentTimeMillis() - beginMonitor) < defaultTimeout) { - notStarted = new ArrayList(); - allStarted = true; - for (int i = 0; i < startedBundles.size(); i++) { - Bundle bundle = (Bundle) startedBundles.get(i); - // TODO check behaviour of lazs bundles - if (bundle.getState() != Bundle.ACTIVE) { - allStarted = false; - notStarted.add(bundle.getSymbolicName()); - } - } - try { - Thread.sleep(100); - } catch (InterruptedException e) { - // silent - } - } - long duration = System.currentTimeMillis() - beginMonitor; - - if (!allStarted) - for (int i = 0; i < notStarted.size(); i++) - OsgiBootUtils.warn("Bundle '" + notStarted.get(i) + "' not ACTIVE after " + (duration / 1000) + "s"); - - return allStarted; - } - - /** Waits for a bundle to become active or resolved */ - @Deprecated - private void waitForBundleResolvedOrActive(long startBegin, Bundle bundle) throws Exception { - int originalState = bundle.getState(); - if ((originalState == Bundle.RESOLVED) || (originalState == Bundle.ACTIVE)) - return; - - String originalStateStr = OsgiBootUtils.stateAsString(originalState); - - int currentState = bundle.getState(); - while (!(currentState == Bundle.RESOLVED || currentState == Bundle.ACTIVE)) { - long now = System.currentTimeMillis(); - if ((now - startBegin) > defaultTimeout * 10) - throw new Exception("Bundle " + bundle.getSymbolicName() + " was not RESOLVED or ACTIVE after " - + (now - startBegin) + "ms (originalState=" + originalStateStr + ", currentState=" - + OsgiBootUtils.stateAsString(currentState) + ")"); - - try { - Thread.sleep(100l); - } catch (InterruptedException e) { - // silent - } - currentState = bundle.getState(); - } - } - /* * BUNDLE PATTERNS INSTALLATION */ @@ -478,14 +506,14 @@ public class OsgiBoot implements OsgiBootConstants { } /** Implements the path matching logic */ + @Deprecated public List getBundlesUrls(String baseUrl, String bundlePatterns) { List urls = new ArrayList(); if (bundlePatterns == null) return urls; // bundlePatterns = SystemPropertyUtils.resolvePlaceholders(bundlePatterns); - if (OsgiBootUtils.debug) - debug(PROP_ARGEO_OSGI_BUNDLES + "=" + bundlePatterns); + logger.log(TRACE, () -> PROP_ARGEO_OSGI_BUNDLES + "=" + bundlePatterns); StringTokenizer st = new StringTokenizer(bundlePatterns, ","); List bundlesSets = new ArrayList(); @@ -572,16 +600,6 @@ public class OsgiBoot implements OsgiBootConstants { 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(); } @@ -597,8 +615,8 @@ public class OsgiBoot implements OsgiBootConstants { File[] files = baseDir.listFiles(); if (files == null) { - if (OsgiBootUtils.debug) - OsgiBootUtils.warn("Base dir " + baseDir + " has no children, exists=" + baseDir.exists() + if (logger.isLoggable(TRACE)) + logger.log(Level.WARNING, "Base dir " + baseDir + " has no children, exists=" + baseDir.exists() + ", isDirectory=" + baseDir.isDirectory()); return; } @@ -630,14 +648,14 @@ public class OsgiBoot implements OsgiBootConstants { // FIXME recurse only if start matches ? match(matched, base, newCurrentPath, pattern); // } else { -// if (OsgiBootUtils.debug) +// if (OsgiBootUtils.isDebug()) // debug(newCurrentPath + " does not start match with " + pattern); // // } } else { boolean nonDirectoryOk = matcher.matches(Paths.get(newCurrentPath)); - if (OsgiBootUtils.debug) - debug(currentPath + " " + (ok ? "" : " not ") + " matched with " + pattern); + logger.log(TRACE, + () -> currentPath + " " + (ok ? "" : " not ") + " matched with " + pattern); if (nonDirectoryOk) matched.add(relativeToFullPath(base, newCurrentPath)); } @@ -647,10 +665,6 @@ public class OsgiBoot implements OsgiBootConstants { } } - protected void matchFile() { - - } - /* * LOW LEVEL UTILITIES */ @@ -690,9 +704,10 @@ public class OsgiBoot implements OsgiBootConstants { return (basePath + '/' + relativePath).replace('/', File.separatorChar); } - private void refreshFramework() { + public void refresh() { Bundle systemBundle = bundleContext.getBundle(0); FrameworkWiring frameworkWiring = systemBundle.adapt(FrameworkWiring.class); + // TODO deal with refresh breaking native loading (e.g SWT) frameworkWiring.refreshBundles(null); } @@ -717,36 +732,51 @@ public class OsgiBoot implements OsgiBootConstants { * BEAN METHODS */ - public boolean getDebug() { - return OsgiBootUtils.debug; - } - - // public void setDebug(boolean debug) { - // this.debug = debug; - // } - public BundleContext getBundleContext() { return bundleContext; } - public String getLocalCache() { - return localCache; + /* + * PLAIN OSGI LAUNCHER + */ + /** Launch an OSGi framework. OSGi Boot initialisation is NOT performed. */ + public static Framework defaultOsgiLaunch(Map configuration) { + Optional frameworkFactory = ServiceLoader.load(FrameworkFactory.class).findFirst(); + if (frameworkFactory.isEmpty()) + throw new IllegalStateException("No framework factory found"); + return defaultOsgiLaunch(frameworkFactory.get(), configuration); } - // public void setDefaultTimeout(long defaultTimeout) { - // this.defaultTimeout = defaultTimeout; - // } - - // public boolean isExcludeSvn() { - // return excludeSvn; - // } - // - // public void setExcludeSvn(boolean excludeSvn) { - // this.excludeSvn = excludeSvn; - // } + /** Launch an OSGi framework. OSGi Boot initialisation is NOT performed. */ + public static Framework defaultOsgiLaunch(FrameworkFactory frameworkFactory, Map configuration) { + // start OSGi + Framework framework = frameworkFactory.newFramework(configuration); + try { + framework.start(); + } catch (BundleException e) { + throw new IllegalStateException("Cannot start OSGi framework", e); + } + return framework; + } /* - * INTERNAL CLASSES + * OSGI UTILITIES */ + /** Uninstall all bundles with these symbolic names */ + public static void uninstallBundles(BundleContext bc, String... symbolicNames) { + List lst = Arrays.asList(symbolicNames); + for (Bundle b : bc.getBundles()) { + String sn = b.getSymbolicName(); + if (sn == null) + continue; + if (lst.contains(sn)) { + try { + b.uninstall(); + } catch (BundleException e) { + logger.log(ERROR, "Cannot uninstall " + sn, e); + } + } + } + } }