OpenJDK / jdk / jdk
changeset 29303:7941167cec3f
8074430: Move policytool to jdk.policytool module
Reviewed-by: alanb, weijun, erikj, ihse
| author | mchung |
|---|---|
| date | Fri, 06 Mar 2015 11:00:42 -0800 |
| parents | d128457628fc |
| children | 81a723f8d33c |
| files | common/bin/unshuffle_list.txt make/Images.gmk modules.xml |
| diffstat | 3 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/common/bin/unshuffle_list.txt Fri Mar 06 09:11:22 2015 -0800 +++ b/common/bin/unshuffle_list.txt Fri Mar 06 11:00:42 2015 -0800 @@ -1300,7 +1300,6 @@ jdk/src/jdk.deploy.osx/macosx/native/libosx/JavaAppLauncher.m : jdk/src/macosx/native/apple/launcher/JavaAppLauncher.m jdk/src/jdk.deploy.osx/macosx/native/libosx/KeystoreImpl.m : jdk/src/macosx/native/apple/security/KeystoreImpl.m jdk/src/jdk.dev/share/classes/com/sun/tools/hat : jdk/src/share/classes/com/sun/tools/hat -jdk/src/jdk.dev/share/classes/sun/security/tools/policytool : jdk/src/share/classes/sun/security/tools/policytool jdk/src/jdk.dev/share/classes/sun/tools/native2ascii : jdk/src/share/classes/sun/tools/native2ascii jdk/src/jdk.hprof.agent/share/classes/com/sun/demo/jvmti/hprof : jdk/src/share/classes/com/sun/demo/jvmti/hprof jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver : jdk/src/share/classes/com/sun/net/httpserver @@ -1453,6 +1452,7 @@ jdk/src/jdk.pack200/unix/native/libjsdt/jvm_symbols_md.c : jdk/src/solaris/native/sun/tracing/dtrace/jvm_symbols_md.c jdk/src/jdk.pack200/windows/native/libjsdt/jvm_symbols_md.c : jdk/src/windows/native/sun/tracing/dtrace/jvm_symbols_md.c jdk/src/jdk.pack200/windows/native/unpack200/unpack200_proto.exe.manifest : jdk/src/windows/resource/unpack200_proto.exe.manifest +jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool : jdk/src/share/classes/sun/security/tools/policytool jdk/src/jdk.rmic/share/classes/sun/rmi/rmic : jdk/src/share/classes/sun/rmi/rmic jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic : jdk/src/share/classes/sun/rmi/rmic/newrmic jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp : jdk/src/share/classes/sun/rmi/rmic/newrmic/jrmp
--- a/make/Images.gmk Fri Mar 06 09:11:22 2015 -0800 +++ b/make/Images.gmk Fri Mar 06 11:00:42 2015 -0800 @@ -47,7 +47,7 @@ # tools TOOLS_MODULES += jdk.attach jdk.compiler jdk.dev jdk.javadoc jdk.jcmd jdk.jconsole \ jdk.hotspot.agent jdk.hprof.agent jdk.jartool jdk.jdi jdk.jdwp.agent \ - jdk.rmic jdk.xml.bind jdk.xml.ws + jdk.policytool jdk.rmic jdk.xml.bind jdk.xml.ws ifeq ($(OPENJDK_TARGET_OS), windows) PROVIDER_MODULES += jdk.crypto.mscapi
--- a/modules.xml Fri Mar 06 09:11:22 2015 -0800 +++ b/modules.xml Fri Mar 06 11:00:42 2015 -0800 @@ -360,8 +360,8 @@ <to>java.rmi</to> <to>java.security.jgss</to> <to>jdk.crypto.pkcs11</to> - <to>jdk.dev</to> <to>jdk.jartool</to> + <to>jdk.policytool</to> <to>jdk.security.auth</to> </export> <export> @@ -393,8 +393,8 @@ <to>jdk.crypto.pkcs11</to> <to>jdk.crypto.ucrypto</to> <to>jdk.deploy.osx</to> - <to>jdk.dev</to> <to>jdk.jartool</to> + <to>jdk.policytool</to> <to>jdk.security.auth</to> </export> <export> @@ -1725,6 +1725,11 @@ <depend>java.base</depend> </module> <module> + <name>jdk.policytool</name> + <depend>java.base</depend> + <depend>java.desktop</depend> + </module> + <module> <name>jdk.rmic</name> <depend>java.base</depend> <depend>java.corba</depend>