]> source.dussan.org Git - vaadin-framework.git/commitdiff
Make Jetty use jul even though the slf4j api is on the classpath
authorLeif Åstrand <leif@vaadin.com>
Tue, 16 Jun 2015 06:01:43 +0000 (09:01 +0300)
committerHenri Sara <hesara@vaadin.com>
Sat, 4 Jul 2015 07:43:51 +0000 (10:43 +0300)
Change-Id: I40804d3e832e4bc7f58c800b74cb56e25a86d353

uitest/src/com/vaadin/launcher/DevelopmentServerLauncher.java

index 871111ad8b6e0aa1b9bbe504d0ec143d740aaea8..aa2c63393be64f2a12e0d9d0b40e2c35d745aaca 100644 (file)
@@ -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();