Author: brett
Date: Tue Feb 16 14:30:27 2010
New Revision: 910535
URL: http://svn.apache.org/viewvc?rev=910535&view=rev
Log:
avoid logging to /logs in the tests
Added:
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/log4j.xml
- copied, changed from r910494,
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml
Modified:
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesActionTest.java
Modified:
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesActionTest.java
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesActionTest.java?rev=910535&r1=910534&r2=910535&view=diff
==============================================================================
---
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesActionTest.java
(original)
+++
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesActionTest.java
Tue Feb 16 14:30:27 2010
@@ -46,9 +46,6 @@
{
super.setUp();
- // TODO: purely to quiet logging - shouldn't be needed
- String appserverBase = getTestFile( "target/appserver-base"
).getAbsolutePath();
- System.setProperty( "appserver.base", appserverBase );
action = (RepositoriesAction) lookup( Action.class.getName(),
"repositoriesAction" );
}
Copied:
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/log4j.xml
(from r910494,
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml)
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/log4j.xml?p2=archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/log4j.xml&p1=archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml&r1=910494&r2=910535&rev=910535&view=diff
==============================================================================
---
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml
(original)
+++
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/src/test/resources/log4j.xml
Tue Feb 16 14:30:27 2010
@@ -1,141 +1,36 @@
<?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" />
+ <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>
-
- <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.codehaus.plexus.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.apache.maven.archiva">
- <level value="info"/>
- </logger>
-
- <logger name="org.codehaus.redback">
- <level value="info"/>
- </logger>
-
- <logger name="org.codehaus.plexus.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.maven.archiva.webdav.ArchivaDavResource">
- <level value="info"/>
- </logger>
-
- <logger name="org.apache.maven.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>
<root>
<priority value ="info" />
- <appender-ref ref="rolling" />
+ <appender-ref ref="console" />
</root>
</log4j:configuration>
