You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2017/04/26 10:09:21 UTC
[07/19] cayenne git commit: + slf4j to cayenne-client-jetty
+ slf4j to cayenne-client-jetty
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/af0a2fc1
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/af0a2fc1
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/af0a2fc1
Branch: refs/heads/master
Commit: af0a2fc1a1aa6b24e49c019a5ea6dc3cbaf2a6b4
Parents: a9b4b3d
Author: Maxim Petrusevich <ma...@gmail.com>
Authored: Wed Apr 12 12:09:53 2017 +0300
Committer: Maxim Petrusevich <ma...@gmail.com>
Committed: Wed Apr 12 12:09:53 2017 +0300
----------------------------------------------------------------------
cayenne-client-jetty/pom.xml | 4 ++++
.../apache/cayenne/rop/JettyHttpClientConnectionProvider.java | 6 +++---
.../org/apache/cayenne/rop/http/JettyHttpROPConnector.java | 6 +++---
3 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/af0a2fc1/cayenne-client-jetty/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-client-jetty/pom.xml b/cayenne-client-jetty/pom.xml
index d12861b..4ee6abf 100644
--- a/cayenne-client-jetty/pom.xml
+++ b/cayenne-client-jetty/pom.xml
@@ -74,6 +74,10 @@
<artifactId>cayenne-client</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
<!-- Jetty client -->
<dependency>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/af0a2fc1/cayenne-client-jetty/src/main/java/org/apache/cayenne/rop/JettyHttpClientConnectionProvider.java
----------------------------------------------------------------------
diff --git a/cayenne-client-jetty/src/main/java/org/apache/cayenne/rop/JettyHttpClientConnectionProvider.java b/cayenne-client-jetty/src/main/java/org/apache/cayenne/rop/JettyHttpClientConnectionProvider.java
index 6a616df..3a3fb25 100644
--- a/cayenne-client-jetty/src/main/java/org/apache/cayenne/rop/JettyHttpClientConnectionProvider.java
+++ b/cayenne-client-jetty/src/main/java/org/apache/cayenne/rop/JettyHttpClientConnectionProvider.java
@@ -28,8 +28,8 @@ import org.apache.cayenne.di.Inject;
import org.apache.cayenne.di.Provider;
import org.apache.cayenne.remote.ClientConnection;
import org.apache.cayenne.rop.http.JettyHttpROPConnector;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.client.api.AuthenticationStore;
import org.eclipse.jetty.client.util.BasicAuthentication;
@@ -43,7 +43,7 @@ import java.net.URI;
*/
public class JettyHttpClientConnectionProvider implements Provider<ClientConnection> {
- private static Log logger = LogFactory.getLog(JettyHttpROPConnector.class);
+ private static Logger logger = LoggerFactory.getLogger(JettyHttpROPConnector.class);
@Inject
protected RuntimeProperties runtimeProperties;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/af0a2fc1/cayenne-client-jetty/src/main/java/org/apache/cayenne/rop/http/JettyHttpROPConnector.java
----------------------------------------------------------------------
diff --git a/cayenne-client-jetty/src/main/java/org/apache/cayenne/rop/http/JettyHttpROPConnector.java b/cayenne-client-jetty/src/main/java/org/apache/cayenne/rop/http/JettyHttpROPConnector.java
index f2c0005..2a308dc 100644
--- a/cayenne-client-jetty/src/main/java/org/apache/cayenne/rop/http/JettyHttpROPConnector.java
+++ b/cayenne-client-jetty/src/main/java/org/apache/cayenne/rop/http/JettyHttpROPConnector.java
@@ -22,8 +22,7 @@ package org.apache.cayenne.rop.http;
import org.apache.cayenne.remote.ClientConnection;
import org.apache.cayenne.remote.RemoteSession;
import org.apache.cayenne.rop.*;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.client.api.ContentResponse;
import org.eclipse.jetty.client.api.Request;
@@ -32,6 +31,7 @@ import org.eclipse.jetty.client.util.BytesContentProvider;
import org.eclipse.jetty.client.util.InputStreamResponseListener;
import org.eclipse.jetty.http.HttpHeader;
import org.eclipse.jetty.http.HttpMethod;
+import org.slf4j.LoggerFactory;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -47,7 +47,7 @@ import java.util.concurrent.TimeUnit;
*/
public class JettyHttpROPConnector implements ROPConnector {
- private static Log logger = LogFactory.getLog(JettyHttpROPConnector.class);
+ private static Logger logger = LoggerFactory.getLogger(JettyHttpROPConnector.class);
public static final String SESSION_COOKIE_NAME = "JSESSIONID";