Author: olamy
Date: Sun Sep 9 22:25:50 2012
New Revision: 1382601
URL: http://svn.apache.org/viewvc?rev=1382601&view=rev
Log:
put log directory in a property for log4j2 files
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/log4j2.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/log4j2.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/log4j2.xml?rev=1382601&r1=1382600&r2=1382601&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/log4j2.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/log4j2.xml
Sun Sep 9 22:25:50 2012
@@ -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>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml?rev=1382601&r1=1382600&r2=1382601&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml
Sun Sep 9 22:25:50 2012
@@ -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>
