--- a/common/bin/unshuffle_list.txt Fri Jan 20 18:26:43 2017 +0000
+++ b/common/bin/unshuffle_list.txt Wed Jul 05 22:43:41 2017 +0200
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2017, 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
@@ -1266,33 +1266,33 @@
jdk/src/jdk.crypto.ec/share/native/libsunec/impl : jdk/src/share/native/sun/security/ec/impl
jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi : jdk/src/windows/classes/sun/security/mscapi
jdk/src/jdk.crypto.mscapi/windows/native/libsunmscapi : jdk/src/windows/native/sun/security/mscapi
-jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11 : jdk/src/share/classes/sun/security/pkcs11
-jdk/src/jdk.crypto.token/share/native/libj2pkcs11/j2secmod.c : jdk/src/share/native/sun/security/pkcs11/j2secmod.c
-jdk/src/jdk.crypto.token/share/native/libj2pkcs11/j2secmod.h : jdk/src/share/native/sun/security/pkcs11/j2secmod.h
-jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_convert.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c
-jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_crypt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_crypt.c
-jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_digest.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_digest.c
-jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_dual.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_dual.c
-jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_general.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_general.c
-jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_keymgmt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c
-jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_mutex.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_mutex.c
-jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_objmgmt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_objmgmt.c
-jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_sessmgmt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sessmgmt.c
-jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_sign.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sign.c
-jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_util.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_util.c
-jdk/src/jdk.crypto.token/share/native/libj2pkcs11/pkcs11f.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11f.h
-jdk/src/jdk.crypto.token/share/native/libj2pkcs11/pkcs11.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11.h
-jdk/src/jdk.crypto.token/share/native/libj2pkcs11/pkcs11t.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11t.h
-jdk/src/jdk.crypto.token/share/native/libj2pkcs11/pkcs-11v2-20a3.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs-11v2-20a3.h
-jdk/src/jdk.crypto.token/share/native/libj2pkcs11/pkcs11wrapper.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h
-jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/j2secmod_md.c : jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c
-jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/j2secmod_md.h : jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.h
-jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/p11_md.c : jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c
-jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/p11_md.h : jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.h
-jdk/src/jdk.crypto.token/windows/native/libj2pkcs11/j2secmod_md.c : jdk/src/windows/native/sun/security/pkcs11/j2secmod_md.c
-jdk/src/jdk.crypto.token/windows/native/libj2pkcs11/j2secmod_md.h : jdk/src/windows/native/sun/security/pkcs11/j2secmod_md.h
-jdk/src/jdk.crypto.token/windows/native/libj2pkcs11/p11_md.c : jdk/src/windows/native/sun/security/pkcs11/wrapper/p11_md.c
-jdk/src/jdk.crypto.token/windows/native/libj2pkcs11/p11_md.h : jdk/src/windows/native/sun/security/pkcs11/wrapper/p11_md.h
+jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11 : jdk/src/share/classes/sun/security/pkcs11
+jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/j2secmod.c : jdk/src/share/native/sun/security/pkcs11/j2secmod.c
+jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/j2secmod.h : jdk/src/share/native/sun/security/pkcs11/j2secmod.h
+jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_convert.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c
+jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_crypt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_crypt.c
+jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_digest.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_digest.c
+jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_dual.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_dual.c
+jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_general.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_general.c
+jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_keymgmt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c
+jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_mutex.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_mutex.c
+jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_objmgmt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_objmgmt.c
+jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_sessmgmt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sessmgmt.c
+jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_sign.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sign.c
+jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_util.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_util.c
+jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/pkcs11f.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11f.h
+jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/pkcs11.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11.h
+jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/pkcs11t.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11t.h
+jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/pkcs-11v2-20a3.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs-11v2-20a3.h
+jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/pkcs11wrapper.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h
+jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/j2secmod_md.c : jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c
+jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/j2secmod_md.h : jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.h
+jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/p11_md.c : jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c
+jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/p11_md.h : jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.h
+jdk/src/jdk.crypto.cryptoki/windows/native/libj2pkcs11/j2secmod_md.c : jdk/src/windows/native/sun/security/pkcs11/j2secmod_md.c
+jdk/src/jdk.crypto.cryptoki/windows/native/libj2pkcs11/j2secmod_md.h : jdk/src/windows/native/sun/security/pkcs11/j2secmod_md.h
+jdk/src/jdk.crypto.cryptoki/windows/native/libj2pkcs11/p11_md.c : jdk/src/windows/native/sun/security/pkcs11/wrapper/p11_md.c
+jdk/src/jdk.crypto.cryptoki/windows/native/libj2pkcs11/p11_md.h : jdk/src/windows/native/sun/security/pkcs11/wrapper/p11_md.h
jdk/src/java.desktop/macosx/native/libosx/CFileManager.m : jdk/src/macosx/native/com/apple/eio/CFileManager.m
jdk/src/java.base/macosx/native/libosxsecurity/KeystoreImpl.m : jdk/src/macosx/native/apple/security/KeystoreImpl.m
jdk/src/jdk.hprof.agent/share/classes/com/sun/demo/jvmti/hprof : jdk/src/share/classes/com/sun/demo/jvmti/hprof
--- a/common/nb_native/nbproject/configurations.xml Fri Jan 20 18:26:43 2017 +0000
+++ b/common/nb_native/nbproject/configurations.xml Wed Jul 05 22:43:41 2017 +0200
@@ -2166,7 +2166,7 @@
</df>
</df>
</df>
- <df name="jdk.crypto.token">
+ <df name="jdk.crypto.cryptoki">
<df name="share">
<df name="native">
<df name="libj2pkcs11">
@@ -29422,35 +29422,35 @@
<cTool flags="5">
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/j2secmod.c"
- ex="false"
- tool="0"
- flavor2="3">
- <cTool flags="5">
- </cTool>
- </item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_convert.c"
- ex="false"
- tool="0"
- flavor2="3">
- <cTool flags="5">
- </cTool>
- </item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_crypt.c"
- ex="false"
- tool="0"
- flavor2="3">
- <cTool flags="5">
- </cTool>
- </item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_digest.c"
- ex="false"
- tool="0"
- flavor2="3">
- <cTool flags="5">
- </cTool>
- </item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_dual.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/j2secmod.c"
+ ex="false"
+ tool="0"
+ flavor2="3">
+ <cTool flags="5">
+ </cTool>
+ </item>
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_convert.c"
+ ex="false"
+ tool="0"
+ flavor2="3">
+ <cTool flags="5">
+ </cTool>
+ </item>
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_crypt.c"
+ ex="false"
+ tool="0"
+ flavor2="3">
+ <cTool flags="5">
+ </cTool>
+ </item>
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_digest.c"
+ ex="false"
+ tool="0"
+ flavor2="3">
+ <cTool flags="5">
+ </cTool>
+ </item>
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_dual.c"
ex="false"
tool="0"
flavor2="2">
@@ -29460,63 +29460,63 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_general.c"
- ex="false"
- tool="0"
- flavor2="3">
- <cTool flags="5">
- </cTool>
- </item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_keymgmt.c"
- ex="false"
- tool="0"
- flavor2="3">
- <cTool flags="5">
- </cTool>
- </item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_mutex.c"
- ex="false"
- tool="0"
- flavor2="3">
- <cTool flags="5">
- </cTool>
- </item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_objmgmt.c"
- ex="false"
- tool="0"
- flavor2="3">
- <cTool flags="5">
- </cTool>
- </item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_sessmgmt.c"
- ex="false"
- tool="0"
- flavor2="3">
- <cTool flags="5">
- </cTool>
- </item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_sign.c"
- ex="false"
- tool="0"
- flavor2="3">
- <cTool flags="5">
- </cTool>
- </item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_util.c"
- ex="false"
- tool="0"
- flavor2="3">
- <cTool flags="5">
- </cTool>
- </item>
- <item path="../../jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/j2secmod_md.c"
- ex="false"
- tool="0"
- flavor2="3">
- <cTool flags="5">
- </cTool>
- </item>
- <item path="../../jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/p11_md.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_general.c"
+ ex="false"
+ tool="0"
+ flavor2="3">
+ <cTool flags="5">
+ </cTool>
+ </item>
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_keymgmt.c"
+ ex="false"
+ tool="0"
+ flavor2="3">
+ <cTool flags="5">
+ </cTool>
+ </item>
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_mutex.c"
+ ex="false"
+ tool="0"
+ flavor2="3">
+ <cTool flags="5">
+ </cTool>
+ </item>
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_objmgmt.c"
+ ex="false"
+ tool="0"
+ flavor2="3">
+ <cTool flags="5">
+ </cTool>
+ </item>
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_sessmgmt.c"
+ ex="false"
+ tool="0"
+ flavor2="3">
+ <cTool flags="5">
+ </cTool>
+ </item>
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_sign.c"
+ ex="false"
+ tool="0"
+ flavor2="3">
+ <cTool flags="5">
+ </cTool>
+ </item>
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_util.c"
+ ex="false"
+ tool="0"
+ flavor2="3">
+ <cTool flags="5">
+ </cTool>
+ </item>
+ <item path="../../jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/j2secmod_md.c"
+ ex="false"
+ tool="0"
+ flavor2="3">
+ <cTool flags="5">
+ </cTool>
+ </item>
+ <item path="../../jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/p11_md.c"
ex="false"
tool="0"
flavor2="3">
@@ -31752,18 +31752,18 @@
</preprocessorList>
</ccTool>
</folder>
- <folder path="0/jdk/src/jdk.crypto.token">
- <cTool>
- <incDir>
- <pElem>../../jdk/src/java.base/share/native/include</pElem>
- <pElem>../../jdk/src/java.base/macosx/native/include</pElem>
- <pElem>../../jdk/src/java.base/unix/native/include</pElem>
- <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
- <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
- <pElem>../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11</pElem>
- <pElem>../../jdk/src/jdk.crypto.token/unix/native/libj2pkcs11</pElem>
- <pElem>../../jdk/src/java.base/macosx/native/libjava</pElem>
- <pElem>../../build/support/headers/jdk.crypto.token</pElem>
+ <folder path="0/jdk/src/jdk.crypto.cryptoki">
+ <cTool>
+ <incDir>
+ <pElem>../../jdk/src/java.base/share/native/include</pElem>
+ <pElem>../../jdk/src/java.base/macosx/native/include</pElem>
+ <pElem>../../jdk/src/java.base/unix/native/include</pElem>
+ <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
+ <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
+ <pElem>../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11</pElem>
+ <pElem>../../jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11</pElem>
+ <pElem>../../jdk/src/java.base/macosx/native/libjava</pElem>
+ <pElem>../../build/support/headers/jdk.crypto.cryptoki</pElem>
<pElem>../../make</pElem>
</incDir>
<preprocessorList>
@@ -31772,7 +31772,7 @@
</preprocessorList>
</cTool>
</folder>
- <folder path="0/jdk/src/jdk.crypto.token/unix">
+ <folder path="0/jdk/src/jdk.crypto.cryptoki/unix">
<cTool>
<preprocessorList>
<Elem>THIS_FILE="j2secmod_md.c"</Elem>
@@ -44741,14 +44741,14 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/j2secmod.c"
- ex="false"
- tool="0"
- flavor2="0">
- <cTool flags="4">
- </cTool>
- </item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_convert.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/j2secmod.c"
+ ex="false"
+ tool="0"
+ flavor2="0">
+ <cTool flags="4">
+ </cTool>
+ </item>
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_convert.c"
ex="false"
tool="0"
flavor2="0">
@@ -44758,7 +44758,7 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_crypt.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_crypt.c"
ex="false"
tool="0"
flavor2="0">
@@ -44768,7 +44768,7 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_digest.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_digest.c"
ex="false"
tool="0"
flavor2="0">
@@ -44778,7 +44778,7 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_dual.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_dual.c"
ex="false"
tool="0"
flavor2="0">
@@ -44788,7 +44788,7 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_general.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_general.c"
ex="false"
tool="0"
flavor2="0">
@@ -44798,7 +44798,7 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_keymgmt.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_keymgmt.c"
ex="false"
tool="0"
flavor2="0">
@@ -44808,7 +44808,7 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_mutex.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_mutex.c"
ex="false"
tool="0"
flavor2="0">
@@ -44818,7 +44818,7 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_objmgmt.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_objmgmt.c"
ex="false"
tool="0"
flavor2="0">
@@ -44828,7 +44828,7 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_sessmgmt.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_sessmgmt.c"
ex="false"
tool="0"
flavor2="0">
@@ -44838,7 +44838,7 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_sign.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_sign.c"
ex="false"
tool="0"
flavor2="0">
@@ -44848,7 +44848,7 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_util.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_util.c"
ex="false"
tool="0"
flavor2="0">
@@ -44858,14 +44858,14 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/j2secmod_md.c"
- ex="false"
- tool="0"
- flavor2="0">
- <cTool flags="4">
- </cTool>
- </item>
- <item path="../../jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/p11_md.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/j2secmod_md.c"
+ ex="false"
+ tool="0"
+ flavor2="0">
+ <cTool flags="4">
+ </cTool>
+ </item>
+ <item path="../../jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/p11_md.c"
ex="false"
tool="0"
flavor2="0">
@@ -47795,18 +47795,18 @@
</preprocessorList>
</ccTool>
</folder>
- <folder path="0/jdk/src/jdk.crypto.token">
- <cTool>
- <incDir>
- <pElem>../../jdk/src/java.base/share/native/include</pElem>
- <pElem>../../jdk/src/java.base/linux/native/include</pElem>
- <pElem>../../jdk/src/java.base/unix/native/include</pElem>
- <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
- <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
- <pElem>../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11</pElem>
- <pElem>../../jdk/src/jdk.crypto.token/unix/native/libj2pkcs11</pElem>
- <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
- <pElem>../../build/support/headers/jdk.crypto.token</pElem>
+ <folder path="0/jdk/src/jdk.crypto.cryptoki">
+ <cTool>
+ <incDir>
+ <pElem>../../jdk/src/java.base/share/native/include</pElem>
+ <pElem>../../jdk/src/java.base/linux/native/include</pElem>
+ <pElem>../../jdk/src/java.base/unix/native/include</pElem>
+ <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
+ <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
+ <pElem>../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11</pElem>
+ <pElem>../../jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11</pElem>
+ <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
+ <pElem>../../build/support/headers/jdk.crypto.cryptoki</pElem>
<pElem>../../make</pElem>
</incDir>
<preprocessorList>
@@ -47815,7 +47815,7 @@
</preprocessorList>
</cTool>
</folder>
- <folder path="0/jdk/src/jdk.crypto.token/unix">
+ <folder path="0/jdk/src/jdk.crypto.cryptoki/unix">
<cTool>
<preprocessorList>
<Elem>THIS_FILE="j2secmod_md.c"</Elem>
@@ -62728,14 +62728,14 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/j2secmod.c"
- ex="false"
- tool="0"
- flavor2="0">
- <cTool flags="2">
- </cTool>
- </item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_convert.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/j2secmod.c"
+ ex="false"
+ tool="0"
+ flavor2="0">
+ <cTool flags="2">
+ </cTool>
+ </item>
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_convert.c"
ex="false"
tool="0"
flavor2="0">
@@ -62745,7 +62745,7 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_crypt.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_crypt.c"
ex="false"
tool="0"
flavor2="0">
@@ -62755,7 +62755,7 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_digest.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_digest.c"
ex="false"
tool="0"
flavor2="0">
@@ -62765,7 +62765,7 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_dual.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_dual.c"
ex="false"
tool="0"
flavor2="0">
@@ -62775,7 +62775,7 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_general.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_general.c"
ex="false"
tool="0"
flavor2="0">
@@ -62785,7 +62785,7 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_keymgmt.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_keymgmt.c"
ex="false"
tool="0"
flavor2="0">
@@ -62795,7 +62795,7 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_mutex.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_mutex.c"
ex="false"
tool="0"
flavor2="0">
@@ -62805,7 +62805,7 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_objmgmt.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_objmgmt.c"
ex="false"
tool="0"
flavor2="0">
@@ -62815,7 +62815,7 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_sessmgmt.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_sessmgmt.c"
ex="false"
tool="0"
flavor2="0">
@@ -62825,7 +62825,7 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_sign.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_sign.c"
ex="false"
tool="0"
flavor2="0">
@@ -62835,7 +62835,7 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_util.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_util.c"
ex="false"
tool="0"
flavor2="0">
@@ -62845,14 +62845,14 @@
</preprocessorList>
</cTool>
</item>
- <item path="../../jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/j2secmod_md.c"
- ex="false"
- tool="0"
- flavor2="0">
- <cTool flags="2">
- </cTool>
- </item>
- <item path="../../jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/p11_md.c"
+ <item path="../../jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/j2secmod_md.c"
+ ex="false"
+ tool="0"
+ flavor2="0">
+ <cTool flags="2">
+ </cTool>
+ </item>
+ <item path="../../jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/p11_md.c"
ex="false"
tool="0"
flavor2="0">
@@ -66281,18 +66281,18 @@
</preprocessorList>
</ccTool>
</folder>
- <folder path="0/jdk/src/jdk.crypto.token">
- <cTool>
- <incDir>
- <pElem>../../jdk/src/java.base/share/native/include</pElem>
- <pElem>../../jdk/src/java.base/solaris/native/include</pElem>
- <pElem>../../jdk/src/java.base/unix/native/include</pElem>
- <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
- <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
- <pElem>../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11</pElem>
- <pElem>../../jdk/src/jdk.crypto.token/unix/native/libj2pkcs11</pElem>
- <pElem>../../jdk/src/java.base/solaris/native/libjava</pElem>
- <pElem>../../build/support/headers/jdk.crypto.token</pElem>
+ <folder path="0/jdk/src/jdk.crypto.cryptoki">
+ <cTool>
+ <incDir>
+ <pElem>../../jdk/src/java.base/share/native/include</pElem>
+ <pElem>../../jdk/src/java.base/solaris/native/include</pElem>
+ <pElem>../../jdk/src/java.base/unix/native/include</pElem>
+ <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
+ <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
+ <pElem>../../jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11</pElem>
+ <pElem>../../jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11</pElem>
+ <pElem>../../jdk/src/java.base/solaris/native/libjava</pElem>
+ <pElem>../../build/support/headers/jdk.crypto.cryptoki</pElem>
<pElem>../../make</pElem>
</incDir>
<preprocessorList>
@@ -66301,7 +66301,7 @@
</preprocessorList>
</cTool>
</folder>
- <folder path="0/jdk/src/jdk.crypto.token/unix">
+ <folder path="0/jdk/src/jdk.crypto.cryptoki/unix">
<cTool>
<preprocessorList>
<Elem>THIS_FILE="j2secmod_md.c"</Elem>
--- a/make/Images.gmk Fri Jan 20 18:26:43 2017 +0000
+++ b/make/Images.gmk Wed Jul 05 22:43:41 2017 +0200
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2017, 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
@@ -52,7 +52,7 @@
java.logging \
java.scripting \
jdk.localedata \
- jdk.crypto.token \
+ jdk.crypto.cryptoki \
jdk.crypto.ec \
jdk.unsupported \
#
--- a/make/InitSupport.gmk Fri Jan 20 18:26:43 2017 +0000
+++ b/make/InitSupport.gmk Wed Jul 05 22:43:41 2017 +0200
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, 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
@@ -460,27 +460,28 @@
endef
define PrintFailureReports
- $(if $(wildcard $(MAKESUPPORT_OUTPUTDIR)/failure-logs/*), \
- $(PRINTF) "=== Output from failing command(s) repeated here ===\n" $(NEWLINE) \
- $(foreach logfile, $(sort $(wildcard $(MAKESUPPORT_OUTPUTDIR)/failure-logs/*)), \
+ $(if $(wildcard $(MAKESUPPORT_OUTPUTDIR)/failure-logs/*.log), \
+ $(PRINTF) "\n=== Output from failing command(s) repeated here ===\n" $(NEWLINE) \
+ $(foreach logfile, $(sort $(wildcard $(MAKESUPPORT_OUTPUTDIR)/failure-logs/*.log)), \
$(PRINTF) "* For target $(notdir $(basename $(logfile))):\n" $(NEWLINE) \
($(GREP) -v -e "^Note: including file:" < $(logfile) || true) | $(HEAD) -n 12 $(NEWLINE) \
if test `$(WC) -l < $(logfile)` -gt 12; then \
$(ECHO) " ... (rest of output omitted)" ; \
fi $(NEWLINE) \
) \
+ $(PRINTF) "\n* All command lines available in $(MAKESUPPORT_OUTPUTDIR)/failure-logs.\n" $(NEWLINE) \
$(PRINTF) "=== End of repeated output ===\n" \
)
endef
define PrintBuildLogFailures
if $(GREP) -q "recipe for target .* failed" $(BUILD_LOG) 2> /dev/null; then \
- $(PRINTF) "=== Make failure sequence repeated here ===\n" ; \
+ $(PRINTF) "\n=== Make failed targets repeated here ===\n" ; \
$(GREP) "recipe for target .* failed" $(BUILD_LOG) ; \
$(PRINTF) "=== End of repeated output ===\n" ; \
- $(PRINTF) "Hint: Try searching the build log for the name of the first failed target.\n" ; \
+ $(PRINTF) "\nHint: Try searching the build log for the name of the first failed target.\n" ; \
else \
- $(PRINTF) "No indication of failed target found.\n" ; \
+ $(PRINTF) "\nNo indication of failed target found.\n" ; \
$(PRINTF) "Hint: Try searching the build log for '] Error'.\n" ; \
fi
endef
--- a/make/Javadoc.gmk Fri Jan 20 18:26:43 2017 +0000
+++ b/make/Javadoc.gmk Wed Jul 05 22:43:41 2017 +0200
@@ -683,22 +683,6 @@
TARGETS += $(jdknet)
################################################################################
-
-# TODO: Need to decide when the plugin API is ready to publish as experimental API.
-# This target is temporarily added for internal use for now.
-$(eval $(call SetupJavadocGeneration, jlinkplugins, \
- MODULES := jdk.jlink, \
- PACKAGES := jdk.tools.jlink.plugin, \
- API_ROOT := jdk, \
- DEST_DIR := jlink, \
- TITLE := JLink Plugin API - EXPERIMENTAL, \
- FIRST_COPYRIGHT_YEAR := 2015, \
- DISABLED_DOCLINT := html missing syntax, \
-))
-
-TARGETS += $(jlinkplugins)
-
-################################################################################
# Copy JDWP html file
JDWP_HTML := $(SUPPORT_OUTPUTDIR)/gensrc/jdk.jdi/jdwp-protocol.html
--- a/make/Main.gmk Fri Jan 20 18:26:43 2017 +0000
+++ b/make/Main.gmk Wed Jul 05 22:43:41 2017 +0200
@@ -247,7 +247,7 @@
define DeclareHotspotGensrcRecipe
hotspot-$1-gensrc:
$$(call LogInfo, Building JVM variant '$1' with features '$(JVM_FEATURES_$1)')
- +($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) -f gensrc/GenerateSources.gmk \
+ +($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f gensrc/GenerateSources.gmk \
JVM_VARIANT=$1)
endef
@@ -255,14 +255,14 @@
define DeclareHotspotLibsRecipe
hotspot-$1-libs:
- +($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) -f lib/CompileLibraries.gmk \
+ +($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f lib/CompileLibraries.gmk \
JVM_VARIANT=$1)
endef
$(foreach v, $(JVM_VARIANTS), $(eval $(call DeclareHotspotLibsRecipe,$v)))
hotspot-jsig:
- +($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) -f lib/CompileLibjsig.gmk)
+ +($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f lib/CompileLibjsig.gmk)
hotspot-ide-project:
+($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ide/CreateVSProject.gmk)
@@ -285,7 +285,7 @@
# Jigsaw specific data and analysis targets.
generate-summary:
- +($(CD) $(JDK_TOPDIR)/make && $(MAKE) -f GenerateModuleSummary.gmk)
+ +($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f GenerateModuleSummary.gmk)
ALL_TARGETS += generate-summary
@@ -318,7 +318,7 @@
bootcycle-images:
ifneq ($(COMPILE_TYPE), cross)
$(call LogWarn, Boot cycle build step 2: Building a new JDK image using previously built image)
- +$(MAKE) -f $(SRC_ROOT)/make/Init.gmk PARALLEL_TARGETS=$(BOOTCYCLE_TARGET) \
+ +$(MAKE) $(MAKE_ARGS) -f $(SRC_ROOT)/make/Init.gmk PARALLEL_TARGETS=$(BOOTCYCLE_TARGET) \
JOBS= SPEC=$(dir $(SPEC))bootcycle-spec.gmk main
else
$(call LogWarn, Boot cycle build disabled when cross compiling)
--- a/make/ZipSecurity.gmk Fri Jan 20 18:26:43 2017 +0000
+++ b/make/ZipSecurity.gmk Wed Jul 05 22:43:41 2017 +0200
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2017, 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
@@ -43,8 +43,8 @@
modules/java.base/com/sun/crypto/provider \
modules/jdk.crypto.ec/sun/security/ec \
modules/jdk.crypto.mscapi/sun/security/mscapi \
- modules/jdk.crypto.token/sun/security/pkcs11 \
- modules/jdk.crypto.token/sun/security/pkcs11/wrapper \
+ modules/jdk.crypto.cryptoki/sun/security/pkcs11 \
+ modules/jdk.crypto.cryptoki/sun/security/pkcs11/wrapper \
modules/jdk.crypto.ucrypto/com/oracle/security/ucrypto \
modules/java.base/javax/net \
modules/java.base/javax/security/cert \
--- a/make/common/MakeBase.gmk Fri Jan 20 18:26:43 2017 +0000
+++ b/make/common/MakeBase.gmk Wed Jul 05 22:43:41 2017 +0200
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, 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
@@ -862,6 +862,7 @@
( $(strip $2) > >($(TEE) $(strip $1).log) 2> >($(TEE) $(strip $1).log >&2) || \
( exitcode=$(DOLLAR)? && \
$(CP) $(strip $1).log $(MAKESUPPORT_OUTPUTDIR)/failure-logs/$(subst /,_,$(patsubst $(BUILD_OUTPUT)/%,%,$(strip $1))).log && \
+ $(CP) $(strip $1).cmdline $(MAKESUPPORT_OUTPUTDIR)/failure-logs/$(subst /,_,$(patsubst $(BUILD_OUTPUT)/%,%,$(strip $1))).cmdline && \
exit $(DOLLAR)exitcode ) )
################################################################################
--- a/make/common/Modules.gmk Fri Jan 20 18:26:43 2017 +0000
+++ b/make/common/Modules.gmk Wed Jul 05 22:43:41 2017 +0200
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2017, 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
@@ -104,7 +104,7 @@
jdk.accessibility \
jdk.charsets \
jdk.crypto.ec \
- jdk.crypto.token \
+ jdk.crypto.cryptoki \
jdk.desktop \
jdk.dynalink \
jdk.jsobject \
--- a/test/lib/jdk/test/lib/SecurityTools.java Fri Jan 20 18:26:43 2017 +0000
+++ b/test/lib/jdk/test/lib/SecurityTools.java Wed Jul 05 22:43:41 2017 +0200
@@ -23,102 +23,97 @@
package jdk.test.lib;
-import java.util.ArrayList;
-import java.util.Collections;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools;
public class SecurityTools {
- public static final String NO_ALIAS = null;
+ public static final String RESPONSE_FILE = "security_tools_response.txt";
+
+ private static ProcessBuilder getProcessBuilder(String tool, List<String> args) {
+ JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK(tool)
+ .addVMArg("-Duser.language=en")
+ .addVMArg("-Duser.country=US")
+ .addVMArg("-Djava.security.egd=file:/dev/./urandom");
+ for (String arg : args) {
+ if (arg.startsWith("-J")) {
+ launcher.addVMArg(arg.substring(2));
+ } else {
+ launcher.addToolArg(arg);
+ }
+ }
+ String[] cmds = launcher.getCommand();
+ String cmdLine = Arrays.stream(cmds).collect(Collectors.joining(" "));
+ System.out.println("Command line: [" + cmdLine + "]");
+ return new ProcessBuilder(cmds);
+ }
// keytool
- public static OutputAnalyzer keytool(List<String> options)
- throws Throwable {
+ public static OutputAnalyzer keytool(List<String> args)
+ throws Exception {
+
+ ProcessBuilder pb = getProcessBuilder("keytool", args);
- JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("keytool")
- .addVMArg("-Duser.language=en")
- .addVMArg("-Duser.country=US");
- for (String option : options) {
- if (option.startsWith("-J")) {
- launcher.addVMArg(option.substring(2));
- } else {
- launcher.addToolArg(option);
- }
+ Path p = Paths.get(RESPONSE_FILE);
+ if (!Files.exists(p)) {
+ Files.createFile(p);
}
- return ProcessTools.executeCommand(launcher.getCommand());
+ pb.redirectInput(ProcessBuilder.Redirect.from(new File(RESPONSE_FILE)));
+
+ try {
+ return ProcessTools.executeProcess(pb);
+ } finally {
+ Files.delete(p);
+ }
}
- public static OutputAnalyzer keytool(String options) throws Throwable {
- return keytool(options.split("\\s+"));
+ // Only call this if there is no white space in every argument
+ public static OutputAnalyzer keytool(String args) throws Exception {
+ return keytool(args.split("\\s+"));
+ }
+
+ public static OutputAnalyzer keytool(String... args) throws Exception {
+ return keytool(List.of(args));
}
- public static OutputAnalyzer keytool(String... options) throws Throwable {
- return keytool(List.of(options));
+ public static void setResponse(String... responses) throws IOException {
+ String text;
+ if (responses.length > 0) {
+ text = Stream.of(responses).collect(
+ Collectors.joining("\n", "", "\n"));
+ } else {
+ text = "";
+ }
+ Files.write(Paths.get(RESPONSE_FILE), text.getBytes());
}
// jarsigner
- public static OutputAnalyzer jarsigner(String jar, String alias,
- List<String> options) throws Throwable {
- JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jarsigner")
- .addVMArg("-Duser.language=en")
- .addVMArg("-Duser.country=US");
- for (String option : options) {
- if (option.startsWith("-J")) {
- launcher.addVMArg(option.substring(2));
- } else {
- launcher.addToolArg(option);
- }
- }
- launcher.addToolArg(jar);
- if (alias != null) {
- launcher.addToolArg(alias);
- }
- return ProcessTools.executeCommand(launcher.getCommand());
- }
-
- public static OutputAnalyzer jarsigner(String jar, String alias,
- String options) throws Throwable {
-
- return jarsigner(jar, alias, options.split("\\s+"));
+ public static OutputAnalyzer jarsigner(List<String> args)
+ throws Exception {
+ return ProcessTools.executeProcess(
+ getProcessBuilder("jarsigner", args));
}
- public static OutputAnalyzer jarsigner(String jar, String alias,
- String... options) throws Throwable {
-
- return jarsigner(jar, alias, List.of(options));
- }
+ // Only call this if there is no white space in every argument
+ public static OutputAnalyzer jarsigner(String args) throws Exception {
- public static OutputAnalyzer sign(String jar, String alias, String... options)
- throws Throwable {
-
- return jarsigner(jar, alias,
- mergeOptions("-J-Djava.security.egd=file:/dev/./urandom", options));
+ return jarsigner(args.split("\\s+"));
}
- public static OutputAnalyzer verify(String jar, String... options)
- throws Throwable {
-
- return jarsigner(jar, NO_ALIAS, mergeOptions("-verify", options));
- }
-
- // helper methods
-
- private static List<String> mergeOptions(
- String firstOption, String... secondPart) {
-
- return mergeOptions(List.of(firstOption), secondPart);
- }
-
- private static List<String> mergeOptions(
- List<String> firstPart, String... secondPart) {
-
- List<String> options = new ArrayList<>(firstPart);
- Collections.addAll(options, secondPart);
- return options;
+ public static OutputAnalyzer jarsigner(String... args) throws Exception {
+ return jarsigner(List.of(args));
}
}
--- a/test/lib/jdk/test/lib/process/OutputAnalyzer.java Fri Jan 20 18:26:43 2017 +0000
+++ b/test/lib/jdk/test/lib/process/OutputAnalyzer.java Wed Jul 05 22:43:41 2017 +0200
@@ -183,6 +183,23 @@
}
/**
+ * Verify that the stdout and stderr contents of output buffer does not contain the string
+ *
+ * @throws RuntimeException If the string was found
+ */
+ public OutputAnalyzer shouldBeEmpty() {
+ if (!stdout.isEmpty()) {
+ reportDiagnosticSummary();
+ throw new RuntimeException("stdout was not empty");
+ }
+ if (!stderr.isEmpty()) {
+ reportDiagnosticSummary();
+ throw new RuntimeException("stderr was not empty");
+ }
+ return this;
+ }
+
+ /**
* Verify that the stdout contents of output buffer does not contain the string
*
* @param expectedString String that the buffer should not contain
@@ -365,6 +382,21 @@
return this;
}
+ /**
+ * Verify the exit value of the process
+ *
+ * @param notExpectedExitValue Unexpected exit value from process
+ * @throws RuntimeException If the exit value from the process did match the expected value
+ */
+ public OutputAnalyzer shouldNotHaveExitValue(int notExpectedExitValue) {
+ if (getExitValue() == notExpectedExitValue) {
+ reportDiagnosticSummary();
+ throw new RuntimeException("Unexpected to get exit value of ["
+ + notExpectedExitValue + "]\n");
+ }
+ return this;
+ }
+
/**
* Report summary that will help to diagnose the problem