Mercurial > hg > jdk9-shenandoah
changeset 1328:afb1acbdd115
8056298: Separate java.awt.datatransfer from the desktop module
Reviewed-by: erikj, alanb, mchung, alexsch
author | serb |
---|---|
date | Fri, 16 Jan 2015 18:45:26 +0300 |
parents | 6ebc4cb8a14d |
children | a521d2e3f763 |
files | make/CompileJavaModules.gmk modules.xml |
diffstat | 2 files changed, 25 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/make/CompileJavaModules.gmk Fri Jan 16 16:02:09 2015 +0100 +++ b/make/CompileJavaModules.gmk Fri Jan 16 18:45:26 2015 +0300 @@ -89,7 +89,11 @@ ################################################################################ -java.desktop_COPY := .gif .png .wav .txt .xml .css flavormap.properties .pf +java.datatransfer_COPY := flavormap.properties + +################################################################################ + +java.desktop_COPY := .gif .png .wav .txt .xml .css .pf java.desktop_CLEAN := iio-plugin.properties java.desktop_EXCLUDES += \
--- a/modules.xml Fri Jan 16 16:02:09 2015 +0100 +++ b/modules.xml Fri Jan 16 18:45:26 2015 +0300 @@ -41,7 +41,8 @@ <module> <name>java.activation</name> <depend>java.base</depend> - <depend re-exports="true">java.desktop</depend> + <depend re-exports="true">java.datatransfer</depend> + <depend>java.desktop</depend> <depend>java.logging</depend> <export> <name>javax.activation</name> @@ -312,6 +313,7 @@ <export> <name>sun.reflect.misc</name> <to>java.corba</to> + <to>java.datatransfer</to> <to>java.desktop</to> <to>java.management</to> <to>java.rmi</to> @@ -582,11 +584,23 @@ </export> </module> <module> + <name>java.datatransfer</name> + <depend>java.base</depend> + <export> + <name>java.awt.datatransfer</name> + </export> + <export> + <name>sun.datatransfer</name> + <to>java.desktop</to> + </export> + </module> + <module> <name>java.desktop</name> <depend>java.base</depend> <depend>java.logging</depend> <depend>java.prefs</depend> <depend re-exports="true">java.xml</depend> + <depend re-exports="true">java.datatransfer</depend> <depend>jdk.charsets</depend> <export> <name>java.applet</name> @@ -598,9 +612,6 @@ <name>java.awt.color</name> </export> <export> - <name>java.awt.datatransfer</name> - </export> - <export> <name>java.awt.dnd</name> </export> <export> @@ -885,6 +896,7 @@ <depend re-exports="true">java.activation</depend> <depend re-exports="true">java.compact3</depend> <depend re-exports="true">java.corba</depend> + <depend re-exports="true">java.datatransfer</depend> <depend re-exports="true">java.desktop</depend> <depend re-exports="true">java.transaction</depend> <depend re-exports="true">java.xml.bind</depend> @@ -1118,6 +1130,7 @@ <depend re-exports="true">java.activation</depend> <depend>java.base</depend> <depend>java.compiler</depend> + <depend>java.datatransfer</depend> <depend>java.desktop</depend> <depend>java.logging</depend> <depend re-exports="true">java.xml</depend> @@ -1325,6 +1338,7 @@ <name>java.xml.ws</name> <depend>java.annotations.common</depend> <depend>java.base</depend> + <depend>java.datatransfer</depend> <depend>java.desktop</depend> <depend>java.logging</depend> <depend>java.management</depend> @@ -1592,6 +1606,7 @@ <module> <name>jdk.hotspot.agent</name> <depend>java.base</depend> + <depend>java.datatransfer</depend> <depend>java.desktop</depend> <depend>java.rmi</depend> <depend>java.scripting</depend> @@ -1764,6 +1779,7 @@ <depend>java.activation</depend> <depend>java.base</depend> <depend>java.compiler</depend> + <depend>java.datatransfer</depend> <depend>java.desktop</depend> <depend>java.logging</depend> <depend>java.xml</depend>