From 4b9fec0cf3588b055eb6b12e237383828453c304 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Thu, 30 Jan 2020 17:53:41 +0100 Subject: [PATCH] Updates after review. Signed-off-by: Simone Bordet --- .../src/main/config/modules/test-keystore.mod | 2 +- .../{keystore.p12 => test-keystore.p12} | Bin .../jetty/test/HttpInputIntegrationTest.java | 3 +-- .../src/test/resources/keystore.p12 | Bin 0 -> 2565 bytes 4 files changed, 2 insertions(+), 3 deletions(-) rename jetty-server/src/main/config/modules/test-keystore/{keystore.p12 => test-keystore.p12} (100%) create mode 100644 tests/test-integration/src/test/resources/keystore.p12 diff --git a/jetty-server/src/main/config/modules/test-keystore.mod b/jetty-server/src/main/config/modules/test-keystore.mod index 40cf74e70da..42dd6a0a90c 100644 --- a/jetty-server/src/main/config/modules/test-keystore.mod +++ b/jetty-server/src/main/config/modules/test-keystore.mod @@ -9,7 +9,7 @@ ssl ssl [files] -basehome:modules/test-keystore/keystore.p12|etc/test-keystore.p12 +basehome:modules/test-keystore/test-keystore.p12|etc/test-keystore.p12 [ini] jetty.sslContext.keyStorePath?=etc/test-keystore.p12 diff --git a/jetty-server/src/main/config/modules/test-keystore/keystore.p12 b/jetty-server/src/main/config/modules/test-keystore/test-keystore.p12 similarity index 100% rename from jetty-server/src/main/config/modules/test-keystore/keystore.p12 rename to jetty-server/src/main/config/modules/test-keystore/test-keystore.p12 diff --git a/tests/test-integration/src/test/java/org/eclipse/jetty/test/HttpInputIntegrationTest.java b/tests/test-integration/src/test/java/org/eclipse/jetty/test/HttpInputIntegrationTest.java index f55a84dd5c9..2474e1ad945 100644 --- a/tests/test-integration/src/test/java/org/eclipse/jetty/test/HttpInputIntegrationTest.java +++ b/tests/test-integration/src/test/java/org/eclipse/jetty/test/HttpInputIntegrationTest.java @@ -102,9 +102,8 @@ public class HttpInputIntegrationTest __server.addConnector(http); // SSL Context Factory for HTTPS and HTTP/2 - String jettyDistro = System.getProperty("jetty.distro", "../../jetty-distribution/target/distribution"); __sslContextFactory = new SslContextFactory.Server(); - __sslContextFactory.setKeyStorePath(jettyDistro + "/../../../jetty-server/src/test/resources/keystore.p12"); + __sslContextFactory.setKeyStorePath("src/test/resources/keystore.p12"); __sslContextFactory.setKeyStorePassword("storepwd"); // HTTPS Configuration diff --git a/tests/test-integration/src/test/resources/keystore.p12 b/tests/test-integration/src/test/resources/keystore.p12 new file mode 100644 index 0000000000000000000000000000000000000000..5c14fee0c85c1cfaa8de3e56d380988e4c3672a8 GIT binary patch literal 2565 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