summaryrefslogtreecommitdiffstats
path: root/jdisc_http_service
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@oath.com>2017-11-08 16:36:11 +0100
committerBjørn Christian Seime <bjorncs@oath.com>2017-11-08 16:36:11 +0100
commitd542503f819b81a3c5c0c49d1a7a76fc987c6896 (patch)
tree502c6390873c7173e2a44c54dc5aab06e456a79d /jdisc_http_service
parentf93282be4b7a50a0ecec38832ad2d7b3bf587ef8 (diff)
Move SslContextFactory to test source directory
Diffstat (limited to 'jdisc_http_service')
-rw-r--r--jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java2
-rw-r--r--jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/TestDriver.java2
-rw-r--r--jdisc_http_service/src/test/java/com/yahoo/jdisc/http/test/RemoteClient.java1
-rw-r--r--jdisc_http_service/src/test/java/com/yahoo/jdisc/http/test/SslContextFactory.java (renamed from jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/SslContextFactory.java)4
4 files changed, 5 insertions, 4 deletions
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java
index 7a03d805864..b0e03bc9035 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java
+++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactoryTest.java
@@ -6,7 +6,7 @@ import com.yahoo.jdisc.Metric;
import com.yahoo.jdisc.http.ConnectorConfig;
import com.yahoo.jdisc.http.SecretStore;
import com.yahoo.jdisc.http.ssl.ReaderForPath;
-import com.yahoo.jdisc.http.ssl.SslContextFactory;
+import com.yahoo.jdisc.http.test.SslContextFactory;
import com.yahoo.jdisc.http.ssl.SslKeyStore;
import com.yahoo.jdisc.http.ssl.pem.PemKeyStore;
import com.yahoo.jdisc.http.ssl.pem.PemSslKeyStore;
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/TestDriver.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/TestDriver.java
index 30f0a5d4d6c..b297a7f8453 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/TestDriver.java
+++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/TestDriver.java
@@ -7,7 +7,7 @@ import com.yahoo.jdisc.application.ContainerBuilder;
import com.yahoo.jdisc.handler.RequestHandler;
import com.yahoo.jdisc.http.ConnectorConfig;
import com.yahoo.jdisc.http.ssl.JKSKeyStore;
-import com.yahoo.jdisc.http.ssl.SslContextFactory;
+import com.yahoo.jdisc.http.test.SslContextFactory;
import com.yahoo.jdisc.http.ssl.SslKeyStore;
import javax.net.ssl.SSLContext;
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/test/RemoteClient.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/test/RemoteClient.java
index dd6033c9975..80603faeaad 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/test/RemoteClient.java
+++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/test/RemoteClient.java
@@ -2,7 +2,6 @@
package com.yahoo.jdisc.http.test;
import com.yahoo.jdisc.http.server.jetty.JettyHttpServer;
-import com.yahoo.jdisc.http.ssl.SslContextFactory;
import com.yahoo.jdisc.http.ssl.SslKeyStore;
import javax.net.ssl.SSLContext;
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/SslContextFactory.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/test/SslContextFactory.java
index 0f39c132b67..e1163b90dfa 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/SslContextFactory.java
+++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/test/SslContextFactory.java
@@ -1,5 +1,7 @@
// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.jdisc.http.ssl;
+package com.yahoo.jdisc.http.test;
+
+import com.yahoo.jdisc.http.ssl.SslKeyStore;
import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.SSLContext;