Small improvements to JShell

diff --git a/org.argeo.cms.jshell/src/org/argeo/cms/jshell/CmsJShell.java b/org.argeo.cms.jshell/src/org/argeo/cms/jshell/CmsJShell.java
index e3718ae73119f693d99c78441e194d9bf7199255..a3fcf3f808a2be65cb2921c8fe13b2a293f84225 100644 (file)
--- a/org.argeo.cms.jshell/src/org/argeo/cms/jshell/CmsJShell.java
+++ b/org.argeo.cms.jshell/src/org/argeo/cms/jshell/CmsJShell.java
@@ -54,7 +54,7 @@ public class CmsJShell {
                jtermLinkedDir = Files.createSymbolicLink(cmsState.getStatePath(JShellClient.JTERM), jtermBase);
 
                log.info("Local JShell on " + jshBase + ", linked to " + jshLinkedDir);
-               log.info("Local JTerml on " + jtermBase + ", linked to " + jtermLinkedDir);
+               log.info("Local JTerm on " + jtermBase + ", linked to " + jtermLinkedDir);
 
                new Thread(() -> {
                        try {

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 a98326c309e952ede6bcb38f50cbeb52188bfbf0..fbca085861759a1410b743555d8eb1d817db6367 100644 (file)
--- 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
@@ -112,7 +112,9 @@ public class OsgiExecutionControlProvider implements ExecutionControlProvider {
                        }
 
                        String std = """
+                                       /open DEFAULT
                                        import jdk.jshell.spi.ExecutionEnv;
+                                       import java.util.function.*;
 
                                        /** Redirected standard IO. */
                                        public class Std {