X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.jshell%2Fsrc%2Forg%2Fargeo%2Finternal%2Fcms%2Fjshell%2Fosgi%2FOsgiExecutionControlProvider.java;h=4a8f1685f769b0d622373cff420362902dbea124;hb=5d7ebadd9fe583fd9d3b2e4ca6e99079b99aac5a;hp=f785919b2455c6d0ff7c6d00173b24603a750856;hpb=c31e21e07586e1a3937ac3c79d71941f047234ae;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.jshell/src/org/argeo/internal/cms/jshell/osgi/OsgiExecutionControlProvider.java b/org.argeo.cms.jshell/src/org/argeo/internal/cms/jshell/osgi/OsgiExecutionControlProvider.java
index f785919b2..4a8f1685f 100644
--- a/org.argeo.cms.jshell/src/org/argeo/internal/cms/jshell/osgi/OsgiExecutionControlProvider.java
+++ b/org.argeo.cms.jshell/src/org/argeo/internal/cms/jshell/osgi/OsgiExecutionControlProvider.java
@@ -19,8 +19,10 @@ import java.util.TreeMap;
 import java.util.TreeSet;
 
 import org.argeo.api.cms.CmsLog;
+import org.argeo.cms.jshell.CmsExecutionControl;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.Version;
 import org.osgi.framework.namespace.PackageNamespace;
@@ -28,7 +30,6 @@ import org.osgi.framework.wiring.BundleRevision;
 import org.osgi.framework.wiring.BundleWire;
 import org.osgi.framework.wiring.BundleWiring;
 
-import jdk.jshell.execution.DirectExecutionControl;
 import jdk.jshell.spi.ExecutionControl;
 import jdk.jshell.spi.ExecutionControlProvider;
 import jdk.jshell.spi.ExecutionEnv;
@@ -53,24 +54,15 @@ public class OsgiExecutionControlProvider implements ExecutionControlProvider {
 
 	@Override
 	public ExecutionControl generate(ExecutionEnv env, Map<String, String> parameters) throws Throwable {
-		// TODO find a better way to get a default bundle context
-		// NOTE: the related default bundle has to be started
-
-//		String symbolicName = parameters.get(BUNDLE_PARAMETER);
-//		Bundle fromBundle = getBundleFromSn(symbolicName);
-
 		Long bundleId = Long.parseLong(parameters.get(BUNDLE_PARAMETER));
 		Bundle fromBundle = getBundleFromId(bundleId);
 
 		BundleWiring fromBundleWiring = fromBundle.adapt(BundleWiring.class);
 		ClassLoader fromBundleClassLoader = fromBundleWiring.getClassLoader();
 
-		// use the bundle classloade as context classloader
-		Thread.currentThread().setContextClassLoader(fromBundleClassLoader);
-		
-		ExecutionControl executionControl = new DirectExecutionControl(
-				new WrappingLoaderDelegate(fromBundleClassLoader));
-		log.debug("JShell from " + fromBundle.getSymbolicName() + "_" + fromBundle.getVersion() + " ["
+		ExecutionControl executionControl = new CmsExecutionControl(env,
+				new WrappingLoaderDelegate(env, fromBundleClassLoader));
+		log.trace(() -> "JShell from " + fromBundle.getSymbolicName() + "_" + fromBundle.getVersion() + " ["
 				+ fromBundle.getBundleId() + "]");
 		return executionControl;
 	}
@@ -98,6 +90,25 @@ public class OsgiExecutionControlProvider implements ExecutionControlProvider {
 	public static Path getBundleStartupScript(Long bundleId) {
 		BundleContext bc = FrameworkUtil.getBundle(OsgiExecutionControlProvider.class).getBundleContext();
 		Bundle fromBundle = bc.getBundle(bundleId);
+
+		int bundleState = fromBundle.getState();
+		if (Bundle.INSTALLED == bundleState)
+			throw new IllegalStateException("Bundle " + fromBundle.getSymbolicName() + " is not resolved");
+		if (Bundle.RESOLVED == bundleState) {
+			try {
+				fromBundle.start();
+			} catch (BundleException e) {
+				throw new IllegalStateException("Cannot start bundle " + fromBundle.getSymbolicName(), e);
+			}
+			while (Bundle.ACTIVE != fromBundle.getState())
+				try {
+					Thread.sleep(100);
+				} catch (InterruptedException e) {
+					// we assume the session has been closed
+					throw new RuntimeException("Bundle " + fromBundle.getSymbolicName() + " is not active", e);
+				}
+		}
+
 		Path bundleStartupScript = fromBundle.getDataFile("BUNDLE.jsh").toPath();
 
 		BundleWiring fromBundleWiring = fromBundle.adapt(BundleWiring.class);
@@ -110,8 +121,13 @@ public class OsgiExecutionControlProvider implements ExecutionControlProvider {
 			packagesToImport.add(pkg.getName());
 		}
 
-		List<BundleWire> bundleWires = fromBundleWiring.getRequiredWires(BundleRevision.PACKAGE_NAMESPACE);
-		for (BundleWire bw : bundleWires) {
+//		List<BundleWire> exportedWires = fromBundleWiring.getProvidedWires(BundleRevision.PACKAGE_NAMESPACE);
+//		for (BundleWire bw : exportedWires) {
+//			packagesToImport.add(bw.getCapability().getAttributes().get(PackageNamespace.PACKAGE_NAMESPACE).toString());
+//		}
+
+		List<BundleWire> importedWires = fromBundleWiring.getRequiredWires(BundleRevision.PACKAGE_NAMESPACE);
+		for (BundleWire bw : importedWires) {
 			packagesToImport.add(bw.getCapability().getAttributes().get(PackageNamespace.PACKAGE_NAMESPACE).toString());
 		}
 
@@ -119,6 +135,42 @@ public class OsgiExecutionControlProvider implements ExecutionControlProvider {
 			for (String p : packagesToImport) {
 				writer.write("import " + p + ".*;\n");
 			}
+
+			String std = """
+					/open DEFAULT
+					import jdk.jshell.spi.ExecutionEnv;
+					import java.util.function.*;
+
+					/** Redirected standard IO. */
+					public class Std {
+						final static InputStream in = new Supplier<InputStream>() {
+
+							@Override
+							public InputStream get() {
+								return ((ExecutionEnv) getClass().getClassLoader()).userIn();
+							}
+
+						}.get();
+						final static PrintStream out = new Supplier<PrintStream>() {
+
+							@Override
+							public PrintStream get() {
+								return ((ExecutionEnv) getClass().getClassLoader()).userOut();
+							}
+
+						}.get();
+						final static PrintStream err = new Supplier<PrintStream>() {
+
+							@Override
+							public PrintStream get() {
+								return ((ExecutionEnv) getClass().getClassLoader()).userErr();
+							}
+
+						}.get();
+
+					}
+					""";
+			writer.write(std);
 		} catch (IOException e) {
 			throw new RuntimeException("Cannot writer bundle startup script to " + bundleStartupScript, e);
 		}