X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.init%2Fsrc%2Forg%2Fargeo%2Finit%2Fosgi%2FOsgiBoot.java;h=2e96db3b37a769774f0c7b7d980ec1cb494549dd;hb=abf185c93b2a4a415dc60c40ed37e6cc9ee12318;hp=9f3bd25f783df4908aaa4c6bd8bfffa8c200597e;hpb=c66685995c1bf2c59bdf6d68753470c85828310a;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 9f3bd25f7..2e96db3b3 100644
--- a/org.argeo.init/src/org/argeo/init/osgi/OsgiBoot.java
+++ b/org.argeo.init/src/org/argeo/init/osgi/OsgiBoot.java
@@ -98,19 +98,25 @@ public class OsgiBoot implements OsgiBootConstants {
 					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" + 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 + queryPart);
 				}
@@ -355,8 +361,17 @@ public class OsgiBoot implements OsgiBootConstants {
 		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(PROP_OSGI_BUNDLES_DEFAULTSTARTLEVEL, "4"));
+		int activeStartLevel = Integer.parseInt(getProperty(PROP_OSGI_STARTLEVEL, "6"));
+		if (OsgiBootUtils.isDebug()) {
+			OsgiBootUtils.debug("OSGi default start level: "
+					+ getProperty(PROP_OSGI_BUNDLES_DEFAULTSTARTLEVEL, "<not set>") + ", using " + defaultStartLevel);
+			OsgiBootUtils.debug("OSGi active start level: " + getProperty(PROP_OSGI_STARTLEVEL, "<not set>")
+					+ ", using " + activeStartLevel);
+			OsgiBootUtils.debug("Framework start level: " + frameworkStartLevel.getStartLevel() + " (initial: "
+					+ initialStartLevel + ")");
+		}
 
 		SortedMap<Integer, List<String>> startLevels = new TreeMap<Integer, List<String>>();
 		computeStartLevels(startLevels, properties, defaultStartLevel);
@@ -383,13 +398,40 @@ public class OsgiBoot implements OsgiBootConstants {
 				}
 			}
 		}
+
+		if (OsgiBootUtils.isDebug())
+			OsgiBootUtils.debug("About to set framework start level to " + activeStartLevel + " ...");
+
 		frameworkStartLevel.setStartLevel(activeStartLevel, (FrameworkEvent event) -> {
-			if (OsgiBootUtils.isDebug())
-				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) {
+				OsgiBootUtils.error("Start sequence failed", event.getThrowable());
+			} else {
+				if (OsgiBootUtils.isDebug())
+					OsgiBootUtils.debug("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<FrameworkEvent> 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<Integer, List<String>> startLevels, Map<String, String> properties,
@@ -666,6 +708,7 @@ public class OsgiBoot implements OsgiBootConstants {
 	private void refreshFramework() {
 		Bundle systemBundle = bundleContext.getBundle(0);
 		FrameworkWiring frameworkWiring = systemBundle.adapt(FrameworkWiring.class);
+		// TODO deal with refresh breaking native loading (e.g SWT)
 		frameworkWiring.refreshBundles(null);
 	}