From 8e30750a7bbf05386691b506313819c2aa493869 Mon Sep 17 00:00:00 2001 From: Thomas Becker Date: Tue, 16 Oct 2012 14:39:25 +0200 Subject: [PATCH] jetty-9 jetty.xml should be the first config file loaded by start.ini. Move jetty-logging.xml behind jetty.xml in start.ini. --- .../src/main/resources/start.ini | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/jetty-distribution/src/main/resources/start.ini b/jetty-distribution/src/main/resources/start.ini index 9fcc0d2b0b5..15a5d262fda 100644 --- a/jetty-distribution/src/main/resources/start.ini +++ b/jetty-distribution/src/main/resources/start.ini @@ -11,7 +11,6 @@ #=========================================================== - #=========================================================== # The --exec option should be used if any of the JVM options # in this file are uncommented (eg -D* or -X*). Because a @@ -53,16 +52,6 @@ # -XX:CMSInitiatingOccupancyFraction=80 #=========================================================== - -#=========================================================== -# Server logging. -# The following configuration will redirect stderr and stdout -# to file which is rolled over daily. -#----------------------------------------------------------- -# etc/jetty-logging.xml -#=========================================================== - - #=========================================================== # Default Server Options # Use the core server jars with websocket on the classpath @@ -76,6 +65,14 @@ etc/jetty.xml start.d/ #=========================================================== +#=========================================================== +# Server logging. +# The following configuration will redirect stderr and stdout +# to file which is rolled over daily. +#----------------------------------------------------------- +# etc/jetty-logging.xml +#=========================================================== + #=========================================================== # JMX Management # To enable remote JMX access uncomment jmxromote and @@ -107,7 +104,6 @@ etc/jetty-http.xml etc/jetty-https.xml #=========================================================== - #=========================================================== # SPDY Connector # SPDY should not be used with HTTPS as the SPDY connector @@ -121,7 +117,6 @@ etc/jetty-https.xml # etc/jetty-spdy.xml #=========================================================== - #=========================================================== # Webapplication Deployer #-----------------------------------------------------------