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 06d4963aa78fa239309deff071a6dc6e0a79b2c6..82cf75e350784b0db1f75788d954f77f72511dd3 100644 (file)
--- 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 <code>jetty:run-exploded</code> into *Goals* and click *Run*
-1. Open URL *http://localhost:8080/run/&lt;testUI&gt;*
+1. Open URL *http://localhost:8888/run/&lt;testUI&gt;*
 
 ## 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/&lt;testUI&gt;*
+1. Open URL *http://localhost:8888/run/&lt;testUI&gt;*
 
 ## 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 61087550583f1be45ffdba62453430a7b702968f..59de2695bc1cb55ab4bba7f68acb89b057fe1613 100644 (file)
--- 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<File> stack = new LinkedList<>();
             stack.add(uitestDir);
@@ -358,7 +358,6 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet {
                             lastModifiedTimestamp = file.lastModified();
                             lastModifiedClassName = className;
                         }
-
                     }
                 }
             }