cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntimof...@apache.org
Subject [04/19] cayenne git commit: + slf4j logger to cayenne-server
Date Wed, 26 Apr 2017 10:09:18 GMT
+ slf4j logger to cayenne-server


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/0aa789b0
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/0aa789b0
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/0aa789b0

Branch: refs/heads/master
Commit: 0aa789b06eb6da92cf27f8f98d2eb307739461a3
Parents: c2110ef
Author: Maxim Petrusevich <maks1464@gmail.com>
Authored: Wed Apr 12 10:43:37 2017 +0300
Committer: Maxim Petrusevich <maks1464@gmail.com>
Committed: Wed Apr 12 10:43:37 2017 +0300

----------------------------------------------------------------------
 cayenne-project/pom.xml                             | 10 +++++-----
 .../v6/XMLDataChannelDescriptorLoader_V3_0_0_1.java |  6 +++---
 .../v6/XMLDataSourceInfoLoader_V3_0_0_1.java        | 16 ++++++++--------
 cayenne-server/pom.xml                              |  5 -----
 .../org/apache/cayenne/access/DataRowStore.java     |  6 +++---
 .../java/org/apache/cayenne/access/DbGenerator.java |  6 +++---
 .../org/apache/cayenne/access/ObjectResolver.java   |  6 +++---
 .../access/dbsync/CreateIfNoSchemaStrategy.java     |  6 +++---
 .../ThrowOnPartialOrCreateSchemaStrategy.java       |  6 +++---
 .../access/dbsync/ThrowOnPartialSchemaStrategy.java |  6 +++---
 .../cayenne/access/jdbc/RowDescriptorBuilder.java   |  6 +++---
 .../access/types/SerializableTypeFactory.java       |  6 +++---
 .../org/apache/cayenne/cache/EhCacheQueryCache.java |  6 +++---
 .../DefaultDataChannelDescriptorMerger.java         |  8 ++++----
 .../configuration/server/DataDomainProvider.java    |  6 +++---
 .../server/DelegatingDataSourceFactory.java         |  8 ++++----
 .../configuration/server/JNDIDataSourceFactory.java |  6 +++---
 .../server/XMLPoolingDataSourceFactory.java         |  6 +++---
 .../apache/cayenne/datasource/DriverDataSource.java |  9 ++++-----
 .../datasource/UnmanagedPoolingDataSource.java      |  9 ++++-----
 .../apache/cayenne/dba/mysql/MySQLPkGenerator.java  |  6 +++---
 .../org/apache/cayenne/exp/parser/ASTEqual.java     |  6 +++---
 .../org/apache/cayenne/exp/parser/ASTObjPath.java   |  6 +++---
 .../apache/cayenne/log/CommonsJdbcEventLogger.java  |  6 +++---
 .../java/org/apache/cayenne/map/MappingCache.java   |  6 +++---
 .../org/apache/cayenne/query/CacheableQuery.java    |  6 +++---
 .../cayenne/remote/service/BaseRemoteService.java   |  8 ++++----
 .../BaseSchemaUpdateStrategy_ConcurrencyTest.java   |  6 +++---
 .../datasource/ManagedPoolingDataSourceIT.java      |  6 +++---
 .../java/org/apache/cayenne/unit/JNDISetup.java     |  6 +++---
 .../java/org/apache/cayenne/unit/UnitDbAdapter.java |  6 +++---
 .../cayenne/unit/di/server/SchemaBuilder.java       |  6 +++---
 .../di/server/ServerCaseDataSourceInfoProvider.java |  6 +++---
 .../apache/cayenne/wocompat/EOModelProcessor.java   |  6 +++---
 34 files changed, 111 insertions(+), 118 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/0aa789b0/cayenne-project/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-project/pom.xml b/cayenne-project/pom.xml
index 732df9c..c8c5675 100644
--- a/cayenne-project/pom.xml
+++ b/cayenne-project/pom.xml
@@ -37,6 +37,11 @@
         </dependency>
 
         <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.cayenne</groupId>
             <artifactId>cayenne-server</artifactId>
             <version>${project.version}</version>
@@ -68,11 +73,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/0aa789b0/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v6/XMLDataChannelDescriptorLoader_V3_0_0_1.java
----------------------------------------------------------------------
diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v6/XMLDataChannelDescriptorLoader_V3_0_0_1.java b/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v6/XMLDataChannelDescriptorLoader_V3_0_0_1.java
index 806e168..f0819ff 100644
--- a/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v6/XMLDataChannelDescriptorLoader_V3_0_0_1.java
+++ b/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v6/XMLDataChannelDescriptorLoader_V3_0_0_1.java
@@ -28,8 +28,8 @@ import org.apache.cayenne.conn.DataSourceInfo;
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.resource.Resource;
 import org.apache.cayenne.util.Util;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.InputSource;
