cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntimof...@apache.org
Subject [01/19] cayenne git commit: replace logging in modeler
Date Wed, 26 Apr 2017 10:09:15 GMT
Repository: cayenne
Updated Branches:
  refs/heads/master 72889dbbc -> a8960c559


replace logging in modeler


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

Branch: refs/heads/master
Commit: fec6ede4025c6264c7c06c896a6ecfb8f43f4ec0
Parents: c9c7cbe
Author: Maxim Petrusevich <maks1464@gmail.com>
Authored: Wed Apr 12 08:46:17 2017 +0300
Committer: Maxim Petrusevich <maks1464@gmail.com>
Committed: Wed Apr 12 08:46:17 2017 +0300

----------------------------------------------------------------------
 cayenne-server/pom.xml                          |  21 +-
 .../XMLDataChannelDescriptorLoader.java         |  16 +-
 .../cayenne/configuration/XMLDataMapLoader.java |   6 +-
 .../org/apache/cayenne/conn/DataSourceInfo.java |   6 +-
 .../org/apache/cayenne/map/EntityResolver.java  |   6 +-
 .../modeler/win/WinPlatformInitializer.java     |   6 +-
 modeler/cayenne-modeler/pom.xml                 |   9 +-
 .../cayenne/modeler/CayenneModelerFrame.java    |   4 +-
 .../cayenne/modeler/CodeTemplateManager.java    |   6 +-
 .../java/org/apache/cayenne/modeler/Main.java   |   6 +-
 .../cayenne/modeler/ModelerPreferences.java     |   6 +-
 .../modeler/ProjectFileChangeTracker.java       |   6 +-
 .../apache/cayenne/modeler/ProjectTreeView.java |   6 +-
 .../cayenne/modeler/action/DBWizardAction.java  |   6 +-
 .../modeler/action/ImportDataMapAction.java     |   6 +-
 .../modeler/action/ImportEOModelAction.java     |   6 +-
 .../modeler/action/OpenProjectAction.java       |   6 +-
 .../cayenne/modeler/action/ProjectOpener.java   |   7 +-
 .../modeler/dialog/ErrorDebugDialog.java        |   6 +-
 .../InferRelationshipsController.java           |   6 +-
 .../dialog/codegen/CodeGeneratorController.java |   6 +-
 .../modeler/dialog/db/load/DbLoaderContext.java |   6 +-
 .../dialog/pref/ClasspathPreferences.java       |   6 +-
 .../dialog/pref/TemplatePreferences.java        |   6 +-
 .../validator/ValidationDisplayHandler.java     |   6 +-
 .../editor/AbstractCallbackMethodsTab.java      |   6 +-
 .../cayenne/modeler/editor/EditorView.java      |   4 +-
 .../ObjEntityAttributeRelationshipTab.java      |   4 +-
 .../editor/ObjEntityRelationshipPanel.java      |   6 +-
 .../modeler/editor/SelectPropertiesPanel.java   |   6 +-
 .../DbEntityAttributeRelationshipTab.java       |   4 +-
 .../modeler/graph/action/SaveAsImageAction.java |   6 +-
 .../cayenne/modeler/util/CayenneController.java |   6 +-
 .../cayenne/modeler/util/CayenneTableModel.java |   6 +-
 .../cayenne/modeler/util/LongRunningTask.java   |   6 +-
 .../cayenne/modeler/util/ModelerLogFactory.java |  13 +-
 .../cayenne/modeler/util/ModelerLogger.java     | 384 ++++++++++++++++---
 .../cayenne/pref/CayennePreferenceEditor.java   |   6 +-
 .../components/textpane/JCayenneTextPane.java   |   6 +-
 .../main/resources/commons-logging.properties   |   1 -
 pom.xml                                         |   8 +-
 41 files changed, 467 insertions(+), 182 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/fec6ede4/cayenne-server/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/pom.xml b/cayenne-server/pom.xml
index 0622a58..ddc4cfa 100644
--- a/cayenne-server/pom.xml
+++ b/cayenne-server/pom.xml
@@ -32,6 +32,17 @@
 	<dependencies>
 
 		<!-- Compile dependencies -->
+
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-simple</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>org.apache.cayenne</groupId>
 			<artifactId>cayenne-di</artifactId>
@@ -118,16 +129,6 @@
     		<scope>test</scope>
 		</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>
-		<dependency>
 			<groupId>xmlunit</groupId>
 			<artifactId>xmlunit</artifactId>
 			<version>1.5</version>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fec6ede4/cayenne-server/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoader.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoader.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoader.java
index 34775ef..00bbee2 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoader.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoader.java
@@ -25,8 +25,8 @@ import org.apache.cayenne.di.Inject;
 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.LoggerFactory;
+import org.slf4j.Logger;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.InputSource;
@@ -44,7 +44,7 @@ import java.net.URL;
  */
 public class XMLDataChannelDescriptorLoader implements DataChannelDescriptorLoader {
 
-	private static Log logger = LogFactory.getLog(XMLDataChannelDescriptorLoader.class);
+	private static Logger logger = LoggerFactory.getLogger(XMLDataChannelDescriptorLoader.class);
 
 	static final String DOMAIN_TAG = "domain";
 	static final String MAP_TAG = "map";
@@ -69,7 +69,7 @@ public class XMLDataChannelDescriptorLoader implements DataChannelDescriptorLoad
 		} 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());
 		}
 
 		return password;
@@ -88,7 +88,7 @@ public class XMLDataChannelDescriptorLoader implements DataChannelDescriptorLoad
 
 			password = bufferedReader.readLine();
 		} catch (IOException exception) {
-			logger.warn(exception);
+			logger.warn(exception.getMessage());
 		} finally {
 
 			try {
@@ -339,7 +339,7 @@ public class XMLDataChannelDescriptorLoader implements DataChannelDescriptorLoad
 						try {
 							password = passwordFromURL(new URL(passwordSource));
 						} catch (MalformedURLException exception) {
-							logger.warn(exception);
+							logger.warn(exception.getMessage());
 						}
 					} else if (passwordLocation.equals(DataSourceInfo.PASSWORD_LOCATION_EXECUTABLE)) {
 						if (passwordSource != null) {
@@ -348,9 +348,9 @@ public class XMLDataChannelDescriptorLoader implements DataChannelDescriptorLoad
 								password = passwordFromInputStream(process.getInputStream());
 								process.waitFor();
 							} catch (IOException exception) {
-								logger.warn(exception);
+								logger.warn(exception.getMessage());
 							} catch (InterruptedException exception) {
-								logger.warn(exception);
+								logger.warn(exception.getMessage());
 							}
 						}
 					}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fec6ede4/cayenne-server/src/main/java/org/apache/cayenne/configuration/XMLDataMapLoader.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/XMLDataMapLoader.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/XMLDataMapLoader.java
index 61e871a..d5cce91 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/XMLDataMapLoader.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/XMLDataMapLoader.java
@@ -22,8 +22,8 @@ import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.map.MapLoader;
 import org.apache.cayenne.resource.Resource;
