Author: olamy
Date: Thu Apr 25 13:38:43 2013
New Revision: 1475765
URL: http://svn.apache.org/r1475765
Log:
testing log4j2 FastFile with dev log4j2 configuration
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/log4j2-test.xml
archiva/trunk/pom.xml
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1475765&r1=1475764&r2=1475765&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Thu Apr 25
13:38:43 2013
@@ -79,6 +79,11 @@
</dependency>
<dependency>
+ <groupId>com.lmax</groupId>
+ <artifactId>disruptor</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
<exclusions>
@@ -1009,6 +1014,7 @@
<archiva.javascriptLog>${archiva.javascriptLog}</archiva.javascriptLog>
<archiva.logMissingI18n>${archiva.logMissingI18n}</archiva.logMissingI18n>
<archiva.tmp.group.index.ttl>${archiva.groupIndexTtl}</archiva.tmp.group.index.ttl>
+
<Log4jContextSelector>org.apache.logging.log4j.core.async.AsyncLoggerContextSelector</Log4jContextSelector>
</systemProperties>
<additionalClasspathDirs>
<additionalClasspathDir>${basedir}/src/test/tomcat</additionalClasspathDir>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/log4j2-test.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/log4j2-test.xml?rev=1475765&r1=1475764&r2=1475765&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/log4j2-test.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/log4j2-test.xml
Thu Apr 25 13:38:43 2013
@@ -31,15 +31,15 @@
<PatternLayout pattern="%highlight{%d{HH:mm:ss.SSS} [%t] %-5level
%logger{36} - %msg%n}" />
</Console>
- <!--RollingFile name="console" fileName="${logsDirectory}/archiva.log"
- filePattern="${logsDirectory}/archiva-%d{MM-dd-yyyy}.log">
+ <FastFile name="rolling" fileName="${logsDirectory}/archiva.log"
+ filePattern="${logsDirectory}/archiva-%d{MM-dd-yyyy}.log"
immediateFlush="false" append="true">
<PatternLayout>
<pattern>%d [%t] %-5p %c %x - %m%n</pattern>
</PatternLayout>
<Policies>
<TimeBasedTriggeringPolicy />
</Policies>
- </RollingFile-->
+ </FastFile>
</appenders>
<loggers>
@@ -52,47 +52,42 @@
<logger name="org.apache.http.headers" level="debug"/>
-->
+ <asyncLogger
name="org.apache.archiva.indexer.search.MavenRepositorySearch" level="info"/>
- <logger name="org.apache.archiva.indexer.search.MavenRepositorySearch"
level="info"/>
+ <asyncLogger
name="org.apache.archiva.common.plexusbridge.MavenIndexerUtils" level="info"/>
- <logger name="org.apache.archiva.common.plexusbridge.MavenIndexerUtils"
level="info"/>
+ <asyncLogger name="JPOX" level="error"/>
- <logger name="JPOX" level="error"/>
+ <asyncLogger
name="org.apache.commons.configuration.DefaultConfigurationBuilder"
level="error"/>
+ <asyncLogger name="org.apache.archiva.admin.repository.managed"
level="info"/>
- <logger
name="org.apache.commons.configuration.DefaultConfigurationBuilder"
level="error"/>
+ <asyncLogger name="org.springframework" level="info"/>
+ <asyncLogger name="org.codehaus.plexus" level="info"/>
- <logger name="org.apache.archiva.admin.repository.managed" level="info"/>
+ <asyncLogger name="org.codehaus.redback" level="info"/>
- <logger name="org.springframework" level="info"/>
+ <asyncLogger name="org.apache.cxf" level="info"/>
+ <asyncLogger name="org.quartz" level="info"/>
- <logger name="org.codehaus.plexus" level="info"/>
+ <asyncLogger name="org.apache.archiva.indexer.merger" level="info"/>
+ <asyncLogger
name="org.apache.archiva.metadata.repository.stats.DefaultRepositoryStatisticsManager"
level="debug" />
- <logger name="org.codehaus.redback" level="info"/>
+ <asyncLogger
name="org.apache.archiva.scheduler.repository.DefaultRepositoryArchivaTaskScheduler"
level="debug"/>
+ <asyncLogger name="org.apache.archiva.web.security.ArchivaAuthorizer"
level="debug"/>
- <logger name="org.apache.cxf" level="info"/>
+ <asyncLogger
name="org.apache.archiva.redback.rest.services.DefaultRoleManagementService"
level="debug"/>
- <logger name="org.quartz" level="info"/>
+ <asyncLogger
name="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry"
level="debug"/>
- <logger name="org.apache.archiva.indexer.merger" level="info"/>
-
- <logger
name="org.apache.archiva.metadata.repository.stats.DefaultRepositoryStatisticsManager"
level="debug" />
-
- <logger
name="org.apache.archiva.scheduler.repository.DefaultRepositoryArchivaTaskScheduler"
level="debug"/>
-
- <logger name="org.apache.archiva.web.security.ArchivaAuthorizer"
level="debug"/>
-
- <logger
name="org.apache.archiva.redback.rest.services.DefaultRoleManagementService"
level="debug"/>
-
- <logger
name="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry"
level="debug"/>
-
- <root level="info">
+ <asyncRoot level="info" includeLocation="true">
<appender-ref ref="console"/>
- </root>
+ <appender-ref ref="rolling"/>
+ </asyncRoot>
</loggers>
</configuration>
Modified: archiva/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1475765&r1=1475764&r2=1475765&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Thu Apr 25 13:38:43 2013
@@ -455,6 +455,12 @@
<version>2.1-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>com.lmax</groupId>
+ <artifactId>disruptor</artifactId>
+ <version>3.0.1</version>
+ </dependency>
+
<!--
use this layer as some modules need to use maven apis
until we find a better solution
