# HG changeset patch
# User sundar
# Date 1439473158 -19800
# Node ID fa1b56b9ad5c839e5241ac17249936197dd11f2c
# Parent  394ab6a6658d139f12382224fc6ed389f04a39a6
8133347: Add makefiles support and basic session, persistence history navigation with jline
Reviewed-by: erikj, jlahoda, jlaskey

diff -r 394ab6a6658d -r fa1b56b9ad5c jdk/make/launcher/Launcher-jdk.scripting.nashorn.gmk
--- a/jdk/make/launcher/Launcher-jdk.scripting.nashorn.gmk	Thu Aug 13 12:40:07 2015 +0300
+++ b/jdk/make/launcher/Launcher-jdk.scripting.nashorn.gmk	Thu Aug 13 19:09:18 2015 +0530
@@ -26,5 +26,5 @@
 include LauncherCommon.gmk
 
 $(eval $(call SetupLauncher,jjs, \
-    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "jdk.nashorn.tools.Shell"$(COMMA) }'))
+    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "jdk.nashorn.tools.jjs.Main"$(COMMA) }'))
 
diff -r 394ab6a6658d -r fa1b56b9ad5c jdk/src/java.base/share/conf/security/java.policy
--- a/jdk/src/java.base/share/conf/security/java.policy	Thu Aug 13 12:40:07 2015 +0300
+++ b/jdk/src/java.base/share/conf/security/java.policy	Thu Aug 13 19:09:18 2015 +0530
@@ -23,6 +23,14 @@
         permission java.security.AllPermission;
 };
 
+grant codeBase "jrt:/jdk.scripting.nashorn.shell" {
+        permission java.security.AllPermission;
+};
+
+grant codeBase "jrt:/jdk.internal.le" {
+        permission java.security.AllPermission;
+};
+
 grant codeBase "jrt:/jdk.crypto.ucrypto" {
         permission java.lang.RuntimePermission "accessClassInPackage.sun.security.*";
         permission java.lang.RuntimePermission "accessClassInPackage.sun.nio.ch";