aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Becker2012-10-16 08:39:25 (EDT)
committerThomas Becker2012-10-16 08:39:25 (EDT)
commit8e30750a7bbf05386691b506313819c2aa493869 (patch)
treee4b0ce26b322d5ec4049dd8a5444259456e52b66
parent8253a3161445552132f22851f85f396d13ae1a34 (diff)
downloadorg.eclipse.jetty.project-8e30750a7bbf05386691b506313819c2aa493869.zip
org.eclipse.jetty.project-8e30750a7bbf05386691b506313819c2aa493869.tar.gz
org.eclipse.jetty.project-8e30750a7bbf05386691b506313819c2aa493869.tar.bz2
jetty-9 jetty.xml should be the first config file loaded by start.ini. Move jetty-logging.xml behind jetty.xml in start.ini.
-rw-r--r--jetty-distribution/src/main/resources/start.ini21
1 files changed, 8 insertions, 13 deletions
diff --git a/jetty-distribution/src/main/resources/start.ini b/jetty-distribution/src/main/resources/start.ini
index 9fcc0d2..15a5d26 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
@@ -77,6 +66,14 @@ 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
# enable --exec or use --exec-print (see above)
@@ -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
#-----------------------------------------------------------