Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorbobv
Mon, 19 Oct 2015 15:47:57 -0400
changeset 33563 60dd2fafbcbc
parent 33562 c76b2fa11486 (current diff)
parent 33028 5520ed52f1c7 (diff)
child 33564 c75efe7715f6
Merge
--- a/.hgtags	Mon Oct 19 13:21:27 2015 -0400
+++ b/.hgtags	Mon Oct 19 15:47:57 2015 -0400
@@ -328,3 +328,4 @@
 f61a63b7d1e52e307abc0bfc751203155d362ec4 jdk9-b83
 51b2db2fa04c16d767b66113dbf08c5349ce382a jdk9-b84
 8392405ab038b22e69a3728e17dbdd9e3d3a22ed jdk9-b85
+7db0663a5e968059fa7c772172187ebd60b6492d jdk9-b86
--- a/.hgtags-top-repo	Mon Oct 19 13:21:27 2015 -0400
+++ b/.hgtags-top-repo	Mon Oct 19 15:47:57 2015 -0400
@@ -328,3 +328,4 @@
 ce5c14d97d95084504c32b9320cb33cce4235588 jdk9-b83
 1c8134475511ffe6726677e1418a89a7a45e92d6 jdk9-b84
 1f345217c9bab05f192d00cf1665b3286c49ccdb jdk9-b85
+2aa1daf98d3e2ee37f20f6858c53cc37020f6937 jdk9-b86
--- a/corba/.hgtags	Mon Oct 19 13:21:27 2015 -0400
+++ b/corba/.hgtags	Mon Oct 19 15:47:57 2015 -0400
@@ -328,3 +328,4 @@
 ca8a1719588424f6e04e943790c7fcb7cb0b8c8f jdk9-b83
 df70bb200356fec686681f0295c50cc3ed43c3b3 jdk9-b84
 3ec06af1368924469f7ce60a00324bac55eaeecc jdk9-b85
+0a3f0d25c201b40575a7c3920fce4d6f4d3ae310 jdk9-b86
--- a/hotspot/.hgtags	Mon Oct 19 13:21:27 2015 -0400
+++ b/hotspot/.hgtags	Mon Oct 19 15:47:57 2015 -0400
@@ -488,3 +488,4 @@
 3ed0df2c553a80e0e26b91a6ce08806ea17a066a jdk9-b83
 184c4328444974edd6b3b490b9d0177ace7e331c jdk9-b84
 03845376ea9dbf9690b6a9cfb4ed63f8cc0541c0 jdk9-b85
+1ae4191359d811a51512f17dca80ffe79837a5ff jdk9-b86
--- a/jaxp/.hgtags	Mon Oct 19 13:21:27 2015 -0400
+++ b/jaxp/.hgtags	Mon Oct 19 15:47:57 2015 -0400
@@ -328,3 +328,4 @@
 497bc2654e11684b11de46744227883d7e760f35 jdk9-b83
 91795d86744f3074d1e59b1e75d9c851c098688f jdk9-b84
 1d9850c1b35c74e8b5c17970ed5d46dc0fc33f06 jdk9-b85
+88d9b1f6b73e0c46fcb5ccabe1231a30ce758a22 jdk9-b86
--- a/jaxws/.hgtags	Mon Oct 19 13:21:27 2015 -0400
+++ b/jaxws/.hgtags	Mon Oct 19 15:47:57 2015 -0400
@@ -331,3 +331,4 @@
 d7ee8157f4feced67924e421225c6f844079a03d jdk9-b83
 51729143f8fe038f52cf55720c4c1f89267f5948 jdk9-b84
 67b626ec730d2601d95ef036d06be34b37fa9ce6 jdk9-b85
+5289646179079394890a34a898a8ab70fcde0331 jdk9-b86
--- a/jdk/.hgtags	Mon Oct 19 13:21:27 2015 -0400
+++ b/jdk/.hgtags	Mon Oct 19 15:47:57 2015 -0400
@@ -328,3 +328,4 @@
 d11f25ce3c545823f53bb978d454a4d2901abac3 jdk9-b83
 757ef7f6d0042934edea3e0bf616fad2c1a22789 jdk9-b84
 fe40b31c0e526d357cf5b62044fea006e43b53a5 jdk9-b85
+e8a66c0b05d786a282a7ff1d7eb4989afa30c891 jdk9-b86
--- a/langtools/.hgtags	Mon Oct 19 13:21:27 2015 -0400
+++ b/langtools/.hgtags	Mon Oct 19 15:47:57 2015 -0400
@@ -328,3 +328,4 @@
 6b3b94a2ebca4a99b2effefb2a1556cee954fd2f jdk9-b83
 e3445ccab58f741801021dec9aa46e7f2c09efd9 jdk9-b84
 7ef2c66892a3af15540c2800104c660c4f7f45e9 jdk9-b85
