summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2012-09-10 07:13:57 +0000
committerOlivier Lamy <olamy@apache.org>2012-09-10 07:13:57 +0000
commit18484f0fc208cf64165e3857474c7f121be6d527 (patch)
tree3d216dcc2810d6acc313a381a0839833e1c3f9f0
parent9fd5b89f160483c5fbddf64d18c900b34fcab05a (diff)
downloadarchiva-18484f0fc208cf64165e3857474c7f121be6d527.tar.gz
archiva-18484f0fc208cf64165e3857474c7f121be6d527.zip
fix missing slf4j impl in webapp-js
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1382667 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--archiva-modules/archiva-web/archiva-webapp-js/pom.xml9
-rw-r--r--archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml5
-rw-r--r--archiva-modules/archiva-web/archiva-webapp-test-js/src/test/resources/log4j2-test.xml38
-rw-r--r--archiva-modules/archiva-web/archiva-webapp-test-js/src/test/resources/logging/log4j2-test.xml54
4 files changed, 106 insertions, 0 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
index 49452e9b5..5a16f22e5 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
@@ -647,6 +647,10 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-ext</artifactId>
+ </dependency>
+ <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<scope>runtime</scope>
@@ -658,6 +662,11 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
+ <artifactId>slf4j-impl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jcl</artifactId>
<scope>runtime</scope>
</dependency>
diff --git a/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml
index 815f00741..7aab98727 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-test-js/pom.xml
@@ -113,6 +113,11 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
+ <artifactId>slf4j-impl</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j12-api</artifactId>
</dependency>
diff --git a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/resources/log4j2-test.xml b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/resources/log4j2-test.xml
new file mode 100644
index 000000000..9294964db
--- /dev/null
+++ b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/resources/log4j2-test.xml
@@ -0,0 +1,38 @@
+<?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.springframework" level="error"/>
+
+ <root level="info">
+ <appender-ref ref="console"/>
+ </root>
+ </loggers>
+</configuration>
+
+
diff --git a/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/resources/logging/log4j2-test.xml b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/resources/logging/log4j2-test.xml
new file mode 100644
index 000000000..e9a65a586
--- /dev/null
+++ b/archiva-modules/archiva-web/archiva-webapp-test-js/src/test/resources/logging/log4j2-test.xml
@@ -0,0 +1,54 @@
+<?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="JPOX" level="error"/>
+
+
+ <logger name="org.apache.commons.configuration.DefaultConfigurationBuilder" level="error"/>
+
+
+ <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"/>
+
+ <logger name="org.apache.archiva" level="info"/>
+
+ <root level="info">
+ <appender-ref ref="console"/>
+ </root>
+ </loggers>
+</configuration>
+
+