# HG changeset patch
# User attila
# Date 1448356934 -3600
# Node ID 64da21aa58f69e85b463e7d68b0082c501390c8f
# Parent  94da318cb5d7abbb0f1ed8d8e0a3c9f82a3f11dd
8141338: Move jdk.internal.dynalink package to jdk.dynalink
Reviewed-by: alanb, mchung, sundar

diff -r 94da318cb5d7 -r 64da21aa58f6 make/CompileJavaModules.gmk
--- a/make/CompileJavaModules.gmk	Fri Nov 20 19:25:45 2015 +0100
+++ b/make/CompileJavaModules.gmk	Tue Nov 24 10:22:14 2015 +0100
@@ -369,6 +369,10 @@
 
 ################################################################################
 
+jdk.dynalink_CLEAN := .properties
+
+################################################################################
+
 jdk.javadoc_COPY := .xml .css .js .png
 
 ################################################################################
diff -r 94da318cb5d7 -r 64da21aa58f6 make/Images.gmk
--- a/make/Images.gmk	Fri Nov 20 19:25:45 2015 +0100
+++ b/make/Images.gmk	Tue Nov 24 10:22:14 2015 +0100
@@ -39,12 +39,13 @@
 
 MAIN_MODULES += java.se java.smartcardio jdk.httpserver jdk.sctp \
                jdk.security.auth jdk.security.jgss jdk.pack200 jdk.xml.dom \
-               jdk.accessibility jdk.internal.le jdk.scripting.nashorn.shell \
+               jdk.accessibility jdk.internal.le jdk.dynalink \
+               jdk.scripting.nashorn jdk.scripting.nashorn.shell \
                jdk.vm.ci jdk.management
 
 # 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
+               jdk.naming.dns jdk.naming.rmi jdk.zipfs
 
 # tools
 TOOLS_MODULES += jdk.attach jdk.compiler jdk.dev \
diff -r 94da318cb5d7 -r 64da21aa58f6 modules.xml
--- a/modules.xml	Fri Nov 20 19:25:45 2015 +0100
+++ b/modules.xml	Tue Nov 24 10:22:14 2015 +0100
@@ -342,6 +342,7 @@
       <to>java.logging</to>
       <to>java.sql</to>
       <to>java.sql.rowset</to>
+      <to>jdk.dynalink</to>
       <to>jdk.scripting.nashorn</to>
     </export>
     <export>
@@ -1657,6 +1658,26 @@
     <depend>java.base</depend>
   </module>
   <module>
+    <name>jdk.dynalink</name>
+    <depend>java.base</depend>
+    <depend>java.logging</depend>
+    <export>
+      <name>jdk.dynalink</name>
+    </export>
+    <export>
+      <name>jdk.dynalink.beans</name>
+    </export>
+    <export>
+      <name>jdk.dynalink.linker</name>
+    </export>
+    <export>
+      <name>jdk.dynalink.linker.support</name>
+    </export>
+    <export>
+      <name>jdk.dynalink.support</name>
+    </export>
+  </module>
+  <module>
     <name>jdk.hotspot.agent</name>
     <depend>java.base</depend>
     <depend>java.datatransfer</depend>
@@ -1849,6 +1870,7 @@
     <name>jdk.scripting.nashorn</name>
     <depend>java.base</depend>
     <depend>java.logging</depend>
+    <depend>jdk.dynalink</depend>
     <depend re-exports="true">java.scripting</depend>
     <export>
       <name>jdk.nashorn.internal.runtime</name>