# HG changeset patch
# User sjiang
# Date 1429256192 -7200
# Node ID 936b85480edb3520fce42ab06a7b84f9b832ee81
# Parent  7ca82a2078963e451b3597e1aeb905f333d6905a
8042901: Allow com.sun.management to be in a different module to java.lang.management
Reviewed-by: mchung, dfuchs, erikj, jbachorik

diff -r 7ca82a207896 -r 936b85480edb common/bin/unshuffle_list.txt
--- a/common/bin/unshuffle_list.txt	Thu Apr 09 09:14:17 2015 +0200
+++ b/common/bin/unshuffle_list.txt	Fri Apr 17 09:36:32 2015 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -1156,7 +1156,6 @@
 jdk/src/java.management/share/classes/com/sun/jmx/interceptor : jdk/src/share/classes/com/sun/jmx/interceptor
 jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver : jdk/src/share/classes/com/sun/jmx/mbeanserver
 jdk/src/java.management/share/classes/com/sun/jmx/remote : jdk/src/share/classes/com/sun/jmx/remote
-jdk/src/java.management/share/classes/com/sun/management : jdk/src/share/classes/com/sun/management
 jdk/src/java.management/share/classes/java/lang/management : jdk/src/share/classes/java/lang/management
 jdk/src/java.management/share/classes/javax/management : jdk/src/share/classes/javax/management
 jdk/src/java.management/share/classes/mgmt-overview.html : jdk/src/share/classes/com/sun/management/mgmt-overview.html
@@ -1426,6 +1425,7 @@
 jdk/src/jdk.localedata/share/classes/sun/util/resources/uk : jdk/src/share/classes/sun/util/resources/uk
 jdk/src/jdk.localedata/share/classes/sun/util/resources/vi : jdk/src/share/classes/sun/util/resources/vi
 jdk/src/jdk.localedata/share/classes/sun/util/resources/zh : jdk/src/share/classes/sun/util/resources/zh
+jdk/src/jdk.management/share/classes/com/sun/management : jdk/src/share/classes/com/sun/management
 jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns : jdk/src/share/classes/com/sun/jndi/dns
 jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/url/dns : jdk/src/share/classes/com/sun/jndi/url/dns
 jdk/src/jdk.naming.dns/share/classes/META-INF/services : jdk/src/share/classes/sun/net/spi/nameservice/dns/META-INF/services
diff -r 7ca82a207896 -r 936b85480edb make/Images.gmk
--- a/make/Images.gmk	Thu Apr 09 09:14:17 2015 +0200
+++ b/make/Images.gmk	Fri Apr 17 09:36:32 2015 +0200
@@ -66,7 +66,7 @@
 
 # compact3 builds have additional modules
 JDK_COMPACT3_MODULES := java.compact3 java.smartcardio jdk.httpserver jdk.naming.dns \
-                       jdk.naming.rmi jdk.sctp jdk.security.auth
+                       jdk.naming.rmi jdk.sctp jdk.security.auth jdk.management
 
 # Replacing double-comma with a single comma is to workaround the issue
 # with some version of make on windows that doesn't substitute spaces
diff -r 7ca82a207896 -r 936b85480edb modules.xml
--- a/modules.xml	Thu Apr 09 09:14:17 2015 +0200
+++ b/modules.xml	Fri Apr 17 09:36:32 2015 +0200
@@ -785,9 +785,6 @@
     <depend>java.naming</depend>
     <depend re-exports="true">java.rmi</depend>
     <export>
-      <name>com.sun.management</name>
-    </export>
-    <export>
       <name>java.lang.management</name>
     </export>
     <export>
@@ -820,9 +817,11 @@
     <export>
       <name>sun.management</name>
       <to>jdk.jconsole</to>
+      <to>jdk.management</to>
     </export>
     <export>
       <name>sun.management.spi</name>
+      <to>jdk.management</to>
       <to>jdk.management.cmm</to>
     </export>
   </module>
@@ -1668,6 +1667,7 @@
     <depend>java.rmi</depend>
     <depend>jdk.attach</depend>
     <depend>jdk.jvmstat</depend>
+    <depend>jdk.management</depend>
     <export>
       <name>com.sun.tools.jconsole</name>
     </export>
@@ -1720,6 +1720,14 @@
     <depend>java.base</depend>
   </module>
   <module>
+    <name>jdk.management</name>
+    <depend>java.base</depend>
+    <depend re-exports="true">java.management</depend>
+    <export>
+      <name>com.sun.management</name>
+    </export>
+  </module>
+  <module>
     <name>jdk.naming.dns</name>
     <depend>java.base</depend>
     <depend>java.naming</depend>