From 521f9a2048917006c1efb2d0f57c1e13c494035c Mon Sep 17 00:00:00 2001
From: Xue-Lei Andrew Fan <xuelei@openjdk.org>
Date: Wed, 5 Mar 2014 07:24:34 +0000
Subject: [PATCH] 8032473: Restructure JSSE regression test hierarchy in jdk
test
Reviewed-by: weijun
---
jdk/test/TEST.groups | 11 +++++++----
.../ssl/SSLSecurity/ComKeyManagerFactoryImpl.java | 0
.../net/ssl/SSLSecurity/ComSSLContextImpl.java | 0
.../SSLSecurity/ComTrustManagerFactoryImpl.java | 0
.../SSLSecurity/JavaxKeyManagerFactoryImpl.java | 0
.../net/ssl/SSLSecurity/JavaxSSLContextImpl.java | 0
.../SSLSecurity/JavaxTrustManagerFactoryImpl.java | 0
.../com/sun/net/ssl/SSLSecurity/ProviderTest.java | 0
.../sun/net/ssl/SSLSecurity/TruncateArray.java | 0
.../ssl => }/javax/net/ssl/Fix5070632.java | 0
.../javax/net/ssl/FixingJavadocs/ComURLNulls.java | 0
.../net/ssl/FixingJavadocs/ImplicitHandshake.java | 2 +-
.../net/ssl/FixingJavadocs/JavaxURLNulls.java | 0
.../net/ssl/FixingJavadocs/KMTMGetNothing.java | 0
.../net/ssl/FixingJavadocs/SSLSessionNulls.java | 2 +-
.../net/ssl/FixingJavadocs/SSLSocketInherit.java | 2 +-
.../ssl => }/javax/net/ssl/GetInstance.java | 0
.../CriticalSubjectAltName.java | 0
.../DelayDefaultContextLoading.java | 0
.../ssl}/HttpsURLConnection/GetResponseCode.java | 2 +-
.../net/ssl}/HttpsURLConnection/crisubn.jks | Bin
.../net/ssl}/HttpsURLConnection/trusted.jks | Bin
jdk/test/{sun/security => javax/net}/ssl/README | 0
.../net/ssl}/SSLEngine/AcceptLargeFragments.java | 0
.../net/ssl}/SSLEngine/ArgCheck.java | 2 +-
.../net/ssl}/SSLEngine/Arrays.java | 2 +-
.../net/ssl}/SSLEngine/Basics.java | 2 +-
.../net/ssl}/SSLEngine/CheckStatus.java | 2 +-
.../net/ssl}/SSLEngine/ConnectionTest.java | 2 +-
.../net/ssl}/SSLEngine/ExtendedKeyEngine.java | 2 +-
.../net/ssl}/SSLEngine/ExtendedKeySocket.java | 2 +-
.../net/ssl}/SSLEngine/LargeBufs.java | 2 +-
.../net/ssl}/SSLEngine/LargePacket.java | 2 +-
.../ssl}/SSLEngine/MyX509ExtendedKeyManager.java | 0
.../net/ssl}/SSLEngine/MyX509KeyManager.java | 0
.../net/ssl}/SSLEngine/NoAuthClientAuth.java | 2 +-
.../net/ssl}/SSLEngine/SSLEngineResultArgs.java | 0
.../net/ssl}/SSLEngine/SSLEngineService.java | 2 +-
.../net/ssl}/SSLEngine/TestAllSuites.java | 2 +-
.../net/ssl}/SSLEngineResult/Deserialize.java | 0
.../ssl/SSLParameters/UseCipherSuitesOrder.java | 2 +-
.../SSLServerSocket/DefaultSSLServSocketFac.java | 0
.../ssl/SSLSession}/CheckMyTrustedKeystore.java | 14 ++++++++------
.../HttpsURLConnectionLocalCertificateChain.java | 2 +-
.../net/ssl/SSLSession}/JSSERenegotiate.java | 2 +-
.../ssl/SSLSession}/KeyManagerTrustManager.java | 0
.../ssl/SSLSession}/SSLCtxAccessToSessCtx.java | 2 +-
.../ssl/SSLSession}/SessionCacheSizeTests.java | 2 +-
.../net/ssl/SSLSession}/SessionTimeOutTests.java | 2 +-
.../net/ssl/SSLSession}/testEnabledProtocols.java | 2 +-
.../javax/net/ssl/ServerName/IllegalSNIName.java | 0
.../net/ssl/ServerName/SSLEngineExplorer.java | 4 ++--
.../ServerName/SSLEngineExplorerMatchedSNI.java | 4 ++--
.../ServerName/SSLEngineExplorerUnmatchedSNI.java | 4 ++--
.../ssl/ServerName/SSLEngineExplorerWithCli.java | 4 ++--
.../ssl/ServerName/SSLEngineExplorerWithSrv.java | 4 ++--
.../ssl/ServerName/SSLSocketConsistentSNI.java | 2 +-
.../net/ssl/ServerName/SSLSocketExplorer.java | 4 ++--
.../ssl/ServerName/SSLSocketExplorerFailure.java | 4 ++--
.../ServerName/SSLSocketExplorerMatchedSNI.java | 4 ++--
.../ServerName/SSLSocketExplorerUnmatchedSNI.java | 4 ++--
.../ServerName/SSLSocketExplorerWithCliSNI.java | 4 ++--
.../ServerName/SSLSocketExplorerWithSrvSNI.java | 4 ++--
.../ssl/ServerName/SSLSocketInconsistentSNI.java | 2 +-
.../net/ssl/ServerName/SSLSocketSNISensitive.java | 0
.../ssl/TLSv11/EmptyCertificateAuthorities.java | 2 +-
.../net/ssl/TLSv11/ExportableBlockCipher.java | 2 +-
.../net/ssl/TLSv11/ExportableStreamCipher.java | 2 +-
.../javax/net/ssl/TLSv11/GenericBlockCipher.java | 2 +-
.../javax/net/ssl/TLSv11/GenericStreamCipher.java | 2 +-
.../net/ssl/TLSv12/DisabledShortRSAKeys.java | 0
.../javax/net/ssl/TLSv12/ShortRSAKey512.java | 0
.../javax/net/ssl/TLSv12/ShortRSAKeyGCM.java | 0
.../{sun/security => javax/net}/ssl/etc/keystore | Bin
.../security => javax/net}/ssl/etc/truststore | Bin
.../net}/ssl/etc/unknown_keystore | Bin
.../sanity/ciphersuites/CheckCipherSuites.java | 0
.../sanity/ciphersuites/CipherSuitesInOrder.java | 0
.../net}/ssl/sanity/ciphersuites/NoKerberos.java | 0
.../net}/ssl/sanity/interop/CipherTest.java | 0
.../ssl/sanity/interop/ClientJSSEServerJSSE.java | 0
.../net}/ssl/sanity/interop/JSSEClient.java | 0
.../net}/ssl/sanity/interop/JSSEServer.java | 0
.../pluggability/CheckSSLContextExport.java | 0
.../sanity/pluggability/CheckSockFacExport1.java | 0
.../sanity/pluggability/CheckSockFacExport2.java | 0
.../ssl/sanity/pluggability/CipherSuites.java | 0
.../ssl/sanity/pluggability/MySSLContextImpl.java | 0
.../ssl/sanity/pluggability/MySSLEngineImpl.java | 0
.../pluggability/MySSLServerSocketFacImpl.java | 0
.../sanity/pluggability/MySSLSocketFacImpl.java | 0
.../net}/ssl/templates/SSLCapabilities.java | 0
.../net}/ssl/templates/SSLEngineTemplate.java | 0
.../net}/ssl/templates/SSLExplorer.java | 0
.../ssl/templates/SSLSocketSSLEngineTemplate.java | 2 +-
.../net}/ssl/templates/SSLSocketTemplate.java | 0
.../www/protocol/https}/AbstractCallback.java | 0
.../www/protocol/https/ChunkedOutputStream.java} | 9 +++++----
.../www/protocol/https}/ClosedChannelList.java | 0
.../www/protocol/https}/HttpCallback.java | 0
.../www/protocol/https}/HttpTransaction.java | 0
.../protocol/https/HttpsClient/MyKeyManager.java | 0
.../protocol/https/HttpsClient/OriginServer.java | 0
.../protocol/https/HttpsClient/ProxyAuthTest.java | 2 +-
.../https/HttpsClient/ProxyTunnelServer.java | 0
.../https/HttpsClient/ServerIdentityTest.java | 0
.../www/protocol/https/HttpsClient/dnsstore | Bin
.../www/protocol/https/HttpsClient/ipstore | Bin
.../https/HttpsURLConnection/B6216082.java | 4 ++--
.../https/HttpsURLConnection/B6226610.java | 0
.../https/HttpsURLConnection/CheckMethods.java | 0
.../HttpsURLConnection/CloseKeepAliveCached.java | 2 +-
.../HttpsURLConnection/CookieHandlerTest.java | 2 +-
.../HttpsURLConnection/CookieHttpsClientTest.java | 2 +-
.../https/HttpsURLConnection/DNSIdentities.java | 0
.../HttpsURLConnection/HttpsCreateSockTest.java | 2 +-
.../https/HttpsURLConnection/HttpsPost.java | 2 +-
.../HttpsProxyStackOverflow.java | 0
.../HttpsURLConnection/HttpsSocketFacTest.java | 2 +-
.../IPAddressDNSIdentities.java | 0
.../HttpsURLConnection/IPAddressIPIdentities.java | 0
.../https/HttpsURLConnection/IPIdentities.java | 0
.../https/HttpsURLConnection/Identities.java | 0
.../https/HttpsURLConnection/OriginServer.java | 0
.../https/HttpsURLConnection/PostThruProxy.java | 2 +-
.../https/HttpsURLConnection/PostThruProxy.sh | 0
.../HttpsURLConnection/PostThruProxyWithAuth.java | 2 +-
.../HttpsURLConnection/PostThruProxyWithAuth.sh | 0
.../HttpsURLConnection/ProxyTunnelServer.java | 0
.../https/HttpsURLConnection/ReadTimeout.java | 2 +-
.../https/HttpsURLConnection/Redirect.java | 2 +-
.../https/HttpsURLConnection/RetryHttps.java | 2 +-
.../https/HttpsURLConnection/TunnelProxy.java | 0
.../https/NewImpl/ComHTTPSConnection.java | 2 +-
.../https/NewImpl/ComHostnameVerifier.java | 0
.../https/NewImpl/JavaxHTTPSConnection.java | 2 +-
.../https/NewImpl/JavaxHostnameVerifier.java | 0
.../www/protocol/https}/TestHttpsServer.java | 0
.../ssl => }/AppInputStream/ReadBlocksClose.java | 2 +-
.../ssl => }/AppInputStream/ReadHandshake.java | 0
.../ssl => }/AppInputStream/ReadZeroBytes.java | 2 +-
.../ssl => }/AppInputStream/RemoveMarkReset.java | 2 +-
.../AppOutputStream/NoExceptionOnClose.java | 2 +-
.../internal/ssl => }/CipherSuite/SSL_NULL.java | 0
.../ClientHandshaker/CipherSuiteOrder.java | 2 +-
.../ssl => }/ClientHandshaker/RSAExport.java | 0
.../ssl => }/DHKeyExchange/DHEKeySizing.java | 0
.../EngineArgs/DebugReportsOneExtraByte.java | 2 +-
.../EngineArgs/DebugReportsOneExtraByte.sh | 0
.../ssl => }/GenSSLConfigs/ClientThread.java | 0
.../internal/ssl => }/GenSSLConfigs/Handler.java | 0
.../ssl => }/GenSSLConfigs/ServerHandler.java | 0
.../ssl => }/GenSSLConfigs/ServerThread.java | 0
.../ssl => }/GenSSLConfigs/TestThread.java | 0
.../internal/ssl => }/GenSSLConfigs/Traffic.java | 0
.../ssl/internal/ssl => }/GenSSLConfigs/main.java | 4 ++--
.../ssl => }/HandshakeOutStream/NullCerts.java | 3 +--
.../ssl => }/InputRecord/ClientHelloRead.java | 2 +-
.../ssl => }/InputRecord/OriginServer.java | 0
.../ssl => }/InputRecord/ProxyTunnelServer.java | 0
.../InputRecord/SSLSocketTimeoutNulls.java | 2 +-
.../ssl => }/ProtocolVersion/HttpsProtocols.java | 2 +-
.../ssl => }/SSLContextImpl/BadKSProvider.java | 2 +-
.../ssl => }/SSLContextImpl/BadTSProvider.java | 2 +-
.../CustomizedDefaultProtocols.java | 0
.../SSLContextImpl/DefaultEnabledProtocols.java | 0
.../ssl => }/SSLContextImpl/GoodProvider.java | 2 +-
.../SSLContextImpl/IllegalProtocolProperty.java | 0
.../ssl => }/SSLContextImpl/MD2InTrustAnchor.java | 0
.../SSLContextImpl/NoOldVersionContext.java | 0
.../SSLContextImpl/NullGetAcceptedIssuers.java | 0
.../SSLContextImpl/SSLContextVersion.java | 0
.../ssl => }/SSLContextImpl/TrustTrustedCert.java | 0
.../SSLEngineImpl/CloseEngineException.java | 2 +-
.../SSLEngineImpl/CloseInboundException.java | 2 +-
.../ssl => }/SSLEngineImpl/CloseStart.java | 2 +-
.../DelegatedTaskWrongException.java | 2 +-
.../SSLEngineImpl/EmptyExtensionData.java | 2 +-
.../SSLEngineImpl/EngineEnforceUseClientMode.java | 2 +-
.../SSLEngineImpl/RehandshakeFinished.java | 2 +-
.../SSLEngineBadBufferArrayAccess.java | 2 +-
.../ssl => }/SSLEngineImpl/SSLEngineDeadlock.java | 2 +-
.../ssl => }/SSLSessionContextImpl/Timeout.java | 0
.../ssl => }/SSLSessionImpl/HashCodeMissing.java | 2 +-
.../SSLSocketImpl/AsyncSSLSocketClose.java | 2 +-
.../ssl => }/SSLSocketImpl/CheckMethods.java | 0
.../SSLSocketImpl/ClientModeClientAuth.java | 2 +-
.../ssl => }/SSLSocketImpl/ClientTimeout.java | 2 +-
.../ssl => }/SSLSocketImpl/CloseSocket.java | 0
.../SSLSocketImpl/CloseSocketException.java | 2 +-
.../InvalidateServerSessionRenegotiate.java | 2 +-
.../ssl => }/SSLSocketImpl/LoopbackSSLSocket.java | 0
.../ssl => }/SSLSocketImpl/NewSocketMethods.java | 2 +-
.../SSLSocketImpl/NoImpactServerRenego.java | 2 +-
.../ssl => }/SSLSocketImpl/NonAutoClose.java | 3 +--
.../SSLSocketImpl/NotifyHandshakeTest.java | 2 +-
.../SSLSocketImpl/NotifyHandshakeTest.policy | 0
.../ssl => }/SSLSocketImpl/NotifyHandshakeTest.sh | 0
.../SSLSocketImpl/NotifyHandshakeTestHeyYou.java | 0
.../SSLSocketImpl/RejectClientRenego.java | 2 +-
.../ssl => }/SSLSocketImpl/ReuseAddr.java | 2 +-
.../ssl => }/SSLSocketImpl/ReverseNameLookup.java | 2 +-
.../SSLSocketImplThrowsWrongExceptions.java | 2 +-
.../ssl => }/SSLSocketImpl/ServerTimeout.java | 2 +-
.../ssl => }/SSLSocketImpl/SetClientMode.java | 2 +-
.../UnconnectedSocketWrongExceptions.java | 2 +-
.../AnonCipherWithWantClientAuth.java | 2 +-
.../ssl => }/ServerHandshaker/GetPeerHost.java | 2 +-
.../ServerHandshaker/GetPeerHostClient.java | 0
.../ServerHandshaker/GetPeerHostServer.java | 2 +-
.../ssl => }/SocketCreation/SocketCreation.java | 2 +-
.../ssl => }/X509KeyManager/NullCases.java | 0
.../ssl => }/X509KeyManager/PreferredKey.java | 2 +-
.../X509KeyManager/SelectOneKeyOutOfMany.java | 2 +-
.../X509TrustManagerImpl/BasicConstraints.java | 0
.../X509TrustManagerImpl/CertRequestOverflow.java | 2 +-
.../X509TrustManagerImpl/CheckNullEntity.java | 2 +-
.../X509TrustManagerImpl/ClientServer.java | 2 +-
.../X509TrustManagerImpl/ComodoHacker.java | 0
.../X509TrustManagerImpl/PKIXExtendedTM.java | 0
.../X509TrustManagerImpl/SelfIssuedCert.java | 0
.../X509TrustManagerImpl/SunX509ExtendedTM.java | 0
.../X509ExtendedTMEnabled.java | 2 +-
.../ssl => }/rsa/BrokenRSAPrivateCrtKey.java | 0
.../ssl/internal/ssl => }/spi/ProviderInit.java | 2 +-
225 files changed, 141 insertions(+), 137 deletions(-)
rename jdk/test/{sun/security/ssl => }/com/sun/net/ssl/SSLSecurity/ComKeyManagerFactoryImpl.java (100%)
rename jdk/test/{sun/security/ssl => }/com/sun/net/ssl/SSLSecurity/ComSSLContextImpl.java (100%)
rename jdk/test/{sun/security/ssl => }/com/sun/net/ssl/SSLSecurity/ComTrustManagerFactoryImpl.java (100%)
rename jdk/test/{sun/security/ssl => }/com/sun/net/ssl/SSLSecurity/JavaxKeyManagerFactoryImpl.java (100%)
rename jdk/test/{sun/security/ssl => }/com/sun/net/ssl/SSLSecurity/JavaxSSLContextImpl.java (100%)
rename jdk/test/{sun/security/ssl => }/com/sun/net/ssl/SSLSecurity/JavaxTrustManagerFactoryImpl.java (100%)
rename jdk/test/{sun/security/ssl => }/com/sun/net/ssl/SSLSecurity/ProviderTest.java (100%)
rename jdk/test/{sun/security/ssl => }/com/sun/net/ssl/SSLSecurity/TruncateArray.java (100%)
rename jdk/test/{sun/security/ssl => }/javax/net/ssl/Fix5070632.java (100%)
rename jdk/test/{sun/security/ssl => }/javax/net/ssl/FixingJavadocs/ComURLNulls.java (100%)
rename jdk/test/{sun/security/ssl => }/javax/net/ssl/FixingJavadocs/ImplicitHandshake.java (99%)
rename jdk/test/{sun/security/ssl => }/javax/net/ssl/FixingJavadocs/JavaxURLNulls.java (100%)
rename jdk/test/{sun/security/ssl => }/javax/net/ssl/FixingJavadocs/KMTMGetNothing.java (100%)
rename jdk/test/{sun/security/ssl => }/javax/net/ssl/FixingJavadocs/SSLSessionNulls.java (99%)
rename jdk/test/{sun/security/ssl => }/javax/net/ssl/FixingJavadocs/SSLSocketInherit.java (99%)
rename jdk/test/{sun/security/ssl => }/javax/net/ssl/GetInstance.java (100%)
rename jdk/test/{sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https => javax/net/ssl}/HttpsURLConnection/CriticalSubjectAltName.java (100%)
rename jdk/test/{sun/security/ssl => }/javax/net/ssl/HttpsURLConnection/DelayDefaultContextLoading.java (100%)
rename jdk/test/{sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https => javax/net/ssl}/HttpsURLConnection/GetResponseCode.java (99%)
rename jdk/test/{sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https => javax/net/ssl}/HttpsURLConnection/crisubn.jks (100%)
rename jdk/test/{sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https => javax/net/ssl}/HttpsURLConnection/trusted.jks (100%)
rename jdk/test/{sun/security => javax/net}/ssl/README (100%)
rename jdk/test/{sun/security/ssl/javax/net/ssl/NewAPIs => javax/net/ssl}/SSLEngine/AcceptLargeFragments.java (100%)
rename jdk/test/{sun/security/ssl/javax/net/ssl/NewAPIs => javax/net/ssl}/SSLEngine/ArgCheck.java (99%)
rename jdk/test/{sun/security/ssl/javax/net/ssl/NewAPIs => javax/net/ssl}/SSLEngine/Arrays.java (99%)
rename jdk/test/{sun/security/ssl/javax/net/ssl/NewAPIs => javax/net/ssl}/SSLEngine/Basics.java (99%)
rename jdk/test/{sun/security/ssl/javax/net/ssl/NewAPIs => javax/net/ssl}/SSLEngine/CheckStatus.java (99%)
rename jdk/test/{sun/security/ssl/javax/net/ssl/NewAPIs => javax/net/ssl}/SSLEngine/ConnectionTest.java (99%)
rename jdk/test/{sun/security/ssl/javax/net/ssl/NewAPIs => javax/net/ssl}/SSLEngine/ExtendedKeyEngine.java (99%)
rename jdk/test/{sun/security/ssl/javax/net/ssl/NewAPIs => javax/net/ssl}/SSLEngine/ExtendedKeySocket.java (99%)
rename jdk/test/{sun/security/ssl/javax/net/ssl/NewAPIs => javax/net/ssl}/SSLEngine/LargeBufs.java (99%)
rename jdk/test/{sun/security/ssl/javax/net/ssl/NewAPIs => javax/net/ssl}/SSLEngine/LargePacket.java (99%)
rename jdk/test/{sun/security/ssl/javax/net/ssl/NewAPIs => javax/net/ssl}/SSLEngine/MyX509ExtendedKeyManager.java (100%)
rename jdk/test/{sun/security/ssl/javax/net/ssl/NewAPIs => javax/net/ssl}/SSLEngine/MyX509KeyManager.java (100%)
rename jdk/test/{sun/security/ssl/javax/net/ssl/NewAPIs => javax/net/ssl}/SSLEngine/NoAuthClientAuth.java (99%)
rename jdk/test/{sun/security/ssl/javax/net/ssl/NewAPIs => javax/net/ssl}/SSLEngine/SSLEngineResultArgs.java (100%)
rename jdk/test/{sun/security/ssl/javax/net/ssl/NewAPIs => javax/net/ssl}/SSLEngine/SSLEngineService.java (99%)
rename jdk/test/{sun/security/ssl/javax/net/ssl/NewAPIs => javax/net/ssl}/SSLEngine/TestAllSuites.java (99%)
rename jdk/test/{sun/security/ssl/javax/net/ssl/NewAPIs => javax/net/ssl}/SSLEngineResult/Deserialize.java (100%)
rename jdk/test/{sun/security/ssl => }/javax/net/ssl/SSLParameters/UseCipherSuitesOrder.java (99%)
rename jdk/test/{sun/security/ssl => }/javax/net/ssl/SSLServerSocket/DefaultSSLServSocketFac.java (100%)
rename jdk/test/{sun/security/ssl/javax/net/ssl/NewAPIs => javax/net/ssl/SSLSession}/CheckMyTrustedKeystore.java (97%)
rename jdk/test/{sun/security/ssl/javax/net/ssl/NewAPIs => javax/net/ssl/SSLSession}/HttpsURLConnectionLocalCertificateChain.java (99%)
rename jdk/test/{sun/security/ssl/javax/net/ssl/NewAPIs => javax/net/ssl/SSLSession}/JSSERenegotiate.java (99%)
rename jdk/test/{sun/security/ssl/javax/net/ssl/NewAPIs => javax/net/ssl/SSLSession}/KeyManagerTrustManager.java (100%)
rename jdk/test/{sun/security/ssl/javax/net/ssl/NewAPIs => javax/net/ssl/SSLSession}/SSLCtxAccessToSessCtx.java (99%)
rename jdk/test/{sun/security/ssl/javax/net/ssl/NewAPIs => javax/net/ssl/SSLSession}/SessionCacheSizeTests.java (99%)
rename jdk/test/{sun/security/ssl/javax/net/ssl/NewAPIs => javax/net/ssl/SSLSession}/SessionTimeOutTests.java (99%)
rename jdk/test/{sun/security/ssl/javax/net/ssl/NewAPIs => javax/net/ssl/SSLSession}/testEnabledProtocols.java (99%)
rename jdk/test/{sun/security/ssl => }/javax/net/ssl/ServerName/IllegalSNIName.java (100%)
rename jdk/test/{sun/security/ssl => }/javax/net/ssl/ServerName/SSLEngineExplorer.java (99%)
rename jdk/test/{sun/security/ssl => }/javax/net/ssl/ServerName/SSLEngineExplorerMatchedSNI.java (99%)
rename jdk/test/{sun/security/ssl => }/javax/net/ssl/ServerName/SSLEngineExplorerUnmatchedSNI.java (99%)
rename jdk/test/{sun/security/ssl => }/javax/net/ssl/ServerName/SSLEngineExplorerWithCli.java (99%)
rename jdk/test/{sun/security/ssl => }/javax/net/ssl/ServerName/SSLEngineExplorerWithSrv.java (99%)
rename jdk/test/{sun/security/ssl => }/javax/net/ssl/ServerName/SSLSocketConsistentSNI.java (99%)
rename jdk/test/{sun/security/ssl => }/javax/net/ssl/ServerName/SSLSocketExplorer.java (99%)
rename jdk/test/{sun/security/ssl => }/javax/net/ssl/ServerName/SSLSocketExplorerFailure.java (99%)
rename jdk/test/{sun/security/ssl => }/javax/net/ssl/ServerName/SSLSocketExplorerMatchedSNI.java (99%)
rename jdk/test/{sun/security/ssl => }/javax/net/ssl/ServerName/SSLSocketExplorerUnmatchedSNI.java (99%)
rename jdk/test/{sun/security/ssl => }/javax/net/ssl/ServerName/SSLSocketExplorerWithCliSNI.java (99%)
rename jdk/test/{sun/security/ssl => }/javax/net/ssl/ServerName/SSLSocketExplorerWithSrvSNI.java (99%)
rename jdk/test/{sun/security/ssl => }/javax/net/ssl/ServerName/SSLSocketInconsistentSNI.java (99%)
rename jdk/test/{sun/security/ssl => }/javax/net/ssl/ServerName/SSLSocketSNISensitive.java (100%)
rename jdk/test/{sun/security/ssl => }/javax/net/ssl/TLSv11/EmptyCertificateAuthorities.java (99%)
rename jdk/test/{sun/security/ssl => }/javax/net/ssl/TLSv11/ExportableBlockCipher.java (99%)
rename jdk/test/{sun/security/ssl => }/javax/net/ssl/TLSv11/ExportableStreamCipher.java (99%)
rename jdk/test/{sun/security/ssl => }/javax/net/ssl/TLSv11/GenericBlockCipher.java (99%)
rename jdk/test/{sun/security/ssl => }/javax/net/ssl/TLSv11/GenericStreamCipher.java (99%)
rename jdk/test/{sun/security/ssl => }/javax/net/ssl/TLSv12/DisabledShortRSAKeys.java (100%)
rename jdk/test/{sun/security/ssl => }/javax/net/ssl/TLSv12/ShortRSAKey512.java (100%)
rename jdk/test/{sun/security/ssl => }/javax/net/ssl/TLSv12/ShortRSAKeyGCM.java (100%)
rename jdk/test/{sun/security => javax/net}/ssl/etc/keystore (100%)
rename jdk/test/{sun/security => javax/net}/ssl/etc/truststore (100%)
rename jdk/test/{sun/security => javax/net}/ssl/etc/unknown_keystore (100%)
rename jdk/test/{sun/security => javax/net}/ssl/sanity/ciphersuites/CheckCipherSuites.java (100%)
rename jdk/test/{sun/security => javax/net}/ssl/sanity/ciphersuites/CipherSuitesInOrder.java (100%)
rename jdk/test/{sun/security => javax/net}/ssl/sanity/ciphersuites/NoKerberos.java (100%)
rename jdk/test/{sun/security => javax/net}/ssl/sanity/interop/CipherTest.java (100%)
rename jdk/test/{sun/security => javax/net}/ssl/sanity/interop/ClientJSSEServerJSSE.java (100%)
rename jdk/test/{sun/security => javax/net}/ssl/sanity/interop/JSSEClient.java (100%)
rename jdk/test/{sun/security => javax/net}/ssl/sanity/interop/JSSEServer.java (100%)
rename jdk/test/{sun/security => javax/net}/ssl/sanity/pluggability/CheckSSLContextExport.java (100%)
rename jdk/test/{sun/security => javax/net}/ssl/sanity/pluggability/CheckSockFacExport1.java (100%)
rename jdk/test/{sun/security => javax/net}/ssl/sanity/pluggability/CheckSockFacExport2.java (100%)
rename jdk/test/{sun/security => javax/net}/ssl/sanity/pluggability/CipherSuites.java (100%)
rename jdk/test/{sun/security => javax/net}/ssl/sanity/pluggability/MySSLContextImpl.java (100%)
rename jdk/test/{sun/security => javax/net}/ssl/sanity/pluggability/MySSLEngineImpl.java (100%)
rename jdk/test/{sun/security => javax/net}/ssl/sanity/pluggability/MySSLServerSocketFacImpl.java (100%)
rename jdk/test/{sun/security => javax/net}/ssl/sanity/pluggability/MySSLSocketFacImpl.java (100%)
rename jdk/test/{sun/security => javax/net}/ssl/templates/SSLCapabilities.java (100%)
rename jdk/test/{sun/security => javax/net}/ssl/templates/SSLEngineTemplate.java (100%)
rename jdk/test/{sun/security => javax/net}/ssl/templates/SSLExplorer.java (100%)
rename jdk/test/{sun/security => javax/net}/ssl/templates/SSLSocketSSLEngineTemplate.java (99%)
rename jdk/test/{sun/security => javax/net}/ssl/templates/SSLSocketTemplate.java (100%)
rename jdk/test/sun/{security/ssl/sun/net/www/httpstest => net/www/protocol/https}/AbstractCallback.java (100%)
rename jdk/test/sun/{security/ssl/sun/net/www/http/ChunkedOutputStream/Test.java => net/www/protocol/https/ChunkedOutputStream.java} (97%)
rename jdk/test/sun/{security/ssl/sun/net/www/httpstest => net/www/protocol/https}/ClosedChannelList.java (100%)
rename jdk/test/sun/{security/ssl/sun/net/www/httpstest => net/www/protocol/https}/HttpCallback.java (100%)
rename jdk/test/sun/{security/ssl/sun/net/www/httpstest => net/www/protocol/https}/HttpTransaction.java (100%)
rename jdk/test/sun/{security/ssl/com/sun/net/ssl/internal => net}/www/protocol/https/HttpsClient/MyKeyManager.java (100%)
rename jdk/test/sun/{security/ssl/com/sun/net/ssl/internal => net}/www/protocol/https/HttpsClient/OriginServer.java (100%)
rename jdk/test/sun/{security/ssl/com/sun/net/ssl/internal => net}/www/protocol/https/HttpsClient/ProxyAuthTest.java (98%)
rename jdk/test/sun/{security/ssl/com/sun/net/ssl/internal => net}/www/protocol/https/HttpsClient/ProxyTunnelServer.java (100%)
rename jdk/test/sun/{security/ssl/com/sun/net/ssl/internal => net}/www/protocol/https/HttpsClient/ServerIdentityTest.java (100%)
rename jdk/test/sun/{security/ssl/com/sun/net/ssl/internal => net}/www/protocol/https/HttpsClient/dnsstore (100%)
rename jdk/test/sun/{security/ssl/com/sun/net/ssl/internal => net}/www/protocol/https/HttpsClient/ipstore (100%)
rename jdk/test/sun/{security/ssl/sun => }/net/www/protocol/https/HttpsURLConnection/B6216082.java (98%)
rename jdk/test/sun/{security/ssl/sun => }/net/www/protocol/https/HttpsURLConnection/B6226610.java (100%)
rename jdk/test/sun/{security/ssl/sun => }/net/www/protocol/https/HttpsURLConnection/CheckMethods.java (100%)
rename jdk/test/sun/{security/ssl/sun => }/net/www/protocol/https/HttpsURLConnection/CloseKeepAliveCached.java (99%)
rename jdk/test/sun/{security/ssl/sun => }/net/www/protocol/https/HttpsURLConnection/CookieHandlerTest.java (99%)
rename jdk/test/sun/{security/ssl/sun => }/net/www/protocol/https/HttpsURLConnection/CookieHttpsClientTest.java (99%)
rename jdk/test/sun/{security/ssl/sun => }/net/www/protocol/https/HttpsURLConnection/DNSIdentities.java (100%)
rename jdk/test/sun/{security/ssl/sun => }/net/www/protocol/https/HttpsURLConnection/HttpsCreateSockTest.java (99%)
rename jdk/test/sun/{security/ssl/sun => }/net/www/protocol/https/HttpsURLConnection/HttpsPost.java (99%)
rename jdk/test/sun/{security/ssl/sun => }/net/www/protocol/https/HttpsURLConnection/HttpsProxyStackOverflow.java (100%)
rename jdk/test/sun/{security/ssl/sun => }/net/www/protocol/https/HttpsURLConnection/HttpsSocketFacTest.java (99%)
rename jdk/test/sun/{security/ssl/sun => }/net/www/protocol/https/HttpsURLConnection/IPAddressDNSIdentities.java (100%)
rename jdk/test/sun/{security/ssl/sun => }/net/www/protocol/https/HttpsURLConnection/IPAddressIPIdentities.java (100%)
rename jdk/test/sun/{security/ssl/sun => }/net/www/protocol/https/HttpsURLConnection/IPIdentities.java (100%)
rename jdk/test/sun/{security/ssl/sun => }/net/www/protocol/https/HttpsURLConnection/Identities.java (100%)
rename jdk/test/sun/{security/ssl/sun => }/net/www/protocol/https/HttpsURLConnection/OriginServer.java (100%)
rename jdk/test/sun/{security/ssl/sun => }/net/www/protocol/https/HttpsURLConnection/PostThruProxy.java (99%)
rename jdk/test/sun/{security/ssl/sun => }/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh (100%)
rename jdk/test/sun/{security/ssl/sun => }/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.java (99%)
rename jdk/test/sun/{security/ssl/sun => }/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh (100%)
rename jdk/test/sun/{security/ssl/sun => }/net/www/protocol/https/HttpsURLConnection/ProxyTunnelServer.java (100%)
rename jdk/test/sun/{security/ssl/sun => }/net/www/protocol/https/HttpsURLConnection/ReadTimeout.java (99%)
rename jdk/test/sun/{security/ssl/sun => }/net/www/protocol/https/HttpsURLConnection/Redirect.java (99%)
rename jdk/test/sun/{security/ssl/sun => }/net/www/protocol/https/HttpsURLConnection/RetryHttps.java (99%)
rename jdk/test/sun/{security/ssl/sun => }/net/www/protocol/https/HttpsURLConnection/TunnelProxy.java (100%)
rename jdk/test/sun/{security/ssl/sun => }/net/www/protocol/https/NewImpl/ComHTTPSConnection.java (99%)
rename jdk/test/sun/{security/ssl/sun => }/net/www/protocol/https/NewImpl/ComHostnameVerifier.java (100%)
rename jdk/test/sun/{security/ssl/sun => }/net/www/protocol/https/NewImpl/JavaxHTTPSConnection.java (99%)
rename jdk/test/sun/{security/ssl/sun => }/net/www/protocol/https/NewImpl/JavaxHostnameVerifier.java (100%)
rename jdk/test/sun/{security/ssl/sun/net/www/httpstest => net/www/protocol/https}/TestHttpsServer.java (100%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/AppInputStream/ReadBlocksClose.java (99%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/AppInputStream/ReadHandshake.java (100%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/AppInputStream/ReadZeroBytes.java (99%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/AppInputStream/RemoveMarkReset.java (99%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/AppOutputStream/NoExceptionOnClose.java (99%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/CipherSuite/SSL_NULL.java (100%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/ClientHandshaker/CipherSuiteOrder.java (99%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/ClientHandshaker/RSAExport.java (100%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/DHKeyExchange/DHEKeySizing.java (100%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/EngineArgs/DebugReportsOneExtraByte.java (99%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/EngineArgs/DebugReportsOneExtraByte.sh (100%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/GenSSLConfigs/ClientThread.java (100%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/GenSSLConfigs/Handler.java (100%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/GenSSLConfigs/ServerHandler.java (100%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/GenSSLConfigs/ServerThread.java (100%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/GenSSLConfigs/TestThread.java (100%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/GenSSLConfigs/Traffic.java (100%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/GenSSLConfigs/main.java (98%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/HandshakeOutStream/NullCerts.java (98%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/InputRecord/ClientHelloRead.java (99%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/InputRecord/OriginServer.java (100%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/InputRecord/ProxyTunnelServer.java (100%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/InputRecord/SSLSocketTimeoutNulls.java (99%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/ProtocolVersion/HttpsProtocols.java (99%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLContextImpl/BadKSProvider.java (99%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLContextImpl/BadTSProvider.java (99%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLContextImpl/CustomizedDefaultProtocols.java (100%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLContextImpl/DefaultEnabledProtocols.java (100%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLContextImpl/GoodProvider.java (99%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLContextImpl/IllegalProtocolProperty.java (100%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLContextImpl/MD2InTrustAnchor.java (100%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLContextImpl/NoOldVersionContext.java (100%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLContextImpl/NullGetAcceptedIssuers.java (100%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLContextImpl/SSLContextVersion.java (100%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLContextImpl/TrustTrustedCert.java (100%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLEngineImpl/CloseEngineException.java (99%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLEngineImpl/CloseInboundException.java (99%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLEngineImpl/CloseStart.java (98%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLEngineImpl/DelegatedTaskWrongException.java (99%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLEngineImpl/EmptyExtensionData.java (99%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLEngineImpl/EngineEnforceUseClientMode.java (99%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLEngineImpl/RehandshakeFinished.java (99%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLEngineImpl/SSLEngineBadBufferArrayAccess.java (99%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLEngineImpl/SSLEngineDeadlock.java (99%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLSessionContextImpl/Timeout.java (100%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLSessionImpl/HashCodeMissing.java (99%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLSocketImpl/AsyncSSLSocketClose.java (98%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLSocketImpl/CheckMethods.java (100%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLSocketImpl/ClientModeClientAuth.java (99%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLSocketImpl/ClientTimeout.java (99%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLSocketImpl/CloseSocket.java (100%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLSocketImpl/CloseSocketException.java (99%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLSocketImpl/InvalidateServerSessionRenegotiate.java (99%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLSocketImpl/LoopbackSSLSocket.java (100%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLSocketImpl/NewSocketMethods.java (99%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLSocketImpl/NoImpactServerRenego.java (99%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLSocketImpl/NonAutoClose.java (98%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLSocketImpl/NotifyHandshakeTest.java (98%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLSocketImpl/NotifyHandshakeTest.policy (100%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLSocketImpl/NotifyHandshakeTest.sh (100%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLSocketImpl/NotifyHandshakeTestHeyYou.java (100%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLSocketImpl/RejectClientRenego.java (99%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLSocketImpl/ReuseAddr.java (99%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLSocketImpl/ReverseNameLookup.java (99%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLSocketImpl/SSLSocketImplThrowsWrongExceptions.java (99%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLSocketImpl/ServerTimeout.java (99%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLSocketImpl/SetClientMode.java (98%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SSLSocketImpl/UnconnectedSocketWrongExceptions.java (99%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/ServerHandshaker/AnonCipherWithWantClientAuth.java (99%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/ServerHandshaker/GetPeerHost.java (96%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/ServerHandshaker/GetPeerHostClient.java (100%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/ServerHandshaker/GetPeerHostServer.java (97%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/SocketCreation/SocketCreation.java (99%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/X509KeyManager/NullCases.java (100%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/X509KeyManager/PreferredKey.java (98%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/X509KeyManager/SelectOneKeyOutOfMany.java (99%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/X509TrustManagerImpl/BasicConstraints.java (100%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/X509TrustManagerImpl/CertRequestOverflow.java (99%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/X509TrustManagerImpl/CheckNullEntity.java (99%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/X509TrustManagerImpl/ClientServer.java (99%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/X509TrustManagerImpl/ComodoHacker.java (100%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/X509TrustManagerImpl/PKIXExtendedTM.java (100%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/X509TrustManagerImpl/SelfIssuedCert.java (100%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/X509TrustManagerImpl/SunX509ExtendedTM.java (100%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/X509TrustManagerImpl/X509ExtendedTMEnabled.java (99%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/rsa/BrokenRSAPrivateCrtKey.java (100%)
rename jdk/test/sun/security/ssl/{com/sun/net/ssl/internal/ssl => }/spi/ProviderInit.java (99%)
diff --git a/jdk/test/TEST.groups b/jdk/test/TEST.groups
index b624ca9b6eb..8e45f1998f7 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 8badfd66224..b1ef64ef88a 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 fc9cfbf1071..e9338cc42eb 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 2e3f544d246..bf1e757ed6a 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 9335085eeba..87ffef9c0f8 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 be395db8a90..3b94c6e2992 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 cae1e552040..ed75a4555c7 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 9f73c8dccf5..8c17e735c55 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 dfdefa9f1f7..c7133ef5d43 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 546a7865668..cdc9bcaa08c 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 ca109392866..2067467b78f 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 0f5b54bf1da..ef4eef3a330 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 5960ea63992..af7f7a146dc 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 c95ebfdf7dc..33f2c4f49ba 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 f951e84c8bc..db8c091c115 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 bc4c6f7db12..d3ee14666c5 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 9781614318d..9c633b58f70 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 c25d74c7d2c..2c2bae510e5 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 7dee02ea699..422d88debd1 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 ec773b244dd..c6e9753a2c1 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 748b5fed6d4..40617bfd321 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 41fddc46ed0..14ed3eab716 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 d4e00855dc6..4001f83ed47 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 9264cb08723..98e590799c8 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 5774049ba6e..0e6e8b197c8 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 2cd46354010..a7831316d0c 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 c201bee86ad..b9854dd3e94 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 2a9647be457..ff8678ba6a8 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 bfa23cb38de..f9888839929 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 e8fd2707f25..0517a7750aa 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 d9ff691e06c..38d999aa3ef 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 27e2b6abce7..a91697c5915 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 44a37150ef8..aaf8d299486 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 c9ae26c42a6..724a37e1a80 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 eab48002d6f..732e0cf3097 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 6933c9a9894..8f2b7816864 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 64b1ae9a63b..f026f32e781 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 6ba1dfd9c21..7c54dd1a882 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 3b11d2a59a7..572ac2cce8c 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 ad27a1e468f..cb232a00e19 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 3d15a7cf154..572d9893b85 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 9a0a83e26e4..5f851843ffb 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 c96d8ec9cc8..4cf02417e82 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 d61a1e5345e..e82fd6402fd 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 67fe5c229f7..cce270642ce 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 a4ef930ff64..8fa75aa81c2 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 4df22a85c45..a5992579025 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 c025c6ef1b9..559f7af98ce 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 2e7d3fb8843..565138c143d 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 21006f0803d..82b54dfd08b 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 08d969d0579..a7e0bc3ab14 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 8d265f11c3a..7964234dbfd 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 043f612cf3c..4011cea722e 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 3908db8ce1b..2ad8a0fde0b 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 d3e7ddae4ff..1a505ac1f34 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 cfaaeb456fe..834d984cc6a 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 276f96c6d25..eacabdd9961 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 c665af0fda7..a21c1b061e8 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 4149bd4be12..ce6f59c8909 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 06b0162b570..196f1d4bf0f 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 e14976ce777..b6e83da5cfe 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 566fdc034a3..931f07dfa2d 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 096f12f8a87..819b1744e58 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 a085d47ff04..f6c129e9bba 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 75e7436291f..5276fcba027 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 fc6eafa259a..6fff6db076d 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 dbe16292e04..13460595a81 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 13b615456fc..51e37a0d5af 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 f123a3cef87..e7a11bd205e 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 4a72a1ecf1e..21218f5e4e1 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 bcdc16d4a3c..1190ece8397 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 8e5f931e0a4..9fdc0797f94 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 93355acf93d..bf68126c4c9 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 0ca10ec0d8c..d97e5d35d7a 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 2acb9f96074..e68f9227396 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 178d94bc107..4b2c665e77f 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 a7cc6e254ca..96a992a675f 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 06366eb37b9..761f44c72c3 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 07ad31eb9e5..430785ecae4 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 274f9394319..9ddf00e8f46 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 bcb4f2a8e56..4096ce083cf 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 45a6df001e8..38d513632dc 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 0522226d987..27d89e22939 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 fa0433187f9..61f0c6cb477 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 8fb13107e90..27cc32dc589 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 8f279e8c5bc..8f4ce4799fd 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 16d28193c75..c40b49a2d20 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 41b88c1facd..b6e33a1324e 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 2a6f0a8fa56..6325b7c593f 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 b78154958c9..759a16609f5 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 ab23ce4239c..9c1a3394c75 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 1d465e343c4..707d22e990e 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 1cd8a53654e..bdc11f0e5a1 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 01a7febca29..1a5d5e652d5 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 db5209f9095..650c309887e 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 612712b35bf..0a0bf62f2cb 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 1333561f7e6..616a3464eaf 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 ff7c0db1203..39733204439 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 f26ae0a0c7f..537e9337421 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 63fb43fa56b..b58a7ca255b 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 137f11460a6..c546cfb7136 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 2e4c9005429..96180df92be 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 5383052d167..afcaaf4b088 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 f81675c3725..65e41b56ac2 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 47e1e775856..0006090a866 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 047ecfa0cdf..b0348fec841 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 883f9797d67..1c0c8d8c1c2 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 2f41c54021b..31f753fe543 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 c6099b407b4..0bfd3317471 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 d257d241ff9..d0eb242442e 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 682d80ade01..25ef93e921b 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";
--
GitLab