@@ -50,7 +50,7 @@ class XMLDataChannelDescriptorLoader_V3_0_0_1 {
 
 	static final String DBCP_DATA_SOURCE_FACTORY = "org.apache.cayenne.configuration.server.DBCPDataSourceFactory";
 
-	private static Log logger = LogFactory.getLog(XMLDataChannelDescriptorLoader_V3_0_0_1.class);
+	private static Logger logger = LoggerFactory.getLogger(XMLDataChannelDescriptorLoader_V3_0_0_1.class);
 
 	static final String DOMAINS_TAG = "domains";
 	static final String DOMAIN_TAG = "domain";

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0aa789b0/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v6/XMLDataSourceInfoLoader_V3_0_0_1.java
----------------------------------------------------------------------
diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v6/XMLDataSourceInfoLoader_V3_0_0_1.java b/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v6/XMLDataSourceInfoLoader_V3_0_0_1.java
index 257f820..188c6f8 100644
--- a/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v6/XMLDataSourceInfoLoader_V3_0_0_1.java
+++ b/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/v6/XMLDataSourceInfoLoader_V3_0_0_1.java
@@ -31,8 +31,8 @@ import org.apache.cayenne.configuration.SAXNestedTagHandler;
 import org.apache.cayenne.conn.DataSourceInfo;
 import org.apache.cayenne.resource.Resource;
 import org.apache.cayenne.util.Util;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.InputSource;
@@ -43,7 +43,7 @@ import org.xml.sax.XMLReader;
  */
 class XMLDataSourceInfoLoader_V3_0_0_1 {
 
-    private static Log logger = LogFactory.getLog(XMLDataSourceInfoLoader_V3_0_0_1.class);
+    private static Logger logger = LoggerFactory.getLogger(XMLDataSourceInfoLoader_V3_0_0_1.class);
 
     private static String passwordFromURL(URL url) {
         InputStream inputStream = null;
@@ -56,7 +56,7 @@ class XMLDataSourceInfoLoader_V3_0_0_1 {
         catch (IOException exception) {
             // Log the error while trying to open the stream. A null
             // password will be returned as a result.
-            logger.warn(exception);
+            logger.warn(exception.getMessage(), exception);
         }
 
         return password;
@@ -71,7 +71,7 @@ class XMLDataSourceInfoLoader_V3_0_0_1 {
             password = bufferedReader.readLine();
         }
         catch (IOException exception) {
-            logger.warn(exception);
+            logger.warn(exception.getMessage(), exception);
         }
         finally {
             try {
@@ -232,7 +232,7 @@ class XMLDataSourceInfoLoader_V3_0_0_1 {
                             password = passwordFromURL(new URL(passwordSource));
                         }
                         catch (MalformedURLException exception) {
-                            logger.warn(exception);
+                            logger.warn(exception.getMessage(), exception);
                         }
                     }
                     else if (passwordLocation
@@ -246,10 +246,10 @@ class XMLDataSourceInfoLoader_V3_0_0_1 {
                                 process.waitFor();
                             }
                             catch (IOException exception) {
-                                logger.warn(exception);
+                                logger.warn(exception.getMessage(), exception);
                             }
                             catch (InterruptedException exception) {
-                                logger.warn(exception);
+                                logger.warn(exception.getMessage(), exception);
                             }
                         }
                     }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0aa789b0/cayenne-server/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/pom.xml b/cayenne-server/pom.xml
index 684e857..792f727 100644
--- a/cayenne-server/pom.xml
+++ b/cayenne-server/pom.xml
@@ -50,11 +50,6 @@
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
 			<groupId>org.apache.velocity</groupId>
 			<artifactId>velocity</artifactId>
 			<scope>compile</scope>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0aa789b0/cayenne-server/src/main/java/org/apache/cayenne/access/DataRowStore.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/DataRowStore.java b/cayenne-server/src/main/java/org/apache/cayenne/access/DataRowStore.java
index 8c518db..18d76db 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/DataRowStore.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/DataRowStore.java
@@ -32,8 +32,8 @@ import org.apache.cayenne.event.EventBridge;
 import org.apache.cayenne.event.EventManager;
 import org.apache.cayenne.event.EventSubject;
 import org.apache.cayenne.util.concurrentlinkedhashmap.ConcurrentLinkedHashMap;
-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.ObjectInputStream;
@@ -52,7 +52,7 @@ import java.util.concurrent.ConcurrentMap;
  */
 public class DataRowStore implements Serializable {
 
-    private static Log logger = LogFactory.getLog(DataRowStore.class);
+    private static Logger logger = LoggerFactory.getLogger(DataRowStore.class);
 
     /**
      * @deprecated since 4.0, never used actually

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0aa789b0/cayenne-server/src/main/java/org/apache/cayenne/access/DbGenerator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/DbGenerator.java b/cayenne-server/src/main/java/org/apache/cayenne/access/DbGenerator.java
index 0b7028d..0f3a467 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/DbGenerator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/DbGenerator.java
@@ -35,8 +35,8 @@ import org.apache.cayenne.map.EntityResolver;
 import org.apache.cayenne.map.EntitySorter;
 import org.apache.cayenne.validation.SimpleValidationFailure;
 import org.apache.cayenne.validation.ValidationResult;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.sql.DataSource;
 import java.sql.Connection;
@@ -58,7 +58,7 @@ import java.util.Map;
  */
 public class DbGenerator {
 
-	private Log logObj = LogFactory.getLog(DbGenerator.class);
+	private Logger logObj = LoggerFactory.getLogger(DbGenerator.class);
 
 	protected DbAdapter adapter;
 	protected DataMap map;

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0aa789b0/cayenne-server/src/main/java/org/apache/cayenne/access/ObjectResolver.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/ObjectResolver.java b/cayenne-server/src/main/java/org/apache/cayenne/access/ObjectResolver.java
index eb0c801..efcac6e 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/ObjectResolver.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/ObjectResolver.java
@@ -31,8 +31,8 @@ import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.map.EntityResolver;
 import org.apache.cayenne.map.ObjEntity;
 import org.apache.cayenne.reflect.ClassDescriptor;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -47,7 +47,7 @@ import java.util.Map;
  */
 class ObjectResolver {
 
-	private static final Log LOGGER = LogFactory.getLog(ObjectResolver.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(ObjectResolver.class);
 
 	DataContext context;
 	ClassDescriptor descriptor;

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0aa789b0/cayenne-server/src/main/java/org/apache/cayenne/access/dbsync/CreateIfNoSchemaStrategy.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/dbsync/CreateIfNoSchemaStrategy.java b/cayenne-server/src/main/java/org/apache/cayenne/access/dbsync/CreateIfNoSchemaStrategy.java
index bcf0010..7c3158e 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/dbsync/CreateIfNoSchemaStrategy.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/dbsync/CreateIfNoSchemaStrategy.java
@@ -23,8 +23,8 @@ import org.apache.cayenne.access.DataNode;
 import org.apache.cayenne.access.DbGenerator;
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.map.DbEntity;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -39,7 +39,7 @@ import java.util.Map;
  */
 public class CreateIfNoSchemaStrategy extends BaseSchemaUpdateStrategy {
 
-    private final static Log LOGGER = LogFactory.getLog(CreateIfNoSchemaStrategy.class);
+    private final static Logger LOGGER = LoggerFactory.getLogger(CreateIfNoSchemaStrategy.class);
 
 
     @Override

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0aa789b0/cayenne-server/src/main/java/org/apache/cayenne/access/dbsync/ThrowOnPartialOrCreateSchemaStrategy.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/dbsync/ThrowOnPartialOrCreateSchemaStrategy.java b/cayenne-server/src/main/java/org/apache/cayenne/access/dbsync/ThrowOnPartialOrCreateSchemaStrategy.java
index 46ea944..3e3a3d6 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/dbsync/ThrowOnPartialOrCreateSchemaStrategy.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/dbsync/ThrowOnPartialOrCreateSchemaStrategy.java
@@ -22,8 +22,8 @@ import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.access.DataNode;
 import org.apache.cayenne.access.DbGenerator;
 import org.apache.cayenne.map.DataMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.sql.SQLException;
 import java.util.Collection;
@@ -35,7 +35,7 @@ import java.util.List;
  */
 public class ThrowOnPartialOrCreateSchemaStrategy extends ThrowOnPartialSchemaStrategy {
 
-    private final static Log LOGGER = LogFactory.getLog(ThrowOnPartialOrCreateSchemaStrategy.class);
+    private final static Logger LOGGER = LoggerFactory.getLogger(ThrowOnPartialOrCreateSchemaStrategy.class);
 
 
     @Override

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0aa789b0/cayenne-server/src/main/java/org/apache/cayenne/access/dbsync/ThrowOnPartialSchemaStrategy.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/dbsync/ThrowOnPartialSchemaStrategy.java b/cayenne-server/src/main/java/org/apache/cayenne/access/dbsync/ThrowOnPartialSchemaStrategy.java
index 4cf7304..6c04b14 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/dbsync/ThrowOnPartialSchemaStrategy.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/dbsync/ThrowOnPartialSchemaStrategy.java
@@ -21,8 +21,8 @@ package org.apache.cayenne.access.dbsync;
 import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.access.DataNode;
 import org.apache.cayenne.map.DbEntity;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
@@ -37,7 +37,7 @@ import java.util.List;
  */
 public class ThrowOnPartialSchemaStrategy extends BaseSchemaUpdateStrategy {
 
-    private final static Log LOGGER = LogFactory.getLog(ThrowOnPartialSchemaStrategy.class);
+    private final static Logger LOGGER = LoggerFactory.getLogger(ThrowOnPartialSchemaStrategy.class);
 
 
     @Override

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0aa789b0/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/RowDescriptorBuilder.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/RowDescriptorBuilder.java b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/RowDescriptorBuilder.java
index 235e804..90151c0 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/RowDescriptorBuilder.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/RowDescriptorBuilder.java
@@ -33,8 +33,8 @@ import org.apache.cayenne.access.types.ExtendedType;
 import org.apache.cayenne.access.types.ExtendedTypeMap;
 import org.apache.commons.collections.Transformer;
 import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A builder class that helps to assemble {@link RowDescriptor} instances from various
@@ -44,7 +44,7 @@ import org.apache.commons.logging.LogFactory;
  */
 public class RowDescriptorBuilder {
 
-    private static final Log logger = LogFactory.getLog(RowDescriptorBuilder.class);
+    private static final Logger logger = LoggerFactory.getLogger(RowDescriptorBuilder.class);
 
     private static final Transformer UPPERCASE_TRANSFORMER = new Transformer() {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0aa789b0/cayenne-server/src/main/java/org/apache/cayenne/access/types/SerializableTypeFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/types/SerializableTypeFactory.java b/cayenne-server/src/main/java/org/apache/cayenne/access/types/SerializableTypeFactory.java
index 5fe7d0d..312a5bf 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/types/SerializableTypeFactory.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/types/SerializableTypeFactory.java
@@ -25,8 +25,8 @@ import java.io.ObjectOutputStream;
 import java.io.Serializable;
 
 import org.apache.cayenne.CayenneRuntimeException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * ExtendedTypeFactory for handling serializable objects. Returned ExtendedType
@@ -36,7 +36,7 @@ import org.apache.commons.logging.LogFactory;
  */
 class SerializableTypeFactory implements ExtendedTypeFactory {
 
-	private static final Log logger = LogFactory.getLog(SerializableTypeFactory.class);
+	private static final Logger logger = LoggerFactory.getLogger(SerializableTypeFactory.class);
 
 	private ExtendedTypeMap map;
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0aa789b0/cayenne-server/src/main/java/org/apache/cayenne/cache/EhCacheQueryCache.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/cache/EhCacheQueryCache.java b/cayenne-server/src/main/java/org/apache/cayenne/cache/EhCacheQueryCache.java
index a3137a8..f6ca82f 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/cache/EhCacheQueryCache.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/cache/EhCacheQueryCache.java
@@ -23,12 +23,12 @@ import java.util.List;
 import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.di.BeforeScopeEnd;
 import org.apache.cayenne.query.QueryMetadata;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
 
 import net.sf.ehcache.CacheManager;
 import net.sf.ehcache.Ehcache;
 import net.sf.ehcache.Element;
+import org.slf4j.LoggerFactory;
 
 /**
  * @deprecated since 4.0 please use JCacheQueryCache (provided by "cayenne-jcache" module)
@@ -41,7 +41,7 @@ public class EhCacheQueryCache implements QueryCache {
      */
     private static final String DEFAULT_CACHE_NAME = "cayenne.default.cachegroup";
 
-    private static final Log logger = LogFactory.getLog(EhCacheQueryCache.class);
+    private static final Logger logger = LoggerFactory.getLogger(EhCacheQueryCache.class);
 
     protected CacheManager cacheManager;
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0aa789b0/cayenne-server/src/main/java/org/apache/cayenne/configuration/DefaultDataChannelDescriptorMerger.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/DefaultDataChannelDescriptorMerger.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/DefaultDataChannelDescriptorMerger.java
index c5a23e0..9e44d19 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/DefaultDataChannelDescriptorMerger.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/DefaultDataChannelDescriptorMerger.java
@@ -19,8 +19,8 @@
 package org.apache.cayenne.configuration;
 
 import org.apache.cayenne.map.DataMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A default implementation of {@link DataChannelDescriptorMerger}. The general rule of
@@ -47,8 +47,8 @@ import org.apache.commons.logging.LogFactory;
  */
 public class DefaultDataChannelDescriptorMerger implements DataChannelDescriptorMerger {
 
-    private static Log logger = LogFactory
-            .getLog(DefaultDataChannelDescriptorMerger.class);
+    private static Logger logger = LoggerFactory
+            .getLogger(DefaultDataChannelDescriptorMerger.class);
 
     public DataChannelDescriptor merge(DataChannelDescriptor... descriptors) {
         if (descriptors == null || descriptors.length == 0) {

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0aa789b0/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java
index f282939..1db8e9c 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java
@@ -42,8 +42,8 @@ import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.map.EntitySorter;
 import org.apache.cayenne.resource.Resource;
 import org.apache.cayenne.resource.ResourceLocator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.Collection;
 import java.util.List;
@@ -57,7 +57,7 @@ import java.util.List;
  */
 public class DataDomainProvider implements Provider<DataDomain> {
 
-	private static Log logger = LogFactory.getLog(DataDomainProvider.class);
+	private static Logger logger = LoggerFactory.getLogger(DataDomainProvider.class);
 
 	@Inject
 	protected ResourceLocator resourceLocator;

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0aa789b0/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DelegatingDataSourceFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DelegatingDataSourceFactory.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DelegatingDataSourceFactory.java
index cf03c4a..522918b 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DelegatingDataSourceFactory.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DelegatingDataSourceFactory.java
@@ -26,8 +26,8 @@ import org.apache.cayenne.di.AdhocObjectFactory;
 import org.apache.cayenne.di.BeforeScopeEnd;
 import org.apache.cayenne.di.Inject;
 import org.apache.cayenne.di.ScopeEventListener;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.sql.DataSource;
 import java.util.Map;
@@ -48,8 +48,8 @@ import java.util.concurrent.ConcurrentHashMap;
  */
 public class DelegatingDataSourceFactory implements DataSourceFactory {
 
-    private static final Log logger = LogFactory
-            .getLog(DelegatingDataSourceFactory.class);
+    private static final Logger logger = LoggerFactory
+            .getLogger(DelegatingDataSourceFactory.class);
 
     @Inject
     protected AdhocObjectFactory objectFactory;

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0aa789b0/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/JNDIDataSourceFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/JNDIDataSourceFactory.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/JNDIDataSourceFactory.java
index 786cc99..f9ae47f 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/JNDIDataSourceFactory.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/JNDIDataSourceFactory.java
@@ -25,8 +25,8 @@ import javax.sql.DataSource;
 
 import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.configuration.DataNodeDescriptor;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Locates DataSource mapped via JNDI.
@@ -35,7 +35,7 @@ import org.apache.commons.logging.LogFactory;
  */
 public class JNDIDataSourceFactory implements DataSourceFactory {
 
-	private static final Log LOGGER = LogFactory.getLog(JNDIDataSourceFactory.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(JNDIDataSourceFactory.class);
 
 	@Override
 	public DataSource getDataSource(DataNodeDescriptor nodeDescriptor) throws Exception {

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0aa789b0/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/XMLPoolingDataSourceFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/XMLPoolingDataSourceFactory.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/XMLPoolingDataSourceFactory.java
index 19a3167..e99d78d 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/XMLPoolingDataSourceFactory.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/XMLPoolingDataSourceFactory.java
@@ -31,8 +31,8 @@ import org.apache.cayenne.datasource.DataSourceBuilder;
 import org.apache.cayenne.datasource.UnmanagedPoolingDataSource;
 import org.apache.cayenne.di.AdhocObjectFactory;
 import org.apache.cayenne.di.Inject;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A {@link DataSourceFactory} that loads JDBC connection information from an
@@ -45,7 +45,7 @@ import org.apache.commons.logging.LogFactory;
 // something else?
 public class XMLPoolingDataSourceFactory implements DataSourceFactory {
 
-	private static final Log logger = LogFactory.getLog(XMLPoolingDataSourceFactory.class);
+	private static final Logger logger = LoggerFactory.getLogger(XMLPoolingDataSourceFactory.class);
 
 	@Inject
 	private RuntimeProperties properties;

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0aa789b0/cayenne-server/src/main/java/org/apache/cayenne/datasource/DriverDataSource.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/datasource/DriverDataSource.java b/cayenne-server/src/main/java/org/apache/cayenne/datasource/DriverDataSource.java
index f692a26..70c223f 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/datasource/DriverDataSource.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/datasource/DriverDataSource.java
@@ -26,21 +26,20 @@ import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.sql.SQLFeatureNotSupportedException;
 import java.util.Properties;
-import java.util.logging.Logger;
 
 import javax.sql.DataSource;
 
 import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.util.Util;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A non-pooling DataSource implementation wrapping a JDBC driver.
  */
 public class DriverDataSource implements DataSource {
 
-	private static final Log LOGGER = LogFactory.getLog(DriverDataSource.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(DriverDataSource.class);
 
 	protected Driver driver;
 	protected String connectionUrl;
@@ -278,7 +277,7 @@ public class DriverDataSource implements DataSource {
 	 * @since 3.1
 	 */
 	@Override
-	public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+	public java.util.logging.Logger getParentLogger() throws SQLFeatureNotSupportedException {
 		throw new UnsupportedOperationException();
 	}
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0aa789b0/cayenne-server/src/main/java/org/apache/cayenne/datasource/UnmanagedPoolingDataSource.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/datasource/UnmanagedPoolingDataSource.java b/cayenne-server/src/main/java/org/apache/cayenne/datasource/UnmanagedPoolingDataSource.java
index 2d0e6e2..da40900 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/datasource/UnmanagedPoolingDataSource.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/datasource/UnmanagedPoolingDataSource.java
@@ -29,13 +29,12 @@ import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
-import java.util.logging.Logger;
 
 import javax.sql.DataSource;
 
 import org.apache.cayenne.CayenneRuntimeException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A non-blocking {@link DataSource} with a pool of connections.
@@ -89,7 +88,7 @@ public class UnmanagedPoolingDataSource implements PoolingDataSource {
 	 */
 	public static final int MAX_QUEUE_WAIT_DEFAULT = 20000;
 
-	private static Log LOGGER = LogFactory.getLog(UnmanagedPoolingDataSource.class);
+	private static Logger LOGGER = LoggerFactory.getLogger(UnmanagedPoolingDataSource.class);
 
 	private DataSource nonPoolingDataSource;
 	private long maxQueueWaitTime;
@@ -390,7 +389,7 @@ public class UnmanagedPoolingDataSource implements PoolingDataSource {
 	}
 
 	@Override
-	public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+	public java.util.logging.Logger getParentLogger() throws SQLFeatureNotSupportedException {
 		return nonPoolingDataSource.getParentLogger();
 	}
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0aa789b0/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLPkGenerator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLPkGenerator.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLPkGenerator.java
index ab186a4..83be87c 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLPkGenerator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLPkGenerator.java
@@ -31,14 +31,14 @@ import org.apache.cayenne.dba.JdbcPkGenerator;
 import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.tx.BaseTransaction;
 import org.apache.cayenne.tx.Transaction;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  */
 public class MySQLPkGenerator extends JdbcPkGenerator {
 
-	private static final Log logger = LogFactory.getLog(MySQLPkGenerator.class);
+	private static final Logger logger = LoggerFactory.getLogger(MySQLPkGenerator.class);
 
 	MySQLPkGenerator(JdbcAdapter adapter) {
 		super(adapter);

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0aa789b0/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTEqual.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTEqual.java b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTEqual.java
index f63a1ba..694d071 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTEqual.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTEqual.java
@@ -23,8 +23,8 @@ import java.util.Collection;
 
 import org.apache.cayenne.exp.Expression;
 import org.apache.cayenne.exp.ValueInjector;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * "Equal To" expression.
@@ -35,7 +35,7 @@ public class ASTEqual extends ConditionNode implements ValueInjector {
 
 	private static final long serialVersionUID = 1211234198602067833L;
 	
-	private static final Log LOGGER = LogFactory.getLog(ASTEqual.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(ASTEqual.class);
 
 	/**
 	 * Constructor used by expression parser. Do not invoke directly.

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0aa789b0/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTObjPath.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTObjPath.java b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTObjPath.java
index fa75195..6c1604e 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTObjPath.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/exp/parser/ASTObjPath.java
@@ -28,14 +28,14 @@ import org.apache.cayenne.exp.Expression;
 import org.apache.cayenne.map.Entity;
 import org.apache.cayenne.map.ObjEntity;
 import org.apache.cayenne.reflect.PropertyUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ASTObjPath extends ASTPath {
 
 	private static final long serialVersionUID = -3574281576491705706L;
 
-	private static final Log LOGGER = LogFactory.getLog(ASTObjPath.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(ASTObjPath.class);
 
 	public static final String OBJ_PREFIX = "obj:";
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0aa789b0/cayenne-server/src/main/java/org/apache/cayenne/log/CommonsJdbcEventLogger.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/log/CommonsJdbcEventLogger.java b/cayenne-server/src/main/java/org/apache/cayenne/log/CommonsJdbcEventLogger.java
index 8e1cf53..7c52bd5 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/log/CommonsJdbcEventLogger.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/log/CommonsJdbcEventLogger.java
@@ -29,8 +29,8 @@ import org.apache.cayenne.di.Inject;
 import org.apache.cayenne.map.DbAttribute;
 import org.apache.cayenne.util.IDUtil;
 import org.apache.cayenne.util.Util;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.lang.reflect.Array;
 import java.sql.SQLException;
@@ -44,7 +44,7 @@ import java.util.List;
  */
 public class CommonsJdbcEventLogger implements JdbcEventLogger {
 
-	private static final Log logger = LogFactory.getLog(CommonsJdbcEventLogger.class);
+	private static final Logger logger = LoggerFactory.getLogger(CommonsJdbcEventLogger.class);
 
     /**
      * @deprecated  since 4.0

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0aa789b0/cayenne-server/src/main/java/org/apache/cayenne/map/MappingCache.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/MappingCache.java b/cayenne-server/src/main/java/org/apache/cayenne/map/MappingCache.java
index 0d08d08..c8b2b2c 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/MappingCache.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/MappingCache.java
@@ -27,8 +27,8 @@ import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.ObjectId;
 import org.apache.cayenne.Persistent;
 import org.apache.commons.collections.collection.CompositeCollection;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @since 4.0
@@ -37,7 +37,7 @@ class MappingCache implements MappingNamespace {
 
     private static final ObjEntity OBJ_DUPLICATE_MARKER = new ObjEntity();
 
-    protected static final Log logger = LogFactory.getLog(MappingCache.class);
+    protected static final Logger logger = LoggerFactory.getLogger(MappingCache.class);
 
     protected Collection<DataMap> maps;
     protected Map<String, QueryDescriptor> queryDesriptors;

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0aa789b0/cayenne-server/src/main/java/org/apache/cayenne/query/CacheableQuery.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/CacheableQuery.java b/cayenne-server/src/main/java/org/apache/cayenne/query/CacheableQuery.java
index b10e1bc..0780381 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/CacheableQuery.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/CacheableQuery.java
@@ -19,8 +19,8 @@
 
 package org.apache.cayenne.query;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Shared functionality for cacheable queries.
@@ -29,7 +29,7 @@ import org.apache.commons.logging.LogFactory;
  */
 public abstract class CacheableQuery implements Query {
 
-    protected static final Log logger = LogFactory.getLog(SelectQuery.class);
+    protected static final Logger logger = LoggerFactory.getLogger(SelectQuery.class);
 
     abstract protected BaseQueryMetadata getBaseMetaData();
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0aa789b0/cayenne-server/src/main/java/org/apache/cayenne/remote/service/BaseRemoteService.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/remote/service/BaseRemoteService.java b/cayenne-server/src/main/java/org/apache/cayenne/remote/service/BaseRemoteService.java
index 3716227..68fd89d 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/remote/service/BaseRemoteService.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/remote/service/BaseRemoteService.java
@@ -29,8 +29,8 @@ import org.apache.cayenne.remote.ClientMessage;
 import org.apache.cayenne.remote.RemoteService;
 import org.apache.cayenne.remote.RemoteSession;
 import org.apache.cayenne.util.Util;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.rmi.RemoteException;
 import java.util.Collections;
@@ -47,7 +47,7 @@ public abstract class BaseRemoteService implements RemoteService {
 
 	// keep logger non-static so that it could be garbage collected with this
 	// instance.
-	protected final Log logger;
+	protected final Logger logger;
 
 	protected ObjectContextFactory contextFactory;
 	protected String eventBridgeFactoryName;
@@ -58,7 +58,7 @@ public abstract class BaseRemoteService implements RemoteService {
 	 */
 	public BaseRemoteService(ObjectContextFactory contextFactory, Map<String, String> eventBridgeProperties) {
 
-		logger = LogFactory.getLog(getClass());
+		logger = LoggerFactory.getLogger(getClass());
 
 		// start Cayenne service
 		logger.debug("ROP service is starting");

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0aa789b0/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/BaseSchemaUpdateStrategy_ConcurrencyTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/BaseSchemaUpdateStrategy_ConcurrencyTest.java b/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/BaseSchemaUpdateStrategy_ConcurrencyTest.java
index d1f22ce..d7f30e6 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/BaseSchemaUpdateStrategy_ConcurrencyTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/dbsync/BaseSchemaUpdateStrategy_ConcurrencyTest.java
@@ -19,11 +19,11 @@
 package org.apache.cayenne.access.dbsync;
 
 import org.apache.cayenne.access.DataNode;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.slf4j.LoggerFactory;
 
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -43,7 +43,7 @@ import static org.mockito.Mockito.mock;
 
 public class BaseSchemaUpdateStrategy_ConcurrencyTest {
 
-    private static final Log LOGGER = LogFactory.getLog(BaseSchemaUpdateStrategy_ConcurrencyTest.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(BaseSchemaUpdateStrategy_ConcurrencyTest.class);
 
     private ExecutorService threadPool;
     private DataNode dataNode;

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0aa789b0/cayenne-server/src/test/java/org/apache/cayenne/datasource/ManagedPoolingDataSourceIT.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/datasource/ManagedPoolingDataSourceIT.java b/cayenne-server/src/test/java/org/apache/cayenne/datasource/ManagedPoolingDataSourceIT.java
index 6231af4..7795413 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/datasource/ManagedPoolingDataSourceIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/datasource/ManagedPoolingDataSourceIT.java
@@ -38,19 +38,19 @@ import javax.sql.DataSource;
 
 import org.apache.cayenne.unit.di.server.CayenneProjects;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 import org.mockito.stubbing.OngoingStubbing;
+import org.slf4j.LoggerFactory;
 
 @UseServerRuntime(CayenneProjects.TESTMAP_PROJECT)
 public class ManagedPoolingDataSourceIT {
 
-	private static final Log LOGGER = LogFactory.getLog(ManagedPoolingDataSourceIT.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(ManagedPoolingDataSourceIT.class);
 
 	private int poolSize;
 	private OnOffDataSourceManager dataSourceManager;

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0aa789b0/cayenne-server/src/test/java/org/apache/cayenne/unit/JNDISetup.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/JNDISetup.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/JNDISetup.java
index cd67479..a21abc9 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/JNDISetup.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/JNDISetup.java
@@ -21,8 +21,8 @@ package org.apache.cayenne.unit;
 import javax.naming.NamingException;
 import javax.naming.spi.NamingManager;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.mock.jndi.SimpleNamingContextBuilder;
 
 /**
@@ -30,7 +30,7 @@ import org.springframework.mock.jndi.SimpleNamingContextBuilder;
  */
 public class JNDISetup {
 
-    private static Log logger = LogFactory.getLog(JNDISetup.class);
+    private static Logger logger = LoggerFactory.getLogger(JNDISetup.class);
 
     private static volatile boolean setup;
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0aa789b0/cayenne-server/src/test/java/org/apache/cayenne/unit/UnitDbAdapter.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/UnitDbAdapter.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/UnitDbAdapter.java
index a4f22f7..0a83243 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/UnitDbAdapter.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/UnitDbAdapter.java
@@ -29,8 +29,8 @@ import org.apache.cayenne.exp.parser.ASTExtract;
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.map.Procedure;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -54,7 +54,7 @@ import java.util.Map;
  */
 public class UnitDbAdapter {
 
-    private static final Log logger = LogFactory.getLog(UnitDbAdapter.class);
+    private static final Logger logger = LoggerFactory.getLogger(UnitDbAdapter.class);
 
     @Inject
     protected RuntimeProperties runtimeProperties;

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0aa789b0/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/SchemaBuilder.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/SchemaBuilder.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/SchemaBuilder.java
index 00121a5..69c4400 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/SchemaBuilder.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/SchemaBuilder.java
@@ -39,8 +39,8 @@ import org.apache.cayenne.map.MapLoader;
 import org.apache.cayenne.map.Procedure;
 import org.apache.cayenne.testdo.extended_type.StringET1ExtendedType;
 import org.apache.cayenne.unit.UnitDbAdapter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xml.sax.InputSource;
 
 import java.io.InputStream;
@@ -62,7 +62,7 @@ import java.util.ListIterator;
  */
 public class SchemaBuilder {
 
-	private static Log logger = LogFactory.getLog(SchemaBuilder.class);
+	private static Logger logger = LoggerFactory.getLogger(SchemaBuilder.class);
 
 	public static final String SKIP_SCHEMA_KEY = "cayenneTestSkipSchemaCreation";
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0aa789b0/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDataSourceInfoProvider.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDataSourceInfoProvider.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDataSourceInfoProvider.java
index 5864b77..d861a1b 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDataSourceInfoProvider.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDataSourceInfoProvider.java
@@ -26,8 +26,8 @@ import org.apache.cayenne.dba.hsqldb.HSQLDBAdapter;
 import org.apache.cayenne.dba.sqlite.SQLiteAdapter;
 import org.apache.cayenne.di.Provider;
 import org.apache.commons.collections.ExtendedProperties;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
@@ -36,7 +36,7 @@ import java.util.Map;
 
 public class ServerCaseDataSourceInfoProvider implements Provider<DataSourceInfo> {
 
-    private static Log logger = LogFactory.getLog(ServerCaseDataSourceInfoProvider.class);
+    private static Logger logger = LoggerFactory.getLogger(ServerCaseDataSourceInfoProvider.class);
 
     private static final String PROPERTIES_FILE = "connection.properties";
     private static final String CONNECTION_NAME_KEY = "cayenneTestConnection";

http://git-wip-us.apache.org/repos/asf/cayenne/blob/0aa789b0/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOModelProcessor.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOModelProcessor.java b/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOModelProcessor.java
index 64eabd9..d320559 100644
--- a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOModelProcessor.java
+++ b/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOModelProcessor.java
@@ -39,8 +39,8 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.Predicate;
 import org.apache.commons.collections.PredicateUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.InputStream;
@@ -60,7 +60,7 @@ import java.util.StringTokenizer;
  */
 public class EOModelProcessor {
 
-	private static final Log logger = LogFactory.getLog(EOModelProcessor.class);
+	private static final Logger logger = LoggerFactory.getLogger(EOModelProcessor.class);
 
 	protected Predicate prototypeChecker;
 


Mime
View raw message