X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.init%2Fsrc%2Forg%2Fargeo%2Finit%2Fosgi%2FActivator.java;h=a4f5a371d9d4c8ab708762b6be70156208510741;hb=1010bff4f1ffadbf3f7988fbd3eba70f5d672c88;hp=3e0d8e1179c251d1299ed99657c354c07030cf44;hpb=8be06a167888a8ba1f262bbe34c70385807d11c0;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.init/src/org/argeo/init/osgi/Activator.java b/org.argeo.init/src/org/argeo/init/osgi/Activator.java
index 3e0d8e117..a4f5a371d 100644
--- a/org.argeo.init/src/org/argeo/init/osgi/Activator.java
+++ b/org.argeo.init/src/org/argeo/init/osgi/Activator.java
@@ -2,6 +2,7 @@ package org.argeo.init.osgi;
 
 import java.lang.System.Logger;
 import java.lang.System.Logger.Level;
+import java.util.Objects;
 
 import org.argeo.init.logging.ThinLoggerFinder;
 import org.osgi.framework.BundleActivator;
@@ -17,28 +18,34 @@ public class Activator implements BundleActivator {
 		// must be called first
 		ThinLoggerFinder.lazyInit();
 	}
-	Logger logger = System.getLogger(Activator.class.getName());
+	private Logger logger = System.getLogger(Activator.class.getName());
 
 	private Long checkpoint = null;
+	private OsgiRuntimeContext runtimeContext;
 
 	public void start(final BundleContext bundleContext) throws Exception {
+		if (runtimeContext == null) {
+			runtimeContext = new OsgiRuntimeContext(bundleContext);
+		}
 		logger.log(Level.DEBUG, () -> "Argeo init via OSGi activator");
 
 		// admin thread
-		Thread adminThread = new AdminThread(bundleContext);
-		adminThread.start();
+//		Thread adminThread = new AdminThread(bundleContext);
+//		adminThread.start();
 
 		// bootstrap
-		OsgiBoot osgiBoot = new OsgiBoot(bundleContext);
+//		OsgiBoot osgiBoot = new OsgiBoot(bundleContext);
 		if (checkpoint == null) {
-			osgiBoot.bootstrap();
+//			osgiBoot.bootstrap();
 			checkpoint = System.currentTimeMillis();
 		} else {
-			osgiBoot.update();
+			runtimeContext.update();
 			checkpoint = System.currentTimeMillis();
 		}
 	}
 
 	public void stop(BundleContext context) throws Exception {
+		Objects.requireNonNull(runtimeContext);
+		runtimeContext.stop(context);
 	}
 }