-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;
@@ -34,7 +34,7 @@ import java.net.URL;
  */
 public class XMLDataMapLoader implements DataMapLoader {
 
-    private static Log logger = LogFactory.getLog(XMLDataMapLoader.class);
+    private static Logger logger = LoggerFactory.getLogger(XMLDataMapLoader.class);
 
     public DataMap load(Resource configurationResource) throws CayenneRuntimeException {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fec6ede4/cayenne-server/src/main/java/org/apache/cayenne/conn/DataSourceInfo.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/conn/DataSourceInfo.java b/cayenne-server/src/main/java/org/apache/cayenne/conn/DataSourceInfo.java
index f07a352..f51c8f0 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/conn/DataSourceInfo.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/conn/DataSourceInfo.java
@@ -27,8 +27,8 @@ import org.apache.cayenne.di.DIRuntimeException;
 import org.apache.cayenne.util.Util;
 import org.apache.cayenne.util.XMLEncoder;
 import org.apache.cayenne.util.XMLSerializable;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Helper JavaBean class that holds DataSource login information.
@@ -37,7 +37,7 @@ public class DataSourceInfo implements Cloneable, Serializable, XMLSerializable
 
 	private static final long serialVersionUID = 3748394113864532902L;
 
-	private static Log logger = LogFactory.getLog(DataSourceInfo.class);
+	private static Logger logger = LoggerFactory.getLogger(DataSourceInfo.class);
 
 	public static final String PASSWORD_LOCATION_CLASSPATH = "classpath";
 	public static final String PASSWORD_LOCATION_EXECUTABLE = "executable";

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fec6ede4/cayenne-server/src/main/java/org/apache/cayenne/map/EntityResolver.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/EntityResolver.java b/cayenne-server/src/main/java/org/apache/cayenne/map/EntityResolver.java
index 2458361..849ad31 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/EntityResolver.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/EntityResolver.java
@@ -30,8 +30,8 @@ import org.apache.cayenne.reflect.LifecycleCallbackRegistry;
 import org.apache.cayenne.reflect.SingletonFaultFactory;
 import org.apache.cayenne.reflect.generic.DataObjectDescriptorFactory;
 import org.apache.cayenne.reflect.valueholder.ValueHolderDescriptorFactory;
-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;
@@ -53,7 +53,7 @@ import java.util.concurrent.atomic.AtomicLong;
  */
 public class EntityResolver implements MappingNamespace, Serializable {
 
-    protected static final Log logger = LogFactory.getLog(EntityResolver.class);
+    protected static final Logger logger = LoggerFactory.getLogger(EntityResolver.class);
     protected static AtomicLong incrementer = new AtomicLong();
 
     @Deprecated

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fec6ede4/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinPlatformInitializer.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinPlatformInitializer.java b/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinPlatformInitializer.java
index 3f7871d..aebaa9c 100644
--- a/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinPlatformInitializer.java
+++ b/modeler/cayenne-modeler-win-ext/src/main/java/org/apache/cayenne/modeler/win/WinPlatformInitializer.java
@@ -20,15 +20,15 @@ package org.apache.cayenne.modeler.win;
 
 import com.jgoodies.looks.windows.WindowsLookAndFeel;
 import org.apache.cayenne.modeler.init.platform.PlatformInitializer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.swing.JFrame;
 import javax.swing.UIManager;
 
 public class WinPlatformInitializer implements PlatformInitializer {
 
-    private static Log logger = LogFactory.getLog(WinPlatformInitializer.class);
+    private static Logger logger = LoggerFactory.getLogger(WinPlatformInitializer.class);
 
     public void setupMenus(JFrame frame) {
     }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fec6ede4/modeler/cayenne-modeler/pom.xml
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/pom.xml b/modeler/cayenne-modeler/pom.xml
index ffcdd01..9735c15 100644
--- a/modeler/cayenne-modeler/pom.xml
+++ b/modeler/cayenne-modeler/pom.xml
@@ -43,8 +43,13 @@
 		</dependency>
 
 		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-simple</artifactId>
 		</dependency>
 
 		<dependency>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fec6ede4/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerFrame.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerFrame.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerFrame.java
index 8a23ed9..58fb829 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerFrame.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerFrame.java
@@ -104,7 +104,7 @@ import org.apache.cayenne.modeler.event.RecentFileListListener;
 import org.apache.cayenne.modeler.pref.ComponentGeometry;
 import org.apache.cayenne.modeler.util.ModelerUtil;
 import org.apache.cayenne.modeler.util.RecentFileMenu;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.LoggerFactory;
 
 /**
  * Main frame of CayenneModeler. Responsibilities include coordination of
@@ -297,7 +297,7 @@ public class CayenneModelerFrame extends JFrame implements DataNodeDisplayListen
                     .bindIntProperty(splitPane, JSplitPane.DIVIDER_LOCATION_PROPERTY, 400);
         }
         catch (Exception ex) {
-            LogFactory.getLog(getClass()).error("Cannot bind divider property", ex);
+            LoggerFactory.getLogger(getClass()).error("Cannot bind divider property", ex);
         }
 
         JPanel statusBar = new JPanel(new FlowLayout(FlowLayout.LEFT, 3, 1));

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fec6ede4/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CodeTemplateManager.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CodeTemplateManager.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CodeTemplateManager.java
index ce6bd0c..b914b9b 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CodeTemplateManager.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CodeTemplateManager.java
@@ -22,8 +22,8 @@ package org.apache.cayenne.modeler;
 import org.apache.cayenne.gen.ClassGenerationAction;
 import org.apache.cayenne.gen.ClientClassGenerationAction;
 import org.apache.cayenne.modeler.pref.FSPath;
-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.HashMap;
@@ -49,7 +49,7 @@ public class CodeTemplateManager {
 	protected Map<String, String> customTemplates;
 	protected Map<String, String> standardTemplates;
 
-	private static Log logger = LogFactory.getLog(CodeTemplateManager.class);
+	private static Logger logger = LoggerFactory.getLogger(CodeTemplateManager.class);
 
 	public Preferences getTemplatePreferences(Application application) {
 		return application.getPreferencesNode(this.getClass(), NODE_NAME);

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fec6ede4/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java
index ce70c10..e8193a3 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java
@@ -29,8 +29,8 @@ import org.apache.cayenne.modeler.dialog.pref.GeneralPreferences;
 import org.apache.cayenne.modeler.init.CayenneModelerModule;
 import org.apache.cayenne.modeler.init.platform.PlatformInitializer;
 import org.apache.cayenne.project.ProjectModule;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.swing.*;
 import java.io.File;
@@ -44,7 +44,7 @@ import java.util.prefs.Preferences;
  */
 public class Main {
 
-    private static Log logger = LogFactory.getLog(Main.class);
+    private static Logger logger = LoggerFactory.getLogger(Main.class);
 
     protected String[] args;
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fec6ede4/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ModelerPreferences.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ModelerPreferences.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ModelerPreferences.java
index 4d94f11..89336b0 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ModelerPreferences.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ModelerPreferences.java
@@ -22,8 +22,8 @@ package org.apache.cayenne.modeler;
 import org.apache.cayenne.pref.CayennePreference;
 import org.apache.cayenne.pref.Preference;
 import org.apache.cayenne.pref.UpgradeCayennePreference;
-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.util.ArrayList;
@@ -44,7 +44,7 @@ public class ModelerPreferences implements PreferenceChangeListener {
 
     private static Preferences cayennePrefs;
 
-    private static final Log logObj = LogFactory.getLog(ModelerPreferences.class);
+    private static final Logger logObj = LoggerFactory.getLogger(ModelerPreferences.class);
 
     /** Name of the log file. */
     public static final String LOGFILE_NAME = "modeler.log";

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fec6ede4/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectFileChangeTracker.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectFileChangeTracker.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectFileChangeTracker.java
index bbb8e74..66892d6 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectFileChangeTracker.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectFileChangeTracker.java
@@ -32,8 +32,8 @@ import org.apache.cayenne.modeler.action.OpenProjectAction;
 import org.apache.cayenne.modeler.action.SaveAction;
 import org.apache.cayenne.modeler.dialog.FileDeletedDialog;
 import org.apache.cayenne.project.Project;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * ProjectWatchdog class is responsible for tracking changes in cayenne.xml and
@@ -42,7 +42,7 @@ import org.apache.commons.logging.LogFactory;
  */
 public class ProjectFileChangeTracker extends Thread {
 
-    private static final Log log = LogFactory.getLog(ProjectFileChangeTracker.class);
+    private static final Logger log = LoggerFactory.getLogger(ProjectFileChangeTracker.class);
 
     /**
      * The default delay between every file modification check

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fec6ede4/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
index adf90c0..6897b9f 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
@@ -80,8 +80,8 @@ import org.apache.cayenne.project.Project;
 import org.apache.cayenne.map.QueryDescriptor;
 import org.apache.cayenne.reflect.PropertyUtils;
 import org.apache.cayenne.resource.Resource;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.swing.Action;
 import javax.swing.JMenuItem;
@@ -114,7 +114,7 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
         ProcedureDisplayListener, MultipleObjectsDisplayListener,
         EmbeddableDisplayListener, EmbeddableListener {
 
-    private static final Log logObj = LogFactory.getLog(ProjectTreeView.class);
+    private static final Logger logObj = LoggerFactory.getLogger(ProjectTreeView.class);
 
     protected ProjectController mediator;
     protected TreeSelectionListener treeSelectionListener;

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fec6ede4/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DBWizardAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DBWizardAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DBWizardAction.java
index bec3922..cd5de6f 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DBWizardAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DBWizardAction.java
@@ -31,11 +31,11 @@ import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.dialog.db.DataSourceWizard;
 import org.apache.cayenne.modeler.dialog.db.DbActionOptionsDialog;
 import org.apache.cayenne.modeler.util.CayenneAction;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public abstract class DBWizardAction<T extends DbActionOptionsDialog> extends CayenneAction {
-	private static Log LOGGER = LogFactory.getLog(DBWizardAction.class);
+	private static Logger LOGGER = LoggerFactory.getLogger(DBWizardAction.class);
 	
     public DBWizardAction(String name, Application application) {
         super(name, application);

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fec6ede4/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportDataMapAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportDataMapAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportDataMapAction.java
index 68059f6..de8d57d 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportDataMapAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportDataMapAction.java
@@ -30,8 +30,8 @@ import org.apache.cayenne.modeler.pref.FSPath;
 import org.apache.cayenne.modeler.util.CayenneAction;
 import org.apache.cayenne.modeler.util.FileFilters;
 import org.apache.cayenne.resource.Resource;
-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 javax.swing.*;
@@ -49,7 +49,7 @@ import java.net.URL;
  */
 public class ImportDataMapAction extends CayenneAction {
 
-    private static Log logObj = LogFactory.getLog(ImportDataMapAction.class);
+    private static Logger logObj = LoggerFactory.getLogger(ImportDataMapAction.class);
 
     private ConfigurationNameMapper nameMapper;
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fec6ede4/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java
index 75290c6..849b777 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java
@@ -45,8 +45,8 @@ import org.apache.cayenne.modeler.util.CayenneAction;
 import org.apache.cayenne.modeler.util.FileFilters;
 import org.apache.cayenne.wocompat.EOModelProcessor;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.swing.*;
 import javax.swing.filechooser.FileFilter;
@@ -65,7 +65,7 @@ import java.util.Map;
  */
 public class ImportEOModelAction extends CayenneAction {
 
-    private static Log logObj = LogFactory.getLog(ImportEOModelAction.class);
+    private static Logger logObj = LoggerFactory.getLogger(ImportEOModelAction.class);
 
     public static String getActionName() {
         return "Import EOModel";

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fec6ede4/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/OpenProjectAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/OpenProjectAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/OpenProjectAction.java
index 3ce93bc..9d71da0 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/OpenProjectAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/OpenProjectAction.java
@@ -40,12 +40,12 @@ import org.apache.cayenne.project.upgrade.UpgradeType;
 import org.apache.cayenne.resource.Resource;
 import org.apache.cayenne.resource.URLResource;
 import org.apache.cayenne.swing.control.FileMenuItem;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class OpenProjectAction extends ProjectAction {
 
-    private static Log logObj = LogFactory.getLog(OpenProjectAction.class);
+    private static Logger logObj = LoggerFactory.getLogger(OpenProjectAction.class);
 
     private ProjectOpener fileChooser;
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fec6ede4/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ProjectOpener.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ProjectOpener.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ProjectOpener.java
index 6b5f459..f958e72 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ProjectOpener.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ProjectOpener.java
@@ -31,8 +31,9 @@ import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.dialog.OverwriteDialog;
 import org.apache.cayenne.modeler.util.FileFilters;
 import org.apache.cayenne.project.Project;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 
 /**
  * File chooser panel used to select a directory to store project files.
@@ -40,7 +41,7 @@ import org.apache.commons.logging.LogFactory;
  */
 class ProjectOpener extends JFileChooser {
 
-    private static Log logObj = LogFactory.getLog(ProjectOpener.class);
+    private static Logger logObj = LoggerFactory.getLogger(ProjectOpener.class);
 
     /**
      * Selects a directory to store the project.

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fec6ede4/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ErrorDebugDialog.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ErrorDebugDialog.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ErrorDebugDialog.java
index 361c847..ef57323 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ErrorDebugDialog.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ErrorDebugDialog.java
@@ -46,15 +46,15 @@ import org.apache.cayenne.modeler.util.ModelerUtil;
 import org.apache.cayenne.modeler.util.PanelFactory;
 import org.apache.cayenne.util.LocalizedStringsHandler;
 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;
 
 /**
  * Displays CayenneModeler exceptions and warning messages.
  * 
  */
 public class ErrorDebugDialog extends CayenneDialog implements ActionListener {
-    private static Log logObj = LogFactory.getLog(ErrorDebugDialog.class);
+    private static Logger logObj = LoggerFactory.getLogger(ErrorDebugDialog.class);
     
     /**
      * Sole instance of error/warning dialog to disallow showing of multiple dialogs

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fec6ede4/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsController.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsController.java
index 71540c4..70c8b23 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsController.java
@@ -39,15 +39,15 @@ import org.apache.cayenne.modeler.undo.InferRelationshipsUndoableEdit;
 import org.apache.cayenne.modeler.util.CayenneController;
 import org.apache.cayenne.modeler.util.NameGeneratorPreferences;
 import org.apache.cayenne.swing.BindingBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class InferRelationshipsController extends InferRelationshipsControllerBase {
 
     public static final int SELECT = 1;
     public static final int CANCEL = 0;
 
-    private static Log logObj = LogFactory.getLog(ErrorDebugDialog.class);
+    private static Logger logObj = LoggerFactory.getLogger(ErrorDebugDialog.class);
 
     protected InferRelationshipsDialog view;
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fec6ede4/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/codegen/CodeGeneratorController.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/codegen/CodeGeneratorController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/codegen/CodeGeneratorController.java
index 751c3ca..ed4b87c 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/codegen/CodeGeneratorController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/codegen/CodeGeneratorController.java
@@ -26,8 +26,8 @@ import org.apache.cayenne.modeler.util.CayenneController;
 import org.apache.cayenne.swing.BindingBuilder;
 import org.apache.commons.collections.Predicate;
 import org.apache.commons.collections.PredicateUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.swing.JOptionPane;
 import java.awt.Component;
@@ -40,7 +40,7 @@ public class CodeGeneratorController extends CodeGeneratorControllerBase {
     /**
      * Logger to print stack traces
      */
-    private static Log logObj = LogFactory.getLog(ErrorDebugDialog.class);
+    private static Logger logObj = LoggerFactory.getLogger(ErrorDebugDialog.class);
 
     protected CodeGeneratorDialog view;
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fec6ede4/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbLoaderContext.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbLoaderContext.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbLoaderContext.java
index 4a62244..88c2042 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbLoaderContext.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbLoaderContext.java
@@ -41,15 +41,15 @@ import org.apache.cayenne.modeler.ProjectController;
 import org.apache.cayenne.modeler.dialog.db.DataSourceWizard;
 import org.apache.cayenne.modeler.pref.DBConnectionInfo;
 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;
 
 /**
  * @since 4.0
  */
 public class DbLoaderContext {
 
-    private static Log LOGGER = LogFactory.getLog(DbLoaderContext.class);
+    private static Logger LOGGER = LoggerFactory.getLogger(DbLoaderContext.class);
 
     private DbImportConfiguration config;
     private Connection connection;

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fec6ede4/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/ClasspathPreferences.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/ClasspathPreferences.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/ClasspathPreferences.java
index 685f868..96f31bd 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/ClasspathPreferences.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/ClasspathPreferences.java
@@ -38,12 +38,12 @@ import org.apache.cayenne.modeler.util.CayenneController;
 import org.apache.cayenne.modeler.util.FileFilters;
 import org.apache.cayenne.pref.CayennePreferenceEditor;
 import org.apache.cayenne.pref.PreferenceEditor;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ClasspathPreferences extends CayenneController {
 
-    private static final Log logger = LogFactory.getLog(ClasspathPreferences.class);
+    private static final Logger logger = LoggerFactory.getLogger(ClasspathPreferences.class);
 
     protected ClasspathPreferencesView view;
     protected List<String> classPathEntries;

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fec6ede4/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/TemplatePreferences.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/TemplatePreferences.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/TemplatePreferences.java
index 2bdc44d..4bf7032 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/TemplatePreferences.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/TemplatePreferences.java
@@ -35,8 +35,8 @@ import org.apache.cayenne.pref.PreferenceEditor;
 import org.apache.cayenne.swing.BindingBuilder;
 import org.apache.cayenne.swing.ObjectBinding;
 import org.apache.cayenne.swing.TableBindingBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class TemplatePreferences extends CayenneController {
 
@@ -45,7 +45,7 @@ public class TemplatePreferences extends CayenneController {
     protected List<FSPath> templateEntries;
     protected ObjectBinding tableBinding;
 
-    private static Log logger = LogFactory.getLog(TemplatePreferences.class);
+    private static Logger logger = LoggerFactory.getLogger(TemplatePreferences.class);
 
     public TemplatePreferences(PreferenceDialog parent) {
         super(parent);

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fec6ede4/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ValidationDisplayHandler.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ValidationDisplayHandler.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ValidationDisplayHandler.java
index 17df282..8849944 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ValidationDisplayHandler.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ValidationDisplayHandler.java
@@ -34,8 +34,8 @@ import org.apache.cayenne.modeler.ProjectController;
 import org.apache.cayenne.modeler.pref.DataNodeDefaults;
 import org.apache.cayenne.map.QueryDescriptor;
 import org.apache.cayenne.validation.ValidationFailure;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Superclass of CayenneModeler validation messages.
@@ -43,7 +43,7 @@ import org.apache.commons.logging.LogFactory;
  */
 public abstract class ValidationDisplayHandler {
 
-    private static Log logObj = LogFactory.getLog(ValidationDisplayHandler.class);
+    private static Logger logObj = LoggerFactory.getLogger(ValidationDisplayHandler.class);
 
     public static final int NO_ERROR = 0;
     public static final int WARNING = 1;

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fec6ede4/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/AbstractCallbackMethodsTab.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/AbstractCallbackMethodsTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/AbstractCallbackMethodsTab.java
index 345fbdf..1af8a03 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/AbstractCallbackMethodsTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/AbstractCallbackMethodsTab.java
@@ -39,8 +39,8 @@ import org.apache.cayenne.modeler.pref.TableColumnPreferences;
 import org.apache.cayenne.modeler.util.CayenneAction;
 import org.apache.cayenne.modeler.util.CayenneTable;
 import org.apache.cayenne.modeler.util.ModelerUtil;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
@@ -78,7 +78,7 @@ import java.util.List;
  */
 public abstract class AbstractCallbackMethodsTab extends JPanel {
 
-    private static Log logger = LogFactory.getLog(AbstractCallbackMethodsTab.class);
+    private static Logger logger = LoggerFactory.getLogger(AbstractCallbackMethodsTab.class);
 
     /**
      * mediator instance

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fec6ede4/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EditorView.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EditorView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EditorView.java
index 4b9a82a..f80d2b7 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EditorView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/EditorView.java
@@ -47,7 +47,7 @@ import org.apache.cayenne.modeler.event.ProcedureDisplayListener;
 import org.apache.cayenne.modeler.event.QueryDisplayEvent;
 import org.apache.cayenne.modeler.event.QueryDisplayListener;
 import org.apache.cayenne.modeler.pref.ComponentGeometry;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.LoggerFactory;
 
 import javax.swing.Action;
 import javax.swing.BorderFactory;
@@ -289,7 +289,7 @@ public class EditorView extends JPanel implements ObjEntityDisplayListener,
                     .bindIntProperty(splitPane, JSplitPane.DIVIDER_LOCATION_PROPERTY, 150);
         }
         catch (Exception ex) {
-            LogFactory.getLog(getClass()).error("Cannot bind divider property", ex);
+            LoggerFactory.getLogger(getClass()).error("Cannot bind divider property", ex);
         }
     }
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fec6ede4/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityAttributeRelationshipTab.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityAttributeRelationshipTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityAttributeRelationshipTab.java
index 9406cf8..e44af8d 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityAttributeRelationshipTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityAttributeRelationshipTab.java
@@ -35,7 +35,7 @@ import org.apache.cayenne.modeler.event.EntityDisplayEvent;
 import org.apache.cayenne.modeler.event.ObjEntityDisplayListener;
 import org.apache.cayenne.modeler.pref.ComponentGeometry;
 import org.apache.cayenne.modeler.util.ModelerUtil;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.LoggerFactory;
 
 import javax.swing.Icon;
 import javax.swing.JButton;
@@ -89,7 +89,7 @@ public class ObjEntityAttributeRelationshipTab extends JPanel implements ObjEnti
                     .bindIntProperty(splitPane, JSplitPane.DIVIDER_LOCATION_PROPERTY, -1);
         }
         catch (Exception ex) {
-            LogFactory.getLog(getClass()).error("Cannot bind divider property", ex);
+            LoggerFactory.getLogger(getClass()).error("Cannot bind divider property", ex);
         }
 
         add(splitPane);

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fec6ede4/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipPanel.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipPanel.java
index d2ee56d..3d15491 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipPanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipPanel.java
@@ -44,8 +44,8 @@ import org.apache.cayenne.modeler.util.DbRelationshipPathComboBoxEditor;
 import org.apache.cayenne.modeler.util.ModelerUtil;
 import org.apache.cayenne.modeler.util.PanelFactory;
 import org.apache.cayenne.modeler.util.UIUtil;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.swing.BorderFactory;
 import javax.swing.DefaultCellEditor;
@@ -78,7 +78,7 @@ import java.util.List;
 public class ObjEntityRelationshipPanel extends JPanel implements ObjEntityDisplayListener,
         ObjEntityListener, ObjRelationshipListener {
 
-    private static Log logObj = LogFactory.getLog(ObjEntityRelationshipPanel.class);
+    private static Logger logObj = LoggerFactory.getLogger(ObjEntityRelationshipPanel.class);
 
     private static final Object[] DELETE_RULES = new Object[]{
             DeleteRule.deleteRuleName(DeleteRule.NO_ACTION),

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fec6ede4/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectPropertiesPanel.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectPropertiesPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectPropertiesPanel.java
index 2c25f3e..97b8c57 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectPropertiesPanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SelectPropertiesPanel.java
@@ -44,8 +44,8 @@ import org.apache.cayenne.query.QueryMetadata;
 import org.apache.cayenne.util.Util;
 import org.apache.cayenne.validation.ValidationException;
 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 panel that supports editing the properties of a GenericSelectQuery.
@@ -53,7 +53,7 @@ import org.apache.commons.logging.LogFactory;
  */
 public abstract class SelectPropertiesPanel extends JPanel {
 
-    private static Log logObj = LogFactory.getLog(SelectPropertiesPanel.class);
+    private static Logger logObj = LoggerFactory.getLogger(SelectPropertiesPanel.class);
 
     private static final Integer ZERO = 0;
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fec6ede4/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityAttributeRelationshipTab.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityAttributeRelationshipTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityAttributeRelationshipTab.java
index 8c35632..8fed5be 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityAttributeRelationshipTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityAttributeRelationshipTab.java
@@ -37,7 +37,7 @@ import org.apache.cayenne.modeler.event.DbEntityDisplayListener;
 import org.apache.cayenne.modeler.event.EntityDisplayEvent;
 import org.apache.cayenne.modeler.pref.ComponentGeometry;
 import org.apache.cayenne.modeler.util.ModelerUtil;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.LoggerFactory;
 
 import javax.swing.Icon;
 import javax.swing.JButton;
@@ -89,7 +89,7 @@ public class DbEntityAttributeRelationshipTab extends JPanel implements DbEntity
                     .bindIntProperty(splitPane, JSplitPane.DIVIDER_LOCATION_PROPERTY, -1);
         }
         catch (Exception ex) {
-            LogFactory.getLog(getClass()).error("Cannot bind divider property", ex);
+            LoggerFactory.getLogger(getClass()).error("Cannot bind divider property", ex);
         }
 
         add(splitPane);

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fec6ede4/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/action/SaveAsImageAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/action/SaveAsImageAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/action/SaveAsImageAction.java
index 18d285a..d9e85dc 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/action/SaveAsImageAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/graph/action/SaveAsImageAction.java
@@ -33,15 +33,15 @@ import org.apache.cayenne.modeler.graph.DataDomainGraphTab;
 import org.apache.cayenne.modeler.pref.FSPath;
 import org.apache.cayenne.modeler.util.CayenneAction;
 import org.apache.cayenne.modeler.util.FileFilters;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
 import org.jgraph.JGraph;
+import org.slf4j.LoggerFactory;
 
 /**
  * Action for saving graph as image
  */
 public class SaveAsImageAction extends CayenneAction {
-	private static final Log logObj = LogFactory.getLog(SaveAsImageAction.class);
+	private static final Logger logObj = LoggerFactory.getLogger(SaveAsImageAction.class);
 
 	private final DataDomainGraphTab dataDomainGraphTab;
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fec6ede4/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneController.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneController.java
index a861c1d..300e2a4 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneController.java
@@ -40,15 +40,15 @@ import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.pref.FSPath;
 import org.apache.cayenne.swing.BoundComponent;
 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 superclass of CayenneModeler controllers.
  */
 public abstract class CayenneController implements BoundComponent {
 
-    private static Log logObj = LogFactory.getLog(CayenneController.class);
+    private static Logger logObj = LoggerFactory.getLogger(CayenneController.class);
 
     protected CayenneController parent;
     protected Application application;

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fec6ede4/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTableModel.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTableModel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTableModel.java
index 01c4354..e60d106 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTableModel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneTableModel.java
@@ -36,8 +36,8 @@ import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.ProjectController;
 import org.apache.cayenne.modeler.undo.CayenneTableModelUndoableEdit;
 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;
 
 /**
  * Superclass of CayenneModeler table model classes.
@@ -48,7 +48,7 @@ public abstract class CayenneTableModel<T> extends AbstractTableModel {
     protected Object eventSource;
     protected List<T> objectList;
 
-    private static Log logObj = LogFactory.getLog(CayenneTableModel.class);
+    private static Logger logObj = LoggerFactory.getLogger(CayenneTableModel.class);
 
     /**
      * Constructor for CayenneTableModel.

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fec6ede4/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/LongRunningTask.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/LongRunningTask.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/LongRunningTask.java
index 55ef5b6..26129f1 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/LongRunningTask.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/LongRunningTask.java
@@ -20,8 +20,8 @@
 package org.apache.cayenne.modeler.util;
 
 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;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
@@ -40,7 +40,7 @@ import java.awt.event.ActionListener;
  */
 public abstract class LongRunningTask<T> {
 
-    private static final Log LOGGER = LogFactory.getLog(LongRunningTask.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(LongRunningTask.class);
 
     protected static final int DEFAULT_MS_TO_DECIDE_TO_POPUP = 500;
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fec6ede4/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ModelerLogFactory.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ModelerLogFactory.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ModelerLogFactory.java
index 1e8ff99..56a4d97 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ModelerLogFactory.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ModelerLogFactory.java
@@ -21,15 +21,14 @@ package org.apache.cayenne.modeler.util;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogConfigurationException;
-import org.apache.commons.logging.impl.LogFactoryImpl;
+import org.slf4j.Logger;
+import org.slf4j.impl.SimpleLoggerFactory;
 
 /**
  * Factory for creating ModelerLogger instances. LogFactoryImpl is subclassed to
  * save default behavior
  */
-public class ModelerLogFactory extends LogFactoryImpl {
+public class ModelerLogFactory extends SimpleLoggerFactory {
 
 	/**
 	 * Local cache of modeler loggers
@@ -40,12 +39,10 @@ public class ModelerLogFactory extends LogFactoryImpl {
 		localCache = new HashMap<>();
 	}
 
-	@Override
-	public Log getInstance(String name) throws LogConfigurationException {
+	public Logger getInstance(String name) {
 		ModelerLogger local = localCache.get(name);
 		if (local == null) {
-			Log def = super.getInstance(name);
-
+			Logger def = super.getLogger(name);
 			local = new ModelerLogger(name, def);
 			localCache.put(name, local);
 		}

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fec6ede4/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ModelerLogger.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ModelerLogger.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ModelerLogger.java
index bcfa26c..e73bcd1 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ModelerLogger.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/ModelerLogger.java
@@ -19,7 +19,8 @@
 package org.apache.cayenne.modeler.util;
 
 import org.apache.cayenne.modeler.dialog.LogConsole;
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
+import org.slf4j.Marker;
 
 import javax.swing.text.AttributeSet;
 
@@ -28,109 +29,388 @@ import javax.swing.text.AttributeSet;
  * to the LogConsole. Default behavior is saved since they are delegated
  * to default Log instance. 
  */
-public class ModelerLogger implements Log {
+public class ModelerLogger implements Logger {
     /**
      * 'Default' Log instance (i.e. Log4jLogger, Jdk14Logger, or other)
      */
-    Log delegate;
+    Logger delegate;
     
     /** 
      * Logger name 
      */
     String name;
     
-    public ModelerLogger(String name, Log delegate) {
+    public ModelerLogger(String name, Logger delegate) {
         this.name = name;
         this.delegate = delegate;
     }
-    
-    public void debug(Object message) {
-        delegate.debug(message);
-        log("DEBUG", message, null, LogConsole.DEBUG_STYLE);
+
+    @Override
+    public void debug(String s) {
+        delegate.debug(s);
+        log("DEBUG", s, null, LogConsole.WARN_STYLE);
     }
 
-    public void debug(Object message, Throwable t) {
-        delegate.debug(message, t);
-        log("DEBUG", message, t, LogConsole.DEBUG_STYLE);
+    @Override
+    public void debug(String s, Object o) {
+        delegate.debug(s, o);
+        log("DEBUG", s, null, LogConsole.WARN_STYLE, o);
     }
 
-    public void error(Object message) {
-        delegate.error(message);
-        log("ERROR", message, null, LogConsole.ERROR_STYLE);
+    @Override
+    public void debug(String s, Object o, Object o1) {
+        delegate.debug(s, o, o1);
+        log("DEBUG", s, null, LogConsole.WARN_STYLE, o, o1);
     }
 
-    public void error(Object message, Throwable t) {
-        delegate.error(message, t);
-        log("ERROR", message, t, LogConsole.ERROR_STYLE);
+    @Override
+    public void debug(String s, Object... objects) {
+        delegate.debug(s, objects);
+        log("DEBUG", s, null, LogConsole.WARN_STYLE, objects);
     }
 
-    public void fatal(Object message) {
-        delegate.fatal(message);
-        log("FATAL", message, null, LogConsole.FATAL_STYLE);
+    @Override
+    public void debug(String s, Throwable throwable) {
+        delegate.debug(s, throwable);
+        log("DEBUG", s, throwable, LogConsole.WARN_STYLE);
     }
 
-    public void fatal(Object message, Throwable t) {
-        delegate.fatal(message, t);
-        log("FATAL", message, t, LogConsole.FATAL_STYLE);
+    @Override
+    public boolean isDebugEnabled(Marker marker) {
+        return delegate.isDebugEnabled(marker);
     }
 
-    public void info(Object message) {
-        delegate.info(message);
-        log("INFO", message, null, LogConsole.INFO_STYLE);
+    @Override
+    public void debug(Marker marker, String s) {
+        delegate.debug(marker, s);
+        log("DEBUG", s, null, LogConsole.WARN_STYLE);
     }
 
-    public void info(Object message, Throwable t) {
-        delegate.info(message);
-        log("INFO", message, t, LogConsole.INFO_STYLE);
+    @Override
+    public void debug(Marker marker, String s, Object o) {
+        delegate.debug(marker, s, o);
+        log("DEBUG", s, null, LogConsole.WARN_STYLE, o);
     }
-    
-    public void trace(Object message) {
-        delegate.trace(message);
-        log("TRACE", message, null, LogConsole.DEBUG_STYLE);
+
+    @Override
+    public void debug(Marker marker, String s, Object o, Object o1) {
+        delegate.debug(marker, s, o, o1);
+        log("DEBUG", s, null, LogConsole.WARN_STYLE, o, o1);
     }
 
-    public void trace(Object message, Throwable t) {
-        delegate.trace(message, t);
-        log("TRACE", message, t, LogConsole.DEBUG_STYLE);
+    @Override
+    public void debug(Marker marker, String s, Object... objects) {
+        delegate.debug(marker, s, objects);
+        log("DEBUG", s, null, LogConsole.WARN_STYLE, objects);
     }
 
-    public void warn(Object message) {
-        delegate.warn(message);
-        log("WARN", message, null, LogConsole.WARN_STYLE);
+    @Override
+    public void debug(Marker marker, String s, Throwable throwable) {
+        delegate.debug(marker, s, throwable);
+        log("DEBUG", s, throwable, LogConsole.WARN_STYLE);
     }
 
-    public void warn(Object message, Throwable t) {
-        delegate.warn(message, t);
-        log("WARN", message, t, LogConsole.WARN_STYLE);
+    @Override
+    public boolean isInfoEnabled() {
+        return delegate.isInfoEnabled();
     }
 
-    public boolean isDebugEnabled() {
-        return delegate.isDebugEnabled();
+    @Override
+    public void error(String s) {
+        delegate.error(s);
+        log("ERROR", s, null, LogConsole.ERROR_STYLE);
     }
 
-    public boolean isErrorEnabled() {
-        return delegate.isErrorEnabled();
+    @Override
+    public void error(String s, Object o) {
+        delegate.error(s, o);
+        log("ERROR", s, null, LogConsole.ERROR_STYLE, o);
     }
 
-    public boolean isFatalEnabled() {
-        return delegate.isFatalEnabled();
+    @Override
+    public void error(String s, Object o, Object o1) {
+        delegate.error(s, o, o1);
+        log("ERROR", s, null, LogConsole.ERROR_STYLE, o, o1);
     }
 
-    public boolean isInfoEnabled() {
-        return delegate.isInfoEnabled();
+    @Override
+    public void error(String s, Object... objects) {
+        delegate.error(s, objects);
+        log("ERROR", s, null, LogConsole.ERROR_STYLE, objects);
     }
 
-    public boolean isTraceEnabled() {
-        return delegate.isTraceEnabled();
+    @Override
+    public void error(String s, Throwable throwable) {
+        delegate.error(s, throwable);
+        log("ERROR", s, throwable, LogConsole.ERROR_STYLE);
+    }
+
+    @Override
+    public boolean isErrorEnabled(Marker marker) {
+        return delegate.isErrorEnabled(marker);
+    }
+
+    @Override
+    public void error(Marker marker, String s) {
+        delegate.error(marker, s);
+        log("ERROR", s, null, LogConsole.ERROR_STYLE);
+    }
+
+    @Override
+    public void error(Marker marker, String s, Object o) {
+        delegate.error(marker, s , o);
+        log("ERROR", s, null, LogConsole.ERROR_STYLE, o);
+    }
+
+    @Override
+    public void error(Marker marker, String s, Object o, Object o1) {
+        delegate.error(marker, s , o, o1);
+        log("ERROR", s, null, LogConsole.ERROR_STYLE, o, o1);
+    }
+
+    @Override
+    public void error(Marker marker, String s, Object... objects) {
+        delegate.error(marker, s, objects);
+        log("ERROR", s, null, LogConsole.ERROR_STYLE, objects);
+    }
+
+    @Override
+    public void error(Marker marker, String s, Throwable throwable) {
+        delegate.error(marker, s, throwable);
+        log("ERROR", s, throwable, LogConsole.ERROR_STYLE);
+    }
+
+    @Override
+    public void info(String s) {
+        delegate.info(s);
+        log("INFO", s, null, LogConsole.INFO_STYLE);
     }
 
+    @Override
+    public void info(String s, Object o) {
+        delegate.info(s, o);
+        log("INFO", s, null, LogConsole.INFO_STYLE, o);
+    }
+
+    @Override
+    public void info(String s, Object o, Object o1) {
+        delegate.info(s, o, o1);
+        log("INFO", s, null, LogConsole.INFO_STYLE, o, o1);
+    }
+
+    @Override
+    public void info(String s, Object... objects) {
+        delegate.info(s, objects);
+        log("INFO", s, null, LogConsole.INFO_STYLE, objects);
+    }
+
+    @Override
+    public void info(String s, Throwable throwable) {
+        delegate.info(s, throwable);
+        log("INFO", s, throwable, LogConsole.INFO_STYLE);
+    }
+
+    @Override
+    public boolean isInfoEnabled(Marker marker) {
+        return delegate.isInfoEnabled(marker);
+    }
+
+    @Override
+    public void info(Marker marker, String s) {
+        delegate.info(marker, s);
+        log("INFO", s, null, LogConsole.INFO_STYLE);
+    }
+
+    @Override
+    public void info(Marker marker, String s, Object o) {
+        delegate.info(marker, s, o);
+        log("INFO", s, null, LogConsole.INFO_STYLE, o);
+    }
+
+    @Override
+    public void info(Marker marker, String s, Object o, Object o1) {
+        delegate.info(marker, s, o, o1);
+        log("INFO", s, null, LogConsole.INFO_STYLE, o, o1);
+    }
+
+    @Override
+    public void info(Marker marker, String s, Object... objects) {
+        delegate.info(marker, s, objects);
+        log("INFO", s, null, LogConsole.INFO_STYLE, objects);
+    }
+
+    @Override
+    public void info(Marker marker, String s, Throwable throwable) {
+        delegate.info(marker, s, throwable);
+        log("INFO", s, throwable, LogConsole.INFO_STYLE);
+    }
+
+    @Override
     public boolean isWarnEnabled() {
         return delegate.isWarnEnabled();
     }
 
+    @Override
+    public String getName() {
+        return delegate.getName();
+    }
+
+    @Override
+    public boolean isTraceEnabled() {
+        return delegate.isTraceEnabled();
+    }
+
+    @Override
+    public void trace(String s) {
+        delegate.trace(s);
+        log("TRACE", s, null, LogConsole.DEBUG_STYLE);
+    }
+
+    @Override
+    public void trace(String s, Object o) {
+        delegate.trace(s, o);
+        log("TRACE", s, null, LogConsole.DEBUG_STYLE, o);
+    }
+
+    @Override
+    public void trace(String s, Object o, Object o1) {
+        delegate.trace(s, o, o1);
+        log("TRACE", s, null, LogConsole.DEBUG_STYLE, o, o1);
+    }
+
+    @Override
+    public void trace(String s, Object... objects) {
+        delegate.trace(s, objects);
+        log("TRACE", s, null, LogConsole.DEBUG_STYLE, objects);
+    }
+
+    @Override
+    public void trace(String s, Throwable throwable) {
+        delegate.trace(s, throwable);
+        log("TRACE", s, throwable, LogConsole.DEBUG_STYLE);
+    }
+
+    @Override
+    public boolean isTraceEnabled(Marker marker) {
+        return delegate.isTraceEnabled(marker);
+    }
+
+    @Override
+    public void trace(Marker marker, String s) {
+        delegate.trace(marker, s);
+        log("TRACE", s, null, LogConsole.DEBUG_STYLE);
+    }
+
+    @Override
+    public void trace(Marker marker, String s, Object o) {
+        delegate.trace(marker, s, o);
+        log("TRACE", s, null, LogConsole.DEBUG_STYLE, o);
+    }
+
+    @Override
+    public void trace(Marker marker, String s, Object o, Object o1) {
+        delegate.trace(marker, s, o, o1);
+        log("TRACE", s, null, LogConsole.DEBUG_STYLE, o, o1);
+    }
+
+    @Override
+    public void trace(Marker marker, String s, Object... objects) {
+        delegate.trace(marker, s, objects);
+        log("TRACE", s, null, LogConsole.DEBUG_STYLE, objects);
+    }
+
+    @Override
+    public void trace(Marker marker, String s, Throwable throwable) {
+        delegate.trace(marker, s, throwable);
+        log("TRACE", s, throwable, LogConsole.DEBUG_STYLE);
+    }
+
+    @Override
+    public boolean isDebugEnabled() {
+        return isErrorEnabled();
+    }
+
+    @Override
+    public void warn(String s) {
+        delegate.warn(s);
+        log("WARN", s, null, LogConsole.WARN_STYLE);
+    }
+
+    @Override
+    public void warn(String s, Object o) {
+        delegate.warn(s, o);
+        log("WARN", s, null, LogConsole.WARN_STYLE, o);
+    }
+
+    @Override
+    public void warn(String s, Object... objects) {
+        delegate.warn(s, objects);
+        log("WARN", s, null, LogConsole.WARN_STYLE, objects);
+    }
+
+    @Override
+    public void warn(String s, Object o, Object o1) {
+        delegate.warn(s, o, o1);
+        log("WARN", s, null, LogConsole.WARN_STYLE, o, o1);
+    }
+
+    @Override
+    public void warn(String s, Throwable throwable) {
+        delegate.warn(s, throwable);
+        log("WARN", s, throwable, LogConsole.WARN_STYLE);
+    }
+
+    @Override
+    public boolean isWarnEnabled(Marker marker) {
+        return delegate.isWarnEnabled(marker);
+    }
+
+    @Override
+    public void warn(Marker marker, String s) {
+        delegate.warn(marker, s);
+        log("WARN", s, null, LogConsole.WARN_STYLE);
+    }
+
+    @Override
+    public void warn(Marker marker, String s, Object o) {
+        delegate.warn(marker, s, o);
+        log("WARN", s, null, LogConsole.WARN_STYLE, o);
+    }
+
+    @Override
+    public void warn(Marker marker, String s, Object o, Object o1) {
+        delegate.warn(marker, s, o, o1);
+        log("WARN", s, null, LogConsole.WARN_STYLE, o, o1);
+    }
+
+    @Override
+    public void warn(Marker marker, String s, Object... objects) {
+        delegate.warn(marker, s, objects);
+        log("WARN", s, null, LogConsole.WARN_STYLE, objects);
+    }
+
+    @Override
+    public void warn(Marker marker, String s, Throwable throwable) {
+        delegate.warn(marker, s, throwable);
+        log("WARN", s, throwable, LogConsole.WARN_STYLE);
+    }
+
+    @Override
+    public boolean isErrorEnabled() {
+        return delegate.isErrorEnabled();
+    }
+
     /**
      * Prints common message to the console
      */
+
+    private void log(String level, String message, Throwable t, AttributeSet style, Object... parameters) {
+        for (Object parameter : parameters) {
+            message.replaceFirst("\\{\\}", String.valueOf(parameter));
+        }
+        getLogConsole().appendMessage(level, message, t, style);
+    }
+
     private void log(String level, Object message, Throwable t, AttributeSet style) {
         getLogConsole().appendMessage(level, String.valueOf(message), t, style);
     }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fec6ede4/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/CayennePreferenceEditor.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/CayennePreferenceEditor.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/CayennePreferenceEditor.java
index 3f00e7e..80f5ead 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/CayennePreferenceEditor.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/CayennePreferenceEditor.java
@@ -29,8 +29,8 @@ import java.util.prefs.Preferences;
 
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.pref.DBConnectionInfo;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * An editor for modifying CayennePreferenceService.
@@ -46,7 +46,7 @@ public abstract class CayennePreferenceEditor implements PreferenceEditor {
     private List<Preferences> removedNode;
     private List<Preferences> addedNode;
 
-    private static Log logger = LogFactory.getLog(CayennePreferenceEditor.class);
+    private static Logger logger = LoggerFactory.getLogger(CayennePreferenceEditor.class);
 
     public CayennePreferenceEditor(CayenneProjectPreferences cayenneProjectPreferences) {
         this.cayenneProjectPreferences = cayenneProjectPreferences;

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fec6ede4/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/JCayenneTextPane.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/JCayenneTextPane.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/JCayenneTextPane.java
index 93c0aaf..88b9fc7 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/JCayenneTextPane.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/JCayenneTextPane.java
@@ -43,8 +43,8 @@ import org.apache.cayenne.modeler.Main;
 import org.apache.cayenne.modeler.util.ModelerUtil;
 import org.apache.cayenne.swing.components.textpane.syntax.SQLSyntaxConstants;
 import org.apache.cayenne.swing.components.textpane.syntax.SyntaxConstant;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class JCayenneTextPane extends JPanel {
 
@@ -69,7 +69,7 @@ public class JCayenneTextPane extends JPanel {
         this.tooltipTextError = tooltipTextError;
     }
 
-    private static Log logObj = LogFactory.getLog(Main.class);
+    private static Logger logObj = LoggerFactory.getLogger(Main.class);
 
     public void setText(String text) {
         pane.setText(text);

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fec6ede4/modeler/cayenne-modeler/src/main/resources/commons-logging.properties
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/resources/commons-logging.properties b/modeler/cayenne-modeler/src/main/resources/commons-logging.properties
index 34794e8..d459acf 100644
--- a/modeler/cayenne-modeler/src/main/resources/commons-logging.properties
+++ b/modeler/cayenne-modeler/src/main/resources/commons-logging.properties
@@ -15,4 +15,3 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-org.apache.commons.logging.LogFactory=org.apache.cayenne.modeler.util.ModelerLogFactory

http://git-wip-us.apache.org/repos/asf/cayenne/blob/fec6ede4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f938dcb..4f542c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,6 +38,7 @@
 		<maven.build.timestamp.format>MMM dd yyyy HH:mm:ss</maven.build.timestamp.format>
 		<project.build.datetime>${maven.build.timestamp}</project.build.datetime>
         <jacoco.version>0.7.1.201405082137</jacoco.version>
+		<slf4j.version>1.7.25</slf4j.version>
 
         <pmd.skip>true</pmd.skip>
         <checkstyle.skip>true</checkstyle.skip>
@@ -306,6 +307,7 @@
 				<artifactId>commons-collections</artifactId>
 				<version>3.2.1</version>
 			</dependency>
+
 			<dependency>
 				<groupId>commons-logging</groupId>
 				<artifactId>commons-logging</artifactId>
@@ -468,17 +470,17 @@
         	<dependency>
     			<groupId>org.slf4j</groupId>
     			<artifactId>jcl-over-slf4j</artifactId>
-    			<version>1.7.7</version>
+    			<version>${slf4j.version}</version>
 			</dependency>
 			<dependency>
     			<groupId>org.slf4j</groupId>
     			<artifactId>slf4j-api</artifactId>
-    			<version>1.7.7</version>
+    			<version>${slf4j.version}</version>
 			</dependency>
 			<dependency>
     			<groupId>org.slf4j</groupId>
     			<artifactId>slf4j-simple</artifactId>
-    			<version>1.7.7</version>
+    			<version>${slf4j.version}</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>


Mime
View raw message