+ slf4j to cayenne-client
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/a9b4b3d2 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/a9b4b3d2 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/a9b4b3d2 Branch: refs/heads/master Commit: a9b4b3d23eafd16c3d97c5ce8afbde25045e3082 Parents: 58e67ec Author: Maxim Petrusevich <maks1...@gmail.com> Authored: Wed Apr 12 12:05:56 2017 +0300 Committer: Maxim Petrusevich <maks1...@gmail.com> Committed: Wed Apr 12 12:05:56 2017 +0300 ---------------------------------------------------------------------- cayenne-client/pom.xml | 10 +++++----- .../java/org/apache/cayenne/remote/BaseConnection.java | 8 ++++---- .../org/apache/cayenne/rop/http/HttpROPConnector.java | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/a9b4b3d2/cayenne-client/pom.xml ---------------------------------------------------------------------- diff --git a/cayenne-client/pom.xml b/cayenne-client/pom.xml index 7d08f51..fbc2915 100644 --- a/cayenne-client/pom.xml +++ b/cayenne-client/pom.xml @@ -22,6 +22,11 @@ <dependencies> <!-- Compile dependencies --> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <scope>compile</scope> + </dependency> <dependency> <groupId>org.apache.cayenne</groupId> <artifactId>cayenne-di</artifactId> @@ -81,11 +86,6 @@ </dependency> <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/cayenne/blob/a9b4b3d2/cayenne-client/src/main/java/org/apache/cayenne/remote/BaseConnection.java ---------------------------------------------------------------------- diff --git a/cayenne-client/src/main/java/org/apache/cayenne/remote/BaseConnection.java b/cayenne-client/src/main/java/org/apache/cayenne/remote/BaseConnection.java index d02449e..f8e3498 100644 --- a/cayenne-client/src/main/java/org/apache/cayenne/remote/BaseConnection.java +++ b/cayenne-client/src/main/java/org/apache/cayenne/remote/BaseConnection.java @@ -19,9 +19,9 @@ package org.apache.cayenne.remote; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; import org.apache.cayenne.CayenneRuntimeException; +import org.slf4j.LoggerFactory; /** * A common base class for concrete ClientConnection implementations. Provides message @@ -31,14 +31,14 @@ import org.apache.cayenne.CayenneRuntimeException; */ public abstract class BaseConnection implements ClientConnection { - protected Log logger; + protected Logger logger; protected long messageId; /** * Default constructor that initializes logging and a single threaded EventManager. */ protected BaseConnection() { - this.logger = LogFactory.getLog(getClass()); + this.logger = LoggerFactory.getLogger(getClass()); } /** http://git-wip-us.apache.org/repos/asf/cayenne/blob/a9b4b3d2/cayenne-client/src/main/java/org/apache/cayenne/rop/http/HttpROPConnector.java ---------------------------------------------------------------------- diff --git a/cayenne-client/src/main/java/org/apache/cayenne/rop/http/HttpROPConnector.java b/cayenne-client/src/main/java/org/apache/cayenne/rop/http/HttpROPConnector.java index bdae52b..ee23ce3 100644 --- a/cayenne-client/src/main/java/org/apache/cayenne/rop/http/HttpROPConnector.java +++ b/cayenne-client/src/main/java/org/apache/cayenne/rop/http/HttpROPConnector.java @@ -23,8 +23,8 @@ import org.apache.cayenne.rop.HttpClientConnection; import org.apache.cayenne.rop.ROPConnector; import org.apache.cayenne.rop.ROPConstants; import org.apache.cayenne.rop.ROPUtil; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.IOException; import java.io.InputStream; @@ -37,7 +37,7 @@ import java.util.Map; public class HttpROPConnector implements ROPConnector { - private static Log logger = LogFactory.getLog(HttpROPConnector.class); + private static Logger logger = LoggerFactory.getLogger(HttpROPConnector.class); public static final String SESSION_COOKIE_NAME = "JSESSIONID";
