changeset 32144:fa1b56b9ad5c

8133347: Add makefiles support and basic session, persistence history navigation with jline Reviewed-by: erikj, jlahoda, jlaskey
author sundar
date Thu, 13 Aug 2015 19:09:18 +0530
parents 394ab6a6658d
children 83cedbbcd7ba
files jdk/make/launcher/Launcher-jdk.scripting.nashorn.gmk jdk/src/java.base/share/conf/security/java.policy
diffstat 2 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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) }'))
 
--- 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";