Author: olamy
Date: Sun Sep 9 15:38:26 2012
New Revision: 1382518
URL: http://svn.apache.org/viewvc?rev=1382518&view=rev
Log:
[MRM-1660] use log4j2
Added:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/log4j2-test.xml
- copied, changed from r1382517,
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/log4j.xml
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/log4j2-test.xml
(contents, props changed)
- copied, changed from r1382517,
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/resources/log4j.xml
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/resources/log4j2-test.xml
- copied, changed from r1382517,
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/log4j.xml
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/log4j2-test.xml
(contents, props changed)
- copied, changed from r1382517,
archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/test/resources/log4j.xml
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/resources/log4j2-test.xml
(contents, props changed)
- copied, changed from r1382517,
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/log4j.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/log4j2.xml
(with props)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/resources/log4j2-test.xml
(contents, props changed)
- copied, changed from r1382517,
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/log4j.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml
(with props)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/log4j2-test.xml
(with props)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/log4j2-test.xml
(with props)
archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/test/resources/log4j2-test.xml
(contents, props changed)
- copied, changed from r1382517,
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/resources/log4j.xml
Removed:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/log4j.xml
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/log4j.xml
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/resources/log4j.xml
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/log4j.xml
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/resources/log4j.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/log4j.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/log4j.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/log4j.xml
archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/test/resources/log4j.xml
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/pom.xml
archiva/trunk/archiva-modules/plugins/stage-repository-merge/pom.xml
archiva/trunk/pom.xml
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml?rev=1382518&r1=1382517&r2=1382518&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml
Sun Sep 9 15:38:26 2012
@@ -92,7 +92,7 @@
<version>${archetypeVersion}</version>
<configuration>
<settingsFile>${basedir}/src/test/test-settings.xml</settingsFile>
-
<localRepositoryPath>${basedir}/target/local-repo</localRepositoryPath>
+
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
</configuration>
</plugin>
</plugins>
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/pom.xml?rev=1382518&r1=1382517&r2=1382518&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/pom.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/pom.xml
Sun Sep 9 15:38:26 2012
@@ -35,6 +35,8 @@
<properties>
<archiva.version>${archivaVersion}</archiva.version>
<wagonVersion>${wagon.version}</wagonVersion>
+ <slf4jVersion>${slf4j.version}</slf4jVersion>
+ <log4jVersion>${log4j.version}</log4jVersion>
</properties>
<dependencies>
<dependency>
@@ -72,14 +74,34 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.6.4</version>
+ <version>${slf4jVersion}</version>
</dependency>
+
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.6.4</version>
- <scope>provided</scope>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4jVersion}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j12-api</artifactId>
+ <version>${log4jVersion}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>slf4j-impl</artifactId>
+ <version>${log4jVersion}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-jcl</artifactId>
+ <version>${log4jVersion}</version>
+ <scope>runtime</scope>
</dependency>
+
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-repository-admin-default</artifactId>
Copied:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/log4j2-test.xml
(from r1382517,
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/log4j.xml)
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/log4j2-test.xml?p2=archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/log4j2-test.xml&p1=archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/log4j.xml&r1=1382517&r2=1382518&rev=1382518&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/log4j.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/log4j2-test.xml
Sun Sep 9 15:38:26 2012
@@ -18,19 +18,21 @@
~ under the License.
-->
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";>
+<configuration status="debug">
+ <appenders>
+ <Console name="console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d [%t] %-5p %c %x - %m%n"/>
+ </Console>
+ </appenders>
+ <loggers>
+
+ <logger name="org.springframework" level="info"/>
+
+ <root level="info">
+ <appender-ref ref="console"/>
+ </root>
+ </loggers>
+</configuration>
- <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>
-
- <root>
- <priority value ="info" />
- <appender-ref ref="console" />
- </root>
-</log4j:configuration>
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml?rev=1382518&r1=1382517&r2=1382518&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
Sun Sep 9 15:38:26 2012
@@ -178,6 +178,12 @@
</dependency>
<dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>slf4j-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-users-memory</artifactId>
<scope>test</scope>
Copied:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/log4j2-test.xml
(from r1382517,
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/resources/log4j.xml)
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/log4j2-test.xml?p2=archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/log4j2-test.xml&p1=archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/resources/log4j.xml&r1=1382517&r2=1382518&rev=1382518&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/resources/log4j.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/log4j2-test.xml
Sun Sep 9 15:38:26 2012
@@ -18,27 +18,27 @@
~ under the License.
-->
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";>
+<configuration status="debug">
+ <appenders>
+ <Console name="console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} -
%msg%n"/>
+ </Console>
+ </appenders>
+ <loggers>
+
+ <logger name="org.apache.archiva.admin.repository.managed" level="debug"/>
+
+ <logger name="JPOX" level="error"/>
+
+
+ <logger name="org.springframework" level="error"/>
+
+
+ <root level="info">
+ <appender-ref ref="console"/>
+ </root>
+ </loggers>
+</configuration>
- <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.springframework">
- <level value="ERROR"/>
- </logger>
-
- <logger name="org.apache.archiva.scheduler.indexing">
- <level value="debug"/>
- </logger>
-
- <root>
- <priority value ="info" />
- <appender-ref ref="console" />
- </root>
-</log4j:configuration>
Propchange:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/log4j2-test.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/log4j2-test.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/resources/log4j2-test.xml
(from r1382517,
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/log4j.xml)
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/resources/log4j2-test.xml?p2=archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/resources/log4j2-test.xml&p1=archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/log4j.xml&r1=1382517&r2=1382518&rev=1382518&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/log4j.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/resources/log4j2-test.xml
Sun Sep 9 15:38:26 2012
@@ -18,19 +18,23 @@
~ under the License.
-->
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";>
+<configuration status="debug">
+ <appenders>
+ <Console name="console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d [%t] %-5p %c %x - %m%n"/>
+ </Console>
+ </appenders>
+ <loggers>
+
+ <logger name="org.springframework" level="error"/>
+
+ <logger name="org.apache.archiva.scheduler.indexing" level="debug"/>
+
+ <root level="info">
+ <appender-ref ref="console"/>
+ </root>
+ </loggers>
+</configuration>
- <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>
-
- <root>
- <priority value ="info" />
- <appender-ref ref="console" />
- </root>
-</log4j:configuration>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml?rev=1382518&r1=1382517&r2=1382518&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
Sun Sep 9 15:38:26 2012
@@ -267,6 +267,12 @@
</dependency>
<dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>slf4j-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope>
Copied:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/log4j2-test.xml
(from r1382517,
archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/test/resources/log4j.xml)
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/log4j2-test.xml?p2=archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/log4j2-test.xml&p1=archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/test/resources/log4j.xml&r1=1382517&r2=1382518&rev=1382518&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/test/resources/log4j.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/log4j2-test.xml
Sun Sep 9 15:38:26 2012
@@ -18,24 +18,26 @@
~ under the License.
-->
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";>
+<configuration status="debug">
+ <appenders>
+ <Console name="console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d [%t] %-5p %c %x - %m%n"/>
+ </Console>
+ </appenders>
+ <loggers>
+
+ <logger name="org.codehaus.redback.rest.services" level="error"/>
+
+ <logger name="JPOX" level="error"/>
+
+
+ <logger name="org.springframework" level="error"/>
+
+ <root level="info">
+ <appender-ref ref="console"/>
+ </root>
+ </loggers>
+</configuration>
- <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.stagerepository.merge">
- <level value="debug"/>
- </logger>
-
- <root>
- <priority value ="info" />
- <appender-ref ref="console" />
- </root>
-
-</log4j:configuration>
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/log4j2-test.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/log4j2-test.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-web-common/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/pom.xml?rev=1382518&r1=1382517&r2=1382518&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-web-common/pom.xml
(original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-web-common/pom.xml Sun
Sep 9 15:38:26 2012
@@ -140,6 +140,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>slf4j-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-test-utils</artifactId>
<version>${project.version}</version>
Copied:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/resources/log4j2-test.xml
(from r1382517,
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/log4j.xml)
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/resources/log4j2-test.xml?p2=archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/resources/log4j2-test.xml&p1=archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/log4j.xml&r1=1382517&r2=1382518&rev=1382518&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/log4j.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/resources/log4j2-test.xml
Sun Sep 9 15:38:26 2012
@@ -18,19 +18,23 @@
~ under the License.
-->
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";>
+<configuration status="debug">
+ <appenders>
+ <Console name="console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d [%t] %-5p %c %x - %m%n"/>
+ </Console>
+ </appenders>
+ <loggers>
+
+ <logger name="org.springframework" level="error"/>
+
+ <logger name="org.apache.archiva.web" level="debug"/>
+
+ <root level="info">
+ <appender-ref ref="console"/>
+ </root>
+ </loggers>
+</configuration>
- <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>
-
- <root>
- <priority value ="info" />
- <appender-ref ref="console" />
- </root>
-</log4j:configuration>
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/resources/log4j2-test.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/resources/log4j2-test.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml?rev=1382518&r1=1382517&r2=1382518&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
(original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml Sun Sep
9 15:38:26 2012
@@ -642,6 +642,11 @@
<artifactId>redback-integrations-security</artifactId>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<scope>runtime</scope>
Added:
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=1382518&view=auto
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/log4j2.xml
(added)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/log4j2.xml
Sun Sep 9 15:38:26 2012
@@ -0,0 +1,138 @@
+<?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.
+ -->
+
+
+<configuration>
+
+ <appenders>
+
+ <RollingFile name="rolling" fileName="${appserver.base}/logs/archiva.log"
+
filePattern="${appserver.base}/logs/archiva-%d{MM-dd-yy-HH-mm}.log">
+ <PatternLayout>
+ <pattern>%d [%t] %-5p %c %x - %m%n</pattern>
+ </PatternLayout>
+ <Policies>
+ <TimeBasedTriggeringPolicy />
+ </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">
+ <PatternLayout>
+ <pattern>%d{yyyy-MM-dd HH:mm:ss} %m%n</pattern>
+ </PatternLayout>
+ <Policies>
+ <TimeBasedTriggeringPolicy />
+ </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">
+ <PatternLayout>
+ <pattern>%d{yyyy-MM-dd HH:mm:ss} - %X{redback.currentUser} -
%m%n</pattern>
+ </PatternLayout>
+ <Policies>
+ <TimeBasedTriggeringPolicy />
+ </Policies>
+ </RollingFile>
+
+ </appenders>
+ <loggers>
+
+ <logger name="org.apache.archiva.redback.struts2.action.AuditEvent"
additivity="false" level="info">
+ <appender-ref ref="redbackAuditLog" />
+ </logger>
+
+ <logger name="org.apache.archiva.AuditLog" additivity="false" level="info">
+ <appender-ref ref="auditlog" />
+ </logger>
+
+ <!-- INFO level loggers can use the default
+ <logger name="org.apache.archiva.consumers" level="info"/>
+
+ <logger name="org.apache.archiva" level="info"/>
+
+
+ <logger name="org.quartz" level="info"/>
+
+ <logger name="org.apache.jasper" level="info"/>
+
+ <logger name="com.opensymphony.xwork2" level="info"/>
+
+ <logger name="org.apache.struts2" level="info"/>
+
+ -->
+
+ <!-- WebDav objects -->
+ <logger name="org.apache.archiva.webdav.ArchivaDavResource" level="info"/>
+
+
+ <logger name="org.apache.archiva.webdav.ArchivaDavResourceFactory"
level="info"/>
+
+
+ <!-- squelch noisy objects (for now) -->
+ <logger name="org.apache.commons" level="warn"/>
+
+ <logger name="net.sf.ehcache" level="warn"/>
+
+
+ <!-- retained for Redback -->
+ <logger name="JPOX" level="warn"/>
+
+
+ <logger name="JPOX.MetaData" level="error"/>
+
+
+ <logger name="JPOX.RDBMS.SQL" level="error"/>
+
+
+ <logger name="SQL" level="error"/>
+
+ <logger name="freemarker" level="warn"/>
+
+ <logger
name="org.codehaus.plexus.component.manager.ClassicSingletonComponentManager"
level="error"/>
+
+
+ <logger name="com.opensymphony.xwork2.ognl.OgnlValueStack" level="error"/>
+
+
+ <!-- debug wagon transfer -->
+ <!--
+ <logger name="org.apache.archiva.proxy.common" level="debug"/>
+
+ -->
+ <!-- apache httpclient debug content transfer verbose -->
+ <!--
+ <logger name="org.apache.http.wire" level="debug"/>
+
+ -->
+ <!-- apache httpclient log headers -->
+ <!--
+ <logger name="org.apache.http.headers" level="debug"/>
+
+ -->
+
+ <root level="info">
+ <appender-ref ref="rolling"/>
+ </root>
+ </loggers>
+</configuration>
+
+
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/log4j2.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/log4j2.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/resources/log4j2-test.xml
(from r1382517,
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/log4j.xml)
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/resources/log4j2-test.xml?p2=archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/resources/log4j2-test.xml&p1=archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/log4j.xml&r1=1382517&r2=1382518&rev=1382518&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/log4j.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/resources/log4j2-test.xml
Sun Sep 9 15:38:26 2012
@@ -18,32 +18,36 @@
~ under the License.
-->
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";>
+<configuration status="debug">
+ <appenders>
+ <Console name="console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d [%t] %-5p %c %x - %m%n"/>
+ </Console>
+ </appenders>
+ <loggers>
+
+ <!--
+ <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.apache.archiva.redback.rest.services" level="error"/>
+
+ <logger name="JPOX" level="error"/>
+
+
+ <logger name="org.springframework" level="error"/>
+
+ <root level="info">
+ <appender-ref ref="console"/>
+ </root>
+ </loggers>
+</configuration>
- <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.admin.repository.managed" >
- <level value="debug"/>
- </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>
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/resources/log4j2-test.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/test/resources/log4j2-test.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
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=1382518&r1=1382517&r2=1382518&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Sun Sep 9
15:38:26 2012
@@ -318,11 +318,30 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-ext</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j12-api</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>slf4j-impl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>httpunit</groupId>
<artifactId>httpunit</artifactId>
<scope>test</scope>
@@ -486,6 +505,12 @@
<dependency>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-struts2-integration</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
@@ -1312,28 +1337,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>override-log4j-with-console-output</id>
- <phase>process-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy overwrite="true"
file="${basedir}/src/test/tomcat/log4j.xml"
- todir="${project.build.directory}/classes"/>
- <copy overwrite="true"
file="${basedir}/src/test/tomcat/auto-admin-creation.properties"
- todir="${basedir}/target/"/>
- <delete dir="${basedir}/src/main/webapp/WEB-INF/lib"/>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<!-- redefine to skip its execution in Tomcat -->
@@ -1468,10 +1471,12 @@
<appserver.base>${archivaAppServerBase}</appserver.base>
<appserver.home>${archivaAppServerBase}</appserver.home>
<derby.system.home>${archivaAppServerBase}/logs</derby.system.home>
-
<redback.admin.creation.file>${basedir}/target/auto-admin-creation.properties
- </redback.admin.creation.file>
+
<redback.admin.creation.file>${basedir}/src/test/tomcat/auto-admin-creation.properties
</redback.admin.creation.file>
<java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
</systemProperties>
+ <additionalClasspathDirs>
+
<additionalClasspathDir>${basedir}/src/test/tomcat</additionalClasspathDir>
+ </additionalClasspathDirs>
</configuration>
<dependencies>
<dependency>
@@ -1498,10 +1503,12 @@
<appserver.base>${archivaAppServerBase}</appserver.base>
<appserver.home>${archivaAppServerBase}</appserver.home>
<derby.system.home>${archivaAppServerBase}/logs</derby.system.home>
-
<redback.admin.creation.file>${basedir}/target/auto-admin-creation.properties
- </redback.admin.creation.file>
+
<redback.admin.creation.file>${basedir}/src/test/tomcat/auto-admin-creation.properties
</redback.admin.creation.file>
<java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
</systemProperties>
+ <additionalClasspathDirs>
+
<additionalClasspathDir>${basedir}/src/test/tomcat</additionalClasspathDir>
+ </additionalClasspathDirs>
</configuration>
<dependencies>
<dependency>
Added:
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=1382518&view=auto
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml
(added)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml
Sun Sep 9 15:38:26 2012
@@ -0,0 +1,138 @@
+<?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.
+ -->
+
+
+<configuration status="debug">
+
+ <appenders>
+
+ <RollingFile name="rolling" fileName="${appserver.base}/logs/archiva.log"
+
filePattern="${appserver.base}/logs/archiva-%d{MM-dd-yy-HH-mm}.log">
+ <PatternLayout>
+ <pattern>%d [%t] %-5p %c %x - %m%n</pattern>
+ </PatternLayout>
+ <Policies>
+ <TimeBasedTriggeringPolicy />
+ </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">
+ <PatternLayout>
+ <pattern>%d{yyyy-MM-dd HH:mm:ss} %m%n</pattern>
+ </PatternLayout>
+ <Policies>
+ <TimeBasedTriggeringPolicy />
+ </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">
+ <PatternLayout>
+ <pattern>%d{yyyy-MM-dd HH:mm:ss} - %X{redback.currentUser} -
%m%n</pattern>
+ </PatternLayout>
+ <Policies>
+ <TimeBasedTriggeringPolicy />
+ </Policies>
+ </RollingFile>
+
+ </appenders>
+ <loggers>
+
+ <logger name="org.apache.archiva.redback.struts2.action.AuditEvent"
additivity="false" level="info">
+ <appender-ref ref="redbackAuditLog" />
+ </logger>
+
+ <logger name="org.apache.archiva.AuditLog" additivity="false" level="info">
+ <appender-ref ref="auditlog" />
+ </logger>
+
+ <!-- INFO level loggers can use the default
+ <logger name="org.apache.archiva.consumers" level="info"/>
+
+ <logger name="org.apache.archiva" level="info"/>
+
+
+ <logger name="org.quartz" level="info"/>
+
+ <logger name="org.apache.jasper" level="info"/>
+
+ <logger name="com.opensymphony.xwork2" level="info"/>
+
+ <logger name="org.apache.struts2" level="info"/>
+
+ -->
+
+ <!-- WebDav objects -->
+ <logger name="org.apache.archiva.webdav.ArchivaDavResource" level="info"/>
+
+
+ <logger name="org.apache.archiva.webdav.ArchivaDavResourceFactory"
level="info"/>
+
+
+ <!-- squelch noisy objects (for now) -->
+ <logger name="org.apache.commons" level="warn"/>
+
+ <logger name="net.sf.ehcache" level="warn"/>
+
+
+ <!-- retained for Redback -->
+ <logger name="JPOX" level="warn"/>
+
+
+ <logger name="JPOX.MetaData" level="error"/>
+
+
+ <logger name="JPOX.RDBMS.SQL" level="error"/>
+
+
+ <logger name="SQL" level="error"/>
+
+ <logger name="freemarker" level="warn"/>
+
+ <logger
name="org.codehaus.plexus.component.manager.ClassicSingletonComponentManager"
level="error"/>
+
+
+ <logger name="com.opensymphony.xwork2.ognl.OgnlValueStack" level="error"/>
+
+
+ <!-- debug wagon transfer -->
+ <!--
+ <logger name="org.apache.archiva.proxy.common" level="debug"/>
+
+ -->
+ <!-- apache httpclient debug content transfer verbose -->
+ <!--
+ <logger name="org.apache.http.wire" level="debug"/>
+
+ -->
+ <!-- apache httpclient log headers -->
+ <!--
+ <logger name="org.apache.http.headers" level="debug"/>
+
+ -->
+
+ <root level="info">
+ <appender-ref ref="rolling"/>
+ </root>
+ </loggers>
+</configuration>
+
+
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j2.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/log4j2-test.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/log4j2-test.xml?rev=1382518&view=auto
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/log4j2-test.xml
(added)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/log4j2-test.xml
Sun Sep 9 15:38:26 2012
@@ -0,0 +1,78 @@
+<?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.
+ -->
+
+
+<configuration status="debug">
+ <appenders>
+ <Console name="console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d [%t] %-5p %c %x - %m%n"/>
+ </Console>
+ </appenders>
+ <loggers>
+
+ <logger name="org.apache.archiva.web.action.SearchAction" level="debug"/>
+
+ <logger name="org.apache.archiva.indexer.search.NexusRepositorySearch"
level="debug"/>
+
+ <logger name="org.apache.archiva.common.plexusbridge.MavenIndexerUtils"
level="debug"/>
+
+ <logger name="JPOX" level="error"/>
+
+ <!-- debug wagon transfer -->
+ <logger name="org.apache.archiva.proxy.common" level="debug"/>
+
+ <!-- apache httpclient debug content transfer-->
+ <!--
+ <logger name="org.apache.http.wire" level="debug"/>
+
+ -->
+ <logger name="org.apache.http.headers" level="debug"/>
+
+ <logger
name="org.apache.commons.configuration.DefaultConfigurationBuilder"
level="error"/>
+
+
+ <logger name="org.apache.archiva.web.action.UploadAction" level="debug"/>
+
+
+ <logger name="org.apache.archiva.admin.repository.managed" level="debug"/>
+
+
+ <logger name="com.opensymphony.xwork2.ognl.OgnlValueStack" level="error"/>
+
+
+ <!-- reduce noise for unit tests -->
+
+ <logger name="org.springframework" level="error"/>
+
+ <logger name="org.codehaus.plexus" level="error"/>
+
+ <logger name="org.apache.archiva.redback" level="error"/>
+
+ <logger name="org.apache.cxf" level="error"/>
+
+ <logger name="org.quartz" level="error"/>
+
+ <root level="info">
+ <appender-ref ref="console"/>
+ </root>
+ </loggers>
+</configuration>
+
+
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/log4j2-test.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/log4j2-test.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
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=1382518&view=auto
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/log4j2-test.xml
(added)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/log4j2-test.xml
Sun Sep 9 15:38:26 2012
@@ -0,0 +1,64 @@
+<?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.
+ -->
+
+
+<configuration status="debug">
+ <appenders>
+ <Console name="console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d [%t] %-5p %c %x - %m%n"/>
+ </Console>
+ </appenders>
+ <loggers>
+
+ <logger name="org.apache.archiva.web.action.SearchAction" level="debug"/>
+
+ <logger name="org.apache.archiva.indexer.search.NexusRepositorySearch"
level="debug"/>
+
+ <logger name="org.apache.archiva.common.plexusbridge.MavenIndexerUtils"
level="debug"/>
+
+ <logger name="JPOX" level="error"/>
+
+ <logger
name="org.apache.commons.configuration.DefaultConfigurationBuilder"
level="error"/>
+
+ <logger name="org.apache.archiva.admin.repository.managed" level="debug"/>
+
+ <logger name="com.opensymphony.xwork2.ognl.OgnlValueStack" level="error"/>
+
+
+ <logger name="org.springframework" level="info"/>
+
+
+ <logger name="org.codehaus.plexus" level="info"/>
+
+ <logger name="org.apache.archiva.redback" level="info"/>
+
+ <logger name="org.apache.cxf" level="info"/>
+
+ <logger name="org.quartz" level="info"/>
+
+ <logger name="org.apache.archiva.indexer.merger" level="debug"/>
+
+ <root level="info">
+ <appender-ref ref="console"/>
+ </root>
+ </loggers>
+</configuration>
+
+
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/log4j2-test.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/tomcat/log4j2-test.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml?rev=1382518&r1=1382517&r2=1382518&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml (original)
+++ archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml Sun Sep 9
15:38:26 2012
@@ -187,6 +187,11 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j12-api</artifactId>
+ </dependency>
+
</dependencies>
<build>
<plugins>
Modified: archiva/trunk/archiva-modules/plugins/metadata-store-jcr/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-jcr/pom.xml?rev=1382518&r1=1382517&r2=1382518&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/metadata-store-jcr/pom.xml (original)
+++ archiva/trunk/archiva-modules/plugins/metadata-store-jcr/pom.xml Sun Sep 9
15:38:26 2012
@@ -64,16 +64,16 @@
<!-- could trim more, but since it's just for test we don't need to
worry -->
<exclusions>
<exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-jcl</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
Modified: archiva/trunk/archiva-modules/plugins/stage-repository-merge/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/stage-repository-merge/pom.xml?rev=1382518&r1=1382517&r2=1382518&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/stage-repository-merge/pom.xml
(original)
+++ archiva/trunk/archiva-modules/plugins/stage-repository-merge/pom.xml Sun
Sep 9 15:38:26 2012
@@ -81,6 +81,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>slf4j-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http</artifactId>
<scope>test</scope>
Copied:
archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/test/resources/log4j2-test.xml
(from r1382517,
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/resources/log4j.xml)
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/test/resources/log4j2-test.xml?p2=archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/test/resources/log4j2-test.xml&p1=archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/resources/log4j.xml&r1=1382517&r2=1382518&rev=1382518&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/test/resources/log4j.xml
(original)
+++
archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/test/resources/log4j2-test.xml
Sun Sep 9 15:38:26 2012
@@ -18,23 +18,24 @@
~ under the License.
-->
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";>
+<configuration status="debug">
+ <appenders>
+ <Console name="console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} -
%msg%n"/>
+ </Console>
+ </appenders>
+ <loggers>
+
+ <logger name="org.apache.archiva.stagerepository.merge" level="debug"/>
+
+ <logger name="org.springframework" level="error"/>
+
+
+ <root level="info">
+ <appender-ref ref="console"/>
+ </root>
+ </loggers>
+</configuration>
- <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.web">
- <level value="debug"/>
- </logger>
-
-
- <root>
- <priority value ="info" />
- <appender-ref ref="console" />
- </root>
-</log4j:configuration>
Propchange:
archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/test/resources/log4j2-test.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/plugins/stage-repository-merge/src/test/resources/log4j2-test.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: archiva/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1382518&r1=1382517&r2=1382518&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Sun Sep 9 15:38:26 2012
@@ -1153,6 +1153,16 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-ext</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>${slf4j.version}</version>
<scope>runtime</scope>
@@ -1553,9 +1563,10 @@
<exclude>commons-logging:commons-logging-api</exclude>
<exclude>log4j:log4j</exclude>
+ <!--
<exclude>org.slf4j:jcl-over-slf4j</exclude>
<exclude>org.slf4j:slf4j-log4j12</exclude>
-
+ -->
<!-- TODO org.sonatype.sisu:sisu-guava -->
</excludes>
