From a27fd2e2e92b394e1705c647a7a239c5dc18a142 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Sun, 9 Sep 2012 15:38:44 +0000
Subject: [PATCH] [MRM-1660] use log4j2

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1382519 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/test/resources/log4j.xml              |  56 ------
 .../src/test/tomcat/log4j.xml                 |  88 ---------
 .../src/main/resources/log4j.xml              | 178 ------------------
 .../src/main/resources/log4j2.xml             |   2 +-
 4 files changed, 1 insertion(+), 323 deletions(-)
 delete mode 100644 archiva-modules/archiva-web/archiva-webapp-js/src/test/resources/log4j.xml
 delete mode 100644 archiva-modules/archiva-web/archiva-webapp-js/src/test/tomcat/log4j.xml
 delete mode 100644 archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/test/resources/log4j.xml b/archiva-modules/archiva-web/archiva-webapp-js/src/test/resources/log4j.xml
deleted file mode 100644
index 8451b6263..000000000
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/test/resources/log4j.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
-  <appender name="console" class="org.apache.log4j.ConsoleAppender">
-    <layout class="org.apache.log4j.PatternLayout">
-      <param name="ConversionPattern" value="%d [%t] %-5p %c %x - %m%n"/>
-    </layout>
-  </appender>
-  <!--
-  <logger name="org.apache.cxf.jaxrs.interceptor.JAXRSInInterceptor">
-    <level value="trace"/>
-  </logger>
-  <logger name="org.apache.cxf.jaxrs.utils.JAXRSUtils">
-    <level value="trace"/>
-  </logger>
-  -->
-
-
-  <logger name="org.codehaus.redback.rest.services" >
-    <level value="ERROR"/>
-  </logger>
-  <logger name="JPOX">
-    <level value="ERROR"/>
-  </logger>
-
-  <logger name="org.springframework">
-    <level value="ERROR"/>
-  </logger>
-
-  <root>
-    <priority value ="info" />
-    <appender-ref ref="console" />
-  </root>
-
-</log4j:configuration>
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/test/tomcat/log4j.xml b/archiva-modules/archiva-web/archiva-webapp-js/src/test/tomcat/log4j.xml
deleted file mode 100644
index 76dead0e1..000000000
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/test/tomcat/log4j.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
-  <appender name="console" class="org.apache.log4j.ConsoleAppender">
-    <layout class="org.apache.log4j.PatternLayout">
-      <param name="ConversionPattern" value="%d [%t] %-5p %c %x - %m%n"/>
-    </layout>
-  </appender>
-
-  <logger name="org.apache.archiva.indexer.search.NexusRepositorySearch">
-    <level value="debug"/>
-  </logger>
-  <logger name="org.apache.archiva.common.plexusbridge.MavenIndexerUtils">
-    <level value="debug"/>
-  </logger>
-  <logger name="JPOX">
-    <level value="error"/>
-  </logger>
-
-  <logger name="org.apache.commons.configuration.DefaultConfigurationBuilder">
-    <level value="error"/>
-  </logger>
-
-  <logger name="org.apache.archiva.admin.repository.managed">
-    <level value="debug"/>
-  </logger>
-
-  <!-- apache httpclient debug content transfer-->
-  <!--
-  <logger name="org.apache.http.wire">
-    <level value="debug"/>
-  </logger>
-  -->
-  <logger name="org.apache.http.headers">
-    <level value="debug"/>
-  </logger>
-
-  <logger name="org.springframework">
-    <level value="info"/>
-  </logger>
-
-  <logger name="org.codehaus.plexus">
-    <level value="info"/>
-  </logger>
-
-  <logger name="org.codehaus.redback">
-    <level value="info"/>
-  </logger>
-
-  <logger name="org.apache.cxf">
-    <level value="info"/>
-  </logger>
-
-  <logger name="org.quartz">
-    <level value="info"/>
-  </logger>
-
-  <logger name="org.apache.archiva.indexer.merger">
-    <level value="debug"/>
-  </logger>
-
-  <root>
-    <priority value ="info" />
-    <appender-ref ref="console" />
-  </root>
-
-</log4j:configuration>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml
deleted file mode 100644
index 4ab8ea41e..000000000
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~  http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
-  <appender name="rolling" class="org.apache.log4j.DailyRollingFileAppender">
-    <param name="file" value="${appserver.base}/logs/archiva.log" />
-    <param name="append" value="true" />
-    <param name="datePattern" value="'.'yyyy-MM-dd" />
-    <layout class="org.apache.log4j.PatternLayout">
-      <param name="ConversionPattern" value="%d [%t] %-5p %c %x - %m%n"/>
-    </layout>
-  </appender>
-  
-  <appender name="auditlog" class="org.apache.log4j.DailyRollingFileAppender">
-    <param name="file" value="${appserver.base}/logs/archiva-audit.log" />
-    <param name="append" value="true" />
-    <param name="datePattern" value="'.'yyyy-MM-dd" />
-    <layout class="org.apache.log4j.PatternLayout">
-      <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} %m%n"/>
-    </layout>
-  </appender>
-
-  <appender name="redbackAuditLog" class="org.apache.log4j.DailyRollingFileAppender">
-    <param name="file" value="${appserver.base}/logs/archiva-security-audit.log" />
-    <param name="append" value="true" />
-    <param name="datePattern" value="'.'yyyy-MM-dd" />
-    <layout class="org.apache.log4j.PatternLayout">
-      <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} - %X{redback.currentUser} - %m%n"/>
-    </layout>
-  </appender>
-
-  <logger name="org.apache.archiva.redback.struts2.action.AuditEvent" additivity="false">
-    <level value="info" />
-    <appender-ref ref="redbackAuditLog" />
-  </logger>
-
-  <logger name="org.apache.archiva.AuditLog" additivity="false">
-    <level value="info" />
-    <appender-ref ref="auditlog" />
-  </logger>
-  
-<!-- INFO level loggers can use the default
- <logger name="org.apache.archiva.consumers">
-    <level value="info"/>
-  </logger>
-  
-  <logger name="org.apache.archiva">
-    <level value="info"/>
-  </logger>
-  
-  <logger name="org.codehaus.redback">
-    <level value="info"/>
-  </logger>
-
-  <logger name="org.apache.archiva.redback">
-    <level value="info"/>
-  </logger>
-
-  <logger name="org.codehaus.plexus.mailsender.MailSender">
-    <level value="info"/>
-  </logger>
-
-  <logger name="org.quartz">
-    <level value="info"/>
-  </logger>
-
-  <logger name="org.apache.jasper">
-    <level value="info"/>
-  </logger>
-
-  <logger name="com.opensymphony.xwork2">
-    <level value="info"/>
-  </logger>
-
-  <logger name="org.apache.struts2">
-    <level value="info"/>
-  </logger>
-
-  <logger name="org.codehaus.plexus.PlexusContainer">
-    <level value="info"/>
-  </logger>
--->
-
-  <!-- WebDav objects -->
-  <logger name="org.apache.archiva.webdav.ArchivaDavResource">
-    <level value="info"/>
-  </logger>
-  
-  <logger name="org.apache.archiva.webdav.ArchivaDavResourceFactory">
-    <level value="info"/>
-  </logger>
-
-  <!-- squelch noisy objects (for now) -->
-  <logger name="org.apache.commons">
-    <level value="warn"/>
-  </logger>
-
-  <logger name="net.sf.ehcache">
-    <level value="warn"/>
-  </logger>
-
-  <logger name="org.codehaus.plexus.velocity">
-    <level value="error"/>
-  </logger>
-
-  <!-- retained for Redback -->
-  <logger name="JPOX">
-    <level value="warn"/>
-  </logger>
-
-  <logger name="JPOX.MetaData">
-    <level value="error"/>
-  </logger>
-
-  <logger name="JPOX.RDBMS.SQL">
-    <level value="error"/>
-  </logger>
-
-  <logger name="SQL">
-    <level value="error"/>
-  </logger>
-
-  <logger name="freemarker">
-    <level value="warn"/>
-  </logger>
-
-  <logger name="org.codehaus.plexus.component.manager.ClassicSingletonComponentManager">
-    <level value="error"/>
-  </logger>
-
-  <logger name="com.opensymphony.xwork2.ognl.OgnlValueStack">
-    <level value="error"/>
-  </logger>
-
-  <!-- debug wagon transfer -->
-  <!--
-  <logger name="org.apache.archiva.proxy.common">
-    <level value="debug"/>
-  </logger>
-  -->
-  <!-- apache httpclient debug content transfer verbose -->
-  <!--
-  <logger name="org.apache.http.wire">
-    <level value="debug"/>
-  </logger>
-  -->
-  <!-- apache httpclient log headers -->
-  <!--
-  <logger name="org.apache.http.headers">
-    <level value="debug"/>
-  </logger>
-  -->
-
-  <root>
-    <priority value ="info" />
-    <appender-ref ref="rolling" />
-  </root>
-
-</log4j:configuration>
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 16e84a5a1..52a145d9e 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
@@ -19,7 +19,7 @@
   -->
 
 
-<configuration status="debug">
+<configuration>
 
   <appenders>
 
-- 
2.39.5