mirror/Jailer
1
0
Fork 0
mirror of https://github.com/Wisser/Jailer.git synced 2026-01-06 01:00:01 -06:00
Code Issues Packages Projects Releases 101 Wiki Activity

added slf4j

Browse Source
This commit is contained in:
Ralf Wisser
2022-04-14 11:44:45 +02:00
parent b46ffefc00
commit 9cb156933f
44 changed files with 172 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
admin/oss/jailer-engine.pom
View File

@@ -51,9 +51,9 @@
<version>1.4.199</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>2.17.2</version>
</dependency>
</dependencies>
</project>

54
config/log4j2.xml Normal file
View File

@@ -0,0 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
<Configuration status="INFO">
<Appenders>
<Console name="A1" target="SYSTEM_OUT">
<PatternLayout pattern="%d [%t] %-5p - %m%n" />
</Console>
<RollingFile name="A2" fileName="export.log" immediateFlush="false"
filePattern="export-%i.log">
<PatternLayout>
<Pattern>%d [%t] %-5p - %m%n</Pattern>
</PatternLayout>
<Policies>
<SizeBasedTriggeringPolicy size="20 MB"/>
</Policies>
<DefaultRolloverStrategy max="10"/>
</RollingFile>
<RollingFile name="A3" fileName="sql.log"
filePattern="sql-%i.log">
<PatternLayout>
<Pattern>%d [%t] %-5p - %m%n</Pattern>
</PatternLayout>
<Policies>
<SizeBasedTriggeringPolicy size="20 MB"/>
</Policies>
<DefaultRolloverStrategy max="10"/>
</RollingFile>
<RollingFile name="A4" fileName="jailer.log" immediateFlush="false"
filePattern="jailer-%i.log">
<PatternLayout>
<Pattern>%d [%t] %-5p - %m%n</Pattern>
</PatternLayout>
<Policies>
<OnStartupTriggeringPolicy />
<SizeBasedTriggeringPolicy size="2 MB"/>
</Policies>
<DefaultRolloverStrategy max="10"/>
</RollingFile>
</Appenders>
<Loggers>
<Root level="error">
<AppenderRef ref="A1" />
</Root>
<Logger name="net.sf.jailer" level="info" additivity="false">
<AppenderRef ref="A1" />
<AppenderRef ref="A2"/>
<AppenderRef ref="A3"/>
<AppenderRef ref="A4"/>
</Logger>
<Logger name="sql" level="debug" additivity="false">
<AppenderRef ref="A3"/>
<AppenderRef ref="A4"/>
</Logger>
</Loggers>
</Configuration>

BIN
lib/log4j-api-2.17.2.jar Normal file
View File

Binary file not shown.

BIN
lib/log4j-core-2.17.2.jar Normal file
View File

Binary file not shown.

BIN
lib/log4j-slf4j-impl-2.17.2.jar Normal file
View File

Binary file not shown.

BIN
lib/slf4j-api-1.7.25.jar Normal file
View File

Binary file not shown.

5
src/main/engine/net/sf/jailer/Jailer.java
View File

