From 27031d0971e9e558e079934247b2dfa8df5464d7 Mon Sep 17 00:00:00 2001
From: Henri Sara <hesara@vaadin.com>
Date: Mon, 18 Apr 2016 16:59:29 +0300
Subject: Fixes for DevelopmentServerLauncher

Makes it possible to run DSL in the uitest project using the same
configuration as before.

Note that this change might not fix all issues with DSL.

Change-Id: Ie69a97e79247d6c211eb0762c4d4def3499b88ae
---
 uitest/pom.xml                                                       | 5 +----
 .../src/main/java/com/vaadin/launcher/DevelopmentServerLauncher.java | 4 ++--
 .../main/java/com/vaadin/screenshotbrowser/ScreenshotBrowser.java    | 2 +-
 .../src/test/java/com/vaadin/tests/tb3/PrivateTB3Configuration.java  | 2 +-
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/uitest/pom.xml b/uitest/pom.xml
index ee47dcf56e..3ec2454d8a 100644
--- a/uitest/pom.xml
+++ b/uitest/pom.xml
@@ -115,7 +115,6 @@
 			<version>3.0.1</version>
 			<scope>provided</scope>
 		</dependency>
-<!--
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-server</artifactId>
@@ -128,9 +127,7 @@
 			</exclusions>
 			<scope>provided</scope>
 		</dependency>
--->
 		<!-- jetty-servlets needed by ProxyTest, but not by jetty-runner -->
-<!-- 
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-servlets</artifactId>
@@ -192,7 +189,7 @@
 			</exclusions>
 			<scope>provided</scope>
 		</dependency>
--->
+
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
diff --git a/uitest/src/main/java/com/vaadin/launcher/DevelopmentServerLauncher.java b/uitest/src/main/java/com/vaadin/launcher/DevelopmentServerLauncher.java
index aa2c63393b..8f86c2d288 100644
--- a/uitest/src/main/java/com/vaadin/launcher/DevelopmentServerLauncher.java
+++ b/uitest/src/main/java/com/vaadin/launcher/DevelopmentServerLauncher.java
@@ -61,7 +61,7 @@ import com.vaadin.launcher.util.BrowserLauncher;
  */
 public class DevelopmentServerLauncher {
 
-    private static final String KEYSTORE = "uitest/src/com/vaadin/launcher/keystore";
+    private static final String KEYSTORE = "src/main/resources/com/vaadin/launcher/keystore";
     private final static int serverPort = 8888;
 
     /**
@@ -142,7 +142,7 @@ public class DevelopmentServerLauncher {
             String mode) throws Exception {
 
         // Assign default values for some arguments
-        assignDefault(serverArgs, "webroot", "WebContent");
+        assignDefault(serverArgs, "webroot", "src/main/webapp");
         assignDefault(serverArgs, "httpPort", "" + serverPort);
         assignDefault(serverArgs, "context", "");
         assignDefault(serverArgs, "slowdown", "/run/APP/PUBLISHED/js_label.js");
diff --git a/uitest/src/main/java/com/vaadin/screenshotbrowser/ScreenshotBrowser.java b/uitest/src/main/java/com/vaadin/screenshotbrowser/ScreenshotBrowser.java
index 7ed96b38d8..a3fc282131 100644
--- a/uitest/src/main/java/com/vaadin/screenshotbrowser/ScreenshotBrowser.java
+++ b/uitest/src/main/java/com/vaadin/screenshotbrowser/ScreenshotBrowser.java
@@ -398,7 +398,7 @@ public class ScreenshotBrowser extends UI {
 
     private static File findScreenshotDir() {
         File propertiesFile = new File(
-                "work/eclipse-run-selected-test.properties");
+                "../work/eclipse-run-selected-test.properties");
         if (!propertiesFile.exists()) {
             throw new RuntimeException("File "
                     + propertiesFile.getAbsolutePath() + " not found.");
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/PrivateTB3Configuration.java b/uitest/src/test/java/com/vaadin/tests/tb3/PrivateTB3Configuration.java
index 227ef4a84f..85104c784b 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/PrivateTB3Configuration.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/PrivateTB3Configuration.java
@@ -57,7 +57,7 @@ public abstract class PrivateTB3Configuration extends ScreenshotTB3Test {
     private static final String DEPLOYMENT_PROPERTY = "com.vaadin.testbench.deployment.url";
     private static final String HUB_URL = "com.vaadin.testbench.hub.url";
     private static final Properties properties = new Properties();
-    private static final File propertiesFile = new File("work",
+    private static final File propertiesFile = new File("../work",
             "eclipse-run-selected-test.properties");
     private static final String FIREFOX_PATH = "firefox.path";
     private static final String PHANTOMJS_PATH = "phantomjs.binary.path";
-- 
cgit v1.2.3