summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAhmed Ashour <asashour@yahoo.com>2017-03-16 10:38:47 +0100
committerHenri Sara <henri.sara@gmail.com>2017-03-16 11:38:47 +0200
commit330329efcec873314f7aca7e17c1009d401a7bfd (patch)
tree17d46d49f3f65d4c9c0a4d2a27756d699926a9dc
parent41878d8943db8d9db98cf8e752b3ffba9bb8fd59 (diff)
downloadvaadin-framework-330329efcec873314f7aca7e17c1009d401a7bfd.tar.gz
vaadin-framework-330329efcec873314f7aca7e17c1009d401a7bfd.zip
ApplicationRunnerServlet to correctly get last modified application (#8852)
Also, change README.txt to the correct test port 8888
-rw-r--r--README.md4
-rw-r--r--uitest/src/main/java/com/vaadin/launcher/ApplicationRunnerServlet.java3
2 files changed, 3 insertions, 4 deletions
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 <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 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<File> stack = new LinkedList<>();
stack.add(uitestDir);
@@ -358,7 +358,6 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet {
lastModifiedTimestamp = file.lastModified();
lastModifiedClassName = className;
}
-
}
}
}