@@ -31,7 +31,8 @@ import java.util.logging.LogManager;
import javax.sql.DataSource;
import org.apache.log4j.Logger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.jailer.configuration.Configuration;
import net.sf.jailer.configuration.DBMS;
@@ -87,7 +88,7 @@ public class Jailer {
*/
private static synchronized Logger getLogger() {
if (logger == null) {
logger = Logger.getLogger(Jailer.class);
logger = LoggerFactory.getLogger(Jailer.class);
}
return logger;
}

5
src/main/engine/net/sf/jailer/database/BasicDataSource.java
View File

@@ -32,7 +32,8 @@ import java.util.regex.Pattern;
import javax.sql.DataSource;
import org.apache.log4j.Logger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.jailer.configuration.Configuration;
import net.sf.jailer.configuration.Configuration.UrlRewriteRule;
@@ -48,7 +49,7 @@ public class BasicDataSource implements DataSource {
/**
* The logger.
*/
private static final Logger _log = Logger.getLogger(BasicDataSource.class);
private static final Logger _log = LoggerFactory.getLogger(BasicDataSource.class);
/**
* Name of JDBC-driver class.

5
src/main/engine/net/sf/jailer/database/Session.java
View File

@@ -41,7 +41,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
import javax.sql.DataSource;
import org.apache.log4j.Logger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.jailer.configuration.Configuration;
import net.sf.jailer.configuration.DBMS;
@@ -183,7 +184,7 @@ public class Session {
/**
* The logger.
*/
public static final Logger _log = Logger.getLogger("sql");
public static final Logger _log = LoggerFactory.getLogger("sql");
/**
* Connection factory.

5
src/main/engine/net/sf/jailer/database/ShellScriptBasedStatisticRenovator.java
View File

@@ -19,7 +19,8 @@ package net.sf.jailer.database;
import java.io.BufferedReader;
import java.io.InputStreamReader;
import org.apache.log4j.Logger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.jailer.ExecutionContext;
@@ -39,7 +40,7 @@ public class ShellScriptBasedStatisticRenovator implements StatisticRenovator {
/**
* The logger.
*/
private static final Logger _log = Logger.getLogger(ShellScriptBasedStatisticRenovator.class);
private static final Logger _log = LoggerFactory.getLogger(ShellScriptBasedStatisticRenovator.class);
/**
* Constructor.

7
src/main/engine/net/sf/jailer/datamodel/DataModel.java
View File

@@ -42,7 +42,8 @@ import java.util.SortedSet;
import java.util.TreeMap;
import java.util.TreeSet;
import org.apache.log4j.Logger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.jailer.ExecutionContext;
import net.sf.jailer.JailerVersion;
@@ -228,7 +229,7 @@ public class DataModel {
/**
* The logger.
*/
private static final Logger _log = Logger.getLogger(DataModel.class);
private static final Logger _log = LoggerFactory.getLogger(DataModel.class);
/**
* Gets a table by name.
@@ -415,7 +416,7 @@ public class DataModel {
try {
pk.add(Column.parse(newName, col));
} catch (Exception e) {
_log.warn(e);
_log.warn("", e);
// ignore, was throw new RuntimeException("unable to load table '" + line.cells.get(0) + "'. " + line.location, e);
}
}

2
src/main/engine/net/sf/jailer/entitygraph/intradatabase/IntraDatabaseEntityGraph.java
View File

@@ -332,7 +332,7 @@ public class IntraDatabaseEntityGraph extends RemoteEntityGraph {
// try upsert
return upsertRows(table, sqlSelect, true);
} catch (Exception uEx) {
Session._log.warn(uEx);
Session._log.warn("", uEx);
LogUtil.warn(uEx);
// throw original exception
throw e;

5
src/main/engine/net/sf/jailer/extractionmodel/ExtractionModel.java
View File

@@ -27,7 +27,8 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import org.apache.log4j.Logger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.jailer.ExecutionContext;
import net.sf.jailer.datamodel.AggregationSchema;
@@ -58,7 +59,7 @@ public class ExtractionModel {
/**
* The logger.
*/
private static final Logger _log = Logger.getLogger(ExtractionModel.class);
private static final Logger _log = LoggerFactory.getLogger(ExtractionModel.class);
/**
* The table to read from.

5
src/main/engine/net/sf/jailer/modelbuilder/JDBCMetaDataBasedModelElementFinder.java
View File

@@ -35,7 +35,8 @@ import java.util.Map.Entry;
import java.util.Set;
import java.util.TreeMap;
import org.apache.log4j.Logger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.jailer.ExecutionContext;
import net.sf.jailer.configuration.DBMS;
@@ -84,7 +85,7 @@ public class JDBCMetaDataBasedModelElementFinder implements ModelElementFinder {
/**
* The logger.
*/
private static final Logger _log = Logger.getLogger(JDBCMetaDataBasedModelElementFinder.class);
private static final Logger _log = LoggerFactory.getLogger(JDBCMetaDataBasedModelElementFinder.class);
/**
* Set of sql types (uppercase) not listed in {@link Types} which needs a length argument.

5
src/main/engine/net/sf/jailer/modelbuilder/MetaDataCache.java
View File

@@ -27,7 +27,8 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import org.apache.log4j.Logger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.jailer.configuration.DBMS;
import net.sf.jailer.database.Session;
@@ -44,7 +45,7 @@ public class MetaDataCache {
/**
* The logger.
*/
private static final Logger _log = Logger.getLogger(MetaDataCache.class);
private static final Logger _log = LoggerFactory.getLogger(MetaDataCache.class);
/**
* The cached rows.

5
src/main/engine/net/sf/jailer/modelbuilder/ModelBuilder.java
View File

@@ -34,7 +34,8 @@ import java.util.TreeMap;
import javax.sql.DataSource;
import org.apache.log4j.Logger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.jailer.ExecutionContext;
import net.sf.jailer.configuration.DBMS;
@@ -70,7 +71,7 @@ public class ModelBuilder {
/**
* The logger.
*/
private static final Logger _log = Logger.getLogger(ModelBuilder.class);
private static final Logger _log = LoggerFactory.getLogger(ModelBuilder.class);
/**
* The statement executor for executing SQL statements.

5
src/main/engine/net/sf/jailer/render/HtmlDataModelRenderer.java
View File

@@ -29,7 +29,8 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.apache.log4j.Logger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.jailer.datamodel.Association;
import net.sf.jailer.datamodel.Column;
@@ -64,7 +65,7 @@ public class HtmlDataModelRenderer implements DataModelRenderer {
/**
* The logger.
*/
private static final Logger _log = Logger.getLogger(HtmlDataModelRenderer.class);
private static final Logger _log = LoggerFactory.getLogger(HtmlDataModelRenderer.class);
public static final String CONTENT_FOLDER_NAME = "tables";

5
src/main/engine/net/sf/jailer/restrictionmodel/RestrictionModel.java
View File

@@ -21,7 +21,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.log4j.Logger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.jailer.ExecutionContext;
import net.sf.jailer.datamodel.Association;
@@ -61,7 +62,7 @@ public class RestrictionModel {
/**
* The logger.
*/
private static final Logger _log = Logger.getLogger(RestrictionModel.class);
private static final Logger _log = LoggerFactory.getLogger(RestrictionModel.class);
/**
* Constructor.

7
src/main/engine/net/sf/jailer/subsetting/SubsettingEngine.java
View File

@@ -54,7 +54,8 @@ import javax.xml.transform.TransformerConfigurationException;
import javax.xml.transform.sax.TransformerHandler;
import javax.xml.transform.stream.StreamResult;
import org.apache.log4j.Logger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
@@ -158,7 +159,7 @@ public class SubsettingEngine {
/**
* The logger.
*/
private static final Logger _log = Logger.getLogger(SubsettingEngine.class);
private static final Logger _log = LoggerFactory.getLogger(SubsettingEngine.class);
/**
* Comment header of the export-script.
@@ -1510,7 +1511,7 @@ public class SubsettingEngine {
}
}
_log.info(session.dbms.getSqlDialect());
_log.info("" + session.dbms.getSqlDialect());
Runnable updateStatistics = new Runnable() {
@Override

5
src/main/engine/net/sf/jailer/util/CancellationHandler.java
View File

@@ -20,7 +20,8 @@ import java.util.IdentityHashMap;
import java.util.Map;
import java.util.WeakHashMap;
import org.apache.log4j.Logger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Handles cancellation request of the user and cancels database requests.
@@ -42,7 +43,7 @@ public class CancellationHandler {
/**
* The logger.
*/
private static final Logger _log = Logger.getLogger(JobManager.class);
private static final Logger _log = LoggerFactory.getLogger(JobManager.class);
/**
* Default context

5
src/main/engine/net/sf/jailer/util/JobManager.java
View File

@@ -21,7 +21,8 @@ import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
import org.apache.log4j.Logger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Executes a job-list in a concurrent way.
@@ -44,7 +45,7 @@ public abstract class JobManager {
/**
* The logger.
*/
private static final Logger _log = Logger.getLogger(JobManager.class);
private static final Logger _log = LoggerFactory.getLogger(JobManager.class);
/**
* The runners list.

17
src/main/engine/net/sf/jailer/util/LogUtil.java
View File

@@ -6,7 +6,10 @@ import java.io.PrintStream;
import java.util.Enumeration;
import java.util.Properties;
import org.apache.log4j.PropertyConfigurator;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.config.Configuration;
public class LogUtil {
@@ -32,7 +35,17 @@ public class LogUtil {
}
}
}
PropertyConfigurator.configure(props);
LoggerContext context = (org.apache.logging.log4j.core.LoggerContext) LogManager.getContext(false);
File file = new File("path/to/a/different/log4j2.xml");
// this will force a reconfiguration
// Configuration c = context.getConfiguration();
// c.getAppenders().values().forEach(a -> {
// if (a instanceof Appender)
// });
// PropertyConfigurator.configure(props);
} catch (Exception e) {
System.setErr(oldErr);
e.printStackTrace();

5
src/main/engine/net/sf/jailer/util/SqlScriptExecutor.java
View File

@@ -41,7 +41,8 @@ import java.util.regex.Pattern;
import java.util.zip.GZIPInputStream;
import java.util.zip.ZipInputStream;
import org.apache.log4j.Logger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.jailer.configuration.Configuration;
import net.sf.jailer.database.Session;
@@ -67,7 +68,7 @@ public class SqlScriptExecutor {
/**
* The logger.
*/
private static final Logger _log = Logger.getLogger(SqlScriptExecutor.class);
private static final Logger _log = LoggerFactory.getLogger(SqlScriptExecutor.class);
/**
* The session.

5
src/main/engine/net/sf/jailer/xml/XmlExportTransformer.java
View File

@@ -29,7 +29,8 @@ import java.util.Set;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerConfigurationException;
import org.apache.log4j.Logger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
@@ -91,7 +92,7 @@ public class XmlExportTransformer extends AbstractResultSetReader {
/**
* The logger.
*/
private static final Logger _log = Logger.getLogger(XmlExportTransformer.class);
private static final Logger _log = LoggerFactory.getLogger(XmlExportTransformer.class);
/**
* Maps clear text SQL-types to {@link java.sql.Types}.

5
src/main/gui/net/sf/jailer/ui/DbConnectionDialog.java
View File

@@ -58,7 +58,8 @@ import javax.swing.table.DefaultTableModel;
import javax.swing.table.TableCellRenderer;
import javax.swing.table.TableColumn;
import org.apache.log4j.Logger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.jailer.ExecutionContext;
import net.sf.jailer.configuration.DBMS;
@@ -84,7 +85,7 @@ public class DbConnectionDialog extends javax.swing.JDialog {
/**
* The logger.
*/
private static final Logger logger = Logger.getLogger(MetaDataPanel.class);
private static final Logger logger = LoggerFactory.getLogger(MetaDataPanel.class);
/**
* <code>true</code> if valid connection is available.

6
src/main/gui/net/sf/jailer/ui/ExtractionModelFrame.java
View File

@@ -47,7 +47,6 @@ import java.util.concurrent.Callable;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Collectors;
import javax.swing.ImageIcon;
@@ -63,6 +62,9 @@ import javax.swing.KeyStroke;
import javax.swing.SwingUtilities;
import javax.swing.WindowConstants;
import org.apache.logging.log4j.core.Logger;
import org.slf4j.LoggerFactory;
import net.sf.jailer.ExecutionContext;
import net.sf.jailer.JailerVersion;
import net.sf.jailer.configuration.Configuration;
@@ -2300,7 +2302,7 @@ public class ExtractionModelFrame extends javax.swing.JFrame {
}
// turn off logging for prefuse library
try {
Logger.getLogger("prefuse").setLevel(Level.OFF);
// Logger.getLogger("prefuse").setLevel(Level.OFF);
} catch (Exception e1) {
e1.printStackTrace();
}

1
src/main/gui/net/sf/jailer/ui/FileView.java
View File

@@ -17,7 +17,6 @@ package net.sf.jailer.ui;
import java.awt.Container;
import java.awt.Dimension;
import java.awt.Font;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;

3
src/main/gui/net/sf/jailer/ui/QueryBuilderDialog.java
View File

@@ -16,13 +16,11 @@
package net.sf.jailer.ui;
import java.awt.Color;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.Font;
import java.awt.GridBagConstraints;
import java.awt.Insets;
import java.awt.Rectangle;
import java.awt.Window;
import java.awt.event.ComponentEvent;
import java.awt.event.ComponentListener;
import java.awt.event.ItemEvent;
@@ -44,7 +42,6 @@ import javax.swing.JComponent;
import javax.swing.JLabel;
import javax.swing.JScrollPane;
import javax.swing.JTextField;
import javax.swing.SwingUtilities;
import javax.swing.border.BevelBorder;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;

5
src/main/gui/net/sf/jailer/ui/UIUtil.java
View File

@@ -117,8 +117,9 @@ import javax.swing.table.TableColumnModel;
import javax.swing.table.TableModel;
import javax.swing.text.DefaultEditorKit;
import org.apache.log4j.Logger;
import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.formdev.flatlaf.FlatLightLaf;
@@ -164,7 +165,7 @@ public class UIUtil {
/**
* The logger.
*/
private static final Logger _log = Logger.getLogger(UIUtil.class);
private static final Logger _log = LoggerFactory.getLogger(UIUtil.class);
/**
* Opens file chooser.

4
src/main/gui/net/sf/jailer/ui/databrowser/DataBrowser.java
View File

@@ -69,8 +69,6 @@ import java.util.Map.Entry;
import java.util.Set;
import java.util.TreeSet;
import java.util.Vector;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Collectors;
import javax.swing.AbstractButton;
@@ -3093,7 +3091,7 @@ public class DataBrowser extends javax.swing.JFrame {
// turn off logging for prefuse library
try {
Logger.getLogger("prefuse").setLevel(Level.OFF);
// LoggerFactory.getLogger("prefuse").setLevel(Level.OFF);
} catch (Exception e1) {
e1.printStackTrace();
}

5
src/main/gui/net/sf/jailer/ui/databrowser/metadata/MDDatabase.java
View File

@@ -25,7 +25,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
import javax.swing.JComponent;
import org.apache.log4j.Logger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.jailer.ExecutionContext;
import net.sf.jailer.database.Session;
@@ -42,7 +43,7 @@ public class MDDatabase extends MDGeneric {
/**
* The logger.
*/
private static final Logger logger = Logger.getLogger(MDDatabase.class);
private static final Logger logger = LoggerFactory.getLogger(MDDatabase.class);
private final DataModel dataModel;

5
src/main/gui/net/sf/jailer/ui/databrowser/metadata/MDDescriptionBasedGeneric.java
View File

@@ -40,9 +40,10 @@ import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTabbedPane;
import org.apache.log4j.Logger;
import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.jailer.ExecutionContext;
import net.sf.jailer.configuration.DBMS;
@@ -63,7 +64,7 @@ public class MDDescriptionBasedGeneric extends MDGeneric {
/**
* The logger.
*/
private static final Logger logger = Logger.getLogger(MetaDataDetailsPanel.class);
private static final Logger logger = LoggerFactory.getLogger(MetaDataDetailsPanel.class);
protected final DatabaseObjectRenderingDescription databaseObjectRenderingDescription;
protected final MDSchema schema;

5
src/main/gui/net/sf/jailer/ui/databrowser/metadata/MDSchema.java
View File

@@ -34,7 +34,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
import javax.swing.ImageIcon;
import org.apache.log4j.Logger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.jailer.database.Session.AbstractResultSetReader;
import net.sf.jailer.modelbuilder.MemorizedResultSet;
@@ -51,7 +52,7 @@ public class MDSchema extends MDObject {
/**
* The logger.
*/
private static final Logger logger = Logger.getLogger(MDObject.class);
private static final Logger logger = LoggerFactory.getLogger(MDObject.class);
public final boolean isDefaultSchema;
private List<MDTable> tables;

5
src/main/gui/net/sf/jailer/ui/databrowser/metadata/MDTable.java
View File

@@ -38,7 +38,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
import javax.swing.JComponent;
import org.apache.log4j.Logger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.jailer.configuration.DBMS;
import net.sf.jailer.database.Session;
@@ -62,7 +63,7 @@ public class MDTable extends MDObject {
/**
* The logger.
*/
private static final Logger logger = Logger.getLogger(MDObject.class);
private static final Logger logger = LoggerFactory.getLogger(MDObject.class);
private final MDSchema schema;
private List<String> primaryKey;

5
src/main/gui/net/sf/jailer/ui/databrowser/metadata/MetaDataDetailsPanel.java
View File

@@ -43,9 +43,10 @@ import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTable;
import org.apache.log4j.Logger;
import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.jailer.ExecutionContext;
import net.sf.jailer.database.Session;
@@ -79,7 +80,7 @@ public abstract class MetaDataDetailsPanel extends javax.swing.JPanel {
/**
* The logger.
*/
private static final Logger logger = Logger.getLogger(MetaDataDetailsPanel.class);
private static final Logger logger = LoggerFactory.getLogger(MetaDataDetailsPanel.class);
private final Reference<DataModel> datamodel;
private final Session session;

5
src/main/gui/net/sf/jailer/ui/databrowser/metadata/MetaDataPanel.java
View File

@@ -109,9 +109,10 @@ import javax.swing.tree.TreeNode;
import javax.swing.tree.TreePath;
import javax.swing.tree.TreeSelectionModel;
import org.apache.log4j.Logger;
import org.fife.rsta.ui.EscapableDialog;
import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.jailer.ExecutionContext;
import net.sf.jailer.configuration.DBMS;
@@ -142,7 +143,7 @@ public abstract class MetaDataPanel extends javax.swing.JPanel {
/**
* The logger.
*/
private static final Logger logger = Logger.getLogger(MetaDataPanel.class);
private static final Logger logger = LoggerFactory.getLogger(MetaDataPanel.class);
private final MetaDataSource metaDataSource;
private final JComboBox2<String> tablesComboBox;

5
src/main/gui/net/sf/jailer/ui/databrowser/metadata/MetaDataSource.java
View File

@@ -24,7 +24,8 @@ import java.util.Locale;
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.log4j.Logger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.jailer.ExecutionContext;
import net.sf.jailer.database.Session;
@@ -43,7 +44,7 @@ public class MetaDataSource {
/**
* The logger.
*/
private static final Logger logger = Logger.getLogger(MetaDataDetailsPanel.class);
private static final Logger logger = LoggerFactory.getLogger(MetaDataDetailsPanel.class);
/**
* The database session.

1
src/main/gui/net/sf/jailer/ui/databrowser/sqlconsole/ColumnsTable.java
View File

@@ -22,7 +22,6 @@ import java.awt.GridBagLayout;
import java.awt.Point;
import java.awt.Rectangle;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter;

5
src/main/gui/net/sf/jailer/ui/databrowser/sqlconsole/QueryTypeAnalyser.java
View File

@@ -28,7 +28,8 @@ import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.log4j.Logger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.jailer.datamodel.PrimaryKey;
import net.sf.jailer.datamodel.PrimaryKeyFactory;
@@ -159,7 +160,7 @@ public class QueryTypeAnalyser {
/**
* The logger.
*/
private static final Logger logger = Logger.getLogger(MetaDataDetailsPanel.class);
private static final Logger logger = LoggerFactory.getLogger(MetaDataDetailsPanel.class);
@SuppressWarnings("serial")
private static class QueryTooComplexException extends RuntimeException {

7
src/main/gui/net/sf/jailer/ui/databrowser/sqlconsole/SQLConsole.java
View File

@@ -111,11 +111,12 @@ import javax.swing.text.BadLocationException;
import javax.swing.text.Document;
import javax.swing.text.Segment;
import org.apache.log4j.Logger;
import org.fife.ui.rsyntaxtextarea.RSyntaxDocument;
import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
import org.fife.ui.rtextarea.RTextScrollPane;
import org.fife.ui.rtextarea.SmartHighlightPainter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.jailer.ExecutionContext;
import net.sf.jailer.configuration.Configuration;
@@ -144,9 +145,9 @@ import net.sf.jailer.ui.databrowser.BrowserContentPane.LoadJob;
import net.sf.jailer.ui.databrowser.BrowserContentPane.RowsClosure;
import net.sf.jailer.ui.databrowser.DataBrowser;
import net.sf.jailer.ui.databrowser.Desktop;
import net.sf.jailer.ui.databrowser.FullTextSearchPanel;
import net.sf.jailer.ui.databrowser.Desktop.FindClosureContext;
import net.sf.jailer.ui.databrowser.Desktop.RowBrowser;
import net.sf.jailer.ui.databrowser.FullTextSearchPanel;
import net.sf.jailer.ui.databrowser.Reference;
import net.sf.jailer.ui.databrowser.Row;
import net.sf.jailer.ui.databrowser.SQLValue;
@@ -184,7 +185,7 @@ public abstract class SQLConsole extends javax.swing.JPanel {
/**
* The logger.
*/
private static final Logger logger = Logger.getLogger(MetaDataDetailsPanel.class);
private static final Logger logger = LoggerFactory.getLogger(MetaDataDetailsPanel.class);
private static final int MAX_TAB_COUNT = 8;
private static final int MAX_HISTORY_SIZE = 100;

5
src/main/gui/net/sf/jailer/ui/databrowser/sqlconsole/SQLPlusSupport.java
View File

@@ -31,7 +31,8 @@ import java.util.TreeMap;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.log4j.Logger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.jailer.modelbuilder.MemorizedResultSet;
@@ -45,7 +46,7 @@ public class SQLPlusSupport {
/**
* The logger.
*/
private static final Logger logger = Logger.getLogger(SQLPlusSupport.class);
private static final Logger logger = LoggerFactory.getLogger(SQLPlusSupport.class);
/**
* The variables.

5
src/main/gui/net/sf/jailer/ui/databrowser/sqlconsole/TabContentPanel.java
View File

@@ -49,10 +49,11 @@ import javax.swing.table.DefaultTableModel;
import javax.swing.table.TableColumnModel;
import javax.swing.table.TableModel;
import org.apache.log4j.Logger;
import org.fife.ui.rsyntaxtextarea.RSyntaxDocument;
import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.jailer.ExecutionContext;
import net.sf.jailer.database.Session;
@@ -74,7 +75,7 @@ public class TabContentPanel extends javax.swing.JPanel {
/**
* The logger.
*/
private static final Logger logger = Logger.getLogger(MetaDataDetailsPanel.class);
private static final Logger logger = LoggerFactory.getLogger(MetaDataDetailsPanel.class);
/**
* Creates new form TabContentPanel

5
src/main/gui/net/sf/jailer/ui/databrowser/whereconditioneditor/WCTypeAnalyser.java
View File

@@ -28,7 +28,8 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import org.apache.log4j.Logger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.jailer.datamodel.PrimaryKey;
import net.sf.jailer.datamodel.Table;
@@ -159,7 +160,7 @@ public class WCTypeAnalyser {
/**
* The logger.
*/
private static final Logger logger = Logger.getLogger(MetaDataDetailsPanel.class);
private static final Logger logger = LoggerFactory.getLogger(MetaDataDetailsPanel.class);
public static class Result {
public Table table;

2
src/main/gui/net/sf/jailer/ui/util/AWTWatchdog.java
View File

@@ -168,7 +168,7 @@ public class AWTWatchdog {
}
sb.append('\n');
Session._log.error(sb);
Session._log.error(sb.toString());
String dump = Pattern.compile(mrk + "(?d)([^\\n]*\\n[^\\n]*\\n)(.*?)\\b" + pckPtrn, Pattern.DOTALL).matcher(sb.toString()).replaceFirst("..$1at " + pck);
dump = dump