Adding initial version of Registry and fixing grid console for Firefo…

…x. (#358) * Adding initial version of Registry. * Refreshing every 20 minutes since "-1" in FF does not work, fixes #356
zalando · Dec 10, 2017 · 3f759af · 3f759af
1 parent ce22065
commit 3f759af
Show file tree

Hide file tree

Showing 14 changed files with 457 additions and 24 deletions.
diff --git a/scripts/zalenium.sh b/scripts/zalenium.sh
@@ -428,6 +428,7 @@ StartUp()
     -servlet de.zalando.ep.zalenium.servlet.ZaleniumResourceServlet \
     -servlet de.zalando.ep.zalenium.dashboard.DashboardCleanupServlet \
     -servlet de.zalando.ep.zalenium.servlet.VncAuthenticationServlet \
+    -registry de.zalando.ep.zalenium.registry.ZaleniumRegistry \
     ${DEBUG_FLAG} &
 
     echo $! > ${PID_PATH_SELENIUM}

diff --git a/src/main/java/de/zalando/ep/zalenium/dashboard/DashboardCleanupServlet.java b/src/main/java/de/zalando/ep/zalenium/dashboard/DashboardCleanupServlet.java
@@ -9,7 +9,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.openqa.grid.internal.GridRegistry;
+import de.zalando.ep.zalenium.registry.ZaleniumRegistry;
 import org.openqa.grid.web.servlet.RegistryBasedServlet;
 import com.google.common.io.ByteStreams;
 
@@ -26,7 +26,7 @@ public DashboardCleanupServlet() {
         this(null);
     }
 
-    public DashboardCleanupServlet(GridRegistry registry) {
+    public DashboardCleanupServlet(ZaleniumRegistry registry) {
         super(registry);
     }
 

diff --git a/src/main/java/de/zalando/ep/zalenium/proxy/DockerSeleniumStarterRemoteProxy.java b/src/main/java/de/zalando/ep/zalenium/proxy/DockerSeleniumStarterRemoteProxy.java
@@ -4,7 +4,6 @@
 import de.zalando.ep.zalenium.container.ContainerClient;
 import de.zalando.ep.zalenium.container.ContainerCreationStatus;
 import de.zalando.ep.zalenium.container.ContainerFactory;
-import de.zalando.ep.zalenium.container.kubernetes.KubernetesContainerClient;
 import de.zalando.ep.zalenium.matcher.DockerSeleniumCapabilityMatcher;
 import de.zalando.ep.zalenium.util.Environment;
 import de.zalando.ep.zalenium.util.GoogleAnalyticsApi;