8074429: Move jar, jarsigner tool to jdk.jartool module
Reviewed-by: alanb, weijun, erikj, ihse
This commit is contained in:
parent
392dc6864e
commit
04e7f3d871
@ -1299,15 +1299,15 @@ jdk/src/jdk.deploy.osx/macosx/native/libosx/CFileManager.m : jdk/src/macosx/nati
|
||||
jdk/src/jdk.deploy.osx/macosx/native/libosx/Dispatch.m : jdk/src/macosx/native/com/apple/concurrent/Dispatch.m
|
||||
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/jarsigner : jdk/src/share/classes/com/sun/jarsigner
|
||||
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/jarsigner : jdk/src/share/classes/sun/security/tools/jarsigner
|
||||
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/jar : jdk/src/share/classes/sun/tools/jar
|
||||
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
|
||||
jdk/src/jdk.httpserver/share/classes/sun/net/httpserver : jdk/src/share/classes/sun/net/httpserver
|
||||
jdk/src/jdk.jartool/share/classes/com/sun/jarsigner : jdk/src/share/classes/com/sun/jarsigner
|
||||
jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner : jdk/src/share/classes/sun/security/tools/jarsigner
|
||||
jdk/src/jdk.jartool/share/classes/sun/tools/jar : jdk/src/share/classes/sun/tools/jar
|
||||
jdk/src/jdk.jcmd/share/classes/sun/tools/jcmd : jdk/src/share/classes/sun/tools/jcmd
|
||||
jdk/src/jdk.jcmd/share/classes/sun/tools/jinfo : jdk/src/share/classes/sun/tools/jinfo
|
||||
jdk/src/jdk.jcmd/share/classes/sun/tools/jmap : jdk/src/share/classes/sun/tools/jmap
|
||||
|
@ -46,8 +46,8 @@ PROVIDER_MODULES += jdk.charsets jdk.crypto.ec jdk.crypto.pkcs11 jdk.jvmstat jdk
|
||||
|
||||
# tools
|
||||
TOOLS_MODULES += jdk.attach jdk.compiler jdk.dev jdk.javadoc jdk.jcmd jdk.jconsole \
|
||||
jdk.hotspot.agent jdk.hprof.agent jdk.jdi jdk.jdwp.agent jdk.rmic \
|
||||
jdk.xml.bind jdk.xml.ws
|
||||
jdk.hotspot.agent jdk.hprof.agent jdk.jartool jdk.jdi jdk.jdwp.agent \
|
||||
jdk.rmic jdk.xml.bind jdk.xml.ws
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS), windows)
|
||||
PROVIDER_MODULES += jdk.crypto.mscapi
|
||||
|
27
modules.xml
27
modules.xml
@ -254,7 +254,7 @@
|
||||
<to>java.sql</to>
|
||||
<to>jdk.charsets</to>
|
||||
<to>jdk.deploy.osx</to>
|
||||
<to>jdk.dev</to>
|
||||
<to>jdk.jartool</to>
|
||||
<to>jdk.jconsole</to>
|
||||
<to>jdk.jvmstat</to>
|
||||
<to>jdk.pack200</to>
|
||||
@ -279,7 +279,7 @@
|
||||
<name>sun.net.www</name>
|
||||
<to>java.desktop</to>
|
||||
<to>jdk.compiler</to>
|
||||
<to>jdk.dev</to>
|
||||
<to>jdk.jartool</to>
|
||||
</export>
|
||||
<export>
|
||||
<name>sun.net.www.protocol.http</name>
|
||||
@ -353,7 +353,7 @@
|
||||
<name>sun.security.pkcs</name>
|
||||
<to>jdk.crypto.ec</to>
|
||||
<to>jdk.deploy.osx</to>
|
||||
<to>jdk.dev</to>
|
||||
<to>jdk.jartool</to>
|
||||
</export>
|
||||
<export>
|
||||
<name>sun.security.provider</name>
|
||||
@ -361,6 +361,7 @@
|
||||
<to>java.security.jgss</to>
|
||||
<to>jdk.crypto.pkcs11</to>
|
||||
<to>jdk.dev</to>
|
||||
<to>jdk.jartool</to>
|
||||
<to>jdk.security.auth</to>
|
||||
</export>
|
||||
<export>
|
||||
@ -378,7 +379,7 @@
|
||||
</export>
|
||||
<export>
|
||||
<name>sun.security.tools</name>
|
||||
<to>jdk.dev</to>
|
||||
<to>jdk.jartool</to>
|
||||
</export>
|
||||
<export>
|
||||
<name>sun.security.util</name>
|
||||
@ -393,6 +394,7 @@
|
||||
<to>jdk.crypto.ucrypto</to>
|
||||
<to>jdk.deploy.osx</to>
|
||||
<to>jdk.dev</to>
|
||||
<to>jdk.jartool</to>
|
||||
<to>jdk.security.auth</to>
|
||||
</export>
|
||||
<export>
|
||||
@ -401,7 +403,7 @@
|
||||
<to>jdk.crypto.ec</to>
|
||||
<to>jdk.crypto.pkcs11</to>
|
||||
<to>jdk.deploy.osx</to>
|
||||
<to>jdk.dev</to>
|
||||
<to>jdk.jartool</to>
|
||||
<to>jdk.security.auth</to>
|
||||
</export>
|
||||
<export>
|
||||
@ -1591,16 +1593,8 @@
|
||||
<module>
|
||||
<name>jdk.dev</name>
|
||||
<depend>java.base</depend>
|
||||
<depend>java.scripting</depend>
|
||||
<depend>java.xml</depend>
|
||||
<depend>java.desktop</depend>
|
||||
<depend>jdk.compiler</depend>
|
||||
<depend>jdk.rmic</depend>
|
||||
<depend>jdk.xml.bind</depend>
|
||||
<depend>jdk.xml.ws</depend>
|
||||
<export>
|
||||
<name>com.sun.jarsigner</name>
|
||||
</export>
|
||||
</module>
|
||||
<module>
|
||||
<name>jdk.hotspot.agent</name>
|
||||
@ -1626,6 +1620,13 @@
|
||||
<name>com.sun.net.httpserver.spi</name>
|
||||
</export>
|
||||
</module>
|
||||
<module>
|
||||
<name>jdk.jartool</name>
|
||||
<depend>java.base</depend>
|
||||
<export>
|
||||
<name>com.sun.jarsigner</name>
|
||||
</export>
|
||||
</module>
|
||||
<module>
|
||||
<name>jdk.javadoc</name>
|
||||
<depend>java.base</depend>
|
||||
|
Loading…
x
Reference in New Issue
Block a user