+130a7c2a85900dde04e119bc36853b73146e3414 jdk9-b86
--- a/make/Images.gmk	Mon Oct 19 13:21:27 2015 -0400
+++ b/make/Images.gmk	Mon Oct 19 15:47:57 2015 -0400
@@ -48,7 +48,8 @@
 # tools
 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
+               jdk.jdeps jdk.jdi jdk.jdwp.agent jdk.jshell jdk.policytool jdk.rmic \
+               jdk.xml.bind jdk.xml.ws
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
   PROVIDER_MODULES += jdk.crypto.mscapi
--- a/modules.xml	Mon Oct 19 13:21:27 2015 -0400
+++ b/modules.xml	Mon Oct 19 15:47:57 2015 -0400
@@ -788,6 +788,19 @@
     </export>
   </module>
   <module>
+    <name>jdk.jshell</name>
+    <depend>java.base</depend>
+    <depend re-exports="true">java.compiler</depend>
+    <depend>jdk.compiler</depend>
+    <depend>java.desktop</depend>
+    <depend>java.prefs</depend>
+    <depend>jdk.jdi</depend>
+    <depend>jdk.internal.le</depend>
+    <export>
+      <name>jdk.jshell</name>
+    </export>
+  </module>
+  <module>
     <name>java.instrument</name>
     <depend>java.base</depend>
     <export>
@@ -1547,14 +1560,17 @@
     </export>
     <export>
       <name>com.sun.tools.javac.api</name>
+      <to>jdk.jshell</to>
       <to>jdk.javadoc</to>
     </export>
     <export>
       <name>com.sun.tools.javac.code</name>
+      <to>jdk.jshell</to>
       <to>jdk.javadoc</to>
     </export>
     <export>
       <name>com.sun.tools.javac.comp</name>
+      <to>jdk.jshell</to>
       <to>jdk.javadoc</to>
     </export>
     <export>
@@ -1564,10 +1580,12 @@
     </export>
     <export>
       <name>com.sun.tools.javac.jvm</name>
+      <to>jdk.jshell</to>
       <to>jdk.javadoc</to>
     </export>
     <export>
       <name>com.sun.tools.javac.main</name>
+      <to>jdk.jshell</to>
       <to>jdk.javadoc</to>
     </export>
     <export>
@@ -1575,6 +1593,10 @@
       <to>jdk.javadoc</to>
     </export>
     <export>
+      <name>com.sun.tools.javac.parser</name>
+      <to>jdk.jshell</to>
+    </export>
+    <export>
       <name>com.sun.tools.javac.platform</name>
       <to>jdk.javadoc</to>
     </export>
@@ -1584,10 +1606,12 @@
     </export>
     <export>
       <name>com.sun.tools.javac.tree</name>
+      <to>jdk.jshell</to>
       <to>jdk.javadoc</to>
     </export>
     <export>
       <name>com.sun.tools.javac.util</name>
+      <to>jdk.jshell</to>
       <to>jdk.javadoc</to>
       <to>jdk.jdeps</to>
     </export>
@@ -1648,22 +1672,27 @@
     <depend>java.base</depend>
     <export>
       <name>jdk.internal.jline</name>
+      <to>jdk.jshell</to>
       <to>jdk.scripting.nashorn.shell</to>
     </export>
     <export>
       <name>jdk.internal.jline.console</name>
+      <to>jdk.jshell</to>
       <to>jdk.scripting.nashorn.shell</to>
     </export>
     <export>
       <name>jdk.internal.jline.console.completer</name>
+      <to>jdk.jshell</to>
       <to>jdk.scripting.nashorn.shell</to>
     </export>
     <export>
       <name>jdk.internal.jline.console.history</name>
+      <to>jdk.jshell</to>
       <to>jdk.scripting.nashorn.shell</to>
     </export>
     <export>
       <name>jdk.internal.jline.internal</name>
+      <to>jdk.jshell</to>
       <to>jdk.scripting.nashorn.shell</to>
     </export>
   </module>
--- a/nashorn/.hgtags	Mon Oct 19 13:21:27 2015 -0400
+++ b/nashorn/.hgtags	Mon Oct 19 15:47:57 2015 -0400
@@ -319,3 +319,4 @@
 21b86b980a5f0d27f1f758a3e4818d3331387172 jdk9-b83
 214b97ba911f4d768c0214098739e32ab54c8503 jdk9-b84
 285628dac94332d95979de365630c93ab8fa9962 jdk9-b85
+e4283eeb182cbdf5004740728a404aac6afa1104 jdk9-b86
jdk-sandbox