From: Leif Åstrand <leif@vaadin.com>
Date: Tue, 16 Jun 2015 06:01:43 +0000 (+0300)
Subject: Make Jetty use jul even though the slf4j api is on the classpath
X-Git-Tag: 7.6.0.alpha2~5^2~24
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4bf49ed6316cf38aa753e73d0070c587a18ca5df;p=vaadin-framework.git

Make Jetty use jul even though the slf4j api is on the classpath

Change-Id: I7a01bb964bd1d73614a5a9fd08405b871f5382ca
---

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();