RFR 8171353: New home for SecurityTools.java test utility

[Artem Smotrakov]

Hi Max,

I am fine with it.

Artem


On 12/16/2016 12:07 AM, Wang Weijun wrote:
> Hi Artem
>
> I hope you are OK with this change:
>
> diff --git a/test/lib/security/SecurityTools.java b/test/lib/testlibrary/jdk/testlibrary/SecurityTools.java
> rename from test/lib/security/SecurityTools.java
> rename to test/lib/testlibrary/jdk/testlibrary/SecurityTools.java
> --- a/test/lib/security/SecurityTools.java
> +++ b/test/lib/testlibrary/jdk/testlibrary/SecurityTools.java
> @@ -20,13 +20,11 @@
>    * or visit www.oracle.com if you need additional information or have any
>    * questions.
>    */
> +package jdk.testlibrary;
>
>   import java.util.ArrayList;
>   import java.util.Collections;
>   import java.util.List;
> -import jdk.testlibrary.JDKToolLauncher;
> -import jdk.testlibrary.OutputAnalyzer;
> -import jdk.testlibrary.ProcessTools;
>
>   public class SecurityTools {
>
> diff --git a/test/sun/security/tools/keytool/PrintSSL.java b/test/sun/security/tools/keytool/PrintSSL.java
> --- a/test/sun/security/tools/keytool/PrintSSL.java
> +++ b/test/sun/security/tools/keytool/PrintSSL.java
> @@ -25,7 +25,6 @@
>    * @test
>    * @bug 6480981 8160624
>    * @summary keytool should be able to import certificates from remote SSL server
> - * @library /lib/security
>    * @library /lib/testlibrary
>    * @run main/othervm PrintSSL
>    */
> @@ -37,6 +36,7 @@
>   import javax.net.ssl.SSLServerSocketFactory;
>   import javax.net.ssl.SSLSocket;
>   import jdk.testlibrary.OutputAnalyzer;
> +import jdk.testlibrary.SecurityTools;
>
>   public class PrintSSL {
>
> diff --git a/test/sun/security/tools/keytool/ReadJar.java b/test/sun/security/tools/keytool/ReadJar.java
> --- a/test/sun/security/tools/keytool/ReadJar.java
> +++ b/test/sun/security/tools/keytool/ReadJar.java
> @@ -25,7 +25,6 @@
>    * @test
>    * @bug 6890872 8168882
>    * @summary keytool -printcert to recognize signed jar files
> - * @library /lib/security
>    * @library /lib/testlibrary
>    */
>
> @@ -33,6 +32,7 @@
>   import java.nio.file.Paths;
>   import jdk.testlibrary.JarUtils;
>   import jdk.testlibrary.OutputAnalyzer;
> +import jdk.testlibrary.SecurityTools;
>
>   public class ReadJar {
>
> Thanks
> Max
>