diff --git a/jdk/test/TEST.groups b/jdk/test/TEST.groups
index b624ca9b6eb61b3269832b1dac7bdacb1410b474..8e45f1998f7ee01c57f4bdf2902578e8552a5dae 100644
--- a/jdk/test/TEST.groups
+++ b/jdk/test/TEST.groups
@@ -101,7 +101,7 @@ jdk_nio = \
jdk_net = \
java/net \
- com/sun/net \
+ com/sun/net/httpserver \
com/oracle/net \
sun/net
@@ -126,6 +126,9 @@ jdk_security3 = \
com/sun/security \
com/sun/org/apache/xml/internal/security \
sun/security \
+ javax/net \
+ sun/net/www/protocol/https \
+ com/sun/net/ssl \
lib/security
jdk_security = \
@@ -489,7 +492,7 @@ needs_compact3 = \
sun/security/provider/PolicyFile/Alias.java \
sun/security/provider/PolicyFile/Comparator.java \
sun/security/provider/PolicyFile/SelfWildcard.java \
- sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/SSLEngineDeadlock.java \
+ sun/security/ssl/SSLEngineImpl/SSLEngineDeadlock.java \
sun/security/util/Oid/OidFormat.java \
sun/security/util/Resources/Format.java \
sun/security/util/Resources/NewNamesFormat.java
@@ -587,8 +590,8 @@ needs_compact2 = \
java/util/zip/ZipFile/DeleteTempJar.java \
javax/crypto/Cipher/CipherStreamClose.java \
sun/misc/URLClassPath/ClassnameCharTest.java \
- sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsCreateSockTest.java \
- sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsSocketFacTest.java
+ sun/net/www/protocol/https/HttpsURLConnection/HttpsCreateSockTest.java \
+ sun/net/www/protocol/https/HttpsURLConnection/HttpsSocketFacTest.java
# Compact 1 adds full VM tests
#
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/ComKeyManagerFactoryImpl.java b/jdk/test/com/sun/net/ssl/SSLSecurity/ComKeyManagerFactoryImpl.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/ComKeyManagerFactoryImpl.java
rename to jdk/test/com/sun/net/ssl/SSLSecurity/ComKeyManagerFactoryImpl.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/ComSSLContextImpl.java b/jdk/test/com/sun/net/ssl/SSLSecurity/ComSSLContextImpl.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/ComSSLContextImpl.java
rename to jdk/test/com/sun/net/ssl/SSLSecurity/ComSSLContextImpl.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/ComTrustManagerFactoryImpl.java b/jdk/test/com/sun/net/ssl/SSLSecurity/ComTrustManagerFactoryImpl.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/ComTrustManagerFactoryImpl.java
rename to jdk/test/com/sun/net/ssl/SSLSecurity/ComTrustManagerFactoryImpl.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/JavaxKeyManagerFactoryImpl.java b/jdk/test/com/sun/net/ssl/SSLSecurity/JavaxKeyManagerFactoryImpl.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/JavaxKeyManagerFactoryImpl.java
rename to jdk/test/com/sun/net/ssl/SSLSecurity/JavaxKeyManagerFactoryImpl.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/JavaxSSLContextImpl.java b/jdk/test/com/sun/net/ssl/SSLSecurity/JavaxSSLContextImpl.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/JavaxSSLContextImpl.java
rename to jdk/test/com/sun/net/ssl/SSLSecurity/JavaxSSLContextImpl.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/JavaxTrustManagerFactoryImpl.java b/jdk/test/com/sun/net/ssl/SSLSecurity/JavaxTrustManagerFactoryImpl.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/JavaxTrustManagerFactoryImpl.java
rename to jdk/test/com/sun/net/ssl/SSLSecurity/JavaxTrustManagerFactoryImpl.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/ProviderTest.java b/jdk/test/com/sun/net/ssl/SSLSecurity/ProviderTest.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/ProviderTest.java
rename to jdk/test/com/sun/net/ssl/SSLSecurity/ProviderTest.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/TruncateArray.java b/jdk/test/com/sun/net/ssl/SSLSecurity/TruncateArray.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/TruncateArray.java
rename to jdk/test/com/sun/net/ssl/SSLSecurity/TruncateArray.java
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/Fix5070632.java b/jdk/test/javax/net/ssl/Fix5070632.java
similarity index 100%
rename from jdk/test/sun/security/ssl/javax/net/ssl/Fix5070632.java
rename to jdk/test/javax/net/ssl/Fix5070632.java
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/FixingJavadocs/ComURLNulls.java b/jdk/test/javax/net/ssl/FixingJavadocs/ComURLNulls.java
similarity index 100%
rename from jdk/test/sun/security/ssl/javax/net/ssl/FixingJavadocs/ComURLNulls.java
rename to jdk/test/javax/net/ssl/FixingJavadocs/ComURLNulls.java
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/FixingJavadocs/ImplicitHandshake.java b/jdk/test/javax/net/ssl/FixingJavadocs/ImplicitHandshake.java
similarity index 99%
rename from jdk/test/sun/security/ssl/javax/net/ssl/FixingJavadocs/ImplicitHandshake.java
rename to jdk/test/javax/net/ssl/FixingJavadocs/ImplicitHandshake.java
index 8badfd66224adf4057b5a7238077bd9e4399dc86..b1ef64ef88a0271362d6343a3306783bc19f7c65 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/FixingJavadocs/ImplicitHandshake.java
+++ b/jdk/test/javax/net/ssl/FixingJavadocs/ImplicitHandshake.java
@@ -55,7 +55,7 @@ public class ImplicitHandshake {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../etc";
+ static String pathToStores = "../etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/FixingJavadocs/JavaxURLNulls.java b/jdk/test/javax/net/ssl/FixingJavadocs/JavaxURLNulls.java
similarity index 100%
rename from jdk/test/sun/security/ssl/javax/net/ssl/FixingJavadocs/JavaxURLNulls.java
rename to jdk/test/javax/net/ssl/FixingJavadocs/JavaxURLNulls.java
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/FixingJavadocs/KMTMGetNothing.java b/jdk/test/javax/net/ssl/FixingJavadocs/KMTMGetNothing.java
similarity index 100%
rename from jdk/test/sun/security/ssl/javax/net/ssl/FixingJavadocs/KMTMGetNothing.java
rename to jdk/test/javax/net/ssl/FixingJavadocs/KMTMGetNothing.java
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/FixingJavadocs/SSLSessionNulls.java b/jdk/test/javax/net/ssl/FixingJavadocs/SSLSessionNulls.java
similarity index 99%
rename from jdk/test/sun/security/ssl/javax/net/ssl/FixingJavadocs/SSLSessionNulls.java
rename to jdk/test/javax/net/ssl/FixingJavadocs/SSLSessionNulls.java
index fc9cfbf1071fa0049cf6b0bef27d609921d74a4c..e9338cc42eb66a0360eeaacc964ac63a0021e08d 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/FixingJavadocs/SSLSessionNulls.java
+++ b/jdk/test/javax/net/ssl/FixingJavadocs/SSLSessionNulls.java
@@ -55,7 +55,7 @@ public class SSLSessionNulls {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../etc";
+ static String pathToStores = "../etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/FixingJavadocs/SSLSocketInherit.java b/jdk/test/javax/net/ssl/FixingJavadocs/SSLSocketInherit.java
similarity index 99%
rename from jdk/test/sun/security/ssl/javax/net/ssl/FixingJavadocs/SSLSocketInherit.java
rename to jdk/test/javax/net/ssl/FixingJavadocs/SSLSocketInherit.java
index 2e3f544d24643bd43c23c21522362fdfaa6eb61e..bf1e757ed6a8fbc0379a6ba3ceb3c70eae1ed91f 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/FixingJavadocs/SSLSocketInherit.java
+++ b/jdk/test/javax/net/ssl/FixingJavadocs/SSLSocketInherit.java
@@ -38,7 +38,7 @@ import java.net.*;
import javax.net.ssl.*;
public class SSLSocketInherit {
- String pathToStores = "../../../../etc";
+ String pathToStores = "../etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/GetInstance.java b/jdk/test/javax/net/ssl/GetInstance.java
similarity index 100%
rename from jdk/test/sun/security/ssl/javax/net/ssl/GetInstance.java
rename to jdk/test/javax/net/ssl/GetInstance.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnection/CriticalSubjectAltName.java b/jdk/test/javax/net/ssl/HttpsURLConnection/CriticalSubjectAltName.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnection/CriticalSubjectAltName.java
rename to jdk/test/javax/net/ssl/HttpsURLConnection/CriticalSubjectAltName.java
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/HttpsURLConnection/DelayDefaultContextLoading.java b/jdk/test/javax/net/ssl/HttpsURLConnection/DelayDefaultContextLoading.java
similarity index 100%
rename from jdk/test/sun/security/ssl/javax/net/ssl/HttpsURLConnection/DelayDefaultContextLoading.java
rename to jdk/test/javax/net/ssl/HttpsURLConnection/DelayDefaultContextLoading.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnection/GetResponseCode.java b/jdk/test/javax/net/ssl/HttpsURLConnection/GetResponseCode.java
similarity index 99%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnection/GetResponseCode.java
rename to jdk/test/javax/net/ssl/HttpsURLConnection/GetResponseCode.java
index 9335085eebaf5241eec9c78c575e7183875a68cd..87ffef9c0f8eb6f3f8289c060ecf6d878da7f461 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnection/GetResponseCode.java
+++ b/jdk/test/javax/net/ssl/HttpsURLConnection/GetResponseCode.java
@@ -54,7 +54,7 @@ public class GetResponseCode implements HostnameVerifier {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../../../../../../etc";
+ static String pathToStores = "../etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnection/crisubn.jks b/jdk/test/javax/net/ssl/HttpsURLConnection/crisubn.jks
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnection/crisubn.jks
rename to jdk/test/javax/net/ssl/HttpsURLConnection/crisubn.jks
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnection/trusted.jks b/jdk/test/javax/net/ssl/HttpsURLConnection/trusted.jks
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnection/trusted.jks
rename to jdk/test/javax/net/ssl/HttpsURLConnection/trusted.jks
diff --git a/jdk/test/sun/security/ssl/README b/jdk/test/javax/net/ssl/README
similarity index 100%
rename from jdk/test/sun/security/ssl/README
rename to jdk/test/javax/net/ssl/README
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/AcceptLargeFragments.java b/jdk/test/javax/net/ssl/SSLEngine/AcceptLargeFragments.java
similarity index 100%
rename from jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/AcceptLargeFragments.java
rename to jdk/test/javax/net/ssl/SSLEngine/AcceptLargeFragments.java
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/ArgCheck.java b/jdk/test/javax/net/ssl/SSLEngine/ArgCheck.java
similarity index 99%
rename from jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/ArgCheck.java
rename to jdk/test/javax/net/ssl/SSLEngine/ArgCheck.java
index be395db8a9019374b18994f817e4afa09942a39d..3b94c6e29929d0c39cc04390d52261962b564452 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/ArgCheck.java
+++ b/jdk/test/javax/net/ssl/SSLEngine/ArgCheck.java
@@ -40,7 +40,7 @@ public class ArgCheck {
private static boolean debug = false;
- private static String pathToStores = "../../../../../etc";
+ private static String pathToStores = "../etc";
private static String keyStoreFile = "keystore";
private static String trustStoreFile = "truststore";
private static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/Arrays.java b/jdk/test/javax/net/ssl/SSLEngine/Arrays.java
similarity index 99%
rename from jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/Arrays.java
rename to jdk/test/javax/net/ssl/SSLEngine/Arrays.java
index cae1e5520407576d09f9ec41696f884fc82f2f72..ed75a4555c7e1cb6f219f3d1dd5ec33e2759ecc1 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/Arrays.java
+++ b/jdk/test/javax/net/ssl/SSLEngine/Arrays.java
@@ -42,7 +42,7 @@ public class Arrays {
private SSLEngine ssle1; // client
private SSLEngine ssle2; // server
- private static String pathToStores = "../../../../../etc";
+ private static String pathToStores = "../etc";
private static String keyStoreFile = "keystore";
private static String trustStoreFile = "truststore";
private static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/Basics.java b/jdk/test/javax/net/ssl/SSLEngine/Basics.java
similarity index 99%
rename from jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/Basics.java
rename to jdk/test/javax/net/ssl/SSLEngine/Basics.java
index 9f73c8dccf541fb95719362ee827b0b1afd01cb7..8c17e735c555de9d491912ea1b730c6559f6cdf4 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/Basics.java
+++ b/jdk/test/javax/net/ssl/SSLEngine/Basics.java
@@ -43,7 +43,7 @@ import javax.net.ssl.SSLEngineResult.*;
public class Basics {
- private static String pathToStores = "../../../../../etc";
+ private static String pathToStores = "../etc";
private static String keyStoreFile = "keystore";
private static String trustStoreFile = "truststore";
private static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/CheckStatus.java b/jdk/test/javax/net/ssl/SSLEngine/CheckStatus.java
similarity index 99%
rename from jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/CheckStatus.java
rename to jdk/test/javax/net/ssl/SSLEngine/CheckStatus.java
index dfdefa9f1f76307b741ad6b1296570596a200a96..c7133ef5d4341f99004963a562f3b6450cb272ad 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/CheckStatus.java
+++ b/jdk/test/javax/net/ssl/SSLEngine/CheckStatus.java
@@ -48,7 +48,7 @@ public class CheckStatus {
private SSLEngine ssle1; // client
private SSLEngine ssle2; // server
- private static String pathToStores = "../../../../../etc";
+ private static String pathToStores = "../etc";
private static String keyStoreFile = "keystore";
private static String trustStoreFile = "truststore";
private static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/ConnectionTest.java b/jdk/test/javax/net/ssl/SSLEngine/ConnectionTest.java
similarity index 99%
rename from jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/ConnectionTest.java
rename to jdk/test/javax/net/ssl/SSLEngine/ConnectionTest.java
index 546a7865668018040236da857146bc4692bbe364..cdc9bcaa08ccde11afe3ea289aea9dc05ac22d97 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/ConnectionTest.java
+++ b/jdk/test/javax/net/ssl/SSLEngine/ConnectionTest.java
@@ -47,7 +47,7 @@ public class ConnectionTest {
private SSLEngine ssle1;
private SSLEngine ssle2;
- private static String pathToStores = "../../../../../etc";
+ private static String pathToStores = "../etc";
private static String keyStoreFile = "keystore";
private static String trustStoreFile = "truststore";
private static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/ExtendedKeyEngine.java b/jdk/test/javax/net/ssl/SSLEngine/ExtendedKeyEngine.java
similarity index 99%
rename from jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/ExtendedKeyEngine.java
rename to jdk/test/javax/net/ssl/SSLEngine/ExtendedKeyEngine.java
index ca109392866d59e7c0db795f85f042e8fa4fa105..2067467b78faf3a9bc93c23cab877a4fd97723b2 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/ExtendedKeyEngine.java
+++ b/jdk/test/javax/net/ssl/SSLEngine/ExtendedKeyEngine.java
@@ -42,7 +42,7 @@ public class ExtendedKeyEngine {
private SSLEngine ssle1; // client
private SSLEngine ssle2; // server
- private static String pathToStores = "../../../../../etc";
+ private static String pathToStores = "../etc";
private static String keyStoreFile = "keystore";
private static String trustStoreFile = "truststore";
private static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/ExtendedKeySocket.java b/jdk/test/javax/net/ssl/SSLEngine/ExtendedKeySocket.java
similarity index 99%
rename from jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/ExtendedKeySocket.java
rename to jdk/test/javax/net/ssl/SSLEngine/ExtendedKeySocket.java
index 0f5b54bf1dae8729c416545520d21ed3b3212832..ef4eef3a3301adf34833acbfbfc17bd723ea9919 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/ExtendedKeySocket.java
+++ b/jdk/test/javax/net/ssl/SSLEngine/ExtendedKeySocket.java
@@ -55,7 +55,7 @@ public class ExtendedKeySocket {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../../etc";
+ static String pathToStores = "../etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static char [] passwd = "passphrase".toCharArray();
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/LargeBufs.java b/jdk/test/javax/net/ssl/SSLEngine/LargeBufs.java
similarity index 99%
rename from jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/LargeBufs.java
rename to jdk/test/javax/net/ssl/SSLEngine/LargeBufs.java
index 5960ea639926fe8b8665792576940979c66ed668..af7f7a146dca6c2248477b66d02ea8ec3dfc7b4c 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/LargeBufs.java
+++ b/jdk/test/javax/net/ssl/SSLEngine/LargeBufs.java
@@ -50,7 +50,7 @@ public class LargeBufs {
static private SSLEngine ssle1; // client
static private SSLEngine ssle2; // server
- private static String pathToStores = "../../../../../etc";
+ private static String pathToStores = "../etc";
private static String keyStoreFile = "keystore";
private static String trustStoreFile = "truststore";
private static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/LargePacket.java b/jdk/test/javax/net/ssl/SSLEngine/LargePacket.java
similarity index 99%
rename from jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/LargePacket.java
rename to jdk/test/javax/net/ssl/SSLEngine/LargePacket.java
index c95ebfdf7dc2ed32f02976a979954fa27191f1b4..33f2c4f49ba4dd6bde4b784f9bde885b88836225 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/LargePacket.java
+++ b/jdk/test/javax/net/ssl/SSLEngine/LargePacket.java
@@ -174,7 +174,7 @@ public class LargePacket extends SSLEngineService {
* Fork off the other side, then do your work.
*/
LargePacket() throws Exception {
- super("../../../../../etc");
+ super("../etc");
if (separateServerThread) {
startServer(true);
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/MyX509ExtendedKeyManager.java b/jdk/test/javax/net/ssl/SSLEngine/MyX509ExtendedKeyManager.java
similarity index 100%
rename from jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/MyX509ExtendedKeyManager.java
rename to jdk/test/javax/net/ssl/SSLEngine/MyX509ExtendedKeyManager.java
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/MyX509KeyManager.java b/jdk/test/javax/net/ssl/SSLEngine/MyX509KeyManager.java
similarity index 100%
rename from jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/MyX509KeyManager.java
rename to jdk/test/javax/net/ssl/SSLEngine/MyX509KeyManager.java
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/NoAuthClientAuth.java b/jdk/test/javax/net/ssl/SSLEngine/NoAuthClientAuth.java
similarity index 99%
rename from jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/NoAuthClientAuth.java
rename to jdk/test/javax/net/ssl/SSLEngine/NoAuthClientAuth.java
index f951e84c8bc1c7b053b1193bec8512950aea72fc..db8c091c115fb2adeb28fff809ca1491202016ee 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/NoAuthClientAuth.java
+++ b/jdk/test/javax/net/ssl/SSLEngine/NoAuthClientAuth.java
@@ -117,7 +117,7 @@ public class NoAuthClientAuth {
/*
* The following is to set up the keystores.
*/
- private static String pathToStores = "../../../../../etc";
+ private static String pathToStores = "../etc";
private static String keyStoreFile = "keystore";
private static String trustStoreFile = "truststore";
private static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/SSLEngineResultArgs.java b/jdk/test/javax/net/ssl/SSLEngine/SSLEngineResultArgs.java
similarity index 100%
rename from jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/SSLEngineResultArgs.java
rename to jdk/test/javax/net/ssl/SSLEngine/SSLEngineResultArgs.java
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/SSLEngineService.java b/jdk/test/javax/net/ssl/SSLEngine/SSLEngineService.java
similarity index 99%
rename from jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/SSLEngineService.java
rename to jdk/test/javax/net/ssl/SSLEngine/SSLEngineService.java
index bc4c6f7db129d6f714017515f5b8399698a18cf0..d3ee14666c5586d8a1347f76f01811eadbe241c6 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/SSLEngineService.java
+++ b/jdk/test/javax/net/ssl/SSLEngine/SSLEngineService.java
@@ -49,7 +49,7 @@ public class SSLEngineService {
private String trustFilename;
protected SSLEngineService() {
- init("../../../../../etc");
+ init("../etc");
}
protected SSLEngineService(String pathToStores) {
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/TestAllSuites.java b/jdk/test/javax/net/ssl/SSLEngine/TestAllSuites.java
similarity index 99%
rename from jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/TestAllSuites.java
rename to jdk/test/javax/net/ssl/SSLEngine/TestAllSuites.java
index 9781614318ddf5de99d4aab7f71af8754bebce38..9c633b58f7051164e8557dd9772a8d535455fd2b 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/TestAllSuites.java
+++ b/jdk/test/javax/net/ssl/SSLEngine/TestAllSuites.java
@@ -51,7 +51,7 @@ public class TestAllSuites {
private SSLEngine ssle1; // client
private SSLEngine ssle2; // server
- private static String pathToStores = "../../../../../etc";
+ private static String pathToStores = "../etc";
private static String keyStoreFile = "keystore";
private static String trustStoreFile = "truststore";
private static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngineResult/Deserialize.java b/jdk/test/javax/net/ssl/SSLEngineResult/Deserialize.java
similarity index 100%
rename from jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngineResult/Deserialize.java
rename to jdk/test/javax/net/ssl/SSLEngineResult/Deserialize.java
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/SSLParameters/UseCipherSuitesOrder.java b/jdk/test/javax/net/ssl/SSLParameters/UseCipherSuitesOrder.java
similarity index 99%
rename from jdk/test/sun/security/ssl/javax/net/ssl/SSLParameters/UseCipherSuitesOrder.java
rename to jdk/test/javax/net/ssl/SSLParameters/UseCipherSuitesOrder.java
index c25d74c7d2cd2a9cc911af8c79b5b520a311f5e5..2c2bae510e51f70090beecaca299a60937e3ff1d 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/SSLParameters/UseCipherSuitesOrder.java
+++ b/jdk/test/javax/net/ssl/SSLParameters/UseCipherSuitesOrder.java
@@ -57,7 +57,7 @@ public class UseCipherSuitesOrder {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../etc";
+ static String pathToStores = "../etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/SSLServerSocket/DefaultSSLServSocketFac.java b/jdk/test/javax/net/ssl/SSLServerSocket/DefaultSSLServSocketFac.java
similarity index 100%
rename from jdk/test/sun/security/ssl/javax/net/ssl/SSLServerSocket/DefaultSSLServSocketFac.java
rename to jdk/test/javax/net/ssl/SSLServerSocket/DefaultSSLServSocketFac.java
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/CheckMyTrustedKeystore.java b/jdk/test/javax/net/ssl/SSLSession/CheckMyTrustedKeystore.java
similarity index 97%
rename from jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/CheckMyTrustedKeystore.java
rename to jdk/test/javax/net/ssl/SSLSession/CheckMyTrustedKeystore.java
index 7dee02ea69908ca9b688efaec41a5a32e6de8d05..422d88debd195303e2c0b4b48ed42f41940baa8f 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/CheckMyTrustedKeystore.java
+++ b/jdk/test/javax/net/ssl/SSLSession/CheckMyTrustedKeystore.java
@@ -21,21 +21,23 @@
* questions.
*/
+// SunJSSE does not support dynamic system properties, no way to re-use
+// system properties in samevm/agentvm mode.
+
/*
* @test
* @bug 4329114
* @summary Need better way of reflecting the reason when a chain is
* rejected as untrusted.
+ * @ignore JSSE supports algorithm constraints with CR 6916074,
+ * need to update this test case in JDK 7 soon
* @run main/othervm CheckMyTrustedKeystore
*
- * SunJSSE does not support dynamic system properties, no way to re-use
- * system properties in samevm/agentvm mode.
- * @ignore JSSE supports algorithm constraints with CR 6916074,
- * need to update this test case in JDK 7 soon
- * This is a serious hack job!
* @author Brad Wetmore
*/
+// This is a serious hack job!
+
import java.io.*;
import java.net.*;
import java.security.*;
@@ -60,7 +62,7 @@ public class CheckMyTrustedKeystore {
/*
* Where do we find the keystores?
*/
- final static String pathToStores = "../../../../etc";
+ final static String pathToStores = "../etc";
final static String keyStoreFile = "keystore";
final static String trustStoreFile = "truststore";
final static String unknownStoreFile = "unknown_keystore";
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/HttpsURLConnectionLocalCertificateChain.java b/jdk/test/javax/net/ssl/SSLSession/HttpsURLConnectionLocalCertificateChain.java
similarity index 99%
rename from jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/HttpsURLConnectionLocalCertificateChain.java
rename to jdk/test/javax/net/ssl/SSLSession/HttpsURLConnectionLocalCertificateChain.java
index ec773b244dde38a860b901a1454bdf8762b7c541..c6e9753a2c1204a40967e2de54c35d40ff124e1e 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/HttpsURLConnectionLocalCertificateChain.java
+++ b/jdk/test/javax/net/ssl/SSLSession/HttpsURLConnectionLocalCertificateChain.java
@@ -62,7 +62,7 @@ public class HttpsURLConnectionLocalCertificateChain
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../etc";
+ static String pathToStores = "../etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/JSSERenegotiate.java b/jdk/test/javax/net/ssl/SSLSession/JSSERenegotiate.java
similarity index 99%
rename from jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/JSSERenegotiate.java
rename to jdk/test/javax/net/ssl/SSLSession/JSSERenegotiate.java
index 748b5fed6d4157e750cdb7593c880203a4e02e5d..40617bfd32109826859759bd7f0ed07bef7560ba 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/JSSERenegotiate.java
+++ b/jdk/test/javax/net/ssl/SSLSession/JSSERenegotiate.java
@@ -63,7 +63,7 @@ public class JSSERenegotiate {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../etc";
+ static String pathToStores = "../etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/KeyManagerTrustManager.java b/jdk/test/javax/net/ssl/SSLSession/KeyManagerTrustManager.java
similarity index 100%
rename from jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/KeyManagerTrustManager.java
rename to jdk/test/javax/net/ssl/SSLSession/KeyManagerTrustManager.java
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLCtxAccessToSessCtx.java b/jdk/test/javax/net/ssl/SSLSession/SSLCtxAccessToSessCtx.java
similarity index 99%
rename from jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLCtxAccessToSessCtx.java
rename to jdk/test/javax/net/ssl/SSLSession/SSLCtxAccessToSessCtx.java
index 41fddc46ed01d3943c865568eb895988a9cdb10b..14ed3eab71667ee7f4997aea659a80549b2ddf36 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLCtxAccessToSessCtx.java
+++ b/jdk/test/javax/net/ssl/SSLSession/SSLCtxAccessToSessCtx.java
@@ -55,7 +55,7 @@ public class SSLCtxAccessToSessCtx {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "/../../../../etc";
+ static String pathToStores = "../etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SessionCacheSizeTests.java b/jdk/test/javax/net/ssl/SSLSession/SessionCacheSizeTests.java
similarity index 99%
rename from jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SessionCacheSizeTests.java
rename to jdk/test/javax/net/ssl/SSLSession/SessionCacheSizeTests.java
index d4e00855dc6db51c733faef873d93342fc777575..4001f83ed471f5ef2dfd0440e74860e05011ae81 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SessionCacheSizeTests.java
+++ b/jdk/test/javax/net/ssl/SSLSession/SessionCacheSizeTests.java
@@ -70,7 +70,7 @@ public class SessionCacheSizeTests {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "/../../../../etc";
+ static String pathToStores = "../etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SessionTimeOutTests.java b/jdk/test/javax/net/ssl/SSLSession/SessionTimeOutTests.java
similarity index 99%
rename from jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SessionTimeOutTests.java
rename to jdk/test/javax/net/ssl/SSLSession/SessionTimeOutTests.java
index 9264cb08723c13f87995d84ef3f406b3ce56037d..98e590799c8e12f776199e31539c1acc7a1beb8a 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/SessionTimeOutTests.java
+++ b/jdk/test/javax/net/ssl/SSLSession/SessionTimeOutTests.java
@@ -69,7 +69,7 @@ public class SessionTimeOutTests {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "/../../../../etc";
+ static String pathToStores = "../etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/testEnabledProtocols.java b/jdk/test/javax/net/ssl/SSLSession/testEnabledProtocols.java
similarity index 99%
rename from jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/testEnabledProtocols.java
rename to jdk/test/javax/net/ssl/SSLSession/testEnabledProtocols.java
index 5774049ba6eaa9382abad06fee063c354259c5e3..0e6e8b197c826fa280e2cdcaf0a553845f521716 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/NewAPIs/testEnabledProtocols.java
+++ b/jdk/test/javax/net/ssl/SSLSession/testEnabledProtocols.java
@@ -99,7 +99,7 @@ public class testEnabledProtocols {
/*
* Where do we find the keystores?
*/
- final static String pathToStores = "../../../../etc";
+ final static String pathToStores = "../etc";
static String passwd = "passphrase";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/IllegalSNIName.java b/jdk/test/javax/net/ssl/ServerName/IllegalSNIName.java
similarity index 100%
rename from jdk/test/sun/security/ssl/javax/net/ssl/ServerName/IllegalSNIName.java
rename to jdk/test/javax/net/ssl/ServerName/IllegalSNIName.java
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLEngineExplorer.java b/jdk/test/javax/net/ssl/ServerName/SSLEngineExplorer.java
similarity index 99%
rename from jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLEngineExplorer.java
rename to jdk/test/javax/net/ssl/ServerName/SSLEngineExplorer.java
index 2cd4635401063eef72e61c0812818b6b50f13897..a7831316d0cdd81c62365c03275620e97f84e9b3 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLEngineExplorer.java
+++ b/jdk/test/javax/net/ssl/ServerName/SSLEngineExplorer.java
@@ -30,7 +30,7 @@
* @test
* @bug 7068321
* @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server
- * @library ../NewAPIs/SSLEngine ../../../../templates
+ * @library ../SSLEngine ../templates
* @build SSLEngineService SSLCapabilities SSLExplorer
* @run main/othervm SSLEngineExplorer SSLv2Hello,SSLv3
* @run main/othervm SSLEngineExplorer SSLv3
@@ -251,7 +251,7 @@ public class SSLEngineExplorer extends SSLEngineService {
* Fork off the other side, then do your work.
*/
SSLEngineExplorer() throws Exception {
- super("../../../../etc");
+ super("../etc");
if (separateServerThread) {
startServer(true);
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLEngineExplorerMatchedSNI.java b/jdk/test/javax/net/ssl/ServerName/SSLEngineExplorerMatchedSNI.java
similarity index 99%
rename from jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLEngineExplorerMatchedSNI.java
rename to jdk/test/javax/net/ssl/ServerName/SSLEngineExplorerMatchedSNI.java
index c201bee86ad9009b894a446d67110383b002b6f6..b9854dd3e942c0af199f72a2bc6133c6d9e95b43 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLEngineExplorerMatchedSNI.java
+++ b/jdk/test/javax/net/ssl/ServerName/SSLEngineExplorerMatchedSNI.java
@@ -30,7 +30,7 @@
* @test
* @bug 7068321
* @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server
- * @library ../NewAPIs/SSLEngine ../../../../templates
+ * @library ../SSLEngine ../templates
* @build SSLEngineService SSLCapabilities SSLExplorer
* @run main/othervm SSLEngineExplorerMatchedSNI www.example.com
* www\.example\.com
@@ -309,7 +309,7 @@ public class SSLEngineExplorerMatchedSNI extends SSLEngineService {
* Fork off the other side, then do your work.
*/
SSLEngineExplorerMatchedSNI() throws Exception {
- super("../../../../etc");
+ super("../etc");
if (separateServerThread) {
startServer(true);
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLEngineExplorerUnmatchedSNI.java b/jdk/test/javax/net/ssl/ServerName/SSLEngineExplorerUnmatchedSNI.java
similarity index 99%
rename from jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLEngineExplorerUnmatchedSNI.java
rename to jdk/test/javax/net/ssl/ServerName/SSLEngineExplorerUnmatchedSNI.java
index 2a9647be457d988e351cd38503dcca197d7131f0..ff8678ba6a8567180b7c23e45fccb7111b3b8d85 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLEngineExplorerUnmatchedSNI.java
+++ b/jdk/test/javax/net/ssl/ServerName/SSLEngineExplorerUnmatchedSNI.java
@@ -30,7 +30,7 @@
* @test
* @bug 7068321
* @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server
- * @library ../NewAPIs/SSLEngine ../../../../templates
+ * @library ../SSLEngine ../templates
* @build SSLEngineService SSLCapabilities SSLExplorer
* @run main/othervm SSLEngineExplorerUnmatchedSNI www.example.com
* www\.example\.org
@@ -322,7 +322,7 @@ public class SSLEngineExplorerUnmatchedSNI extends SSLEngineService {
* Fork off the other side, then do your work.
*/
SSLEngineExplorerUnmatchedSNI() throws Exception {
- super("../../../../etc");
+ super("../etc");
if (separateServerThread) {
startServer(true);
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLEngineExplorerWithCli.java b/jdk/test/javax/net/ssl/ServerName/SSLEngineExplorerWithCli.java
similarity index 99%
rename from jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLEngineExplorerWithCli.java
rename to jdk/test/javax/net/ssl/ServerName/SSLEngineExplorerWithCli.java
index bfa23cb38de307176718a8f614c4f32ca0d8f205..f9888839929e2b4c3d1c6909fc904e408f683c5a 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLEngineExplorerWithCli.java
+++ b/jdk/test/javax/net/ssl/ServerName/SSLEngineExplorerWithCli.java
@@ -30,7 +30,7 @@
* @test
* @bug 7068321
* @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server
- * @library ../NewAPIs/SSLEngine ../../../../templates
+ * @library ../SSLEngine ../templates
* @build SSLEngineService SSLCapabilities SSLExplorer
* @run main/othervm SSLEngineExplorerWithCli
*/
@@ -281,7 +281,7 @@ public class SSLEngineExplorerWithCli extends SSLEngineService {
* Fork off the other side, then do your work.
*/
SSLEngineExplorerWithCli() throws Exception {
- super("../../../../etc");
+ super("../etc");
if (separateServerThread) {
startServer(true);
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLEngineExplorerWithSrv.java b/jdk/test/javax/net/ssl/ServerName/SSLEngineExplorerWithSrv.java
similarity index 99%
rename from jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLEngineExplorerWithSrv.java
rename to jdk/test/javax/net/ssl/ServerName/SSLEngineExplorerWithSrv.java
index e8fd2707f251fcb2ed3cbe2b7abc5060bb8de5a7..0517a7750aa06874700f84f4d9ea9c830c0a4959 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLEngineExplorerWithSrv.java
+++ b/jdk/test/javax/net/ssl/ServerName/SSLEngineExplorerWithSrv.java
@@ -30,7 +30,7 @@
* @test
* @bug 7068321
* @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server
- * @library ../NewAPIs/SSLEngine ../../../../templates
+ * @library ../SSLEngine ../templates
* @build SSLEngineService SSLCapabilities SSLExplorer
* @run main/othervm SSLEngineExplorerWithSrv
*/
@@ -267,7 +267,7 @@ public class SSLEngineExplorerWithSrv extends SSLEngineService {
* Fork off the other side, then do your work.
*/
SSLEngineExplorerWithSrv() throws Exception {
- super("../../../../etc");
+ super("../etc");
if (separateServerThread) {
startServer(true);
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketConsistentSNI.java b/jdk/test/javax/net/ssl/ServerName/SSLSocketConsistentSNI.java
similarity index 99%
rename from jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketConsistentSNI.java
rename to jdk/test/javax/net/ssl/ServerName/SSLSocketConsistentSNI.java
index d9ff691e06c95bd77bc51a0f1b61f72de1a22576..38d999aa3ef2211b3d81bbe52e16f63edc5d020d 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketConsistentSNI.java
+++ b/jdk/test/javax/net/ssl/ServerName/SSLSocketConsistentSNI.java
@@ -58,7 +58,7 @@ public class SSLSocketConsistentSNI {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../etc";
+ static String pathToStores = "../etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketExplorer.java b/jdk/test/javax/net/ssl/ServerName/SSLSocketExplorer.java
similarity index 99%
rename from jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketExplorer.java
rename to jdk/test/javax/net/ssl/ServerName/SSLSocketExplorer.java
index 27e2b6abce7c1df32647cddfea50c2b9be07e132..a91697c5915c98407cb61662feeda2359ce74cd9 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketExplorer.java
+++ b/jdk/test/javax/net/ssl/ServerName/SSLSocketExplorer.java
@@ -30,7 +30,7 @@
* @test
* @bug 7068321
* @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server
- * @library ../../../../templates
+ * @library ../templates
* @build SSLCapabilities SSLExplorer
* @run main/othervm SSLSocketExplorer SSLv2Hello,SSLv3
* @run main/othervm SSLSocketExplorer SSLv3
@@ -64,7 +64,7 @@ public class SSLSocketExplorer {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../etc";
+ static String pathToStores = "../etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketExplorerFailure.java b/jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerFailure.java
similarity index 99%
rename from jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketExplorerFailure.java
rename to jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerFailure.java
index 44a37150ef870192382c86347c0836c90243a0c7..aaf8d29948628fd9e6e81228712897b8702f7a42 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketExplorerFailure.java
+++ b/jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerFailure.java
@@ -30,7 +30,7 @@
* @test
* @bug 7068321
* @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server
- * @library ../../../../templates
+ * @library ../templates
* @build SSLCapabilities SSLExplorer
* @run main/othervm SSLSocketExplorerFailure SSLv2Hello,SSLv3
* @run main/othervm SSLSocketExplorerFailure SSLv3
@@ -64,7 +64,7 @@ public class SSLSocketExplorerFailure {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../etc";
+ static String pathToStores = "../etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketExplorerMatchedSNI.java b/jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerMatchedSNI.java
similarity index 99%
rename from jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketExplorerMatchedSNI.java
rename to jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerMatchedSNI.java
index c9ae26c42a68114b125c24eac93d30222ebdb2cf..724a37e1a80d2f25d931da15d54c1101e7098a97 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketExplorerMatchedSNI.java
+++ b/jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerMatchedSNI.java
@@ -30,7 +30,7 @@
* @test
* @bug 7068321
* @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server
- * @library ../../../../templates
+ * @library ../templates
* @build SSLCapabilities SSLExplorer
* @run main/othervm SSLSocketExplorerMatchedSNI www.example.com
* www\.example\.com
@@ -69,7 +69,7 @@ public class SSLSocketExplorerMatchedSNI {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../etc";
+ static String pathToStores = "../etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketExplorerUnmatchedSNI.java b/jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerUnmatchedSNI.java
similarity index 99%
rename from jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketExplorerUnmatchedSNI.java
rename to jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerUnmatchedSNI.java
index eab48002d6f67c5ddcbe53d35135e3278a72fe3a..732e0cf3097566a4d367937f9a738c9af8f0e4b1 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketExplorerUnmatchedSNI.java
+++ b/jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerUnmatchedSNI.java
@@ -30,7 +30,7 @@
* @test
* @bug 7068321
* @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server
- * @library ../../../../templates
+ * @library ../templates
* @build SSLCapabilities SSLExplorer
* @run main/othervm SSLSocketExplorerUnmatchedSNI www.example.com
* www\.example\.org
@@ -61,7 +61,7 @@ public class SSLSocketExplorerUnmatchedSNI {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../etc";
+ static String pathToStores = "../etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketExplorerWithCliSNI.java b/jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerWithCliSNI.java
similarity index 99%
rename from jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketExplorerWithCliSNI.java
rename to jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerWithCliSNI.java
index 6933c9a989428a913a897b0d586e60f4cdad1afd..8f2b78168649e6bf702e39947e553289b2ae6d3a 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketExplorerWithCliSNI.java
+++ b/jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerWithCliSNI.java
@@ -30,7 +30,7 @@
* @test
* @bug 7068321
* @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server
- * @library ../../../../templates
+ * @library ../templates
* @build SSLCapabilities SSLExplorer
* @run main/othervm SSLSocketExplorerWithCliSNI
*/
@@ -60,7 +60,7 @@ public class SSLSocketExplorerWithCliSNI {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../etc";
+ static String pathToStores = "../etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketExplorerWithSrvSNI.java b/jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerWithSrvSNI.java
similarity index 99%
rename from jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketExplorerWithSrvSNI.java
rename to jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerWithSrvSNI.java
index 64b1ae9a63bc5bc726a7bc485b1c92a6a7ed342e..f026f32e781a2787f24b9f979c7af755546b25dd 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketExplorerWithSrvSNI.java
+++ b/jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerWithSrvSNI.java
@@ -30,7 +30,7 @@
* @test
* @bug 7068321
* @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server
- * @library ../../../../templates
+ * @library ../templates
* @build SSLCapabilities SSLExplorer
* @run main/othervm SSLSocketExplorerWithSrvSNI
*/
@@ -60,7 +60,7 @@ public class SSLSocketExplorerWithSrvSNI {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../etc";
+ static String pathToStores = "../etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketInconsistentSNI.java b/jdk/test/javax/net/ssl/ServerName/SSLSocketInconsistentSNI.java
similarity index 99%
rename from jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketInconsistentSNI.java
rename to jdk/test/javax/net/ssl/ServerName/SSLSocketInconsistentSNI.java
index 6ba1dfd9c21f6a0d3daeb61441b1af58b8e20456..7c54dd1a8822fb6e52d8e9bc7c40f224ba388de1 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketInconsistentSNI.java
+++ b/jdk/test/javax/net/ssl/ServerName/SSLSocketInconsistentSNI.java
@@ -58,7 +58,7 @@ public class SSLSocketInconsistentSNI {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../etc";
+ static String pathToStores = "../etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketSNISensitive.java b/jdk/test/javax/net/ssl/ServerName/SSLSocketSNISensitive.java
similarity index 100%
rename from jdk/test/sun/security/ssl/javax/net/ssl/ServerName/SSLSocketSNISensitive.java
rename to jdk/test/javax/net/ssl/ServerName/SSLSocketSNISensitive.java
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/TLSv11/EmptyCertificateAuthorities.java b/jdk/test/javax/net/ssl/TLSv11/EmptyCertificateAuthorities.java
similarity index 99%
rename from jdk/test/sun/security/ssl/javax/net/ssl/TLSv11/EmptyCertificateAuthorities.java
rename to jdk/test/javax/net/ssl/TLSv11/EmptyCertificateAuthorities.java
index 3b11d2a59a7f4b76906cd7024c892c605f315317..572ac2cce8c688df1c3a86fa0c0e081260b2d73e 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/TLSv11/EmptyCertificateAuthorities.java
+++ b/jdk/test/javax/net/ssl/TLSv11/EmptyCertificateAuthorities.java
@@ -60,7 +60,7 @@ public class EmptyCertificateAuthorities {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "/../../../../etc";
+ static String pathToStores = "../etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/TLSv11/ExportableBlockCipher.java b/jdk/test/javax/net/ssl/TLSv11/ExportableBlockCipher.java
similarity index 99%
rename from jdk/test/sun/security/ssl/javax/net/ssl/TLSv11/ExportableBlockCipher.java
rename to jdk/test/javax/net/ssl/TLSv11/ExportableBlockCipher.java
index ad27a1e468f651c51bfa57b21d0abee2fb629ca6..cb232a00e197d6815c374465a2092ad679a74431 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/TLSv11/ExportableBlockCipher.java
+++ b/jdk/test/javax/net/ssl/TLSv11/ExportableBlockCipher.java
@@ -57,7 +57,7 @@ public class ExportableBlockCipher {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "/../../../../etc";
+ static String pathToStores = "../etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/TLSv11/ExportableStreamCipher.java b/jdk/test/javax/net/ssl/TLSv11/ExportableStreamCipher.java
similarity index 99%
rename from jdk/test/sun/security/ssl/javax/net/ssl/TLSv11/ExportableStreamCipher.java
rename to jdk/test/javax/net/ssl/TLSv11/ExportableStreamCipher.java
index 3d15a7cf1549c1f8ddf0174e5228639da4aed6d7..572d9893b8585176677da9a0256a0cc001576f64 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/TLSv11/ExportableStreamCipher.java
+++ b/jdk/test/javax/net/ssl/TLSv11/ExportableStreamCipher.java
@@ -57,7 +57,7 @@ public class ExportableStreamCipher {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "/../../../../etc";
+ static String pathToStores = "../etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/TLSv11/GenericBlockCipher.java b/jdk/test/javax/net/ssl/TLSv11/GenericBlockCipher.java
similarity index 99%
rename from jdk/test/sun/security/ssl/javax/net/ssl/TLSv11/GenericBlockCipher.java
rename to jdk/test/javax/net/ssl/TLSv11/GenericBlockCipher.java
index 9a0a83e26e4d7c67483bc6ee979404d09c4c4a02..5f851843ffbdc9271048a9edb40227ff8a8d375f 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/TLSv11/GenericBlockCipher.java
+++ b/jdk/test/javax/net/ssl/TLSv11/GenericBlockCipher.java
@@ -57,7 +57,7 @@ public class GenericBlockCipher {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "/../../../../etc";
+ static String pathToStores = "../etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/TLSv11/GenericStreamCipher.java b/jdk/test/javax/net/ssl/TLSv11/GenericStreamCipher.java
similarity index 99%
rename from jdk/test/sun/security/ssl/javax/net/ssl/TLSv11/GenericStreamCipher.java
rename to jdk/test/javax/net/ssl/TLSv11/GenericStreamCipher.java
index c96d8ec9cc88d64b3f43346cceed03e152a44188..4cf02417e82a65238ef58ae45d8c648947175a24 100644
--- a/jdk/test/sun/security/ssl/javax/net/ssl/TLSv11/GenericStreamCipher.java
+++ b/jdk/test/javax/net/ssl/TLSv11/GenericStreamCipher.java
@@ -57,7 +57,7 @@ public class GenericStreamCipher {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "/../../../../etc";
+ static String pathToStores = "../etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/TLSv12/DisabledShortRSAKeys.java b/jdk/test/javax/net/ssl/TLSv12/DisabledShortRSAKeys.java
similarity index 100%
rename from jdk/test/sun/security/ssl/javax/net/ssl/TLSv12/DisabledShortRSAKeys.java
rename to jdk/test/javax/net/ssl/TLSv12/DisabledShortRSAKeys.java
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/TLSv12/ShortRSAKey512.java b/jdk/test/javax/net/ssl/TLSv12/ShortRSAKey512.java
similarity index 100%
rename from jdk/test/sun/security/ssl/javax/net/ssl/TLSv12/ShortRSAKey512.java
rename to jdk/test/javax/net/ssl/TLSv12/ShortRSAKey512.java
diff --git a/jdk/test/sun/security/ssl/javax/net/ssl/TLSv12/ShortRSAKeyGCM.java b/jdk/test/javax/net/ssl/TLSv12/ShortRSAKeyGCM.java
similarity index 100%
rename from jdk/test/sun/security/ssl/javax/net/ssl/TLSv12/ShortRSAKeyGCM.java
rename to jdk/test/javax/net/ssl/TLSv12/ShortRSAKeyGCM.java
diff --git a/jdk/test/sun/security/ssl/etc/keystore b/jdk/test/javax/net/ssl/etc/keystore
similarity index 100%
rename from jdk/test/sun/security/ssl/etc/keystore
rename to jdk/test/javax/net/ssl/etc/keystore
diff --git a/jdk/test/sun/security/ssl/etc/truststore b/jdk/test/javax/net/ssl/etc/truststore
similarity index 100%
rename from jdk/test/sun/security/ssl/etc/truststore
rename to jdk/test/javax/net/ssl/etc/truststore
diff --git a/jdk/test/sun/security/ssl/etc/unknown_keystore b/jdk/test/javax/net/ssl/etc/unknown_keystore
similarity index 100%
rename from jdk/test/sun/security/ssl/etc/unknown_keystore
rename to jdk/test/javax/net/ssl/etc/unknown_keystore
diff --git a/jdk/test/sun/security/ssl/sanity/ciphersuites/CheckCipherSuites.java b/jdk/test/javax/net/ssl/sanity/ciphersuites/CheckCipherSuites.java
similarity index 100%
rename from jdk/test/sun/security/ssl/sanity/ciphersuites/CheckCipherSuites.java
rename to jdk/test/javax/net/ssl/sanity/ciphersuites/CheckCipherSuites.java
diff --git a/jdk/test/sun/security/ssl/sanity/ciphersuites/CipherSuitesInOrder.java b/jdk/test/javax/net/ssl/sanity/ciphersuites/CipherSuitesInOrder.java
similarity index 100%
rename from jdk/test/sun/security/ssl/sanity/ciphersuites/CipherSuitesInOrder.java
rename to jdk/test/javax/net/ssl/sanity/ciphersuites/CipherSuitesInOrder.java
diff --git a/jdk/test/sun/security/ssl/sanity/ciphersuites/NoKerberos.java b/jdk/test/javax/net/ssl/sanity/ciphersuites/NoKerberos.java
similarity index 100%
rename from jdk/test/sun/security/ssl/sanity/ciphersuites/NoKerberos.java
rename to jdk/test/javax/net/ssl/sanity/ciphersuites/NoKerberos.java
diff --git a/jdk/test/sun/security/ssl/sanity/interop/CipherTest.java b/jdk/test/javax/net/ssl/sanity/interop/CipherTest.java
similarity index 100%
rename from jdk/test/sun/security/ssl/sanity/interop/CipherTest.java
rename to jdk/test/javax/net/ssl/sanity/interop/CipherTest.java
diff --git a/jdk/test/sun/security/ssl/sanity/interop/ClientJSSEServerJSSE.java b/jdk/test/javax/net/ssl/sanity/interop/ClientJSSEServerJSSE.java
similarity index 100%
rename from jdk/test/sun/security/ssl/sanity/interop/ClientJSSEServerJSSE.java
rename to jdk/test/javax/net/ssl/sanity/interop/ClientJSSEServerJSSE.java
diff --git a/jdk/test/sun/security/ssl/sanity/interop/JSSEClient.java b/jdk/test/javax/net/ssl/sanity/interop/JSSEClient.java
similarity index 100%
rename from jdk/test/sun/security/ssl/sanity/interop/JSSEClient.java
rename to jdk/test/javax/net/ssl/sanity/interop/JSSEClient.java
diff --git a/jdk/test/sun/security/ssl/sanity/interop/JSSEServer.java b/jdk/test/javax/net/ssl/sanity/interop/JSSEServer.java
similarity index 100%
rename from jdk/test/sun/security/ssl/sanity/interop/JSSEServer.java
rename to jdk/test/javax/net/ssl/sanity/interop/JSSEServer.java
diff --git a/jdk/test/sun/security/ssl/sanity/pluggability/CheckSSLContextExport.java b/jdk/test/javax/net/ssl/sanity/pluggability/CheckSSLContextExport.java
similarity index 100%
rename from jdk/test/sun/security/ssl/sanity/pluggability/CheckSSLContextExport.java
rename to jdk/test/javax/net/ssl/sanity/pluggability/CheckSSLContextExport.java
diff --git a/jdk/test/sun/security/ssl/sanity/pluggability/CheckSockFacExport1.java b/jdk/test/javax/net/ssl/sanity/pluggability/CheckSockFacExport1.java
similarity index 100%
rename from jdk/test/sun/security/ssl/sanity/pluggability/CheckSockFacExport1.java
rename to jdk/test/javax/net/ssl/sanity/pluggability/CheckSockFacExport1.java
diff --git a/jdk/test/sun/security/ssl/sanity/pluggability/CheckSockFacExport2.java b/jdk/test/javax/net/ssl/sanity/pluggability/CheckSockFacExport2.java
similarity index 100%
rename from jdk/test/sun/security/ssl/sanity/pluggability/CheckSockFacExport2.java
rename to jdk/test/javax/net/ssl/sanity/pluggability/CheckSockFacExport2.java
diff --git a/jdk/test/sun/security/ssl/sanity/pluggability/CipherSuites.java b/jdk/test/javax/net/ssl/sanity/pluggability/CipherSuites.java
similarity index 100%
rename from jdk/test/sun/security/ssl/sanity/pluggability/CipherSuites.java
rename to jdk/test/javax/net/ssl/sanity/pluggability/CipherSuites.java
diff --git a/jdk/test/sun/security/ssl/sanity/pluggability/MySSLContextImpl.java b/jdk/test/javax/net/ssl/sanity/pluggability/MySSLContextImpl.java
similarity index 100%
rename from jdk/test/sun/security/ssl/sanity/pluggability/MySSLContextImpl.java
rename to jdk/test/javax/net/ssl/sanity/pluggability/MySSLContextImpl.java
diff --git a/jdk/test/sun/security/ssl/sanity/pluggability/MySSLEngineImpl.java b/jdk/test/javax/net/ssl/sanity/pluggability/MySSLEngineImpl.java
similarity index 100%
rename from jdk/test/sun/security/ssl/sanity/pluggability/MySSLEngineImpl.java
rename to jdk/test/javax/net/ssl/sanity/pluggability/MySSLEngineImpl.java
diff --git a/jdk/test/sun/security/ssl/sanity/pluggability/MySSLServerSocketFacImpl.java b/jdk/test/javax/net/ssl/sanity/pluggability/MySSLServerSocketFacImpl.java
similarity index 100%
rename from jdk/test/sun/security/ssl/sanity/pluggability/MySSLServerSocketFacImpl.java
rename to jdk/test/javax/net/ssl/sanity/pluggability/MySSLServerSocketFacImpl.java
diff --git a/jdk/test/sun/security/ssl/sanity/pluggability/MySSLSocketFacImpl.java b/jdk/test/javax/net/ssl/sanity/pluggability/MySSLSocketFacImpl.java
similarity index 100%
rename from jdk/test/sun/security/ssl/sanity/pluggability/MySSLSocketFacImpl.java
rename to jdk/test/javax/net/ssl/sanity/pluggability/MySSLSocketFacImpl.java
diff --git a/jdk/test/sun/security/ssl/templates/SSLCapabilities.java b/jdk/test/javax/net/ssl/templates/SSLCapabilities.java
similarity index 100%
rename from jdk/test/sun/security/ssl/templates/SSLCapabilities.java
rename to jdk/test/javax/net/ssl/templates/SSLCapabilities.java
diff --git a/jdk/test/sun/security/ssl/templates/SSLEngineTemplate.java b/jdk/test/javax/net/ssl/templates/SSLEngineTemplate.java
similarity index 100%
rename from jdk/test/sun/security/ssl/templates/SSLEngineTemplate.java
rename to jdk/test/javax/net/ssl/templates/SSLEngineTemplate.java
diff --git a/jdk/test/sun/security/ssl/templates/SSLExplorer.java b/jdk/test/javax/net/ssl/templates/SSLExplorer.java
similarity index 100%
rename from jdk/test/sun/security/ssl/templates/SSLExplorer.java
rename to jdk/test/javax/net/ssl/templates/SSLExplorer.java
diff --git a/jdk/test/sun/security/ssl/templates/SSLSocketSSLEngineTemplate.java b/jdk/test/javax/net/ssl/templates/SSLSocketSSLEngineTemplate.java
similarity index 99%
rename from jdk/test/sun/security/ssl/templates/SSLSocketSSLEngineTemplate.java
rename to jdk/test/javax/net/ssl/templates/SSLSocketSSLEngineTemplate.java
index d61a1e5345e279836cf14ada80ba51ff655f4332..e82fd6402fd5f8f7ebbaaca13e2fdf333e0457e9 100644
--- a/jdk/test/sun/security/ssl/templates/SSLSocketSSLEngineTemplate.java
+++ b/jdk/test/javax/net/ssl/templates/SSLSocketSSLEngineTemplate.java
@@ -124,7 +124,7 @@ public class SSLSocketSSLEngineTemplate {
/*
* The following is to set up the keystores/trust material.
*/
- private static final String pathToStores = "../etc/";
+ private static final String pathToStores = "../etc";
private static final String keyStoreFile = "keystore";
private static final String trustStoreFile = "truststore";
private static final String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/templates/SSLSocketTemplate.java b/jdk/test/javax/net/ssl/templates/SSLSocketTemplate.java
similarity index 100%
rename from jdk/test/sun/security/ssl/templates/SSLSocketTemplate.java
rename to jdk/test/javax/net/ssl/templates/SSLSocketTemplate.java
diff --git a/jdk/test/sun/security/ssl/sun/net/www/httpstest/AbstractCallback.java b/jdk/test/sun/net/www/protocol/https/AbstractCallback.java
similarity index 100%
rename from jdk/test/sun/security/ssl/sun/net/www/httpstest/AbstractCallback.java
rename to jdk/test/sun/net/www/protocol/https/AbstractCallback.java
diff --git a/jdk/test/sun/security/ssl/sun/net/www/http/ChunkedOutputStream/Test.java b/jdk/test/sun/net/www/protocol/https/ChunkedOutputStream.java
similarity index 97%
rename from jdk/test/sun/security/ssl/sun/net/www/http/ChunkedOutputStream/Test.java
rename to jdk/test/sun/net/www/protocol/https/ChunkedOutputStream.java
index 67fe5c229f714eb1a08869b8b897ee6ef88347a6..cce270642cecd30a61a6df5a45b25841932c5634 100644
--- a/jdk/test/sun/security/ssl/sun/net/www/http/ChunkedOutputStream/Test.java
+++ b/jdk/test/sun/net/www/protocol/https/ChunkedOutputStream.java
@@ -26,7 +26,7 @@
* @bug 5026745
* @library ../../httpstest/
* @build TestHttpsServer HttpCallback
- * @run main/othervm Test
+ * @run main/othervm ChunkedOutputStream
*
* SunJSSE does not support dynamic system properties, no way to re-use
* system properties in samevm/agentvm mode.
@@ -37,11 +37,11 @@ import java.io.*;
import java.net.*;
import javax.net.ssl.*;
-public class Test implements HttpCallback {
+public class ChunkedOutputStream implements HttpCallback {
/*
* Where do we find the keystores for ssl?
*/
- static String pathToStores = "../../../../../etc";
+ static String pathToStores = "../../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
@@ -297,7 +297,8 @@ public class Test implements HttpCallback {
HttpsURLConnection.setDefaultHostnameVerifier(new NameVerifier());
try {
- server = new TestHttpsServer (new Test(), 1, 10, 0);
+ server = new TestHttpsServer(
+ new ChunkedOutputStream(), 1, 10, 0);
System.out.println ("Server started: listening on port: " + server.getLocalPort());
// the test server doesn't support keep-alive yet
// test1("http://localhost:"+server.getLocalPort()+"/d0");
diff --git a/jdk/test/sun/security/ssl/sun/net/www/httpstest/ClosedChannelList.java b/jdk/test/sun/net/www/protocol/https/ClosedChannelList.java
similarity index 100%
rename from jdk/test/sun/security/ssl/sun/net/www/httpstest/ClosedChannelList.java
rename to jdk/test/sun/net/www/protocol/https/ClosedChannelList.java
diff --git a/jdk/test/sun/security/ssl/sun/net/www/httpstest/HttpCallback.java b/jdk/test/sun/net/www/protocol/https/HttpCallback.java
similarity index 100%
rename from jdk/test/sun/security/ssl/sun/net/www/httpstest/HttpCallback.java
rename to jdk/test/sun/net/www/protocol/https/HttpCallback.java
diff --git a/jdk/test/sun/security/ssl/sun/net/www/httpstest/HttpTransaction.java b/jdk/test/sun/net/www/protocol/https/HttpTransaction.java
similarity index 100%
rename from jdk/test/sun/security/ssl/sun/net/www/httpstest/HttpTransaction.java
rename to jdk/test/sun/net/www/protocol/https/HttpTransaction.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/MyKeyManager.java b/jdk/test/sun/net/www/protocol/https/HttpsClient/MyKeyManager.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/MyKeyManager.java
rename to jdk/test/sun/net/www/protocol/https/HttpsClient/MyKeyManager.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/OriginServer.java b/jdk/test/sun/net/www/protocol/https/HttpsClient/OriginServer.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/OriginServer.java
rename to jdk/test/sun/net/www/protocol/https/HttpsClient/OriginServer.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/ProxyAuthTest.java b/jdk/test/sun/net/www/protocol/https/HttpsClient/ProxyAuthTest.java
similarity index 98%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/ProxyAuthTest.java
rename to jdk/test/sun/net/www/protocol/https/HttpsClient/ProxyAuthTest.java
index a4ef930ff6450e5a4c1ac5a0c0725b3ae2b1c27b..8fa75aa81c2e073331f84819a5d99a70597eb5cc 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/ProxyAuthTest.java
+++ b/jdk/test/sun/net/www/protocol/https/HttpsClient/ProxyAuthTest.java
@@ -50,7 +50,7 @@ public class ProxyAuthTest {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../../../../../../etc";
+ static String pathToStores = "../../../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/ProxyTunnelServer.java b/jdk/test/sun/net/www/protocol/https/HttpsClient/ProxyTunnelServer.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/ProxyTunnelServer.java
rename to jdk/test/sun/net/www/protocol/https/HttpsClient/ProxyTunnelServer.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/ServerIdentityTest.java b/jdk/test/sun/net/www/protocol/https/HttpsClient/ServerIdentityTest.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/ServerIdentityTest.java
rename to jdk/test/sun/net/www/protocol/https/HttpsClient/ServerIdentityTest.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/dnsstore b/jdk/test/sun/net/www/protocol/https/HttpsClient/dnsstore
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/dnsstore
rename to jdk/test/sun/net/www/protocol/https/HttpsClient/dnsstore
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/ipstore b/jdk/test/sun/net/www/protocol/https/HttpsClient/ipstore
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/ipstore
rename to jdk/test/sun/net/www/protocol/https/HttpsClient/ipstore
diff --git a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/B6216082.java b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/B6216082.java
similarity index 98%
rename from jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/B6216082.java
rename to jdk/test/sun/net/www/protocol/https/HttpsURLConnection/B6216082.java
index 4df22a85c45e46e069ae24b5d7d134446f6e5139..a59925790251ff38b50c5ad82554eab9b4cab174 100644
--- a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/B6216082.java
+++ b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/B6216082.java
@@ -24,7 +24,7 @@
/*
* @test
* @bug 6216082
- * @library ../../../httpstest/
+ * @library ..
* @build HttpCallback TestHttpsServer ClosedChannelList HttpTransaction TunnelProxy
* @summary Redirect problem with HttpsURLConnection using a proxy
* SunJSSE does not support dynamic system properties, no way to re-use
@@ -83,7 +83,7 @@ public class B6216082 {
/*
* Where do we find the keystores for ssl?
*/
- static String pathToStores = "../../../../../../etc";
+ static String pathToStores = "../../../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/B6226610.java b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/B6226610.java
similarity index 100%
rename from jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/B6226610.java
rename to jdk/test/sun/net/www/protocol/https/HttpsURLConnection/B6226610.java
diff --git a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/CheckMethods.java b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/CheckMethods.java
similarity index 100%
rename from jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/CheckMethods.java
rename to jdk/test/sun/net/www/protocol/https/HttpsURLConnection/CheckMethods.java
diff --git a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/CloseKeepAliveCached.java b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/CloseKeepAliveCached.java
similarity index 99%
rename from jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/CloseKeepAliveCached.java
rename to jdk/test/sun/net/www/protocol/https/HttpsURLConnection/CloseKeepAliveCached.java
index c025c6ef1b9b0ece891c9c7f6cd51df94a8765cf..559f7af98ce472a4dfde51120938931e0746a4e6 100644
--- a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/CloseKeepAliveCached.java
+++ b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/CloseKeepAliveCached.java
@@ -62,7 +62,7 @@ public class CloseKeepAliveCached {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../../../etc";
+ static String pathToStores = "../../../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/CookieHandlerTest.java b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/CookieHandlerTest.java
similarity index 99%
rename from jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/CookieHandlerTest.java
rename to jdk/test/sun/net/www/protocol/https/HttpsURLConnection/CookieHandlerTest.java
index 2e7d3fb8843ea6c04177db1047518be742c60aa8..565138c143d375edb0c22af96d7822c8d5b117ae 100644
--- a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/CookieHandlerTest.java
+++ b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/CookieHandlerTest.java
@@ -56,7 +56,7 @@ public class CookieHandlerTest {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../../../etc";
+ static String pathToStores = "../../../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/CookieHttpsClientTest.java b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/CookieHttpsClientTest.java
similarity index 99%
rename from jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/CookieHttpsClientTest.java
rename to jdk/test/sun/net/www/protocol/https/HttpsURLConnection/CookieHttpsClientTest.java
index 21006f0803d48a43815b83a4c593c8abba9b66cf..82b54dfd08b1dd1f0eb5e0f6d90b25bd4321bc2d 100644
--- a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/CookieHttpsClientTest.java
+++ b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/CookieHttpsClientTest.java
@@ -69,7 +69,7 @@ public class CookieHttpsClientTest {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../../../etc";
+ static String pathToStores = "../../../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/DNSIdentities.java b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/DNSIdentities.java
similarity index 100%
rename from jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/DNSIdentities.java
rename to jdk/test/sun/net/www/protocol/https/HttpsURLConnection/DNSIdentities.java
diff --git a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsCreateSockTest.java b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/HttpsCreateSockTest.java
similarity index 99%
rename from jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsCreateSockTest.java
rename to jdk/test/sun/net/www/protocol/https/HttpsURLConnection/HttpsCreateSockTest.java
index 08d969d057907a4de7ef70b0c09f6710f1a405e1..a7e0bc3ab1443a106d5d931c8d8c76b9726dddae 100644
--- a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsCreateSockTest.java
+++ b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/HttpsCreateSockTest.java
@@ -63,7 +63,7 @@ public class HttpsCreateSockTest
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../../../etc";
+ static String pathToStores = "../../../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsPost.java b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/HttpsPost.java
similarity index 99%
rename from jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsPost.java
rename to jdk/test/sun/net/www/protocol/https/HttpsURLConnection/HttpsPost.java
index 8d265f11c3af52fe44e1d667a1abadc9c4a1e79e..7964234dbfd1f6448c5babcd175eb86a3c4db5c7 100644
--- a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsPost.java
+++ b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/HttpsPost.java
@@ -54,7 +54,7 @@ public class HttpsPost {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../../../etc";
+ static String pathToStores = "../../../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsProxyStackOverflow.java b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/HttpsProxyStackOverflow.java
similarity index 100%
rename from jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsProxyStackOverflow.java
rename to jdk/test/sun/net/www/protocol/https/HttpsURLConnection/HttpsProxyStackOverflow.java
diff --git a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsSocketFacTest.java b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/HttpsSocketFacTest.java
similarity index 99%
rename from jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsSocketFacTest.java
rename to jdk/test/sun/net/www/protocol/https/HttpsURLConnection/HttpsSocketFacTest.java
index 043f612cf3cbae2712f4ec0b7e67653131a5d3ea..4011cea722e3a8b722f0a6768b51f32273da806e 100644
--- a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsSocketFacTest.java
+++ b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/HttpsSocketFacTest.java
@@ -63,7 +63,7 @@ public class HttpsSocketFacTest
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../../../etc";
+ static String pathToStores = "../../../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/IPAddressDNSIdentities.java b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/IPAddressDNSIdentities.java
similarity index 100%
rename from jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/IPAddressDNSIdentities.java
rename to jdk/test/sun/net/www/protocol/https/HttpsURLConnection/IPAddressDNSIdentities.java
diff --git a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/IPAddressIPIdentities.java b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/IPAddressIPIdentities.java
similarity index 100%
rename from jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/IPAddressIPIdentities.java
rename to jdk/test/sun/net/www/protocol/https/HttpsURLConnection/IPAddressIPIdentities.java
diff --git a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/IPIdentities.java b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/IPIdentities.java
similarity index 100%
rename from jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/IPIdentities.java
rename to jdk/test/sun/net/www/protocol/https/HttpsURLConnection/IPIdentities.java
diff --git a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/Identities.java b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/Identities.java
similarity index 100%
rename from jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/Identities.java
rename to jdk/test/sun/net/www/protocol/https/HttpsURLConnection/Identities.java
diff --git a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/OriginServer.java b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/OriginServer.java
similarity index 100%
rename from jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/OriginServer.java
rename to jdk/test/sun/net/www/protocol/https/HttpsURLConnection/OriginServer.java
diff --git a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.java b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.java
similarity index 99%
rename from jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.java
rename to jdk/test/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.java
index 3908db8ce1b28ca95414dcdc12347db045a8945b..2ad8a0fde0be5876b1fae510812ad12416b00cd6 100644
--- a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.java
+++ b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.java
@@ -45,7 +45,7 @@ public class PostThruProxy {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../../../etc";
+ static String pathToStores = "../../../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh
similarity index 100%
rename from jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh
rename to jdk/test/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh
diff --git a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.java b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.java
similarity index 99%
rename from jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.java
rename to jdk/test/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.java
index d3e7ddae4ff4f0ae4411bbd7c2e79a382acb8591..1a505ac1f341a8839e65a853858ce6c59c804081 100644
--- a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.java
+++ b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.java
@@ -46,7 +46,7 @@ public class PostThruProxyWithAuth {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../../../etc";
+ static String pathToStores = "../../../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh
similarity index 100%
rename from jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh
rename to jdk/test/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh
diff --git a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/ProxyTunnelServer.java b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/ProxyTunnelServer.java
similarity index 100%
rename from jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/ProxyTunnelServer.java
rename to jdk/test/sun/net/www/protocol/https/HttpsURLConnection/ProxyTunnelServer.java
diff --git a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/ReadTimeout.java b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/ReadTimeout.java
similarity index 99%
rename from jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/ReadTimeout.java
rename to jdk/test/sun/net/www/protocol/https/HttpsURLConnection/ReadTimeout.java
index cfaaeb456fe5dd56f65ef293d1a4f3ac68e8977c..834d984cc6adcb86f28eb8566753b9c6fde05b56 100644
--- a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/ReadTimeout.java
+++ b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/ReadTimeout.java
@@ -55,7 +55,7 @@ public class ReadTimeout {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../../../etc";
+ static String pathToStores = "../../../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/Redirect.java b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/Redirect.java
similarity index 99%
rename from jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/Redirect.java
rename to jdk/test/sun/net/www/protocol/https/HttpsURLConnection/Redirect.java
index 276f96c6d2576c1c9c198788c3540493d8679871..eacabdd9961eb1f67f02349be9f136fa9f914625 100644
--- a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/Redirect.java
+++ b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/Redirect.java
@@ -54,7 +54,7 @@ public class Redirect {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../../../etc";
+ static String pathToStores = "../../../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/RetryHttps.java b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/RetryHttps.java
similarity index 99%
rename from jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/RetryHttps.java
rename to jdk/test/sun/net/www/protocol/https/HttpsURLConnection/RetryHttps.java
index c665af0fda76a7678fff42fb1a0d07c774990c9e..a21c1b061e85c8f09eb0da5d2561cfcc87f7a524 100644
--- a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/RetryHttps.java
+++ b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/RetryHttps.java
@@ -56,7 +56,7 @@ public class RetryHttps {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../../../etc";
+ static String pathToStores = "../../../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/TunnelProxy.java b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/TunnelProxy.java
similarity index 100%
rename from jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/TunnelProxy.java
rename to jdk/test/sun/net/www/protocol/https/HttpsURLConnection/TunnelProxy.java
diff --git a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/NewImpl/ComHTTPSConnection.java b/jdk/test/sun/net/www/protocol/https/NewImpl/ComHTTPSConnection.java
similarity index 99%
rename from jdk/test/sun/security/ssl/sun/net/www/protocol/https/NewImpl/ComHTTPSConnection.java
rename to jdk/test/sun/net/www/protocol/https/NewImpl/ComHTTPSConnection.java
index 4149bd4be1278349b76935f8d8b2827b31bb4e58..ce6f59c890925674a0ec1e72ed58327af7bf95af 100644
--- a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/NewImpl/ComHTTPSConnection.java
+++ b/jdk/test/sun/net/www/protocol/https/NewImpl/ComHTTPSConnection.java
@@ -61,7 +61,7 @@ public class ComHTTPSConnection {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../../../etc";
+ static String pathToStores = "../../../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/NewImpl/ComHostnameVerifier.java b/jdk/test/sun/net/www/protocol/https/NewImpl/ComHostnameVerifier.java
similarity index 100%
rename from jdk/test/sun/security/ssl/sun/net/www/protocol/https/NewImpl/ComHostnameVerifier.java
rename to jdk/test/sun/net/www/protocol/https/NewImpl/ComHostnameVerifier.java
diff --git a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/NewImpl/JavaxHTTPSConnection.java b/jdk/test/sun/net/www/protocol/https/NewImpl/JavaxHTTPSConnection.java
similarity index 99%
rename from jdk/test/sun/security/ssl/sun/net/www/protocol/https/NewImpl/JavaxHTTPSConnection.java
rename to jdk/test/sun/net/www/protocol/https/NewImpl/JavaxHTTPSConnection.java
index 06b0162b570c90816e45b2db5a73cce59aaff11b..196f1d4bf0f26c3c12d439f3e41fc44eda2c1ab9 100644
--- a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/NewImpl/JavaxHTTPSConnection.java
+++ b/jdk/test/sun/net/www/protocol/https/NewImpl/JavaxHTTPSConnection.java
@@ -59,7 +59,7 @@ public class JavaxHTTPSConnection {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../../../etc";
+ static String pathToStores = "../../../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/NewImpl/JavaxHostnameVerifier.java b/jdk/test/sun/net/www/protocol/https/NewImpl/JavaxHostnameVerifier.java
similarity index 100%
rename from jdk/test/sun/security/ssl/sun/net/www/protocol/https/NewImpl/JavaxHostnameVerifier.java
rename to jdk/test/sun/net/www/protocol/https/NewImpl/JavaxHostnameVerifier.java
diff --git a/jdk/test/sun/security/ssl/sun/net/www/httpstest/TestHttpsServer.java b/jdk/test/sun/net/www/protocol/https/TestHttpsServer.java
similarity index 100%
rename from jdk/test/sun/security/ssl/sun/net/www/httpstest/TestHttpsServer.java
rename to jdk/test/sun/net/www/protocol/https/TestHttpsServer.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/AppInputStream/ReadBlocksClose.java b/jdk/test/sun/security/ssl/AppInputStream/ReadBlocksClose.java
similarity index 99%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/AppInputStream/ReadBlocksClose.java
rename to jdk/test/sun/security/ssl/AppInputStream/ReadBlocksClose.java
index e14976ce777881ddc20a558fb27e9c25aa634134..b6e83da5cfe698d2c9a55ac855ee7be58de4e9c7 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/AppInputStream/ReadBlocksClose.java
+++ b/jdk/test/sun/security/ssl/AppInputStream/ReadBlocksClose.java
@@ -54,7 +54,7 @@ public class ReadBlocksClose {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../../../../etc";
+ static String pathToStores = "../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/AppInputStream/ReadHandshake.java b/jdk/test/sun/security/ssl/AppInputStream/ReadHandshake.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/AppInputStream/ReadHandshake.java
rename to jdk/test/sun/security/ssl/AppInputStream/ReadHandshake.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/AppInputStream/ReadZeroBytes.java b/jdk/test/sun/security/ssl/AppInputStream/ReadZeroBytes.java
similarity index 99%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/AppInputStream/ReadZeroBytes.java
rename to jdk/test/sun/security/ssl/AppInputStream/ReadZeroBytes.java
index 566fdc034a347d4411801099e907b92bf3428390..931f07dfa2deec22bbb66fdb88105fa6ee9fb930 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/AppInputStream/ReadZeroBytes.java
+++ b/jdk/test/sun/security/ssl/AppInputStream/ReadZeroBytes.java
@@ -53,7 +53,7 @@ public class ReadZeroBytes {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../../../../etc";
+ static String pathToStores = "../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/AppInputStream/RemoveMarkReset.java b/jdk/test/sun/security/ssl/AppInputStream/RemoveMarkReset.java
similarity index 99%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/AppInputStream/RemoveMarkReset.java
rename to jdk/test/sun/security/ssl/AppInputStream/RemoveMarkReset.java
index 096f12f8a87c2604e8759267fb7ccbeed9fa8714..819b1744e5858cebc73973526860c710b3aef131 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/AppInputStream/RemoveMarkReset.java
+++ b/jdk/test/sun/security/ssl/AppInputStream/RemoveMarkReset.java
@@ -54,7 +54,7 @@ public class RemoveMarkReset {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../../../../etc";
+ static String pathToStores = "../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/AppOutputStream/NoExceptionOnClose.java b/jdk/test/sun/security/ssl/AppOutputStream/NoExceptionOnClose.java
similarity index 99%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/AppOutputStream/NoExceptionOnClose.java
rename to jdk/test/sun/security/ssl/AppOutputStream/NoExceptionOnClose.java
index a085d47ff04bf146ab369bfa44b8442da573e51b..f6c129e9bba09c0eed7043c75319eeb423a1b4aa 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/AppOutputStream/NoExceptionOnClose.java
+++ b/jdk/test/sun/security/ssl/AppOutputStream/NoExceptionOnClose.java
@@ -54,7 +54,7 @@ public class NoExceptionOnClose {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../../../../etc";
+ static String pathToStores = "../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/CipherSuite/SSL_NULL.java b/jdk/test/sun/security/ssl/CipherSuite/SSL_NULL.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/CipherSuite/SSL_NULL.java
rename to jdk/test/sun/security/ssl/CipherSuite/SSL_NULL.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ClientHandshaker/CipherSuiteOrder.java b/jdk/test/sun/security/ssl/ClientHandshaker/CipherSuiteOrder.java
similarity index 99%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ClientHandshaker/CipherSuiteOrder.java
rename to jdk/test/sun/security/ssl/ClientHandshaker/CipherSuiteOrder.java
index 75e7436291fac974bd8da7349f6b9bbc525be019..5276fcba027ea2b1d52a8c7812c04bd8af9d1d3a 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ClientHandshaker/CipherSuiteOrder.java
+++ b/jdk/test/sun/security/ssl/ClientHandshaker/CipherSuiteOrder.java
@@ -55,7 +55,7 @@ public class CipherSuiteOrder {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "/../../../../../../../etc";
+ static String pathToStores = "../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ClientHandshaker/RSAExport.java b/jdk/test/sun/security/ssl/ClientHandshaker/RSAExport.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ClientHandshaker/RSAExport.java
rename to jdk/test/sun/security/ssl/ClientHandshaker/RSAExport.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/DHKeyExchange/DHEKeySizing.java b/jdk/test/sun/security/ssl/DHKeyExchange/DHEKeySizing.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/DHKeyExchange/DHEKeySizing.java
rename to jdk/test/sun/security/ssl/DHKeyExchange/DHEKeySizing.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.java b/jdk/test/sun/security/ssl/EngineArgs/DebugReportsOneExtraByte.java
similarity index 99%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.java
rename to jdk/test/sun/security/ssl/EngineArgs/DebugReportsOneExtraByte.java
index fc6eafa259a44119c24cf0b111dc335554898ae7..6fff6db076dc3b1f27487b1e95424de22fce9315 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.java
+++ b/jdk/test/sun/security/ssl/EngineArgs/DebugReportsOneExtraByte.java
@@ -114,7 +114,7 @@ public class DebugReportsOneExtraByte {
/*
* The following is to set up the keystores.
*/
- private static String pathToStores = "../../../../../../../etc";
+ private static String pathToStores = "../../../../javax/net/ssl/etc";
private static String keyStoreFile = "keystore";
private static String trustStoreFile = "truststore";
private static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh b/jdk/test/sun/security/ssl/EngineArgs/DebugReportsOneExtraByte.sh
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh
rename to jdk/test/sun/security/ssl/EngineArgs/DebugReportsOneExtraByte.sh
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/ClientThread.java b/jdk/test/sun/security/ssl/GenSSLConfigs/ClientThread.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/ClientThread.java
rename to jdk/test/sun/security/ssl/GenSSLConfigs/ClientThread.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/Handler.java b/jdk/test/sun/security/ssl/GenSSLConfigs/Handler.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/Handler.java
rename to jdk/test/sun/security/ssl/GenSSLConfigs/Handler.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/ServerHandler.java b/jdk/test/sun/security/ssl/GenSSLConfigs/ServerHandler.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/ServerHandler.java
rename to jdk/test/sun/security/ssl/GenSSLConfigs/ServerHandler.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/ServerThread.java b/jdk/test/sun/security/ssl/GenSSLConfigs/ServerThread.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/ServerThread.java
rename to jdk/test/sun/security/ssl/GenSSLConfigs/ServerThread.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/TestThread.java b/jdk/test/sun/security/ssl/GenSSLConfigs/TestThread.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/TestThread.java
rename to jdk/test/sun/security/ssl/GenSSLConfigs/TestThread.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/Traffic.java b/jdk/test/sun/security/ssl/GenSSLConfigs/Traffic.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/Traffic.java
rename to jdk/test/sun/security/ssl/GenSSLConfigs/Traffic.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/main.java b/jdk/test/sun/security/ssl/GenSSLConfigs/main.java
similarity index 98%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/main.java
rename to jdk/test/sun/security/ssl/GenSSLConfigs/main.java
index dbe16292e04dd00e64a8ce4f3ec2dedcb3b59a51..13460595a8192d3d402cbef6a88cc0d99abfce3e 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/main.java
+++ b/jdk/test/sun/security/ssl/GenSSLConfigs/main.java
@@ -188,11 +188,11 @@ public class main
try {
String testRoot = System.getProperty("test.src", ".");
System.setProperty("javax.net.ssl.trustStore", testRoot
- + "/../../../../../../../etc/truststore");
+ + "/../../../../javax/net/ssl/etc/truststore");
KeyStore ks = KeyStore.getInstance("JKS");
ks.load(new FileInputStream(testRoot
- + "/../../../../../../../etc/keystore"),
+ + "/../../../../javax/net/ssl/etc/truststore"),
"passphrase".toCharArray());
KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
kmf.init(ks, "passphrase".toCharArray());
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/HandshakeOutStream/NullCerts.java b/jdk/test/sun/security/ssl/HandshakeOutStream/NullCerts.java
similarity index 98%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/HandshakeOutStream/NullCerts.java
rename to jdk/test/sun/security/ssl/HandshakeOutStream/NullCerts.java
index 13b615456fc869b439f2bfaa2bd719ad6a155992..51e37a0d5afc4fc201990ae475fe01a731a31c5a 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/HandshakeOutStream/NullCerts.java
+++ b/jdk/test/sun/security/ssl/HandshakeOutStream/NullCerts.java
@@ -56,8 +56,7 @@ public class NullCerts {
/*
* Where do we find the keystores?
*/
- // private final static String pathToStores = "./etc";
- private final static String pathToStores = "../../../../../../../etc";
+ private final static String pathToStores = "../../../../javax/net/ssl/etc";
private final static String keyStoreFile = "keystore";
private final static String trustStoreFile = "truststore";
private final static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/InputRecord/ClientHelloRead.java b/jdk/test/sun/security/ssl/InputRecord/ClientHelloRead.java
similarity index 99%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/InputRecord/ClientHelloRead.java
rename to jdk/test/sun/security/ssl/InputRecord/ClientHelloRead.java
index f123a3cef87f74942712fc03dfed91ac114f08f7..e7a11bd205eb885d0a0732a144c4c34f9d52e4e9 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/InputRecord/ClientHelloRead.java
+++ b/jdk/test/sun/security/ssl/InputRecord/ClientHelloRead.java
@@ -52,7 +52,7 @@ public class ClientHelloRead {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "/../../../../../../../etc";
+ static String pathToStores = "../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/InputRecord/OriginServer.java b/jdk/test/sun/security/ssl/InputRecord/OriginServer.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/InputRecord/OriginServer.java
rename to jdk/test/sun/security/ssl/InputRecord/OriginServer.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/InputRecord/ProxyTunnelServer.java b/jdk/test/sun/security/ssl/InputRecord/ProxyTunnelServer.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/InputRecord/ProxyTunnelServer.java
rename to jdk/test/sun/security/ssl/InputRecord/ProxyTunnelServer.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/InputRecord/SSLSocketTimeoutNulls.java b/jdk/test/sun/security/ssl/InputRecord/SSLSocketTimeoutNulls.java
similarity index 99%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/InputRecord/SSLSocketTimeoutNulls.java
rename to jdk/test/sun/security/ssl/InputRecord/SSLSocketTimeoutNulls.java
index 4a72a1ecf1e34e5ce0f04bbc8852d94267d5e5c9..21218f5e4e1c02987bb54cbc84fa6291c6ac7971 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/InputRecord/SSLSocketTimeoutNulls.java
+++ b/jdk/test/sun/security/ssl/InputRecord/SSLSocketTimeoutNulls.java
@@ -58,7 +58,7 @@ public class SSLSocketTimeoutNulls {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "/../../../../../../../etc";
+ static String pathToStores = "../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ProtocolVersion/HttpsProtocols.java b/jdk/test/sun/security/ssl/ProtocolVersion/HttpsProtocols.java
similarity index 99%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ProtocolVersion/HttpsProtocols.java
rename to jdk/test/sun/security/ssl/ProtocolVersion/HttpsProtocols.java
index bcdc16d4a3cccfd461a63dcc6e834e9489486fc4..1190ece839700d89f8b244e77456f843f6d40cda 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ProtocolVersion/HttpsProtocols.java
+++ b/jdk/test/sun/security/ssl/ProtocolVersion/HttpsProtocols.java
@@ -51,7 +51,7 @@ public class HttpsProtocols implements HostnameVerifier {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../../../../etc";
+ static String pathToStores = "../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/BadKSProvider.java b/jdk/test/sun/security/ssl/SSLContextImpl/BadKSProvider.java
similarity index 99%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/BadKSProvider.java
rename to jdk/test/sun/security/ssl/SSLContextImpl/BadKSProvider.java
index 8e5f931e0a4b958a7f0fd40f0cef1187c16e20c1..9fdc0797f945ec3a7b8a484f19deffe7b3048842 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/BadKSProvider.java
+++ b/jdk/test/sun/security/ssl/SSLContextImpl/BadKSProvider.java
@@ -53,7 +53,7 @@ public class BadKSProvider {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "/../../../../../../../etc";
+ static String pathToStores = "../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/BadTSProvider.java b/jdk/test/sun/security/ssl/SSLContextImpl/BadTSProvider.java
similarity index 99%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/BadTSProvider.java
rename to jdk/test/sun/security/ssl/SSLContextImpl/BadTSProvider.java
index 93355acf93d156a796a1e6d7f2d068d69e9655a8..bf68126c4c97fc2e9685c8746a37c159794c344d 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/BadTSProvider.java
+++ b/jdk/test/sun/security/ssl/SSLContextImpl/BadTSProvider.java
@@ -53,7 +53,7 @@ public class BadTSProvider {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "/../../../../../../../etc";
+ static String pathToStores = "../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/CustomizedDefaultProtocols.java b/jdk/test/sun/security/ssl/SSLContextImpl/CustomizedDefaultProtocols.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/CustomizedDefaultProtocols.java
rename to jdk/test/sun/security/ssl/SSLContextImpl/CustomizedDefaultProtocols.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/DefaultEnabledProtocols.java b/jdk/test/sun/security/ssl/SSLContextImpl/DefaultEnabledProtocols.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/DefaultEnabledProtocols.java
rename to jdk/test/sun/security/ssl/SSLContextImpl/DefaultEnabledProtocols.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/GoodProvider.java b/jdk/test/sun/security/ssl/SSLContextImpl/GoodProvider.java
similarity index 99%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/GoodProvider.java
rename to jdk/test/sun/security/ssl/SSLContextImpl/GoodProvider.java
index 0ca10ec0d8c4d3a70f702afa22e868dcccec72ef..d97e5d35d7a37953fa1319fe22c15fe24c12230d 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/GoodProvider.java
+++ b/jdk/test/sun/security/ssl/SSLContextImpl/GoodProvider.java
@@ -53,7 +53,7 @@ public class GoodProvider {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "/../../../../../../../etc";
+ static String pathToStores = "../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/IllegalProtocolProperty.java b/jdk/test/sun/security/ssl/SSLContextImpl/IllegalProtocolProperty.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/IllegalProtocolProperty.java
rename to jdk/test/sun/security/ssl/SSLContextImpl/IllegalProtocolProperty.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/MD2InTrustAnchor.java b/jdk/test/sun/security/ssl/SSLContextImpl/MD2InTrustAnchor.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/MD2InTrustAnchor.java
rename to jdk/test/sun/security/ssl/SSLContextImpl/MD2InTrustAnchor.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/NoOldVersionContext.java b/jdk/test/sun/security/ssl/SSLContextImpl/NoOldVersionContext.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/NoOldVersionContext.java
rename to jdk/test/sun/security/ssl/SSLContextImpl/NoOldVersionContext.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/NullGetAcceptedIssuers.java b/jdk/test/sun/security/ssl/SSLContextImpl/NullGetAcceptedIssuers.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/NullGetAcceptedIssuers.java
rename to jdk/test/sun/security/ssl/SSLContextImpl/NullGetAcceptedIssuers.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/SSLContextVersion.java b/jdk/test/sun/security/ssl/SSLContextImpl/SSLContextVersion.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/SSLContextVersion.java
rename to jdk/test/sun/security/ssl/SSLContextImpl/SSLContextVersion.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/TrustTrustedCert.java b/jdk/test/sun/security/ssl/SSLContextImpl/TrustTrustedCert.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/TrustTrustedCert.java
rename to jdk/test/sun/security/ssl/SSLContextImpl/TrustTrustedCert.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/CloseEngineException.java b/jdk/test/sun/security/ssl/SSLEngineImpl/CloseEngineException.java
similarity index 99%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/CloseEngineException.java
rename to jdk/test/sun/security/ssl/SSLEngineImpl/CloseEngineException.java
index 2acb9f9607478c0ef8ab522abeaa57b7dc6adb1c..e68f92273969e0f163f7bb7696deea92ae0724e4 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/CloseEngineException.java
+++ b/jdk/test/sun/security/ssl/SSLEngineImpl/CloseEngineException.java
@@ -53,7 +53,7 @@ public class CloseEngineException {
private SSLEngine ssle1; // client
private SSLEngine ssle2; // server
- private static String pathToStores = "../../../../../../../etc";
+ private static String pathToStores = "../../../../javax/net/ssl/etc";
private static String keyStoreFile = "keystore";
private static String trustStoreFile = "truststore";
private static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/CloseInboundException.java b/jdk/test/sun/security/ssl/SSLEngineImpl/CloseInboundException.java
similarity index 99%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/CloseInboundException.java
rename to jdk/test/sun/security/ssl/SSLEngineImpl/CloseInboundException.java
index 178d94bc107302281228176a1a34cccf4ece6477..4b2c665e77f65ce37db1157886a162e4cdf55700 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/CloseInboundException.java
+++ b/jdk/test/sun/security/ssl/SSLEngineImpl/CloseInboundException.java
@@ -49,7 +49,7 @@ public class CloseInboundException {
SSLEngineResult result1; // ssle1's results from last operation
SSLEngineResult result2; // ssle2's results from last operation
- private static String pathToStores = "../../../../../../../etc";
+ private static String pathToStores = "../../../../javax/net/ssl/etc";
private static String keyStoreFile = "keystore";
private static String trustStoreFile = "truststore";
private static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/CloseStart.java b/jdk/test/sun/security/ssl/SSLEngineImpl/CloseStart.java
similarity index 98%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/CloseStart.java
rename to jdk/test/sun/security/ssl/SSLEngineImpl/CloseStart.java
index a7cc6e254cad803c1d83553439258b497f949429..96a992a675f4c188a1948ac1815ed478ac948cca 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/CloseStart.java
+++ b/jdk/test/sun/security/ssl/SSLEngineImpl/CloseStart.java
@@ -47,7 +47,7 @@ public class CloseStart {
private static boolean debug = false;
- private static String pathToStores = "../../../../../../../etc";
+ private static String pathToStores = "../../../../javax/net/ssl/etc";
private static String keyStoreFile = "keystore";
private static String trustStoreFile = "truststore";
private static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/DelegatedTaskWrongException.java b/jdk/test/sun/security/ssl/SSLEngineImpl/DelegatedTaskWrongException.java
similarity index 99%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/DelegatedTaskWrongException.java
rename to jdk/test/sun/security/ssl/SSLEngineImpl/DelegatedTaskWrongException.java
index 06366eb37b937818f9413790f43c5980211b4054..761f44c72c3f82388edd537c592c2d5b7865e965 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/DelegatedTaskWrongException.java
+++ b/jdk/test/sun/security/ssl/SSLEngineImpl/DelegatedTaskWrongException.java
@@ -47,7 +47,7 @@ public class DelegatedTaskWrongException {
private SSLEngine ssle1; // client
private SSLEngine ssle2; // server
- private static String pathToStores = "../../../../../../../etc";
+ private static String pathToStores = "../../../../javax/net/ssl/etc";
private static String keyStoreFile = "keystore";
private static String trustStoreFile = "truststore";
private static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/EmptyExtensionData.java b/jdk/test/sun/security/ssl/SSLEngineImpl/EmptyExtensionData.java
similarity index 99%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/EmptyExtensionData.java
rename to jdk/test/sun/security/ssl/SSLEngineImpl/EmptyExtensionData.java
index 07ad31eb9e5594ba7b18c9d45455870385d0d430..430785ecae4b10342ba28cb5bd90c830ace4b58c 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/EmptyExtensionData.java
+++ b/jdk/test/sun/security/ssl/SSLEngineImpl/EmptyExtensionData.java
@@ -43,7 +43,7 @@ public class EmptyExtensionData {
private static boolean debug = false;
- private static String pathToStores = "../../../../../../../etc";
+ private static String pathToStores = "../../../../javax/net/ssl/etc";
private static String keyStoreFile = "keystore";
private static String trustStoreFile = "truststore";
private static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/EngineEnforceUseClientMode.java b/jdk/test/sun/security/ssl/SSLEngineImpl/EngineEnforceUseClientMode.java
similarity index 99%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/EngineEnforceUseClientMode.java
rename to jdk/test/sun/security/ssl/SSLEngineImpl/EngineEnforceUseClientMode.java
index 274f93943191ee58da04ef1cd39ba75563791587..9ddf00e8f46cdc286d81fbc1c8f392b18a6b0829 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/EngineEnforceUseClientMode.java
+++ b/jdk/test/sun/security/ssl/SSLEngineImpl/EngineEnforceUseClientMode.java
@@ -52,7 +52,7 @@ public class EngineEnforceUseClientMode {
private SSLEngine ssle4; // server
private SSLEngine ssle5; // server
- private static String pathToStores = "../../../../../../../etc";
+ private static String pathToStores = "../../../../javax/net/ssl/etc";
private static String keyStoreFile = "keystore";
private static String trustStoreFile = "truststore";
private static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/RehandshakeFinished.java b/jdk/test/sun/security/ssl/SSLEngineImpl/RehandshakeFinished.java
similarity index 99%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/RehandshakeFinished.java
rename to jdk/test/sun/security/ssl/SSLEngineImpl/RehandshakeFinished.java
index bcb4f2a8e56cb17326cc7a95cf1b49cd09e4e1eb..4096ce083cf7fea321f1fcb4cf1fb4bcc5cd0d18 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/RehandshakeFinished.java
+++ b/jdk/test/sun/security/ssl/SSLEngineImpl/RehandshakeFinished.java
@@ -129,7 +129,7 @@ public class RehandshakeFinished {
/*
* The following is to set up the keystores.
*/
- private static String pathToStores = "../../../../../../../etc";
+ private static String pathToStores = "../../../../javax/net/ssl/etc";
private static String keyStoreFile = "keystore";
private static String trustStoreFile = "truststore";
private static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/SSLEngineBadBufferArrayAccess.java b/jdk/test/sun/security/ssl/SSLEngineImpl/SSLEngineBadBufferArrayAccess.java
similarity index 99%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/SSLEngineBadBufferArrayAccess.java
rename to jdk/test/sun/security/ssl/SSLEngineImpl/SSLEngineBadBufferArrayAccess.java
index 45a6df001e81aaf9954c4e342aca6e60f2acbbd4..38d513632dce24bf4e057f8442ed1f1b916c5afa 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/SSLEngineBadBufferArrayAccess.java
+++ b/jdk/test/sun/security/ssl/SSLEngineImpl/SSLEngineBadBufferArrayAccess.java
@@ -125,7 +125,7 @@ public class SSLEngineBadBufferArrayAccess {
/*
* The following is to set up the keystores/trust material.
*/
- private static final String pathToStores = "../../../../../../../etc/";
+ private static final String pathToStores = "../../../../javax/net/ssl/etc";
private static final String keyStoreFile = "keystore";
private static final String trustStoreFile = "truststore";
private static final String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/SSLEngineDeadlock.java b/jdk/test/sun/security/ssl/SSLEngineImpl/SSLEngineDeadlock.java
similarity index 99%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/SSLEngineDeadlock.java
rename to jdk/test/sun/security/ssl/SSLEngineImpl/SSLEngineDeadlock.java
index 0522226d987517fe7cdb20817e6c94509134b34d..27d89e22939f683a8277d679c0a0c0aeee5e35ab 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/SSLEngineDeadlock.java
+++ b/jdk/test/sun/security/ssl/SSLEngineImpl/SSLEngineDeadlock.java
@@ -116,7 +116,7 @@ public class SSLEngineDeadlock {
/*
* The following is to set up the keystores.
*/
- private static String pathToStores = "../../../../../../../etc";
+ private static String pathToStores = "../../../../javax/net/ssl/etc";
private static String keyStoreFile = "keystore";
private static String trustStoreFile = "truststore";
private static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSessionContextImpl/Timeout.java b/jdk/test/sun/security/ssl/SSLSessionContextImpl/Timeout.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSessionContextImpl/Timeout.java
rename to jdk/test/sun/security/ssl/SSLSessionContextImpl/Timeout.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSessionImpl/HashCodeMissing.java b/jdk/test/sun/security/ssl/SSLSessionImpl/HashCodeMissing.java
similarity index 99%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSessionImpl/HashCodeMissing.java
rename to jdk/test/sun/security/ssl/SSLSessionImpl/HashCodeMissing.java
index fa0433187f98be2062244e6c244e81d31c9e278d..61f0c6cb477f6d58a4636e8fc326e66e37e4c647 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSessionImpl/HashCodeMissing.java
+++ b/jdk/test/sun/security/ssl/SSLSessionImpl/HashCodeMissing.java
@@ -55,7 +55,7 @@ public class HashCodeMissing {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../../../../etc";
+ static String pathToStores = "../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/AsyncSSLSocketClose.java b/jdk/test/sun/security/ssl/SSLSocketImpl/AsyncSSLSocketClose.java
similarity index 98%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/AsyncSSLSocketClose.java
rename to jdk/test/sun/security/ssl/SSLSocketImpl/AsyncSSLSocketClose.java
index 8fb13107e908c1af49d04e091f673fb4f2a48675..27cc32dc58922b8035f3f77872ae13fee8a80b86 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/AsyncSSLSocketClose.java
+++ b/jdk/test/sun/security/ssl/SSLSocketImpl/AsyncSSLSocketClose.java
@@ -47,7 +47,7 @@ public class AsyncSSLSocketClose implements Runnable
SSLServerSocket ss;
// Where do we find the keystores?
- static String pathToStores = "../../../../../../../etc";
+ static String pathToStores = "../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/CheckMethods.java b/jdk/test/sun/security/ssl/SSLSocketImpl/CheckMethods.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/CheckMethods.java
rename to jdk/test/sun/security/ssl/SSLSocketImpl/CheckMethods.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/ClientModeClientAuth.java b/jdk/test/sun/security/ssl/SSLSocketImpl/ClientModeClientAuth.java
similarity index 99%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/ClientModeClientAuth.java
rename to jdk/test/sun/security/ssl/SSLSocketImpl/ClientModeClientAuth.java
index 8f279e8c5bc74c5805ecd53b2fb210028b080d42..8f4ce4799fdcfb4607af5fb707db7b2b64f6d1fa 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/ClientModeClientAuth.java
+++ b/jdk/test/sun/security/ssl/SSLSocketImpl/ClientModeClientAuth.java
@@ -55,7 +55,7 @@ public class ClientModeClientAuth {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../../../../etc";
+ static String pathToStores = "../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/ClientTimeout.java b/jdk/test/sun/security/ssl/SSLSocketImpl/ClientTimeout.java
similarity index 99%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/ClientTimeout.java
rename to jdk/test/sun/security/ssl/SSLSocketImpl/ClientTimeout.java
index 16d28193c7511022368997926cd53d365165522a..c40b49a2d200e3c353a27bfb0aad68137ae5eb91 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/ClientTimeout.java
+++ b/jdk/test/sun/security/ssl/SSLSocketImpl/ClientTimeout.java
@@ -55,7 +55,7 @@ public class ClientTimeout {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "/../../../../../../../etc";
+ static String pathToStores = "../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/CloseSocket.java b/jdk/test/sun/security/ssl/SSLSocketImpl/CloseSocket.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/CloseSocket.java
rename to jdk/test/sun/security/ssl/SSLSocketImpl/CloseSocket.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/CloseSocketException.java b/jdk/test/sun/security/ssl/SSLSocketImpl/CloseSocketException.java
similarity index 99%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/CloseSocketException.java
rename to jdk/test/sun/security/ssl/SSLSocketImpl/CloseSocketException.java
index 41b88c1facdd812430d406f4e65b29eed385d1a5..b6e33a1324e26f89dd1d386a5188c162553297db 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/CloseSocketException.java
+++ b/jdk/test/sun/security/ssl/SSLSocketImpl/CloseSocketException.java
@@ -59,7 +59,7 @@ public class CloseSocketException {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../../../../etc";
+ static String pathToStores = "../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/InvalidateServerSessionRenegotiate.java b/jdk/test/sun/security/ssl/SSLSocketImpl/InvalidateServerSessionRenegotiate.java
similarity index 99%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/InvalidateServerSessionRenegotiate.java
rename to jdk/test/sun/security/ssl/SSLSocketImpl/InvalidateServerSessionRenegotiate.java
index 2a6f0a8fa5645e1324d039d22194ff25d4ab7f2d..6325b7c593fcc65f282902243be0559a21fd391f 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/InvalidateServerSessionRenegotiate.java
+++ b/jdk/test/sun/security/ssl/SSLSocketImpl/InvalidateServerSessionRenegotiate.java
@@ -69,7 +69,7 @@ public class InvalidateServerSessionRenegotiate implements
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../../../../etc";
+ static String pathToStores = "../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/LoopbackSSLSocket.java b/jdk/test/sun/security/ssl/SSLSocketImpl/LoopbackSSLSocket.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/LoopbackSSLSocket.java
rename to jdk/test/sun/security/ssl/SSLSocketImpl/LoopbackSSLSocket.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NewSocketMethods.java b/jdk/test/sun/security/ssl/SSLSocketImpl/NewSocketMethods.java
similarity index 99%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NewSocketMethods.java
rename to jdk/test/sun/security/ssl/SSLSocketImpl/NewSocketMethods.java
index b78154958c98b2dd776360bef5cfcda8b7cdad96..759a16609f5b70dbca6c703df5ea92abe719e78d 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NewSocketMethods.java
+++ b/jdk/test/sun/security/ssl/SSLSocketImpl/NewSocketMethods.java
@@ -88,7 +88,7 @@ public class NewSocketMethods {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../../../../etc";
+ static String pathToStores = "../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NoImpactServerRenego.java b/jdk/test/sun/security/ssl/SSLSocketImpl/NoImpactServerRenego.java
similarity index 99%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NoImpactServerRenego.java
rename to jdk/test/sun/security/ssl/SSLSocketImpl/NoImpactServerRenego.java
index ab23ce4239c9e529a8f21316cc6e03059cdf5427..9c1a3394c753652a3dc092178a5f23a34666fdbe 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NoImpactServerRenego.java
+++ b/jdk/test/sun/security/ssl/SSLSocketImpl/NoImpactServerRenego.java
@@ -69,7 +69,7 @@ public class NoImpactServerRenego implements
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../../../../etc";
+ static String pathToStores = "../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NonAutoClose.java b/jdk/test/sun/security/ssl/SSLSocketImpl/NonAutoClose.java
similarity index 98%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NonAutoClose.java
rename to jdk/test/sun/security/ssl/SSLSocketImpl/NonAutoClose.java
index 1d465e343c4082dcbb66466a234674dc35c26df2..707d22e990e45afbb1bc5782290d2af71b10bfa3 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NonAutoClose.java
+++ b/jdk/test/sun/security/ssl/SSLSocketImpl/NonAutoClose.java
@@ -57,8 +57,7 @@ public class NonAutoClose {
/*
* Where do we find the keystores?
*/
- // private final static String pathToStores = "./etc";
- private final static String pathToStores = "../../../../../../../etc";
+ private final static String pathToStores = "../../../../javax/net/ssl/etc";
private final static String keyStoreFile = "keystore";
private final static String trustStoreFile = "truststore";
private final static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.java b/jdk/test/sun/security/ssl/SSLSocketImpl/NotifyHandshakeTest.java
similarity index 98%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.java
rename to jdk/test/sun/security/ssl/SSLSocketImpl/NotifyHandshakeTest.java
index 1cd8a53654e73e458bc9730f2516427152f5da00..bdc11f0e5a160c83d958c2394eded68bcb65ce0b 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.java
+++ b/jdk/test/sun/security/ssl/SSLSocketImpl/NotifyHandshakeTest.java
@@ -43,7 +43,7 @@ import java.security.*;
public class NotifyHandshakeTest implements HandshakeCompletedListener {
- static String pathToStores = "../../../../../../../etc";
+ static String pathToStores = "../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.policy b/jdk/test/sun/security/ssl/SSLSocketImpl/NotifyHandshakeTest.policy
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.policy
rename to jdk/test/sun/security/ssl/SSLSocketImpl/NotifyHandshakeTest.policy
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh b/jdk/test/sun/security/ssl/SSLSocketImpl/NotifyHandshakeTest.sh
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh
rename to jdk/test/sun/security/ssl/SSLSocketImpl/NotifyHandshakeTest.sh
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTestHeyYou.java b/jdk/test/sun/security/ssl/SSLSocketImpl/NotifyHandshakeTestHeyYou.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTestHeyYou.java
rename to jdk/test/sun/security/ssl/SSLSocketImpl/NotifyHandshakeTestHeyYou.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/RejectClientRenego.java b/jdk/test/sun/security/ssl/SSLSocketImpl/RejectClientRenego.java
similarity index 99%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/RejectClientRenego.java
rename to jdk/test/sun/security/ssl/SSLSocketImpl/RejectClientRenego.java
index 01a7febca29fbbe75766fa5536cd57fcf3f6067d..1a5d5e652d5b41f9b610f5bbc0ac36a913f1b4aa 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/RejectClientRenego.java
+++ b/jdk/test/sun/security/ssl/SSLSocketImpl/RejectClientRenego.java
@@ -69,7 +69,7 @@ public class RejectClientRenego implements
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../../../../etc";
+ static String pathToStores = "../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/ReuseAddr.java b/jdk/test/sun/security/ssl/SSLSocketImpl/ReuseAddr.java
similarity index 99%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/ReuseAddr.java
rename to jdk/test/sun/security/ssl/SSLSocketImpl/ReuseAddr.java
index db5209f9095dedac57573be6b0814f491ba44df4..650c309887e4f4ad5726e3c1ee3e49c4c37f1180 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/ReuseAddr.java
+++ b/jdk/test/sun/security/ssl/SSLSocketImpl/ReuseAddr.java
@@ -54,7 +54,7 @@ public class ReuseAddr {
/*
* Where do we find the keystores?
*/
- private final static String pathToStores = "../../../../../../../etc";
+ private final static String pathToStores = "../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/ReverseNameLookup.java b/jdk/test/sun/security/ssl/SSLSocketImpl/ReverseNameLookup.java
similarity index 99%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/ReverseNameLookup.java
rename to jdk/test/sun/security/ssl/SSLSocketImpl/ReverseNameLookup.java
index 612712b35bfb37ed2c7fa013b468702496c3406c..0a0bf62f2cb8995089c8621df513f8e84f9d26e2 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/ReverseNameLookup.java
+++ b/jdk/test/sun/security/ssl/SSLSocketImpl/ReverseNameLookup.java
@@ -53,7 +53,7 @@ public class ReverseNameLookup {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../../../../etc";
+ static String pathToStores = "../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/SSLSocketImplThrowsWrongExceptions.java b/jdk/test/sun/security/ssl/SSLSocketImpl/SSLSocketImplThrowsWrongExceptions.java
similarity index 99%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/SSLSocketImplThrowsWrongExceptions.java
rename to jdk/test/sun/security/ssl/SSLSocketImpl/SSLSocketImplThrowsWrongExceptions.java
index 1333561f7e6c1eec0f0196c67071fc15aa9e4ac8..616a3464eaff8b54d4c9f2bfe6d4f0961d326c1b 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/SSLSocketImplThrowsWrongExceptions.java
+++ b/jdk/test/sun/security/ssl/SSLSocketImpl/SSLSocketImplThrowsWrongExceptions.java
@@ -57,7 +57,7 @@ public class SSLSocketImplThrowsWrongExceptions {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../../../../etc";
+ static String pathToStores = "../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/ServerTimeout.java b/jdk/test/sun/security/ssl/SSLSocketImpl/ServerTimeout.java
similarity index 99%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/ServerTimeout.java
rename to jdk/test/sun/security/ssl/SSLSocketImpl/ServerTimeout.java
index ff7c0db1203379403b7bb967fed5d239f9624584..397332044390b0506c35fdea026bb66830c707ce 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/ServerTimeout.java
+++ b/jdk/test/sun/security/ssl/SSLSocketImpl/ServerTimeout.java
@@ -55,7 +55,7 @@ public class ServerTimeout {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "/../../../../../../../etc";
+ static String pathToStores = "../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/SetClientMode.java b/jdk/test/sun/security/ssl/SSLSocketImpl/SetClientMode.java
similarity index 98%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/SetClientMode.java
rename to jdk/test/sun/security/ssl/SSLSocketImpl/SetClientMode.java
index f26ae0a0c7f5856bff8473ace712ca6b4ed30ba1..537e933742137e86ef158353619c0fd5354fc688 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/SetClientMode.java
+++ b/jdk/test/sun/security/ssl/SSLSocketImpl/SetClientMode.java
@@ -59,7 +59,7 @@ public class SetClientMode {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../../../../etc";
+ static String pathToStores = "../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/UnconnectedSocketWrongExceptions.java b/jdk/test/sun/security/ssl/SSLSocketImpl/UnconnectedSocketWrongExceptions.java
similarity index 99%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/UnconnectedSocketWrongExceptions.java
rename to jdk/test/sun/security/ssl/SSLSocketImpl/UnconnectedSocketWrongExceptions.java
index 63fb43fa56b095428fa42653fe36b39d49cef0af..b58a7ca255b6c30e7a8a701be5d0208b981df7f7 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/UnconnectedSocketWrongExceptions.java
+++ b/jdk/test/sun/security/ssl/SSLSocketImpl/UnconnectedSocketWrongExceptions.java
@@ -55,7 +55,7 @@ public class UnconnectedSocketWrongExceptions {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../../../../etc";
+ static String pathToStores = "../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ServerHandshaker/AnonCipherWithWantClientAuth.java b/jdk/test/sun/security/ssl/ServerHandshaker/AnonCipherWithWantClientAuth.java
similarity index 99%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ServerHandshaker/AnonCipherWithWantClientAuth.java
rename to jdk/test/sun/security/ssl/ServerHandshaker/AnonCipherWithWantClientAuth.java
index 137f11460a6654c69462791fcb4a121de3721308..c546cfb71367cc420171eeb41d37c49c40b56c87 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ServerHandshaker/AnonCipherWithWantClientAuth.java
+++ b/jdk/test/sun/security/ssl/ServerHandshaker/AnonCipherWithWantClientAuth.java
@@ -53,7 +53,7 @@ public class AnonCipherWithWantClientAuth {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../../../../etc";
+ static String pathToStores = "../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ServerHandshaker/GetPeerHost.java b/jdk/test/sun/security/ssl/ServerHandshaker/GetPeerHost.java
similarity index 96%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ServerHandshaker/GetPeerHost.java
rename to jdk/test/sun/security/ssl/ServerHandshaker/GetPeerHost.java
index 2e4c9005429a13249afe7584a63b58eabab7bf3f..96180df92bee24e8e69ecdbd829db2427428b23a 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ServerHandshaker/GetPeerHost.java
+++ b/jdk/test/sun/security/ssl/ServerHandshaker/GetPeerHost.java
@@ -40,7 +40,7 @@ public class GetPeerHost {
String testRoot = System.getProperty("test.src", ".");
System.setProperty("javax.net.ssl.trustStore", testRoot
- + "/../../../../../../../etc/truststore");
+ + "/../../../../javax/net/ssl/etc/truststore");
GetPeerHostServer server = new GetPeerHostServer();
server.start();
GetPeerHostClient client =
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ServerHandshaker/GetPeerHostClient.java b/jdk/test/sun/security/ssl/ServerHandshaker/GetPeerHostClient.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ServerHandshaker/GetPeerHostClient.java
rename to jdk/test/sun/security/ssl/ServerHandshaker/GetPeerHostClient.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ServerHandshaker/GetPeerHostServer.java b/jdk/test/sun/security/ssl/ServerHandshaker/GetPeerHostServer.java
similarity index 97%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ServerHandshaker/GetPeerHostServer.java
rename to jdk/test/sun/security/ssl/ServerHandshaker/GetPeerHostServer.java
index 5383052d1673c6e26ad06c48f73ccf44f87aa5f3..afcaaf4b088af9723992e6c5b81132f9b84d41cf 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ServerHandshaker/GetPeerHostServer.java
+++ b/jdk/test/sun/security/ssl/ServerHandshaker/GetPeerHostServer.java
@@ -53,7 +53,7 @@ class GetPeerHostServer extends Thread
char[] passphrase = "passphrase".toCharArray();
String testRoot = System.getProperty("test.src", ".");
ks.load(new FileInputStream(testRoot
- + "/../../../../../../../etc/keystore"),
+ + "/../../../../javax/net/ssl/etc/keystore"),
passphrase);
kmf.init(ks, passphrase);
ctx.init(kmf.getKeyManagers(), null, null);
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SocketCreation/SocketCreation.java b/jdk/test/sun/security/ssl/SocketCreation/SocketCreation.java
similarity index 99%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SocketCreation/SocketCreation.java
rename to jdk/test/sun/security/ssl/SocketCreation/SocketCreation.java
index f81675c3725e39ac69391ec307b395ba9f7e39df..65e41b56ac2626e06134d56354e6fa94e12fa143 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SocketCreation/SocketCreation.java
+++ b/jdk/test/sun/security/ssl/SocketCreation/SocketCreation.java
@@ -64,7 +64,7 @@ public class SocketCreation {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../../../../etc";
+ static String pathToStores = "../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509KeyManager/NullCases.java b/jdk/test/sun/security/ssl/X509KeyManager/NullCases.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509KeyManager/NullCases.java
rename to jdk/test/sun/security/ssl/X509KeyManager/NullCases.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509KeyManager/PreferredKey.java b/jdk/test/sun/security/ssl/X509KeyManager/PreferredKey.java
similarity index 98%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509KeyManager/PreferredKey.java
rename to jdk/test/sun/security/ssl/X509KeyManager/PreferredKey.java
index 47e1e775856be4c76c045a63da07f1612a21e859..0006090a866e54034d2786de55fb867e0227d4bf 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509KeyManager/PreferredKey.java
+++ b/jdk/test/sun/security/ssl/X509KeyManager/PreferredKey.java
@@ -50,7 +50,7 @@ public class PreferredKey {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../../../../etc";
+ static String pathToStores = "../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509KeyManager/SelectOneKeyOutOfMany.java b/jdk/test/sun/security/ssl/X509KeyManager/SelectOneKeyOutOfMany.java
similarity index 99%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509KeyManager/SelectOneKeyOutOfMany.java
rename to jdk/test/sun/security/ssl/X509KeyManager/SelectOneKeyOutOfMany.java
index 047ecfa0cdf21de35e66c0abfce4c9976a551faf..b0348fec8415da0f841a938550c116a98a2fe702 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509KeyManager/SelectOneKeyOutOfMany.java
+++ b/jdk/test/sun/security/ssl/X509KeyManager/SelectOneKeyOutOfMany.java
@@ -52,7 +52,7 @@ public class SelectOneKeyOutOfMany {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../../../../etc";
+ static String pathToStores = "../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/BasicConstraints.java b/jdk/test/sun/security/ssl/X509TrustManagerImpl/BasicConstraints.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/BasicConstraints.java
rename to jdk/test/sun/security/ssl/X509TrustManagerImpl/BasicConstraints.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/CertRequestOverflow.java b/jdk/test/sun/security/ssl/X509TrustManagerImpl/CertRequestOverflow.java
similarity index 99%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/CertRequestOverflow.java
rename to jdk/test/sun/security/ssl/X509TrustManagerImpl/CertRequestOverflow.java
index 883f9797d674d14885261fc7127c93ece8af5088..1c0c8d8c1c29a65123ec573f54de8fa69b9239a3 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/CertRequestOverflow.java
+++ b/jdk/test/sun/security/ssl/X509TrustManagerImpl/CertRequestOverflow.java
@@ -59,7 +59,7 @@ public class CertRequestOverflow {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../../../../etc";
+ static String pathToStores = "../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/CheckNullEntity.java b/jdk/test/sun/security/ssl/X509TrustManagerImpl/CheckNullEntity.java
similarity index 99%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/CheckNullEntity.java
rename to jdk/test/sun/security/ssl/X509TrustManagerImpl/CheckNullEntity.java
index 2f41c54021b4d96ed616df5c6e5ae1a9a1c29777..31f753fe5431e4c624cffc2d08ebb31237c10960 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/CheckNullEntity.java
+++ b/jdk/test/sun/security/ssl/X509TrustManagerImpl/CheckNullEntity.java
@@ -56,7 +56,7 @@ public class CheckNullEntity {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../../../../etc";
+ static String pathToStores = "../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/ClientServer.java b/jdk/test/sun/security/ssl/X509TrustManagerImpl/ClientServer.java
similarity index 99%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/ClientServer.java
rename to jdk/test/sun/security/ssl/X509TrustManagerImpl/ClientServer.java
index c6099b407b408748ebd629a126f181cb5a64a3be..0bfd3317471efed60d6cb495b5f37c2ba99059a3 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/ClientServer.java
+++ b/jdk/test/sun/security/ssl/X509TrustManagerImpl/ClientServer.java
@@ -62,7 +62,7 @@ public class ClientServer {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../../../../etc";
+ static String pathToStores = "../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/ComodoHacker.java b/jdk/test/sun/security/ssl/X509TrustManagerImpl/ComodoHacker.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/ComodoHacker.java
rename to jdk/test/sun/security/ssl/X509TrustManagerImpl/ComodoHacker.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/PKIXExtendedTM.java b/jdk/test/sun/security/ssl/X509TrustManagerImpl/PKIXExtendedTM.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/PKIXExtendedTM.java
rename to jdk/test/sun/security/ssl/X509TrustManagerImpl/PKIXExtendedTM.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/SelfIssuedCert.java b/jdk/test/sun/security/ssl/X509TrustManagerImpl/SelfIssuedCert.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/SelfIssuedCert.java
rename to jdk/test/sun/security/ssl/X509TrustManagerImpl/SelfIssuedCert.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/SunX509ExtendedTM.java b/jdk/test/sun/security/ssl/X509TrustManagerImpl/SunX509ExtendedTM.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/SunX509ExtendedTM.java
rename to jdk/test/sun/security/ssl/X509TrustManagerImpl/SunX509ExtendedTM.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/X509ExtendedTMEnabled.java b/jdk/test/sun/security/ssl/X509TrustManagerImpl/X509ExtendedTMEnabled.java
similarity index 99%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/X509ExtendedTMEnabled.java
rename to jdk/test/sun/security/ssl/X509TrustManagerImpl/X509ExtendedTMEnabled.java
index d257d241ff99a0163aec8be3945b26c5794e463a..d0eb242442ed9f947ae506192f8fee2686348a5c 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/X509ExtendedTMEnabled.java
+++ b/jdk/test/sun/security/ssl/X509TrustManagerImpl/X509ExtendedTMEnabled.java
@@ -57,7 +57,7 @@ public class X509ExtendedTMEnabled {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../../../../etc";
+ static String pathToStores = "../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/rsa/BrokenRSAPrivateCrtKey.java b/jdk/test/sun/security/ssl/rsa/BrokenRSAPrivateCrtKey.java
similarity index 100%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/rsa/BrokenRSAPrivateCrtKey.java
rename to jdk/test/sun/security/ssl/rsa/BrokenRSAPrivateCrtKey.java
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/spi/ProviderInit.java b/jdk/test/sun/security/ssl/spi/ProviderInit.java
similarity index 99%
rename from jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/spi/ProviderInit.java
rename to jdk/test/sun/security/ssl/spi/ProviderInit.java
index 682d80ade0114cff12bde2250cbbf5af3448ea08..25ef93e921baaaabeb4e7322362f5c9659da5ce0 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/spi/ProviderInit.java
+++ b/jdk/test/sun/security/ssl/spi/ProviderInit.java
@@ -61,7 +61,7 @@ public class ProviderInit {
/*
* Where do we find the keystores?
*/
- static String pathToStores = "../../../../../../../etc";
+ static String pathToStores = "../../../../javax/net/ssl/etc";
static String keyStoreFile = "keystore";
static String trustStoreFile = "truststore";
static String passwd = "passphrase";