From 9fd5b89f160483c5fbddf64d18c900b34fcab05a Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Sun, 9 Sep 2012 22:25:50 +0000
Subject: [PATCH] put log directory in a property for log4j2 files

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1382601 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/resources/log4j2.xml                | 16 ++++++++++------
 .../archiva-webapp/src/main/resources/log4j2.xml | 16 ++++++++++------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/log4j2.xml b/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/log4j2.xml
index 52a145d9e..17b8a2079 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/log4j2.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/log4j2.xml
@@ -21,10 +21,14 @@
 
 <configuration>
 
+  <properties>
+    <property name="logsDirectory">${sys:appserver.base}/logs</property>
+  </properties>
+
   <appenders>
 
-    <RollingFile name="rolling" fileName="${appserver.base}/logs/archiva.log"
-                 filePattern="${appserver.base}/logs/archiva-%d{MM-dd-yy-HH-mm}.log">
+    <RollingFile name="rolling" fileName="${logsDirectory}/archiva.log"
+                 filePattern="${logsDirectory}/archiva-%d{MM-dd-yy-HH-mm}.log">
       <PatternLayout>
         <pattern>%d [%t] %-5p %c %x - %m%n</pattern>
       </PatternLayout>
@@ -33,8 +37,8 @@
       </Policies>
     </RollingFile>
 
-    <RollingFile name="auditlog" fileName="${appserver.base}/logs/archiva-audit.log"
-                 filePattern="${appserver.base}/logs/archiva-audit-%d{MM-dd-yy-HH-mm}.log">
+    <RollingFile name="auditlog" fileName="${logsDirectory}/archiva-audit.log"
+                 filePattern="${logsDirectory}/logs/archiva-audit-%d{MM-dd-yy-HH-mm}.log">
       <PatternLayout>
         <pattern>%d{yyyy-MM-dd HH:mm:ss} %m%n</pattern>
       </PatternLayout>
@@ -43,8 +47,8 @@
       </Policies>
     </RollingFile>
 
-    <RollingFile name="redbackAuditLog" fileName="${appserver.base}/logs/archiva-security-audit.log"
-                 filePattern="${appserver.base}/logs/archiva-security-audit.log-%d{MM-dd-yy-HH-mm}.log">
+    <RollingFile name="redbackAuditLog" fileName="${logsDirectory}/archiva-security-audit.log"
+                 filePattern="${logsDirectory}/archiva-security-audit.log-%d{MM-dd-yy-HH-mm}.log">
       <PatternLayout>
         <pattern>%d{yyyy-MM-dd HH:mm:ss} - %X{redback.currentUser} - %m%n</pattern>
       </PatternLayout>
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 52a145d9e..17b8a2079 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
@@ -21,10 +21,14 @@
 
 <configuration>
 
+  <properties>
+    <property name="logsDirectory">${sys:appserver.base}/logs</property>
+  </properties>
+
   <appenders>
 
-    <RollingFile name="rolling" fileName="${appserver.base}/logs/archiva.log"
-                 filePattern="${appserver.base}/logs/archiva-%d{MM-dd-yy-HH-mm}.log">
+    <RollingFile name="rolling" fileName="${logsDirectory}/archiva.log"
+                 filePattern="${logsDirectory}/archiva-%d{MM-dd-yy-HH-mm}.log">
       <PatternLayout>
         <pattern>%d [%t] %-5p %c %x - %m%n</pattern>
       </PatternLayout>
@@ -33,8 +37,8 @@
       </Policies>
     </RollingFile>
 
-    <RollingFile name="auditlog" fileName="${appserver.base}/logs/archiva-audit.log"
-                 filePattern="${appserver.base}/logs/archiva-audit-%d{MM-dd-yy-HH-mm}.log">
+    <RollingFile name="auditlog" fileName="${logsDirectory}/archiva-audit.log"
+                 filePattern="${logsDirectory}/logs/archiva-audit-%d{MM-dd-yy-HH-mm}.log">
       <PatternLayout>
         <pattern>%d{yyyy-MM-dd HH:mm:ss} %m%n</pattern>
       </PatternLayout>
@@ -43,8 +47,8 @@
       </Policies>
     </RollingFile>
 
-    <RollingFile name="redbackAuditLog" fileName="${appserver.base}/logs/archiva-security-audit.log"
-                 filePattern="${appserver.base}/logs/archiva-security-audit.log-%d{MM-dd-yy-HH-mm}.log">
+    <RollingFile name="redbackAuditLog" fileName="${logsDirectory}/archiva-security-audit.log"
+                 filePattern="${logsDirectory}/archiva-security-audit.log-%d{MM-dd-yy-HH-mm}.log">
       <PatternLayout>
         <pattern>%d{yyyy-MM-dd HH:mm:ss} - %X{redback.currentUser} - %m%n</pattern>
       </PatternLayout>
-- 
2.39.5