From: Ahmed Ashour Date: Thu, 16 Mar 2017 09:38:47 +0000 (+0100) Subject: ApplicationRunnerServlet to correctly get last modified application (#8852) X-Git-Tag: 8.1.0.alpha1~5 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=330329efcec873314f7aca7e17c1009d401a7bfd;p=vaadin-framework.git ApplicationRunnerServlet to correctly get last modified application (#8852) Also, change README.txt to the correct test port 8888 --- diff --git a/README.md b/README.md index 06d4963aa7..82cf75e350 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ The following preferences need to be set to keep the project consistent. You nee 1. In a Project Explorer right-click *vaadin-uitest* 1. Open *Run As* -> *Maven build...* 1. Type in jetty:run-exploded into *Goals* and click *Run* -1. Open URL *http://localhost:8080/run/<testUI>* +1. Open URL *http://localhost:8888/run/<testUI>* ## Setting up IntelliJ IDEA to Develop Vaadin 7 @@ -75,7 +75,7 @@ The following preferences need to be set to keep the project consistent. You nee 1. Open *Maven Projects* 1. Open *vaadin-uitest* -> *Plugins* -> *jetty* -> *jetty:run-exploded* -1. Open URL *http://localhost:8080/run/<testUI>* +1. Open URL *http://localhost:8888/run/<testUI>* ## Running a Development Server diff --git a/uitest/src/main/java/com/vaadin/launcher/ApplicationRunnerServlet.java b/uitest/src/main/java/com/vaadin/launcher/ApplicationRunnerServlet.java index 6108755058..59de2695bc 100644 --- a/uitest/src/main/java/com/vaadin/launcher/ApplicationRunnerServlet.java +++ b/uitest/src/main/java/com/vaadin/launcher/ApplicationRunnerServlet.java @@ -337,7 +337,7 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet { private static String findLastModifiedApplication() { String lastModifiedClassName = null; - File uitestDir = new File("uitest/src"); + File uitestDir = new File("src/main/java"); if (uitestDir.isDirectory()) { LinkedList stack = new LinkedList<>(); stack.add(uitestDir); @@ -358,7 +358,6 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet { lastModifiedTimestamp = file.lastModified(); lastModifiedClassName = className; } - } } }