From 9cdfdf34a72c7372cc356f1f802268c623adf0d9 Mon Sep 17 00:00:00 2001
From: Greg Wilkins <gregw@webtide.com>
Date: Wed, 19 Oct 2016 11:20:23 +1100
Subject: [PATCH] Improve logging modules and listing #984

renamed stderout-capture to console-capture
---
 .../{stderrout-capture.mod => console-capture.mod}     |  6 +++---
 .../console-capture.xml}                               | 10 +---------
 2 files changed, 4 insertions(+), 12 deletions(-)
 rename jetty-util/src/main/config/modules/{stderrout-capture.mod => console-capture.mod} (72%)
 rename jetty-util/src/main/config/modules/{stderrout-capture/stderrout-capture.xml => console-capture/console-capture.xml} (67%)

diff --git a/jetty-util/src/main/config/modules/stderrout-capture.mod b/jetty-util/src/main/config/modules/console-capture.mod
similarity index 72%
rename from jetty-util/src/main/config/modules/stderrout-capture.mod
rename to jetty-util/src/main/config/modules/console-capture.mod
index 380e488ba5a..df936a9d9f2 100644
--- a/jetty-util/src/main/config/modules/stderrout-capture.mod
+++ b/jetty-util/src/main/config/modules/console-capture.mod
@@ -1,16 +1,16 @@
 [description]
-Redirects JVMs stderr and stdout to a log file,
+Redirects JVMs console stderr and stdout to a log file,
 including output from Jetty's default StdErrLog logging.
 
 [tags]
 logging
 
 [xml]
-etc/stderrout-capture.xml
+etc/console-capture.xml
 
 [files]
 logs/
-basehome:modules/stderrout-capture/stderrout-capture.xml|etc/stderrout-capture.xml
+basehome:modules/console-capture/console-capture.xml|etc/console-capture.xml
 
 [lib]
 resources/
diff --git a/jetty-util/src/main/config/modules/stderrout-capture/stderrout-capture.xml b/jetty-util/src/main/config/modules/console-capture/console-capture.xml
similarity index 67%
rename from jetty-util/src/main/config/modules/stderrout-capture/stderrout-capture.xml
rename to jetty-util/src/main/config/modules/console-capture/console-capture.xml
index 5edac2118b1..1d370297575 100644
--- a/jetty-util/src/main/config/modules/stderrout-capture/stderrout-capture.xml
+++ b/jetty-util/src/main/config/modules/console-capture/console-capture.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
 
-<!-- =============================================================== -->
-<!-- Configure stderr and stdout to a Jetty rollover log file        -->
-<!-- this configuration file should be used in combination with      -->
-<!-- other configuration files.  e.g.                                -->
-<!--    java -jar start.jar etc/jetty-logging.xml                    -->
-<!-- =============================================================== -->
 <Configure id="logging" class="org.eclipse.jetty.util.log.Log">
-
     <New id="ServerLog" class="java.io.PrintStream">
       <Arg>
         <New class="org.eclipse.jetty.util.RolloverFileOutputStream">
@@ -24,11 +17,10 @@
     </New>
 
     <Get name="rootLogger">
-      <Call name="info"><Arg>Capturing stderr/stdout to <Ref refid="ServerLogName"/></Arg></Call>
+      <Call name="info"><Arg>Console stderr/stdout captured to <Ref refid="ServerLogName"/></Arg></Call>
     </Get>
     <Call class="java.lang.System" name="setErr"><Arg><Ref refid="ServerLog"/></Arg></Call>
     <Call class="java.lang.System" name="setOut"><Arg><Ref refid="ServerLog"/></Arg></Call>
-
 </Configure>