# HG changeset patch
# User lana
# Date 1440706897 25200
# Node ID f7c5ae2933c0b8510a420d1713a955e4ffc7ad0b
# Parent  9c2b8cb198441b00c99ef3be8a1ada886f51b97c# Parent  8d59a6070b989c6299458bf349b216f778a05934
Merge

diff -r 9c2b8cb19844 -r f7c5ae2933c0 make/Images.gmk
--- a/make/Images.gmk	Thu Aug 27 12:59:49 2015 -0700
+++ b/make/Images.gmk	Thu Aug 27 13:21:37 2015 -0700
@@ -39,14 +39,14 @@
 
 MAIN_MODULES += java.se java.smartcardio jdk.httpserver jdk.sctp \
                jdk.security.auth jdk.security.jgss jdk.pack200 jdk.xml.dom \
-               jdk.accessibility
+               jdk.accessibility jdk.internal.le jdk.scripting.nashorn.shell
 
 # providers
 PROVIDER_MODULES += jdk.charsets jdk.crypto.ec jdk.crypto.pkcs11 jdk.jvmstat jdk.localedata \
                jdk.naming.dns jdk.naming.rmi jdk.scripting.nashorn jdk.zipfs
 
 # tools
-TOOLS_MODULES += jdk.attach jdk.compiler jdk.dev jdk.internal.le jdk.scripting.nashorn.shell \
+TOOLS_MODULES += jdk.attach jdk.compiler jdk.dev \
                jdk.javadoc jdk.jcmd jdk.jconsole jdk.hotspot.agent jdk.jartool \
                jdk.jdeps jdk.jdi jdk.jdwp.agent jdk.policytool jdk.rmic jdk.xml.bind jdk.xml.ws
 
diff -r 9c2b8cb19844 -r f7c5ae2933c0 modules.xml
--- a/modules.xml	Thu Aug 27 12:59:49 2015 -0700
+++ b/modules.xml	Thu Aug 27 13:21:37 2015 -0700
@@ -1652,6 +1652,10 @@
       <name>jdk.internal.jline.console.history</name>
       <to>jdk.scripting.nashorn.shell</to>
     </export>
+    <export>
+      <name>jdk.internal.jline.internal</name>
+      <to>jdk.scripting.nashorn.shell</to>
+    </export>
   </module>
   <module>
     <name>jdk.jartool</name>
@@ -1818,7 +1822,9 @@
     <name>jdk.scripting.nashorn.shell</name>
     <depend>java.base</depend>
     <depend>jdk.scripting.nashorn</depend>
-    <depend>jdk.internal.le</depend>
+    <depend>jdk.internal.le</depend> <!-- jline -->
+    <depend>java.desktop</depend> <!-- EditPad -->
+    <depend>java.compiler</depend> <!-- java package completion -->
   </module>
   <module>
     <name>jdk.sctp</name>