You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by gg...@apache.org on 2016/10/31 22:21:31 UTC
svn commit: r1767384 [3/3] - in /httpcomponents/httpcore/trunk: ./
httpcore5-h2/ httpcore5-testing/
httpcore5-testing/src/main/java/org/apache/hc/core5/testing/classic/
httpcore5-testing/src/main/java/org/apache/hc/core5/testing/framework/
httpcore5-te...
Modified: httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/http2/Http2TestServer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/http2/Http2TestServer.java?rev=1767384&r1=1767383&r2=1767384&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/http2/Http2TestServer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/http2/Http2TestServer.java Mon Oct 31 22:21:30 2016
@@ -32,8 +32,6 @@ import java.net.InetSocketAddress;
import java.nio.channels.SelectionKey;
import java.nio.charset.StandardCharsets;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hc.core5.http.ExceptionListener;
import org.apache.hc.core5.http.impl.nio.bootstrap.AsyncServer;
import org.apache.hc.core5.http.impl.nio.bootstrap.AsyncServerExchangeHandlerRegistry;
@@ -52,7 +50,8 @@ import org.apache.hc.core5.reactor.IORea
import org.apache.hc.core5.reactor.IOSession;
import org.apache.hc.core5.reactor.IOSessionCallback;
import org.apache.hc.core5.reactor.ListenerEndpoint;
-
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
public class Http2TestServer extends AsyncServer {
private final AsyncServerExchangeHandlerRegistry handlerRegistry;
@@ -60,7 +59,7 @@ public class Http2TestServer extends Asy
public Http2TestServer(final IOReactorConfig ioReactorConfig) throws IOException {
super(ioReactorConfig, new ExceptionListener() {
- private final Log log = LogFactory.getLog(Http2TestServer.class);
+ private final Logger log = LogManager.getLogger(Http2TestServer.class);
@Override
public void onError(final Exception ex) {
Modified: httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/http2/InternalClientHttp2EventHandlerFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/http2/InternalClientHttp2EventHandlerFactory.java?rev=1767384&r1=1767383&r2=1767384&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/http2/InternalClientHttp2EventHandlerFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/http2/InternalClientHttp2EventHandlerFactory.java Mon Oct 31 22:21:30 2016
@@ -30,8 +30,6 @@ package org.apache.hc.core5.testing.nio.
import java.nio.charset.Charset;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hc.core5.http.ConnectionClosedException;
import org.apache.hc.core5.http.HttpConnection;
import org.apache.hc.core5.http.impl.nio.ConnectionListener;
@@ -47,6 +45,8 @@ import org.apache.hc.core5.reactor.IOSes
import org.apache.hc.core5.testing.nio.LoggingIOEventHandler;
import org.apache.hc.core5.testing.nio.LoggingIOSession;
import org.apache.hc.core5.util.Args;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
class InternalClientHttp2EventHandlerFactory implements IOEventHandlerFactory {
@@ -71,7 +71,7 @@ class InternalClientHttp2EventHandlerFac
@Override
public IOEventHandler createHandler(final IOSession ioSession) {
final String id = "http2-outgoing-" + COUNT.incrementAndGet();
- final Log sessionLog = LogFactory.getLog(ioSession.getClass());
+ final Logger sessionLog = LogManager.getLogger(ioSession.getClass());
return new LoggingIOEventHandler(new ClientHttpProtocolNegotiator(
ioSession, httpProcessor, exchangeHandlerFactory, charset, h2Config,
new ConnectionListener() {
Modified: httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/http2/InternalHttp2StreamListener.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/http2/InternalHttp2StreamListener.java?rev=1767384&r1=1767383&r2=1767384&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/http2/InternalHttp2StreamListener.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/http2/InternalHttp2StreamListener.java Mon Oct 31 22:21:30 2016
@@ -30,29 +30,29 @@ package org.apache.hc.core5.testing.nio.
import java.io.IOException;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http2.frame.FramePrinter;
import org.apache.hc.core5.http2.frame.RawFrame;
import org.apache.hc.core5.http2.impl.nio.Http2StreamListener;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
class InternalHttp2StreamListener implements Http2StreamListener {
private final String id;
- private final Log headerLog;
- private final Log frameLog;
- private final Log framePayloadLog;
- private final Log flowCtrlLog;
+ private final Logger headerLog;
+ private final Logger frameLog;
+ private final Logger framePayloadLog;
+ private final Logger flowCtrlLog;
private final FramePrinter framePrinter;
public InternalHttp2StreamListener(final String id) {
this.id = id;
this.framePrinter = new FramePrinter();
- this.headerLog = LogFactory.getLog("org.apache.hc.core5.http.headers");
- this.frameLog = LogFactory.getLog("org.apache.hc.core5.http.frame");
- this.framePayloadLog = LogFactory.getLog("org.apache.hc.core5.http.frame.payload");
- this.flowCtrlLog = LogFactory.getLog("org.apache.hc.core5.http.flow");
+ this.headerLog = LogManager.getLogger("org.apache.hc.core5.http.headers");
+ this.frameLog = LogManager.getLogger("org.apache.hc.core5.http.frame");
+ this.framePayloadLog = LogManager.getLogger("org.apache.hc.core5.http.frame.payload");
+ this.flowCtrlLog = LogManager.getLogger("org.apache.hc.core5.http.flow");
}
private void logFrameInfo(final String prefix, final RawFrame frame) {
Modified: httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/http2/InternalServerHttp2EventHandlerFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/http2/InternalServerHttp2EventHandlerFactory.java?rev=1767384&r1=1767383&r2=1767384&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/http2/InternalServerHttp2EventHandlerFactory.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/http2/InternalServerHttp2EventHandlerFactory.java Mon Oct 31 22:21:30 2016
@@ -30,8 +30,6 @@ package org.apache.hc.core5.testing.nio.
import java.nio.charset.Charset;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hc.core5.http.ConnectionClosedException;
import org.apache.hc.core5.http.HttpConnection;
import org.apache.hc.core5.http.impl.nio.ConnectionListener;
@@ -47,6 +45,8 @@ import org.apache.hc.core5.reactor.IOSes
import org.apache.hc.core5.testing.nio.LoggingIOEventHandler;
import org.apache.hc.core5.testing.nio.LoggingIOSession;
import org.apache.hc.core5.util.Args;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
class InternalServerHttp2EventHandlerFactory implements IOEventHandlerFactory {
@@ -71,7 +71,7 @@ class InternalServerHttp2EventHandlerFac
@Override
public IOEventHandler createHandler(final IOSession ioSession) {
final String id = "http2-incoming-" + COUNT.incrementAndGet();
- final Log sessionLog = LogFactory.getLog(ioSession.getClass());
+ final Logger sessionLog = LogManager.getLogger(ioSession.getClass());
return new LoggingIOEventHandler(new ServerHttpProtocolNegotiator(
ioSession, httpProcessor, exchangeHandlerFactory, charset, h2Config,
new ConnectionListener() {
Modified: httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/http2/LogAppendable.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/http2/LogAppendable.java?rev=1767384&r1=1767383&r2=1767384&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/http2/LogAppendable.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-testing/src/main/java/org/apache/hc/core5/testing/nio/http2/LogAppendable.java Mon Oct 31 22:21:30 2016
@@ -29,20 +29,21 @@ package org.apache.hc.core5.testing.nio.
import java.io.IOException;
-import org.apache.commons.logging.Log;
+import org.apache.logging.log4j.Logger;
class LogAppendable implements Appendable {
- private final Log log;
+ private final Logger log;
private final String prefix;
private final StringBuilder buffer;
- LogAppendable(final Log log, final String prefix) {
+ LogAppendable(final Logger log, final String prefix) {
this.log = log;
this.prefix = prefix;
this.buffer = new StringBuilder();
}
+
@Override
public Appendable append(final CharSequence text) throws IOException {
return append(text, 0, text.length());
Added: httpcomponents/httpcore/trunk/httpcore5-testing/src/test/resources/log4j2.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-testing/src/test/resources/log4j2.xml?rev=1767384&view=auto
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-testing/src/test/resources/log4j2.xml (added)
+++ httpcomponents/httpcore/trunk/httpcore5-testing/src/test/resources/log4j2.xml Mon Oct 31 22:21:30 2016
@@ -0,0 +1,29 @@
+<?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="WARN" name="XMLConfigTest">
+ <Appenders>
+ <Console name="STDOUT">
+ <PatternLayout pattern="%d %-5level [%t][%logger]%notEmpty{[%markerSimpleName]} %msg%n%xThrowable" />
+ </Console>
+ </Appenders>
+ <Loggers>
+ <Root level="WARN">
+ <AppenderRef ref="STDOUT" />
+ </Root>
+ </Loggers>
+</Configuration>
\ No newline at end of file
Modified: httpcomponents/httpcore/trunk/httpcore5/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/pom.xml?rev=1767384&r1=1767383&r2=1767384&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/pom.xml (original)
+++ httpcomponents/httpcore/trunk/httpcore5/pom.xml Mon Oct 31 22:21:30 2016
@@ -49,8 +49,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Modified: httpcomponents/httpcore/trunk/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/pom.xml?rev=1767384&r1=1767383&r2=1767384&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/pom.xml (original)
+++ httpcomponents/httpcore/trunk/pom.xml Mon Oct 31 22:21:30 2016
@@ -79,7 +79,7 @@
<maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
<junit.version>4.12</junit.version>
<mockito.version>1.10.19</mockito.version>
- <commons-logging.version>1.2</commons-logging.version>
+ <log4j.version>2.7</log4j.version>
<hc.stylecheck.version>1</hc.stylecheck.version>
</properties>
@@ -98,9 +98,15 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons-logging.version}</version>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j.version}</version>
+ <scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>