You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2017/04/26 10:09:15 UTC
[01/19] cayenne git commit: replace logging in modeler
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 <ma...@gmail.com>
Authored: Wed Apr 12 08:46:17 2017 +0300
Committer: Maxim Petrusevich <ma...@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>
[04/19] cayenne git commit: + slf4j logger to cayenne-server
Posted by nt...@apache.org.
+ 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 <ma...@gmail.com>
Authored: Wed Apr 12 10:43:37 2017 +0300
Committer: Maxim Petrusevich <ma...@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;
[19/19] cayenne git commit: Cleanup: missing license,
missing artifact in assemblies
Posted by nt...@apache.org.
Cleanup: missing license, missing artifact in assemblies
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/a8960c55
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/a8960c55
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/a8960c55
Branch: refs/heads/master
Commit: a8960c55971cb349d10bf41f37a2172ab3cdbd9d
Parents: e1cd8bc
Author: Nikita Timofeev <st...@gmail.com>
Authored: Wed Apr 26 12:57:37 2017 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Wed Apr 26 12:57:37 2017 +0300
----------------------------------------------------------------------
.../resources/assemblies/assembly-generic.xml | 2 +-
.../main/resources/assemblies/assembly-mac.xml | 2 +-
.../resources/assemblies/assembly-windows.xml | 2 +-
.../java/org/slf4j/impl/StaticLoggerBinder.java | 40 +++++++++++++++-----
4 files changed, 34 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a8960c55/assembly/src/main/resources/assemblies/assembly-generic.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/assembly-generic.xml b/assembly/src/main/resources/assemblies/assembly-generic.xml
index f5342aa..8439a57 100644
--- a/assembly/src/main/resources/assemblies/assembly-generic.xml
+++ b/assembly/src/main/resources/assemblies/assembly-generic.xml
@@ -102,7 +102,7 @@
<!-- Include only a minimal set of dependencies to run cayenne-server and ant tasks -->
<includes>
<include>commons-collections:commons-collections</include>
- <include>slf4-api:slf4j-api</include>
+ <include>org.slf4j:slf4j-api</include>
<include>commons-lang:commons-lang</include>
<include>org.apache.velocity:velocity</include>
<include>foundrylogic.vpp:vpp</include>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a8960c55/assembly/src/main/resources/assemblies/assembly-mac.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/assembly-mac.xml b/assembly/src/main/resources/assemblies/assembly-mac.xml
index 361bea7..90cbe1a 100644
--- a/assembly/src/main/resources/assemblies/assembly-mac.xml
+++ b/assembly/src/main/resources/assemblies/assembly-mac.xml
@@ -102,7 +102,7 @@
<!-- Include only a minimal set of dependencies to run cayenne-server and ant tasks -->
<includes>
<include>commons-collections:commons-collections</include>
- <include>slf4j-api:slf4j-api</include>
+ <include>org.slf4j:slf4j-api</include>
<include>commons-lang:commons-lang</include>
<include>org.apache.velocity:velocity</include>
<include>foundrylogic.vpp:vpp</include>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a8960c55/assembly/src/main/resources/assemblies/assembly-windows.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/assembly-windows.xml b/assembly/src/main/resources/assemblies/assembly-windows.xml
index 7d1d470..1ae16e2 100644
--- a/assembly/src/main/resources/assemblies/assembly-windows.xml
+++ b/assembly/src/main/resources/assemblies/assembly-windows.xml
@@ -102,7 +102,7 @@
<!-- Include only a minimal set of dependencies to run cayenne-server and ant tasks -->
<includes>
<include>commons-collections:commons-collections</include>
- <include>slf4j-api:slf-api</include>
+ <include>org.slf4j:slf-api</include>
<include>commons-lang:commons-lang</include>
<include>org.apache.velocity:velocity</include>
<include>foundrylogic.vpp:vpp</include>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a8960c55/modeler/cayenne-modeler/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/modeler/cayenne-modeler/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
index 7dd03aa..e4d6162 100644
--- a/modeler/cayenne-modeler/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
+++ b/modeler/cayenne-modeler/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
@@ -1,22 +1,44 @@
+/*****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ ****************************************************************/
+
package org.slf4j.impl;
import org.apache.cayenne.modeler.util.ModelerLogFactory;
import org.slf4j.ILoggerFactory;
import org.slf4j.spi.LoggerFactoryBinder;
-/*
-* StaticLoggerBinder bind and replace standard SLF4J LoggerFactory to ModelerLogFactory.
-* This is used because in Cayenne Modeler we use custom logger implementation (ModelerLogger)
-* for logging in System.err and modeler logger.
-* */
+/**
+ * StaticLoggerBinder bind and replace standard SLF4J LoggerFactory to ModelerLogFactory.
+ * This is used because in Cayenne Modeler we use custom logger implementation (ModelerLogger)
+ * for logging in System.err and modeler logger.
+ *
+ * @since 4.0
+ */
public class StaticLoggerBinder implements LoggerFactoryBinder {
- private final static StaticLoggerBinder singleton = new StaticLoggerBinder();
+ private final static StaticLoggerBinder SINGLETON = new StaticLoggerBinder();
+ private final static String LOGGER_FACTORY_CLASS_STR = ModelerLogFactory.class.getName();
+
private final ILoggerFactory loggerFactory = new ModelerLogFactory();
- private static final String loggerFactoryClassStr = ModelerLogFactory.class.getName();
public static StaticLoggerBinder getSingleton() {
- return singleton;
+ return SINGLETON;
}
public ILoggerFactory getLoggerFactory() {
@@ -24,6 +46,6 @@ public class StaticLoggerBinder implements LoggerFactoryBinder {
}
public String getLoggerFactoryClassStr() {
- return this.loggerFactoryClassStr;
+ return LOGGER_FACTORY_CLASS_STR;
}
}
[02/19] cayenne git commit: change logger in dbsync module
Posted by nt...@apache.org.
change logger in dbsync module
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/0312b96d
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/0312b96d
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/0312b96d
Branch: refs/heads/master
Commit: 0312b96d326063bc204064df1a4a1e83573b0ee4
Parents: fec6ede
Author: Maxim Petrusevich <ma...@gmail.com>
Authored: Wed Apr 12 09:12:58 2017 +0300
Committer: Maxim Petrusevich <ma...@gmail.com>
Committed: Wed Apr 12 09:12:58 2017 +0300
----------------------------------------------------------------------
cayenne-dbsync/pom.xml | 18 ++++++++----------
.../cayenne/dbsync/filter/NamePatternMatcher.java | 6 +++---
.../dbsync/merge/context/EntityMergeSupport.java | 6 +++---
.../dbsync/reverse/configuration/ToolsModule.java | 8 ++++----
.../reverse/dbimport/DbImportConfiguration.java | 8 ++++----
.../reverse/dbimport/DefaultDbImportAction.java | 9 ++++-----
.../dbimport/ManyToManyCandidateEntity.java | 6 +++---
.../dbsync/reverse/dbload/AttributeLoader.java | 6 +++---
.../dbsync/reverse/dbload/EntityLoader.java | 6 +++---
.../dbsync/reverse/dbload/ExportedKeyLoader.java | 6 +++---
.../reverse/dbload/LoggingDbLoaderDelegate.java | 6 +++---
.../dbsync/reverse/dbload/PrimaryKeyLoader.java | 6 +++---
.../reverse/dbload/ProcedureColumnLoader.java | 6 +++---
.../dbsync/reverse/dbload/ProcedureLoader.java | 6 +++---
.../dbsync/reverse/dbload/RelationshipLoader.java | 6 +++---
.../apache/cayenne/dbsync/merge/MergeCase.java | 8 ++++----
.../reverse/configuration/ToolsModuleTest.java | 8 ++++----
.../reverse/dbimport/DbImportModuleTest.java | 4 ++--
.../dbimport/DefaultDbImportActionTest.java | 6 +++---
.../modeler/dialog/db/load/LoadDataMapTask.java | 6 +++---
.../dialog/db/load/ModelerDbImportAction.java | 4 ++--
.../modeler/dialog/db/merge/MergerOptions.java | 4 ++--
22 files changed, 73 insertions(+), 76 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/0312b96d/cayenne-dbsync/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/pom.xml b/cayenne-dbsync/pom.xml
index cf57b9a..34317e0 100644
--- a/cayenne-dbsync/pom.xml
+++ b/cayenne-dbsync/pom.xml
@@ -32,6 +32,14 @@
<name>cayenne-dbsync: Database Synchronization Tools</name>
<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-server</artifactId>
<version>${project.version}</version>
@@ -75,16 +83,6 @@
<artifactId>jcl-over-slf4j</artifactId>
<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>org.apache.cayenne.build-tools</groupId>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/0312b96d/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/filter/NamePatternMatcher.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/filter/NamePatternMatcher.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/filter/NamePatternMatcher.java
index cb379da..a70345c 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/filter/NamePatternMatcher.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/filter/NamePatternMatcher.java
@@ -20,7 +20,7 @@
package org.apache.cayenne.dbsync.filter;
import org.apache.cayenne.util.CayenneMapEntry;
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
import java.util.ArrayList;
import java.util.Iterator;
@@ -49,7 +49,7 @@ public class NamePatternMatcher implements NameFilter {
private final Pattern[] itemIncludeFilters;
private final Pattern[] itemExcludeFilters;
- public static NamePatternMatcher build(Log logger, String includePattern, String excludePattern) {
+ public static NamePatternMatcher build(Logger logger, String includePattern, String excludePattern) {
return new NamePatternMatcher(createPatterns(logger, includePattern), createPatterns(logger, excludePattern));
}
@@ -101,7 +101,7 @@ public class NamePatternMatcher implements NameFilter {
* <code>^billing_.*$</code><br>
* <code>^user.?$</code><br>
*/
- public static Pattern[] createPatterns(Log logger, String patternString) {
+ public static Pattern[] createPatterns(Logger logger, String patternString) {
if (patternString == null) {
return new Pattern[0];
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/0312b96d/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/context/EntityMergeSupport.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/context/EntityMergeSupport.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/context/EntityMergeSupport.java
index ae93916..09bdae3 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/context/EntityMergeSupport.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/context/EntityMergeSupport.java
@@ -35,8 +35,8 @@ import org.apache.cayenne.map.ObjRelationship;
import org.apache.cayenne.map.Relationship;
import org.apache.cayenne.util.DeleteRuleUpdater;
import org.apache.cayenne.util.EntityMergeListener;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.sql.Types;
import java.util.ArrayList;
@@ -51,7 +51,7 @@ import java.util.Map;
*/
public class EntityMergeSupport {
- private static final Log LOGGER = LogFactory.getLog(EntityMergeSupport.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(EntityMergeSupport.class);
private static final Map<String, String> CLASS_TO_PRIMITIVE = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/0312b96d/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsModule.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsModule.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsModule.java
index 8fcafa7..d2c6b62 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsModule.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsModule.java
@@ -55,7 +55,7 @@ import org.apache.cayenne.log.CommonsJdbcEventLogger;
import org.apache.cayenne.log.JdbcEventLogger;
import org.apache.cayenne.resource.ClassLoaderResourceLocator;
import org.apache.cayenne.resource.ResourceLocator;
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
/**
* A DI module to bootstrap DI container for Cayenne Ant tasks and Maven
@@ -65,9 +65,9 @@ import org.apache.commons.logging.Log;
*/
public class ToolsModule implements Module {
- private Log logger;
+ private Logger logger;
- public ToolsModule(Log logger) {
+ public ToolsModule(Logger logger) {
if (logger == null) {
throw new NullPointerException("Null logger");
@@ -78,7 +78,7 @@ public class ToolsModule implements Module {
public void configure(Binder binder) {
- binder.bind(Log.class).toInstance(logger);
+ binder.bind(Logger.class).toInstance(logger);
// configure empty global stack properties
ServerModule.contributeProperties(binder);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/0312b96d/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DbImportConfiguration.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DbImportConfiguration.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DbImportConfiguration.java
index d7350e7..110a7ff 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DbImportConfiguration.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DbImportConfiguration.java
@@ -36,7 +36,7 @@ import org.apache.cayenne.dbsync.reverse.dbload.DbLoaderDelegate;
import org.apache.cayenne.dbsync.reverse.dbload.DefaultDbLoaderDelegate;
import org.apache.cayenne.dbsync.reverse.dbload.LoggingDbLoaderDelegate;
import org.apache.cayenne.dbsync.reverse.filters.FiltersConfig;
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
import java.io.File;
import java.util.regex.Pattern;
@@ -56,7 +56,7 @@ public class DbImportConfiguration {
private String adapter;
private boolean usePrimitives;
private boolean useJava7Types;
- private Log logger;
+ private Logger logger;
private String namingStrategy;
private String stripFromTableNames;
private boolean forceDataMapCatalog;
@@ -75,11 +75,11 @@ public class DbImportConfiguration {
this.stripFromTableNames = stripFromTableNames;
}
- public Log getLogger() {
+ public Logger getLogger() {
return logger;
}
- public void setLogger(Log logger) {
+ public void setLogger(Logger logger) {
this.logger = logger;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/0312b96d/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportAction.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportAction.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportAction.java
index cd2838c..3ada4bd 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportAction.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportAction.java
@@ -23,7 +23,6 @@ import org.apache.cayenne.configuration.DataNodeDescriptor;
import org.apache.cayenne.configuration.server.DataSourceFactory;
import org.apache.cayenne.configuration.server.DbAdapterFactory;
import org.apache.cayenne.dba.DbAdapter;
-import org.apache.cayenne.dbsync.filter.NameFilter;
import org.apache.cayenne.dbsync.merge.token.model.AbstractToModelToken;
import org.apache.cayenne.dbsync.merge.DataMapMerger;
import org.apache.cayenne.dbsync.merge.context.MergerContext;
@@ -52,7 +51,7 @@ import org.apache.cayenne.resource.URLResource;
import org.apache.cayenne.validation.SimpleValidationFailure;
import org.apache.cayenne.validation.ValidationFailure;
import org.apache.cayenne.validation.ValidationResult;
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
import org.xml.sax.InputSource;
import javax.sql.DataSource;
@@ -74,13 +73,13 @@ import java.util.List;
public class DefaultDbImportAction implements DbImportAction {
private final ProjectSaver projectSaver;
- private final Log logger;
+ private final Logger logger;
private final DataSourceFactory dataSourceFactory;
private final DbAdapterFactory adapterFactory;
private final MapLoader mapLoader;
private final MergerTokenFactoryProvider mergerTokenFactoryProvider;
- public DefaultDbImportAction(@Inject Log logger,
+ public DefaultDbImportAction(@Inject Logger logger,
@Inject ProjectSaver projectSaver,
@Inject DataSourceFactory dataSourceFactory,
@Inject DbAdapterFactory adapterFactory,
@@ -130,7 +129,7 @@ public class DefaultDbImportAction implements DbImportAction {
if (logger.isDebugEnabled()) {
logger.debug("DB connection: " + config.getDataSourceInfo());
- logger.debug(config);
+ logger.debug(String.valueOf(config));
}
boolean hasChanges = false;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/0312b96d/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/ManyToManyCandidateEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/ManyToManyCandidateEntity.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/ManyToManyCandidateEntity.java
index 3c3cbf3..404cd41 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/ManyToManyCandidateEntity.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/ManyToManyCandidateEntity.java
@@ -24,8 +24,8 @@ import org.apache.cayenne.dbsync.naming.ObjectNameGenerator;
import org.apache.cayenne.map.DbRelationship;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.map.ObjRelationship;
-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.List;
@@ -35,7 +35,7 @@ import java.util.List;
*/
class ManyToManyCandidateEntity {
- private static final Log LOG = LogFactory.getLog(ManyToManyCandidateEntity.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ManyToManyCandidateEntity.class);
private final ObjEntity joinEntity;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/0312b96d/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/AttributeLoader.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/AttributeLoader.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/AttributeLoader.java
index af44f7b..4731ccd 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/AttributeLoader.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/AttributeLoader.java
@@ -31,12 +31,12 @@ import org.apache.cayenne.dbsync.reverse.filters.PatternFilter;
import org.apache.cayenne.dbsync.reverse.filters.SchemaFilter;
import org.apache.cayenne.map.DbAttribute;
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;
class AttributeLoader extends PerCatalogAndSchemaLoader {
- private static final Log LOGGER = LogFactory.getLog(DbLoader.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(DbLoader.class);
private boolean firstRow;
private boolean supportAutoIncrement;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/0312b96d/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/EntityLoader.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/EntityLoader.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/EntityLoader.java
index 2531a3f..7d279a2 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/EntityLoader.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/EntityLoader.java
@@ -30,12 +30,12 @@ import org.apache.cayenne.dbsync.reverse.filters.CatalogFilter;
import org.apache.cayenne.dbsync.reverse.filters.SchemaFilter;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.DetectedDbEntity;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
class EntityLoader extends PerCatalogAndSchemaLoader {
- private static final Log LOGGER = LogFactory.getLog(DbLoader.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(DbLoader.class);
private final String[] types;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/0312b96d/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/ExportedKeyLoader.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/ExportedKeyLoader.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/ExportedKeyLoader.java
index 779218b..dfe38e6 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/ExportedKeyLoader.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/ExportedKeyLoader.java
@@ -24,12 +24,12 @@ import java.sql.ResultSet;
import java.sql.SQLException;
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;
class ExportedKeyLoader extends PerEntityLoader {
- private static final Log LOGGER = LogFactory.getLog(ExportedKeyLoader.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(ExportedKeyLoader.class);
ExportedKeyLoader(DbLoaderConfiguration config, DbLoaderDelegate delegate) {
super(null, config, delegate);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/0312b96d/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/LoggingDbLoaderDelegate.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/LoggingDbLoaderDelegate.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/LoggingDbLoaderDelegate.java
index 70279c1..55a8874 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/LoggingDbLoaderDelegate.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/LoggingDbLoaderDelegate.java
@@ -20,16 +20,16 @@ package org.apache.cayenne.dbsync.reverse.dbload;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.DbRelationship;
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
/**
* @since 4.0
*/
public class LoggingDbLoaderDelegate extends DefaultDbLoaderDelegate {
- private final Log logger;
+ private final Logger logger;
- public LoggingDbLoaderDelegate(Log logger) {
+ public LoggingDbLoaderDelegate(Logger logger) {
this.logger = logger;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/0312b96d/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/PrimaryKeyLoader.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/PrimaryKeyLoader.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/PrimaryKeyLoader.java
index 4f80534..1f00f2b 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/PrimaryKeyLoader.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/PrimaryKeyLoader.java
@@ -26,12 +26,12 @@ import java.sql.SQLException;
import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.DetectedDbEntity;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
class PrimaryKeyLoader extends PerEntityLoader {
- private static final Log LOGGER = LogFactory.getLog(DbLoader.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(DbLoader.class);
PrimaryKeyLoader(DbLoaderConfiguration config, DbLoaderDelegate delegate) {
super(null, config, delegate);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/0312b96d/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/ProcedureColumnLoader.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/ProcedureColumnLoader.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/ProcedureColumnLoader.java
index 8ac0fde..f4096a1 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/ProcedureColumnLoader.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/ProcedureColumnLoader.java
@@ -30,12 +30,12 @@ import org.apache.cayenne.dbsync.reverse.filters.PatternFilter;
import org.apache.cayenne.dbsync.reverse.filters.SchemaFilter;
import org.apache.cayenne.map.Procedure;
import org.apache.cayenne.map.ProcedureParameter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ProcedureColumnLoader extends PerCatalogAndSchemaLoader {
- private static final Log LOGGER = LogFactory.getLog(DbLoader.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(DbLoader.class);
ProcedureColumnLoader(DbAdapter adapter, DbLoaderConfiguration config, DbLoaderDelegate delegate) {
super(adapter, config, delegate);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/0312b96d/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/ProcedureLoader.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/ProcedureLoader.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/ProcedureLoader.java
index 34808a0..d0b3636 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/ProcedureLoader.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/ProcedureLoader.java
@@ -28,12 +28,12 @@ import org.apache.cayenne.dbsync.reverse.filters.CatalogFilter;
import org.apache.cayenne.dbsync.reverse.filters.PatternFilter;
import org.apache.cayenne.dbsync.reverse.filters.SchemaFilter;
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;
public class ProcedureLoader extends PerCatalogAndSchemaLoader {
- private static final Log LOGGER = LogFactory.getLog(DbLoader.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(DbLoader.class);
ProcedureLoader(DbAdapter adapter, DbLoaderConfiguration config, DbLoaderDelegate delegate) {
super(adapter, config, delegate);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/0312b96d/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/RelationshipLoader.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/RelationshipLoader.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/RelationshipLoader.java
index 1b9e9db..46a1aa0 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/RelationshipLoader.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/RelationshipLoader.java
@@ -31,12 +31,12 @@ import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.DbJoin;
import org.apache.cayenne.map.DbRelationship;
import org.apache.cayenne.util.EqualsBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class RelationshipLoader extends AbstractLoader {
- private static final Log LOGGER = LogFactory.getLog(DbLoader.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(DbLoader.class);
private final ObjectNameGenerator nameGenerator;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/0312b96d/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/MergeCase.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/MergeCase.java b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/MergeCase.java
index a8315ec..a1c4177 100644
--- a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/MergeCase.java
+++ b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/merge/MergeCase.java
@@ -48,9 +48,9 @@ import org.apache.cayenne.unit.UnitDbAdapter;
import org.apache.cayenne.unit.di.server.CayenneProjects;
import org.apache.cayenne.unit.di.server.ServerCaseDataSourceFactory;
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.Before;
+import org.slf4j.LoggerFactory;
import java.sql.Connection;
import java.sql.SQLException;
@@ -69,7 +69,7 @@ public abstract class MergeCase extends DbSyncCase {
@Inject
protected DataNode node;
protected DataMap map;
- private Log logger = LogFactory.getLog(MergeCase.class);
+ private Logger logger = LoggerFactory.getLogger(MergeCase.class);
@Inject
private DBHelper dbHelper;
@Inject
@@ -121,7 +121,7 @@ public abstract class MergeCase extends DbSyncCase {
try (Connection conn = node.getDataSource().getConnection();) {
dbImport = new DbLoader(node.getAdapter(), conn,
loaderConfiguration,
- new LoggingDbLoaderDelegate(LogFactory.getLog(DbLoader.class)),
+ new LoggingDbLoaderDelegate(LoggerFactory.getLogger(DbLoader.class)),
new DefaultObjectNameGenerator(NoStemStemmer.getInstance()))
.load();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/0312b96d/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsModuleTest.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsModuleTest.java b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsModuleTest.java
index 899b049..7381dd8 100644
--- a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsModuleTest.java
+++ b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsModuleTest.java
@@ -28,7 +28,7 @@ import org.apache.cayenne.di.AdhocObjectFactory;
import org.apache.cayenne.di.DIBootstrap;
import org.apache.cayenne.di.Injector;
import org.apache.cayenne.di.spi.DefaultAdhocObjectFactory;
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
import org.junit.Test;
import javax.sql.DataSource;
@@ -42,10 +42,10 @@ public class ToolsModuleTest {
@Test
public void testModuleContents() {
- Log log = mock(Log.class);
+ Logger log = mock(Logger.class);
Injector i = DIBootstrap.createInjector(new ToolsModule(log));
- assertSame(log, i.getInstance(Log.class));
+ assertSame(log, i.getInstance(Logger.class));
assertTrue(i.getInstance(DataSourceFactory.class) instanceof DriverDataSourceFactory);
assertTrue(i.getInstance(AdhocObjectFactory.class) instanceof DefaultAdhocObjectFactory);
assertTrue(i.getInstance(DbAdapterFactory.class) instanceof DefaultDbAdapterFactory);
@@ -53,7 +53,7 @@ public class ToolsModuleTest {
@Test
public void testDbApdater() throws Exception {
- Log log = mock(Log.class);
+ Logger log = mock(Logger.class);
Injector i = DIBootstrap.createInjector(new ToolsModule(log));
DbAdapterFactory factory = i.getInstance(DbAdapterFactory.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/0312b96d/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbimport/DbImportModuleTest.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbimport/DbImportModuleTest.java b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbimport/DbImportModuleTest.java
index d057fda..b765516 100644
--- a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbimport/DbImportModuleTest.java
+++ b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbimport/DbImportModuleTest.java
@@ -23,7 +23,7 @@ import org.apache.cayenne.dbsync.DbSyncModule;
import org.apache.cayenne.dbsync.reverse.configuration.ToolsModule;
import org.apache.cayenne.di.DIBootstrap;
import org.apache.cayenne.di.Injector;
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
import org.junit.Test;
import static org.junit.Assert.assertTrue;
@@ -34,7 +34,7 @@ public class DbImportModuleTest {
@Test
public void testModuleContents() {
- Log log = mock(Log.class);
+ Logger log = mock(Logger.class);
Injector i = DIBootstrap.createInjector(new DbSyncModule(), new ToolsModule(log), new DbImportModule());
assertTrue(i.getInstance(DbImportAction.class) instanceof DbImportAction);
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/0312b96d/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportActionTest.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportActionTest.java b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportActionTest.java
index aeddd37..f390fef 100644
--- a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportActionTest.java
+++ b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportActionTest.java
@@ -50,7 +50,7 @@ import org.apache.cayenne.project.FileProjectSaver;
import org.apache.cayenne.project.Project;
import org.apache.cayenne.resource.URLResource;
import org.apache.cayenne.util.Util;
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
import org.junit.Before;
import org.junit.Test;
import org.xml.sax.InputSource;
@@ -281,7 +281,7 @@ public class DefaultDbImportActionTest {
private DefaultDbImportAction buildDbImportAction(FileProjectSaver projectSaver, MapLoader mapLoader, final DbLoader dbLoader)
throws Exception {
- Log log = mock(Log.class);
+ Logger log = mock(Logger.class);
when(log.isDebugEnabled()).thenReturn(true);
when(log.isInfoEnabled()).thenReturn(true);
@@ -309,7 +309,7 @@ public class DefaultDbImportActionTest {
@Test
public void testSaveLoaded() throws Exception {
- Log log = mock(Log.class);
+ Logger log = mock(Logger.class);
Injector i = DIBootstrap.createInjector(new DbSyncModule(), new ToolsModule(log), new DbImportModule());
DefaultDbImportAction action = (DefaultDbImportAction) i.getInstance(DbImportAction.class);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/0312b96d/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/LoadDataMapTask.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/LoadDataMapTask.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/LoadDataMapTask.java
index f0576ea..484cdc6 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/LoadDataMapTask.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/LoadDataMapTask.java
@@ -29,15 +29,15 @@ import org.apache.cayenne.modeler.util.ProjectUtil;
import org.apache.cayenne.dbsync.reverse.configuration.ToolsModule;
import org.apache.cayenne.dbsync.reverse.dbimport.DbImportAction;
import org.apache.cayenne.dbsync.reverse.dbimport.DbImportModule;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @since 4.0
*/
final public class LoadDataMapTask extends LongRunningTask {
- private static Log LOGGER = LogFactory.getLog(DbLoaderContext.class);
+ private static Logger LOGGER = LoggerFactory.getLogger(DbLoaderContext.class);
private DbLoaderContext context;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/0312b96d/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/ModelerDbImportAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/ModelerDbImportAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/ModelerDbImportAction.java
index 64b33e3..c74df88 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/ModelerDbImportAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/ModelerDbImportAction.java
@@ -27,7 +27,7 @@ import org.apache.cayenne.map.MapLoader;
import org.apache.cayenne.project.ProjectSaver;
import org.apache.cayenne.dbsync.reverse.dbimport.DbImportConfiguration;
import org.apache.cayenne.dbsync.reverse.dbimport.DefaultDbImportAction;
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
import java.io.IOException;
@@ -36,7 +36,7 @@ public class ModelerDbImportAction extends DefaultDbImportAction {
@Inject
private DataMap targetMap;
- public ModelerDbImportAction(@Inject Log logger,
+ public ModelerDbImportAction(@Inject Logger logger,
@Inject ProjectSaver projectSaver,
@Inject DataSourceFactory dataSourceFactory,
@Inject DbAdapterFactory adapterFactory,
http://git-wip-us.apache.org/repos/asf/cayenne/blob/0312b96d/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerOptions.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerOptions.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerOptions.java
index e486837..057cf01 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerOptions.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerOptions.java
@@ -54,7 +54,7 @@ import org.apache.cayenne.resource.Resource;
import org.apache.cayenne.swing.BindingBuilder;
import org.apache.cayenne.swing.ObjectBinding;
import org.apache.cayenne.validation.ValidationResult;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.LoggerFactory;
import javax.sql.DataSource;
import javax.swing.JFileChooser;
@@ -173,7 +173,7 @@ public class MergerOptions extends CayenneController {
try (Connection conn = dataSource.getConnection();) {
dbImport = new DbLoader(adapter, conn,
config,
- new LoggingDbLoaderDelegate(LogFactory.getLog(DbLoader.class)),
+ new LoggingDbLoaderDelegate(LoggerFactory.getLogger(DbLoader.class)),
new DefaultObjectNameGenerator(NoStemStemmer.getInstance()))
.load();
} catch (SQLException e) {
[12/19] cayenne git commit: code refactoring in maven and modeler
logger
Posted by nt...@apache.org.
code refactoring in maven and modeler logger
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/15c49552
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/15c49552
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/15c49552
Branch: refs/heads/master
Commit: 15c49552ac733b4ab80f8757daae34921fb9999f
Parents: 00ef613
Author: Maxim Petrusevich <ma...@gmail.com>
Authored: Wed Apr 12 12:58:44 2017 +0300
Committer: Maxim Petrusevich <ma...@gmail.com>
Committed: Wed Apr 12 12:58:44 2017 +0300
----------------------------------------------------------------------
.../org/apache/cayenne/tools/MavenLogger.java | 204 ++++++------
.../cayenne/modeler/util/ModelerLogger.java | 308 +++++++++----------
2 files changed, 257 insertions(+), 255 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/15c49552/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/MavenLogger.java
----------------------------------------------------------------------
diff --git a/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/MavenLogger.java b/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/MavenLogger.java
index f684528..d1382c0 100644
--- a/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/MavenLogger.java
+++ b/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/MavenLogger.java
@@ -28,6 +28,8 @@ import org.apache.maven.plugin.logging.Log;
*/
class MavenLogger implements Logger {
+ private static final String LOGGER_NAME = "MavenLogger";
+
private Log logger;
public MavenLogger(AbstractMojo parent) {
@@ -35,28 +37,28 @@ class MavenLogger implements Logger {
}
@Override
- public void debug(String s) {
- logger.debug(s);
+ public void debug(String message) {
+ logger.debug(message);
}
@Override
- public void debug(String s, Object o) {
- logger.debug(s);
+ public void debug(String message, Object object) {
+ logger.debug(message);
}
@Override
- public void debug(String s, Object o, Object o1) {
- logger.debug(s);
+ public void debug(String message, Object object, Object secondObject) {
+ logger.debug(message);
}
@Override
- public void debug(String s, Object... objects) {
- logger.debug(s);
+ public void debug(String message, Object... objects) {
+ logger.debug(message);
}
@Override
- public void debug(String s, Throwable throwable) {
- logger.debug(s, throwable);
+ public void debug(String message, Throwable throwable) {
+ logger.debug(message, throwable);
}
@Override
@@ -65,28 +67,28 @@ class MavenLogger implements Logger {
}
@Override
- public void debug(Marker marker, String s) {
- logger.debug(s);
+ public void debug(Marker marker, String message) {
+ logger.debug(message);
}
@Override
- public void debug(Marker marker, String s, Object o) {
- logger.debug(s);
+ public void debug(Marker marker, String message, Object object) {
+ logger.debug(message);
}
@Override
- public void debug(Marker marker, String s, Object o, Object o1) {
- logger.debug(s);
+ public void debug(Marker marker, String message, Object object, Object secondObject) {
+ logger.debug(message);
}
@Override
- public void debug(Marker marker, String s, Object... objects) {
- logger.debug(s);
+ public void debug(Marker marker, String message, Object... objects) {
+ logger.debug(message);
}
@Override
- public void debug(Marker marker, String s, Throwable throwable) {
- logger.debug(s, throwable);
+ public void debug(Marker marker, String message, Throwable throwable) {
+ logger.debug(message, throwable);
}
@Override
@@ -95,28 +97,28 @@ class MavenLogger implements Logger {
}
@Override
- public void error(String s) {
- logger.error(s);
+ public void error(String message) {
+ logger.error(message);
}
@Override
- public void error(String s, Object o) {
- logger.error(s);
+ public void error(String message, Object object) {
+ logger.error(message);
}
@Override
- public void error(String s, Object o, Object o1) {
- logger.error(s);
+ public void error(String message, Object object, Object secondObject) {
+ logger.error(message);
}
@Override
- public void error(String s, Object... objects) {
- logger.error(s);
+ public void error(String message, Object... objects) {
+ logger.error(message);
}
@Override
- public void error(String s, Throwable throwable) {
- logger.error(s, throwable);
+ public void error(String message, Throwable throwable) {
+ logger.error(message, throwable);
}
@Override
@@ -125,53 +127,53 @@ class MavenLogger implements Logger {
}
@Override
- public void error(Marker marker, String s) {
- logger.error(s);
+ public void error(Marker marker, String message) {
+ logger.error(message);
}
@Override
- public void error(Marker marker, String s, Object o) {
- logger.error(s);
+ public void error(Marker marker, String message, Object object) {
+ logger.error(message);
}
@Override
- public void error(Marker marker, String s, Object o, Object o1) {
- logger.error(s);
+ public void error(Marker marker, String message, Object object, Object secondObject) {
+ logger.error(message);
}
@Override
- public void error(Marker marker, String s, Object... objects) {
- logger.error(s);
+ public void error(Marker marker, String message, Object... objects) {
+ logger.error(message);
}
@Override
- public void error(Marker marker, String s, Throwable throwable) {
- logger.error(s, throwable);
+ public void error(Marker marker, String message, Throwable throwable) {
+ logger.error(message, throwable);
}
@Override
- public void info(String s) {
- logger.info(s);
+ public void info(String message) {
+ logger.info(message);
}
@Override
- public void info(String s, Object o) {
- logger.info(s);
+ public void info(String message, Object object) {
+ logger.info(message);
}
@Override
- public void info(String s, Object o, Object o1) {
- logger.info(s);
+ public void info(String message, Object object, Object secondObject) {
+ logger.info(message);
}
@Override
- public void info(String s, Object... objects) {
- logger.info(s);
+ public void info(String message, Object... objects) {
+ logger.info(message);
}
@Override
- public void info(String s, Throwable throwable) {
- logger.info(s, throwable);
+ public void info(String message, Throwable throwable) {
+ logger.info(message, throwable);
}
@Override
@@ -180,28 +182,28 @@ class MavenLogger implements Logger {
}
@Override
- public void info(Marker marker, String s) {
- logger.info(s);
+ public void info(Marker marker, String message) {
+ logger.info(message);
}
@Override
- public void info(Marker marker, String s, Object o) {
- logger.info(s);
+ public void info(Marker marker, String message, Object object) {
+ logger.info(message);
}
@Override
- public void info(Marker marker, String s, Object o, Object o1) {
- logger.info(s);
+ public void info(Marker marker, String message, Object object, Object secondObject) {
+ logger.info(message);
}
@Override
- public void info(Marker marker, String s, Object... objects) {
- logger.info(s);
+ public void info(Marker marker, String message, Object... objects) {
+ logger.info(message);
}
@Override
- public void info(Marker marker, String s, Throwable throwable) {
- logger.info(s, throwable);
+ public void info(Marker marker, String message, Throwable throwable) {
+ logger.info(message, throwable);
}
@Override
@@ -211,7 +213,7 @@ class MavenLogger implements Logger {
@Override
public String getName() {
- return this.getName();
+ return LOGGER_NAME;
}
@Override
@@ -220,28 +222,28 @@ class MavenLogger implements Logger {
}
@Override
- public void trace(String s) {
- logger.debug(s);
+ public void trace(String message) {
+ logger.debug(message);
}
@Override
- public void trace(String s, Object o) {
- logger.debug(s);
+ public void trace(String message, Object object) {
+ logger.debug(message);
}
@Override
- public void trace(String s, Object o, Object o1) {
- logger.debug(s);
+ public void trace(String message, Object object, Object secondObject) {
+ logger.debug(message);
}
@Override
- public void trace(String s, Object... objects) {
- logger.debug(s);
+ public void trace(String message, Object... objects) {
+ logger.debug(message);
}
@Override
- public void trace(String s, Throwable throwable) {
- logger.debug(s, throwable);
+ public void trace(String message, Throwable throwable) {
+ logger.debug(message, throwable);
}
@Override
@@ -250,28 +252,28 @@ class MavenLogger implements Logger {
}
@Override
- public void trace(Marker marker, String s) {
- logger.debug(s);
+ public void trace(Marker marker, String message) {
+ logger.debug(message);
}
@Override
- public void trace(Marker marker, String s, Object o) {
- logger.debug(s);
+ public void trace(Marker marker, String message, Object object) {
+ logger.debug(message);
}
@Override
- public void trace(Marker marker, String s, Object o, Object o1) {
- logger.debug(s);
+ public void trace(Marker marker, String message, Object object, Object secondObject) {
+ logger.debug(message);
}
@Override
- public void trace(Marker marker, String s, Object... objects) {
- logger.debug(s);
+ public void trace(Marker marker, String message, Object... objects) {
+ logger.debug(message);
}
@Override
- public void trace(Marker marker, String s, Throwable throwable) {
- logger.debug(s, throwable);
+ public void trace(Marker marker, String message, Throwable throwable) {
+ logger.debug(message, throwable);
}
@Override
@@ -280,28 +282,28 @@ class MavenLogger implements Logger {
}
@Override
- public void warn(String s) {
- logger.warn(s);
+ public void warn(String message) {
+ logger.warn(message);
}
@Override
- public void warn(String s, Object o) {
- logger.warn(s);
+ public void warn(String message, Object object) {
+ logger.warn(message);
}
@Override
- public void warn(String s, Object... objects) {
- logger.warn(s);
+ public void warn(String message, Object... objects) {
+ logger.warn(message);
}
@Override
- public void warn(String s, Object o, Object o1) {
- logger.warn(s);
+ public void warn(String message, Object object, Object secondObject) {
+ logger.warn(message);
}
@Override
- public void warn(String s, Throwable throwable) {
- logger.warn(s, throwable);
+ public void warn(String message, Throwable throwable) {
+ logger.warn(message, throwable);
}
@Override
@@ -310,28 +312,28 @@ class MavenLogger implements Logger {
}
@Override
- public void warn(Marker marker, String s) {
- logger.warn(s);
+ public void warn(Marker marker, String message) {
+ logger.warn(message);
}
@Override
- public void warn(Marker marker, String s, Object o) {
- logger.warn(s);
+ public void warn(Marker marker, String message, Object object) {
+ logger.warn(message);
}
@Override
- public void warn(Marker marker, String s, Object o, Object o1) {
- logger.warn(s);
+ public void warn(Marker marker, String message, Object object, Object secondObject) {
+ logger.warn(message);
}
@Override
- public void warn(Marker marker, String s, Object... objects) {
- logger.warn(s);
+ public void warn(Marker marker, String message, Object... objects) {
+ logger.warn(message);
}
@Override
- public void warn(Marker marker, String s, Throwable throwable) {
- logger.warn(s, throwable);
+ public void warn(Marker marker, String message, Throwable throwable) {
+ logger.warn(message, throwable);
}
@Override
http://git-wip-us.apache.org/repos/asf/cayenne/blob/15c49552/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 e73bcd1..9dcc224 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
@@ -46,33 +46,33 @@ public class ModelerLogger implements Logger {
}
@Override
- public void debug(String s) {
- delegate.debug(s);
- log("DEBUG", s, null, LogConsole.WARN_STYLE);
+ public void debug(String message) {
+ delegate.debug(message);
+ log("DEBUG", message, null, LogConsole.WARN_STYLE);
}
@Override
- public void debug(String s, Object o) {
- delegate.debug(s, o);
- log("DEBUG", s, null, LogConsole.WARN_STYLE, o);
+ public void debug(String message, Object object) {
+ delegate.debug(message, object);
+ log("DEBUG", message, null, LogConsole.WARN_STYLE, object);
}
@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 debug(String message, Object object, Object secondObject) {
+ delegate.debug(message, object, secondObject);
+ log("DEBUG", message, null, LogConsole.WARN_STYLE, object, secondObject);
}
@Override
- public void debug(String s, Object... objects) {
- delegate.debug(s, objects);
- log("DEBUG", s, null, LogConsole.WARN_STYLE, objects);
+ public void debug(String message, Object... objects) {
+ delegate.debug(message, objects);
+ log("DEBUG", message, null, LogConsole.WARN_STYLE, objects);
}
@Override
- public void debug(String s, Throwable throwable) {
- delegate.debug(s, throwable);
- log("DEBUG", s, throwable, LogConsole.WARN_STYLE);
+ public void debug(String message, Throwable throwable) {
+ delegate.debug(message, throwable);
+ log("DEBUG", message, throwable, LogConsole.WARN_STYLE);
}
@Override
@@ -81,33 +81,33 @@ public class ModelerLogger implements Logger {
}
@Override
- public void debug(Marker marker, String s) {
- delegate.debug(marker, s);
- log("DEBUG", s, null, LogConsole.WARN_STYLE);
+ public void debug(Marker marker, String message) {
+ delegate.debug(marker, message);
+ log("DEBUG", message, null, LogConsole.WARN_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 debug(Marker marker, String message, Object object) {
+ delegate.debug(marker, message, object);
+ log("DEBUG", message, null, LogConsole.WARN_STYLE, object);
}
@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 debug(Marker marker, String message, Object object, Object secondObject) {
+ delegate.debug(marker, message, object, secondObject);
+ log("DEBUG", message, null, LogConsole.WARN_STYLE, object, secondObject);
}
@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 debug(Marker marker, String message, Object... objects) {
+ delegate.debug(marker, message, objects);
+ log("DEBUG", message, null, LogConsole.WARN_STYLE, objects);
}
@Override
- public void debug(Marker marker, String s, Throwable throwable) {
- delegate.debug(marker, s, throwable);
- log("DEBUG", s, throwable, LogConsole.WARN_STYLE);
+ public void debug(Marker marker, String message, Throwable throwable) {
+ delegate.debug(marker, message, throwable);
+ log("DEBUG", message, throwable, LogConsole.WARN_STYLE);
}
@Override
@@ -116,33 +116,33 @@ public class ModelerLogger implements Logger {
}
@Override
- public void error(String s) {
- delegate.error(s);
- log("ERROR", s, null, LogConsole.ERROR_STYLE);
+ public void error(String message) {
+ delegate.error(message);
+ log("ERROR", message, null, LogConsole.ERROR_STYLE);
}
@Override
- public void error(String s, Object o) {
- delegate.error(s, o);
- log("ERROR", s, null, LogConsole.ERROR_STYLE, o);
+ public void error(String message, Object object) {
+ delegate.error(message, object);
+ log("ERROR", message, null, LogConsole.ERROR_STYLE, object);
}
@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 void error(String message, Object object, Object secondObject) {
+ delegate.error(message, object, secondObject);
+ log("ERROR", message, null, LogConsole.ERROR_STYLE, object, secondObject);
}
@Override
- public void error(String s, Object... objects) {
- delegate.error(s, objects);
- log("ERROR", s, null, LogConsole.ERROR_STYLE, objects);
+ public void error(String message, Object... objects) {
+ delegate.error(message, objects);
+ log("ERROR", message, null, LogConsole.ERROR_STYLE, objects);
}
@Override
- public void error(String s, Throwable throwable) {
- delegate.error(s, throwable);
- log("ERROR", s, throwable, LogConsole.ERROR_STYLE);
+ public void error(String message, Throwable throwable) {
+ delegate.error(message, throwable);
+ log("ERROR", message, throwable, LogConsole.ERROR_STYLE);
}
@Override
@@ -151,63 +151,63 @@ public class ModelerLogger implements Logger {
}
@Override
- public void error(Marker marker, String s) {
- delegate.error(marker, s);
- log("ERROR", s, null, LogConsole.ERROR_STYLE);
+ public void error(Marker marker, String message) {
+ delegate.error(marker, message);
+ log("ERROR", message, 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);
+ public void error(Marker marker, String message, Object object) {
+ delegate.error(marker, message , object);
+ log("ERROR", message, null, LogConsole.ERROR_STYLE, object);
}
@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);
+ public void error(Marker marker, String message, Object object, Object secondObject) {
+ delegate.error(marker, message , object, secondObject);
+ log("ERROR", message, null, LogConsole.ERROR_STYLE, object, secondObject);
}
@Override
- public void error(Marker marker, String s, Object... objects) {
- delegate.error(marker, s, objects);
- log("ERROR", s, null, LogConsole.ERROR_STYLE, objects);
+ public void error(Marker marker, String message, Object... objects) {
+ delegate.error(marker, message, objects);
+ log("ERROR", message, 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);
+ public void error(Marker marker, String message, Throwable throwable) {
+ delegate.error(marker, message, throwable);
+ log("ERROR", message, throwable, LogConsole.ERROR_STYLE);
}
@Override
- public void info(String s) {
- delegate.info(s);
- log("INFO", s, null, LogConsole.INFO_STYLE);
+ public void info(String message) {
+ delegate.info(message);
+ log("INFO", message, null, LogConsole.INFO_STYLE);
}
@Override
- public void info(String s, Object o) {
- delegate.info(s, o);
- log("INFO", s, null, LogConsole.INFO_STYLE, o);
+ public void info(String message, Object object) {
+ delegate.info(message, object);
+ log("INFO", message, null, LogConsole.INFO_STYLE, object);
}
@Override
- public void info(String s, Object o, Object o1) {
- delegate.info(s, o, o1);
- log("INFO", s, null, LogConsole.INFO_STYLE, o, o1);
+ public void info(String message, Object object, Object secondObject) {
+ delegate.info(message, object, secondObject);
+ log("INFO", message, null, LogConsole.INFO_STYLE, object, secondObject);
}
@Override
- public void info(String s, Object... objects) {
- delegate.info(s, objects);
- log("INFO", s, null, LogConsole.INFO_STYLE, objects);
+ public void info(String message, Object... objects) {
+ delegate.info(message, objects);
+ log("INFO", message, null, LogConsole.INFO_STYLE, objects);
}
@Override
- public void info(String s, Throwable throwable) {
- delegate.info(s, throwable);
- log("INFO", s, throwable, LogConsole.INFO_STYLE);
+ public void info(String message, Throwable throwable) {
+ delegate.info(message, throwable);
+ log("INFO", message, throwable, LogConsole.INFO_STYLE);
}
@Override
@@ -216,33 +216,33 @@ public class ModelerLogger implements Logger {
}
@Override
- public void info(Marker marker, String s) {
- delegate.info(marker, s);
- log("INFO", s, null, LogConsole.INFO_STYLE);
+ public void info(Marker marker, String message) {
+ delegate.info(marker, message);
+ log("INFO", message, 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);
+ public void info(Marker marker, String message, Object object) {
+ delegate.info(marker, message, object);
+ log("INFO", message, null, LogConsole.INFO_STYLE, object);
}
@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);
+ public void info(Marker marker, String message, Object object, Object secondObject) {
+ delegate.info(marker, message, object, secondObject);
+ log("INFO", message, null, LogConsole.INFO_STYLE, object, secondObject);
}
@Override
- public void info(Marker marker, String s, Object... objects) {
- delegate.info(marker, s, objects);
- log("INFO", s, null, LogConsole.INFO_STYLE, objects);
+ public void info(Marker marker, String message, Object... objects) {
+ delegate.info(marker, message, objects);
+ log("INFO", message, 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);
+ public void info(Marker marker, String message, Throwable throwable) {
+ delegate.info(marker, message, throwable);
+ log("INFO", message, throwable, LogConsole.INFO_STYLE);
}
@Override
@@ -261,33 +261,33 @@ public class ModelerLogger implements Logger {
}
@Override
- public void trace(String s) {
- delegate.trace(s);
- log("TRACE", s, null, LogConsole.DEBUG_STYLE);
+ public void trace(String message) {
+ delegate.trace(message);
+ log("TRACE", message, null, LogConsole.DEBUG_STYLE);
}
@Override
- public void trace(String s, Object o) {
- delegate.trace(s, o);
- log("TRACE", s, null, LogConsole.DEBUG_STYLE, o);
+ public void trace(String message, Object object) {
+ delegate.trace(message, object);
+ log("TRACE", message, null, LogConsole.DEBUG_STYLE, object);
}
@Override
- public void trace(String s, Object o, Object o1) {
- delegate.trace(s, o, o1);
- log("TRACE", s, null, LogConsole.DEBUG_STYLE, o, o1);
+ public void trace(String message, Object object, Object secondObject) {
+ delegate.trace(message, object, secondObject);
+ log("TRACE", message, null, LogConsole.DEBUG_STYLE, object, secondObject);
}
@Override
- public void trace(String s, Object... objects) {
- delegate.trace(s, objects);
- log("TRACE", s, null, LogConsole.DEBUG_STYLE, objects);
+ public void trace(String message, Object... objects) {
+ delegate.trace(message, objects);
+ log("TRACE", message, null, LogConsole.DEBUG_STYLE, objects);
}
@Override
- public void trace(String s, Throwable throwable) {
- delegate.trace(s, throwable);
- log("TRACE", s, throwable, LogConsole.DEBUG_STYLE);
+ public void trace(String message, Throwable throwable) {
+ delegate.trace(message, throwable);
+ log("TRACE", message, throwable, LogConsole.DEBUG_STYLE);
}
@Override
@@ -296,33 +296,33 @@ public class ModelerLogger implements Logger {
}
@Override
- public void trace(Marker marker, String s) {
- delegate.trace(marker, s);
- log("TRACE", s, null, LogConsole.DEBUG_STYLE);
+ public void trace(Marker marker, String message) {
+ delegate.trace(marker, message);
+ log("TRACE", message, 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);
+ public void trace(Marker marker, String message, Object object) {
+ delegate.trace(marker, message, object);
+ log("TRACE", message, null, LogConsole.DEBUG_STYLE, object);
}
@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);
+ public void trace(Marker marker, String message, Object object, Object secondObject) {
+ delegate.trace(marker, message, object, secondObject);
+ log("TRACE", message, null, LogConsole.DEBUG_STYLE, object, secondObject);
}
@Override
- public void trace(Marker marker, String s, Object... objects) {
- delegate.trace(marker, s, objects);
- log("TRACE", s, null, LogConsole.DEBUG_STYLE, objects);
+ public void trace(Marker marker, String message, Object... objects) {
+ delegate.trace(marker, message, objects);
+ log("TRACE", message, 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);
+ public void trace(Marker marker, String message, Throwable throwable) {
+ delegate.trace(marker, message, throwable);
+ log("TRACE", message, throwable, LogConsole.DEBUG_STYLE);
}
@Override
@@ -331,33 +331,33 @@ public class ModelerLogger implements Logger {
}
@Override
- public void warn(String s) {
- delegate.warn(s);
- log("WARN", s, null, LogConsole.WARN_STYLE);
+ public void warn(String message) {
+ delegate.warn(message);
+ log("WARN", message, null, LogConsole.WARN_STYLE);
}
@Override
- public void warn(String s, Object o) {
- delegate.warn(s, o);
- log("WARN", s, null, LogConsole.WARN_STYLE, o);
+ public void warn(String message, Object object) {
+ delegate.warn(message, object);
+ log("WARN", message, null, LogConsole.WARN_STYLE, object);
}
@Override
- public void warn(String s, Object... objects) {
- delegate.warn(s, objects);
- log("WARN", s, null, LogConsole.WARN_STYLE, objects);
+ public void warn(String message, Object... objects) {
+ delegate.warn(message, objects);
+ log("WARN", message, 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);
+ public void warn(String message, Object object, Object secondObject) {
+ delegate.warn(message, object, secondObject);
+ log("WARN", message, null, LogConsole.WARN_STYLE, object, secondObject);
}
@Override
- public void warn(String s, Throwable throwable) {
- delegate.warn(s, throwable);
- log("WARN", s, throwable, LogConsole.WARN_STYLE);
+ public void warn(String message, Throwable throwable) {
+ delegate.warn(message, throwable);
+ log("WARN", message, throwable, LogConsole.WARN_STYLE);
}
@Override
@@ -366,33 +366,33 @@ public class ModelerLogger implements Logger {
}
@Override
- public void warn(Marker marker, String s) {
- delegate.warn(marker, s);
- log("WARN", s, null, LogConsole.WARN_STYLE);
+ public void warn(Marker marker, String message) {
+ delegate.warn(marker, message);
+ log("WARN", message, 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);
+ public void warn(Marker marker, String message, Object object) {
+ delegate.warn(marker, message, object);
+ log("WARN", message, null, LogConsole.WARN_STYLE, object);
}
@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);
+ public void warn(Marker marker, String message, Object object, Object secondObject) {
+ delegate.warn(marker, message, object, secondObject);
+ log("WARN", message, null, LogConsole.WARN_STYLE, object, secondObject);
}
@Override
- public void warn(Marker marker, String s, Object... objects) {
- delegate.warn(marker, s, objects);
- log("WARN", s, null, LogConsole.WARN_STYLE, objects);
+ public void warn(Marker marker, String message, Object... objects) {
+ delegate.warn(marker, message, objects);
+ log("WARN", message, 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);
+ public void warn(Marker marker, String message, Throwable throwable) {
+ delegate.warn(marker, message, throwable);
+ log("WARN", message, throwable, LogConsole.WARN_STYLE);
}
@Override
@@ -404,15 +404,15 @@ public class ModelerLogger implements Logger {
* Prints common message to the console
*/
- private void log(String level, String message, Throwable t, AttributeSet style, Object... parameters) {
+ private void log(String level, String message, Throwable throwable, AttributeSet style, Object... parameters) {
for (Object parameter : parameters) {
message.replaceFirst("\\{\\}", String.valueOf(parameter));
}
- getLogConsole().appendMessage(level, message, t, style);
+ getLogConsole().appendMessage(level, message, throwable, style);
}
- private void log(String level, Object message, Throwable t, AttributeSet style) {
- getLogConsole().appendMessage(level, String.valueOf(message), t, style);
+ private void log(String level, Object message, Throwable throwable, AttributeSet style) {
+ getLogConsole().appendMessage(level, String.valueOf(message), throwable, style);
}
private LogConsole getLogConsole() {
[14/19] cayenne git commit: CAY-2280 update upgrade.txt,
replace commons-logging in docs and assembly files
Posted by nt...@apache.org.
CAY-2280 update upgrade.txt, replace commons-logging in docs and assembly files
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/ef5e5d84
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/ef5e5d84
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/ef5e5d84
Branch: refs/heads/master
Commit: ef5e5d84f97db58badbac975ce7a3c617ed10dfe
Parents: a35a460
Author: Maxim Petrusevich <ma...@gmail.com>
Authored: Thu Apr 13 11:04:31 2017 +0300
Committer: Maxim Petrusevich <ma...@gmail.com>
Committed: Thu Apr 13 11:04:31 2017 +0300
----------------------------------------------------------------------
.../resources/assemblies/assembly-generic.xml | 2 +-
.../main/resources/assemblies/assembly-mac.xml | 2 +-
.../resources/assemblies/assembly-windows.xml | 2 +-
build-tools/cayenne-test-utilities/pom.xml | 4 ---
cayenne-ant/pom.xml | 5 ----
cayenne-client/pom.xml | 5 ----
.../apache/cayenne/remote/BaseConnection.java | 2 +-
cayenne-dbcp2/pom.xml | 5 ++++
cayenne-dbsync/pom.xml | 5 ++++
cayenne-postcommit/pom.xml | 5 ++++
cayenne-server/pom.xml | 5 ++++
.../cayenne/log/CommonsJdbcEventLogger.java | 2 +-
docs/doc/pom.xml | 5 ----
docs/doc/src/main/resources/UPGRADE.txt | 17 ++++++++++++
.../src/docbkx/customizing-cayenne-runtime.xml | 2 +-
.../src/docbkx/including-cayenne-in-project.xml | 2 +-
eventbridges/cayenne-jgroups/pom.xml | 5 ++++
eventbridges/cayenne-jms/pom.xml | 5 ++++
eventbridges/cayenne-xmpp/pom.xml | 5 ++++
maven-plugins/cayenne-maven-plugin/pom.xml | 5 ++++
modeler/cayenne-wocompat/pom.xml | 6 +++++
pom.xml | 27 --------------------
22 files changed, 70 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ef5e5d84/assembly/src/main/resources/assemblies/assembly-generic.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/assembly-generic.xml b/assembly/src/main/resources/assemblies/assembly-generic.xml
index 9417d84..f5342aa 100644
--- a/assembly/src/main/resources/assemblies/assembly-generic.xml
+++ b/assembly/src/main/resources/assemblies/assembly-generic.xml
@@ -102,7 +102,7 @@
<!-- Include only a minimal set of dependencies to run cayenne-server and ant tasks -->
<includes>
<include>commons-collections:commons-collections</include>
- <include>commons-logging:commons-logging</include>
+ <include>slf4-api:slf4j-api</include>
<include>commons-lang:commons-lang</include>
<include>org.apache.velocity:velocity</include>
<include>foundrylogic.vpp:vpp</include>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ef5e5d84/assembly/src/main/resources/assemblies/assembly-mac.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/assembly-mac.xml b/assembly/src/main/resources/assemblies/assembly-mac.xml
index 206aca2..361bea7 100644
--- a/assembly/src/main/resources/assemblies/assembly-mac.xml
+++ b/assembly/src/main/resources/assemblies/assembly-mac.xml
@@ -102,7 +102,7 @@
<!-- Include only a minimal set of dependencies to run cayenne-server and ant tasks -->
<includes>
<include>commons-collections:commons-collections</include>
- <include>commons-logging:commons-logging</include>
+ <include>slf4j-api:slf4j-api</include>
<include>commons-lang:commons-lang</include>
<include>org.apache.velocity:velocity</include>
<include>foundrylogic.vpp:vpp</include>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ef5e5d84/assembly/src/main/resources/assemblies/assembly-windows.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/assemblies/assembly-windows.xml b/assembly/src/main/resources/assemblies/assembly-windows.xml
index d12b463..7d1d470 100644
--- a/assembly/src/main/resources/assemblies/assembly-windows.xml
+++ b/assembly/src/main/resources/assemblies/assembly-windows.xml
@@ -102,7 +102,7 @@
<!-- Include only a minimal set of dependencies to run cayenne-server and ant tasks -->
<includes>
<include>commons-collections:commons-collections</include>
- <include>commons-logging:commons-logging</include>
+ <include>slf4j-api:slf-api</include>
<include>commons-lang:commons-lang</include>
<include>org.apache.velocity:velocity</include>
<include>foundrylogic.vpp:vpp</include>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ef5e5d84/build-tools/cayenne-test-utilities/pom.xml
----------------------------------------------------------------------
diff --git a/build-tools/cayenne-test-utilities/pom.xml b/build-tools/cayenne-test-utilities/pom.xml
index baa98eb..8641e64 100644
--- a/build-tools/cayenne-test-utilities/pom.xml
+++ b/build-tools/cayenne-test-utilities/pom.xml
@@ -42,9 +42,5 @@
<artifactId>junit</artifactId>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ef5e5d84/cayenne-ant/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-ant/pom.xml b/cayenne-ant/pom.xml
index b6788d1..343f857 100644
--- a/cayenne-ant/pom.xml
+++ b/cayenne-ant/pom.xml
@@ -47,11 +47,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/ef5e5d84/cayenne-client/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-client/pom.xml b/cayenne-client/pom.xml
index fbc2915..1fe9107 100644
--- a/cayenne-client/pom.xml
+++ b/cayenne-client/pom.xml
@@ -45,11 +45,6 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>com.caucho</groupId>
<artifactId>hessian</artifactId>
<scope>compile</scope>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ef5e5d84/cayenne-client/src/main/java/org/apache/cayenne/remote/BaseConnection.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/main/java/org/apache/cayenne/remote/BaseConnection.java b/cayenne-client/src/main/java/org/apache/cayenne/remote/BaseConnection.java
index f8e3498..b26a5a7 100644
--- a/cayenne-client/src/main/java/org/apache/cayenne/remote/BaseConnection.java
+++ b/cayenne-client/src/main/java/org/apache/cayenne/remote/BaseConnection.java
@@ -25,7 +25,7 @@ import org.slf4j.LoggerFactory;
/**
* A common base class for concrete ClientConnection implementations. Provides message
- * logging functionality via commons-logging.
+ * logging functionality via slf4j logging.
*
* @since 1.2
*/
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ef5e5d84/cayenne-dbcp2/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-dbcp2/pom.xml b/cayenne-dbcp2/pom.xml
index 85855ee..7a5b031 100644
--- a/cayenne-dbcp2/pom.xml
+++ b/cayenne-dbcp2/pom.xml
@@ -51,6 +51,11 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ef5e5d84/cayenne-dbsync/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/pom.xml b/cayenne-dbsync/pom.xml
index 0838fa3..560a92d 100644
--- a/cayenne-dbsync/pom.xml
+++ b/cayenne-dbsync/pom.xml
@@ -75,6 +75,11 @@
<type>test-jar</type>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ef5e5d84/cayenne-postcommit/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-postcommit/pom.xml b/cayenne-postcommit/pom.xml
index 318a252..0dddd03 100644
--- a/cayenne-postcommit/pom.xml
+++ b/cayenne-postcommit/pom.xml
@@ -47,6 +47,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.cayenne.build-tools</groupId>
<artifactId>cayenne-test-utilities</artifactId>
<version>${project.version}</version>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ef5e5d84/cayenne-server/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/pom.xml b/cayenne-server/pom.xml
index 792f727..9d05911 100644
--- a/cayenne-server/pom.xml
+++ b/cayenne-server/pom.xml
@@ -119,6 +119,11 @@
<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/ef5e5d84/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 7c52bd5..17c5f4a 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
@@ -38,7 +38,7 @@ import java.util.Iterator;
import java.util.List;
/**
- * A {@link JdbcEventLogger} built on top of commons-logging.
+ * A {@link JdbcEventLogger} built on top of slf4j-api logger.
*
* @since 3.1
*/
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ef5e5d84/docs/doc/pom.xml
----------------------------------------------------------------------
diff --git a/docs/doc/pom.xml b/docs/doc/pom.xml
index 00e84d4..6235672 100644
--- a/docs/doc/pom.xml
+++ b/docs/doc/pom.xml
@@ -53,11 +53,6 @@
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
-
- <dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ef5e5d84/docs/doc/src/main/resources/UPGRADE.txt
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/UPGRADE.txt b/docs/doc/src/main/resources/UPGRADE.txt
index f3c538b..997285a 100644
--- a/docs/doc/src/main/resources/UPGRADE.txt
+++ b/docs/doc/src/main/resources/UPGRADE.txt
@@ -7,6 +7,23 @@ IMPORTANT: be sure to read all notes for the intermediate releases between your
UPGRADING TO 4.0.M6
+* Per CAY-2280 org.apache.commons.logging.Log logger was replaced to org.slf4j.Logger logger.
+
+ To change the logger to SLF4J need:
+ - Replace logger dependencies in pom.xml files from commons-logging to slf4j-api (if pom.xml contains slf4j-api
+ in test scope - replace test scope to compile scope);
+ - In classes that import org.apache.commons.logging.Log, replace org.apache.commons.logging.Log to
+ org.slf4j.Logger (and org.apache.commons.logging.LogFactory to org.slf4j.LoggerFactory if exist);
+ - Replace all fields type of Log to Logger (and LogFactory to LoggerFactory if exist, and methods call from
+ LogFactory.getLog(...) to LoggerFactory.getLogger(...) if exist);
+ - Change interface in custom loggers (MavenLogger, AntLogger, ModelerLogger(if exist)) from Log to Logger, and
+ override standart methods;
+ - Delete commons-logging.properties file.
+
+ For go to a SLF4J without changing the source code need:
+ - Add to pom.xml files jcl-over-slf4j dependency;
+ - Exclude commons-logging dependencies from pom.xml.
+
* Per CAY-2278 The org.apache.cayenne.lifecycle.audit package (with the exception of AuditableChild annotation) and the
org.apache.cayenne.lifecycle.changeset package where deprecated.
Weighted graph sorter moved to cayenne-server into org.apache.cayenne.ashwood package.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ef5e5d84/docs/docbook/cayenne-guide/src/docbkx/customizing-cayenne-runtime.xml
----------------------------------------------------------------------
diff --git a/docs/docbook/cayenne-guide/src/docbkx/customizing-cayenne-runtime.xml b/docs/docbook/cayenne-guide/src/docbkx/customizing-cayenne-runtime.xml
index 0182e2c..a26629d 100644
--- a/docs/docbook/cayenne-guide/src/docbkx/customizing-cayenne-runtime.xml
+++ b/docs/docbook/cayenne-guide/src/docbkx/customizing-cayenne-runtime.xml
@@ -382,7 +382,7 @@ ServerRuntime runtime = ServerRuntime.builder()
logging API for Cayenne internals. It provides facilities for logging queries,
commits, transactions, etc. The default implementation is
<code>org.apache.cayenne.log.CommonsJdbcEventLogger</code> that performs logging
- via commons-logging library. Cayenne library includes another potentially useful
+ via slf4j-api library. Cayenne library includes another potentially useful
logger - <code>org.apache.cayenne.log.FormattedCommonsJdbcEventLogger</code> that
produces formatted multiline SQL output that can be easier to read.</para>
</section>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ef5e5d84/docs/docbook/cayenne-guide/src/docbkx/including-cayenne-in-project.xml
----------------------------------------------------------------------
diff --git a/docs/docbook/cayenne-guide/src/docbkx/including-cayenne-in-project.xml b/docs/docbook/cayenne-guide/src/docbkx/including-cayenne-in-project.xml
index 06ff0da..f811356 100644
--- a/docs/docbook/cayenne-guide/src/docbkx/including-cayenne-in-project.xml
+++ b/docs/docbook/cayenne-guide/src/docbkx/including-cayenne-in-project.xml
@@ -686,7 +686,7 @@
<include name="cayenne-server-*.jar" />
<include name="commons-collections-*.jar" />
<include name="commons-lang-*.jar" />
- <include name="commons-logging-*.jar" />
+ <include name="slf4j-api-*.jar" />
<include name="velocity-*.jar" />
<include name="vpp-2.2.1.jar" />
</fileset>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ef5e5d84/eventbridges/cayenne-jgroups/pom.xml
----------------------------------------------------------------------
diff --git a/eventbridges/cayenne-jgroups/pom.xml b/eventbridges/cayenne-jgroups/pom.xml
index 8ba3fcb..e21ba03 100644
--- a/eventbridges/cayenne-jgroups/pom.xml
+++ b/eventbridges/cayenne-jgroups/pom.xml
@@ -39,6 +39,11 @@
<version>2.2.7</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ef5e5d84/eventbridges/cayenne-jms/pom.xml
----------------------------------------------------------------------
diff --git a/eventbridges/cayenne-jms/pom.xml b/eventbridges/cayenne-jms/pom.xml
index 7b275fa..84ce88a 100644
--- a/eventbridges/cayenne-jms/pom.xml
+++ b/eventbridges/cayenne-jms/pom.xml
@@ -39,6 +39,11 @@
<version>1.1</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ef5e5d84/eventbridges/cayenne-xmpp/pom.xml
----------------------------------------------------------------------
diff --git a/eventbridges/cayenne-xmpp/pom.xml b/eventbridges/cayenne-xmpp/pom.xml
index c78e981..574ea59 100644
--- a/eventbridges/cayenne-xmpp/pom.xml
+++ b/eventbridges/cayenne-xmpp/pom.xml
@@ -45,6 +45,11 @@
<version>2.2.1</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ef5e5d84/maven-plugins/cayenne-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/cayenne-maven-plugin/pom.xml b/maven-plugins/cayenne-maven-plugin/pom.xml
index 1578431..0142946 100644
--- a/maven-plugins/cayenne-maven-plugin/pom.xml
+++ b/maven-plugins/cayenne-maven-plugin/pom.xml
@@ -95,6 +95,11 @@
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ef5e5d84/modeler/cayenne-wocompat/pom.xml
----------------------------------------------------------------------
diff --git a/modeler/cayenne-wocompat/pom.xml b/modeler/cayenne-wocompat/pom.xml
index b596244..c5473ce 100644
--- a/modeler/cayenne-wocompat/pom.xml
+++ b/modeler/cayenne-wocompat/pom.xml
@@ -42,6 +42,12 @@
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-server</artifactId>
<version>${project.version}</version>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ef5e5d84/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4f542c9..0c8da83 100644
--- a/pom.xml
+++ b/pom.xml
@@ -309,33 +309,6 @@
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1</version>
- <exclusions>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
<version>2.1</version>
[10/19] cayenne git commit: + slf4j to
build-tools/cayenne-test-utilities
Posted by nt...@apache.org.
+ slf4j to build-tools/cayenne-test-utilities
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/620f7670
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/620f7670
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/620f7670
Branch: refs/heads/master
Commit: 620f76705be0114beb91f6635b5ac2604e3fc4f6
Parents: 4bc4dd1
Author: Maxim Petrusevich <ma...@gmail.com>
Authored: Wed Apr 12 12:20:16 2017 +0300
Committer: Maxim Petrusevich <ma...@gmail.com>
Committed: Wed Apr 12 12:20:16 2017 +0300
----------------------------------------------------------------------
build-tools/cayenne-test-utilities/pom.xml | 4 ++++
.../main/java/org/apache/cayenne/test/jdbc/UtilityLogger.java | 6 +++---
2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/620f7670/build-tools/cayenne-test-utilities/pom.xml
----------------------------------------------------------------------
diff --git a/build-tools/cayenne-test-utilities/pom.xml b/build-tools/cayenne-test-utilities/pom.xml
index 714850b..baa98eb 100644
--- a/build-tools/cayenne-test-utilities/pom.xml
+++ b/build-tools/cayenne-test-utilities/pom.xml
@@ -34,6 +34,10 @@
<dependencies>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>compile</scope>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/620f7670/build-tools/cayenne-test-utilities/src/main/java/org/apache/cayenne/test/jdbc/UtilityLogger.java
----------------------------------------------------------------------
diff --git a/build-tools/cayenne-test-utilities/src/main/java/org/apache/cayenne/test/jdbc/UtilityLogger.java b/build-tools/cayenne-test-utilities/src/main/java/org/apache/cayenne/test/jdbc/UtilityLogger.java
index b3d58d8..39c17a2 100644
--- a/build-tools/cayenne-test-utilities/src/main/java/org/apache/cayenne/test/jdbc/UtilityLogger.java
+++ b/build-tools/cayenne-test-utilities/src/main/java/org/apache/cayenne/test/jdbc/UtilityLogger.java
@@ -18,12 +18,12 @@
****************************************************************/
package org.apache.cayenne.test.jdbc;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
class UtilityLogger {
- private static Log logger = LogFactory.getLog(UtilityLogger.class);
+ private static Logger logger = LoggerFactory.getLogger(UtilityLogger.class);
static void log(String sql) {
logger.info(sql);
[11/19] cayenne git commit: + slf4j to
maven-plugins/cayenne-maven-plugin
Posted by nt...@apache.org.
+ slf4j to maven-plugins/cayenne-maven-plugin
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/00ef6135
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/00ef6135
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/00ef6135
Branch: refs/heads/master
Commit: 00ef6135976eb2481e7c2afb47b60b1b1a9d4b94
Parents: 620f767
Author: Maxim Petrusevich <ma...@gmail.com>
Authored: Wed Apr 12 12:52:47 2017 +0300
Committer: Maxim Petrusevich <ma...@gmail.com>
Committed: Wed Apr 12 12:52:47 2017 +0300
----------------------------------------------------------------------
.../cayenne/tools/CayenneGeneratorMojo.java | 4 +-
.../apache/cayenne/tools/DbGeneratorMojo.java | 4 +-
.../apache/cayenne/tools/DbImporterMojo.java | 6 +-
.../org/apache/cayenne/tools/MavenLogger.java | 302 +++++++++++++++++--
.../tools/DbImporterMojoConfigurationTest.java | 6 +-
.../cayenne/tools/DbImporterMojoTest.java | 14 +-
.../DbImporterOldMojoConfigurationTest.java | 6 +-
7 files changed, 289 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/00ef6135/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java b/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java
index 98e54e3..3736cef 100644
--- a/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java
+++ b/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java
@@ -23,7 +23,7 @@ import org.apache.cayenne.dbsync.filter.NamePatternMatcher;
import org.apache.cayenne.gen.ClassGenerationAction;
import org.apache.cayenne.gen.ClientClassGenerationAction;
import org.apache.cayenne.map.DataMap;
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
@@ -189,7 +189,7 @@ public class CayenneGeneratorMojo extends AbstractMojo {
destDir.mkdirs();
}
- Log logger = new MavenLogger(this);
+ Logger logger = new MavenLogger(this);
CayenneGeneratorMapLoaderAction loaderAction = new CayenneGeneratorMapLoaderAction();
loaderAction.setMainDataMapFile(map);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/00ef6135/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorMojo.java b/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorMojo.java
index fa88296..131f3de 100644
--- a/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorMojo.java
+++ b/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbGeneratorMojo.java
@@ -32,7 +32,7 @@ import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.MapLoader;
import org.apache.cayenne.dbsync.reverse.configuration.ToolsModule;
import org.apache.cayenne.util.Util;
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
@@ -119,7 +119,7 @@ public class DbGeneratorMojo extends AbstractMojo {
public void execute() throws MojoExecutionException, MojoFailureException {
- Log logger = new MavenLogger(this);
+ Logger logger = new MavenLogger(this);
// check missing data source parameters
dataSource.validate();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/00ef6135/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java b/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java
index ae9aa90..fc1a4e4 100644
--- a/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java
+++ b/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java
@@ -29,7 +29,7 @@ import org.apache.cayenne.dbsync.reverse.filters.FiltersConfigBuilder;
import org.apache.cayenne.di.DIBootstrap;
import org.apache.cayenne.di.Injector;
import org.apache.cayenne.util.Util;
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
@@ -108,7 +108,7 @@ public class DbImporterMojo extends AbstractMojo {
public void execute() throws MojoExecutionException, MojoFailureException {
- Log logger = new MavenLogger(this);
+ Logger logger = new MavenLogger(this);
// check missing data source parameters
dataSource.validate();
@@ -141,7 +141,7 @@ public class DbImporterMojo extends AbstractMojo {
}
}
- DbImportConfiguration createConfig(Log logger) {
+ DbImportConfiguration createConfig(Logger logger) {
DbImportConfiguration config = new DbImportConfiguration();
config.setAdapter(adapter);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/00ef6135/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/MavenLogger.java
----------------------------------------------------------------------
diff --git a/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/MavenLogger.java b/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/MavenLogger.java
index c439f98..f684528 100644
--- a/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/MavenLogger.java
+++ b/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/MavenLogger.java
@@ -19,87 +19,323 @@
package org.apache.cayenne.tools;
import org.apache.maven.plugin.AbstractMojo;
+import org.slf4j.Logger;
+import org.slf4j.Marker;
+import org.apache.maven.plugin.logging.Log;
/**
* @since 3.0
*/
-class MavenLogger implements org.apache.commons.logging.Log {
+class MavenLogger implements Logger {
- private org.apache.maven.plugin.logging.Log logger;
+ private Log logger;
public MavenLogger(AbstractMojo parent) {
this.logger = parent.getLog();
}
- public void debug(Object message, Throwable th) {
- logger.debug(String.valueOf(message), th);
+ @Override
+ public void debug(String s) {
+ logger.debug(s);
}
- public void debug(Object message) {
- logger.debug(String.valueOf(message));
+ @Override
+ public void debug(String s, Object o) {
+ logger.debug(s);
}
- public void error(Object message, Throwable th) {
- logger.error(String.valueOf(message), th);
+ @Override
+ public void debug(String s, Object o, Object o1) {
+ logger.debug(s);
}
- public void error(Object message) {
- logger.error(String.valueOf(message));
+ @Override
+ public void debug(String s, Object... objects) {
+ logger.debug(s);
}
- public void fatal(Object message, Throwable th) {
- logger.error(String.valueOf(message), th);
+ @Override
+ public void debug(String s, Throwable throwable) {
+ logger.debug(s, throwable);
}
- public void fatal(Object message) {
- logger.error(String.valueOf(message));
+ @Override
+ public boolean isDebugEnabled(Marker marker) {
+ return logger.isDebugEnabled();
}
- public void info(Object message, Throwable th) {
- logger.info(String.valueOf(message), th);
+ @Override
+ public void debug(Marker marker, String s) {
+ logger.debug(s);
}
- public void info(Object message) {
- logger.info(String.valueOf(message));
+ @Override
+ public void debug(Marker marker, String s, Object o) {
+ logger.debug(s);
}
- public boolean isDebugEnabled() {
- return logger.isDebugEnabled();
+ @Override
+ public void debug(Marker marker, String s, Object o, Object o1) {
+ logger.debug(s);
}
- public boolean isErrorEnabled() {
- return logger.isErrorEnabled();
+ @Override
+ public void debug(Marker marker, String s, Object... objects) {
+ logger.debug(s);
}
- public boolean isFatalEnabled() {
- return logger.isErrorEnabled();
+ @Override
+ public void debug(Marker marker, String s, Throwable throwable) {
+ logger.debug(s, throwable);
}
+ @Override
public boolean isInfoEnabled() {
return logger.isInfoEnabled();
}
+ @Override
+ public void error(String s) {
+ logger.error(s);
+ }
+
+ @Override
+ public void error(String s, Object o) {
+ logger.error(s);
+ }
+
+ @Override
+ public void error(String s, Object o, Object o1) {
+ logger.error(s);
+ }
+
+ @Override
+ public void error(String s, Object... objects) {
+ logger.error(s);
+ }
+
+ @Override
+ public void error(String s, Throwable throwable) {
+ logger.error(s, throwable);
+ }
+
+ @Override
+ public boolean isErrorEnabled(Marker marker) {
+ return logger.isErrorEnabled();
+ }
+
+ @Override
+ public void error(Marker marker, String s) {
+ logger.error(s);
+ }
+
+ @Override
+ public void error(Marker marker, String s, Object o) {
+ logger.error(s);
+ }
+
+ @Override
+ public void error(Marker marker, String s, Object o, Object o1) {
+ logger.error(s);
+ }
+
+ @Override
+ public void error(Marker marker, String s, Object... objects) {
+ logger.error(s);
+ }
+
+ @Override
+ public void error(Marker marker, String s, Throwable throwable) {
+ logger.error(s, throwable);
+ }
+
+ @Override
+ public void info(String s) {
+ logger.info(s);
+ }
+
+ @Override
+ public void info(String s, Object o) {
+ logger.info(s);
+ }
+
+ @Override
+ public void info(String s, Object o, Object o1) {
+ logger.info(s);
+ }
+
+ @Override
+ public void info(String s, Object... objects) {
+ logger.info(s);
+ }
+
+ @Override
+ public void info(String s, Throwable throwable) {
+ logger.info(s, throwable);
+ }
+
+ @Override
+ public boolean isInfoEnabled(Marker marker) {
+ return isInfoEnabled();
+ }
+
+ @Override
+ public void info(Marker marker, String s) {
+ logger.info(s);
+ }
+
+ @Override
+ public void info(Marker marker, String s, Object o) {
+ logger.info(s);
+ }
+
+ @Override
+ public void info(Marker marker, String s, Object o, Object o1) {
+ logger.info(s);
+ }
+
+ @Override
+ public void info(Marker marker, String s, Object... objects) {
+ logger.info(s);
+ }
+
+ @Override
+ public void info(Marker marker, String s, Throwable throwable) {
+ logger.info(s, throwable);
+ }
+
+ @Override
+ public boolean isWarnEnabled() {
+ return logger.isWarnEnabled();
+ }
+
+ @Override
+ public String getName() {
+ return this.getName();
+ }
+
+ @Override
public boolean isTraceEnabled() {
return logger.isDebugEnabled();
}
- public boolean isWarnEnabled() {
+ @Override
+ public void trace(String s) {
+ logger.debug(s);
+ }
+
+ @Override
+ public void trace(String s, Object o) {
+ logger.debug(s);
+ }
+
+ @Override
+ public void trace(String s, Object o, Object o1) {
+ logger.debug(s);
+ }
+
+ @Override
+ public void trace(String s, Object... objects) {
+ logger.debug(s);
+ }
+
+ @Override
+ public void trace(String s, Throwable throwable) {
+ logger.debug(s, throwable);
+ }
+
+ @Override
+ public boolean isTraceEnabled(Marker marker) {
+ return logger.isDebugEnabled();
+ }
+
+ @Override
+ public void trace(Marker marker, String s) {
+ logger.debug(s);
+ }
+
+ @Override
+ public void trace(Marker marker, String s, Object o) {
+ logger.debug(s);
+ }
+
+ @Override
+ public void trace(Marker marker, String s, Object o, Object o1) {
+ logger.debug(s);
+ }
+
+ @Override
+ public void trace(Marker marker, String s, Object... objects) {
+ logger.debug(s);
+ }
+
+ @Override
+ public void trace(Marker marker, String s, Throwable throwable) {
+ logger.debug(s, throwable);
+ }
+
+ @Override
+ public boolean isDebugEnabled() {
+ return logger.isDebugEnabled();
+ }
+
+ @Override
+ public void warn(String s) {
+ logger.warn(s);
+ }
+
+ @Override
+ public void warn(String s, Object o) {
+ logger.warn(s);
+ }
+
+ @Override
+ public void warn(String s, Object... objects) {
+ logger.warn(s);
+ }
+
+ @Override
+ public void warn(String s, Object o, Object o1) {
+ logger.warn(s);
+ }
+
+ @Override
+ public void warn(String s, Throwable throwable) {
+ logger.warn(s, throwable);
+ }
+
+ @Override
+ public boolean isWarnEnabled(Marker marker) {
return logger.isWarnEnabled();
}
- public void trace(Object message, Throwable th) {
- logger.debug(String.valueOf(message), th);
+ @Override
+ public void warn(Marker marker, String s) {
+ logger.warn(s);
}
- public void trace(Object message) {
- logger.debug(String.valueOf(message));
+ @Override
+ public void warn(Marker marker, String s, Object o) {
+ logger.warn(s);
}
- public void warn(Object message, Throwable th) {
- logger.warn(String.valueOf(message), th);
+ @Override
+ public void warn(Marker marker, String s, Object o, Object o1) {
+ logger.warn(s);
}
- public void warn(Object message) {
- logger.warn(String.valueOf(message));
+ @Override
+ public void warn(Marker marker, String s, Object... objects) {
+ logger.warn(s);
+ }
+
+ @Override
+ public void warn(Marker marker, String s, Throwable throwable) {
+ logger.warn(s, throwable);
+ }
+
+ @Override
+ public boolean isErrorEnabled() {
+ return logger.isErrorEnabled();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/00ef6135/maven-plugins/cayenne-maven-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoConfigurationTest.java
----------------------------------------------------------------------
diff --git a/maven-plugins/cayenne-maven-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoConfigurationTest.java b/maven-plugins/cayenne-maven-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoConfigurationTest.java
index e904216..6bae7e0 100644
--- a/maven-plugins/cayenne-maven-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoConfigurationTest.java
+++ b/maven-plugins/cayenne-maven-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoConfigurationTest.java
@@ -25,7 +25,7 @@ import org.apache.cayenne.dbsync.reverse.filters.FiltersConfig;
import org.apache.cayenne.dbsync.reverse.filters.IncludeTableFilter;
import org.apache.cayenne.dbsync.reverse.filters.PatternFilter;
import org.apache.cayenne.dbsync.reverse.filters.TableFilter;
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
import org.junit.Test;
@@ -67,7 +67,7 @@ public class DbImporterMojoConfigurationTest extends AbstractMojoTestCase {
@Test
public void testLoadSchema2() throws Exception {
- FiltersConfig filters = getCdbImport("pom-schema-2.xml").createConfig(mock(Log.class))
+ FiltersConfig filters = getCdbImport("pom-schema-2.xml").createConfig(mock(Logger.class))
.getDbLoaderConfig().getFiltersConfig();
TreeSet<IncludeTableFilter> includes = new TreeSet<>();
@@ -87,7 +87,7 @@ public class DbImporterMojoConfigurationTest extends AbstractMojoTestCase {
@Test
public void testDefaultPackage() throws Exception {
- DbImportConfiguration config = getCdbImport("pom-default-package.xml").createConfig(mock(Log.class));
+ DbImportConfiguration config = getCdbImport("pom-default-package.xml").createConfig(mock(Logger.class));
assertEquals("com.example.test", config.getDefaultPackage());
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/00ef6135/maven-plugins/cayenne-maven-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java
----------------------------------------------------------------------
diff --git a/maven-plugins/cayenne-maven-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java b/maven-plugins/cayenne-maven-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java
index eec1c18..63a349d 100644
--- a/maven-plugins/cayenne-maven-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java
+++ b/maven-plugins/cayenne-maven-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java
@@ -24,7 +24,7 @@ import org.apache.cayenne.dbsync.reverse.dbimport.IncludeTable;
import org.apache.cayenne.dbsync.reverse.dbimport.Schema;
import org.apache.cayenne.test.jdbc.SQLReader;
import org.apache.cayenne.test.resource.ResourceUtil;
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
import org.codehaus.plexus.util.FileUtils;
@@ -75,23 +75,23 @@ public class DbImporterMojoTest extends AbstractMojoTestCase {
@Test
public void testToParameters_MeaningfulPkTables() throws Exception {
- DbImportConfiguration parameters1 = getCdbImport("dbimporter-pom1.xml").createConfig(mock(Log.class));
+ DbImportConfiguration parameters1 = getCdbImport("dbimporter-pom1.xml").createConfig(mock(Logger.class));
assertNull(parameters1.getMeaningfulPkTables());
assertPathEquals("target/test/org/apache/cayenne/tools/dbimporter-map1.map.xml", parameters1.getTargetDataMap()
.getPath());
- assertEquals("x,b*", getCdbImport("dbimporter-pom2.xml").createConfig(mock(Log.class)).getMeaningfulPkTables());
- assertEquals("*", getCdbImport("dbimporter-pom3.xml").createConfig(mock(Log.class)).getMeaningfulPkTables());
+ assertEquals("x,b*", getCdbImport("dbimporter-pom2.xml").createConfig(mock(Logger.class)).getMeaningfulPkTables());
+ assertEquals("*", getCdbImport("dbimporter-pom3.xml").createConfig(mock(Logger.class)).getMeaningfulPkTables());
}
public void testToParameters_Map() throws Exception {
- DbImportConfiguration parameters1 = getCdbImport("dbimporter-pom1.xml").createConfig(mock(Log.class));
+ DbImportConfiguration parameters1 = getCdbImport("dbimporter-pom1.xml").createConfig(mock(Logger.class));
assertNotNull(parameters1.getTargetDataMap());
assertPathEquals("target/test/org/apache/cayenne/tools/dbimporter-map1.map.xml", parameters1.getTargetDataMap()
.getPath());
- assertNull(getCdbImport("dbimporter-pom2.xml").createConfig(mock(Log.class)).getTargetDataMap());
+ assertNull(getCdbImport("dbimporter-pom2.xml").createConfig(mock(Logger.class)).getTargetDataMap());
}
private DbImporterMojo getCdbImport(String pomFileName) throws Exception {
@@ -340,7 +340,7 @@ public class DbImporterMojoTest extends AbstractMojoTestCase {
mapFileCopy = mapFile;
}
- DbImportConfiguration parameters = cdbImport.createConfig(mock(Log.class));
+ DbImportConfiguration parameters = cdbImport.createConfig(mock(Logger.class));
prepareDatabase(name, parameters);
try {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/00ef6135/maven-plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DbImporterOldMojoConfigurationTest.java
----------------------------------------------------------------------
diff --git a/maven-plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DbImporterOldMojoConfigurationTest.java b/maven-plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DbImporterOldMojoConfigurationTest.java
index a14a6b3..17f06b1 100644
--- a/maven-plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DbImporterOldMojoConfigurationTest.java
+++ b/maven-plugins/maven-cayenne-plugin/src/test/java/org/apache/cayenne/tools/DbImporterOldMojoConfigurationTest.java
@@ -31,7 +31,7 @@ import org.apache.cayenne.dbsync.reverse.filters.FiltersConfig;
import org.apache.cayenne.dbsync.reverse.filters.IncludeTableFilter;
import org.apache.cayenne.dbsync.reverse.filters.PatternFilter;
import org.apache.cayenne.dbsync.reverse.filters.TableFilter;
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
import static org.apache.cayenne.dbsync.reverse.dbimport.ReverseEngineeringUtils.*;
@@ -64,7 +64,7 @@ public class DbImporterOldMojoConfigurationTest extends AbstractMojoTestCase {
}
public void testLoadSchema2() throws Exception {
- FiltersConfig filters = getCdbImport("pom-schema-2.xml").createConfig(mock(Log.class))
+ FiltersConfig filters = getCdbImport("pom-schema-2.xml").createConfig(mock(Logger.class))
.getDbLoaderConfig().getFiltersConfig();
TreeSet<IncludeTableFilter> includes = new TreeSet<>();
@@ -82,7 +82,7 @@ public class DbImporterOldMojoConfigurationTest extends AbstractMojoTestCase {
}
public void testDefaultPackage() throws Exception {
- DbImportConfiguration config = getCdbImport("pom-default-package.xml").createConfig(mock(Log.class));
+ DbImportConfiguration config = getCdbImport("pom-default-package.xml").createConfig(mock(Logger.class));
assertEquals("com.example.test", config.getDefaultPackage());
}
[08/19] cayenne git commit: + slf4j to cayenne-dbcp2
Posted by nt...@apache.org.
+ slf4j to cayenne-dbcp2
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/9c9a35d4
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/9c9a35d4
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/9c9a35d4
Branch: refs/heads/master
Commit: 9c9a35d4ec4abc55541a3c69c94771cf4081cef9
Parents: af0a2fc
Author: Maxim Petrusevich <ma...@gmail.com>
Authored: Wed Apr 12 12:12:04 2017 +0300
Committer: Maxim Petrusevich <ma...@gmail.com>
Committed: Wed Apr 12 12:12:04 2017 +0300
----------------------------------------------------------------------
cayenne-dbcp2/pom.xml | 5 +++++
.../cayenne/configuration/server/DBCPDataSourceFactory.java | 6 +++---
2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/9c9a35d4/cayenne-dbcp2/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-dbcp2/pom.xml b/cayenne-dbcp2/pom.xml
index 91fe6d7..85855ee 100644
--- a/cayenne-dbcp2/pom.xml
+++ b/cayenne-dbcp2/pom.xml
@@ -34,6 +34,11 @@
<artifactId>commons-dbcp2</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
<!-- Test dependencies -->
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/9c9a35d4/cayenne-dbcp2/src/main/java/org/apache/cayenne/configuration/server/DBCPDataSourceFactory.java
----------------------------------------------------------------------
diff --git a/cayenne-dbcp2/src/main/java/org/apache/cayenne/configuration/server/DBCPDataSourceFactory.java b/cayenne-dbcp2/src/main/java/org/apache/cayenne/configuration/server/DBCPDataSourceFactory.java
index 69c5bdd..54d3a6d 100644
--- a/cayenne-dbcp2/src/main/java/org/apache/cayenne/configuration/server/DBCPDataSourceFactory.java
+++ b/cayenne-dbcp2/src/main/java/org/apache/cayenne/configuration/server/DBCPDataSourceFactory.java
@@ -28,8 +28,8 @@ import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.configuration.DataNodeDescriptor;
import org.apache.cayenne.resource.Resource;
import org.apache.commons.dbcp2.BasicDataSourceFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A {@link DataSourceFactory} based on DBCP2 connection pool library.
@@ -38,7 +38,7 @@ public class DBCPDataSourceFactory implements DataSourceFactory {
private static final String DBCP2_PROPERTIES = "dbcp2.properties";
- private static final Log logger = LogFactory.getLog(DBCPDataSourceFactory.class);
+ private static final Logger logger = LoggerFactory.getLogger(DBCPDataSourceFactory.class);
@Override
public DataSource getDataSource(DataNodeDescriptor nodeDescriptor) throws Exception {
[07/19] cayenne git commit: + slf4j to cayenne-client-jetty
Posted by nt...@apache.org.
+ slf4j to cayenne-client-jetty
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/af0a2fc1
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/af0a2fc1
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/af0a2fc1
Branch: refs/heads/master
Commit: af0a2fc1a1aa6b24e49c019a5ea6dc3cbaf2a6b4
Parents: a9b4b3d
Author: Maxim Petrusevich <ma...@gmail.com>
Authored: Wed Apr 12 12:09:53 2017 +0300
Committer: Maxim Petrusevich <ma...@gmail.com>
Committed: Wed Apr 12 12:09:53 2017 +0300
----------------------------------------------------------------------
cayenne-client-jetty/pom.xml | 4 ++++
.../apache/cayenne/rop/JettyHttpClientConnectionProvider.java | 6 +++---
.../org/apache/cayenne/rop/http/JettyHttpROPConnector.java | 6 +++---
3 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/af0a2fc1/cayenne-client-jetty/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-client-jetty/pom.xml b/cayenne-client-jetty/pom.xml
index d12861b..4ee6abf 100644
--- a/cayenne-client-jetty/pom.xml
+++ b/cayenne-client-jetty/pom.xml
@@ -74,6 +74,10 @@
<artifactId>cayenne-client</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
<!-- Jetty client -->
<dependency>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/af0a2fc1/cayenne-client-jetty/src/main/java/org/apache/cayenne/rop/JettyHttpClientConnectionProvider.java
----------------------------------------------------------------------
diff --git a/cayenne-client-jetty/src/main/java/org/apache/cayenne/rop/JettyHttpClientConnectionProvider.java b/cayenne-client-jetty/src/main/java/org/apache/cayenne/rop/JettyHttpClientConnectionProvider.java
index 6a616df..3a3fb25 100644
--- a/cayenne-client-jetty/src/main/java/org/apache/cayenne/rop/JettyHttpClientConnectionProvider.java
+++ b/cayenne-client-jetty/src/main/java/org/apache/cayenne/rop/JettyHttpClientConnectionProvider.java
@@ -28,8 +28,8 @@ import org.apache.cayenne.di.Inject;
import org.apache.cayenne.di.Provider;
import org.apache.cayenne.remote.ClientConnection;
import org.apache.cayenne.rop.http.JettyHttpROPConnector;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.client.api.AuthenticationStore;
import org.eclipse.jetty.client.util.BasicAuthentication;
@@ -43,7 +43,7 @@ import java.net.URI;
*/
public class JettyHttpClientConnectionProvider implements Provider<ClientConnection> {
- private static Log logger = LogFactory.getLog(JettyHttpROPConnector.class);
+ private static Logger logger = LoggerFactory.getLogger(JettyHttpROPConnector.class);
@Inject
protected RuntimeProperties runtimeProperties;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/af0a2fc1/cayenne-client-jetty/src/main/java/org/apache/cayenne/rop/http/JettyHttpROPConnector.java
----------------------------------------------------------------------
diff --git a/cayenne-client-jetty/src/main/java/org/apache/cayenne/rop/http/JettyHttpROPConnector.java b/cayenne-client-jetty/src/main/java/org/apache/cayenne/rop/http/JettyHttpROPConnector.java
index f2c0005..2a308dc 100644
--- a/cayenne-client-jetty/src/main/java/org/apache/cayenne/rop/http/JettyHttpROPConnector.java
+++ b/cayenne-client-jetty/src/main/java/org/apache/cayenne/rop/http/JettyHttpROPConnector.java
@@ -22,8 +22,7 @@ package org.apache.cayenne.rop.http;
import org.apache.cayenne.remote.ClientConnection;
import org.apache.cayenne.remote.RemoteSession;
import org.apache.cayenne.rop.*;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.client.api.ContentResponse;
import org.eclipse.jetty.client.api.Request;
@@ -32,6 +31,7 @@ import org.eclipse.jetty.client.util.BytesContentProvider;
import org.eclipse.jetty.client.util.InputStreamResponseListener;
import org.eclipse.jetty.http.HttpHeader;
import org.eclipse.jetty.http.HttpMethod;
+import org.slf4j.LoggerFactory;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -47,7 +47,7 @@ import java.util.concurrent.TimeUnit;
*/
public class JettyHttpROPConnector implements ROPConnector {
- private static Log logger = LogFactory.getLog(JettyHttpROPConnector.class);
+ private static Logger logger = LoggerFactory.getLogger(JettyHttpROPConnector.class);
public static final String SESSION_COOKIE_NAME = "JSESSIONID";
[15/19] cayenne git commit: CAY-2280 rebase slf4j-simple in test scope
Posted by nt...@apache.org.
CAY-2280 rebase slf4j-simple in test scope
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/04ab1bf0
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/04ab1bf0
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/04ab1bf0
Branch: refs/heads/master
Commit: 04ab1bf05565b1cfcc400518a0012efa4494851b
Parents: ef5e5d8
Author: Maxim Petrusevich <ma...@gmail.com>
Authored: Mon Apr 17 14:16:19 2017 +0300
Committer: Maxim Petrusevich <ma...@gmail.com>
Committed: Mon Apr 17 14:16:19 2017 +0300
----------------------------------------------------------------------
cayenne-cache-invalidation/pom.xml | 5 +++++
cayenne-client-jetty/pom.xml | 5 +++++
cayenne-protostuff/pom.xml | 5 +++++
3 files changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/04ab1bf0/cayenne-cache-invalidation/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-cache-invalidation/pom.xml b/cayenne-cache-invalidation/pom.xml
index a59a576..ec4a84f 100644
--- a/cayenne-cache-invalidation/pom.xml
+++ b/cayenne-cache-invalidation/pom.xml
@@ -47,6 +47,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/04ab1bf0/cayenne-client-jetty/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-client-jetty/pom.xml b/cayenne-client-jetty/pom.xml
index 4ee6abf..1c1627d 100644
--- a/cayenne-client-jetty/pom.xml
+++ b/cayenne-client-jetty/pom.xml
@@ -121,6 +121,11 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/04ab1bf0/cayenne-protostuff/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-protostuff/pom.xml b/cayenne-protostuff/pom.xml
index a7326c8..5fcc618 100644
--- a/cayenne-protostuff/pom.xml
+++ b/cayenne-protostuff/pom.xml
@@ -87,6 +87,11 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
[18/19] cayenne git commit: Merge remote-tracking branch
'remotes/parent/pr/196' into asf-master
Posted by nt...@apache.org.
Merge remote-tracking branch 'remotes/parent/pr/196' into asf-master
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/e1cd8bc4
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/e1cd8bc4
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/e1cd8bc4
Branch: refs/heads/master
Commit: e1cd8bc4b2072a524291e13d231229b4e342ad77
Parents: 72889db a6f272b
Author: Nikita Timofeev <st...@gmail.com>
Authored: Wed Apr 26 12:18:52 2017 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Wed Apr 26 12:18:52 2017 +0300
----------------------------------------------------------------------
.../resources/assemblies/assembly-generic.xml | 2 +-
.../main/resources/assemblies/assembly-mac.xml | 2 +-
.../resources/assemblies/assembly-windows.xml | 2 +-
build-tools/cayenne-test-utilities/pom.xml | 8 +-
.../apache/cayenne/test/jdbc/UtilityLogger.java | 6 +-
cayenne-ant/pom.xml | 14 +-
.../org/apache/cayenne/tools/AntLogger.java | 296 +++++++++--
.../apache/cayenne/tools/DbGeneratorTask.java | 4 +-
.../apache/cayenne/tools/DbImporterTask.java | 4 +-
.../cayenne/tools/DbGeneratorTaskTest.java | 4 +-
cayenne-cache-invalidation/pom.xml | 5 +
cayenne-cgen/pom.xml | 4 +-
.../cayenne/gen/ClassGenerationAction.java | 6 +-
cayenne-client-jetty/pom.xml | 9 +
.../rop/JettyHttpClientConnectionProvider.java | 6 +-
.../cayenne/rop/http/JettyHttpROPConnector.java | 6 +-
cayenne-client/pom.xml | 15 +-
.../apache/cayenne/remote/BaseConnection.java | 10 +-
.../cayenne/rop/http/HttpROPConnector.java | 6 +-
cayenne-dbcp2/pom.xml | 10 +
.../server/DBCPDataSourceFactory.java | 6 +-
cayenne-dbsync/pom.xml | 17 +-
.../dbsync/filter/NamePatternMatcher.java | 6 +-
.../merge/context/EntityMergeSupport.java | 6 +-
.../reverse/configuration/ToolsModule.java | 8 +-
.../reverse/dbimport/DbImportConfiguration.java | 8 +-
.../reverse/dbimport/DefaultDbImportAction.java | 9 +-
.../dbimport/ManyToManyCandidateEntity.java | 6 +-
.../dbsync/reverse/dbload/AttributeLoader.java | 6 +-
.../dbsync/reverse/dbload/EntityLoader.java | 6 +-
.../reverse/dbload/ExportedKeyLoader.java | 6 +-
.../reverse/dbload/LoggingDbLoaderDelegate.java | 6 +-
.../dbsync/reverse/dbload/PrimaryKeyLoader.java | 6 +-
.../reverse/dbload/ProcedureColumnLoader.java | 6 +-
.../dbsync/reverse/dbload/ProcedureLoader.java | 6 +-
.../reverse/dbload/RelationshipLoader.java | 6 +-
.../apache/cayenne/dbsync/merge/MergeCase.java | 8 +-
.../reverse/configuration/ToolsModuleTest.java | 8 +-
.../reverse/dbimport/DbImportModuleTest.java | 4 +-
.../dbimport/DefaultDbImportActionTest.java | 6 +-
cayenne-postcommit/pom.xml | 5 +
.../postcommit/DeletedDiffProcessor.java | 6 +-
.../postcommit/PostCommitModuleBuilder.java | 6 +-
cayenne-project/pom.xml | 10 +-
...XMLDataChannelDescriptorLoader_V3_0_0_1.java | 6 +-
.../v6/XMLDataSourceInfoLoader_V3_0_0_1.java | 16 +-
cayenne-protostuff/pom.xml | 5 +
cayenne-server/pom.xml | 22 +-
.../org/apache/cayenne/access/DataRowStore.java | 6 +-
.../org/apache/cayenne/access/DbGenerator.java | 6 +-
.../apache/cayenne/access/ObjectResolver.java | 6 +-
.../access/dbsync/CreateIfNoSchemaStrategy.java | 6 +-
.../ThrowOnPartialOrCreateSchemaStrategy.java | 6 +-
.../dbsync/ThrowOnPartialSchemaStrategy.java | 6 +-
.../access/jdbc/RowDescriptorBuilder.java | 6 +-
.../access/types/SerializableTypeFactory.java | 6 +-
.../apache/cayenne/cache/EhCacheQueryCache.java | 6 +-
.../DefaultDataChannelDescriptorMerger.java | 8 +-
.../XMLDataChannelDescriptorLoader.java | 16 +-
.../cayenne/configuration/XMLDataMapLoader.java | 6 +-
.../server/DataDomainProvider.java | 6 +-
.../server/DelegatingDataSourceFactory.java | 8 +-
.../server/JNDIDataSourceFactory.java | 6 +-
.../server/XMLPoolingDataSourceFactory.java | 6 +-
.../org/apache/cayenne/conn/DataSourceInfo.java | 6 +-
.../cayenne/datasource/DriverDataSource.java | 9 +-
.../datasource/UnmanagedPoolingDataSource.java | 9 +-
.../cayenne/dba/mysql/MySQLPkGenerator.java | 6 +-
.../org/apache/cayenne/exp/parser/ASTEqual.java | 6 +-
.../apache/cayenne/exp/parser/ASTObjPath.java | 6 +-
.../cayenne/log/CommonsJdbcEventLogger.java | 8 +-
.../org/apache/cayenne/map/EntityResolver.java | 6 +-
.../org/apache/cayenne/map/MappingCache.java | 6 +-
.../apache/cayenne/query/CacheableQuery.java | 6 +-
.../remote/service/BaseRemoteService.java | 8 +-
...aseSchemaUpdateStrategy_ConcurrencyTest.java | 6 +-
.../datasource/ManagedPoolingDataSourceIT.java | 6 +-
.../java/org/apache/cayenne/unit/JNDISetup.java | 6 +-
.../org/apache/cayenne/unit/UnitDbAdapter.java | 6 +-
.../cayenne/unit/di/server/SchemaBuilder.java | 6 +-
.../ServerCaseDataSourceInfoProvider.java | 6 +-
docs/doc/pom.xml | 5 -
docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 +
docs/doc/src/main/resources/UPGRADE.txt | 10 +
.../src/docbkx/customizing-cayenne-runtime.xml | 2 +-
.../src/docbkx/including-cayenne-in-project.xml | 2 +-
.../getting-started/src/docbkx/java-classes.xml | 11 +-
eventbridges/cayenne-jgroups/pom.xml | 5 +
eventbridges/cayenne-jms/pom.xml | 5 +
eventbridges/cayenne-xmpp/pom.xml | 5 +
maven-plugins/cayenne-maven-plugin/pom.xml | 6 +
.../cayenne/tools/CayenneGeneratorMojo.java | 4 +-
.../apache/cayenne/tools/DbGeneratorMojo.java | 4 +-
.../apache/cayenne/tools/DbImporterMojo.java | 6 +-
.../org/apache/cayenne/tools/MavenLogger.java | 304 ++++++++++--
.../tools/DbImporterMojoConfigurationTest.java | 6 +-
.../cayenne/tools/DbImporterMojoTest.java | 14 +-
.../DbImporterOldMojoConfigurationTest.java | 6 +-
.../generic/GenericPlatformInitializer.java | 6 +-
.../modeler/win/WinPlatformInitializer.java | 6 +-
modeler/cayenne-modeler/pom.xml | 4 +-
.../cayenne/modeler/CayenneModelerFrame.java | 4 +-
.../cayenne/modeler/CodeTemplateManager.java | 6 +-
.../java/org/apache/cayenne/modeler/Main.java | 7 +-
.../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 +-
.../modeler/dialog/db/load/LoadDataMapTask.java | 6 +-
.../dialog/db/load/ModelerDbImportAction.java | 4 +-
.../modeler/dialog/db/merge/MergerOptions.java | 4 +-
.../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 | 18 +-
.../cayenne/modeler/util/ModelerLogger.java | 494 ++++++++++++++++---
.../cayenne/pref/CayennePreferenceEditor.java | 6 +-
.../components/textpane/JCayenneTextPane.java | 6 +-
.../java/org/slf4j/impl/StaticLoggerBinder.java | 29 ++
.../main/resources/commons-logging.properties | 18 -
modeler/cayenne-wocompat/pom.xml | 6 +
.../cayenne/wocompat/EOModelProcessor.java | 6 +-
pom.xml | 36 +-
141 files changed, 1473 insertions(+), 591 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e1cd8bc4/docs/doc/src/main/resources/RELEASE-NOTES.txt
----------------------------------------------------------------------
[17/19] cayenne git commit: CAY-2280 + custom modeler logger
Posted by nt...@apache.org.
CAY-2280 + custom modeler logger
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/a6f272bd
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/a6f272bd
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/a6f272bd
Branch: refs/heads/master
Commit: a6f272bd2ef9e33b847fca6f0859250ea70ad10e
Parents: 1f17edb
Author: Maxim Petrusevich <ma...@gmail.com>
Authored: Fri Apr 21 14:47:39 2017 +0300
Committer: Maxim Petrusevich <ma...@gmail.com>
Committed: Fri Apr 21 14:47:39 2017 +0300
----------------------------------------------------------------------
maven-plugins/cayenne-maven-plugin/pom.xml | 1 +
modeler/cayenne-modeler/pom.xml | 5 -
.../java/org/apache/cayenne/modeler/Main.java | 1 -
.../cayenne/modeler/util/ModelerLogFactory.java | 15 +-
.../cayenne/modeler/util/ModelerLogger.java | 244 +++++++++++++------
.../java/org/slf4j/impl/StaticLoggerBinder.java | 29 +++
pom.xml | 1 +
7 files changed, 206 insertions(+), 90 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a6f272bd/maven-plugins/cayenne-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-plugins/cayenne-maven-plugin/pom.xml b/maven-plugins/cayenne-maven-plugin/pom.xml
index 0142946..bb70da8 100644
--- a/maven-plugins/cayenne-maven-plugin/pom.xml
+++ b/maven-plugins/cayenne-maven-plugin/pom.xml
@@ -97,6 +97,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a6f272bd/modeler/cayenne-modeler/pom.xml
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/pom.xml b/modeler/cayenne-modeler/pom.xml
index 9735c15..921e0ca 100644
--- a/modeler/cayenne-modeler/pom.xml
+++ b/modeler/cayenne-modeler/pom.xml
@@ -48,11 +48,6 @@
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a6f272bd/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 e8193a3..a431cc9 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
@@ -69,7 +69,6 @@ public class Main {
// TODO: use module auto-loading...
final Injector injector = DIBootstrap.createInjector(appendModules(new ArrayList<Module>()));
-
logger.info("Starting CayenneModeler.");
logger.info("JRE v."
+ System.getProperty("java.version")
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a6f272bd/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 56a4d97..1a2aec0 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,14 +21,12 @@ package org.apache.cayenne.modeler.util;
import java.util.HashMap;
import java.util.Map;
-import org.slf4j.Logger;
-import org.slf4j.impl.SimpleLoggerFactory;
+import org.slf4j.ILoggerFactory;
/**
- * Factory for creating ModelerLogger instances. LogFactoryImpl is subclassed to
- * save default behavior
+ * Factory for creating ModelerLogger instances.
*/
-public class ModelerLogFactory extends SimpleLoggerFactory {
+public class ModelerLogFactory implements ILoggerFactory {
/**
* Local cache of modeler loggers
@@ -39,13 +37,14 @@ public class ModelerLogFactory extends SimpleLoggerFactory {
localCache = new HashMap<>();
}
- public Logger getInstance(String name) {
+ public ModelerLogger getLogger(String name) {
ModelerLogger local = localCache.get(name);
if (local == null) {
- Logger def = super.getLogger(name);
- local = new ModelerLogger(name, def);
+ //Logger def = LoggerFactory.getLogger(name);
+ local = new ModelerLogger(name);
localCache.put(name, local);
}
return local;
}
+
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a6f272bd/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 9dcc224..739cd7a 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
@@ -21,307 +21,401 @@ package org.apache.cayenne.modeler.util;
import org.apache.cayenne.modeler.dialog.LogConsole;
import org.slf4j.Logger;
import org.slf4j.Marker;
+import org.slf4j.helpers.FormattingTuple;
+import org.slf4j.helpers.MessageFormatter;
import javax.swing.text.AttributeSet;
+import java.io.PrintStream;
+import java.text.SimpleDateFormat;
+import java.util.Date;
/**
- * ModelerLogger is a Log implementation, which performs output
- * to the LogConsole. Default behavior is saved since they are delegated
- * to default Log instance.
+ * ModelerLogger is a Logger implementation, which performs output
+ * to the LogConsole.
*/
public class ModelerLogger implements Logger {
- /**
- * 'Default' Log instance (i.e. Log4jLogger, Jdk14Logger, or other)
- */
- Logger delegate;
+
+ private static final int BUFFER_SIZE = 32;
+ private static final byte LOG_LEVEL_INFO = 2;
+ private static final byte LOG_LEVEL_DEBUG = 1;
+ private static final byte LOG_LEVEL_TRACE = 0;
+ private static final byte LOG_LEVEL_WARNING = 3;
+ private static final byte LOG_LEVEL_ERROR = 4;
+
+ private static final String INFO_LOG_NAME = "INFO";
+ private static final String DEBUG_LOG_NAME = "DEBUG";
+ private static final String TRACE_LOG_NAME = "TRACE";
+ private static final String WARNING_LOG_NAME = "WARNING";
+ private static final String ERROR_LOG_NAME = "ERROR";
+ private static final String DATE_FORMAT = "yyyy/MM/dd HH.mm.ss";
/**
* Logger name
*/
- String name;
-
- public ModelerLogger(String name, Logger delegate) {
+ private String name;
+ private int currentLogLevel = LOG_LEVEL_INFO;
+
+ public ModelerLogger(String name) {
this.name = name;
- this.delegate = delegate;
+ }
+
+ private String getLogLevel(byte level) {
+ switch (level) {
+ case LOG_LEVEL_INFO:
+ return INFO_LOG_NAME;
+
+ case LOG_LEVEL_DEBUG:
+ return DEBUG_LOG_NAME;
+
+ case LOG_LEVEL_TRACE:
+ return TRACE_LOG_NAME;
+
+ case LOG_LEVEL_WARNING:
+ return WARNING_LOG_NAME;
+
+ case LOG_LEVEL_ERROR:
+ return ERROR_LOG_NAME;
+
+ default:
+ throw new IllegalStateException("Unregistered log level - " + level);
+
+ }
+ }
+
+ private void consoleLog(byte level, String message, Throwable throwable) {
+ if(this.isLevelEnabled(level)) {
+ StringBuilder buffer = new StringBuilder(BUFFER_SIZE);
+ buffer.append(this.getFormattedDate());
+ buffer.append(' ');
+
+ buffer.append('[');
+ buffer.append(Thread.currentThread().getName());
+ buffer.append("] ");
+
+ buffer.append('[');
+ String levelStr = this.getLogLevel(level);
+ buffer.append(levelStr);
+ buffer.append(']');
+
+ buffer.append(' ');
+ buffer.append(message);
+ this.write(buffer, throwable);
+ }
+ }
+
+ private void consoleLog(byte level, String message) {
+ consoleLog(level, message, (Throwable) null);
+ }
+
+ private void consoleLog(byte level, String format, Object... arguments) {
+ if(this.isLevelEnabled(level)) {
+ FormattingTuple tuple = MessageFormatter.arrayFormat(format, arguments);
+ this.consoleLog(level, tuple.getMessage(), tuple.getThrowable());
+ }
+ }
+
+ private String getFormattedDate() {
+ Date currentDate = new Date();
+ SimpleDateFormat formatter = new SimpleDateFormat(DATE_FORMAT);
+ String dateText = formatter.format(currentDate);
+ return dateText;
+ }
+
+ private void write(StringBuilder buffer, Throwable throwable) {
+ PrintStream targetStream = System.err;
+ targetStream.println(buffer.toString());
+ this.writeThrowable(throwable, targetStream);
+ targetStream.flush();
+ }
+
+ private void writeThrowable(Throwable throwable, PrintStream targetStream) {
+ if(throwable != null) {
+ throwable.printStackTrace(targetStream);
+ }
+
+ }
+
+ private boolean isLevelEnabled(int logLevel) {
+ return (logLevel >= this.currentLogLevel);
}
@Override
public void debug(String message) {
- delegate.debug(message);
+ consoleLog(LOG_LEVEL_DEBUG, message);
log("DEBUG", message, null, LogConsole.WARN_STYLE);
}
@Override
public void debug(String message, Object object) {
- delegate.debug(message, object);
+ consoleLog(LOG_LEVEL_DEBUG, message, object);
log("DEBUG", message, null, LogConsole.WARN_STYLE, object);
}
@Override
public void debug(String message, Object object, Object secondObject) {
- delegate.debug(message, object, secondObject);
+ consoleLog(LOG_LEVEL_DEBUG, message, object, secondObject);
log("DEBUG", message, null, LogConsole.WARN_STYLE, object, secondObject);
}
@Override
public void debug(String message, Object... objects) {
- delegate.debug(message, objects);
+ consoleLog(LOG_LEVEL_DEBUG, message, objects);
log("DEBUG", message, null, LogConsole.WARN_STYLE, objects);
}
@Override
public void debug(String message, Throwable throwable) {
- delegate.debug(message, throwable);
+ consoleLog(LOG_LEVEL_DEBUG, message, throwable);
log("DEBUG", message, throwable, LogConsole.WARN_STYLE);
}
@Override
public boolean isDebugEnabled(Marker marker) {
- return delegate.isDebugEnabled(marker);
+ return isLevelEnabled(LOG_LEVEL_DEBUG);
}
@Override
public void debug(Marker marker, String message) {
- delegate.debug(marker, message);
+ consoleLog(LOG_LEVEL_DEBUG, message);
log("DEBUG", message, null, LogConsole.WARN_STYLE);
}
@Override
public void debug(Marker marker, String message, Object object) {
- delegate.debug(marker, message, object);
+ consoleLog(LOG_LEVEL_DEBUG, message, object);
log("DEBUG", message, null, LogConsole.WARN_STYLE, object);
}
@Override
public void debug(Marker marker, String message, Object object, Object secondObject) {
- delegate.debug(marker, message, object, secondObject);
+ consoleLog(LOG_LEVEL_DEBUG, message, object, secondObject);
log("DEBUG", message, null, LogConsole.WARN_STYLE, object, secondObject);
}
@Override
public void debug(Marker marker, String message, Object... objects) {
- delegate.debug(marker, message, objects);
+ consoleLog(LOG_LEVEL_DEBUG, message, objects);
log("DEBUG", message, null, LogConsole.WARN_STYLE, objects);
}
@Override
public void debug(Marker marker, String message, Throwable throwable) {
- delegate.debug(marker, message, throwable);
+ consoleLog(LOG_LEVEL_DEBUG, message, throwable);
log("DEBUG", message, throwable, LogConsole.WARN_STYLE);
}
@Override
public boolean isInfoEnabled() {
- return delegate.isInfoEnabled();
+ return isLevelEnabled(LOG_LEVEL_INFO);
}
@Override
public void error(String message) {
- delegate.error(message);
+ consoleLog(LOG_LEVEL_ERROR, message);
log("ERROR", message, null, LogConsole.ERROR_STYLE);
}
@Override
public void error(String message, Object object) {
- delegate.error(message, object);
+ consoleLog(LOG_LEVEL_ERROR, message, object);
log("ERROR", message, null, LogConsole.ERROR_STYLE, object);
}
@Override
public void error(String message, Object object, Object secondObject) {
- delegate.error(message, object, secondObject);
+ consoleLog(LOG_LEVEL_ERROR, message, object, secondObject);
log("ERROR", message, null, LogConsole.ERROR_STYLE, object, secondObject);
}
@Override
public void error(String message, Object... objects) {
- delegate.error(message, objects);
+ consoleLog(LOG_LEVEL_ERROR, message, objects);
log("ERROR", message, null, LogConsole.ERROR_STYLE, objects);
}
@Override
public void error(String message, Throwable throwable) {
- delegate.error(message, throwable);
+ consoleLog(LOG_LEVEL_ERROR, message, throwable);
log("ERROR", message, throwable, LogConsole.ERROR_STYLE);
}
@Override
public boolean isErrorEnabled(Marker marker) {
- return delegate.isErrorEnabled(marker);
+ return isLevelEnabled(LOG_LEVEL_ERROR);
}
@Override
public void error(Marker marker, String message) {
- delegate.error(marker, message);
+ consoleLog(LOG_LEVEL_ERROR, message);
log("ERROR", message, null, LogConsole.ERROR_STYLE);
}
@Override
public void error(Marker marker, String message, Object object) {
- delegate.error(marker, message , object);
+ consoleLog(LOG_LEVEL_ERROR, message, object);
log("ERROR", message, null, LogConsole.ERROR_STYLE, object);
}
@Override
public void error(Marker marker, String message, Object object, Object secondObject) {
- delegate.error(marker, message , object, secondObject);
+ consoleLog(LOG_LEVEL_ERROR, message, object, secondObject);
log("ERROR", message, null, LogConsole.ERROR_STYLE, object, secondObject);
}
@Override
public void error(Marker marker, String message, Object... objects) {
- delegate.error(marker, message, objects);
+ consoleLog(LOG_LEVEL_ERROR, message, objects);
log("ERROR", message, null, LogConsole.ERROR_STYLE, objects);
}
@Override
public void error(Marker marker, String message, Throwable throwable) {
- delegate.error(marker, message, throwable);
+ consoleLog(LOG_LEVEL_ERROR, message, throwable);
log("ERROR", message, throwable, LogConsole.ERROR_STYLE);
}
@Override
public void info(String message) {
- delegate.info(message);
+ consoleLog(LOG_LEVEL_INFO, message);
log("INFO", message, null, LogConsole.INFO_STYLE);
}
@Override
public void info(String message, Object object) {
- delegate.info(message, object);
+ consoleLog(LOG_LEVEL_INFO, message, object);
log("INFO", message, null, LogConsole.INFO_STYLE, object);
}
@Override
public void info(String message, Object object, Object secondObject) {
- delegate.info(message, object, secondObject);
+ consoleLog(LOG_LEVEL_INFO, message, object, secondObject);
log("INFO", message, null, LogConsole.INFO_STYLE, object, secondObject);
}
@Override
public void info(String message, Object... objects) {
- delegate.info(message, objects);
+ consoleLog(LOG_LEVEL_INFO, message, objects);
log("INFO", message, null, LogConsole.INFO_STYLE, objects);
}
@Override
public void info(String message, Throwable throwable) {
- delegate.info(message, throwable);
+ consoleLog(LOG_LEVEL_INFO, message, throwable);
log("INFO", message, throwable, LogConsole.INFO_STYLE);
}
@Override
public boolean isInfoEnabled(Marker marker) {
- return delegate.isInfoEnabled(marker);
+ return isLevelEnabled(LOG_LEVEL_INFO);
}
@Override
public void info(Marker marker, String message) {
- delegate.info(marker, message);
+ consoleLog(LOG_LEVEL_INFO, message);
log("INFO", message, null, LogConsole.INFO_STYLE);
}
@Override
public void info(Marker marker, String message, Object object) {
- delegate.info(marker, message, object);
+ consoleLog(LOG_LEVEL_INFO, message, object);
log("INFO", message, null, LogConsole.INFO_STYLE, object);
}
@Override
public void info(Marker marker, String message, Object object, Object secondObject) {
- delegate.info(marker, message, object, secondObject);
+ consoleLog(LOG_LEVEL_INFO, message, object, secondObject);
log("INFO", message, null, LogConsole.INFO_STYLE, object, secondObject);
}
@Override
public void info(Marker marker, String message, Object... objects) {
- delegate.info(marker, message, objects);
+ consoleLog(LOG_LEVEL_INFO, message, objects);
log("INFO", message, null, LogConsole.INFO_STYLE, objects);
}
@Override
public void info(Marker marker, String message, Throwable throwable) {
- delegate.info(marker, message, throwable);
+ consoleLog(LOG_LEVEL_INFO, message, throwable);
log("INFO", message, throwable, LogConsole.INFO_STYLE);
}
@Override
public boolean isWarnEnabled() {
- return delegate.isWarnEnabled();
+ return isLevelEnabled(LOG_LEVEL_WARNING);
}
@Override
public String getName() {
- return delegate.getName();
+ return name;
}
@Override
public boolean isTraceEnabled() {
- return delegate.isTraceEnabled();
+ return isLevelEnabled(LOG_LEVEL_TRACE);
}
@Override
public void trace(String message) {
- delegate.trace(message);
+ consoleLog(LOG_LEVEL_TRACE, message);
log("TRACE", message, null, LogConsole.DEBUG_STYLE);
}
@Override
public void trace(String message, Object object) {
- delegate.trace(message, object);
+ consoleLog(LOG_LEVEL_TRACE, message, object);
log("TRACE", message, null, LogConsole.DEBUG_STYLE, object);
}
@Override
public void trace(String message, Object object, Object secondObject) {
- delegate.trace(message, object, secondObject);
+ consoleLog(LOG_LEVEL_TRACE, message, secondObject);
log("TRACE", message, null, LogConsole.DEBUG_STYLE, object, secondObject);
}
@Override
public void trace(String message, Object... objects) {
- delegate.trace(message, objects);
+ consoleLog(LOG_LEVEL_TRACE, message, objects);
log("TRACE", message, null, LogConsole.DEBUG_STYLE, objects);
}
@Override
public void trace(String message, Throwable throwable) {
- delegate.trace(message, throwable);
+ consoleLog(LOG_LEVEL_TRACE, message, throwable);
log("TRACE", message, throwable, LogConsole.DEBUG_STYLE);
}
@Override
public boolean isTraceEnabled(Marker marker) {
- return delegate.isTraceEnabled(marker);
+ return isLevelEnabled(LOG_LEVEL_TRACE);
}
@Override
public void trace(Marker marker, String message) {
- delegate.trace(marker, message);
+ consoleLog(LOG_LEVEL_TRACE, message);
log("TRACE", message, null, LogConsole.DEBUG_STYLE);
}
@Override
public void trace(Marker marker, String message, Object object) {
- delegate.trace(marker, message, object);
+ consoleLog(LOG_LEVEL_TRACE, message, object);
log("TRACE", message, null, LogConsole.DEBUG_STYLE, object);
}
@Override
public void trace(Marker marker, String message, Object object, Object secondObject) {
- delegate.trace(marker, message, object, secondObject);
+ consoleLog(LOG_LEVEL_TRACE, message, object, secondObject);
log("TRACE", message, null, LogConsole.DEBUG_STYLE, object, secondObject);
}
@Override
public void trace(Marker marker, String message, Object... objects) {
- delegate.trace(marker, message, objects);
+ consoleLog(LOG_LEVEL_TRACE, message, objects);
log("TRACE", message, null, LogConsole.DEBUG_STYLE, objects);
}
@Override
public void trace(Marker marker, String message, Throwable throwable) {
- delegate.trace(marker, message, throwable);
+ consoleLog(LOG_LEVEL_TRACE, message, throwable);
log("TRACE", message, throwable, LogConsole.DEBUG_STYLE);
}
@@ -332,83 +426,81 @@ public class ModelerLogger implements Logger {
@Override
public void warn(String message) {
- delegate.warn(message);
+ consoleLog(LOG_LEVEL_WARNING, message);
log("WARN", message, null, LogConsole.WARN_STYLE);
}
@Override
public void warn(String message, Object object) {
- delegate.warn(message, object);
+ consoleLog(LOG_LEVEL_WARNING, message, object);
log("WARN", message, null, LogConsole.WARN_STYLE, object);
}
@Override
public void warn(String message, Object... objects) {
- delegate.warn(message, objects);
+ consoleLog(LOG_LEVEL_WARNING, message, objects);
log("WARN", message, null, LogConsole.WARN_STYLE, objects);
}
@Override
public void warn(String message, Object object, Object secondObject) {
- delegate.warn(message, object, secondObject);
+ consoleLog(LOG_LEVEL_WARNING, message, secondObject);
log("WARN", message, null, LogConsole.WARN_STYLE, object, secondObject);
}
@Override
public void warn(String message, Throwable throwable) {
- delegate.warn(message, throwable);
+ consoleLog(LOG_LEVEL_WARNING, message, throwable);
log("WARN", message, throwable, LogConsole.WARN_STYLE);
}
@Override
public boolean isWarnEnabled(Marker marker) {
- return delegate.isWarnEnabled(marker);
+ return isLevelEnabled(LOG_LEVEL_WARNING);
}
@Override
public void warn(Marker marker, String message) {
- delegate.warn(marker, message);
+ consoleLog(LOG_LEVEL_WARNING, message);
log("WARN", message, null, LogConsole.WARN_STYLE);
}
@Override
public void warn(Marker marker, String message, Object object) {
- delegate.warn(marker, message, object);
+ consoleLog(LOG_LEVEL_WARNING, message, object);
log("WARN", message, null, LogConsole.WARN_STYLE, object);
}
@Override
public void warn(Marker marker, String message, Object object, Object secondObject) {
- delegate.warn(marker, message, object, secondObject);
+ consoleLog(LOG_LEVEL_WARNING, message, object, secondObject);
log("WARN", message, null, LogConsole.WARN_STYLE, object, secondObject);
}
@Override
public void warn(Marker marker, String message, Object... objects) {
- delegate.warn(marker, message, objects);
+ consoleLog(LOG_LEVEL_WARNING, message, objects);
log("WARN", message, null, LogConsole.WARN_STYLE, objects);
}
@Override
public void warn(Marker marker, String message, Throwable throwable) {
- delegate.warn(marker, message, throwable);
+ consoleLog(LOG_LEVEL_WARNING, message, throwable);
log("WARN", message, throwable, LogConsole.WARN_STYLE);
}
@Override
public boolean isErrorEnabled() {
- return delegate.isErrorEnabled();
+ return isLevelEnabled(LOG_LEVEL_ERROR);
}
/**
- * Prints common message to the console
+ * Prints common message to the modeler console
*/
private void log(String level, String message, Throwable throwable, AttributeSet style, Object... parameters) {
- for (Object parameter : parameters) {
- message.replaceFirst("\\{\\}", String.valueOf(parameter));
- }
- getLogConsole().appendMessage(level, message, throwable, style);
+ FormattingTuple tuple = MessageFormatter.arrayFormat(message, parameters);
+ getLogConsole().appendMessage(level, tuple.getMessage(), throwable, style);
}
private void log(String level, Object message, Throwable throwable, AttributeSet style) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a6f272bd/modeler/cayenne-modeler/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/slf4j/impl/StaticLoggerBinder.java b/modeler/cayenne-modeler/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
new file mode 100644
index 0000000..7dd03aa
--- /dev/null
+++ b/modeler/cayenne-modeler/src/main/java/org/slf4j/impl/StaticLoggerBinder.java
@@ -0,0 +1,29 @@
+package org.slf4j.impl;
+
+import org.apache.cayenne.modeler.util.ModelerLogFactory;
+import org.slf4j.ILoggerFactory;
+import org.slf4j.spi.LoggerFactoryBinder;
+
+/*
+* StaticLoggerBinder bind and replace standard SLF4J LoggerFactory to ModelerLogFactory.
+* This is used because in Cayenne Modeler we use custom logger implementation (ModelerLogger)
+* for logging in System.err and modeler logger.
+* */
+public class StaticLoggerBinder implements LoggerFactoryBinder {
+
+ private final static StaticLoggerBinder singleton = new StaticLoggerBinder();
+ private final ILoggerFactory loggerFactory = new ModelerLogFactory();
+ private static final String loggerFactoryClassStr = ModelerLogFactory.class.getName();
+
+ public static StaticLoggerBinder getSingleton() {
+ return singleton;
+ }
+
+ public ILoggerFactory getLoggerFactory() {
+ return this.loggerFactory;
+ }
+
+ public String getLoggerFactoryClassStr() {
+ return this.loggerFactoryClassStr;
+ }
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a6f272bd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0c8da83..6ed6a6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -454,6 +454,7 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>${slf4j.version}</version>
+ <scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>
[06/19] cayenne git commit: + slf4j to cayenne-client
Posted by nt...@apache.org.
+ slf4j to cayenne-client
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/a9b4b3d2
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/a9b4b3d2
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/a9b4b3d2
Branch: refs/heads/master
Commit: a9b4b3d23eafd16c3d97c5ce8afbde25045e3082
Parents: 58e67ec
Author: Maxim Petrusevich <ma...@gmail.com>
Authored: Wed Apr 12 12:05:56 2017 +0300
Committer: Maxim Petrusevich <ma...@gmail.com>
Committed: Wed Apr 12 12:05:56 2017 +0300
----------------------------------------------------------------------
cayenne-client/pom.xml | 10 +++++-----
.../java/org/apache/cayenne/remote/BaseConnection.java | 8 ++++----
.../org/apache/cayenne/rop/http/HttpROPConnector.java | 6 +++---
3 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a9b4b3d2/cayenne-client/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-client/pom.xml b/cayenne-client/pom.xml
index 7d08f51..fbc2915 100644
--- a/cayenne-client/pom.xml
+++ b/cayenne-client/pom.xml
@@ -22,6 +22,11 @@
<dependencies>
<!-- Compile dependencies -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-di</artifactId>
@@ -81,11 +86,6 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a9b4b3d2/cayenne-client/src/main/java/org/apache/cayenne/remote/BaseConnection.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/main/java/org/apache/cayenne/remote/BaseConnection.java b/cayenne-client/src/main/java/org/apache/cayenne/remote/BaseConnection.java
index d02449e..f8e3498 100644
--- a/cayenne-client/src/main/java/org/apache/cayenne/remote/BaseConnection.java
+++ b/cayenne-client/src/main/java/org/apache/cayenne/remote/BaseConnection.java
@@ -19,9 +19,9 @@
package org.apache.cayenne.remote;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
import org.apache.cayenne.CayenneRuntimeException;
+import org.slf4j.LoggerFactory;
/**
* A common base class for concrete ClientConnection implementations. Provides message
@@ -31,14 +31,14 @@ import org.apache.cayenne.CayenneRuntimeException;
*/
public abstract class BaseConnection implements ClientConnection {
- protected Log logger;
+ protected Logger logger;
protected long messageId;
/**
* Default constructor that initializes logging and a single threaded EventManager.
*/
protected BaseConnection() {
- this.logger = LogFactory.getLog(getClass());
+ this.logger = LoggerFactory.getLogger(getClass());
}
/**
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a9b4b3d2/cayenne-client/src/main/java/org/apache/cayenne/rop/http/HttpROPConnector.java
----------------------------------------------------------------------
diff --git a/cayenne-client/src/main/java/org/apache/cayenne/rop/http/HttpROPConnector.java b/cayenne-client/src/main/java/org/apache/cayenne/rop/http/HttpROPConnector.java
index bdae52b..ee23ce3 100644
--- a/cayenne-client/src/main/java/org/apache/cayenne/rop/http/HttpROPConnector.java
+++ b/cayenne-client/src/main/java/org/apache/cayenne/rop/http/HttpROPConnector.java
@@ -23,8 +23,8 @@ import org.apache.cayenne.rop.HttpClientConnection;
import org.apache.cayenne.rop.ROPConnector;
import org.apache.cayenne.rop.ROPConstants;
import org.apache.cayenne.rop.ROPUtil;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.InputStream;
@@ -37,7 +37,7 @@ import java.util.Map;
public class HttpROPConnector implements ROPConnector {
- private static Log logger = LogFactory.getLog(HttpROPConnector.class);
+ private static Logger logger = LoggerFactory.getLogger(HttpROPConnector.class);
public static final String SESSION_COOKIE_NAME = "JSESSIONID";
[16/19] cayenne git commit: CAY-2280 upgrade docs files
Posted by nt...@apache.org.
CAY-2280 upgrade docs files
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/1f17edba
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/1f17edba
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/1f17edba
Branch: refs/heads/master
Commit: 1f17edbae73402ca0336e919b50f8b8f8c3ca1d5
Parents: 04ab1bf
Author: Maxim Petrusevich <ma...@gmail.com>
Authored: Tue Apr 18 12:16:34 2017 +0300
Committer: Maxim Petrusevich <ma...@gmail.com>
Committed: Tue Apr 18 12:16:34 2017 +0300
----------------------------------------------------------------------
docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 +
docs/doc/src/main/resources/UPGRADE.txt | 25 +++++++-------------
.../getting-started/src/docbkx/java-classes.xml | 11 +++++++--
3 files changed, 19 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1f17edba/docs/doc/src/main/resources/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/RELEASE-NOTES.txt b/docs/doc/src/main/resources/RELEASE-NOTES.txt
index 31b50af..d3b8b07 100644
--- a/docs/doc/src/main/resources/RELEASE-NOTES.txt
+++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt
@@ -31,6 +31,7 @@ CAY-2272 ColumnSelect: methods to manually control DISTINCT clause
CAY-2274 Modeler: Validate case when dependent PK is marked as \u201cgenerated\u201d
CAY-2277 Create ClientRuntime with ClientRuntimeBuilder just like ServerRuntime
CAY-2278 Extract cayenne-postcommit module from cayenne-lifecycle
+CAY-2280 Switch from commons-logging to slf4j
Bug Fixes:
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1f17edba/docs/doc/src/main/resources/UPGRADE.txt
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/UPGRADE.txt b/docs/doc/src/main/resources/UPGRADE.txt
index 997285a..0418ccb 100644
--- a/docs/doc/src/main/resources/UPGRADE.txt
+++ b/docs/doc/src/main/resources/UPGRADE.txt
@@ -7,22 +7,15 @@ IMPORTANT: be sure to read all notes for the intermediate releases between your
UPGRADING TO 4.0.M6
-* Per CAY-2280 org.apache.commons.logging.Log logger was replaced to org.slf4j.Logger logger.
-
- To change the logger to SLF4J need:
- - Replace logger dependencies in pom.xml files from commons-logging to slf4j-api (if pom.xml contains slf4j-api
- in test scope - replace test scope to compile scope);
- - In classes that import org.apache.commons.logging.Log, replace org.apache.commons.logging.Log to
- org.slf4j.Logger (and org.apache.commons.logging.LogFactory to org.slf4j.LoggerFactory if exist);
- - Replace all fields type of Log to Logger (and LogFactory to LoggerFactory if exist, and methods call from
- LogFactory.getLog(...) to LoggerFactory.getLogger(...) if exist);
- - Change interface in custom loggers (MavenLogger, AntLogger, ModelerLogger(if exist)) from Log to Logger, and
- override standart methods;
- - Delete commons-logging.properties file.
-
- For go to a SLF4J without changing the source code need:
- - Add to pom.xml files jcl-over-slf4j dependency;
- - Exclude commons-logging dependencies from pom.xml.
+* Per CAY-2280 Cayenne migrated from commons-logging to SLF4J.
+ Here is options you have to upgrade your project accordingly:
+ 1) Migrate your logging to SLF4J. Please see https://www.slf4j.org for documentation about
+ inclusion into your project logging backend of you choice.
+
+ 2) Other option is to use commons-logging over SLF4J and keep all logging compatible with previous Cayenne versions.
+ In order to do so you need:
+ - remove commons-logging dependency if you have it
+ - add to your project slf4j-jcl dependency
* Per CAY-2278 The org.apache.cayenne.lifecycle.audit package (with the exception of AuditableChild annotation) and the
org.apache.cayenne.lifecycle.changeset package where deprecated.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1f17edba/docs/docbook/getting-started/src/docbkx/java-classes.xml
----------------------------------------------------------------------
diff --git a/docs/docbook/getting-started/src/docbkx/java-classes.xml b/docs/docbook/getting-started/src/docbkx/java-classes.xml
index 848699f..d27631f 100644
--- a/docs/docbook/getting-started/src/docbkx/java-classes.xml
+++ b/docs/docbook/getting-started/src/docbkx/java-classes.xml
@@ -71,13 +71,20 @@
<dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-java8</artifactId>
- <version>4.0.M5</version>
+ <version><?eval ${project.version}?></version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.7.25</version>
</dependency>
</dependencies>
</project></programlisting></para>
<para>Your computer must be connected to the internet. Once you edit the <code>pom.xml</code>, IDEA
will download the needed Cayenne jar file and add it to the project build path. As a
- result, all the errors should disappear.</para>
+ result, all the errors should disappear. In tutorial for console output we use slf4j-simple logger
+ implementation. Due to use SLF4J logger in Apache Cayenne, you can use your custom logger through bridges
+ (e.g log4j bridge, jcl bridge et. al.)</para>
<para><inlinemediaobject>
<imageobject>
<imagedata fileref="images/idea-generated-classes.png" scalefit="1" width="100%"/>
[09/19] cayenne git commit: + slf4j to cayenne-postcommit
Posted by nt...@apache.org.
+ slf4j to cayenne-postcommit
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/4bc4dd11
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/4bc4dd11
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/4bc4dd11
Branch: refs/heads/master
Commit: 4bc4dd116cce7ff5fac5c3f4e2694c40580f407d
Parents: 9c9a35d
Author: Maxim Petrusevich <ma...@gmail.com>
Authored: Wed Apr 12 12:17:54 2017 +0300
Committer: Maxim Petrusevich <ma...@gmail.com>
Committed: Wed Apr 12 12:17:54 2017 +0300
----------------------------------------------------------------------
.../cayenne/lifecycle/postcommit/DeletedDiffProcessor.java | 6 +++---
.../cayenne/lifecycle/postcommit/PostCommitModuleBuilder.java | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/4bc4dd11/cayenne-postcommit/src/main/java/org/apache/cayenne/lifecycle/postcommit/DeletedDiffProcessor.java
----------------------------------------------------------------------
diff --git a/cayenne-postcommit/src/main/java/org/apache/cayenne/lifecycle/postcommit/DeletedDiffProcessor.java b/cayenne-postcommit/src/main/java/org/apache/cayenne/lifecycle/postcommit/DeletedDiffProcessor.java
index 5f6042a..3aa7189 100644
--- a/cayenne-postcommit/src/main/java/org/apache/cayenne/lifecycle/postcommit/DeletedDiffProcessor.java
+++ b/cayenne-postcommit/src/main/java/org/apache/cayenne/lifecycle/postcommit/DeletedDiffProcessor.java
@@ -36,12 +36,12 @@ import org.apache.cayenne.reflect.ClassDescriptor;
import org.apache.cayenne.reflect.PropertyVisitor;
import org.apache.cayenne.reflect.ToManyProperty;
import org.apache.cayenne.reflect.ToOneProperty;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
class DeletedDiffProcessor implements GraphChangeHandler {
- private static final Log LOGGER = LogFactory.getLog(DeletedDiffProcessor.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(DeletedDiffProcessor.class);
private PostCommitEntityFactory entityFactory;
private MutableChangeMap changeSet;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/4bc4dd11/cayenne-postcommit/src/main/java/org/apache/cayenne/lifecycle/postcommit/PostCommitModuleBuilder.java
----------------------------------------------------------------------
diff --git a/cayenne-postcommit/src/main/java/org/apache/cayenne/lifecycle/postcommit/PostCommitModuleBuilder.java b/cayenne-postcommit/src/main/java/org/apache/cayenne/lifecycle/postcommit/PostCommitModuleBuilder.java
index ae3f691..179ba2c 100644
--- a/cayenne-postcommit/src/main/java/org/apache/cayenne/lifecycle/postcommit/PostCommitModuleBuilder.java
+++ b/cayenne-postcommit/src/main/java/org/apache/cayenne/lifecycle/postcommit/PostCommitModuleBuilder.java
@@ -28,8 +28,8 @@ import org.apache.cayenne.lifecycle.postcommit.meta.IncludeAllPostCommitEntityFa
import org.apache.cayenne.lifecycle.postcommit.meta.PostCommitEntity;
import org.apache.cayenne.lifecycle.postcommit.meta.PostCommitEntityFactory;
import org.apache.cayenne.tx.TransactionFilter;
-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.HashSet;
@@ -42,7 +42,7 @@ import java.util.HashSet;
*/
public class PostCommitModuleBuilder {
- private static final Log LOGGER = LogFactory.getLog(PostCommitModuleBuilder.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(PostCommitModuleBuilder.class);
public static PostCommitModuleBuilder builder() {
return new PostCommitModuleBuilder();
[03/19] cayenne git commit: + slf4j logger to cgen module,
small code refactoring
Posted by nt...@apache.org.
+ slf4j logger to cgen module, small code refactoring
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/c2110ef3
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/c2110ef3
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/c2110ef3
Branch: refs/heads/master
Commit: c2110ef3d6678226b4cc87af2cd0cf595b367d14
Parents: 0312b96
Author: Maxim Petrusevich <ma...@gmail.com>
Authored: Wed Apr 12 10:08:44 2017 +0300
Committer: Maxim Petrusevich <ma...@gmail.com>
Committed: Wed Apr 12 10:08:44 2017 +0300
----------------------------------------------------------------------
cayenne-cgen/pom.xml | 4 ++--
.../apache/cayenne/gen/ClassGenerationAction.java | 6 +++---
cayenne-server/pom.xml | 7 +------
.../XMLDataChannelDescriptorLoader.java | 10 +++++-----
.../generic/GenericPlatformInitializer.java | 6 +++---
.../src/main/resources/commons-logging.properties | 17 -----------------
6 files changed, 14 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c2110ef3/cayenne-cgen/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-cgen/pom.xml b/cayenne-cgen/pom.xml
index 801a4b6..20bef58 100644
--- a/cayenne-cgen/pom.xml
+++ b/cayenne-cgen/pom.xml
@@ -43,8 +43,8 @@
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
<scope>compile</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c2110ef3/cayenne-cgen/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java
----------------------------------------------------------------------
diff --git a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java
index 387cabb..8d08c52 100644
--- a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java
+++ b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java
@@ -25,7 +25,7 @@ import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.Embeddable;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.map.QueryDescriptor;
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.VelocityEngine;
@@ -68,7 +68,7 @@ public class ClassGenerationAction {
protected ArtifactsGenerationMode artifactsGenerationMode;
protected boolean makePairs;
- protected Log logger;
+ protected Logger logger;
protected File destDir;
protected boolean overwrite;
protected boolean usePkgPath;
@@ -569,7 +569,7 @@ public class ClassGenerationAction {
* Injects an optional logger that will be used to trace generated files at
* the info level.
*/
- public void setLogger(Log logger) {
+ public void setLogger(Logger logger) {
this.logger = logger;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c2110ef3/cayenne-server/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/pom.xml b/cayenne-server/pom.xml
index ddc4cfa..684e857 100644
--- a/cayenne-server/pom.xml
+++ b/cayenne-server/pom.xml
@@ -36,13 +36,8 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
+ <scope>compile</scope>
</dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- </dependency>
-
<dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-di</artifactId>
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c2110ef3/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 00bbee2..ad9341a 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
@@ -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.getMessage());
+ logger.warn(exception.getMessage(), exception);
}
return password;
@@ -88,7 +88,7 @@ public class XMLDataChannelDescriptorLoader implements DataChannelDescriptorLoad
password = bufferedReader.readLine();
} catch (IOException exception) {
- logger.warn(exception.getMessage());
+ logger.warn(exception.getMessage(), exception);
} finally {
try {
@@ -339,7 +339,7 @@ public class XMLDataChannelDescriptorLoader implements DataChannelDescriptorLoad
try {
password = passwordFromURL(new URL(passwordSource));
} catch (MalformedURLException exception) {
- logger.warn(exception.getMessage());
+ logger.warn(exception.getMessage(), exception);
}
} 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.getMessage());
+ logger.warn(exception.getMessage(), exception);
} catch (InterruptedException exception) {
- logger.warn(exception.getMessage());
+ logger.warn(exception.getMessage(), exception);
}
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c2110ef3/modeler/cayenne-modeler-generic-ext/src/main/java/org/apache/cayenne/modeler/generic/GenericPlatformInitializer.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler-generic-ext/src/main/java/org/apache/cayenne/modeler/generic/GenericPlatformInitializer.java b/modeler/cayenne-modeler-generic-ext/src/main/java/org/apache/cayenne/modeler/generic/GenericPlatformInitializer.java
index 39ee16b..5a5c426 100644
--- a/modeler/cayenne-modeler-generic-ext/src/main/java/org/apache/cayenne/modeler/generic/GenericPlatformInitializer.java
+++ b/modeler/cayenne-modeler-generic-ext/src/main/java/org/apache/cayenne/modeler/generic/GenericPlatformInitializer.java
@@ -22,8 +22,8 @@ import javax.swing.JFrame;
import javax.swing.UIManager;
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 com.jgoodies.looks.plastic.PlasticLookAndFeel;
import com.jgoodies.looks.plastic.PlasticTheme;
@@ -31,7 +31,7 @@ import com.jgoodies.looks.plastic.PlasticXPLookAndFeel;
public class GenericPlatformInitializer implements PlatformInitializer {
- private static Log logger = LogFactory.getLog(GenericPlatformInitializer.class);
+ private static Logger logger = LoggerFactory.getLogger(GenericPlatformInitializer.class);
static final String DEFAULT_LAF_NAME = PlasticXPLookAndFeel.class.getName();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c2110ef3/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
deleted file mode 100644
index d459acf..0000000
--- a/modeler/cayenne-modeler/src/main/resources/commons-logging.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
[13/19] cayenne git commit: delete slf4j-simple dependency in
cayenne-dbsync
Posted by nt...@apache.org.
delete slf4j-simple dependency in cayenne-dbsync
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/a35a4602
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/a35a4602
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/a35a4602
Branch: refs/heads/master
Commit: a35a460271f0c1f322cca9f9e5d3cd4dabb17124
Parents: 15c4955
Author: Maxim Petrusevich <ma...@gmail.com>
Authored: Wed Apr 12 13:02:34 2017 +0300
Committer: Maxim Petrusevich <ma...@gmail.com>
Committed: Wed Apr 12 13:02:34 2017 +0300
----------------------------------------------------------------------
cayenne-dbsync/pom.xml | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/a35a4602/cayenne-dbsync/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/pom.xml b/cayenne-dbsync/pom.xml
index 34317e0..0838fa3 100644
--- a/cayenne-dbsync/pom.xml
+++ b/cayenne-dbsync/pom.xml
@@ -36,10 +36,6 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.cayenne</groupId>
<artifactId>cayenne-server</artifactId>
<version>${project.version}</version>
[05/19] cayenne git commit: + slfj4 to cayenne-ant
Posted by nt...@apache.org.
+ slfj4 to cayenne-ant
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/58e67ec8
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/58e67ec8
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/58e67ec8
Branch: refs/heads/master
Commit: 58e67ec8f684f03c0ed5a10fd435625a984792b4
Parents: 0aa789b
Author: Maxim Petrusevich <ma...@gmail.com>
Authored: Wed Apr 12 12:00:28 2017 +0300
Committer: Maxim Petrusevich <ma...@gmail.com>
Committed: Wed Apr 12 12:00:28 2017 +0300
----------------------------------------------------------------------
cayenne-ant/pom.xml | 9 +-
.../org/apache/cayenne/tools/AntLogger.java | 296 +++++++++++++++++--
.../apache/cayenne/tools/DbGeneratorTask.java | 4 +-
.../apache/cayenne/tools/DbImporterTask.java | 4 +-
.../cayenne/tools/DbGeneratorTaskTest.java | 4 +-
5 files changed, 275 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/58e67ec8/cayenne-ant/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-ant/pom.xml b/cayenne-ant/pom.xml
index 20c06fc..b6788d1 100644
--- a/cayenne-ant/pom.xml
+++ b/cayenne-ant/pom.xml
@@ -33,6 +33,10 @@
<dependencies>
<!-- Compile Dependencies -->
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<scope>compile</scope>
@@ -101,11 +105,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/58e67ec8/cayenne-ant/src/main/java/org/apache/cayenne/tools/AntLogger.java
----------------------------------------------------------------------
diff --git a/cayenne-ant/src/main/java/org/apache/cayenne/tools/AntLogger.java b/cayenne-ant/src/main/java/org/apache/cayenne/tools/AntLogger.java
index 4e8e8b5..95d98df 100644
--- a/cayenne-ant/src/main/java/org/apache/cayenne/tools/AntLogger.java
+++ b/cayenne-ant/src/main/java/org/apache/cayenne/tools/AntLogger.java
@@ -19,14 +19,15 @@
package org.apache.cayenne.tools;
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
+import org.slf4j.Marker;
/**
* @since 3.0
*/
-class AntLogger implements Log {
+class AntLogger implements Logger {
private Task parentTask;
@@ -34,75 +35,308 @@ class AntLogger implements Log {
this.parentTask = parentTask;
}
- public void debug(Object message, Throwable th) {
- parentTask.log(String.valueOf(message), Project.MSG_DEBUG);
+ @Override
+ public void debug(String message) {
+ parentTask.log(message, Project.MSG_DEBUG);
}
- public void debug(Object message) {
- parentTask.log(String.valueOf(message), Project.MSG_DEBUG);
+ @Override
+ public void debug(String message, Object object) {
+ parentTask.log(message, Project.MSG_DEBUG);
}
- public void error(Object message, Throwable th) {
- parentTask.log(String.valueOf(message), Project.MSG_ERR);
+ @Override
+ public void debug(String message, Object object, Object secondObject) {
+ parentTask.log(message, Project.MSG_DEBUG);
}
- public void error(Object message) {
- parentTask.log(String.valueOf(message), Project.MSG_ERR);
+ @Override
+ public void debug(String message, Object... objects) {
+ parentTask.log(message, Project.MSG_DEBUG);
}
- public void fatal(Object message, Throwable th) {
- parentTask.log(String.valueOf(message), Project.MSG_ERR);
+ @Override
+ public void debug(String message, Throwable throwable) {
+ parentTask.log(message, throwable, Project.MSG_DEBUG);
}
- public void fatal(Object message) {
- parentTask.log(String.valueOf(message), Project.MSG_ERR);
+ @Override
+ public boolean isDebugEnabled(Marker marker) {
+ return true;
+ }
+
+ @Override
+ public void debug(Marker marker, String message) {
+ parentTask.log(message, Project.MSG_DEBUG);
+ }
+
+ @Override
+ public void debug(Marker marker, String message, Object object) {
+ parentTask.log(message, Project.MSG_DEBUG);
+ }
+
+ @Override
+ public void debug(Marker marker, String message, Object object, Object secondObject) {
+ parentTask.log(message, Project.MSG_DEBUG);
+ }
+
+ @Override
+ public void debug(Marker marker, String message, Object... objects) {
+ parentTask.log(message, Project.MSG_DEBUG);
+ }
+
+ @Override
+ public void debug(Marker marker, String message, Throwable throwable) {
+ parentTask.log(message, throwable, Project.MSG_DEBUG);
+ }
+
+ @Override
+ public boolean isInfoEnabled() {
+ return true;
+ }
+
+ @Override
+ public void error(String message) {
+ parentTask.log(message, Project.MSG_ERR);
+ }
+
+ @Override
+ public void error(String message, Object object) {
+ parentTask.log(message, Project.MSG_ERR);
+ }
+
+ @Override
+ public void error(String message, Object object, Object secondObject) {
+ parentTask.log(message, Project.MSG_ERR);
+ }
+
+ @Override
+ public void error(String message, Object... objects) {
+ parentTask.log(message, Project.MSG_ERR);
+ }
+
+ @Override
+ public void error(String message, Throwable throwable) {
+ parentTask.log(message, throwable, Project.MSG_ERR);
}
- public void info(Object message, Throwable th) {
- parentTask.log(String.valueOf(message), Project.MSG_INFO);
+ @Override
+ public boolean isErrorEnabled(Marker marker) {
+ return true;
+ }
+
+ @Override
+ public void error(Marker marker, String message) {
+ parentTask.log(message, Project.MSG_ERR);
+ }
+
+ @Override
+ public void error(Marker marker, String message, Object object) {
+ parentTask.log(message, Project.MSG_ERR);
+ }
+
+ @Override
+ public void error(Marker marker, String message, Object object, Object secondObject) {
+ parentTask.log(message, Project.MSG_ERR);
+ }
+
+ @Override
+ public void error(Marker marker, String message, Object... objects) {
+ parentTask.log(message, Project.MSG_ERR);
+ }
+
+ @Override
+ public void error(Marker marker, String message, Throwable throwable) {
+ parentTask.log(message, throwable, Project.MSG_ERR);
+ }
+
+ @Override
+ public void info(String message) {
+ parentTask.log(message, Project.MSG_INFO);
+ }
+
+ @Override
+ public void info(String message, Object object) {
+ parentTask.log(message, Project.MSG_INFO);
+ }
+
+ @Override
+ public void info(String message, Object object, Object secondObject) {
+ parentTask.log(message, Project.MSG_INFO);
+ }
+
+ @Override
+ public void info(String message, Object... objects) {
+ parentTask.log(message, Project.MSG_INFO);
+ }
+
+ @Override
+ public void info(String message, Throwable throwable) {
+ parentTask.log(message, throwable, Project.MSG_INFO);
+ }
+
+ @Override
+ public boolean isInfoEnabled(Marker marker) {
+ return true;
}
- public void info(Object message) {
- parentTask.log(String.valueOf(message), Project.MSG_INFO);
+ @Override
+ public void info(Marker marker, String message) {
+ parentTask.log(message, Project.MSG_INFO);
}
- public void trace(Object message, Throwable th) {
- parentTask.log(String.valueOf(message), Project.MSG_VERBOSE);
+ @Override
+ public void info(Marker marker, String message, Object object) {
+ parentTask.log(message, Project.MSG_INFO);
}
- public void trace(Object message) {
- parentTask.log(String.valueOf(message), Project.MSG_VERBOSE);
+ @Override
+ public void info(Marker marker, String message, Object object, Object secondObject) {
+ parentTask.log(message, Project.MSG_INFO);
}
- public void warn(Object message, Throwable th) {
- parentTask.log(String.valueOf(message), Project.MSG_WARN);
+ @Override
+ public void info(Marker marker, String message, Object... objects) {
+ parentTask.log(message, Project.MSG_INFO);
}
- public void warn(Object message) {
- parentTask.log(String.valueOf(message), Project.MSG_WARN);
+ @Override
+ public void info(Marker marker, String message, Throwable throwable) {
+ parentTask.log(message, throwable, Project.MSG_INFO);
}
+ @Override
public boolean isWarnEnabled() {
return true;
}
- public boolean isDebugEnabled() {
+ @Override
+ public String getName() {
+ return parentTask.getTaskName();
+ }
+
+ @Override
+ public boolean isTraceEnabled() {
return true;
}
- public boolean isErrorEnabled() {
+ @Override
+ public void trace(String message) {
+ parentTask.log(message, Project.MSG_VERBOSE);
+ }
+
+ @Override
+ public void trace(String message, Object object) {
+ parentTask.log(message, Project.MSG_VERBOSE);
+ }
+
+ @Override
+ public void trace(String message, Object object, Object secondObject) {
+ parentTask.log(message, Project.MSG_VERBOSE);
+ }
+
+ @Override
+ public void trace(String message, Object... objects) {
+ parentTask.log(message, Project.MSG_VERBOSE);
+ }
+
+ @Override
+ public void trace(String message, Throwable throwable) {
+ parentTask.log(message, throwable, Project.MSG_VERBOSE);
+ }
+
+ @Override
+ public boolean isTraceEnabled(Marker marker) {
return true;
}
- public boolean isFatalEnabled() {
+ @Override
+ public void trace(Marker marker, String message) {
+ parentTask.log(message, Project.MSG_VERBOSE);
+ }
+
+ @Override
+ public void trace(Marker marker, String message, Object object) {
+ parentTask.log(message, Project.MSG_VERBOSE);
+ }
+
+ @Override
+ public void trace(Marker marker, String message, Object object, Object secondObject) {
+ parentTask.log(message, Project.MSG_VERBOSE);
+ }
+
+ @Override
+ public void trace(Marker marker, String message, Object... objects) {
+ parentTask.log(message, Project.MSG_VERBOSE);
+ }
+
+ @Override
+ public void trace(Marker marker, String message, Throwable throwable) {
+ parentTask.log(message, throwable, Project.MSG_VERBOSE);
+ }
+
+ @Override
+ public boolean isDebugEnabled() {
return true;
}
- public boolean isInfoEnabled() {
+ @Override
+ public void warn(String message) {
+ parentTask.log(message, Project.MSG_WARN);
+ }
+
+ @Override
+ public void warn(String message, Object object) {
+ parentTask.log(message, Project.MSG_WARN);
+ }
+
+ @Override
+ public void warn(String message, Object... objects) {
+ parentTask.log(message, Project.MSG_WARN);
+ }
+
+ @Override
+ public void warn(String message, Object object, Object secondObject) {
+ parentTask.log(message, Project.MSG_WARN);
+ }
+
+ @Override
+ public void warn(String message, Throwable throwable) {
+ parentTask.log(message, throwable, Project.MSG_WARN);
+ }
+
+ @Override
+ public boolean isWarnEnabled(Marker marker) {
return true;
}
- public boolean isTraceEnabled() {
+ @Override
+ public void warn(Marker marker, String message) {
+ parentTask.log(message, Project.MSG_WARN);
+ }
+
+ @Override
+ public void warn(Marker marker, String message, Object object) {
+ parentTask.log(message, Project.MSG_WARN);
+ }
+
+ @Override
+ public void warn(Marker marker, String message, Object object, Object secondObject) {
+ parentTask.log(message, Project.MSG_WARN);
+ }
+
+ @Override
+ public void warn(Marker marker, String message, Object... objects) {
+ parentTask.log(message, Project.MSG_WARN);
+ }
+
+ @Override
+ public void warn(Marker marker, String message, Throwable throwable) {
+ parentTask.log(message, throwable, Project.MSG_WARN);
+ }
+
+ @Override
+ public boolean isErrorEnabled() {
return true;
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/58e67ec8/cayenne-ant/src/main/java/org/apache/cayenne/tools/DbGeneratorTask.java
----------------------------------------------------------------------
diff --git a/cayenne-ant/src/main/java/org/apache/cayenne/tools/DbGeneratorTask.java b/cayenne-ant/src/main/java/org/apache/cayenne/tools/DbGeneratorTask.java
index ce2e574..0e537f7 100644
--- a/cayenne-ant/src/main/java/org/apache/cayenne/tools/DbGeneratorTask.java
+++ b/cayenne-ant/src/main/java/org/apache/cayenne/tools/DbGeneratorTask.java
@@ -30,7 +30,7 @@ import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.dbsync.reverse.configuration.ToolsModule;
import org.apache.cayenne.util.Util;
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
@@ -57,7 +57,7 @@ public class DbGeneratorTask extends CayenneTask {
@Override
public void execute() {
- Log logger = new AntLogger(this);
+ Logger logger = new AntLogger(this);
log(String.format("connection settings - [driver: %s, url: %s, username: %s]", driver, url, userName),
Project.MSG_VERBOSE);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/58e67ec8/cayenne-ant/src/main/java/org/apache/cayenne/tools/DbImporterTask.java
----------------------------------------------------------------------
diff --git a/cayenne-ant/src/main/java/org/apache/cayenne/tools/DbImporterTask.java b/cayenne-ant/src/main/java/org/apache/cayenne/tools/DbImporterTask.java
index 9a42ede..8ab949f 100644
--- a/cayenne-ant/src/main/java/org/apache/cayenne/tools/DbImporterTask.java
+++ b/cayenne-ant/src/main/java/org/apache/cayenne/tools/DbImporterTask.java
@@ -39,9 +39,9 @@ import org.apache.cayenne.dbsync.reverse.filters.FiltersConfigBuilder;
import org.apache.cayenne.di.DIBootstrap;
import org.apache.cayenne.di.Injector;
import org.apache.cayenne.util.Util;
-import org.apache.commons.logging.Log;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
+import org.slf4j.Logger;
import org.apache.tools.ant.Task;
import java.io.File;
@@ -110,7 +110,7 @@ public class DbImporterTask extends Task {
config.setFiltersConfig(new FiltersConfigBuilder(reverseEngineering).build());
validateAttributes();
- Log logger = new AntLogger(this);
+ Logger logger = new AntLogger(this);
config.setLogger(logger);
config.setSkipRelationshipsLoading(reverseEngineering.getSkipRelationshipsLoading());
config.setSkipPrimaryKeyLoading(reverseEngineering.getSkipPrimaryKeyLoading());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/58e67ec8/cayenne-ant/src/test/java/org/apache/cayenne/tools/DbGeneratorTaskTest.java
----------------------------------------------------------------------
diff --git a/cayenne-ant/src/test/java/org/apache/cayenne/tools/DbGeneratorTaskTest.java b/cayenne-ant/src/test/java/org/apache/cayenne/tools/DbGeneratorTaskTest.java
index bd02e12..1ba2584 100644
--- a/cayenne-ant/src/test/java/org/apache/cayenne/tools/DbGeneratorTaskTest.java
+++ b/cayenne-ant/src/test/java/org/apache/cayenne/tools/DbGeneratorTaskTest.java
@@ -25,7 +25,7 @@ import org.apache.cayenne.dba.sqlserver.SQLServerAdapter;
import org.apache.cayenne.dbsync.reverse.configuration.ToolsModule;
import org.apache.cayenne.di.DIBootstrap;
import org.apache.cayenne.di.Injector;
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
import org.junit.Test;
import javax.sql.DataSource;
@@ -53,7 +53,7 @@ public class DbGeneratorTaskTest {
@Test
public void testSetAdapter() throws Exception {
DataSource ds = mock(DataSource.class);
- Injector injector = DIBootstrap.createInjector(new ToolsModule(mock(Log.class)));
+ Injector injector = DIBootstrap.createInjector(new ToolsModule(mock(Logger.class)));
DbGeneratorTask task = new DbGeneratorTask();