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 23:24:38 UTC
svn commit: r1767391 [1/2] - in /httpcomponents/httpclient/trunk: ./
httpclient5-cache/ httpclient5-cache/src/test/resources/
httpclient5-fluent/ httpclient5-fluent/src/test/resources/
httpclient5-osgi/ httpclient5-osgi/src/main/java/org/apache/hc/clie...
Author: ggregory
Date: Mon Oct 31 23:24:37 2016
New Revision: 1767391
URL: http://svn.apache.org/viewvc?rev=1767391&view=rev
Log:
[HTTPCLIENT-1786] Port from Apache Commons Logging to Apache Log4j 2.
Added:
httpcomponents/httpclient/trunk/httpclient5-cache/src/test/resources/log4j2.xml
httpcomponents/httpclient/trunk/httpclient5-fluent/src/test/resources/
httpcomponents/httpclient/trunk/httpclient5-fluent/src/test/resources/log4j2.xml
httpcomponents/httpclient/trunk/httpclient5-osgi/src/test/resources/log4j2.xml
httpcomponents/httpclient/trunk/httpclient5-win/src/test/resources/
httpcomponents/httpclient/trunk/httpclient5-win/src/test/resources/log4j2.xml
httpcomponents/httpclient/trunk/httpclient5/src/test/resources/log4j2.xml
Modified:
httpcomponents/httpclient/trunk/RELEASE_NOTES.txt
httpcomponents/httpclient/trunk/httpclient5-cache/pom.xml
httpcomponents/httpclient/trunk/httpclient5-fluent/pom.xml
httpcomponents/httpclient/trunk/httpclient5-osgi/pom.xml
httpcomponents/httpclient/trunk/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/HttpClientBuilderConfigurator.java
httpcomponents/httpclient/trunk/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiCredentialsProvider.java
httpcomponents/httpclient/trunk/httpclient5-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/HostMatcherTest.java
httpcomponents/httpclient/trunk/httpclient5-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/MimeExportedIT.java
httpcomponents/httpclient/trunk/httpclient5-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/OSGiCredentialsProviderTest.java
httpcomponents/httpclient/trunk/httpclient5-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/WeakListTest.java
httpcomponents/httpclient/trunk/httpclient5-win/pom.xml
httpcomponents/httpclient/trunk/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateScheme.java
httpcomponents/httpclient/trunk/httpclient5/pom.xml
httpcomponents/httpclient/trunk/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientMultipartFormPost.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/auth/CredentialsStore.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/InMemoryDnsResolver.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/BasicAuthCache.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/GGSSchemeBase.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/HttpAuthenticator.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/BasicHttpClientConnectionManager.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/CPool.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/CPoolEntry.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpClientConnectionOperator.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LenientHttpResponseParser.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingManagedHttpClientConnection.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/ManagedHttpClientConnectionFactory.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/Wire.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultAuthenticationStrategy.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultRedirectStrategy.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/CloseableHttpClient.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ConnectionHolder.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/InternalHttpClient.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/MainClientExec.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/MinimalClientExec.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ProtocolExec.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RedirectExec.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RetryExec.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ServiceUnavailableRetryExec.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestAddCookies.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestAuthCache.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestClientConnControl.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/ResponseProcessCookies.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixMatcherLoader.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/DefaultHostnameVerifier.java
httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/SSLConnectionSocketFactory.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/io/TestPoolingHttpClientConnectionManager.java
httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/impl/sync/TestConnectionHolder.java
httpcomponents/httpclient/trunk/pom.xml
Modified: httpcomponents/httpclient/trunk/RELEASE_NOTES.txt
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/RELEASE_NOTES.txt?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/RELEASE_NOTES.txt (original)
+++ httpcomponents/httpclient/trunk/RELEASE_NOTES.txt Mon Oct 31 23:24:37 2016
@@ -13,6 +13,8 @@ Changelog:
* [HTTPCLIENT-1717] Make fluent API .Content.Content(byte[], ContentType) public.
Contributed by Cash Costello <cash.costello at gmail.com>
+* [HTTPCLIENT-1786] Port from Apache Commons Logging to Apache Log4j 2.
+ Contributed by Gary Gregory <ggregory at apache.org>
Release 5.0-ALPHA1
-------------------
Modified: httpcomponents/httpclient/trunk/httpclient5-cache/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5-cache/pom.xml?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5-cache/pom.xml (original)
+++ httpcomponents/httpclient/trunk/httpclient5-cache/pom.xml Mon Oct 31 23:24:37 2016
@@ -45,11 +45,18 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${log4j.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache-core</artifactId>
<scope>compile</scope>
Added: httpcomponents/httpclient/trunk/httpclient5-cache/src/test/resources/log4j2.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5-cache/src/test/resources/log4j2.xml?rev=1767391&view=auto
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5-cache/src/test/resources/log4j2.xml (added)
+++ httpcomponents/httpclient/trunk/httpclient5-cache/src/test/resources/log4j2.xml Mon Oct 31 23:24:37 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/httpclient/trunk/httpclient5-fluent/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5-fluent/pom.xml?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5-fluent/pom.xml (original)
+++ httpcomponents/httpclient/trunk/httpclient5-fluent/pom.xml Mon Oct 31 23:24:37 2016
@@ -53,8 +53,15 @@
</dependency>
<!-- direct dependency on logging -->
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <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>
<dependency>
<groupId>junit</groupId>
@@ -87,6 +94,7 @@
<excludes>
<exclude>.externalToolBuilders/**</exclude>
<exclude>maven-eclipse.xml</exclude>
+ <exclude>.checkstyle</exclude>
</excludes>
</configuration>
</plugin>
Added: httpcomponents/httpclient/trunk/httpclient5-fluent/src/test/resources/log4j2.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5-fluent/src/test/resources/log4j2.xml?rev=1767391&view=auto
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5-fluent/src/test/resources/log4j2.xml (added)
+++ httpcomponents/httpclient/trunk/httpclient5-fluent/src/test/resources/log4j2.xml Mon Oct 31 23:24:37 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/httpclient/trunk/httpclient5-osgi/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5-osgi/pom.xml?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5-osgi/pom.xml (original)
+++ httpcomponents/httpclient/trunk/httpclient5-osgi/pom.xml Mon Oct 31 23:24:37 2016
@@ -41,7 +41,7 @@
<properties>
<httpcore.osgi.import.version>"5.0-alpha1"</httpcore.osgi.import.version>
- <commons-logging.osgi.import.version>"[1.1.0, 1.3.0)"</commons-logging.osgi.import.version>
+ <log4j.osgi.import.version>"2.7"</log4j.osgi.import.version>
<pax.url.version>2.4.1</pax.url.version>
<pax.exam.version>4.5.0</pax.exam.version>
<osgi.framework.version>5.0.0</osgi.framework.version>
@@ -197,7 +197,7 @@
org.ietf.jgss,,
org.osgi.framework,
org.osgi.service.cm,
- org.apache.commons.logging;version=${commons-logging.osgi.import.version},
+ org.apache.logging.log4j;version=${log4j.osgi.import.version},
org.apache.hc.core5.concurrent;version=${httpcore.osgi.import.version},
org.apache.hc.core5.pool;version=${httpcore.osgi.import.version},
org.apache.hc.core5.ssl;version=${httpcore.osgi.import.version},
Modified: httpcomponents/httpclient/trunk/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/HttpClientBuilderConfigurator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/HttpClientBuilderConfigurator.java?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/HttpClientBuilderConfigurator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/HttpClientBuilderConfigurator.java Mon Oct 31 23:24:37 2016
@@ -26,6 +26,8 @@
*/
package org.apache.hc.client5.http.osgi.impl;
+import static org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory.getSocketFactory;
+
import java.util.List;
import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
@@ -37,8 +39,6 @@ import org.apache.hc.client5.http.socket
import org.apache.hc.core5.http.config.Registry;
import org.apache.hc.core5.http.config.RegistryBuilder;
-import static org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory.getSocketFactory;
-
final class HttpClientBuilderConfigurator {
private final OSGiCredentialsProvider credentialsProvider;
Modified: httpcomponents/httpclient/trunk/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiCredentialsProvider.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiCredentialsProvider.java?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiCredentialsProvider.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiCredentialsProvider.java Mon Oct 31 23:24:37 2016
@@ -28,8 +28,6 @@ package org.apache.hc.client5.http.osgi.
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hc.client5.http.auth.AuthScope;
import org.apache.hc.client5.http.auth.Credentials;
import org.apache.hc.client5.http.auth.CredentialsStore;
@@ -37,13 +35,15 @@ import org.apache.hc.client5.http.auth.N
import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
import org.apache.hc.client5.http.osgi.services.ProxyConfiguration;
import org.apache.hc.core5.http.protocol.HttpContext;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* @since 4.3
*/
final class OSGiCredentialsProvider implements CredentialsStore {
- private static final Log log = LogFactory.getLog(OSGiCredentialsProvider.class);
+ private static final Logger log = LogManager.getLogger(OSGiCredentialsProvider.class);
private static final int HOST_AND_PORT_MATCH = 12;
Modified: httpcomponents/httpclient/trunk/httpclient5-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/HostMatcherTest.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/HostMatcherTest.java?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/HostMatcherTest.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/HostMatcherTest.java Mon Oct 31 23:24:37 2016
@@ -27,9 +27,9 @@
package org.apache.hc.client5.http.osgi.impl;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
import org.apache.hc.client5.http.osgi.impl.HostMatcher.DomainNameMatcher;
import org.apache.hc.client5.http.osgi.impl.HostMatcher.HostMatcherFactory;
Modified: httpcomponents/httpclient/trunk/httpclient5-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/MimeExportedIT.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/MimeExportedIT.java?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/MimeExportedIT.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/MimeExportedIT.java Mon Oct 31 23:24:37 2016
@@ -38,8 +38,8 @@ import java.net.MalformedURLException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder;
import org.apache.hc.client5.http.entity.mime.ByteArrayBody;
+import org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder;
import org.apache.hc.client5.http.entity.mime.StringBody;
import org.apache.hc.client5.http.methods.HttpPost;
import org.apache.hc.core5.http.HttpEntity;
Modified: httpcomponents/httpclient/trunk/httpclient5-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/OSGiCredentialsProviderTest.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/OSGiCredentialsProviderTest.java?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/OSGiCredentialsProviderTest.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/OSGiCredentialsProviderTest.java Mon Oct 31 23:24:37 2016
@@ -26,6 +26,13 @@
*/
package org.apache.hc.client5.http.osgi.impl;
+import static java.util.Arrays.asList;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.junit.Assert.assertThat;
+
+import java.util.Hashtable;
+
import org.apache.hc.client5.http.auth.AuthScope;
import org.apache.hc.client5.http.auth.Credentials;
import org.apache.hc.client5.http.auth.CredentialsProvider;
@@ -36,13 +43,6 @@ import org.apache.hc.core5.http.protocol
import org.apache.hc.core5.http.protocol.HttpContext;
import org.junit.Test;
-import java.util.Hashtable;
-
-import static java.util.Arrays.asList;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.junit.Assert.assertThat;
-
public class OSGiCredentialsProviderTest {
private static final String HOST = "proxy.example.org";
Modified: httpcomponents/httpclient/trunk/httpclient5-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/WeakListTest.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/WeakListTest.java?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/WeakListTest.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5-osgi/src/test/java/org/apache/hc/client5/http/osgi/impl/WeakListTest.java Mon Oct 31 23:24:37 2016
@@ -26,14 +26,14 @@
*/
package org.apache.hc.client5.http.osgi.impl;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import java.util.Iterator;
import java.util.NoSuchElementException;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertEquals;
+import org.junit.Test;
public class WeakListTest {
Added: httpcomponents/httpclient/trunk/httpclient5-osgi/src/test/resources/log4j2.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5-osgi/src/test/resources/log4j2.xml?rev=1767391&view=auto
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5-osgi/src/test/resources/log4j2.xml (added)
+++ httpcomponents/httpclient/trunk/httpclient5-osgi/src/test/resources/log4j2.xml Mon Oct 31 23:24:37 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/httpclient/trunk/httpclient5-win/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5-win/pom.xml?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5-win/pom.xml (original)
+++ httpcomponents/httpclient/trunk/httpclient5-win/pom.xml Mon Oct 31 23:24:37 2016
@@ -66,6 +66,11 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<reporting>
Modified: httpcomponents/httpclient/trunk/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateScheme.java?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateScheme.java Mon Oct 31 23:24:37 2016
@@ -29,8 +29,6 @@ package org.apache.hc.client5.http.impl.
import java.security.Principal;
import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hc.client5.http.RouteInfo;
import org.apache.hc.client5.http.auth.AuthChallenge;
import org.apache.hc.client5.http.auth.AuthScheme;
@@ -45,6 +43,8 @@ import org.apache.hc.core5.http.HttpHost
import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.util.Args;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import com.sun.jna.platform.win32.Secur32;
import com.sun.jna.platform.win32.Secur32Util;
@@ -71,7 +71,7 @@ import com.sun.jna.ptr.IntByReference;
@NotThreadSafe
public class WindowsNegotiateScheme implements AuthScheme {
- private final Log log = LogFactory.getLog(getClass());
+ private final Logger log = LogManager.getLogger(getClass());
// NTLM or Negotiate
private final String scheme;
Added: httpcomponents/httpclient/trunk/httpclient5-win/src/test/resources/log4j2.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5-win/src/test/resources/log4j2.xml?rev=1767391&view=auto
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5-win/src/test/resources/log4j2.xml (added)
+++ httpcomponents/httpclient/trunk/httpclient5-win/src/test/resources/log4j2.xml Mon Oct 31 23:24:37 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/httpclient/trunk/httpclient5/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/pom.xml?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/pom.xml (original)
+++ httpcomponents/httpclient/trunk/httpclient5/pom.xml Mon Oct 31 23:24:37 2016
@@ -43,11 +43,18 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${log4j.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<scope>compile</scope>
Modified: httpcomponents/httpclient/trunk/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientMultipartFormPost.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientMultipartFormPost.java?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientMultipartFormPost.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/examples/org/apache/hc/client5/http/examples/ClientMultipartFormPost.java Mon Oct 31 23:24:37 2016
@@ -28,8 +28,8 @@ package org.apache.hc.client5.http.examp
import java.io.File;
-import org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder;
import org.apache.hc.client5.http.entity.mime.FileBody;
+import org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder;
import org.apache.hc.client5.http.entity.mime.StringBody;
import org.apache.hc.client5.http.impl.sync.CloseableHttpClient;
import org.apache.hc.client5.http.impl.sync.HttpClients;
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/auth/CredentialsStore.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/auth/CredentialsStore.java?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/auth/CredentialsStore.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/auth/CredentialsStore.java Mon Oct 31 23:24:37 2016
@@ -26,6 +26,8 @@
*/
package org.apache.hc.client5.http.auth;
+import org.apache.hc.core5.http.protocol.HttpContext;
+
/**
* Abstract store of authentication credentials.
* <p>
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/InMemoryDnsResolver.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/InMemoryDnsResolver.java?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/InMemoryDnsResolver.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/InMemoryDnsResolver.java Mon Oct 31 23:24:37 2016
@@ -32,10 +32,10 @@ import java.util.Arrays;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hc.client5.http.DnsResolver;
import org.apache.hc.core5.util.Args;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* In-memory {@link DnsResolver} implementation.
@@ -45,7 +45,7 @@ import org.apache.hc.core5.util.Args;
public class InMemoryDnsResolver implements DnsResolver {
/** Logger associated to this class. */
- private final Log log = LogFactory.getLog(InMemoryDnsResolver.class);
+ private final Logger log = LogManager.getLogger(InMemoryDnsResolver.class);
/**
* In-memory collection that will hold the associations between a host name
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/BasicAuthCache.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/BasicAuthCache.java?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/BasicAuthCache.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/BasicAuthCache.java Mon Oct 31 23:24:37 2016
@@ -35,8 +35,6 @@ import java.io.Serializable;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hc.client5.http.SchemePortResolver;
import org.apache.hc.client5.http.UnsupportedSchemeException;
import org.apache.hc.client5.http.auth.AuthCache;
@@ -45,6 +43,8 @@ import org.apache.hc.client5.http.impl.D
import org.apache.hc.core5.annotation.ThreadSafe;
import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.util.Args;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* Default implementation of {@link AuthCache}. This implements
@@ -59,7 +59,7 @@ import org.apache.hc.core5.util.Args;
@ThreadSafe
public class BasicAuthCache implements AuthCache {
- private final Log log = LogFactory.getLog(getClass());
+ private final Logger log = LogManager.getLogger(getClass());
private final Map<HttpHost, byte[]> map;
private final SchemePortResolver schemePortResolver;
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/GGSSchemeBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/GGSSchemeBase.java?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/GGSSchemeBase.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/GGSSchemeBase.java Mon Oct 31 23:24:37 2016
@@ -31,8 +31,6 @@ import java.security.Principal;
import java.util.Locale;
import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hc.client5.http.DnsResolver;
import org.apache.hc.client5.http.SystemDefaultDnsResolver;
import org.apache.hc.client5.http.auth.AuthChallenge;
@@ -49,6 +47,8 @@ import org.apache.hc.core5.http.HttpHost
import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.util.Args;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.ietf.jgss.GSSContext;
import org.ietf.jgss.GSSCredential;
import org.ietf.jgss.GSSException;
@@ -69,7 +69,7 @@ public abstract class GGSSchemeBase impl
FAILED,
}
- private final Log log = LogFactory.getLog(getClass());
+ private final Logger log = LogManager.getLogger(getClass());
private final DnsResolver dnsResolver;
private final boolean stripPort;
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/HttpAuthenticator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/HttpAuthenticator.java?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/HttpAuthenticator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/HttpAuthenticator.java Mon Oct 31 23:24:37 2016
@@ -34,8 +34,6 @@ import java.util.Locale;
import java.util.Map;
import java.util.Queue;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hc.client5.http.auth.AuthCache;
import org.apache.hc.client5.http.auth.AuthChallenge;
import org.apache.hc.client5.http.auth.AuthExchange;
@@ -60,18 +58,20 @@ import org.apache.hc.core5.http.message.
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.util.Asserts;
import org.apache.hc.core5.util.CharArrayBuffer;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* @since 4.3
*/
public class HttpAuthenticator {
- private final Log log;
+ private final Logger log;
private final AuthChallengeParser parser;
- public HttpAuthenticator(final Log log) {
+ public HttpAuthenticator(final Logger log) {
super();
- this.log = log != null ? log : LogFactory.getLog(getClass());
+ this.log = log != null ? log : LogManager.getLogger(getClass());
this.parser = new AuthChallengeParser();
}
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/BasicHttpClientConnectionManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/BasicHttpClientConnectionManager.java?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/BasicHttpClientConnectionManager.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/BasicHttpClientConnectionManager.java Mon Oct 31 23:24:37 2016
@@ -34,8 +34,6 @@ import java.util.Date;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hc.client5.http.DnsResolver;
import org.apache.hc.client5.http.HttpConnectionFactory;
import org.apache.hc.client5.http.HttpRoute;
@@ -60,6 +58,8 @@ import org.apache.hc.core5.http.protocol
import org.apache.hc.core5.util.Args;
import org.apache.hc.core5.util.Asserts;
import org.apache.hc.core5.util.LangUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* A connection manager for a single connection. This connection manager maintains only one active
@@ -82,7 +82,7 @@ import org.apache.hc.core5.util.LangUtil
@ThreadSafe
public class BasicHttpClientConnectionManager implements HttpClientConnectionManager, Closeable {
- private final Log log = LogFactory.getLog(getClass());
+ private final Logger log = LogManager.getLogger(getClass());
private final HttpClientConnectionOperator connectionOperator;
private final HttpConnectionFactory<HttpRoute, ManagedHttpClientConnection> connFactory;
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/CPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/CPool.java?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/CPool.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/CPool.java Mon Oct 31 23:24:37 2016
@@ -29,14 +29,14 @@ package org.apache.hc.client5.http.impl.
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hc.client5.http.HttpRoute;
import org.apache.hc.client5.http.io.ManagedHttpClientConnection;
import org.apache.hc.core5.annotation.ThreadSafe;
import org.apache.hc.core5.pool.PoolEntryCallback;
import org.apache.hc.core5.pool.io.AbstractConnPool;
import org.apache.hc.core5.pool.io.ConnFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* @since 4.3
@@ -46,7 +46,7 @@ class CPool extends AbstractConnPool<Htt
private static final AtomicLong COUNTER = new AtomicLong();
- private final Log log = LogFactory.getLog(CPool.class);
+ private final Logger log = LogManager.getLogger(CPool.class);
private final long timeToLive;
private final TimeUnit tunit;
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/CPoolEntry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/CPoolEntry.java?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/CPoolEntry.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/CPoolEntry.java Mon Oct 31 23:24:37 2016
@@ -30,12 +30,12 @@ import java.io.IOException;
import java.util.Date;
import java.util.concurrent.TimeUnit;
-import org.apache.commons.logging.Log;
import org.apache.hc.client5.http.HttpRoute;
import org.apache.hc.client5.http.io.ManagedHttpClientConnection;
import org.apache.hc.core5.annotation.ThreadSafe;
import org.apache.hc.core5.http.io.HttpClientConnection;
import org.apache.hc.core5.pool.PoolEntry;
+import org.apache.logging.log4j.Logger;
/**
* @since 4.3
@@ -43,11 +43,11 @@ import org.apache.hc.core5.pool.PoolEntr
@ThreadSafe
class CPoolEntry extends PoolEntry<HttpRoute, ManagedHttpClientConnection> {
- private final Log log;
+ private final Logger log;
private volatile boolean routeComplete;
public CPoolEntry(
- final Log log,
+ final Logger log,
final String id,
final HttpRoute route,
final ManagedHttpClientConnection conn,
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpClientConnectionOperator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpClientConnectionOperator.java?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpClientConnectionOperator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpClientConnectionOperator.java Mon Oct 31 23:24:37 2016
@@ -34,8 +34,6 @@ import java.net.NoRouteToHostException;
import java.net.Socket;
import java.net.SocketTimeoutException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hc.client5.http.ConnectTimeoutException;
import org.apache.hc.client5.http.DnsResolver;
import org.apache.hc.client5.http.HttpHostConnectException;
@@ -54,6 +52,8 @@ import org.apache.hc.core5.http.config.L
import org.apache.hc.core5.http.config.SocketConfig;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.util.Args;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* Default implementation of {@link HttpClientConnectionOperator} used as default in Http client,
@@ -67,7 +67,7 @@ public class DefaultHttpClientConnection
static final String SOCKET_FACTORY_REGISTRY = "http.socket-factory-registry";
- private final Log log = LogFactory.getLog(getClass());
+ private final Logger log = LogManager.getLogger(getClass());
private final Lookup<ConnectionSocketFactory> socketFactoryRegistry;
private final SchemePortResolver schemePortResolver;
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LenientHttpResponseParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LenientHttpResponseParser.java?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LenientHttpResponseParser.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LenientHttpResponseParser.java Mon Oct 31 23:24:37 2016
@@ -29,8 +29,6 @@ package org.apache.hc.client5.http.impl.
import java.io.IOException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hc.core5.annotation.NotThreadSafe;
import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.HttpResponse;
@@ -39,6 +37,8 @@ import org.apache.hc.core5.http.config.M
import org.apache.hc.core5.http.impl.io.DefaultHttpResponseParser;
import org.apache.hc.core5.http.message.LineParser;
import org.apache.hc.core5.util.CharArrayBuffer;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* Lenient HTTP response parser implementation that can skip malformed data until
@@ -49,7 +49,7 @@ import org.apache.hc.core5.util.CharArra
@NotThreadSafe
public class LenientHttpResponseParser extends DefaultHttpResponseParser {
- private final Log log = LogFactory.getLog(getClass());
+ private final Logger log = LogManager.getLogger(getClass());
/**
* Creates new instance of DefaultHttpResponseParser.
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingManagedHttpClientConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingManagedHttpClientConnection.java?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingManagedHttpClientConnection.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingManagedHttpClientConnection.java Mon Oct 31 23:24:37 2016
@@ -34,7 +34,6 @@ import java.net.Socket;
import java.nio.charset.CharsetDecoder;
import java.nio.charset.CharsetEncoder;
-import org.apache.commons.logging.Log;
import org.apache.hc.core5.annotation.NotThreadSafe;
import org.apache.hc.core5.http.ContentLengthStrategy;
import org.apache.hc.core5.http.Header;
@@ -43,19 +42,20 @@ import org.apache.hc.core5.http.HttpResp
import org.apache.hc.core5.http.config.MessageConstraints;
import org.apache.hc.core5.http.io.HttpMessageParserFactory;
import org.apache.hc.core5.http.io.HttpMessageWriterFactory;
+import org.apache.logging.log4j.Logger;
@NotThreadSafe
class LoggingManagedHttpClientConnection extends DefaultManagedHttpClientConnection {
- private final Log log;
- private final Log headerlog;
+ private final Logger log;
+ private final Logger headerlog;
private final Wire wire;
public LoggingManagedHttpClientConnection(
final String id,
- final Log log,
- final Log headerlog,
- final Log wirelog,
+ final Logger log,
+ final Logger headerlog,
+ final Logger wirelog,
final int buffersize,
final int fragmentSizeHint,
final CharsetDecoder chardecoder,
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/ManagedHttpClientConnectionFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/ManagedHttpClientConnectionFactory.java?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/ManagedHttpClientConnectionFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/ManagedHttpClientConnectionFactory.java Mon Oct 31 23:24:37 2016
@@ -33,8 +33,6 @@ import java.nio.charset.CharsetEncoder;
import java.nio.charset.CodingErrorAction;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hc.client5.http.HttpConnectionFactory;
import org.apache.hc.client5.http.HttpRoute;
import org.apache.hc.client5.http.io.ManagedHttpClientConnection;
@@ -47,6 +45,8 @@ import org.apache.hc.core5.http.impl.Def
import org.apache.hc.core5.http.impl.io.DefaultHttpRequestWriterFactory;
import org.apache.hc.core5.http.io.HttpMessageParserFactory;
import org.apache.hc.core5.http.io.HttpMessageWriterFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* Factory for {@link ManagedHttpClientConnection} instances.
@@ -60,9 +60,9 @@ public class ManagedHttpClientConnection
public static final ManagedHttpClientConnectionFactory INSTANCE = new ManagedHttpClientConnectionFactory();
- private final Log log = LogFactory.getLog(DefaultManagedHttpClientConnection.class);
- private final Log headerlog = LogFactory.getLog("org.apache.http.headers");
- private final Log wirelog = LogFactory.getLog("org.apache.http.wire");
+ private final Logger log = LogManager.getLogger(DefaultManagedHttpClientConnection.class);
+ private final Logger headerlog = LogManager.getLogger("org.apache.http.headers");
+ private final Logger wirelog = LogManager.getLogger("org.apache.http.wire");
private final HttpMessageWriterFactory<HttpRequest> requestWriterFactory;
private final HttpMessageParserFactory<HttpResponse> responseParserFactory;
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java Mon Oct 31 23:24:37 2016
@@ -38,8 +38,6 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hc.client5.http.ConnectionPoolTimeoutException;
import org.apache.hc.client5.http.DnsResolver;
import org.apache.hc.client5.http.HttpConnectionFactory;
@@ -67,6 +65,8 @@ import org.apache.hc.core5.pool.PoolStat
import org.apache.hc.core5.pool.io.ConnFactory;
import org.apache.hc.core5.util.Args;
import org.apache.hc.core5.util.Asserts;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* {@code ClientConnectionPoolManager} maintains a pool of
@@ -104,7 +104,7 @@ import org.apache.hc.core5.util.Asserts;
public class PoolingHttpClientConnectionManager
implements HttpClientConnectionManager, ConnPoolControl<HttpRoute>, Closeable {
- private final Log log = LogFactory.getLog(getClass());
+ private final Logger log = LogManager.getLogger(getClass());
public static final int DEFAULT_MAX_TOTAL_CONNECTIONS = 25;
public static final int DEFAULT_MAX_CONNECTIONS_PER_ROUTE = 5;
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/Wire.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/Wire.java?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/Wire.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/Wire.java Mon Oct 31 23:24:37 2016
@@ -30,9 +30,9 @@ import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
-import org.apache.commons.logging.Log;
import org.apache.hc.core5.annotation.Immutable;
import org.apache.hc.core5.util.Args;
+import org.apache.logging.log4j.Logger;
/**
* Logs data to the wire LOG.
@@ -42,18 +42,18 @@ import org.apache.hc.core5.util.Args;
@Immutable
class Wire {
- private final Log log;
+ private final Logger log;
private final String id;
/**
* @since 4.3
*/
- public Wire(final Log log, final String id) {
+ public Wire(final Logger log, final String id) {
this.log = log;
this.id = id;
}
- public Wire(final Log log) {
+ public Wire(final Logger log) {
this(log, "");
}
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultAuthenticationStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultAuthenticationStrategy.java?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultAuthenticationStrategy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultAuthenticationStrategy.java Mon Oct 31 23:24:37 2016
@@ -35,8 +35,6 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hc.client5.http.auth.AuthChallenge;
import org.apache.hc.client5.http.auth.AuthScheme;
import org.apache.hc.client5.http.auth.AuthSchemeProvider;
@@ -49,6 +47,8 @@ import org.apache.hc.core5.annotation.Im
import org.apache.hc.core5.http.config.Lookup;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.util.Args;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* Default implementation of {@link AuthenticationStrategy}
@@ -58,7 +58,7 @@ import org.apache.hc.core5.util.Args;
@Immutable
public class DefaultAuthenticationStrategy implements AuthenticationStrategy {
- private final Log log = LogFactory.getLog(getClass());
+ private final Logger log = LogManager.getLogger(getClass());
public static final DefaultAuthenticationStrategy INSTANCE = new DefaultAuthenticationStrategy();
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultRedirectStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultRedirectStrategy.java?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultRedirectStrategy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/protocol/DefaultRedirectStrategy.java Mon Oct 31 23:24:37 2016
@@ -33,8 +33,6 @@ import java.util.Locale;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hc.client5.http.config.RequestConfig;
import org.apache.hc.client5.http.methods.HttpGet;
import org.apache.hc.client5.http.methods.HttpUriRequest;
@@ -58,6 +56,8 @@ import org.apache.hc.core5.http.protocol
import org.apache.hc.core5.util.Args;
import org.apache.hc.core5.util.Asserts;
import org.apache.hc.core5.util.TextUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* Default implementation of {@link RedirectStrategy}. This strategy honors the restrictions
@@ -71,7 +71,7 @@ import org.apache.hc.core5.util.TextUtil
@Immutable
public class DefaultRedirectStrategy implements RedirectStrategy {
- private final Log log = LogFactory.getLog(getClass());
+ private final Logger log = LogManager.getLogger(getClass());
public static final DefaultRedirectStrategy INSTANCE = new DefaultRedirectStrategy();
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/CloseableHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/CloseableHttpClient.java?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/CloseableHttpClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/CloseableHttpClient.java Mon Oct 31 23:24:37 2016
@@ -31,8 +31,6 @@ import java.io.Closeable;
import java.io.IOException;
import java.net.URI;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hc.client5.http.methods.CloseableHttpResponse;
import org.apache.hc.client5.http.methods.HttpUriRequest;
import org.apache.hc.client5.http.protocol.ClientProtocolException;
@@ -46,6 +44,8 @@ import org.apache.hc.core5.http.HttpRequ
import org.apache.hc.core5.http.entity.EntityUtils;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.util.Args;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* Base implementation of {@link HttpClient} that also implements {@link Closeable}.
@@ -55,7 +55,7 @@ import org.apache.hc.core5.util.Args;
@ThreadSafe
public abstract class CloseableHttpClient implements HttpClient, Closeable {
- private final Log log = LogFactory.getLog(getClass());
+ private final Logger log = LogManager.getLogger(getClass());
protected abstract CloseableHttpResponse doExecute(HttpHost target, HttpRequest request,
HttpContext context) throws IOException;
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ConnectionHolder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ConnectionHolder.java?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ConnectionHolder.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ConnectionHolder.java Mon Oct 31 23:24:37 2016
@@ -32,12 +32,12 @@ import java.io.IOException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.commons.logging.Log;
import org.apache.hc.client5.http.io.ConnectionReleaseTrigger;
import org.apache.hc.client5.http.io.HttpClientConnectionManager;
import org.apache.hc.core5.annotation.ThreadSafe;
import org.apache.hc.core5.concurrent.Cancellable;
import org.apache.hc.core5.http.io.HttpClientConnection;
+import org.apache.logging.log4j.Logger;
/**
* Internal connection holder.
@@ -47,7 +47,7 @@ import org.apache.hc.core5.http.io.HttpC
@ThreadSafe
class ConnectionHolder implements ConnectionReleaseTrigger, Cancellable, Closeable {
- private final Log log;
+ private final Logger log;
private final HttpClientConnectionManager manager;
private final HttpClientConnection managedConn;
@@ -58,7 +58,7 @@ class ConnectionHolder implements Connec
private volatile TimeUnit tunit;
public ConnectionHolder(
- final Log log,
+ final Logger log,
final HttpClientConnectionManager manager,
final HttpClientConnection managedConn) {
super();
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/InternalHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/InternalHttpClient.java?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/InternalHttpClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/InternalHttpClient.java Mon Oct 31 23:24:37 2016
@@ -31,8 +31,6 @@ import java.io.Closeable;
import java.io.IOException;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hc.client5.http.HttpRoute;
import org.apache.hc.client5.http.auth.AuthSchemeProvider;
import org.apache.hc.client5.http.auth.CredentialsProvider;
@@ -55,6 +53,8 @@ import org.apache.hc.core5.http.config.L
import org.apache.hc.core5.http.protocol.BasicHttpContext;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.util.Args;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* Internal class.
@@ -64,7 +64,7 @@ import org.apache.hc.core5.util.Args;
@ThreadSafe
class InternalHttpClient extends CloseableHttpClient implements Configurable {
- private final Log log = LogFactory.getLog(getClass());
+ private final Logger log = LogManager.getLogger(getClass());
private final ClientExecChain execChain;
private final HttpClientConnectionManager connManager;
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/MainClientExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/MainClientExec.java?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/MainClientExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/MainClientExec.java Mon Oct 31 23:24:37 2016
@@ -32,8 +32,6 @@ import java.io.InterruptedIOException;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hc.client5.http.ConnectionKeepAliveStrategy;
import org.apache.hc.client5.http.HttpRoute;
import org.apache.hc.client5.http.RouteTracker;
@@ -71,6 +69,8 @@ import org.apache.hc.core5.http.protocol
import org.apache.hc.core5.http.protocol.ImmutableHttpProcessor;
import org.apache.hc.core5.http.protocol.RequestTargetHost;
import org.apache.hc.core5.util.Args;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* The last request executor in the HTTP request execution chain
@@ -85,7 +85,7 @@ import org.apache.hc.core5.util.Args;
@Immutable
public class MainClientExec implements ClientExecChain {
- private final Log log = LogFactory.getLog(getClass());
+ private final Logger log = LogManager.getLogger(getClass());
private final HttpRequestExecutor requestExecutor;
private final HttpClientConnectionManager connManager;
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/MinimalClientExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/MinimalClientExec.java?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/MinimalClientExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/MinimalClientExec.java Mon Oct 31 23:24:37 2016
@@ -34,8 +34,6 @@ import java.net.URISyntaxException;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hc.client5.http.ConnectionKeepAliveStrategy;
import org.apache.hc.client5.http.HttpRoute;
import org.apache.hc.client5.http.config.RequestConfig;
@@ -67,6 +65,8 @@ import org.apache.hc.core5.http.protocol
import org.apache.hc.core5.http.protocol.RequestUserAgent;
import org.apache.hc.core5.util.Args;
import org.apache.hc.core5.util.VersionInfo;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* Request executor that implements the most fundamental aspects of
@@ -80,7 +80,7 @@ import org.apache.hc.core5.util.VersionI
@Immutable
public class MinimalClientExec implements ClientExecChain {
- private final Log log = LogFactory.getLog(getClass());
+ private final Logger log = LogManager.getLogger(getClass());
private final HttpRequestExecutor requestExecutor;
private final HttpClientConnectionManager connManager;
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ProtocolExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ProtocolExec.java?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ProtocolExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ProtocolExec.java Mon Oct 31 23:24:37 2016
@@ -31,8 +31,6 @@ import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hc.client5.http.HttpRoute;
import org.apache.hc.client5.http.auth.AuthScope;
import org.apache.hc.client5.http.auth.CredentialsProvider;
@@ -52,6 +50,8 @@ import org.apache.hc.core5.http.Protocol
import org.apache.hc.core5.http.protocol.HttpCoreContext;
import org.apache.hc.core5.http.protocol.HttpProcessor;
import org.apache.hc.core5.util.Args;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* Request executor in the request execution chain that is responsible
@@ -70,7 +70,7 @@ import org.apache.hc.core5.util.Args;
@Immutable
public class ProtocolExec implements ClientExecChain {
- private final Log log = LogFactory.getLog(getClass());
+ private final Logger log = LogManager.getLogger(getClass());
private final ClientExecChain requestExecutor;
private final HttpProcessor httpProcessor;
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RedirectExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RedirectExec.java?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RedirectExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RedirectExec.java Mon Oct 31 23:24:37 2016
@@ -31,8 +31,6 @@ import java.io.IOException;
import java.net.URI;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hc.client5.http.HttpRoute;
import org.apache.hc.client5.http.auth.AuthExchange;
import org.apache.hc.client5.http.auth.AuthScheme;
@@ -52,6 +50,8 @@ import org.apache.hc.core5.http.HttpRequ
import org.apache.hc.core5.http.ProtocolException;
import org.apache.hc.core5.http.entity.EntityUtils;
import org.apache.hc.core5.util.Args;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* Request executor in the request execution chain that is responsible
@@ -67,7 +67,7 @@ import org.apache.hc.core5.util.Args;
@ThreadSafe
public class RedirectExec implements ClientExecChain {
- private final Log log = LogFactory.getLog(getClass());
+ private final Logger log = LogManager.getLogger(getClass());
private final ClientExecChain requestExecutor;
private final RedirectStrategy redirectStrategy;
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RetryExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RetryExec.java?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RetryExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/RetryExec.java Mon Oct 31 23:24:37 2016
@@ -29,8 +29,6 @@ package org.apache.hc.client5.http.impl.
import java.io.IOException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hc.client5.http.HttpRoute;
import org.apache.hc.client5.http.methods.CloseableHttpResponse;
import org.apache.hc.client5.http.methods.HttpExecutionAware;
@@ -43,6 +41,8 @@ import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.NoHttpResponseException;
import org.apache.hc.core5.util.Args;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* Request executor in the request execution chain that is responsible
@@ -59,7 +59,7 @@ import org.apache.hc.core5.util.Args;
@Immutable
public class RetryExec implements ClientExecChain {
- private final Log log = LogFactory.getLog(getClass());
+ private final Logger log = LogManager.getLogger(getClass());
private final ClientExecChain requestExecutor;
private final HttpRequestRetryHandler retryHandler;
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ServiceUnavailableRetryExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ServiceUnavailableRetryExec.java?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ServiceUnavailableRetryExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/impl/sync/ServiceUnavailableRetryExec.java Mon Oct 31 23:24:37 2016
@@ -30,8 +30,6 @@ package org.apache.hc.client5.http.impl.
import java.io.IOException;
import java.io.InterruptedIOException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hc.client5.http.HttpRoute;
import org.apache.hc.client5.http.methods.CloseableHttpResponse;
import org.apache.hc.client5.http.methods.HttpExecutionAware;
@@ -42,6 +40,8 @@ import org.apache.hc.core5.annotation.Im
import org.apache.hc.core5.http.Header;
import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.util.Args;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* Request executor in the request execution chain that is responsible
@@ -58,7 +58,7 @@ import org.apache.hc.core5.util.Args;
@Immutable
public class ServiceUnavailableRetryExec implements ClientExecChain {
- private final Log log = LogFactory.getLog(getClass());
+ private final Logger log = LogManager.getLogger(getClass());
private final ClientExecChain requestExecutor;
private final ServiceUnavailableRetryStrategy retryStrategy;
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestAddCookies.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestAddCookies.java?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestAddCookies.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestAddCookies.java Mon Oct 31 23:24:37 2016
@@ -34,8 +34,6 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hc.client5.http.RouteInfo;
import org.apache.hc.client5.http.config.CookieSpecs;
import org.apache.hc.client5.http.config.RequestConfig;
@@ -55,6 +53,8 @@ import org.apache.hc.core5.http.config.L
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.util.Args;
import org.apache.hc.core5.util.TextUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* Request interceptor that matches cookies available in the current
@@ -66,7 +66,7 @@ import org.apache.hc.core5.util.TextUtil
@Immutable
public class RequestAddCookies implements HttpRequestInterceptor {
- private final Log log = LogFactory.getLog(getClass());
+ private final Logger log = LogManager.getLogger(getClass());
public RequestAddCookies() {
super();
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestAuthCache.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestAuthCache.java?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestAuthCache.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestAuthCache.java Mon Oct 31 23:24:37 2016
@@ -29,8 +29,6 @@ package org.apache.hc.client5.http.proto
import java.io.IOException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hc.client5.http.RouteInfo;
import org.apache.hc.client5.http.auth.AuthCache;
import org.apache.hc.client5.http.auth.AuthExchange;
@@ -43,6 +41,8 @@ import org.apache.hc.core5.http.HttpRequ
import org.apache.hc.core5.http.HttpRequestInterceptor;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.util.Args;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* Request interceptor that can preemptively authenticate against known hosts,
@@ -54,7 +54,7 @@ import org.apache.hc.core5.util.Args;
@Immutable
public class RequestAuthCache implements HttpRequestInterceptor {
- private final Log log = LogFactory.getLog(getClass());
+ private final Logger log = LogManager.getLogger(getClass());
public RequestAuthCache() {
super();
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestClientConnControl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestClientConnControl.java?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestClientConnControl.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestClientConnControl.java Mon Oct 31 23:24:37 2016
@@ -29,8 +29,6 @@ package org.apache.hc.client5.http.proto
import java.io.IOException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hc.client5.http.RouteInfo;
import org.apache.hc.core5.annotation.Immutable;
import org.apache.hc.core5.http.HeaderElements;
@@ -40,6 +38,8 @@ import org.apache.hc.core5.http.HttpRequ
import org.apache.hc.core5.http.HttpRequestInterceptor;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.util.Args;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* This protocol interceptor is responsible for adding {@code Connection}
@@ -51,7 +51,7 @@ import org.apache.hc.core5.util.Args;
@Immutable
public class RequestClientConnControl implements HttpRequestInterceptor {
- private final Log log = LogFactory.getLog(getClass());
+ private final Logger log = LogManager.getLogger(getClass());
private static final String PROXY_CONN_DIRECTIVE = "Proxy-Connection";
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/ResponseProcessCookies.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/ResponseProcessCookies.java?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/ResponseProcessCookies.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/ResponseProcessCookies.java Mon Oct 31 23:24:37 2016
@@ -31,8 +31,6 @@ import java.io.IOException;
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hc.client5.http.cookie.Cookie;
import org.apache.hc.client5.http.cookie.CookieOrigin;
import org.apache.hc.client5.http.cookie.CookieSpec;
@@ -45,6 +43,8 @@ import org.apache.hc.core5.http.HttpResp
import org.apache.hc.core5.http.HttpResponseInterceptor;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.util.Args;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* Response interceptor that populates the current {@link CookieStore} with data
@@ -55,7 +55,7 @@ import org.apache.hc.core5.util.Args;
@Immutable
public class ResponseProcessCookies implements HttpResponseInterceptor {
- private final Log log = LogFactory.getLog(getClass());
+ private final Logger log = LogManager.getLogger(getClass());
public ResponseProcessCookies() {
super();
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixMatcherLoader.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixMatcherLoader.java?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixMatcherLoader.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixMatcherLoader.java Mon Oct 31 23:24:37 2016
@@ -36,10 +36,10 @@ import java.nio.charset.StandardCharsets
import java.util.Arrays;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hc.core5.annotation.ThreadSafe;
import org.apache.hc.core5.util.Args;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* {@link PublicSuffixMatcher} loader.
@@ -82,7 +82,7 @@ public final class PublicSuffixMatcherLo
DEFAULT_INSTANCE = load(url);
} catch (final IOException ex) {
// Should never happen
- final Log log = LogFactory.getLog(PublicSuffixMatcherLoader.class);
+ final Logger log = LogManager.getLogger(PublicSuffixMatcherLoader.class);
if (log.isWarnEnabled()) {
log.warn("Failure loading public suffix list from default resource", ex);
}
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/DefaultHostnameVerifier.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/DefaultHostnameVerifier.java?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/DefaultHostnameVerifier.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/DefaultHostnameVerifier.java Mon Oct 31 23:24:37 2016
@@ -49,12 +49,12 @@ import javax.net.ssl.SSLException;
import javax.net.ssl.SSLSession;
import javax.security.auth.x500.X500Principal;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hc.client5.http.psl.DomainType;
import org.apache.hc.client5.http.psl.PublicSuffixMatcher;
import org.apache.hc.client5.http.utils.InetAddressUtils;
import org.apache.hc.core5.annotation.Immutable;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* Default {@link javax.net.ssl.HostnameVerifier} implementation.
@@ -69,7 +69,7 @@ public final class DefaultHostnameVerifi
final static int DNS_NAME_TYPE = 2;
final static int IP_ADDRESS_TYPE = 7;
- private final Log log = LogFactory.getLog(getClass());
+ private final Logger log = LogManager.getLogger(getClass());
private final PublicSuffixMatcher publicSuffixMatcher;
Modified: httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/SSLConnectionSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/SSLConnectionSocketFactory.java?rev=1767391&r1=1767390&r2=1767391&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/SSLConnectionSocketFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/SSLConnectionSocketFactory.java Mon Oct 31 23:24:37 2016
@@ -47,8 +47,6 @@ import javax.net.ssl.SSLSession;
import javax.net.ssl.SSLSocket;
import javax.security.auth.x500.X500Principal;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hc.client5.http.psl.PublicSuffixMatcherLoader;
import org.apache.hc.client5.http.socket.LayeredConnectionSocketFactory;
import org.apache.hc.core5.annotation.ThreadSafe;
@@ -57,6 +55,8 @@ import org.apache.hc.core5.http.protocol
import org.apache.hc.core5.ssl.SSLContexts;
import org.apache.hc.core5.util.Args;
import org.apache.hc.core5.util.TextUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* Layered socket factory for TLS/SSL connections.
@@ -139,7 +139,7 @@ public class SSLConnectionSocketFactory
public static final String TLS = "TLS";
public static final String SSL = "SSL";
- private final Log log = LogFactory.getLog(getClass());
+ private final Logger log = LogManager.getLogger(getClass());
/**
* @since 4.4