diff options
author | Bjørn Christian Seime <bjorncs@oath.com> | 2017-11-08 16:41:50 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@oath.com> | 2017-11-08 16:41:50 +0100 |
commit | 85130776922d3c1d72bf720c4fc5ad32fc7bb2da (patch) | |
tree | 4a12dc781822a547e4334571ac5f28eeb88eb66c /jdisc_http_service | |
parent | 7fa4b11b87c5606d144735e21bead8f5bb019954 (diff) |
Move JKSKeyStore to separate package
Diffstat (limited to 'jdisc_http_service')
-rw-r--r-- | jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/jks/JKSKeyStore.java (renamed from jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/JKSKeyStore.java) | 4 | ||||
-rw-r--r-- | jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/TestDriver.java | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/JKSKeyStore.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/jks/JKSKeyStore.java index ce3c6f6ea4a..2ca53b731c3 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/JKSKeyStore.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/jks/JKSKeyStore.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.ssl.jks; + +import com.yahoo.jdisc.http.ssl.SslKeyStore; import java.io.IOException; import java.io.InputStream; 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 b297a7f8453..b2155655b64 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 @@ -6,7 +6,7 @@ import com.google.inject.Module; 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.jks.JKSKeyStore; import com.yahoo.jdisc.http.test.SslContextFactory; import com.yahoo.jdisc.http.ssl.SslKeyStore; |