Move //java/client/test/keystore next to the only two classes that us…

…e it.
roydekleijn · Sep 10, 2013 · 57675ff · 57675ff
1 parent bb35efe
commit 57675ff
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/java/client/test/org/openqa/selenium/environment/webserver/Jetty7AppServer.java b/java/client/test/org/openqa/selenium/environment/webserver/Jetty7AppServer.java
@@ -28,10 +28,12 @@
 import org.seleniumhq.jetty7.server.ssl.SslSocketConnector;
 import org.seleniumhq.jetty7.servlet.ServletHolder;
 import org.seleniumhq.jetty7.servlets.MultiPartFilter;
+import org.seleniumhq.jetty7.util.ssl.SslContextFactory;
 import org.seleniumhq.jetty7.webapp.WebAppContext;
 
 import java.io.File;
 
+import javax.net.ssl.SSLContext;
 import javax.servlet.Filter;
 import javax.servlet.Servlet;
 
@@ -182,13 +184,15 @@ public void start() {
           "Cannot find keystore for SSL cert: " + keyStore.getAbsolutePath());
     }
 
-    SslSocketConnector secureSocket = new SslSocketConnector();
+    SslContextFactory sslContextFactory = new SslContextFactory();
+    sslContextFactory.setKeyStorePath(keyStore.getAbsolutePath());
+    sslContextFactory.setKeyStorePassword("password");
+    sslContextFactory.setKeyManagerPassword("password");
+    sslContextFactory.setTrustStore(keyStore.getAbsolutePath());
+    sslContextFactory.setTrustStorePassword("password");
+
+    SslSocketConnector secureSocket = new SslSocketConnector(sslContextFactory);
     secureSocket.setPort(securePort);
-    secureSocket.setKeystore(keyStore.getAbsolutePath());
-    secureSocket.setPassword("password");
-    secureSocket.setKeyPassword("password");
-    secureSocket.setTruststore(keyStore.getAbsolutePath());
-    secureSocket.setTrustPassword("password");
     server.addConnector(secureSocket);
 
     try {
@@ -199,7 +203,7 @@ public void start() {
   }
 
   protected File getKeyStore() {
-    return InProject.locate("java/client/test/keystore");
+    return InProject.locate("java/client/test/org/openqa/selenium/environment/webserver/keystore");
   }
 
   public void listenOn(int port) {

diff --git a/java/client/test/org/openqa/selenium/environment/webserver/WebbitAppServer.java b/java/client/test/org/openqa/selenium/environment/webserver/WebbitAppServer.java
@@ -21,6 +21,7 @@
 import static java.util.concurrent.Executors.newFixedThreadPool;
 import static org.openqa.selenium.net.PortProber.findFreePort;
 
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.util.concurrent.Future;
@@ -182,7 +183,8 @@ public WebbitAppServer addHandler(String path, HttpHandler handler) {
 
   private InputStream getKeystoreFile() {
     try {
-      return new FileInputStream(InProject.locate("java/client/test/keystore"));
+      return new FileInputStream(InProject.locate(
+          "java/client/test/org/openqa/selenium/environment/webserver/keystore"));
     } catch (Throwable t) {
       throw Throwables.propagate(t);
     }

diff --git a/java/client/test/keystore → ...a/selenium/environment/webserver/keystore b/java/client/test/keystore → ...a/selenium/environment/webserver/keystore