X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.init%2Fsrc%2Forg%2Fargeo%2Finit%2Fosgi%2FOsgiBuilder.java;h=f1c16af91aa76110d59b5cbf764587df3f0bebe7;hb=641e3f3c535f540afd122d2a7b53389342f77002;hp=d89535e03633d276c55648e442bc1b097d7b89c9;hpb=7d4cccc2f758f30e0704f2e8f500c43fd4245ebf;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.init/src/org/argeo/init/osgi/OsgiBuilder.java b/org.argeo.init/src/org/argeo/init/osgi/OsgiBuilder.java index d89535e03..f1c16af91 100644 --- a/org.argeo.init/src/org/argeo/init/osgi/OsgiBuilder.java +++ b/org.argeo.init/src/org/argeo/init/osgi/OsgiBuilder.java @@ -12,7 +12,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Properties; import java.util.Set; import java.util.TreeMap; @@ -53,6 +52,7 @@ public class OsgiBuilder { } public Framework launch() { + configuration.putAll(startLevelsToProperties()); // start OSGi framework = OsgiBoot.defaultOsgiLaunch(configuration); @@ -73,7 +73,7 @@ public class OsgiBuilder { } } // start bundles - osgiBoot.startBundles(startLevelsToProperties()); + osgiBoot.startBundles(); // if (OsgiBootUtils.isDebug()) // for (Bundle bundle : bc.getBundles()) { @@ -283,8 +283,8 @@ public class OsgiBuilder { // // UTILITIES // - private Properties startLevelsToProperties() { - Properties properties = new Properties(); + private Map startLevelsToProperties() { + Map properties = new HashMap<>(); for (Integer startLevel : startLevels.keySet()) { String property = InitConstants.PROP_ARGEO_OSGI_START + "." + startLevel; StringBuilder value = new StringBuilder();