From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 7 Mar 2024 18:51:23 +0000 (+0100)
Subject: Clean up code
X-Git-Tag: v2.3.28~20
X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=7d4cccc2f758f30e0704f2e8f500c43fd4245ebf

Clean up code
---

diff --git a/org.argeo.init/src/org/argeo/init/RuntimeManagerMain.java b/org.argeo.init/src/org/argeo/init/RuntimeManagerMain.java
index 7a3f78139..74560185d 100644
--- a/org.argeo.init/src/org/argeo/init/RuntimeManagerMain.java
+++ b/org.argeo.init/src/org/argeo/init/RuntimeManagerMain.java
@@ -59,18 +59,6 @@ public class RuntimeManagerMain implements RuntimeManager {
 	}
 
 	public void run() {
-//		try {
-//			for (Path p : Files.newDirectoryStream(Paths.get("/usr/local/lib/a2"), "*.so")) {
-//				try {
-//					System.load(p.toString());
-//				} catch (UnsatisfiedLinkError e) {
-//					e.printStackTrace();
-//				}
-//			}
-//		} catch (IOException e) {
-//			e.printStackTrace();
-//		}
-
 		OsgiRuntimeContext managerRuntimeContext = new OsgiRuntimeContext(configuration);
 		try {
 			managerRuntimeContext.run();
@@ -149,21 +137,6 @@ public class RuntimeManagerMain implements RuntimeManager {
 		OsgiRuntimeContext runtimeContext = loadRuntime(relPath, configCallback);
 		runtimeContext.run();
 		Framework framework = runtimeContext.getFramework();
-
-//		for (Bundle b : framework.getBundleContext().getBundles()) {
-//			try {
-////				if (b.getSymbolicName().startsWith("org.eclipse.swt.gtk")) {
-////					b.uninstall();
-////				}
-////				else if (b.getSymbolicName().startsWith("org.eclipse.jface")) {
-////					b.uninstall();
-////				}
-//			} catch (Exception e) {
-//				// TODO Auto-generated catch block
-//				e.printStackTrace();
-//			}
-//		}
-
 		if (framework != null) {// in case the framework has closed very quickly after run
 			framework.getBundleContext().addFrameworkListener((e) -> {
 				if (e.getType() >= FrameworkEvent.STOPPED) {
diff --git a/org.argeo.init/src/org/argeo/init/osgi/OsgiRuntimeContext.java b/org.argeo.init/src/org/argeo/init/osgi/OsgiRuntimeContext.java
index 268fb221b..4ec5a0473 100644
--- a/org.argeo.init/src/org/argeo/init/osgi/OsgiRuntimeContext.java
+++ b/org.argeo.init/src/org/argeo/init/osgi/OsgiRuntimeContext.java
@@ -14,7 +14,6 @@ import java.util.function.Consumer;
 import java.util.function.Supplier;
 
 import org.argeo.api.init.RuntimeContext;
-import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;
 import org.osgi.framework.Constants;
@@ -28,7 +27,7 @@ public class OsgiRuntimeContext implements RuntimeContext, AutoCloseable {
 	private final static long STOP_FOR_UPDATE_TIMEOUT = 60 * 1000;
 	private final static long CLOSE_TIMEOUT = 60 * 1000;
 
-	private final static String SYMBOLIC_NAME_FELIX_SCR = "org.apache.felix.scr";
+	// private final static String SYMBOLIC_NAME_FELIX_SCR = "org.apache.felix.scr";
 
 	private Map<String, String> config;
 	private Framework framework;