summaryrefslogtreecommitdiffstats
path: root/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2015-06-16 09:01:43 +0300
committerLeif Åstrand <leif@vaadin.com>2015-06-16 09:01:43 +0300
commit4bf49ed6316cf38aa753e73d0070c587a18ca5df (patch)
treebd50c4ae49de4295888050f21cb11cae8552f030 /uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java
parent9dc69b25e4599077c0f743b04237c09fad29ecde (diff)
downloadvaadin-framework-4bf49ed6316cf38aa753e73d0070c587a18ca5df.tar.gz
vaadin-framework-4bf49ed6316cf38aa753e73d0070c587a18ca5df.zip
Make Jetty use jul even though the slf4j api is on the classpath
Change-Id: I7a01bb964bd1d73614a5a9fd08405b871f5382ca
Diffstat (limited to 'uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java')
-rw-r--r--uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java b/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java
index 871111ad8b..aa2c63393b 100644
--- a/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java
+++ b/uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java
@@ -49,6 +49,7 @@ import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.nio.SelectChannelConnector;
import org.eclipse.jetty.server.ssl.SslSocketConnector;
import org.eclipse.jetty.util.Scanner;
+import org.eclipse.jetty.util.log.JavaUtilLog;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.webapp.WebAppContext;
@@ -74,6 +75,8 @@ public class DevelopmentServerLauncher {
*/
public static void main(String[] args) {
System.setProperty("java.awt.headless", "true");
+ System.setProperty("org.eclipse.jetty.util.log.class",
+ JavaUtilLog.class.getName());
assertAssertionsEnabled();