You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2014/07/18 00:46:26 UTC
svn commit: r1611501 - in /webservices/axiom/trunk: ./ axiom-spring-ws/
axiom-spring-ws/src/test/resources/ testing/spring-ws-testsuite/
testing/spring-ws-testsuite/src/test/resources/
Author: veithen
Date: Thu Jul 17 22:46:25 2014
New Revision: 1611501
URL: http://svn.apache.org/r1611501
Log:
Upgrade to log4j 2.0.
Added:
webservices/axiom/trunk/axiom-spring-ws/src/test/resources/log4j2-test.xml (with props)
webservices/axiom/trunk/testing/spring-ws-testsuite/src/test/resources/log4j2-test.xml (with props)
Removed:
webservices/axiom/trunk/axiom-spring-ws/src/test/resources/log4j.properties
webservices/axiom/trunk/testing/spring-ws-testsuite/src/test/resources/log4j.properties
Modified:
webservices/axiom/trunk/axiom-spring-ws/pom.xml
webservices/axiom/trunk/pom.xml
webservices/axiom/trunk/testing/spring-ws-testsuite/pom.xml
Modified: webservices/axiom/trunk/axiom-spring-ws/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-spring-ws/pom.xml?rev=1611501&r1=1611500&r2=1611501&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-spring-ws/pom.xml (original)
+++ webservices/axiom/trunk/axiom-spring-ws/pom.xml Thu Jul 17 22:46:25 2014
@@ -43,8 +43,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-jcl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Added: webservices/axiom/trunk/axiom-spring-ws/src/test/resources/log4j2-test.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-spring-ws/src/test/resources/log4j2-test.xml?rev=1611501&view=auto
==============================================================================
--- webservices/axiom/trunk/axiom-spring-ws/src/test/resources/log4j2-test.xml (added)
+++ webservices/axiom/trunk/axiom-spring-ws/src/test/resources/log4j2-test.xml Thu Jul 17 22:46:25 2014
@@ -0,0 +1,33 @@
+<?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>
+ <Console name="stdout" target="SYSTEM_OUT">
+ <PatternLayout pattern="%-6r %-5p %-8t [%c{1}] %m%n"/>
+ </Console>
+ </Appenders>
+ <Loggers>
+ <Logger name="org.apache.axiom" level="warn"/>
+ <Logger name="org.springframework.ws" level="warn"/>
+ <Root level="warn">
+ <AppenderRef ref="stdout"/>
+ </Root>
+ </Loggers>
+</Configuration>
\ No newline at end of file
Propchange: webservices/axiom/trunk/axiom-spring-ws/src/test/resources/log4j2-test.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axiom/trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/pom.xml?rev=1611501&r1=1611500&r2=1611501&view=diff
==============================================================================
--- webservices/axiom/trunk/pom.xml (original)
+++ webservices/axiom/trunk/pom.xml Thu Jul 17 22:46:25 2014
@@ -367,9 +367,14 @@
</exclusions>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.16</version>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-jcl</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>2.0</version>
</dependency>
<dependency>
<groupId>org.springframework.ws</groupId>
Modified: webservices/axiom/trunk/testing/spring-ws-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/spring-ws-testsuite/pom.xml?rev=1611501&r1=1611500&r2=1611501&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/spring-ws-testsuite/pom.xml (original)
+++ webservices/axiom/trunk/testing/spring-ws-testsuite/pom.xml Thu Jul 17 22:46:25 2014
@@ -98,8 +98,13 @@
<version>1.6.15</version>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-jcl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Added: webservices/axiom/trunk/testing/spring-ws-testsuite/src/test/resources/log4j2-test.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/spring-ws-testsuite/src/test/resources/log4j2-test.xml?rev=1611501&view=auto
==============================================================================
--- webservices/axiom/trunk/testing/spring-ws-testsuite/src/test/resources/log4j2-test.xml (added)
+++ webservices/axiom/trunk/testing/spring-ws-testsuite/src/test/resources/log4j2-test.xml Thu Jul 17 22:46:25 2014
@@ -0,0 +1,32 @@
+<?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>
+ <Console name="stdout" target="SYSTEM_OUT">
+ <PatternLayout pattern="%-6r %-5p %-8t [%c{1}] %m%n"/>
+ </Console>
+ </Appenders>
+ <Loggers>
+ <Logger name="org.springframework.ws" level="warn"/>
+ <Root level="warn">
+ <AppenderRef ref="stdout"/>
+ </Root>
+ </Loggers>
+</Configuration>
\ No newline at end of file
Propchange: webservices/axiom/trunk/testing/spring-ws-testsuite/src/test/resources/log4j2-test.xml
------------------------------------------------------------------------------
svn:eol-style = native