[MRM-1216] remove jetty-logging configuration and log everything to stdout (wrapper...

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@794571 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-jetty/pom.xml b/archiva-jetty/pom.xml
index badd17e859c9db3dcd03d144f21253a8e76b51bc..0e9ada6ede9fa4d45988a4f2fc7e0f41b7cd97cc 100644 (file)
--- a/archiva-jetty/pom.xml
+++ b/archiva-jetty/pom.xml
@@ -86,7 +86,6 @@
               <mainClass>org.mortbay.start.Main</mainClass>
               <commandLineArguments>
                 <commandLineArgument>conf/jetty.xml</commandLineArgument>
-                <commandLineArgument>conf/jetty-logging.xml</commandLineArgument> 
               </commandLineArguments>
               <platforms>
                 <platform>jsw</platform>
@@ -119,10 +118,6 @@
                       <name>wrapper.app.parameter.2</name>
                       <value>%ARCHIVA_BASE%/conf/jetty.xml</value>
                     </property>
-                    <property>
-                      <name>wrapper.app.parameter.3</name>
-                      <value>%ARCHIVA_BASE%/conf/jetty-logging.xml</value>
-                    </property>
                     <property>
                       <name>app.base.envvar</name>
                       <value>ARCHIVA_BASE</value>

diff --git a/archiva-jetty/src/main/conf/jetty-logging.xml b/archiva-jetty/src/main/conf/jetty-logging.xml
deleted file mode 100644 (file)
index 3eedcd6..0000000
--- a/archiva-jetty/src/main/conf/jetty-logging.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.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 etc/jetty.xml      -->
-<!-- =============================================================== -->
-<Configure id="Server" class="org.mortbay.jetty.Server">
-
-    <New id="ServerLog" class="java.io.PrintStream">
-      <Arg>
-        <New class="org.mortbay.util.RolloverFileOutputStream">
-          <Arg><SystemProperty name="jetty.logs" default="./logs"/>/yyyy_mm_dd.stderrout.log</Arg>
-          <Arg type="boolean">false</Arg>
-          <Arg type="int">90</Arg>
-          <Arg><Call class="java.util.TimeZone" name="getTimeZone"><Arg>GMT</Arg></Call></Arg>
-          <Get id="ServerLogName" name="datedFilename"/>
-        </New>
-      </Arg>
-    </New>
-
-    <Call class="org.mortbay.log.Log" name="info"><Arg>Redirecting stderr/stdout to <Ref id="ServerLogName"/></Arg></Call>
-    <Call class="java.lang.System" name="setErr"><Arg><Ref id="ServerLog"/></Arg></Call>
-    <Call class="java.lang.System" name="setOut"><Arg><Ref id="ServerLog"/></Arg></Call>
-
-</Configure>
-
-
-