From 68e62f959565abfed610a0091e0e0b62bf0eb081 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Thu, 2 May 2013 13:20:34 +0000
Subject: [PATCH] [MRM-1760] Multiple, incompatible, log name formats

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1478363 13f79535-47bb-0310-9956-ffa450edef68
---
 archiva-jetty/pom.xml                                       | 2 +-
 archiva-jetty/src/main/conf/jetty.xml                       | 4 ++--
 .../archiva-webapp/src/main/resources/log4j2.xml            | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/archiva-jetty/pom.xml b/archiva-jetty/pom.xml
index bdf59a669..73fa9370d 100644
--- a/archiva-jetty/pom.xml
+++ b/archiva-jetty/pom.xml
@@ -121,7 +121,7 @@
                     </property>
                     <property>
                       <name>wrapper.logfile</name>
-                      <value>%ARCHIVA_BASE%/logs/wrapper.YYYYMMDD.log</value>
+                      <value>%ARCHIVA_BASE%/logs/wrapper-YYYYMMDD.log</value>
                     </property>
                     <property>
                       <name>wrapper.logfile.rollmode</name>
diff --git a/archiva-jetty/src/main/conf/jetty.xml b/archiva-jetty/src/main/conf/jetty.xml
index 39ca9f1ed..2881f23f8 100644
--- a/archiva-jetty/src/main/conf/jetty.xml
+++ b/archiva-jetty/src/main/conf/jetty.xml
@@ -179,8 +179,8 @@
     <Ref id="RequestLog">
       <Set name="requestLog">
         <New id="RequestLogImpl" class="org.eclipse.jetty.server.NCSARequestLog">
-          <Set name="filename"><SystemProperty name="jetty.logs" default="./logs"/>/yyyy_mm_dd.request.log</Set>
-          <Set name="filenameDateFormat">yyyy_MM_dd</Set>
+          <Set name="filename"><SystemProperty name="jetty.logs" default="./logs"/>/request-yyyy_mm_dd.log</Set>
+          <Set name="filenameDateFormat">yyyyMMdd</Set>
           <Set name="retainDays">90</Set>
           <Set name="append">true</Set>
           <Set name="extended">true</Set>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml
index 426407f0e..32e1ed8f0 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml
@@ -28,7 +28,7 @@
   <appenders>
 
     <FastRollingFile name="rolling" fileName="${logsDirectory}/archiva.log"
-                 filePattern="${logsDirectory}/archiva-%d{MM-dd-yyyy}.log"
+                 filePattern="${logsDirectory}/archiva-%d{yyyyMMdd}.log"
                  immediateFlush="false" append="true">
       <PatternLayout>
         <pattern>%d [%t] %-5p %c %x - %m%n</pattern>
@@ -39,7 +39,7 @@
     </FastRollingFile>
 
     <FastRollingFile name="auditlog" fileName="${logsDirectory}/archiva-audit.log"
-                 filePattern="${logsDirectory}/archiva-audit-%d{MM-dd-yyyy}.log"
+                 filePattern="${logsDirectory}/archiva-audit-%d{yyyyMMdd}.log"
                  immediateFlush="false" append="true">
       <PatternLayout>
         <pattern>%d{yyyy-MM-dd HH:mm:ss} %m%n</pattern>
@@ -50,7 +50,7 @@
     </FastRollingFile>
 
     <FastRollingFile name="redbackAuditLog" fileName="${logsDirectory}/archiva-security-audit.log"
-                 filePattern="${logsDirectory}/archiva-security-audit.log-%d{MM-dd-yyyy}.log"
+                 filePattern="${logsDirectory}/archiva-security-audit.log-%d{yyyyMMdd}.log"
                  immediateFlush="false" append="true">
       <PatternLayout>
         <pattern>%d{yyyy-MM-dd HH:mm:ss} - %X{redback.currentUser} - %m%n</pattern>
-- 
2.39.5