Mercurial > hg > jdk9-shenandoah
changeset 1313:d1f37d39ff24 jdk9-b50
Merge
author | lana |
---|---|
date | Thu, 05 Feb 2015 15:41:43 -0800 |
parents | cd980bcebb6c (current diff) 197265d15c34 (diff) |
children | 942895213b68 32470a815f99 |
files | |
diffstat | 2 files changed, 5 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/common/bin/unshuffle_list.txt Thu Feb 05 11:43:28 2015 -0800 +++ b/common/bin/unshuffle_list.txt Thu Feb 05 15:41:43 2015 -0800 @@ -123,6 +123,7 @@ jdk/src/java.base/share/classes/java/math : jdk/src/share/classes/java/math jdk/src/java.base/share/classes/java/net : jdk/src/share/classes/java/net jdk/src/java.base/share/classes/java/nio : jdk/src/share/classes/java/nio +jdk/src/java.base/share/classes/java/security/acl : jdk/src/share/classes/java/security/acl jdk/src/java.base/share/classes/java/security/cert : jdk/src/share/classes/java/security/cert jdk/src/java.base/share/classes/java/security/interfaces : jdk/src/share/classes/java/security/interfaces jdk/src/java.base/share/classes/java/security : jdk/src/share/classes/java/security @@ -179,6 +180,7 @@ jdk/src/java.base/share/classes/sun/nio/cs : jdk/src/share/classes/sun/nio/cs jdk/src/java.base/share/classes/sun/nio/fs : jdk/src/share/classes/sun/nio/fs jdk/src/java.base/share/classes/sun/reflect : jdk/src/share/classes/sun/reflect +jdk/src/java.base/share/classes/sun/security/acl : jdk/src/share/classes/sun/security/acl jdk/src/java.base/share/classes/sun/security/action : jdk/src/share/classes/sun/security/action jdk/src/java.base/share/classes/sun/security/internal : jdk/src/share/classes/sun/security/internal jdk/src/java.base/share/classes/sun/security/jca : jdk/src/share/classes/sun/security/jca @@ -1211,8 +1213,6 @@ jdk/src/java.rmi/unix/bin/java-rmi.cgi.sh : jdk/src/solaris/bin/java-rmi.cgi.sh jdk/src/java.scripting/share/classes/javax/script : jdk/src/share/classes/javax/script jdk/src/java.scripting/share/classes/com/sun/tools/script/shell : jdk/src/share/classes/com/sun/tools/script/shell -jdk/src/java.security.acl/share/classes/java/security/acl : jdk/src/share/classes/java/security/acl -jdk/src/java.security.acl/share/classes/sun/security/acl : jdk/src/share/classes/sun/security/acl jdk/src/java.security.jgss/macosx/native/libosxkrb5/nativeccache.c : jdk/src/share/native/sun/security/krb5/nativeccache.c jdk/src/java.security.jgss/macosx/native/libosxkrb5/SCDynamicStoreConfig.m : jdk/src/macosx/native/sun/security/krb5/SCDynamicStoreConfig.m jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos : jdk/src/share/classes/javax/security/auth/kerberos
--- a/modules.xml Thu Feb 05 11:43:28 2015 -0800 +++ b/modules.xml Thu Feb 05 15:41:43 2015 -0800 @@ -108,6 +108,9 @@ <name>java.security</name> </export> <export> + <name>java.security.acl</name> + </export> + <export> <name>java.security.cert</name> </export> <export> @@ -446,7 +449,6 @@ <depend re-exports="true">java.management</depend> <depend re-exports="true">java.naming</depend> <depend re-exports="true">java.prefs</depend> - <depend re-exports="true">java.security.acl</depend> <depend re-exports="true">java.security.jgss</depend> <depend re-exports="true">java.security.sasl</depend> <depend re-exports="true">java.sql.rowset</depend> @@ -891,13 +893,6 @@ <depend re-exports="true">java.xml.ws</depend> </module> <module> - <name>java.security.acl</name> - <depend>java.base</depend> - <export> - <name>java.security.acl</name> - </export> - </module> - <module> <name>java.security.jgss</name> <depend>java.base</depend> <depend>java.naming</depend>