From dfade971209c13a5a93881219a815a8fdd992c48 Mon Sep 17 00:00:00 2001 From: chenson42 Date: Mon, 16 Jan 2012 17:03:28 +0000 Subject: [PATCH] first pass at converting to slf4j --- .../symmetric/ClientSymmetricEngine.java | 19 +- .../db/AbstractEmbeddedSymmetricDialect.java | 7 +- .../db/JdbcSymmetricDialectFactory.java | 40 +- .../symmetric/db/db2/Db2SymmetricDialect.java | 5 +- .../db/db2/Db2v9SymmetricDialect.java | 5 +- .../db/derby/DerbySymmetricDialect.java | 5 +- .../db/firebird/FirebirdSymmetricDialect.java | 5 +- .../symmetric/db/h2/H2SymmetricDialect.java | 5 +- .../db/hsqldb/HsqlDbSymmetricDialect.java | 5 +- .../db/hsqldb2/HsqlDb2SymmetricDialect.java | 5 +- .../db/informix/InformixSymmetricDialect.java | 5 +- .../interbase/InterbaseSymmetricDialect.java | 5 +- .../db/mssql/MsSqlSymmetricDialect.java | 5 +- .../db/mysql/MySqlSymmetricDialect.java | 5 +- .../db/oracle/OracleSymmetricDialect.java | 9 +- .../postgresql/GreenplumSymmetricDialect.java | 5 +- .../PostgreSqlSymmetricDialect.java | 5 +- .../db/sybase/SybaseSymmetricDialect.java | 5 +- .../service/jmx/NodeManagementService.java | 10 +- .../symmetric/test/TestSetupUtil.java | 15 +- .../src/test/resources/log4j.xml | 2 +- .../symmetric/AbstractSymmetricEngine.java | 88 +- .../jumpmind/symmetric/ISymmetricEngine.java | 4 +- .../db/AbstractSymmetricDialect.java | 17 +- .../symmetric/ext/ExtensionPointManager.java | 9 +- .../io/DefaultOfflineClientListener.java | 9 +- .../jumpmind/symmetric/job/AbstractJob.java | 8 +- .../job/DefaultOfflineServerListener.java | 13 +- .../jumpmind/symmetric/job/JobManager.java | 9 +- .../load/ConfigurationChangedFilter.java | 6 +- .../symmetric/route/AbstractDataRouter.java | 6 +- .../symmetric/route/ChannelRouterContext.java | 8 +- .../symmetric/route/DataGapDetector.java | 8 +- .../symmetric/route/DataGapRouteReader.java | 16 +- .../route/LookupTableDataRouter.java | 6 +- .../symmetric/route/SimpleRouterContext.java | 7 +- .../impl/AbstractOfflineDetectorService.java | 5 +- .../service/impl/AbstractService.java | 9 +- .../service/impl/AcknowledgeService.java | 5 +- .../service/impl/BandwidthService.java | 11 +- .../service/impl/ClusterService.java | 5 +- .../service/impl/ConfigurationService.java | 7 +- .../service/impl/DataExtractorService.java | 9 +- .../service/impl/DataLoaderService.java | 16 +- .../symmetric/service/impl/DataService.java | 21 +- .../service/impl/IncomingBatchService.java | 5 +- .../symmetric/service/impl/NodeService.java | 5 +- .../service/impl/OutgoingBatchService.java | 5 +- .../service/impl/ParameterService.java | 9 +- .../symmetric/service/impl/PullService.java | 15 +- .../symmetric/service/impl/PurgeService.java | 19 +- .../symmetric/service/impl/PushService.java | 7 +- .../service/impl/RegistrationService.java | 15 +- .../symmetric/service/impl/RouterService.java | 50 +- .../service/impl/SecurityService.java | 6 +- .../service/impl/StatisticService.java | 5 +- .../service/impl/TransformService.java | 5 +- .../service/impl/TriggerRouterService.java | 11 +- .../transport/AbstractTransportManager.java | 16 +- .../http/HttpBandwidthUrlSelector.java | 9 +- .../transport/http/HttpTransportManager.java | 3 +- .../http/SelfSignedX509TrustManager.java | 6 +- .../internal/InternalTransportManager.java | 10 +- .../org/jumpmind/symmetric/util/AppUtils.java | 14 +- .../util/DefaultParameterParser.java | 8 +- .../org/jumpmind/symmetric/TestUtils.java | 8 - .../impl/AbstractRouterServiceTest.java | 5 +- .../service/impl/AbstractServiceTest.java | 24 +- .../http/HttpBandwidthBalancerTest.java | 3 +- .../db/platform/AbstractDatabasePlatform.java | 18 +- .../db/platform/AbstractDdlBuilder.java | 8 +- .../db/platform/DatabasePlatformInfo.java | 7 +- .../jumpmind/symmetric/io/data/CsvUtils.java | 6 +- .../symmetric/io/data/DataProcessor.java | 8 +- .../io/data/reader/ProtocolDataReader.java | 6 +- .../io/data/transform/BshColumnTransform.java | 6 +- .../transform/IdentityColumnTransform.java | 6 +- .../data/transform/LookupColumnTransform.java | 6 +- .../io/data/writer/DatabaseWriter.java | 21 +- ...DefaultDatabaseWriterConflictResolver.java | 6 +- .../io/data/writer/TransformWriter.java | 21 +- .../AbstractJdbcDatabasePlatform.java | 4 +- .../db/platform/AbstractJdbcDdlReader.java | 8 +- .../platform/JdbcDatabasePlatformFactory.java | 19 +- .../jumpmind/db/platform/db2/Db2Builder.java | 5 +- .../db/platform/db2/Db2DdlReader.java | 5 +- .../jumpmind/db/platform/db2/Db2Platform.java | 9 +- .../db/platform/derby/DerbyBuilder.java | 5 +- .../db/platform/derby/DerbyDdlReader.java | 5 +- .../db/platform/derby/DerbyPlatform.java | 9 +- .../db/platform/firebird/FirebirdBuilder.java | 5 +- .../platform/firebird/FirebirdDdlReader.java | 5 +- .../platform/firebird/FirebirdPlatform.java | 9 +- .../greenplum/GreenplumDdlReader.java | 5 +- .../platform/greenplum/GreenplumPlatform.java | 7 +- .../jumpmind/db/platform/h2/H2Builder.java | 5 +- .../jumpmind/db/platform/h2/H2DdlReader.java | 5 +- .../jumpmind/db/platform/h2/H2Platform.java | 9 +- .../db/platform/hsqldb/HsqlDbBuilder.java | 5 +- .../db/platform/hsqldb/HsqlDbDdlReader.java | 5 +- .../db/platform/hsqldb/HsqlDbPlatform.java | 9 +- .../db/platform/hsqldb2/HsqlDb2Builder.java | 5 +- .../db/platform/hsqldb2/HsqlDb2DdlReader.java | 5 +- .../db/platform/hsqldb2/HsqlDb2Platform.java | 9 +- .../db/platform/informix/InformixBuilder.java | 5 +- .../platform/informix/InformixDdlReader.java | 5 +- .../platform/informix/InformixPlatform.java | 9 +- .../platform/interbase/InterbaseBuilder.java | 5 +- .../interbase/InterbaseDdlReader.java | 5 +- .../platform/interbase/InterbasePlatform.java | 9 +- .../db/platform/mssql/MsSqlBuilder.java | 5 +- .../db/platform/mssql/MsSqlDdlReader.java | 5 +- .../db/platform/mssql/MsSqlPlatform.java | 9 +- .../db/platform/mysql/MySqlBuilder.java | 5 +- .../db/platform/mysql/MySqlDdlReader.java | 5 +- .../db/platform/mysql/MySqlPlatform.java | 9 +- .../db/platform/oracle/OracleBuilder.java | 5 +- .../db/platform/oracle/OracleDdlReader.java | 5 +- .../db/platform/oracle/OraclePlatform.java | 9 +- .../postgresql/PostgreSqlBuilder.java | 5 +- .../postgresql/PostgreSqlDdlReader.java | 5 +- .../postgresql/PostgreSqlPlatform.java | 9 +- .../db/platform/sybase/SybaseBuilder.java | 5 +- .../db/platform/sybase/SybaseDdlReader.java | 5 +- .../db/platform/sybase/SybasePlatform.java | 9 +- .../jumpmind/db/sql/SqlScriptUnitTest.java | 1 - .../jumpmind/db/sql/jdbc/JdbcSqlTemplate.java | 16 +- .../db/sql/jdbc/JdbcSqlTransaction.java | 6 +- .../java/org/jumpmind/db/AbstractDbTest.java | 9 - symmetric/symmetric-parent/pom.xml | 1229 +++++++++-------- symmetric/symmetric-server/pom.xml | 6 - .../jumpmind/symmetric/SymmetricLauncher.java | 24 +- .../symmetric/SymmetricWebServer.java | 6 +- ...AbstractTextPublisherDataLoaderFilter.java | 13 +- .../AbstractXmlPublisherExtensionPoint.java | 6 +- .../integrate/SimpleJmsPublisher.java | 6 +- .../symmetric/map/ColumnDataFilters.java | 6 +- .../web/AbstractCompressionUriHandler.java | 5 +- .../symmetric/web/AbstractUriHandler.java | 11 +- .../jumpmind/symmetric/web/AckUriHandler.java | 5 +- .../web/BandwidthSamplerUriHandler.java | 5 +- .../symmetric/web/BatchUriHandler.java | 5 +- .../symmetric/web/InfoUriHandler.java | 5 +- .../symmetric/web/PingUriHandler.java | 5 +- .../symmetric/web/PullUriHandler.java | 5 +- .../symmetric/web/PushUriHandler.java | 5 +- .../symmetric/web/RegistrationUriHandler.java | 5 +- .../symmetric/web/ServerSymmetricEngine.java | 18 +- .../symmetric/web/SymmetricEngineHolder.java | 10 +- .../symmetric/web/SymmetricServlet.java | 26 +- .../CompressionServletResponseWrapper.java | 6 +- symmetric/symmetric-util/pom.xml | 8 + .../java/org/jumpmind/log/ConsoleLog.java | 60 - .../src/main/java/org/jumpmind/log/Log.java | 59 - .../main/java/org/jumpmind/log/Log4jLog.java | 66 - .../java/org/jumpmind/log/LogFactory.java | 59 - .../main/java/org/jumpmind/log/LogLevel.java | 5 - .../jumpmind/properties/TypedProperties.java | 9 +- 158 files changed, 1243 insertions(+), 1613 deletions(-) delete mode 100644 symmetric/symmetric-util/src/main/java/org/jumpmind/log/ConsoleLog.java delete mode 100644 symmetric/symmetric-util/src/main/java/org/jumpmind/log/Log.java delete mode 100644 symmetric/symmetric-util/src/main/java/org/jumpmind/log/Log4jLog.java delete mode 100644 symmetric/symmetric-util/src/main/java/org/jumpmind/log/LogFactory.java delete mode 100644 symmetric/symmetric-util/src/main/java/org/jumpmind/log/LogLevel.java diff --git a/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/ClientSymmetricEngine.java b/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/ClientSymmetricEngine.java index c5f99055c1..2eaa4b93d3 100644 --- a/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/ClientSymmetricEngine.java +++ b/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/ClientSymmetricEngine.java @@ -17,8 +17,6 @@ import org.jumpmind.db.platform.JdbcDatabasePlatformFactory; import org.jumpmind.db.sql.jdbc.JdbcSqlTemplate; import org.jumpmind.exception.IoException; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; import org.jumpmind.properties.TypedProperties; import org.jumpmind.symmetric.common.ParameterConstants; import org.jumpmind.symmetric.common.SecurityConstants; @@ -31,6 +29,7 @@ import org.jumpmind.symmetric.job.JobManager; import org.jumpmind.symmetric.service.ISecurityService; import org.jumpmind.symmetric.util.AppUtils; +import org.slf4j.LoggerFactory; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.Resource; @@ -58,11 +57,11 @@ public DataSource getDataSource() { } public static BasicDataSource createBasicDataSource(File propsFile) { - return createBasicDataSource(LogFactory.getLog(ClientSymmetricEngine.class), + return createBasicDataSource( createTypedPropertiesFactory(propsFile, null).reload(), createSecurityService()); } - public static BasicDataSource createBasicDataSource(Log log, TypedProperties properties, + public static BasicDataSource createBasicDataSource(TypedProperties properties, ISecurityService securityService) { BasicDataSource dataSource = new BasicDataSource(); dataSource.setDriverClassName(properties.get(ParameterConstants.DBPOOL_DRIVER, null)); @@ -96,7 +95,7 @@ public static BasicDataSource createBasicDataSource(Log log, TypedProperties pro for (String property : tokens) { String[] keyValue = property.split("="); if (keyValue != null && keyValue.length > 1) { - log.info("Setting database connection property %s=%s", keyValue[0], keyValue[1]); + LoggerFactory.getLogger(ClientSymmetricEngine.class).info("Setting database connection property %s=%s", keyValue[0], keyValue[1]); dataSource.addConnectionProperty(keyValue[0], keyValue[1]); } } @@ -107,7 +106,7 @@ public static BasicDataSource createBasicDataSource(Log log, TypedProperties pro @Override protected ISymmetricDialect createSymmetricDialect() { - return new JdbcSymmetricDialectFactory(parameterService, platform, log).create(); + return new JdbcSymmetricDialectFactory(parameterService, platform).create(); } @Override @@ -115,7 +114,7 @@ protected IDatabasePlatform createDatabasePlatform(TypedProperties properties) { createDataSource(properties); waitForAvailableDatabase(); return JdbcDatabasePlatformFactory.createNewPlatformInstance(this.dataSource, - createDatabasePlatformSettings(properties), log); + createDatabasePlatformSettings(properties)); } protected DatabasePlatformSettings createDatabasePlatformSettings(TypedProperties properties) { @@ -127,17 +126,17 @@ protected DatabasePlatformSettings createDatabasePlatformSettings(TypedPropertie } protected void createDataSource(TypedProperties properties) { - this.dataSource = createBasicDataSource(log, properties, securityService); + this.dataSource = createBasicDataSource(properties, securityService); } @Override protected IExtensionPointManager createExtensionPointManager() { - return new ExtensionPointManager(log, this); + return new ExtensionPointManager(this); } @Override protected IJobManager createJobManager() { - return new JobManager(log, this); + return new JobManager(this); } protected void waitForAvailableDatabase() { diff --git a/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/AbstractEmbeddedSymmetricDialect.java b/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/AbstractEmbeddedSymmetricDialect.java index 5a669a1c64..c318eb2f3d 100644 --- a/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/AbstractEmbeddedSymmetricDialect.java +++ b/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/AbstractEmbeddedSymmetricDialect.java @@ -22,7 +22,6 @@ import org.jumpmind.db.model.Table; import org.jumpmind.db.platform.IDatabasePlatform; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.model.Channel; import org.jumpmind.symmetric.model.Node; import org.jumpmind.symmetric.model.Trigger; @@ -32,9 +31,9 @@ abstract public class AbstractEmbeddedSymmetricDialect extends AbstractSymmetricDialect implements ISymmetricDialect { - public AbstractEmbeddedSymmetricDialect(Log log, - IParameterService parameterService, IDatabasePlatform platform) { - super(log, parameterService, platform); + public AbstractEmbeddedSymmetricDialect(IParameterService parameterService, + IDatabasePlatform platform) { + super(parameterService, platform); } /** diff --git a/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/JdbcSymmetricDialectFactory.java b/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/JdbcSymmetricDialectFactory.java index 9310ce75bd..484de28696 100644 --- a/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/JdbcSymmetricDialectFactory.java +++ b/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/JdbcSymmetricDialectFactory.java @@ -36,8 +36,6 @@ import org.jumpmind.db.platform.oracle.OraclePlatform; import org.jumpmind.db.platform.postgresql.PostgreSqlPlatform; import org.jumpmind.db.platform.sybase.SybasePlatform; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; import org.jumpmind.symmetric.db.db2.Db2SymmetricDialect; import org.jumpmind.symmetric.db.db2.Db2v9SymmetricDialect; import org.jumpmind.symmetric.db.derby.DerbySymmetricDialect; @@ -54,6 +52,8 @@ import org.jumpmind.symmetric.db.postgresql.PostgreSqlSymmetricDialect; import org.jumpmind.symmetric.db.sybase.SybaseSymmetricDialect; import org.jumpmind.symmetric.service.IParameterService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Factory class that is responsible for creating the appropriate @@ -61,17 +61,15 @@ */ public class JdbcSymmetricDialectFactory { - protected Log log = LogFactory.getLog(getClass()); + protected final Logger log = LoggerFactory.getLogger(getClass()); private IParameterService parameterService; private IDatabasePlatform platform; - public JdbcSymmetricDialectFactory(IParameterService parameterService, IDatabasePlatform platform, - Log log) { + public JdbcSymmetricDialectFactory(IParameterService parameterService, IDatabasePlatform platform) { this.parameterService = parameterService; this.platform = platform; - this.log = log; } public ISymmetricDialect create() { @@ -79,39 +77,39 @@ public ISymmetricDialect create() { AbstractSymmetricDialect dialect = null; if (platform instanceof MySqlPlatform) { - dialect = new MySqlSymmetricDialect(log, parameterService, platform); + dialect = new MySqlSymmetricDialect(parameterService, platform); } else if (platform instanceof OraclePlatform) { - dialect = new OracleSymmetricDialect(log, parameterService, platform); + dialect = new OracleSymmetricDialect(parameterService, platform); } else if (platform instanceof MsSqlPlatform) { - dialect = new MsSqlSymmetricDialect(log, parameterService, platform); + dialect = new MsSqlSymmetricDialect(parameterService, platform); } else if (platform instanceof GreenplumPlatform) { - dialect = new GreenplumSymmetricDialect(log, parameterService, platform); + dialect = new GreenplumSymmetricDialect(parameterService, platform); } else if (platform instanceof PostgreSqlPlatform) { - dialect = new PostgreSqlSymmetricDialect(log, parameterService, platform); + dialect = new PostgreSqlSymmetricDialect(parameterService, platform); } else if (platform instanceof DerbyPlatform) { - dialect = new DerbySymmetricDialect(log, parameterService, platform); + dialect = new DerbySymmetricDialect(parameterService, platform); } else if (platform instanceof H2Platform) { - dialect = new H2SymmetricDialect(log, parameterService, platform); + dialect = new H2SymmetricDialect(parameterService, platform); } else if (platform instanceof HsqlDbPlatform) { - dialect = new HsqlDbSymmetricDialect(log, parameterService, platform); + dialect = new HsqlDbSymmetricDialect(parameterService, platform); } else if (platform instanceof HsqlDb2Platform) { - dialect = new HsqlDb2SymmetricDialect(log, parameterService, platform); + dialect = new HsqlDb2SymmetricDialect(parameterService, platform); } else if (platform instanceof InformixPlatform) { - dialect = new InformixSymmetricDialect(log, parameterService, platform); + dialect = new InformixSymmetricDialect(parameterService, platform); } else if (platform instanceof Db2Platform) { int dbMajorVersion = platform.getSqlTemplate().getDatabaseMajorVersion(); int dbMinorVersion = platform.getSqlTemplate().getDatabaseMinorVersion(); if (dbMajorVersion < 9 || (dbMajorVersion == 9 && dbMinorVersion < 5)) { - dialect = new Db2SymmetricDialect(log, parameterService, platform); + dialect = new Db2SymmetricDialect(parameterService, platform); } else { - dialect = new Db2v9SymmetricDialect(log, parameterService, platform); + dialect = new Db2v9SymmetricDialect(parameterService, platform); } } else if (platform instanceof FirebirdPlatform) { - dialect = new FirebirdSymmetricDialect(log, parameterService, platform); + dialect = new FirebirdSymmetricDialect(parameterService, platform); } else if (platform instanceof SybasePlatform) { - dialect = new SybaseSymmetricDialect(log, parameterService, platform); + dialect = new SybaseSymmetricDialect(parameterService, platform); } else if (platform instanceof InterbasePlatform) { - dialect = new InterbaseSymmetricDialect(log, parameterService, platform); + dialect = new InterbaseSymmetricDialect(parameterService, platform); } else { throw new DbNotSupportedException(); } diff --git a/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/db2/Db2SymmetricDialect.java b/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/db2/Db2SymmetricDialect.java index 61a8ab311b..0891518813 100644 --- a/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/db2/Db2SymmetricDialect.java +++ b/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/db2/Db2SymmetricDialect.java @@ -24,7 +24,6 @@ import org.jumpmind.db.platform.IDatabasePlatform; import org.jumpmind.db.sql.ISqlTransaction; import org.jumpmind.db.util.BinaryEncoding; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.db.AbstractSymmetricDialect; import org.jumpmind.symmetric.db.ISymmetricDialect; import org.jumpmind.symmetric.model.Trigger; @@ -35,8 +34,8 @@ */ public class Db2SymmetricDialect extends AbstractSymmetricDialect implements ISymmetricDialect { - public Db2SymmetricDialect(Log log, IParameterService parameterService, IDatabasePlatform platform) { - super(log, parameterService, platform); + public Db2SymmetricDialect(IParameterService parameterService, IDatabasePlatform platform) { + super(parameterService, platform); this.triggerText = new Db2TriggerText(); } diff --git a/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/db2/Db2v9SymmetricDialect.java b/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/db2/Db2v9SymmetricDialect.java index 8c6f51420b..7917b9a328 100644 --- a/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/db2/Db2v9SymmetricDialect.java +++ b/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/db2/Db2v9SymmetricDialect.java @@ -24,7 +24,6 @@ import org.jumpmind.db.platform.IDatabasePlatform; import org.jumpmind.db.sql.ISqlTransaction; import org.jumpmind.db.sql.SqlScript; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.db.ISymmetricDialect; import org.jumpmind.symmetric.service.IParameterService; import org.springframework.jdbc.core.JdbcTemplate; @@ -35,8 +34,8 @@ public class Db2v9SymmetricDialect extends Db2SymmetricDialect implements ISymme static final String SYNC_TRIGGERS_DISABLED_NODE_VARIABLE = "sync_node_disabled"; - public Db2v9SymmetricDialect(Log log, IParameterService parameterService, IDatabasePlatform platform) { - super(log, parameterService, platform); + public Db2v9SymmetricDialect(IParameterService parameterService, IDatabasePlatform platform) { + super(parameterService, platform); } @Override diff --git a/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/derby/DerbySymmetricDialect.java b/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/derby/DerbySymmetricDialect.java index 4ab1080118..b35a1e6113 100644 --- a/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/derby/DerbySymmetricDialect.java +++ b/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/derby/DerbySymmetricDialect.java @@ -24,7 +24,6 @@ import org.jumpmind.db.platform.IDatabasePlatform; import org.jumpmind.db.sql.ISqlTransaction; import org.jumpmind.db.util.BinaryEncoding; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.db.AbstractSymmetricDialect; import org.jumpmind.symmetric.db.ISymmetricDialect; import org.jumpmind.symmetric.model.Trigger; @@ -32,8 +31,8 @@ public class DerbySymmetricDialect extends AbstractSymmetricDialect implements ISymmetricDialect { - public DerbySymmetricDialect(Log log, IParameterService parameterService, IDatabasePlatform platform) { - super(log, parameterService, platform); + public DerbySymmetricDialect(IParameterService parameterService, IDatabasePlatform platform) { + super(parameterService, platform); this.triggerText = new DerbyTriggerText(); } diff --git a/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/firebird/FirebirdSymmetricDialect.java b/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/firebird/FirebirdSymmetricDialect.java index 26c15d27c6..0d23d619d4 100644 --- a/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/firebird/FirebirdSymmetricDialect.java +++ b/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/firebird/FirebirdSymmetricDialect.java @@ -22,7 +22,6 @@ import org.jumpmind.db.platform.IDatabasePlatform; import org.jumpmind.db.sql.ISqlTransaction; import org.jumpmind.db.util.BinaryEncoding; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.db.AbstractSymmetricDialect; import org.jumpmind.symmetric.db.ISymmetricDialect; import org.jumpmind.symmetric.model.Trigger; @@ -38,8 +37,8 @@ public class FirebirdSymmetricDialect extends AbstractSymmetricDialect implement static final String SYNC_TRIGGERS_DISABLED_NODE_VARIABLE = "sync_node_disabled"; - public FirebirdSymmetricDialect(Log log, IParameterService parameterService, IDatabasePlatform platform) { - super(log, parameterService, platform); + public FirebirdSymmetricDialect(IParameterService parameterService, IDatabasePlatform platform) { + super(parameterService, platform); this.triggerText = new FirebirdTriggerText(); } diff --git a/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/h2/H2SymmetricDialect.java b/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/h2/H2SymmetricDialect.java index 99db0e63e8..2e2a3060be 100644 --- a/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/h2/H2SymmetricDialect.java +++ b/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/h2/H2SymmetricDialect.java @@ -23,7 +23,6 @@ import org.jumpmind.db.platform.IDatabasePlatform; import org.jumpmind.db.sql.ISqlTransaction; import org.jumpmind.db.util.BinaryEncoding; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.common.ParameterConstants; import org.jumpmind.symmetric.db.AbstractEmbeddedSymmetricDialect; import org.jumpmind.symmetric.db.ISymmetricDialect; @@ -36,8 +35,8 @@ */ public class H2SymmetricDialect extends AbstractEmbeddedSymmetricDialect implements ISymmetricDialect { - public H2SymmetricDialect(Log log, IParameterService parameterService, IDatabasePlatform platform) { - super(log, parameterService, platform); + public H2SymmetricDialect(IParameterService parameterService, IDatabasePlatform platform) { + super(parameterService, platform); this.triggerText = new H2TriggerText(); } diff --git a/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/hsqldb/HsqlDbSymmetricDialect.java b/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/hsqldb/HsqlDbSymmetricDialect.java index 79e43b6bd0..2dc70a6439 100644 --- a/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/hsqldb/HsqlDbSymmetricDialect.java +++ b/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/hsqldb/HsqlDbSymmetricDialect.java @@ -24,7 +24,6 @@ import org.jumpmind.db.platform.IDatabasePlatform; import org.jumpmind.db.sql.ISqlTransaction; import org.jumpmind.db.util.BinaryEncoding; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.common.ParameterConstants; import org.jumpmind.symmetric.db.AbstractEmbeddedSymmetricDialect; import org.jumpmind.symmetric.db.ISymmetricDialect; @@ -38,8 +37,8 @@ public class HsqlDbSymmetricDialect extends AbstractEmbeddedSymmetricDialect imp private boolean enforceStrictSize = true; - public HsqlDbSymmetricDialect(Log log, IParameterService parameterService, IDatabasePlatform platform) { - super(log, parameterService, platform); + public HsqlDbSymmetricDialect(IParameterService parameterService, IDatabasePlatform platform) { + super(parameterService, platform); this.triggerText = new HsqlDbTriggerText(); platform.getSqlTemplate().update("SET WRITE_DELAY 100 MILLIS"); diff --git a/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/hsqldb2/HsqlDb2SymmetricDialect.java b/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/hsqldb2/HsqlDb2SymmetricDialect.java index 14502045c0..8c908d9bc7 100644 --- a/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/hsqldb2/HsqlDb2SymmetricDialect.java +++ b/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/hsqldb2/HsqlDb2SymmetricDialect.java @@ -24,7 +24,6 @@ import org.jumpmind.db.platform.IDatabasePlatform; import org.jumpmind.db.sql.ISqlTransaction; import org.jumpmind.db.util.BinaryEncoding; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.common.ParameterConstants; import org.jumpmind.symmetric.db.AbstractSymmetricDialect; import org.jumpmind.symmetric.db.ISymmetricDialect; @@ -34,8 +33,8 @@ public class HsqlDb2SymmetricDialect extends AbstractSymmetricDialect implements ISymmetricDialect { - public HsqlDb2SymmetricDialect(Log log, IParameterService parameterService, IDatabasePlatform platform) { - super(log, parameterService, platform); + public HsqlDb2SymmetricDialect(IParameterService parameterService, IDatabasePlatform platform) { + super(parameterService, platform); this.triggerText = new HsqlDb2TriggerText(); platform.getSqlTemplate().update("SET DATABASE DEFAULT TABLE TYPE CACHED"); } diff --git a/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/informix/InformixSymmetricDialect.java b/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/informix/InformixSymmetricDialect.java index 95ddf9f84f..2ec0b47b36 100644 --- a/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/informix/InformixSymmetricDialect.java +++ b/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/informix/InformixSymmetricDialect.java @@ -22,7 +22,6 @@ import org.jumpmind.db.platform.IDatabasePlatform; import org.jumpmind.db.sql.ISqlTransaction; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.db.AbstractSymmetricDialect; import org.jumpmind.symmetric.db.ISymmetricDialect; import org.jumpmind.symmetric.model.Trigger; @@ -30,8 +29,8 @@ public class InformixSymmetricDialect extends AbstractSymmetricDialect implements ISymmetricDialect { - public InformixSymmetricDialect(Log log, IParameterService parameterService, IDatabasePlatform platform) { - super(log, parameterService, platform); + public InformixSymmetricDialect(IParameterService parameterService, IDatabasePlatform platform) { + super(parameterService, platform); this.triggerText = new InformixTriggerText(); } diff --git a/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/interbase/InterbaseSymmetricDialect.java b/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/interbase/InterbaseSymmetricDialect.java index c1313c5081..f79cf96470 100644 --- a/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/interbase/InterbaseSymmetricDialect.java +++ b/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/interbase/InterbaseSymmetricDialect.java @@ -26,7 +26,6 @@ import org.jumpmind.db.sql.ISqlTransaction; import org.jumpmind.db.sql.mapper.StringMapper; import org.jumpmind.db.util.BinaryEncoding; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.db.AbstractSymmetricDialect; import org.jumpmind.symmetric.db.ISymmetricDialect; import org.jumpmind.symmetric.db.SequenceIdentifier; @@ -49,8 +48,8 @@ public class InterbaseSymmetricDialect extends AbstractSymmetricDialect implemen static final String SYNC_TRIGGERS_DISABLED_NODE_VARIABLE = "sync_node_disabled"; - public InterbaseSymmetricDialect(Log log, IParameterService parameterService, IDatabasePlatform platform) { - super(log, parameterService, platform); + public InterbaseSymmetricDialect(IParameterService parameterService, IDatabasePlatform platform) { + super(parameterService, platform); this.triggerText = new InterbaseTriggerText(); } diff --git a/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/mssql/MsSqlSymmetricDialect.java b/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/mssql/MsSqlSymmetricDialect.java index 3b1ea86aea..2f500c9ec6 100644 --- a/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/mssql/MsSqlSymmetricDialect.java +++ b/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/mssql/MsSqlSymmetricDialect.java @@ -34,7 +34,6 @@ import org.jumpmind.db.sql.jdbc.JdbcSqlTemplate; import org.jumpmind.db.sql.jdbc.JdbcSqlTransaction; import org.jumpmind.db.util.BinaryEncoding; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.common.ParameterConstants; import org.jumpmind.symmetric.db.AbstractSymmetricDialect; import org.jumpmind.symmetric.db.ISymmetricDialect; @@ -51,8 +50,8 @@ */ public class MsSqlSymmetricDialect extends AbstractSymmetricDialect implements ISymmetricDialect { - public MsSqlSymmetricDialect(Log log, IParameterService parameterService, IDatabasePlatform platform) { - super(log, parameterService, platform); + public MsSqlSymmetricDialect(IParameterService parameterService, IDatabasePlatform platform) { + super(parameterService, platform); this.triggerText = new MsSqlTriggerText(); } diff --git a/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/mysql/MySqlSymmetricDialect.java b/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/mysql/MySqlSymmetricDialect.java index 49deda2f9f..aae7fc18f2 100644 --- a/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/mysql/MySqlSymmetricDialect.java +++ b/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/mysql/MySqlSymmetricDialect.java @@ -29,7 +29,6 @@ import org.jumpmind.db.sql.SqlException; import org.jumpmind.db.sql.jdbc.JdbcSqlTransaction; import org.jumpmind.db.util.BinaryEncoding; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.Version; import org.jumpmind.symmetric.common.ParameterConstants; import org.jumpmind.symmetric.db.AbstractSymmetricDialect; @@ -48,8 +47,8 @@ public class MySqlSymmetricDialect extends AbstractSymmetricDialect implements I private String functionTemplateKeySuffix = null; - public MySqlSymmetricDialect(Log log, IParameterService parameterService, IDatabasePlatform platform) { - super(log, parameterService, platform); + public MySqlSymmetricDialect(IParameterService parameterService, IDatabasePlatform platform) { + super(parameterService, platform); this.triggerText = new MySqlTriggerText(); this.parameterService = parameterService; } diff --git a/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/oracle/OracleSymmetricDialect.java b/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/oracle/OracleSymmetricDialect.java index 5ecf9b9ad6..b76dc4893b 100644 --- a/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/oracle/OracleSymmetricDialect.java +++ b/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/oracle/OracleSymmetricDialect.java @@ -30,7 +30,6 @@ import org.jumpmind.db.platform.IDatabasePlatform; import org.jumpmind.db.sql.ISqlTransaction; import org.jumpmind.db.util.BinaryEncoding; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.common.ParameterConstants; import org.jumpmind.symmetric.db.AbstractSymmetricDialect; import org.jumpmind.symmetric.db.ISymmetricDialect; @@ -56,15 +55,15 @@ public class OracleSymmetricDialect extends AbstractSymmetricDialect implements String selectTransactionsSql = "select min(start_time) from gv$transaction"; - public OracleSymmetricDialect(Log log, IParameterService parameterService, IDatabasePlatform platform) { - super(log, parameterService, platform); + public OracleSymmetricDialect(IParameterService parameterService, IDatabasePlatform platform) { + super(parameterService, platform); this.triggerText = new OracleTriggerText(); try { areDatabaseTransactionsPendingSince(System.currentTimeMillis()); supportsTransactionViews = true; } catch (Exception ex) { if (parameterService.is(ParameterConstants.DBDIALECT_ORACLE_USE_TRANSACTION_VIEW)) { - log.warn(ex); + log.warn(ex.getMessage(),ex); } } } @@ -177,7 +176,7 @@ public boolean areDatabaseTransactionsPendingSince(long time) { date = DateUtils.parseDate(returnValue, new String[] { "MM/dd/yy HH:mm:ss" }); return date.getTime() < time; } catch (ParseException e) { - log.error(e); + log.error(e.getMessage(),e); return true; } } else { diff --git a/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/postgresql/GreenplumSymmetricDialect.java b/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/postgresql/GreenplumSymmetricDialect.java index ccbad9a6b7..d937ecaa97 100644 --- a/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/postgresql/GreenplumSymmetricDialect.java +++ b/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/postgresql/GreenplumSymmetricDialect.java @@ -1,13 +1,12 @@ package org.jumpmind.symmetric.db.postgresql; import org.jumpmind.db.platform.IDatabasePlatform; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.service.IParameterService; public class GreenplumSymmetricDialect extends PostgreSqlSymmetricDialect { - public GreenplumSymmetricDialect(Log log, IParameterService parameterService, IDatabasePlatform platform) { - super(log, parameterService, platform); + public GreenplumSymmetricDialect(IParameterService parameterService, IDatabasePlatform platform) { + super(parameterService, platform); this.triggerText = new GreenplumTriggerText(); } diff --git a/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/postgresql/PostgreSqlSymmetricDialect.java b/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/postgresql/PostgreSqlSymmetricDialect.java index 54eecaa961..4ee213db32 100644 --- a/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/postgresql/PostgreSqlSymmetricDialect.java +++ b/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/postgresql/PostgreSqlSymmetricDialect.java @@ -23,7 +23,6 @@ import org.jumpmind.db.platform.IDatabasePlatform; import org.jumpmind.db.sql.ISqlTransaction; import org.jumpmind.db.util.BinaryEncoding; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.SymmetricException; import org.jumpmind.symmetric.common.ParameterConstants; import org.jumpmind.symmetric.db.AbstractSymmetricDialect; @@ -47,8 +46,8 @@ public class PostgreSqlSymmetricDialect extends AbstractSymmetricDialect impleme private String transactionIdExpression = "null"; - public PostgreSqlSymmetricDialect(Log log, IParameterService parameterService, IDatabasePlatform platform) { - super(log, parameterService, platform); + public PostgreSqlSymmetricDialect(IParameterService parameterService, IDatabasePlatform platform) { + super(parameterService, platform); this.triggerText = new PostgreSqlTriggerText(); } diff --git a/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/sybase/SybaseSymmetricDialect.java b/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/sybase/SybaseSymmetricDialect.java index 946360f38a..faa13e38a4 100644 --- a/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/sybase/SybaseSymmetricDialect.java +++ b/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/sybase/SybaseSymmetricDialect.java @@ -35,7 +35,6 @@ import org.jumpmind.db.sql.jdbc.JdbcSqlTemplate; import org.jumpmind.db.sql.jdbc.JdbcSqlTransaction; import org.jumpmind.db.util.BinaryEncoding; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.common.ParameterConstants; import org.jumpmind.symmetric.db.AbstractSymmetricDialect; import org.jumpmind.symmetric.db.ISymmetricDialect; @@ -52,8 +51,8 @@ */ public class SybaseSymmetricDialect extends AbstractSymmetricDialect implements ISymmetricDialect { - public SybaseSymmetricDialect(Log log, IParameterService parameterService, IDatabasePlatform platform) { - super(log, parameterService, platform); + public SybaseSymmetricDialect(IParameterService parameterService, IDatabasePlatform platform) { + super(parameterService, platform); this.triggerText = new SybaseTriggerText(); } diff --git a/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/service/jmx/NodeManagementService.java b/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/service/jmx/NodeManagementService.java index 64db83df6c..46ee07b1f8 100644 --- a/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/service/jmx/NodeManagementService.java +++ b/symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/service/jmx/NodeManagementService.java @@ -32,8 +32,6 @@ import org.apache.commons.dbcp.BasicDataSource; import org.apache.commons.lang.NotImplementedException; import org.apache.commons.lang.StringUtils; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; import org.jumpmind.symmetric.ClientSymmetricEngine; import org.jumpmind.symmetric.common.ParameterConstants; import org.jumpmind.symmetric.common.SecurityConstants; @@ -41,6 +39,8 @@ import org.jumpmind.symmetric.transport.ConcurrentConnectionManager.NodeConnectionStatistics; import org.jumpmind.symmetric.transport.IOutgoingTransport; import org.jumpmind.symmetric.transport.internal.InternalOutgoingTransport; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.jmx.export.annotation.ManagedAttribute; import org.springframework.jmx.export.annotation.ManagedOperation; import org.springframework.jmx.export.annotation.ManagedOperationParameter; @@ -50,7 +50,7 @@ @ManagedResource(description = "The management interface for a node") public class NodeManagementService { - final Log log = LogFactory.getLog(getClass()); + final Logger log = LoggerFactory.getLogger(getClass()); protected ClientSymmetricEngine engine; @@ -76,7 +76,7 @@ public boolean start() { return false; } } catch (Exception ex) { - log.error(ex); + log.error(ex.getMessage(),ex); return false; } } @@ -88,7 +88,7 @@ public void stop() { engine.stop(); } } catch (Exception ex) { - log.error(ex); + log.error(ex.getMessage(),ex); } } diff --git a/symmetric/symmetric-client/src/test/java/org/jumpmind/symmetric/test/TestSetupUtil.java b/symmetric/symmetric-client/src/test/java/org/jumpmind/symmetric/test/TestSetupUtil.java index 8a3519482a..57af595e27 100644 --- a/symmetric/symmetric-client/src/test/java/org/jumpmind/symmetric/test/TestSetupUtil.java +++ b/symmetric/symmetric-client/src/test/java/org/jumpmind/symmetric/test/TestSetupUtil.java @@ -18,11 +18,14 @@ import org.jumpmind.symmetric.ClientSymmetricEngine; import org.jumpmind.symmetric.ISymmetricEngine; import org.jumpmind.symmetric.TestConstants; -import org.jumpmind.symmetric.TestUtils; import org.jumpmind.symmetric.common.ParameterConstants; import org.jumpmind.symmetric.db.ISymmetricDialect; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class TestSetupUtil { + + private static final Logger logger = LoggerFactory.getLogger(TestSetupUtil.class); static private ISymmetricEngine engine; @@ -89,7 +92,7 @@ protected static boolean isConnectionValid(Properties properties) throws Excepti c.close(); return true; } catch (Exception ex) { - TestUtils.getLog().error( + logger.error( "Could not connect to the test database using the url: " + properties.getProperty("db.url") + " and classpath: " + System.getProperty("java.class.path"), ex); @@ -101,19 +104,19 @@ protected static void removeEmbededdedDatabases() { File clientDbDir = new File("target/clientdbs"); if (clientDbDir.exists()) { try { - TestUtils.getLog().info("Removing client database files."); + logger.info("Removing client database files."); FileUtils.deleteDirectory(clientDbDir); } catch (IOException e) { - TestUtils.getLog().error(e); + logger.error(e.getMessage(), e); } } File rootDbDir = new File("target/rootdbs"); if (rootDbDir.exists()) { try { - TestUtils.getLog().info("Removing root database files"); + logger.info("Removing root database files"); FileUtils.deleteDirectory(rootDbDir); } catch (IOException e) { - TestUtils.getLog().error(e); + logger.error(e.getMessage(),e); } } } diff --git a/symmetric/symmetric-client/src/test/resources/log4j.xml b/symmetric/symmetric-client/src/test/resources/log4j.xml index 085bafc4dd..cdb85543ac 100644 --- a/symmetric/symmetric-client/src/test/resources/log4j.xml +++ b/symmetric/symmetric-client/src/test/resources/log4j.xml @@ -5,7 +5,7 @@ - + diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/AbstractSymmetricEngine.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/AbstractSymmetricEngine.java index 6ed7979c43..aee980f6e7 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/AbstractSymmetricEngine.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/AbstractSymmetricEngine.java @@ -9,8 +9,6 @@ import org.apache.commons.lang.StringUtils; import org.jumpmind.db.model.Table; import org.jumpmind.db.platform.IDatabasePlatform; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; import org.jumpmind.properties.TypedProperties; import org.jumpmind.symmetric.common.Constants; import org.jumpmind.symmetric.common.DeploymentType; @@ -72,13 +70,15 @@ import org.jumpmind.symmetric.transport.ITransportManager; import org.jumpmind.symmetric.transport.TransportManagerFactory; import org.jumpmind.symmetric.util.AppUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; abstract public class AbstractSymmetricEngine implements ISymmetricEngine { private static Map registeredEnginesByUrl = new HashMap(); private static Map registeredEnginesByName = new HashMap(); - protected Log log = LogFactory.getLog(getClass()); + protected final Logger log = LoggerFactory.getLogger(getClass()); private boolean started = false; @@ -178,71 +178,67 @@ protected void init() { this.securityService = createSecurityService(); this.propertiesFactory = createTypedPropertiesFactory(); TypedProperties properties = this.propertiesFactory.reload(); - log = LogFactory.getLog("org.jumpmind." - + properties.get(ParameterConstants.ENGINE_NAME, "default")); this.platform = createDatabasePlatform(properties); this.parameterService = new ParameterService(platform, propertiesFactory, properties.get( - ParameterConstants.RUNTIME_CONFIG_TABLE_PREFIX, "sym"), log); + ParameterConstants.RUNTIME_CONFIG_TABLE_PREFIX, "sym")); - if (parameterService - .is(ParameterConstants.DB_FORCE_DELIMITED_IDENTIFIER_ON)) { + if (parameterService.is(ParameterConstants.DB_FORCE_DELIMITED_IDENTIFIER_ON)) { this.platform.setDelimitedIdentifierModeOn(true); - } else if (parameterService - .is(ParameterConstants.DB_FORCE_DELIMITED_IDENTIFIER_OFF)) { + } else if (parameterService.is(ParameterConstants.DB_FORCE_DELIMITED_IDENTIFIER_OFF)) { this.platform.setDelimitedIdentifierModeOn(false); } this.platform.setClearCacheModelTimeoutInMs(parameterService .getLong(ParameterConstants.CACHE_TIMEOUT_TABLES_IN_MS)); - this.bandwidthService = new BandwidthService(parameterService, log); + this.bandwidthService = new BandwidthService(parameterService); this.symmetricDialect = createSymmetricDialect(); - this.nodeService = new NodeService(log, parameterService, symmetricDialect); - this.configurationService = new ConfigurationService(log, parameterService, symmetricDialect, + this.nodeService = new NodeService(parameterService, symmetricDialect); + this.configurationService = new ConfigurationService(parameterService, symmetricDialect, nodeService); - this.statisticService = new StatisticService(log, parameterService, symmetricDialect); + this.statisticService = new StatisticService(parameterService, symmetricDialect); this.statisticManager = new StatisticManager(parameterService, nodeService, configurationService, statisticService); this.concurrentConnectionManager = new ConcurrentConnectionManager(parameterService, statisticManager); - this.clusterService = new ClusterService(log, parameterService, symmetricDialect); - this.purgeService = new PurgeService(log, parameterService, symmetricDialect, clusterService, + this.clusterService = new ClusterService(parameterService, symmetricDialect); + this.purgeService = new PurgeService(parameterService, symmetricDialect, clusterService, statisticManager); - this.transformService = new TransformService(log, parameterService, symmetricDialect); - this.triggerRouterService = new TriggerRouterService(log, parameterService, symmetricDialect, + this.transformService = new TransformService(parameterService, symmetricDialect); + this.triggerRouterService = new TriggerRouterService(parameterService, symmetricDialect, clusterService, configurationService, statisticManager); - this.outgoingBatchService = new OutgoingBatchService(log, parameterService, symmetricDialect, + this.outgoingBatchService = new OutgoingBatchService(parameterService, symmetricDialect, nodeService, configurationService); - this.dataService = new DataService(log, parameterService, symmetricDialect, deploymentType, + this.dataService = new DataService(parameterService, symmetricDialect, deploymentType, triggerRouterService, nodeService, purgeService, configurationService, outgoingBatchService, statisticManager); - this.routerService = new RouterService(log, parameterService, symmetricDialect, clusterService, + this.routerService = new RouterService(parameterService, symmetricDialect, clusterService, dataService, configurationService, triggerRouterService, outgoingBatchService, nodeService, statisticManager, transformService); - this.dataExtractorService = new DataExtractorService(log, parameterService, symmetricDialect, + this.dataExtractorService = new DataExtractorService(parameterService, symmetricDialect, outgoingBatchService, routerService, configurationService, triggerRouterService, nodeService, statisticManager); - this.incomingBatchService = new IncomingBatchService(log, parameterService, symmetricDialect); + this.incomingBatchService = new IncomingBatchService(parameterService, symmetricDialect); this.transportManager = new TransportManagerFactory(this).create(); - this.dataLoaderService = new DataLoaderService(log, parameterService, symmetricDialect, + this.dataLoaderService = new DataLoaderService(parameterService, symmetricDialect, incomingBatchService, configurationService, transportManager, statisticManager, nodeService, transformService, triggerRouterService); - this.registrationService = new RegistrationService(log, parameterService, symmetricDialect, + this.registrationService = new RegistrationService(parameterService, symmetricDialect, nodeService, dataExtractorService, dataService, dataLoaderService, transportManager, statisticManager); - this.acknowledgeService = new AcknowledgeService(log, parameterService, symmetricDialect, + this.acknowledgeService = new AcknowledgeService(parameterService, symmetricDialect, outgoingBatchService, registrationService); - this.pushService = new PushService(log, parameterService, symmetricDialect, + this.pushService = new PushService(parameterService, symmetricDialect, dataExtractorService, acknowledgeService, transportManager, nodeService, clusterService); - this.pullService = new PullService(log, parameterService, symmetricDialect, nodeService, + this.pullService = new PullService(parameterService, symmetricDialect, nodeService, dataLoaderService, registrationService, clusterService); this.jobManager = createJobManager(); - this.nodeService.addOfflineServerListener(new DefaultOfflineServerListener(log, + this.nodeService.addOfflineServerListener(new DefaultOfflineServerListener( statisticManager, nodeService, outgoingBatchService)); - IOfflineClientListener defaultlistener = new DefaultOfflineClientListener(log, - parameterService, nodeService); + IOfflineClientListener defaultlistener = new DefaultOfflineClientListener(parameterService, + nodeService); this.pullService.addOfflineListener(defaultlistener); this.pushService.addOfflineListener(defaultlistener); @@ -259,7 +255,7 @@ protected static ISecurityService createSecurityService() { // TODO check system property. integrate eric's changes return new SecurityService(); } - + abstract protected ISymmetricDialect createSymmetricDialect(); abstract protected IJobManager createJobManager(); @@ -308,8 +304,10 @@ public synchronized boolean start(boolean startJobs) { starting = true; Node node = nodeService.findIdentity(); if (node != null) { - log.info("Starting registered node [group=%s, id=%s, externalId=%s]", - node.getNodeGroupId(), node.getNodeId(), node.getExternalId()); + log.info( + "Starting registered node [group=%s, id=%s, externalId=%s]", + new Object[] { node.getNodeGroupId(), node.getNodeId(), + node.getExternalId() }); } else { log.info("Starting unregistered node [group=%s, externalId=%s]", parameterService.getNodeGroupId(), parameterService.getExternalId()); @@ -332,16 +330,18 @@ public synchronized boolean start(boolean startJobs) { log.info( "SymmetricDS: type=%s, name=%s, version=%s, groupId=%s, externalId=%s, databaseName=%s, databaseVersion=%s, driverName=%s, driverVersion=%s", - getDeploymentType().getDeploymentType(), getEngineName(), Version.version(), - getParameterService().getNodeGroupId(), getParameterService().getExternalId(), - symmetricDialect.getName(), symmetricDialect.getVersion(), - symmetricDialect.getDriverName(), symmetricDialect.getDriverVersion()); + new Object[] { getDeploymentType().getDeploymentType(), getEngineName(), + Version.version(), getParameterService().getNodeGroupId(), + getParameterService().getExternalId(), symmetricDialect.getName(), + symmetricDialect.getVersion(), symmetricDialect.getDriverName(), + symmetricDialect.getDriverVersion() }); return started; } public synchronized void stop() { - log.info("Closing SymmetricDS externalId=%s version=%s database=%s", getParameterService().getExternalId(), Version.version(), - symmetricDialect.getName()); + log.info("Closing SymmetricDS externalId=%s version=%s database=%s", + new Object[] { getParameterService().getExternalId(), Version.version(), + symmetricDialect.getName() }); if (jobManager != null) { jobManager.stopJobs(); } @@ -436,8 +436,8 @@ public boolean isConfigured() { .getNodeGroupId().equals(getParameterService().getNodeGroupId()))) { log.warn( "The configured state does not match recorded database state. The recorded external id is %s while the configured external id is %s. The recorded node group id is %s while the configured node group id is %s", - node.getExternalId(), getParameterService().getExternalId(), - node.getNodeGroupId(), getParameterService().getNodeGroupId()); + new Object[] { node.getExternalId(), getParameterService().getExternalId(), + node.getNodeGroupId(), getParameterService().getNodeGroupId() }); } else if (node != null && StringUtils.isBlank(getParameterService().getRegistrationUrl()) && StringUtils.isBlank(getParameterService().getSyncUrl())) { @@ -597,7 +597,7 @@ public String getTablePrefix() { public ITransportManager getTransportManager() { return transportManager; } - + public IExtensionPointManager getExtensionPointManager() { return extensionPointManger; } @@ -641,7 +641,7 @@ private void registerHandleToEngine() { } - public Log getLog() { + public Logger getLog() { return log; } diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/ISymmetricEngine.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/ISymmetricEngine.java index 1a064c413c..5223d72db9 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/ISymmetricEngine.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/ISymmetricEngine.java @@ -21,7 +21,6 @@ import java.util.Properties; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.common.DeploymentType; import org.jumpmind.symmetric.db.ISymmetricDialect; import org.jumpmind.symmetric.ext.IExtensionPointManager; @@ -55,6 +54,7 @@ import org.jumpmind.symmetric.statistic.IStatisticManager; import org.jumpmind.symmetric.transport.IConcurrentConnectionManager; import org.jumpmind.symmetric.transport.ITransportManager; +import org.slf4j.Logger; public interface ISymmetricEngine { @@ -252,7 +252,7 @@ public interface ISymmetricEngine { public String getTablePrefix(); - public Log getLog(); + public Logger getLog(); public IExtensionPointManager getExtensionPointManager(); diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/db/AbstractSymmetricDialect.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/db/AbstractSymmetricDialect.java index 19a4601d47..fd2c9961d2 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/db/AbstractSymmetricDialect.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/db/AbstractSymmetricDialect.java @@ -47,8 +47,6 @@ import org.jumpmind.db.sql.SqlException; import org.jumpmind.db.sql.SqlScript; import org.jumpmind.db.util.BinaryEncoding; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; import org.jumpmind.symmetric.common.Constants; import org.jumpmind.symmetric.common.ParameterConstants; import org.jumpmind.symmetric.ext.IDatabaseUpgradeListener; @@ -61,6 +59,8 @@ import org.jumpmind.symmetric.service.IParameterService; import org.jumpmind.symmetric.util.AppUtils; import org.jumpmind.util.FormatUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.dao.DataAccessException; import org.springframework.jdbc.support.lob.LobHandler; @@ -69,7 +69,7 @@ */ abstract public class AbstractSymmetricDialect implements ISymmetricDialect { - protected Log log = LogFactory.getLog(getClass()); + protected final Logger log = LoggerFactory.getLogger(getClass()); public static final int MAX_SYMMETRIC_SUPPORTED_TRIGGER_SIZE = 50; @@ -101,9 +101,8 @@ abstract public class AbstractSymmetricDialect implements ISymmetricDialect { protected List databaseUpgradeListeners = new ArrayList(); - public AbstractSymmetricDialect(Log log, - IParameterService parameterService, IDatabasePlatform platform) { - this.log = log; + public AbstractSymmetricDialect(IParameterService parameterService, + IDatabasePlatform platform) { this.parameterService = parameterService; this.platform = platform; @@ -435,7 +434,7 @@ protected boolean createTablesIfNecessary() { try { modelFromXml = merge(modelFromXml, readDatabaseFromXml(extraTablesXml)); } catch (Exception ex) { - log.error(ex); + log.error(ex.getMessage(),ex); } } @@ -678,7 +677,7 @@ public void truncateTable(String tableName) { platform.getSqlTemplate().update("truncate table " + quote + tableName + quote); success = true; } catch (DataAccessException ex) { - log.warn(ex); + log.warn(ex.getMessage(),ex); AppUtils.sleep(5000); tryCount--; } @@ -711,7 +710,7 @@ public long getDatabaseTime() { return this.platform.getSqlTemplate().queryForObject(sql, java.util.Date.class) .getTime(); } catch (Exception ex) { - log.error(ex); + log.error(ex.getMessage(),ex); return System.currentTimeMillis(); } } diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/ext/ExtensionPointManager.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/ext/ExtensionPointManager.java index f796b7cfc3..8e8888ee89 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/ext/ExtensionPointManager.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/ext/ExtensionPointManager.java @@ -27,8 +27,6 @@ import org.jumpmind.extension.IBuiltInExtensionPoint; import org.jumpmind.extension.IExtensionPoint; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; import org.jumpmind.symmetric.ISymmetricEngine; import org.jumpmind.symmetric.config.INodeIdGenerator; import org.jumpmind.symmetric.config.IParameterFilter; @@ -43,6 +41,8 @@ import org.jumpmind.symmetric.security.INodePasswordFilter; import org.jumpmind.symmetric.transport.IAcknowledgeEventListener; import org.jumpmind.symmetric.transport.ISyncUrlExtension; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.BeansException; import org.springframework.beans.factory.ListableBeanFactory; import org.springframework.context.ApplicationContext; @@ -58,7 +58,7 @@ */ public class ExtensionPointManager implements IExtensionPointManager { - private Log log = LogFactory.getLog(getClass()); + private final static Logger log = LoggerFactory.getLogger(ExtensionPointManager.class); private boolean initialized = false; @@ -68,8 +68,7 @@ public class ExtensionPointManager implements IExtensionPointManager { private List extensionPoints = new ArrayList(); - public ExtensionPointManager(Log log, ISymmetricEngine engine) { - this.log = log; + public ExtensionPointManager(ISymmetricEngine engine) { this.engine = engine; } diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/io/DefaultOfflineClientListener.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/io/DefaultOfflineClientListener.java index 8f894fb906..66174bcc3f 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/io/DefaultOfflineClientListener.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/io/DefaultOfflineClientListener.java @@ -21,11 +21,11 @@ package org.jumpmind.symmetric.io; import org.jumpmind.extension.IBuiltInExtensionPoint; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; import org.jumpmind.symmetric.model.Node; import org.jumpmind.symmetric.service.INodeService; import org.jumpmind.symmetric.service.IParameterService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Default implementation of an {@link IOfflineClientListener}. When the listener detects @@ -33,13 +33,12 @@ */ public class DefaultOfflineClientListener implements IOfflineClientListener, IBuiltInExtensionPoint { - protected Log log = LogFactory.getLog(getClass()); + protected final Logger log = LoggerFactory.getLogger(getClass()); protected IParameterService parameterService; protected INodeService nodeService; - public DefaultOfflineClientListener(Log log, IParameterService parameterService, + public DefaultOfflineClientListener(IParameterService parameterService, INodeService nodeService) { - this.log = log; this.parameterService = parameterService; this.nodeService = nodeService; } diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/job/AbstractJob.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/job/AbstractJob.java index 5100e53bcb..4dce3c1212 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/job/AbstractJob.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/job/AbstractJob.java @@ -24,11 +24,11 @@ import java.util.concurrent.ScheduledFuture; import org.apache.commons.lang.StringUtils; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; import org.jumpmind.symmetric.ISymmetricEngine; import org.jumpmind.symmetric.common.Constants; import org.jumpmind.symmetric.util.RandomTimeSlot; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.jmx.export.annotation.ManagedAttribute; import org.springframework.jmx.export.annotation.ManagedMetric; import org.springframework.jmx.export.annotation.ManagedOperation; @@ -39,7 +39,7 @@ @ManagedResource(description = "The management interface for a job") abstract public class AbstractJob implements Runnable, IJob { - protected Log log = LogFactory.getLog(getClass()); + protected final Logger log = LoggerFactory.getLogger(getClass()); private String jobName; @@ -183,7 +183,7 @@ public boolean invoke(boolean force) { log.info("The engine is not currently started."); } } catch (final Throwable ex) { - log.error(ex); + log.error(ex.getMessage(),ex); } return ran; diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/job/DefaultOfflineServerListener.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/job/DefaultOfflineServerListener.java index e4e5780ce7..4a2de356b1 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/job/DefaultOfflineServerListener.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/job/DefaultOfflineServerListener.java @@ -22,13 +22,13 @@ package org.jumpmind.symmetric.job; import org.jumpmind.extension.IBuiltInExtensionPoint; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; import org.jumpmind.symmetric.ext.IOfflineServerListener; import org.jumpmind.symmetric.model.Node; import org.jumpmind.symmetric.service.INodeService; import org.jumpmind.symmetric.service.IOutgoingBatchService; import org.jumpmind.symmetric.statistic.IStatisticManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /* * The default implementation of the {@link IOfflineServerListener}. @@ -36,15 +36,14 @@ public class DefaultOfflineServerListener implements IOfflineServerListener, IBuiltInExtensionPoint { - protected Log log = LogFactory.getLog(DefaultOfflineServerListener.class); + protected final static Logger log = LoggerFactory.getLogger(DefaultOfflineServerListener.class); protected IStatisticManager statisticManager; protected INodeService nodeService; protected IOutgoingBatchService outgoingBatchService; - public DefaultOfflineServerListener(Log log, IStatisticManager statisticManager, - INodeService nodeService, IOutgoingBatchService outgoingBatchService) { - this.log = log; + public DefaultOfflineServerListener(IStatisticManager statisticManager, + INodeService nodeService, IOutgoingBatchService outgoingBatchService) { this.statisticManager = statisticManager; this.nodeService = nodeService; this.outgoingBatchService = outgoingBatchService; @@ -56,7 +55,7 @@ public DefaultOfflineServerListener(Log log, IStatisticManager statisticManager, * outgoing batches. */ public void clientNodeOffline(Node node) { - log.warn("Node %s is offline. Last heartbeat was %s, timezone %s. Syncing will be disabled and node security deleted.", node.getNodeId(), node.getHeartbeatTime(), node.getTimezoneOffset()); + log.warn("Node %s is offline. Last heartbeat was %s, timezone %s. Syncing will be disabled and node security deleted.", new Object[] {node.getNodeId(), node.getHeartbeatTime(), node.getTimezoneOffset()}); statisticManager.incrementNodesDisabled(1); node.setSyncEnabled(false); nodeService.updateNode(node); diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/job/JobManager.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/job/JobManager.java index 370793bb35..014e0c53eb 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/job/JobManager.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/job/JobManager.java @@ -22,9 +22,9 @@ import java.util.ArrayList; import java.util.List; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; import org.jumpmind.symmetric.ISymmetricEngine; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; /* @@ -32,14 +32,13 @@ */ public class JobManager implements IJobManager { - Log log = LogFactory.getLog(JobManager.class); + static final Logger log = LoggerFactory.getLogger(JobManager.class); private List jobs; private ThreadPoolTaskScheduler taskScheduler; - public JobManager(Log log, ISymmetricEngine engine) { - this.log = log; + public JobManager(ISymmetricEngine engine) { this.taskScheduler = new ThreadPoolTaskScheduler(); this.taskScheduler.setThreadNamePrefix(String.format("%s-job-", engine.getParameterService().getEngineName())); diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/load/ConfigurationChangedFilter.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/load/ConfigurationChangedFilter.java index 7bcfbb0fd9..0583d92204 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/load/ConfigurationChangedFilter.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/load/ConfigurationChangedFilter.java @@ -23,8 +23,6 @@ import org.jumpmind.db.model.Table; import org.jumpmind.extension.IBuiltInExtensionPoint; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; import org.jumpmind.symmetric.common.ParameterConstants; import org.jumpmind.symmetric.common.TableConstants; import org.jumpmind.symmetric.io.data.CsvData; @@ -36,6 +34,8 @@ import org.jumpmind.symmetric.service.IParameterService; import org.jumpmind.symmetric.service.ITransformService; import org.jumpmind.symmetric.service.ITriggerRouterService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * An out of the box filter that checks to see if the SymmetricDS configuration @@ -45,7 +45,7 @@ public class ConfigurationChangedFilter extends DatabaseWriterFilterAdapter implements IBuiltInExtensionPoint { - static final Log log = LogFactory.getLog(ConfigurationChangedFilter.class); + static final Logger log = LoggerFactory.getLogger(ConfigurationChangedFilter.class); final String CTX_KEY_RESYNC_NEEDED = "Resync." + ConfigurationChangedFilter.class.getSimpleName() + hashCode(); diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/route/AbstractDataRouter.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/route/AbstractDataRouter.java index 64a0bdc506..026503e919 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/route/AbstractDataRouter.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/route/AbstractDataRouter.java @@ -26,13 +26,13 @@ import java.util.Map; import java.util.Set; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; import org.jumpmind.symmetric.db.ISymmetricDialect; import org.jumpmind.symmetric.io.data.DataEventType; import org.jumpmind.symmetric.model.DataMetaData; import org.jumpmind.symmetric.model.Node; import org.jumpmind.symmetric.model.OutgoingBatch; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A common superclass for data routers @@ -41,7 +41,7 @@ public abstract class AbstractDataRouter implements IDataRouter { private static final String OLD_ = "OLD_"; - protected Log log = LogFactory.getLog(getClass()); + protected Logger log = LoggerFactory.getLogger(getClass()); private boolean autoRegister = true; diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/route/ChannelRouterContext.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/route/ChannelRouterContext.java index 62c72a9621..2ea2952cab 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/route/ChannelRouterContext.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/route/ChannelRouterContext.java @@ -31,8 +31,6 @@ import org.jumpmind.db.sql.ISqlTransaction; import org.jumpmind.db.sql.SqlException; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; import org.jumpmind.symmetric.model.Data; import org.jumpmind.symmetric.model.DataEvent; import org.jumpmind.symmetric.model.Node; @@ -42,8 +40,6 @@ public class ChannelRouterContext extends SimpleRouterContext { - static final Log log = LogFactory.getLog(ChannelRouterContext.class); - public static final String STAT_INSERT_DATA_EVENTS_MS = "data.events.insert.time.ms"; public static final String STAT_DATA_ROUTER_MS = "data.router.time.ms"; public static final String STAT_QUERY_TIME_MS = "data.read.query.time.ms"; @@ -112,7 +108,7 @@ public void rollback() { try { sqlTransaction.rollback(); } catch (SqlException e) { - log.warn(e); + log.warn(e.getMessage(),e); } finally { clearState(); } @@ -122,7 +118,7 @@ public void cleanup() { try { this.sqlTransaction.commit(); } catch (Exception ex) { - log.warn(ex); + log.warn(ex.getMessage(),ex); } finally { this.sqlTransaction.close(); } diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/route/DataGapDetector.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/route/DataGapDetector.java index b031b113ff..adda6ce418 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/route/DataGapDetector.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/route/DataGapDetector.java @@ -28,12 +28,13 @@ import org.jumpmind.db.sql.ISqlMap; import org.jumpmind.db.sql.ISqlTemplate; import org.jumpmind.db.sql.mapper.NumberMapper; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.common.ParameterConstants; import org.jumpmind.symmetric.db.ISymmetricDialect; import org.jumpmind.symmetric.model.DataGap; import org.jumpmind.symmetric.service.IDataService; import org.jumpmind.symmetric.service.IParameterService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Responsible for managing gaps in data ids to ensure that all captured data is @@ -41,7 +42,7 @@ */ public class DataGapDetector implements IDataToRouteGapDetector { - private Log log; + private static final Logger log = LoggerFactory.getLogger(DataGapDetector.class); private IDataService dataService; @@ -54,9 +55,8 @@ public class DataGapDetector implements IDataToRouteGapDetector { public DataGapDetector() { } - public DataGapDetector(Log log, IDataService dataService, IParameterService parameterService, + public DataGapDetector(IDataService dataService, IParameterService parameterService, ISymmetricDialect symmetricDialect, ISqlMap sqlMap) { - this.log = log; this.dataService = dataService; this.parameterService = parameterService; this.sqlMap = sqlMap; diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/route/DataGapRouteReader.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/route/DataGapRouteReader.java index 3cc12a7b73..61019e2997 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/route/DataGapRouteReader.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/route/DataGapRouteReader.java @@ -36,7 +36,6 @@ import org.jumpmind.db.sql.ISqlRowMapper; import org.jumpmind.db.sql.ISqlTemplate; import org.jumpmind.db.sql.Row; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.SymmetricException; import org.jumpmind.symmetric.common.Constants; import org.jumpmind.symmetric.common.ParameterConstants; @@ -48,6 +47,8 @@ import org.jumpmind.symmetric.service.IParameterService; import org.jumpmind.symmetric.util.AppUtils; import org.jumpmind.util.FormatUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This class is responsible for reading data for the purpose of routing. It @@ -56,14 +57,14 @@ */ public class DataGapRouteReader implements IDataToRouteReader { + protected final static Logger log = LoggerFactory.getLogger(DataGapRouteReader.class); + private static final String SELECT_DATA_USING_GAPS_SQL = "selectDataUsingGapsSql"; protected List dataGaps; protected DataGap currentGap; - protected Log log; - protected BlockingQueue dataQueue; protected ChannelRouterContext context; @@ -78,10 +79,9 @@ public class DataGapRouteReader implements IDataToRouteReader { protected boolean reading = true; - public DataGapRouteReader(Log log, ISqlMap sqlMap, ChannelRouterContext context, + public DataGapRouteReader(ISqlMap sqlMap, ChannelRouterContext context, IDataService dataService, ISymmetricDialect symmetricDialect, IParameterService parameterService) { - this.log = log; this.sqlMap = sqlMap; this.symmetricDialect = symmetricDialect; this.dataQueue = new LinkedBlockingQueue( @@ -95,7 +95,7 @@ public void run() { try { execute(); } catch (Throwable ex) { - log.error(ex); + log.error(ex.getMessage(), ex); } } @@ -149,7 +149,7 @@ protected void execute() { } } catch (Throwable ex) { - log.error(ex); + log.error(ex.getMessage(), ex); } finally { copyToQueue(new EOD()); reading = false; @@ -188,7 +188,7 @@ public Data take() { ParameterConstants.ROUTING_WAIT_FOR_DATA_TIMEOUT_SECONDS, 330); data = dataQueue.poll(timeout, TimeUnit.SECONDS); } catch (InterruptedException e) { - log.warn(e); + log.warn(e.getMessage(), e); } if (data == null) { diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/route/LookupTableDataRouter.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/route/LookupTableDataRouter.java index d130308795..a44c7105ee 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/route/LookupTableDataRouter.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/route/LookupTableDataRouter.java @@ -30,19 +30,19 @@ import org.jumpmind.db.sql.ISqlRowMapper; import org.jumpmind.db.sql.ISqlTemplate; import org.jumpmind.db.sql.Row; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; import org.jumpmind.symmetric.db.ISymmetricDialect; import org.jumpmind.symmetric.model.DataMetaData; import org.jumpmind.symmetric.model.Node; import org.jumpmind.symmetric.model.Router; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A data router that uses a lookup table to map data to nodes */ public class LookupTableDataRouter extends AbstractDataRouter implements IDataRouter { - final static Log log = LogFactory.getLog(LookupTableDataRouter.class); + final static Logger log = LoggerFactory.getLogger(LookupTableDataRouter.class); public final static String PARAM_TABLE = "LOOKUP_TABLE"; public final static String PARAM_KEY_COLUMN = "KEY_COLUMN"; diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/route/SimpleRouterContext.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/route/SimpleRouterContext.java index 37c1401ad6..985f4b8cb3 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/route/SimpleRouterContext.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/route/SimpleRouterContext.java @@ -28,12 +28,15 @@ import java.util.TreeSet; import org.jumpmind.db.util.BinaryEncoding; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.common.Constants; import org.jumpmind.symmetric.model.NodeChannel; import org.jumpmind.util.Context; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class SimpleRouterContext extends Context { + + protected final Logger log = LoggerFactory.getLogger(getClass()); protected NodeChannel channel; protected boolean encountedTransactionBoundary = false; @@ -93,7 +96,7 @@ synchronized public long getStat(String name) { return val; } - synchronized public void logStats(Log log, long totalTimeInMs) { + synchronized public void logStats(Logger log, long totalTimeInMs) { boolean infoLevel = totalTimeInMs > Constants.LONG_OPERATION_THRESHOLD; Set keys = new TreeSet(stats.keySet()); StringBuilder statsPrintout = new StringBuilder(channel.getChannelId()); diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/AbstractOfflineDetectorService.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/AbstractOfflineDetectorService.java index e89b397400..a986080528 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/AbstractOfflineDetectorService.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/AbstractOfflineDetectorService.java @@ -28,7 +28,6 @@ import java.util.List; import org.apache.commons.lang.exception.ExceptionUtils; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.db.ISymmetricDialect; import org.jumpmind.symmetric.io.IOfflineClientListener; import org.jumpmind.symmetric.model.Node; @@ -48,9 +47,9 @@ public abstract class AbstractOfflineDetectorService extends AbstractService imp private List offlineListeners; - public AbstractOfflineDetectorService(Log log, IParameterService parameterService, + public AbstractOfflineDetectorService(IParameterService parameterService, ISymmetricDialect symmetricDialect) { - super(log, parameterService, symmetricDialect); + super(parameterService, symmetricDialect); } public void setOfflineListeners(List listeners) { diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/AbstractService.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/AbstractService.java index b422befcbc..f2f3121b72 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/AbstractService.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/AbstractService.java @@ -30,15 +30,15 @@ import org.jumpmind.db.sql.ISqlMap; import org.jumpmind.db.sql.ISqlTemplate; import org.jumpmind.db.sql.ISqlTransaction; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; import org.jumpmind.symmetric.db.ISymmetricDialect; import org.jumpmind.symmetric.service.IParameterService; import org.jumpmind.symmetric.service.IService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; abstract public class AbstractService implements IService { - protected Log log = LogFactory.getLog(getClass()); + protected final Logger log = LoggerFactory.getLogger(getClass()); protected IParameterService parameterService; @@ -50,8 +50,7 @@ abstract public class AbstractService implements IService { private ISqlMap sqlMap; - public AbstractService(Log log, IParameterService parameterService, ISymmetricDialect symmetricDialect) { - this.log = log; + public AbstractService(IParameterService parameterService, ISymmetricDialect symmetricDialect) { this.symmetricDialect = symmetricDialect; this.parameterService = parameterService; this.tablePrefix = parameterService.getTablePrefix(); diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/AcknowledgeService.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/AcknowledgeService.java index a6d1c80998..4e2fab7886 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/AcknowledgeService.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/AcknowledgeService.java @@ -25,7 +25,6 @@ import org.jumpmind.db.sql.AbstractSqlMap; import org.jumpmind.db.sql.mapper.NumberMapper; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.db.ISymmetricDialect; import org.jumpmind.symmetric.model.BatchInfo; import org.jumpmind.symmetric.model.OutgoingBatch; @@ -47,10 +46,10 @@ public class AcknowledgeService extends AbstractService implements IAcknowledgeS private IRegistrationService registrationService; - public AcknowledgeService(Log log, IParameterService parameterService, + public AcknowledgeService(IParameterService parameterService, ISymmetricDialect symmetricDialect, IOutgoingBatchService outgoingBatchService, IRegistrationService registrationService) { - super(log, parameterService, symmetricDialect); + super(parameterService, symmetricDialect); this.outgoingBatchService = outgoingBatchService; this.registrationService = registrationService; } diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/BandwidthService.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/BandwidthService.java index 8568e8d717..165e1b2b20 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/BandwidthService.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/BandwidthService.java @@ -28,26 +28,25 @@ import java.net.URL; import org.apache.commons.io.IOUtils; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; import org.jumpmind.symmetric.common.ParameterConstants; import org.jumpmind.symmetric.service.IBandwidthService; import org.jumpmind.symmetric.service.IParameterService; import org.jumpmind.symmetric.transport.BandwidthTestResults; import org.jumpmind.symmetric.transport.http.HttpTransportManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @see IBandwidthService */ public class BandwidthService implements IBandwidthService { - protected Log log = LogFactory.getLog(getClass()); + protected final Logger log = LoggerFactory.getLogger(getClass()); private IParameterService parameterService; - public BandwidthService(IParameterService parameterService, Log log) { + public BandwidthService(IParameterService parameterService) { this.parameterService = parameterService; - this.log = log; } public double getDownloadKbpsFor(String syncUrl, long sampleSize, long maxTestDuration) { @@ -58,7 +57,7 @@ public double getDownloadKbpsFor(String syncUrl, long sampleSize, long maxTestDu } catch (SocketTimeoutException e) { log.warn("Socket timeout while attempting to contact %s", syncUrl); } catch (Exception e) { - log.error(e); + log.error(e.getMessage(), e); } return downloadSpeed; diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ClusterService.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ClusterService.java index de9be7ae4d..9b8025e1fe 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ClusterService.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ClusterService.java @@ -40,7 +40,6 @@ import org.jumpmind.db.sql.ISqlRowMapper; import org.jumpmind.db.sql.Row; import org.jumpmind.db.sql.UniqueKeyException; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.common.ParameterConstants; import org.jumpmind.symmetric.db.ISymmetricDialect; import org.jumpmind.symmetric.model.Lock; @@ -55,8 +54,8 @@ public class ClusterService extends AbstractService implements IClusterService { protected String serverId = AppUtils.getServerId(); - public ClusterService(Log log, IParameterService parameterService, ISymmetricDialect dialect) { - super(log, parameterService, dialect); + public ClusterService(IParameterService parameterService, ISymmetricDialect dialect) { + super(parameterService, dialect); } public void initLockTable() { diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ConfigurationService.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ConfigurationService.java index 1f45d40612..d2915a9920 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ConfigurationService.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ConfigurationService.java @@ -40,7 +40,6 @@ import org.jumpmind.db.sql.Row; import org.jumpmind.db.sql.SqlScript; import org.jumpmind.db.sql.UniqueKeyException; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.common.Constants; import org.jumpmind.symmetric.common.ParameterConstants; import org.jumpmind.symmetric.db.ISymmetricDialect; @@ -70,9 +69,9 @@ public class ConfigurationService extends AbstractService implements IConfigurat private List defaultChannels; - public ConfigurationService(Log log, IParameterService parameterService, ISymmetricDialect dialect, + public ConfigurationService(IParameterService parameterService, ISymmetricDialect dialect, INodeService nodeService) { - super(log, parameterService, dialect); + super(parameterService, dialect); this.nodeService = nodeService; this.defaultChannels = new ArrayList(); this.defaultChannels.add(new Channel(Constants.CHANNEL_CONFIG, 0, 100, 100, true, 0)); @@ -410,7 +409,7 @@ private boolean buildTablesFromDdlUtilXmlIfProvided() { platform.createDatabase(database, true, true); loaded = true; } catch (Exception e) { - log.error(e); + log.error(e.getMessage(),e); } } } diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataExtractorService.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataExtractorService.java index dfb116bb8d..81ee3ed24a 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataExtractorService.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataExtractorService.java @@ -39,7 +39,6 @@ import org.jumpmind.db.sql.ISqlReadCursor; import org.jumpmind.db.sql.ISqlRowMapper; import org.jumpmind.db.sql.Row; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.Version; import org.jumpmind.symmetric.common.Constants; import org.jumpmind.symmetric.common.ParameterConstants; @@ -52,12 +51,12 @@ import org.jumpmind.symmetric.io.data.DataProcessor; import org.jumpmind.symmetric.io.data.IDataReader; import org.jumpmind.symmetric.io.data.IDataWriter; -import org.jumpmind.symmetric.io.data.reader.IExtractBatchSource; import org.jumpmind.symmetric.io.data.reader.ExtractDataReader; +import org.jumpmind.symmetric.io.data.reader.IExtractBatchSource; import org.jumpmind.symmetric.io.data.reader.ProtocolDataReader; +import org.jumpmind.symmetric.io.data.writer.IProtocolDataWriterListener; import org.jumpmind.symmetric.io.data.writer.ProtocolDataWriter; import org.jumpmind.symmetric.io.data.writer.StagingDataWriter; -import org.jumpmind.symmetric.io.data.writer.IProtocolDataWriterListener; import org.jumpmind.symmetric.model.BatchInfo; import org.jumpmind.symmetric.model.ChannelMap; import org.jumpmind.symmetric.model.Data; @@ -103,12 +102,12 @@ public class DataExtractorService extends AbstractService implements IDataExtrac private Set extractingNodes = new HashSet(); - public DataExtractorService(Log log, IParameterService parameterService, + public DataExtractorService(IParameterService parameterService, ISymmetricDialect symmetricDialect, IOutgoingBatchService outgoingBatchService, IRouterService routingService, IConfigurationService configurationService, ITriggerRouterService triggerRouterService, INodeService nodeService, IStatisticManager statisticManager) { - super(log, parameterService, symmetricDialect); + super(parameterService, symmetricDialect); this.outgoingBatchService = outgoingBatchService; this.routerService = routingService; this.configurationService = configurationService; diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataLoaderService.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataLoaderService.java index 44db959ab8..539094d5ef 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataLoaderService.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataLoaderService.java @@ -37,7 +37,6 @@ import org.apache.commons.lang.StringUtils; import org.jumpmind.db.sql.AbstractSqlMap; import org.jumpmind.db.sql.ISqlTransaction; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.common.Constants; import org.jumpmind.symmetric.common.ParameterConstants; import org.jumpmind.symmetric.db.ISymmetricDialect; @@ -52,9 +51,9 @@ import org.jumpmind.symmetric.io.data.transform.TransformPoint; import org.jumpmind.symmetric.io.data.transform.TransformTable; import org.jumpmind.symmetric.io.data.writer.DatabaseWriterSettings; -import org.jumpmind.symmetric.io.data.writer.StagingDataWriter; -import org.jumpmind.symmetric.io.data.writer.IProtocolDataWriterListener; import org.jumpmind.symmetric.io.data.writer.IDatabaseWriterFilter; +import org.jumpmind.symmetric.io.data.writer.IProtocolDataWriterListener; +import org.jumpmind.symmetric.io.data.writer.StagingDataWriter; import org.jumpmind.symmetric.io.data.writer.TransformDatabaseWriter; import org.jumpmind.symmetric.load.ConfigurationChangedFilter; import org.jumpmind.symmetric.model.BatchInfo; @@ -108,12 +107,12 @@ public class DataLoaderService extends AbstractService implements IDataLoaderSer private ITransformService transformService; - public DataLoaderService(Log log, IParameterService parameterService, + public DataLoaderService(IParameterService parameterService, ISymmetricDialect symmetricDialect, IIncomingBatchService incomingBatchService, IConfigurationService configurationService, ITransportManager transportManager, IStatisticManager statisticManager, INodeService nodeService, ITransformService transformService, ITriggerRouterService triggerRouterService) { - super(log, parameterService, symmetricDialect); + super(parameterService, symmetricDialect); this.incomingBatchService = incomingBatchService; this.configurationService = configurationService; this.transportManager = transportManager; @@ -472,7 +471,7 @@ protected void enableSyncTriggers(DataContext conte this.currentBatch.getNodeBatchId(), ex.getMessage()); this.currentBatch.setSqlMessage(ex.getMessage()); } else { - log.error("Failed to load batch %s because: %s", ex, - this.currentBatch.getNodeBatchId(), ex.getMessage()); + log.error("Failed to load batch %s because: %s", new Object[] { + this.currentBatch.getNodeBatchId(), ex.getMessage() }); + log.error(ex.getMessage(), ex); SQLException se = unwrapSqlException(ex); if (se != null) { this.currentBatch.setSqlState(se.getSQLState()); diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataService.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataService.java index 879f10f518..e84ba3e4b6 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataService.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataService.java @@ -44,7 +44,6 @@ import org.jumpmind.db.sql.Row; import org.jumpmind.db.sql.UniqueKeyException; import org.jumpmind.db.sql.mapper.NumberMapper; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.Version; import org.jumpmind.symmetric.common.Constants; import org.jumpmind.symmetric.common.DeploymentType; @@ -103,12 +102,12 @@ public class DataService extends AbstractService implements IDataService { private IStatisticManager statisticManager; - public DataService(Log log, IParameterService parameterService, - ISymmetricDialect symmetricDialect, DeploymentType deploymentType, - ITriggerRouterService triggerRouterService, INodeService nodeService, - IPurgeService purgeService, IConfigurationService configurationService, - IOutgoingBatchService outgoingBatchService, IStatisticManager statisticManager) { - super(log, parameterService, symmetricDialect); + public DataService(IParameterService parameterService, ISymmetricDialect symmetricDialect, + DeploymentType deploymentType, ITriggerRouterService triggerRouterService, + INodeService nodeService, IPurgeService purgeService, + IConfigurationService configurationService, IOutgoingBatchService outgoingBatchService, + IStatisticManager statisticManager) { + super(parameterService, symmetricDialect); this.deploymentType = deploymentType; this.triggerRouterService = triggerRouterService; this.nodeService = nodeService; @@ -214,7 +213,8 @@ public void checkForAndUpdateMissingChannelIds(long firstDataId, long lastDataId if (numberUpdated > 0) { log.warn( "There were %d data records found between %d and %d that an invalid channel_id. Updating them to be on the '%s' channel.", - numberUpdated, firstDataId, lastDataId, Constants.CHANNEL_DEFAULT); + new Object[] { numberUpdated, firstDataId, lastDataId, + Constants.CHANNEL_DEFAULT }); } } @@ -277,8 +277,9 @@ protected void insertDataEvent(ISqlTransaction transaction, long dataId, long ba StringUtils.isBlank(routerId) ? Constants.UNKNOWN_ROUTER_ID : routerId }, new int[] { Types.NUMERIC, Types.NUMERIC, Types.VARCHAR }); } catch (RuntimeException ex) { - log.error("Could not insert a data event: data_id=%d batch_id=%d router_id=%s", ex, - dataId, batchId, routerId); + log.error("Could not insert a data event: data_id=%d batch_id=%d router_id=%s", + new Object[] { dataId, batchId, routerId }); + log.error(ex.getMessage(), ex); throw ex; } } diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/IncomingBatchService.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/IncomingBatchService.java index c6cbc8a969..29f644724d 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/IncomingBatchService.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/IncomingBatchService.java @@ -32,7 +32,6 @@ import org.jumpmind.db.sql.Row; import org.jumpmind.db.sql.UniqueKeyException; import org.jumpmind.db.sql.mapper.DateMapper; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.common.ParameterConstants; import org.jumpmind.symmetric.db.ISymmetricDialect; import org.jumpmind.symmetric.model.IncomingBatch; @@ -47,9 +46,9 @@ */ public class IncomingBatchService extends AbstractService implements IIncomingBatchService { - public IncomingBatchService(Log log, IParameterService parameterService, + public IncomingBatchService(IParameterService parameterService, ISymmetricDialect symmetricDialect) { - super(log, parameterService, symmetricDialect); + super(parameterService, symmetricDialect); } public IncomingBatch findIncomingBatch(long batchId, String nodeId) { diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeService.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeService.java index 57849ee7df..9f059c7052 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeService.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/NodeService.java @@ -37,7 +37,6 @@ import org.jumpmind.db.sql.Row; import org.jumpmind.db.sql.UniqueKeyException; import org.jumpmind.db.sql.mapper.StringMapper; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.common.ParameterConstants; import org.jumpmind.symmetric.config.INodeIdGenerator; import org.jumpmind.symmetric.db.ISymmetricDialect; @@ -75,8 +74,8 @@ public class NodeService extends AbstractService implements INodeService { private List offlineServerListeners; - public NodeService(Log log, IParameterService parameterService, ISymmetricDialect dialect) { - super(log, parameterService, dialect); + public NodeService(IParameterService parameterService, ISymmetricDialect dialect) { + super(parameterService, dialect); } @Override diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/OutgoingBatchService.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/OutgoingBatchService.java index e6069996cc..be3abd91a5 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/OutgoingBatchService.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/OutgoingBatchService.java @@ -34,7 +34,6 @@ import org.jumpmind.db.sql.SqlList; import org.jumpmind.db.sql.SqlToken; import org.jumpmind.db.sql.mapper.StringMapper; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.common.Constants; import org.jumpmind.symmetric.common.ParameterConstants; import org.jumpmind.symmetric.db.ISymmetricDialect; @@ -62,10 +61,10 @@ public class OutgoingBatchService extends AbstractService implements IOutgoingBa private IConfigurationService configurationService; - public OutgoingBatchService(Log log, IParameterService parameterService, + public OutgoingBatchService(IParameterService parameterService, ISymmetricDialect symmetricDialect, INodeService nodeService, IConfigurationService configurationService) { - super(log, parameterService, symmetricDialect); + super(parameterService, symmetricDialect); this.nodeService = nodeService; this.configurationService = configurationService; } diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ParameterService.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ParameterService.java index 568f6ca574..1ac19c7bbd 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ParameterService.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ParameterService.java @@ -33,8 +33,6 @@ import org.jumpmind.db.sql.ISqlRowMapper; import org.jumpmind.db.sql.ISqlTemplate; import org.jumpmind.db.sql.Row; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; import org.jumpmind.properties.TypedProperties; import org.jumpmind.symmetric.ITypedPropertiesFactory; import org.jumpmind.symmetric.common.ParameterConstants; @@ -43,13 +41,15 @@ import org.jumpmind.symmetric.service.IParameterService; import org.jumpmind.symmetric.util.AppUtils; import org.jumpmind.util.FormatUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @see IParameterService */ public class ParameterService implements IParameterService { - protected Log log = LogFactory.getLog(getClass()); + protected final Logger log = LoggerFactory.getLogger(getClass()); private TypedProperties parameters; @@ -72,8 +72,7 @@ public class ParameterService implements IParameterService { private ISqlTemplate sqlTemplate; public ParameterService(IDatabasePlatform platform, ITypedPropertiesFactory factory, - String tablePrefix, Log log) { - this.log = log; + String tablePrefix) { this.systemProperties = (Properties) System.getProperties().clone(); this.tablePrefix = tablePrefix; this.factory = factory; diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/PullService.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/PullService.java index ccc6287691..98b8e75440 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/PullService.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/PullService.java @@ -27,7 +27,6 @@ import java.util.List; import org.jumpmind.db.sql.AbstractSqlMap; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.db.ISymmetricDialect; import org.jumpmind.symmetric.model.Node; import org.jumpmind.symmetric.model.RemoteNodeStatus; @@ -57,10 +56,10 @@ public class PullService extends AbstractOfflineDetectorService implements IPull private IClusterService clusterService; - public PullService(Log log, IParameterService parameterService, ISymmetricDialect symmetricDialect, + public PullService(IParameterService parameterService, ISymmetricDialect symmetricDialect, INodeService nodeService, IDataLoaderService dataLoaderService, IRegistrationService registrationService, IClusterService clusterService) { - super(log, parameterService, symmetricDialect); + super(parameterService, symmetricDialect); this.nodeService = nodeService; this.dataLoaderService = dataLoaderService; this.registrationService = registrationService; @@ -90,11 +89,11 @@ synchronized public RemoteNodeStatuses pullData() { dataLoaderService.loadDataFromPull(node, status); if (status.getDataProcessed() > 0 || status.getBatchesProcessed() > 0) { - log.info("Pull data received from %s. %d rows and %d batches were processed.", node.toString(), status.getDataProcessed(), - status.getBatchesProcessed()); + log.info("Pull data received from %s. %d rows and %d batches were processed.", new Object[] { node.toString(), status.getDataProcessed(), + status.getBatchesProcessed() }); } else { - log.debug("Pull data received from %s. %d rows and %d batches were processed.", node.toString(), status.getDataProcessed(), - status.getBatchesProcessed()); + log.debug("Pull data received from %s. %d rows and %d batches were processed.", new Object[] {node.toString(), status.getDataProcessed(), + status.getBatchesProcessed()}); } } catch (ConnectException ex) { log.warn( @@ -118,7 +117,7 @@ synchronized public RemoteNodeStatuses pullData() { log.warn("%s", ex.getMessage()); fireOffline(ex, node, status); } catch (IOException ex) { - log.error(ex); + log.error(ex.getMessage(),ex); fireOffline(ex, node, status); } } diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/PurgeService.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/PurgeService.java index 44914defd3..7b4e38f8f5 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/PurgeService.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/PurgeService.java @@ -31,7 +31,6 @@ import org.jumpmind.db.sql.AbstractSqlMap; import org.jumpmind.db.sql.ISqlRowMapper; import org.jumpmind.db.sql.Row; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.common.ParameterConstants; import org.jumpmind.symmetric.db.ISymmetricDialect; import org.jumpmind.symmetric.service.ClusterConstants; @@ -53,9 +52,9 @@ enum MinMaxDeleteSql { private IStatisticManager statisticManager; - public PurgeService(Log log, IParameterService parameterService, ISymmetricDialect symmetricDialect, + public PurgeService(IParameterService parameterService, ISymmetricDialect symmetricDialect, IClusterService clusterService, IStatisticManager statisticManager) { - super(log, parameterService, symmetricDialect); + super(parameterService, symmetricDialect); this.clusterService = clusterService; this.statisticManager = statisticManager; } @@ -110,7 +109,7 @@ public long purgeDataGaps(Calendar retentionCutoff) { log.warn("Did not run the data gap purge process because the cluster service has it locked"); } } catch (Exception ex) { - log.error(ex); + log.error(ex.getMessage(), ex); } return rowsPurged; } @@ -134,7 +133,7 @@ public long purgeOutgoing(Calendar retentionCutoff) { log.info("Could not get a lock to run an outgoing purge"); } } catch (Exception ex) { - log.error(ex); + log.error(ex.getMessage(), ex); } return rowsPurged; } @@ -244,8 +243,8 @@ private int purgeByMinMax(long[] minMax, MinMaxDeleteSql identifier, Date retent if (totalCount > 0 && (System.currentTimeMillis() - ts > DateUtils.MILLIS_PER_MINUTE * 5)) { - log.info("Purged %d of %s rows so far using %d statements", totalCount, identifier - .toString().toLowerCase(), totalDeleteStmts); + log.info("Purged %d of %s rows so far using %d statements", new Object[] { + totalCount, identifier.toString().toLowerCase(), totalDeleteStmts }); ts = System.currentTimeMillis(); } minId = maxId + 1; @@ -269,7 +268,7 @@ public long purgeIncoming(Calendar retentionCutoff) { log.info("Could not get a lock to run an incoming purge"); } } catch (Exception ex) { - log.error(ex); + log.error(ex.getMessage(), ex); } return purgedRowCount; } @@ -315,8 +314,8 @@ private int purgeByNodeBatchRangeList(String deleteSql, List nod if (totalCount > 0 && (System.currentTimeMillis() - ts > DateUtils.MILLIS_PER_MINUTE * 5)) { - log.info("Purged %d of %s rows so far using %d statements", totalCount, tableName, - totalDeleteStmts); + log.info("Purged %d of %s rows so far using %d statements", new Object[] {totalCount, tableName, + totalDeleteStmts}); ts = System.currentTimeMillis(); } } diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/PushService.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/PushService.java index b4bd6e7862..c4982c5e3b 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/PushService.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/PushService.java @@ -28,7 +28,6 @@ import org.apache.commons.lang.StringUtils; import org.jumpmind.db.sql.AbstractSqlMap; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.db.ISymmetricDialect; import org.jumpmind.symmetric.model.BatchInfo; import org.jumpmind.symmetric.model.Node; @@ -66,11 +65,11 @@ public class PushService extends AbstractOfflineDetectorService implements IPush private IClusterService clusterService; - public PushService(Log log, IParameterService parameterService, ISymmetricDialect symmetricDialect, + public PushService(IParameterService parameterService, ISymmetricDialect symmetricDialect, IDataExtractorService dataExtractorService, IAcknowledgeService acknowledgeService, ITransportManager transportManager, INodeService nodeService, IClusterService clusterService) { - super(log, parameterService, symmetricDialect); + super(parameterService, symmetricDialect); this.dataExtractorService = dataExtractorService; this.acknowledgeService = acknowledgeService; this.transportManager = transportManager; @@ -173,7 +172,7 @@ private RemoteNodeStatus pushToNode(Node remote, Node identity, NodeSecurity ide } catch (Exception ex) { // just report the error because we want to push to other nodes // in our list - log.error(ex); + log.error(ex.getMessage(),ex); fireOffline(ex, remote, status); } finally { try { diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/RegistrationService.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/RegistrationService.java index ba731e8144..84b228452e 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/RegistrationService.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/RegistrationService.java @@ -35,7 +35,6 @@ import org.jumpmind.db.sql.ISqlRowMapper; import org.jumpmind.db.sql.Row; import org.jumpmind.db.sql.mapper.StringMapper; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.common.ParameterConstants; import org.jumpmind.symmetric.db.ISymmetricDialect; import org.jumpmind.symmetric.model.Node; @@ -77,12 +76,12 @@ public class RegistrationService extends AbstractService implements IRegistratio private IStatisticManager statisticManager; - public RegistrationService(Log log, IParameterService parameterService, + public RegistrationService(IParameterService parameterService, ISymmetricDialect symmetricDialect, INodeService nodeService, IDataExtractorService dataExtractorService, IDataService dataService, IDataLoaderService dataLoaderService, ITransportManager transportManager, IStatisticManager statisticManager) { - super(log, parameterService, symmetricDialect); + super(parameterService, symmetricDialect); this.nodeService = nodeService; this.dataExtractorService = dataExtractorService; this.dataService = dataService; @@ -238,7 +237,8 @@ private void sleepBeforeRegistrationRetry() { try { long sleepTimeInMs = DateUtils.MILLIS_PER_SECOND * randomTimeSlot.getRandomValueSeededByExternalId(); - log.warn("Could not register. Sleeping for %d ms before attempting again.", sleepTimeInMs); + log.warn("Could not register. Sleeping for %d ms before attempting again.", + sleepTimeInMs); Thread.sleep(sleepTimeInMs); } catch (InterruptedException e) { } @@ -265,7 +265,7 @@ public void registerWithServer() { } catch (UnknownHostException e) { log.warn("Connection failed while registering."); } catch (Exception e) { - log.error(e); + log.error(e.getMessage(), e); } maxNumberOfAttempts--; @@ -349,8 +349,9 @@ protected synchronized String openRegistration(Node node) { sqlTemplate.update(getSql("openRegistrationNodeSecuritySql"), new Object[] { nodeId, password, me.getNodeId() }); nodeService.insertNodeGroup(node.getNodeGroupId(), null); - log.info("Just opened registration for external id of %s and a node group of %s and a node id of %s", node.getExternalId(), node.getNodeGroupId(), - nodeId); + log.info( + "Just opened registration for external id of %s and a node group of %s and a node id of %s", + new Object[] { node.getExternalId(), node.getNodeGroupId(), nodeId }); } else { reOpenRegistration(nodeId); } diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/RouterService.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/RouterService.java index bdff29f4a0..f138290a17 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/RouterService.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/RouterService.java @@ -36,7 +36,6 @@ import org.apache.commons.lang.StringUtils; import org.jumpmind.db.model.Table; import org.jumpmind.db.sql.AbstractSqlMap; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.common.Constants; import org.jumpmind.symmetric.common.ParameterConstants; import org.jumpmind.symmetric.db.ISymmetricDialect; @@ -105,12 +104,12 @@ public class RouterService extends AbstractService implements IRouterService { transient ExecutorService readThread = null; - public RouterService(Log log, IParameterService parameterService, ISymmetricDialect symmetricDialect, + public RouterService(IParameterService parameterService, ISymmetricDialect symmetricDialect, IClusterService clusterService, IDataService dataService, IConfigurationService configurationService, ITriggerRouterService triggerRouterService, IOutgoingBatchService outgoingBatchService, INodeService nodeService, IStatisticManager statisticManager, ITransformService transformService) { - super(log, parameterService, symmetricDialect); + super(parameterService, symmetricDialect); this.clusterService = clusterService; this.dataService = dataService; this.configurationService = configurationService; @@ -179,7 +178,7 @@ public synchronized void stop() { getReadService().shutdown(); readThread = null; } catch (Exception ex) { - log.error(ex); + log.error(ex.getMessage(), ex); } } @@ -196,7 +195,7 @@ synchronized public long routeData() { try { insertInitialLoadEvents(); long ts = System.currentTimeMillis(); - IDataToRouteGapDetector gapDetector = new DataGapDetector(log, dataService, + IDataToRouteGapDetector gapDetector = new DataGapDetector(dataService, parameterService, symmetricDialect, getSqlMap()); gapDetector.beforeRouting(); dataCount = routeDataForEachChannel(); @@ -228,16 +227,18 @@ protected void insertInitialLoadEvents() { .getNodeId())); ts = System.currentTimeMillis() - ts; if (ts > Constants.LONG_OPERATION_THRESHOLD) { - log.warn("Inserted reload events for node %s in %d ms", security.getNodeId(), ts); + log.warn("Inserted reload events for node %s in %d ms", + security.getNodeId(), ts); } else { - log.info("Inserted reload events for node %s in %d ms", security.getNodeId(), ts); + log.info("Inserted reload events for node %s in %d ms", + security.getNodeId(), ts); } } } } } } catch (Exception ex) { - log.error(ex); + log.error(ex.getMessage(), ex); } } @@ -256,7 +257,8 @@ protected int routeDataForEachChannel() { dataCount += routeDataForChannel(nodeChannel, sourceNode); } else { if (log.isDebugEnabled()) { - log.debug("Not routing the %s channel. It is either disabled or suspended.", nodeChannel.getChannelId()); + log.debug("Not routing the %s channel. It is either disabled or suspended.", + nodeChannel.getChannelId()); } } } @@ -273,7 +275,8 @@ protected int routeDataForChannel(final NodeChannel nodeChannel, final Node sour dataCount = selectDataAndRoute(context); return dataCount; } catch (Exception ex) { - log.error("Failed to route and batch data on '%s' channel", ex, nodeChannel.getChannelId()); + log.error("Failed to route and batch data on '%s' channel", ex, + nodeChannel.getChannelId()); if (context != null) { context.rollback(); } @@ -305,7 +308,7 @@ protected int routeDataForChannel(final NodeChannel nodeChannel, final Node sour if (context != null) { context.rollback(); } - log.error(e); + log.error(e.getMessage(), e); } finally { long totalTime = System.currentTimeMillis() - ts; context.incrementStat(totalTime, ChannelRouterContext.STAT_ROUTE_TOTAL_TIME); @@ -351,9 +354,10 @@ protected Set findAvailableNodes(TriggerRouter triggerRouter, ChannelRoute nodes.addAll(nodeService.findEnabledNodesFromNodeGroup(router.getNodeGroupLink() .getTargetNodeGroupId())); } else { - log.error("The router %s has no node group link configured from %s to %s", router.getRouterId(), router - .getNodeGroupLink().getSourceNodeGroupId(), router.getNodeGroupLink() - .getTargetNodeGroupId()); + log.error("The router %s has no node group link configured from %s to %s", + new Object[] { router.getRouterId(), + router.getNodeGroupLink().getSourceNodeGroupId(), + router.getNodeGroupLink().getTargetNodeGroupId() }); } context.getAvailableNodes().put(triggerRouter, nodes); } @@ -372,7 +376,7 @@ protected Set findAvailableNodes(TriggerRouter triggerRouter, ChannelRoute * The current context of the routing process */ protected int selectDataAndRoute(ChannelRouterContext context) throws SQLException { - IDataToRouteReader reader = new DataGapRouteReader(log, getSqlMap(), context, dataService, + IDataToRouteReader reader = new DataGapRouteReader(getSqlMap(), context, dataService, symmetricDialect, parameterService); getReadService().execute(reader); Data data = null; @@ -466,8 +470,9 @@ protected int routeData(Data data, ChannelRouterContext context) throws SQLExcep } } else { - log.warn("Could not find trigger for trigger id of %s. Not processing data with the id of %s", data.getTriggerHistory().getTriggerId(), - data.getDataId()); + log.warn( + "Could not find trigger for trigger id of %s. Not processing data with the id of %s", + data.getTriggerHistory().getTriggerId(), data.getDataId()); } context.incrementStat(numberOfDataEventsInserted, @@ -513,8 +518,9 @@ protected IDataRouter getDataRouter(TriggerRouter trigger) { if (!StringUtils.isBlank(trigger.getRouter().getRouterType())) { router = routers.get(trigger.getRouter().getRouterType()); if (router == null) { - log.warn("Could not find configured router '%s' for trigger with the id of %s. Defaulting the router", trigger.getRouter().getRouterType(), trigger.getTrigger() - .getTriggerId()); + log.warn( + "Could not find configured router '%s' for trigger with the id of %s. Defaulting the router", + trigger.getRouter().getRouterType(), trigger.getTrigger().getTriggerId()); } } @@ -535,7 +541,9 @@ protected List getTriggerRoutersForData(Data data) { .get((data.getTriggerHistory().getTriggerId())); } } else { - log.warn("Could not find a trigger hist record for recorded data %d. Was the trigger hist record deleted manually?", data.getDataId()); + log.warn( + "Could not find a trigger hist record for recorded data %d. Was the trigger hist record deleted manually?", + data.getDataId()); } } return triggerRouters; @@ -571,6 +579,6 @@ public Map getRouters() { @Override protected AbstractSqlMap createSqlMap() { return new RouterServiceSqlMap(symmetricDialect.getPlatform(), createSqlReplacementTokens()); - } + } } \ No newline at end of file diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/SecurityService.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/SecurityService.java index 2f6ca5ac8b..6bb5cd571f 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/SecurityService.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/SecurityService.java @@ -35,14 +35,14 @@ import org.apache.commons.codec.binary.Base64; import org.apache.commons.math.random.RandomDataImpl; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; import org.jumpmind.symmetric.common.SecurityConstants; import org.jumpmind.symmetric.service.ISecurityService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class SecurityService implements ISecurityService { - protected Log log = LogFactory.getLog(getClass()); + protected Logger log = LoggerFactory.getLogger(getClass()); private SecretKey secretKey; diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/StatisticService.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/StatisticService.java index 9dea51d0b8..51e340ffd8 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/StatisticService.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/StatisticService.java @@ -30,7 +30,6 @@ import org.jumpmind.db.sql.AbstractSqlMap; import org.jumpmind.db.sql.ISqlRowMapper; import org.jumpmind.db.sql.Row; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.db.ISymmetricDialect; import org.jumpmind.symmetric.service.IParameterService; import org.jumpmind.symmetric.service.IStatisticService; @@ -45,8 +44,8 @@ */ public class StatisticService extends AbstractService implements IStatisticService { - public StatisticService(Log log, IParameterService parameterService, ISymmetricDialect dialect) { - super(log, parameterService, dialect); + public StatisticService(IParameterService parameterService, ISymmetricDialect dialect) { + super(parameterService, dialect); } public void save(ChannelStats stats) { diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/TransformService.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/TransformService.java index 0f1a4cdd88..c2d201f5fe 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/TransformService.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/TransformService.java @@ -9,7 +9,6 @@ import org.jumpmind.db.sql.ISqlRowMapper; import org.jumpmind.db.sql.ISqlTransaction; import org.jumpmind.db.sql.Row; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.common.ParameterConstants; import org.jumpmind.symmetric.db.ISymmetricDialect; import org.jumpmind.symmetric.io.data.transform.DeleteAction; @@ -27,8 +26,8 @@ public class TransformService extends AbstractService implements ITransformServi private long lastCacheTimeInMs; - public TransformService(Log log, IParameterService parameterService, ISymmetricDialect symmetricDialect) { - super(log, parameterService, symmetricDialect); + public TransformService(IParameterService parameterService, ISymmetricDialect symmetricDialect) { + super(parameterService, symmetricDialect); } @Override diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/TriggerRouterService.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/TriggerRouterService.java index 9968ecb2d2..5eff1c9a42 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/TriggerRouterService.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/TriggerRouterService.java @@ -38,7 +38,6 @@ import org.jumpmind.db.sql.AbstractSqlMap; import org.jumpmind.db.sql.ISqlRowMapper; import org.jumpmind.db.sql.Row; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.Version; import org.jumpmind.symmetric.common.Constants; import org.jumpmind.symmetric.common.ParameterConstants; @@ -98,10 +97,10 @@ public class TriggerRouterService extends AbstractService implements ITriggerRou */ private HashMap historyMap = new HashMap(); - public TriggerRouterService(Log log, IParameterService parameterService, + public TriggerRouterService(IParameterService parameterService, ISymmetricDialect symmetricDialect, IClusterService clusterService, IConfigurationService configurationService, IStatisticManager statisticManager) { - super(log, parameterService, symmetricDialect); + super(parameterService, symmetricDialect); this.clusterService = clusterService; this.configurationService = configurationService; this.statisticManager = statisticManager; @@ -872,7 +871,8 @@ protected void updateOrCreateDatabaseTriggers(List triggers, StringBuil String errorMessage = null; Channel channel = configurationService.getChannel(trigger.getChannelId()); if (channel == null) { - errorMessage = String.format("Trigger %s had an unrecognized channel_id of '%s'. Please check to make sure the channel exists. Creating trigger on the '%s' channel", + errorMessage = String + .format("Trigger %s had an unrecognized channel_id of '%s'. Please check to make sure the channel exists. Creating trigger on the '%s' channel", trigger.getTriggerId(), trigger.getChannelId(), Constants.CHANNEL_DEFAULT); log.error(errorMessage); @@ -1110,7 +1110,8 @@ protected String getTriggerName(DataEventType dml, int maxTriggerNameLength, Tri triggerName = triggerName.substring(0, maxTriggerNameLength - 1); log.debug( "We just truncated the trigger name for the %s trigger id=%s. You might want to consider manually providing a name for the trigger that is less than %d characters long", - dml.name().toLowerCase(), trigger.getTriggerId(), maxTriggerNameLength); + new Object[] { dml.name().toLowerCase(), trigger.getTriggerId(), + maxTriggerNameLength }); } int duplicateCount = 0; diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/transport/AbstractTransportManager.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/transport/AbstractTransportManager.java index 2706354f2d..5152915ac5 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/transport/AbstractTransportManager.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/transport/AbstractTransportManager.java @@ -33,30 +33,22 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; import org.jumpmind.symmetric.common.Constants; import org.jumpmind.symmetric.model.BatchInfo; import org.jumpmind.symmetric.model.IncomingBatch; import org.jumpmind.symmetric.model.IncomingBatch.Status; import org.jumpmind.symmetric.web.WebConstants; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -/** - * - */ abstract public class AbstractTransportManager { - protected Log log = LogFactory.getLog(getClass()); + protected final Logger log = LoggerFactory.getLogger(getClass()); protected Map extensionSyncUrlHandlers = new HashMap(); public AbstractTransportManager() { } - - public AbstractTransportManager(Log log) { - this.log = log; - } - public void addExtensionSyncUrlHandler(String name, ISyncUrlExtension handler) { if (extensionSyncUrlHandlers == null) { @@ -87,7 +79,7 @@ public String resolveURL(String syncUrl, String registrationUrl) { return handler.resolveUrl(uri); } } catch (URISyntaxException e) { - log.error(e); + log.error(e.getMessage(),e); return syncUrl; } } else { diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/transport/http/HttpBandwidthUrlSelector.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/transport/http/HttpBandwidthUrlSelector.java index 1946500ee4..67137aecbe 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/transport/http/HttpBandwidthUrlSelector.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/transport/http/HttpBandwidthUrlSelector.java @@ -29,11 +29,11 @@ import java.util.Map; import org.jumpmind.extension.IBuiltInExtensionPoint; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; import org.jumpmind.symmetric.service.IBandwidthService; import org.jumpmind.symmetric.service.INodeService; import org.jumpmind.symmetric.transport.ISyncUrlExtension; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This {@link ISyncUrlExtension} is capable of measuring the bandwidth of a @@ -47,7 +47,7 @@ */ public class HttpBandwidthUrlSelector implements ISyncUrlExtension, IBuiltInExtensionPoint { - protected Log log = LogFactory.getLog(getClass()); + protected final Logger log = LoggerFactory.getLogger(getClass()); public static String PARAM_PRELOAD_ONLY = "initialLoadOnly"; public static String PARAM_SAMPLE_SIZE = "sampleSize"; @@ -64,9 +64,8 @@ public class HttpBandwidthUrlSelector implements ISyncUrlExtension, IBuiltInExte private INodeService nodeService; private IBandwidthService bandwidthService; - public HttpBandwidthUrlSelector(Log log, INodeService nodeService, + public HttpBandwidthUrlSelector(INodeService nodeService, IBandwidthService bandwidthService) { - this.log = log; this.nodeService = nodeService; this.bandwidthService = bandwidthService; } diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/transport/http/HttpTransportManager.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/transport/http/HttpTransportManager.java index 383bad8bd0..ea9b05d46a 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/transport/http/HttpTransportManager.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/transport/http/HttpTransportManager.java @@ -60,9 +60,8 @@ public HttpTransportManager() { } public HttpTransportManager(ISymmetricEngine engine) { - super(engine.getLog()); this.parameterService = engine.getParameterService(); - this.addExtensionSyncUrlHandler("httpBandwidthUrlSelector", new HttpBandwidthUrlSelector(log, engine.getNodeService(), engine.getBandwidthService())); + this.addExtensionSyncUrlHandler("httpBandwidthUrlSelector", new HttpBandwidthUrlSelector(engine.getNodeService(), engine.getBandwidthService())); } public int sendAcknowledgement(Node remote, List list, Node local, String securityToken, String registrationUrl) throws IOException { diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/transport/http/SelfSignedX509TrustManager.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/transport/http/SelfSignedX509TrustManager.java index ba9f2ddeb9..41e24800d4 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/transport/http/SelfSignedX509TrustManager.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/transport/http/SelfSignedX509TrustManager.java @@ -30,8 +30,8 @@ import javax.net.ssl.TrustManagerFactory; import javax.net.ssl.X509TrustManager; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A X509TrustManager that accepts self-signed certificates. @@ -51,7 +51,7 @@ public class SelfSignedX509TrustManager implements X509TrustManager private X509TrustManager standardTrustManager = null; /** Log object for this class. */ - protected Log log = LogFactory.getLog(getClass()); + protected Logger log = LoggerFactory.getLogger(getClass()); /** * Constructor for SelfSignedX509TrustManager. diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/transport/internal/InternalTransportManager.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/transport/internal/InternalTransportManager.java index 57b744d5c9..78d1ef2a7d 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/transport/internal/InternalTransportManager.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/transport/internal/InternalTransportManager.java @@ -33,8 +33,6 @@ import java.util.Map; import org.apache.commons.io.IOUtils; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; import org.jumpmind.symmetric.AbstractSymmetricEngine; import org.jumpmind.symmetric.ISymmetricEngine; import org.jumpmind.symmetric.common.Constants; @@ -47,13 +45,15 @@ import org.jumpmind.symmetric.transport.IOutgoingTransport; import org.jumpmind.symmetric.transport.IOutgoingWithResponseTransport; import org.jumpmind.symmetric.transport.ITransportManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Coordinates interaction between two symmetric engines in the same JVM. */ public class InternalTransportManager extends AbstractTransportManager implements ITransportManager { - static final Log log = LogFactory.getLog(InternalTransportManager.class); + static final Logger log = LoggerFactory.getLogger(InternalTransportManager.class); protected ISymmetricEngine symmetricEngine; @@ -124,7 +124,7 @@ public int sendAcknowledgement(Node remote, List list, } return HttpURLConnection.HTTP_OK; } catch (Exception ex) { - log.error(ex); + log.error(ex.getMessage(),ex); return -1; } } @@ -145,7 +145,7 @@ public void run() { ISymmetricEngine engine = getTargetEngine(url); runnable.run(engine, is, os); } catch (Exception e) { - log.error(e); + log.error(e.getMessage(),e); } finally { IOUtils.closeQuietly(is); IOUtils.closeQuietly(os); diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/util/AppUtils.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/util/AppUtils.java index a293f71521..d8e13ea228 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/util/AppUtils.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/util/AppUtils.java @@ -36,8 +36,8 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.time.FastDateFormat; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import bsh.EvalError; import bsh.Interpreter; @@ -51,7 +51,7 @@ public class AppUtils { private static String UNKNOWN = "unknown"; - private static Log log = LogFactory.getLog(AppUtils.class); + private static Logger log = LoggerFactory.getLogger(AppUtils.class); private static final String SYM_TEMP_SUFFIX = "sym.tmp"; @@ -88,7 +88,7 @@ public static String getHostName() { try { hostName = InetAddress.getLocalHost().getHostName(); } catch (Exception ex) { - log.warn(ex); + log.warn(ex.getMessage(),ex); } } return hostName; @@ -100,7 +100,7 @@ public static String getIpAddress() { try { ipAddress = InetAddress.getLocalHost().getHostAddress(); } catch (Exception ex) { - log.warn(ex); + log.warn(ex.getMessage(),ex); } } return ipAddress; @@ -156,7 +156,7 @@ public synchronized static void cleanupTempFiles() { log.warn("Cleaned %d stranded temporary files.", deletedCount); } } catch (Exception ex) { - log.error(ex); + log.error(ex.getMessage(),ex); } } } @@ -200,7 +200,7 @@ public static void resetDataSource(DataSource ds) { try { bds.close(); } catch (Exception ex) { - log.warn(ex); + log.warn(ex.getMessage(),ex); } } } diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/util/DefaultParameterParser.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/util/DefaultParameterParser.java index 4c6fdc950d..e7c172e5d4 100644 --- a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/util/DefaultParameterParser.java +++ b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/util/DefaultParameterParser.java @@ -29,8 +29,8 @@ import java.util.TreeMap; import org.apache.commons.io.IOUtils; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class DefaultParameterParser { @@ -39,7 +39,7 @@ public class DefaultParameterParser { private static final String DATABASE_OVERRIDABLE = "DatabaseOverridable:"; private static final String TAGS = "Tags:"; private static final String TYPE = "Type:"; - final Log log = LogFactory.getLog(getClass()); + final Logger log = LoggerFactory.getLogger(getClass()); public DefaultParameterParser() { } @@ -82,7 +82,7 @@ public Map parse() { } } } catch (IOException e) { - log.error(e); + log.error(e.getMessage(),e); } return metaData; } diff --git a/symmetric/symmetric-core/src/test/java/org/jumpmind/symmetric/TestUtils.java b/symmetric/symmetric-core/src/test/java/org/jumpmind/symmetric/TestUtils.java index c021231735..5eb800b00e 100644 --- a/symmetric/symmetric-core/src/test/java/org/jumpmind/symmetric/TestUtils.java +++ b/symmetric/symmetric-core/src/test/java/org/jumpmind/symmetric/TestUtils.java @@ -1,14 +1,6 @@ package org.jumpmind.symmetric; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; public class TestUtils { - - final static Log log = LogFactory.getLog("org.jumpmind.unittests"); - - public static Log getLog() { - return log; - } } diff --git a/symmetric/symmetric-core/src/test/java/org/jumpmind/symmetric/service/impl/AbstractRouterServiceTest.java b/symmetric/symmetric-core/src/test/java/org/jumpmind/symmetric/service/impl/AbstractRouterServiceTest.java index 3df11c815a..b116bf1bfb 100644 --- a/symmetric/symmetric-core/src/test/java/org/jumpmind/symmetric/service/impl/AbstractRouterServiceTest.java +++ b/symmetric/symmetric-core/src/test/java/org/jumpmind/symmetric/service/impl/AbstractRouterServiceTest.java @@ -10,7 +10,6 @@ import org.jumpmind.db.platform.IDatabasePlatform; import org.jumpmind.db.sql.ISqlTransaction; import org.jumpmind.symmetric.TestConstants; -import org.jumpmind.symmetric.TestUtils; import org.jumpmind.symmetric.common.Constants; import org.jumpmind.symmetric.common.ParameterConstants; import org.jumpmind.symmetric.db.ISymmetricDialect; @@ -945,7 +944,7 @@ public void testGapRouting() throws Exception { Assert.assertEquals(0, gap.getEndId() - gap.getStartId()); } } catch (Exception ex) { - TestUtils.getLog().error(ex); + logger.error(ex.getMessage(), ex); throw ex; } } @@ -1134,7 +1133,7 @@ public void testDontSelectOldDataDuringRouting() throws Exception { ChannelRouterContext context = new ChannelRouterContext( TestConstants.TEST_ROOT_EXTERNAL_ID, testChannel, getSqlTemplate() .startSqlTransaction()); - DataGapRouteReader reader = new DataGapRouteReader(logger, getRouterService().getSqlMap(), + DataGapRouteReader reader = new DataGapRouteReader(getRouterService().getSqlMap(), context, getDataService(), getDbDialect(), getParameterService()); reader.run(); diff --git a/symmetric/symmetric-core/src/test/java/org/jumpmind/symmetric/service/impl/AbstractServiceTest.java b/symmetric/symmetric-core/src/test/java/org/jumpmind/symmetric/service/impl/AbstractServiceTest.java index e7c3764f65..be86de6e77 100644 --- a/symmetric/symmetric-core/src/test/java/org/jumpmind/symmetric/service/impl/AbstractServiceTest.java +++ b/symmetric/symmetric-core/src/test/java/org/jumpmind/symmetric/service/impl/AbstractServiceTest.java @@ -5,13 +5,9 @@ import java.util.Date; import org.apache.log4j.Level; -import org.apache.log4j.Logger; import org.jumpmind.db.platform.IDatabasePlatform; import org.jumpmind.db.sql.ISqlTemplate; -import org.jumpmind.log.Log; -import org.jumpmind.log.Log4jLog; import org.jumpmind.symmetric.ISymmetricEngine; -import org.jumpmind.symmetric.TestUtils; import org.jumpmind.symmetric.db.ISymmetricDialect; import org.jumpmind.symmetric.service.IConfigurationService; import org.jumpmind.symmetric.service.IDataService; @@ -24,16 +20,14 @@ import org.jumpmind.symmetric.service.ITriggerRouterService; import org.junit.Assert; import org.junit.BeforeClass; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public abstract class AbstractServiceTest { static private ISymmetricEngine engine; - protected Log logger = TestUtils.getLog(); - - static { - org.jumpmind.log.LogFactory.setLogClass(Log4jLog.class); - } + protected final static Logger logger = LoggerFactory.getLogger(AbstractServiceTest.class); @BeforeClass public static void setup() { @@ -44,34 +38,34 @@ public static void setup() { engine = (ISymmetricEngine) method.invoke(clazz); } catch (InvocationTargetException ex) { Throwable cause = ex.getCause(); - TestUtils.getLog().error(cause); + logger.error(cause.getMessage(), cause); if (cause instanceof RuntimeException) { throw (RuntimeException) cause; } else { throw new IllegalStateException(cause); } } catch (Exception ex) { - TestUtils.getLog().error(ex); + logger.error(ex.getMessage(), ex); Assert.fail(ex.getMessage()); } } } - protected Level setLoggingLevelForTest(Level level) { - Logger logger = Logger.getLogger(getSymmetricEngine().getLog().getCategory()); + protected Level setLoggingLevelForTest(Level level) { + org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(DataService.class); Level old = logger.getLevel(); logger.setLevel(level); return old; } protected void logTestRunning() { - TestUtils.getLog().info( + logger.info( "Running " + new Exception().getStackTrace()[1].getMethodName() + ". " + getSymmetricEngine().getSymmetricDialect().getPlatform().getName()); } protected void logTestComplete() { - TestUtils.getLog().info( + logger.info( "Completed running " + new Exception().getStackTrace()[1].getMethodName() + ". " + getSymmetricEngine().getSymmetricDialect().getPlatform().getName()); } diff --git a/symmetric/symmetric-core/src/test/java/org/jumpmind/symmetric/transport/http/HttpBandwidthBalancerTest.java b/symmetric/symmetric-core/src/test/java/org/jumpmind/symmetric/transport/http/HttpBandwidthBalancerTest.java index c03137178f..24106798aa 100644 --- a/symmetric/symmetric-core/src/test/java/org/jumpmind/symmetric/transport/http/HttpBandwidthBalancerTest.java +++ b/symmetric/symmetric-core/src/test/java/org/jumpmind/symmetric/transport/http/HttpBandwidthBalancerTest.java @@ -26,7 +26,6 @@ import junit.framework.Assert; -import org.jumpmind.log.LogFactory; import org.jumpmind.symmetric.service.IBandwidthService; import org.jumpmind.symmetric.service.impl.MockNodeService; import org.junit.Test; @@ -71,7 +70,7 @@ public void testSampleTTL() throws Exception { } protected HttpBandwidthUrlSelector getMockBandwidthBalancer(final boolean dataLoadCompleted) { - HttpBandwidthUrlSelector ext = new HttpBandwidthUrlSelector(LogFactory.getLog(getClass()), + HttpBandwidthUrlSelector ext = new HttpBandwidthUrlSelector( new MockNodeService() { @Override public boolean isDataLoadCompleted() { diff --git a/symmetric/symmetric-db/src/main/java/org/jumpmind/db/platform/AbstractDatabasePlatform.java b/symmetric/symmetric-db/src/main/java/org/jumpmind/db/platform/AbstractDatabasePlatform.java index 6df16e7c32..5821a0dbdb 100644 --- a/symmetric/symmetric-db/src/main/java/org/jumpmind/db/platform/AbstractDatabasePlatform.java +++ b/symmetric/symmetric-db/src/main/java/org/jumpmind/db/platform/AbstractDatabasePlatform.java @@ -41,8 +41,8 @@ import org.jumpmind.db.sql.ISqlTemplate; import org.jumpmind.db.sql.SqlScript; import org.jumpmind.db.util.BinaryEncoding; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.jumpmind.util.FormatUtils; /* @@ -59,7 +59,7 @@ public abstract class AbstractDatabasePlatform implements IDatabasePlatform { protected static final String MODEL_DEFAULT_NAME = "default"; /* The log for this platform. */ - protected Log log = LogFactory.getLog(getClass()); + protected final Logger log = LoggerFactory.getLogger(getClass()); /* The platform info. */ protected DatabasePlatformInfo info = new DatabasePlatformInfo(); @@ -94,8 +94,7 @@ public abstract class AbstractDatabasePlatform implements IDatabasePlatform { protected String defaultCatalog; - public AbstractDatabasePlatform(Log log) { - this.log = log; + public AbstractDatabasePlatform() { } abstract public ISqlTemplate getSqlTemplate(); @@ -112,10 +111,6 @@ public DmlStatement createDmlStatement(DmlType dmlType, String catalogName, Stri .getIdentifierQuoteString()); } - public void setLog(Log log) { - this.log = log; - } - public IDdlReader getDdlReader() { return ddlReader; } @@ -361,8 +356,9 @@ public Object[] getObjectValues(BinaryEncoding encoding, String[] values, list.add(objectValue); } } catch (Exception ex) { - log.error("Could not convert a value of %s for column %s of type %s", value, - column.getName(), column.getType(), ex); + log.error("Could not convert a value of %s for column %s of type %s", new Object[] {value, + column.getName(), column.getType()}); + log.error(ex.getMessage(), ex); throw new RuntimeException(ex); } } diff --git a/symmetric/symmetric-db/src/main/java/org/jumpmind/db/platform/AbstractDdlBuilder.java b/symmetric/symmetric-db/src/main/java/org/jumpmind/db/platform/AbstractDdlBuilder.java index f89f97d7ee..cca75a1234 100644 --- a/symmetric/symmetric-db/src/main/java/org/jumpmind/db/platform/AbstractDdlBuilder.java +++ b/symmetric/symmetric-db/src/main/java/org/jumpmind/db/platform/AbstractDdlBuilder.java @@ -66,7 +66,8 @@ import org.jumpmind.db.model.TypeMap; import org.jumpmind.db.util.CallbackClosure; import org.jumpmind.db.util.MultiInstanceofPredicate; -import org.jumpmind.log.Log; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This class is a collection of Strategy methods for creating the DDL required @@ -90,7 +91,7 @@ public abstract class AbstractDdlBuilder implements IDdlBuilder { protected static final String SIZE_PLACEHOLDER = "{0}"; /** The Log to which logging calls will be made. */ - protected Log log; + protected final Logger log = LoggerFactory.getLogger(getClass()); /** The platform that this builder belongs to. */ protected IDatabasePlatform platform; @@ -122,8 +123,7 @@ public abstract class AbstractDdlBuilder implements IDdlBuilder { * @param platform * The platform this builder belongs to */ - public AbstractDdlBuilder(Log log, IDatabasePlatform platform) { - this.log = log; + public AbstractDdlBuilder(IDatabasePlatform platform) { this.platform = platform; } diff --git a/symmetric/symmetric-db/src/main/java/org/jumpmind/db/platform/DatabasePlatformInfo.java b/symmetric/symmetric-db/src/main/java/org/jumpmind/db/platform/DatabasePlatformInfo.java index ce6eb1ad4d..e2fc88d0b0 100644 --- a/symmetric/symmetric-db/src/main/java/org/jumpmind/db/platform/DatabasePlatformInfo.java +++ b/symmetric/symmetric-db/src/main/java/org/jumpmind/db/platform/DatabasePlatformInfo.java @@ -26,15 +26,16 @@ import java.util.Map; import java.util.Set; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /* * Contains information about the database platform such as supported features and native type mappings. */ public class DatabasePlatformInfo { + /* The Log to which logging calls will be made. */ - private final Log log = LogFactory.getLog(DatabasePlatformInfo.class); + private final Logger log = LoggerFactory.getLogger(DatabasePlatformInfo.class); // properties influencing the definition of columns diff --git a/symmetric/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/CsvUtils.java b/symmetric/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/CsvUtils.java index 042b1770cf..b4ee4f8a45 100644 --- a/symmetric/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/CsvUtils.java +++ b/symmetric/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/CsvUtils.java @@ -28,15 +28,15 @@ import java.io.Reader; import java.io.Writer; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.jumpmind.symmetric.csv.CsvReader; import org.jumpmind.symmetric.csv.CsvWriter; public class CsvUtils { - static final Log log = LogFactory.getLog(CsvUtils.class); + static final Logger log = LoggerFactory.getLogger(CsvUtils.class); public static final String DELIMITER = ", "; diff --git a/symmetric/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/DataProcessor.java b/symmetric/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/DataProcessor.java index e35ca30b8d..29bc80962c 100644 --- a/symmetric/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/DataProcessor.java +++ b/symmetric/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/DataProcessor.java @@ -1,15 +1,15 @@ package org.jumpmind.symmetric.io.data; import org.jumpmind.db.model.Table; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class DataProcessor { private static final String STAT_WRITE_DATA = "statWriteData"; private static final String STAT_READ_DATA = "statReadData"; - static final Log log = LogFactory.getLog(DataProcessor.class); + static final Logger log = LoggerFactory.getLogger(DataProcessor.class); protected R dataReader; protected W dataWriter; @@ -145,7 +145,7 @@ protected void close(IDataResource dataResource) { try { dataResource.close(); } catch (Exception ex) { - log.error(ex); + log.error(ex.getMessage(),ex); } } diff --git a/symmetric/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/reader/ProtocolDataReader.java b/symmetric/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/reader/ProtocolDataReader.java index 52d173c1d3..df7d8509db 100644 --- a/symmetric/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/reader/ProtocolDataReader.java +++ b/symmetric/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/reader/ProtocolDataReader.java @@ -19,8 +19,8 @@ import org.jumpmind.db.model.Table; import org.jumpmind.db.util.BinaryEncoding; import org.jumpmind.exception.IoException; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.jumpmind.symmetric.csv.CsvReader; import org.jumpmind.symmetric.io.IoResource; import org.jumpmind.symmetric.io.data.Batch; @@ -35,7 +35,7 @@ public class ProtocolDataReader implements IDataReader { - protected Log log = LogFactory.getLog(getClass()); + protected Logger log = LoggerFactory.getLogger(getClass()); protected IoResource ioResource; protected Reader reader; diff --git a/symmetric/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/transform/BshColumnTransform.java b/symmetric/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/transform/BshColumnTransform.java index c69511a6a5..e2be03d2de 100644 --- a/symmetric/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/transform/BshColumnTransform.java +++ b/symmetric/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/transform/BshColumnTransform.java @@ -25,8 +25,8 @@ import org.jumpmind.db.platform.IDatabasePlatform; import org.jumpmind.extension.IBuiltInExtensionPoint; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.jumpmind.symmetric.io.data.DataContext; import org.jumpmind.symmetric.io.data.IDataReader; import org.jumpmind.symmetric.io.data.IDataWriter; @@ -37,7 +37,7 @@ public class BshColumnTransform implements ISingleValueColumnTransform, IBuiltInExtensionPoint { - protected final Log log = LogFactory.getLog(getClass()); + protected final Logger log = LoggerFactory.getLogger(getClass()); final String INTERPRETER_KEY = String.format("%d.BshInterpreter", hashCode()); diff --git a/symmetric/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/transform/IdentityColumnTransform.java b/symmetric/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/transform/IdentityColumnTransform.java index 7ddf5a9074..d83f87c5fe 100644 --- a/symmetric/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/transform/IdentityColumnTransform.java +++ b/symmetric/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/transform/IdentityColumnTransform.java @@ -4,15 +4,15 @@ import org.jumpmind.db.platform.IDatabasePlatform; import org.jumpmind.extension.IBuiltInExtensionPoint; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.jumpmind.symmetric.io.data.DataContext; import org.jumpmind.symmetric.io.data.IDataReader; import org.jumpmind.symmetric.io.data.IDataWriter; public class IdentityColumnTransform implements ISingleValueColumnTransform, IBuiltInExtensionPoint { - protected final Log log = LogFactory.getLog(getClass()); + protected final Logger log = LoggerFactory.getLogger(getClass()); public static final String NAME = "identity"; diff --git a/symmetric/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/transform/LookupColumnTransform.java b/symmetric/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/transform/LookupColumnTransform.java index 19536edc85..e26e9ab9a2 100644 --- a/symmetric/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/transform/LookupColumnTransform.java +++ b/symmetric/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/transform/LookupColumnTransform.java @@ -28,15 +28,15 @@ import org.jumpmind.db.platform.IDatabasePlatform; import org.jumpmind.db.sql.mapper.StringMapper; import org.jumpmind.extension.IBuiltInExtensionPoint; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.jumpmind.symmetric.io.data.DataContext; import org.jumpmind.symmetric.io.data.IDataReader; import org.jumpmind.symmetric.io.data.IDataWriter; public class LookupColumnTransform implements ISingleValueColumnTransform, IBuiltInExtensionPoint { - protected final Log log = LogFactory.getLog(getClass()); + protected final Logger log = LoggerFactory.getLogger(getClass()); public static final String NAME = "lookup"; diff --git a/symmetric/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/writer/DatabaseWriter.java b/symmetric/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/writer/DatabaseWriter.java index 25a68025c6..1738da57f2 100644 --- a/symmetric/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/writer/DatabaseWriter.java +++ b/symmetric/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/writer/DatabaseWriter.java @@ -20,8 +20,8 @@ import org.jumpmind.db.sql.ISqlTransaction; import org.jumpmind.db.sql.SqlException; import org.jumpmind.db.sql.jdbc.JdbcSqlTemplate; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.jumpmind.symmetric.io.data.Batch; import org.jumpmind.symmetric.io.data.ConflictException; import org.jumpmind.symmetric.io.data.CsvData; @@ -36,7 +36,7 @@ public class DatabaseWriter implements IDataWriter { - protected Log log; + protected final static Logger log = LoggerFactory.getLogger(DatabaseWriter.class); protected IDatabasePlatform platform; @@ -76,29 +76,20 @@ public DatabaseWriter(IDatabasePlatform platform) { public DatabaseWriter(IDatabasePlatform platform, DatabaseWriterSettings defaultSettings, IDatabaseWriterFilter... filters) { - this(platform, null, defaultSettings, null, null, filters); + this(platform, null, defaultSettings, null, filters); } public DatabaseWriter(IDatabasePlatform platform, DatabaseWriterSettings defaultSettings, Map channelSpecificSettings, IDatabaseWriterFilter... filters) { - this(platform, null, defaultSettings, channelSpecificSettings, null, filters); + this(platform, null, defaultSettings, channelSpecificSettings, filters); } public DatabaseWriter(IDatabasePlatform platform, IDatabaseWriterConflictResolver conflictResolver, DatabaseWriterSettings defaultSettings, - Map channelSpecificSettings, - IDatabaseWriterFilter... filters) { - this(platform, conflictResolver, defaultSettings, channelSpecificSettings, null, filters); - } - - public DatabaseWriter(IDatabasePlatform platform, - IDatabaseWriterConflictResolver conflictResolver, - DatabaseWriterSettings defaultSettings, - Map channelSpecificSettings, Log log, + Map channelSpecificSettings, IDatabaseWriterFilter... filters) { - this.log = log == null ? LogFactory.getLog(getClass()) : log; this.platform = platform; this.conflictResolver = conflictResolver == null ? new DefaultDatabaseWriterConflictResolver() : conflictResolver; diff --git a/symmetric/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/writer/DefaultDatabaseWriterConflictResolver.java b/symmetric/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/writer/DefaultDatabaseWriterConflictResolver.java index 4be6c506d1..7e0e242530 100644 --- a/symmetric/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/writer/DefaultDatabaseWriterConflictResolver.java +++ b/symmetric/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/writer/DefaultDatabaseWriterConflictResolver.java @@ -1,14 +1,14 @@ package org.jumpmind.symmetric.io.data.writer; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.jumpmind.symmetric.io.data.ConflictException; import org.jumpmind.symmetric.io.data.CsvData; import org.jumpmind.symmetric.io.data.DataEventType; public class DefaultDatabaseWriterConflictResolver implements IDatabaseWriterConflictResolver { - protected Log log = LogFactory.getLog(getClass()); + protected Logger log = LoggerFactory.getLogger(getClass()); protected boolean autoRegister; diff --git a/symmetric/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/writer/TransformWriter.java b/symmetric/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/writer/TransformWriter.java index 5c1c8a6434..9a14c53299 100644 --- a/symmetric/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/writer/TransformWriter.java +++ b/symmetric/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/writer/TransformWriter.java @@ -8,8 +8,8 @@ import org.apache.commons.lang.ArrayUtils; import org.jumpmind.db.model.Table; import org.jumpmind.db.platform.IDatabasePlatform; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.jumpmind.symmetric.io.data.Batch; import org.jumpmind.symmetric.io.data.CsvData; import org.jumpmind.symmetric.io.data.DataContext; @@ -38,7 +38,7 @@ public class TransformWriter implements IDataWriter { - protected Log log = LogFactory.getLog(getClass()); + protected static final Logger log = LoggerFactory.getLogger(TransformWriter.class); protected IDataWriter targetWriter; protected TransformPoint transformPoint; @@ -142,8 +142,8 @@ public void write(CsvData data) { if (log.isDebugEnabled()) { log.debug( "%d transformation(s) started because of %s on %s. The original row data was: %s", - activeTransforms.size(), eventType.toString(), - this.sourceTable.getFullyQualifiedTableName(), sourceValues); + new Object[] { activeTransforms.size(), eventType.toString(), + this.sourceTable.getFullyQualifiedTableName(), sourceValues }); } List dataThatHasBeenTransformed = new ArrayList(); @@ -177,8 +177,8 @@ protected List transform(DataEventType eventType, if (log.isDebugEnabled()) { log.debug( "%d target data was created for the %s transformation. The target table is %s", - dataToTransform.size(), transformation.getTransformId(), - transformation.getFullyQualifiedTargetTableName()); + new Object[] { dataToTransform.size(), transformation.getTransformId(), + transformation.getFullyQualifiedTargetTableName() }); } int transformNumber = 0; for (TransformedData targetData : dataToTransform) { @@ -187,9 +187,10 @@ protected List transform(DataEventType eventType, if (log.isDebugEnabled()) { log.debug( "Data has been transformed to a %s for the #%d transform. The mapped target columns are: %s. The mapped target values are: %s", - targetData.getTargetDmlType().toString(), transformNumber, - ArrayUtils.toString(targetData.getColumnNames()), - ArrayUtils.toString(targetData.getColumnValues())); + new Object[] { targetData.getTargetDmlType().toString(), + transformNumber, + ArrayUtils.toString(targetData.getColumnNames()), + ArrayUtils.toString(targetData.getColumnValues()) }); } dataThatHasBeenTransformed.add(targetData); } else { diff --git a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/AbstractJdbcDatabasePlatform.java b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/AbstractJdbcDatabasePlatform.java index 4c12677e18..0d7ad67874 100644 --- a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/AbstractJdbcDatabasePlatform.java +++ b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/AbstractJdbcDatabasePlatform.java @@ -4,7 +4,6 @@ import org.jumpmind.db.sql.ISqlTemplate; import org.jumpmind.db.sql.jdbc.JdbcSqlTemplate; -import org.jumpmind.log.Log; abstract public class AbstractJdbcDatabasePlatform extends AbstractDatabasePlatform { @@ -14,8 +13,7 @@ abstract public class AbstractJdbcDatabasePlatform extends AbstractDatabasePlatf protected DatabasePlatformSettings settings; - public AbstractJdbcDatabasePlatform(DataSource dataSource, DatabasePlatformSettings settings, Log log) { - super(log); + public AbstractJdbcDatabasePlatform(DataSource dataSource, DatabasePlatformSettings settings) { this.dataSource = dataSource; this.settings = settings; createSqlTemplate(); diff --git a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/AbstractJdbcDdlReader.java b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/AbstractJdbcDdlReader.java index 6113988136..0059564453 100644 --- a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/AbstractJdbcDdlReader.java +++ b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/AbstractJdbcDdlReader.java @@ -50,8 +50,8 @@ import org.jumpmind.db.model.UniqueIndex; import org.jumpmind.db.sql.jdbc.IConnectionCallback; import org.jumpmind.db.sql.jdbc.JdbcSqlTemplate; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /* * An utility class to create a Database model from a live database. @@ -59,7 +59,7 @@ public abstract class AbstractJdbcDdlReader implements IDdlReader { /* The Log to which logging calls will be made. */ - protected Log log = LogFactory.getLog(getClass()); + protected Logger log = LoggerFactory.getLogger(getClass()); /* The descriptors for the relevant columns in the table meta data. */ private final List _columnsForTable; @@ -99,7 +99,7 @@ public abstract class AbstractJdbcDdlReader implements IDdlReader { /* The table types to recognize per default. */ private String[] _defaultTableTypes = { "TABLE" }; - public AbstractJdbcDdlReader(Log log, IDatabasePlatform platform) { + public AbstractJdbcDdlReader(IDatabasePlatform platform) { this.platform = platform; _defaultSizes.put(new Integer(Types.CHAR), "254"); diff --git a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/JdbcDatabasePlatformFactory.java b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/JdbcDatabasePlatformFactory.java index 560a1b6df6..eafd30a309 100644 --- a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/JdbcDatabasePlatformFactory.java +++ b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/JdbcDatabasePlatformFactory.java @@ -46,8 +46,6 @@ import org.jumpmind.db.platform.postgresql.PostgreSqlPlatform; import org.jumpmind.db.platform.sybase.SybasePlatform; import org.jumpmind.db.sql.SqlException; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; /* * A factory of {@link IDatabasePlatform} instances based on a case @@ -106,12 +104,7 @@ public class JdbcDatabasePlatformFactory { jdbcSubProtocolToPlatform.put(SybasePlatform.JDBC_SUBPROTOCOL, SybasePlatform.DATABASENAME); jdbcSubProtocolToPlatform.put(FirebirdPlatform.JDBC_SUBPROTOCOL, FirebirdPlatform.DATABASENAME); - } - - public static synchronized IDatabasePlatform createNewPlatformInstance(DataSource dataSource, DatabasePlatformSettings settings) - throws DdlException { - return createNewPlatformInstance(dataSource, settings, null); - } + } /* * Creates a new platform for the specified database. Note that this method installs @@ -123,13 +116,9 @@ public static synchronized IDatabasePlatform createNewPlatformInstance(DataSourc * @return The platform or null if the database is not * supported */ - public static synchronized IDatabasePlatform createNewPlatformInstance(DataSource dataSource, DatabasePlatformSettings settings, Log log) + public static synchronized IDatabasePlatform createNewPlatformInstance(DataSource dataSource, DatabasePlatformSettings settings) throws DdlException { - if (log == null) { - log = LogFactory.getLog("org.jumpmind"); - } - // connects to the database and uses actual metadata info to get db name // and version to determine platform String[] nameVersion = determineDatabaseNameVersionSubprotocol(dataSource); @@ -137,8 +126,8 @@ public static synchronized IDatabasePlatform createNewPlatformInstance(DataSourc Class clazz = findPlatformClass(nameVersion); try { - Constructor construtor = clazz.getConstructor(DataSource.class, DatabasePlatformSettings.class, Log.class); - return construtor.newInstance(dataSource, settings, log); + Constructor construtor = clazz.getConstructor(DataSource.class, DatabasePlatformSettings.class); + return construtor.newInstance(dataSource, settings); } catch (Exception e) { throw new DdlException("Could not create a platform of type " + nameVersion[0], e); } diff --git a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/db2/Db2Builder.java b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/db2/Db2Builder.java index d60b870635..9e7352249a 100644 --- a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/db2/Db2Builder.java +++ b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/db2/Db2Builder.java @@ -37,15 +37,14 @@ import org.jumpmind.db.platform.AbstractDdlBuilder; import org.jumpmind.db.platform.IDatabasePlatform; import org.jumpmind.db.platform.PlatformUtils; -import org.jumpmind.log.Log; /* * The DDL Builder for DB2. */ public class Db2Builder extends AbstractDdlBuilder { - public Db2Builder(Log log, IDatabasePlatform platform) { - super(log, platform); + public Db2Builder(IDatabasePlatform platform) { + super(platform); addEscapedCharSequence("'", "''"); } diff --git a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/db2/Db2DdlReader.java b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/db2/Db2DdlReader.java index ac227c92f3..b44e6fd8cf 100644 --- a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/db2/Db2DdlReader.java +++ b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/db2/Db2DdlReader.java @@ -40,7 +40,6 @@ import org.jumpmind.db.platform.DatabaseMetaDataWrapper; import org.jumpmind.db.platform.DdlException; import org.jumpmind.db.platform.IDatabasePlatform; -import org.jumpmind.log.Log; /* * Reads a database model from a Db2 UDB database. @@ -56,8 +55,8 @@ public class Db2DdlReader extends AbstractJdbcDdlReader { /* The regular expression pattern for the timestamp values that Db2 returns. */ private Pattern _db2TimestampPattern; - public Db2DdlReader(Log log, IDatabasePlatform platform) { - super(log, platform); + public Db2DdlReader(IDatabasePlatform platform) { + super(platform); setDefaultCatalogPattern(null); setDefaultSchemaPattern(null); diff --git a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/db2/Db2Platform.java b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/db2/Db2Platform.java index c64d955caa..2b4dd73385 100644 --- a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/db2/Db2Platform.java +++ b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/db2/Db2Platform.java @@ -26,7 +26,6 @@ import org.apache.commons.lang.StringUtils; import org.jumpmind.db.platform.AbstractJdbcDatabasePlatform; import org.jumpmind.db.platform.DatabasePlatformSettings; -import org.jumpmind.log.Log; /* * The DB2 platform implementation. @@ -45,8 +44,8 @@ public class Db2Platform extends AbstractJdbcDatabasePlatform { /* * Creates a new platform instance. */ - public Db2Platform(DataSource dataSource, DatabasePlatformSettings settings, Log log) { - super(dataSource, settings, log); + public Db2Platform(DataSource dataSource, DatabasePlatformSettings settings) { + super(dataSource, settings); // the BINARY types are also handled by Db2Builder.getSqlType(Column) info.addNativeTypeMapping(Types.ARRAY, "BLOB", Types.BLOB); @@ -80,8 +79,8 @@ public Db2Platform(DataSource dataSource, DatabasePlatformSettings settings, Log info.setCharColumnSpaceTrimmed(false); info.setEmptyStringNulled(false); - ddlReader = new Db2DdlReader(log, this); - ddlBuilder = new Db2Builder(log, this); + ddlReader = new Db2DdlReader(this); + ddlBuilder = new Db2Builder(this); } @Override diff --git a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/derby/DerbyBuilder.java b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/derby/DerbyBuilder.java index 903fba331e..8bbbec0fc9 100644 --- a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/derby/DerbyBuilder.java +++ b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/derby/DerbyBuilder.java @@ -33,15 +33,14 @@ import org.jumpmind.db.platform.AbstractDdlBuilder; import org.jumpmind.db.platform.IDatabasePlatform; import org.jumpmind.db.platform.PlatformUtils; -import org.jumpmind.log.Log; /* * The SQL Builder for Derby. */ public class DerbyBuilder extends AbstractDdlBuilder { - public DerbyBuilder(Log log, IDatabasePlatform platform) { - super(log, platform); + public DerbyBuilder(IDatabasePlatform platform) { + super(platform); addEscapedCharSequence("'", "''"); } diff --git a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/derby/DerbyDdlReader.java b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/derby/DerbyDdlReader.java index 2bdf87f18f..30738fcec2 100644 --- a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/derby/DerbyDdlReader.java +++ b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/derby/DerbyDdlReader.java @@ -31,15 +31,14 @@ import org.jumpmind.db.platform.AbstractJdbcDdlReader; import org.jumpmind.db.platform.DatabaseMetaDataWrapper; import org.jumpmind.db.platform.IDatabasePlatform; -import org.jumpmind.log.Log; /* * Reads a database model from a Derby database. */ public class DerbyDdlReader extends AbstractJdbcDdlReader { - public DerbyDdlReader(IDatabasePlatform platform, Log log) { - super(log, platform); + public DerbyDdlReader(IDatabasePlatform platform) { + super(platform); } @Override diff --git a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/derby/DerbyPlatform.java b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/derby/DerbyPlatform.java index 03b34e0661..4e16a5be31 100644 --- a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/derby/DerbyPlatform.java +++ b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/derby/DerbyPlatform.java @@ -27,7 +27,6 @@ import org.jumpmind.db.platform.AbstractJdbcDatabasePlatform; import org.jumpmind.db.platform.DatabaseNamesConstants; import org.jumpmind.db.platform.DatabasePlatformSettings; -import org.jumpmind.log.Log; /* * The platform implementation for Derby. @@ -49,8 +48,8 @@ public class DerbyPlatform extends AbstractJdbcDatabasePlatform { /* * Creates a new Derby platform instance. */ - public DerbyPlatform(DataSource dataSource, DatabasePlatformSettings settings, Log log) { - super(dataSource, settings, log); + public DerbyPlatform(DataSource dataSource, DatabasePlatformSettings settings) { + super(dataSource, settings); info.setMaxIdentifierLength(128); info.setSystemForeignKeyIndicesAlwaysNonUnique(true); @@ -83,8 +82,8 @@ public DerbyPlatform(DataSource dataSource, DatabasePlatformSettings settings, L info.setCharColumnSpaceTrimmed(false); info.setEmptyStringNulled(false); - ddlReader = new DerbyDdlReader(this, log); - ddlBuilder = new DerbyBuilder(log, this); + ddlReader = new DerbyDdlReader(this); + ddlBuilder = new DerbyBuilder(this); } @Override diff --git a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/firebird/FirebirdBuilder.java b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/firebird/FirebirdBuilder.java index adf714cae3..7812ceaa92 100644 --- a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/firebird/FirebirdBuilder.java +++ b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/firebird/FirebirdBuilder.java @@ -34,14 +34,13 @@ import org.jumpmind.db.platform.AbstractDdlBuilder; import org.jumpmind.db.platform.IDatabasePlatform; import org.jumpmind.db.platform.PlatformUtils; -import org.jumpmind.log.Log; /* * The SQL Builder for the FireBird database. */ public class FirebirdBuilder extends AbstractDdlBuilder { - public FirebirdBuilder(Log log, IDatabasePlatform platform) { - super(log, platform); + public FirebirdBuilder(IDatabasePlatform platform) { + super(platform); addEscapedCharSequence("'", "''"); } diff --git a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/firebird/FirebirdDdlReader.java b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/firebird/FirebirdDdlReader.java index 132c3b55f0..5224283b43 100644 --- a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/firebird/FirebirdDdlReader.java +++ b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/firebird/FirebirdDdlReader.java @@ -41,15 +41,14 @@ import org.jumpmind.db.platform.DatabaseMetaDataWrapper; import org.jumpmind.db.platform.IDatabasePlatform; import org.jumpmind.db.platform.IDdlBuilder; -import org.jumpmind.log.Log; /* * The Jdbc Model Reader for Firebird. */ public class FirebirdDdlReader extends AbstractJdbcDdlReader { - public FirebirdDdlReader(Log log, IDatabasePlatform platform) { - super(log, platform); + public FirebirdDdlReader(IDatabasePlatform platform) { + super(platform); setDefaultCatalogPattern(null); setDefaultSchemaPattern(null); setDefaultTablePattern("%"); diff --git a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/firebird/FirebirdPlatform.java b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/firebird/FirebirdPlatform.java index 0436d4bdcc..821ddc17ad 100644 --- a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/firebird/FirebirdPlatform.java +++ b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/firebird/FirebirdPlatform.java @@ -26,7 +26,6 @@ import org.jumpmind.db.platform.AbstractJdbcDatabasePlatform; import org.jumpmind.db.platform.DatabasePlatformInfo; import org.jumpmind.db.platform.DatabasePlatformSettings; -import org.jumpmind.log.Log; /* * The platform implementation for the Firebird database. @@ -45,8 +44,8 @@ public class FirebirdPlatform extends AbstractJdbcDatabasePlatform { /* * Creates a new Firebird platform instance. */ - public FirebirdPlatform(DataSource dataSource, DatabasePlatformSettings settings, Log log) { - super(dataSource, settings, log); + public FirebirdPlatform(DataSource dataSource, DatabasePlatformSettings settings) { + super(dataSource, settings); DatabasePlatformInfo info = getPlatformInfo(); @@ -87,8 +86,8 @@ public FirebirdPlatform(DataSource dataSource, DatabasePlatformSettings settings info.setCharColumnSpaceTrimmed(false); info.setEmptyStringNulled(false); - ddlReader = new FirebirdDdlReader(log, this); - ddlBuilder = new FirebirdBuilder(log, this); + ddlReader = new FirebirdDdlReader(this); + ddlBuilder = new FirebirdBuilder(this); } @Override diff --git a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/greenplum/GreenplumDdlReader.java b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/greenplum/GreenplumDdlReader.java index 26d3092bd6..f6ac2ca613 100644 --- a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/greenplum/GreenplumDdlReader.java +++ b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/greenplum/GreenplumDdlReader.java @@ -11,12 +11,11 @@ import org.jumpmind.db.platform.DatabaseMetaDataWrapper; import org.jumpmind.db.platform.IDatabasePlatform; import org.jumpmind.db.platform.postgresql.PostgreSqlDdlReader; -import org.jumpmind.log.Log; public class GreenplumDdlReader extends PostgreSqlDdlReader { - public GreenplumDdlReader(Log log, IDatabasePlatform platform) { - super(log, platform); + public GreenplumDdlReader(IDatabasePlatform platform) { + super(platform); } protected void setDistributionKeys(Connection connection, Table table, String schema) diff --git a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/greenplum/GreenplumPlatform.java b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/greenplum/GreenplumPlatform.java index 15c9a01a95..e5f13d271f 100644 --- a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/greenplum/GreenplumPlatform.java +++ b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/greenplum/GreenplumPlatform.java @@ -4,7 +4,6 @@ import org.jumpmind.db.platform.DatabasePlatformSettings; import org.jumpmind.db.platform.postgresql.PostgreSqlPlatform; -import org.jumpmind.log.Log; public class GreenplumPlatform extends PostgreSqlPlatform { @@ -16,10 +15,10 @@ public class GreenplumPlatform extends PostgreSqlPlatform { public static final String SQL_GET_GREENPLUM_NAME = "select gpname from gp_id"; public static final String SQL_GET_GREENPLUM_VERSION = "select productversion from gp_version_at_initdb"; - public GreenplumPlatform(DataSource dataSource, DatabasePlatformSettings settings, Log log) { - super(dataSource, settings, log); + public GreenplumPlatform(DataSource dataSource, DatabasePlatformSettings settings) { + super(dataSource, settings); info.setTriggersSupported(false); - this.ddlReader = new GreenplumDdlReader(log, this); + this.ddlReader = new GreenplumDdlReader(this); } } diff --git a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/h2/H2Builder.java b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/h2/H2Builder.java index 2cc58bb0cc..0957b03e13 100644 --- a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/h2/H2Builder.java +++ b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/h2/H2Builder.java @@ -37,15 +37,14 @@ import org.jumpmind.db.model.TypeMap; import org.jumpmind.db.platform.AbstractDdlBuilder; import org.jumpmind.db.platform.IDatabasePlatform; -import org.jumpmind.log.Log; /* * The SQL Builder for the H2 database. */ public class H2Builder extends AbstractDdlBuilder { - public H2Builder(Log log, IDatabasePlatform platform) { - super(log, platform); + public H2Builder(IDatabasePlatform platform) { + super(platform); addEscapedCharSequence("'", "''"); } diff --git a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/h2/H2DdlReader.java b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/h2/H2DdlReader.java index 96d8a13441..af1f876e10 100644 --- a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/h2/H2DdlReader.java +++ b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/h2/H2DdlReader.java @@ -33,7 +33,6 @@ import org.jumpmind.db.platform.DatabaseMetaDataWrapper; import org.jumpmind.db.platform.IDatabasePlatform; import org.jumpmind.db.platform.MetaDataColumnDescriptor; -import org.jumpmind.log.Log; /* * Reads a database model from a H2 database. From patch sqlScriptReplacementTokens; - public InformixPlatform(DataSource dataSource, DatabasePlatformSettings settings, Log log) { - super(dataSource, settings, log); + public InformixPlatform(DataSource dataSource, DatabasePlatformSettings settings) { + super(dataSource, settings); info.addNativeTypeMapping(Types.VARCHAR, "VARCHAR", Types.VARCHAR); info.addNativeTypeMapping(Types.LONGVARCHAR, "LVARCHAR", Types.LONGVARCHAR); @@ -55,8 +54,8 @@ public InformixPlatform(DataSource dataSource, DatabasePlatformSettings settings info.setIdentifierQuoteString("\""); } - ddlReader = new InformixDdlReader(log, this); - ddlBuilder = new InformixBuilder(log, this); + ddlReader = new InformixDdlReader(this); + ddlBuilder = new InformixBuilder(this); sqlScriptReplacementTokens = new HashMap(); sqlScriptReplacementTokens.put("current_timestamp", "current"); diff --git a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/interbase/InterbaseBuilder.java b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/interbase/InterbaseBuilder.java index d126330803..0e82e42bc2 100644 --- a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/interbase/InterbaseBuilder.java +++ b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/interbase/InterbaseBuilder.java @@ -34,15 +34,14 @@ import org.jumpmind.db.platform.AbstractDdlBuilder; import org.jumpmind.db.platform.IDatabasePlatform; import org.jumpmind.db.platform.PlatformUtils; -import org.jumpmind.log.Log; /* * The SQL Builder for the Interbase database. */ public class InterbaseBuilder extends AbstractDdlBuilder { - public InterbaseBuilder(Log log, IDatabasePlatform platform) { - super(log, platform); + public InterbaseBuilder(IDatabasePlatform platform) { + super(platform); addEscapedCharSequence("'", "''"); } diff --git a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/interbase/InterbaseDdlReader.java b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/interbase/InterbaseDdlReader.java index c6540c6d1e..8e3719701a 100644 --- a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/interbase/InterbaseDdlReader.java +++ b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/interbase/InterbaseDdlReader.java @@ -40,15 +40,14 @@ import org.jumpmind.db.platform.AbstractJdbcDdlReader; import org.jumpmind.db.platform.DatabaseMetaDataWrapper; import org.jumpmind.db.platform.IDatabasePlatform; -import org.jumpmind.log.Log; /* * The Jdbc Model Reader for Interbase. */ public class InterbaseDdlReader extends AbstractJdbcDdlReader { - public InterbaseDdlReader(Log log, IDatabasePlatform platform) { - super(log, platform); + public InterbaseDdlReader(IDatabasePlatform platform) { + super(platform); setDefaultCatalogPattern(null); setDefaultSchemaPattern(null); setDefaultTablePattern("%"); diff --git a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/interbase/InterbasePlatform.java b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/interbase/InterbasePlatform.java index f718193d45..aca0971a1f 100644 --- a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/interbase/InterbasePlatform.java +++ b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/interbase/InterbasePlatform.java @@ -25,7 +25,6 @@ import org.jumpmind.db.platform.AbstractJdbcDatabasePlatform; import org.jumpmind.db.platform.DatabasePlatformSettings; -import org.jumpmind.log.Log; /* * The platform implementation for the Interbase database. @@ -46,8 +45,8 @@ public class InterbasePlatform extends AbstractJdbcDatabasePlatform { /* * Creates a new platform instance. */ - public InterbasePlatform(DataSource dataSource, DatabasePlatformSettings settings, Log log) { - super(dataSource, settings, log); + public InterbasePlatform(DataSource dataSource, DatabasePlatformSettings settings) { + super(dataSource, settings); info.setMaxIdentifierLength(31); info.setCommentPrefix("/*"); @@ -94,8 +93,8 @@ public InterbasePlatform(DataSource dataSource, DatabasePlatformSettings setting info.setCharColumnSpaceTrimmed(false); info.setEmptyStringNulled(false); - ddlReader = new InterbaseDdlReader(log, this); - ddlBuilder = new InterbaseBuilder(log, this); + ddlReader = new InterbaseDdlReader(this); + ddlBuilder = new InterbaseBuilder(this); } @Override diff --git a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mssql/MsSqlBuilder.java b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mssql/MsSqlBuilder.java index 6e9bbe834d..e5da929203 100644 --- a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mssql/MsSqlBuilder.java +++ b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mssql/MsSqlBuilder.java @@ -51,7 +51,6 @@ import org.jumpmind.db.platform.AbstractDdlBuilder; import org.jumpmind.db.platform.IDatabasePlatform; import org.jumpmind.db.platform.PlatformUtils; -import org.jumpmind.log.Log; /* * The SQL Builder for the Microsoft SQL Server. @@ -64,8 +63,8 @@ public class MsSqlBuilder extends AbstractDdlBuilder { /* We use a generic date format. */ private DateFormat _genericTimeFormat = new SimpleDateFormat("HH:mm:ss"); - public MsSqlBuilder(Log log, IDatabasePlatform platform) { - super(log, platform); + public MsSqlBuilder(IDatabasePlatform platform) { + super(platform); addEscapedCharSequence("'", "''"); } diff --git a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mssql/MsSqlDdlReader.java b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mssql/MsSqlDdlReader.java index 6b2b662466..1b9f47d311 100644 --- a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mssql/MsSqlDdlReader.java +++ b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mssql/MsSqlDdlReader.java @@ -42,7 +42,6 @@ import org.jumpmind.db.platform.DatabaseMetaDataWrapper; import org.jumpmind.db.platform.DdlException; import org.jumpmind.db.platform.IDatabasePlatform; -import org.jumpmind.log.Log; /* * Reads a database model from a Microsoft Sql Server database. @@ -58,8 +57,8 @@ public class MsSqlDdlReader extends AbstractJdbcDdlReader { /* The regular expression pattern for the ISO times. */ private Pattern _isoTimePattern; - public MsSqlDdlReader(Log log, IDatabasePlatform platform) { - super(log, platform); + public MsSqlDdlReader(IDatabasePlatform platform) { + super(platform); setDefaultCatalogPattern(null); setDefaultSchemaPattern(null); setDefaultTablePattern("%"); diff --git a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mssql/MsSqlPlatform.java b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mssql/MsSqlPlatform.java index b636b3307d..27c186dd2a 100644 --- a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mssql/MsSqlPlatform.java +++ b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mssql/MsSqlPlatform.java @@ -27,7 +27,6 @@ import org.jumpmind.db.platform.AbstractJdbcDatabasePlatform; import org.jumpmind.db.platform.DatabaseNamesConstants; import org.jumpmind.db.platform.DatabasePlatformSettings; -import org.jumpmind.log.Log; /* * The platform implementation for the Microsoft SQL Server database. @@ -46,8 +45,8 @@ public class MsSqlPlatform extends AbstractJdbcDatabasePlatform { /* * Creates a new platform instance. */ - public MsSqlPlatform(DataSource dataSource, DatabasePlatformSettings settings, Log log) { - super(dataSource, settings, log); + public MsSqlPlatform(DataSource dataSource, DatabasePlatformSettings settings) { + super(dataSource, settings); info.setMaxIdentifierLength(128); @@ -86,8 +85,8 @@ public MsSqlPlatform(DataSource dataSource, DatabasePlatformSettings settings, L info.setEmptyStringNulled(false); info.setAutoIncrementUpdateAllowed(false); - ddlReader = new MsSqlDdlReader(log, this); - ddlBuilder = new MsSqlBuilder(log, this); + ddlReader = new MsSqlDdlReader(this); + ddlBuilder = new MsSqlBuilder(this); setDelimitedIdentifierModeOn(true); } diff --git a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mysql/MySqlBuilder.java b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mysql/MySqlBuilder.java index 811aa6f0b3..50fddec424 100644 --- a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mysql/MySqlBuilder.java +++ b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mysql/MySqlBuilder.java @@ -37,15 +37,14 @@ import org.jumpmind.db.model.Table; import org.jumpmind.db.platform.AbstractDdlBuilder; import org.jumpmind.db.platform.IDatabasePlatform; -import org.jumpmind.log.Log; /* * The SQL Builder for MySQL. */ public class MySqlBuilder extends AbstractDdlBuilder { - public MySqlBuilder(Log log, IDatabasePlatform platform) { - super(log, platform); + public MySqlBuilder(IDatabasePlatform platform) { + super(platform); // we need to handle the backslash first otherwise the other // already escaped sequences would be affected diff --git a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mysql/MySqlDdlReader.java b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mysql/MySqlDdlReader.java index a6258bf748..9904ebf6a2 100644 --- a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mysql/MySqlDdlReader.java +++ b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mysql/MySqlDdlReader.java @@ -31,15 +31,14 @@ import org.jumpmind.db.platform.AbstractJdbcDdlReader; import org.jumpmind.db.platform.DatabaseMetaDataWrapper; import org.jumpmind.db.platform.IDatabasePlatform; -import org.jumpmind.log.Log; /* * Reads a database model from a MySql database. */ public class MySqlDdlReader extends AbstractJdbcDdlReader { - public MySqlDdlReader(Log log, IDatabasePlatform platform) { - super(log, platform); + public MySqlDdlReader(IDatabasePlatform platform) { + super(platform); setDefaultCatalogPattern(null); setDefaultSchemaPattern(null); setDefaultTablePattern(null); diff --git a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mysql/MySqlPlatform.java b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mysql/MySqlPlatform.java index 1a85f459ac..e44448f157 100644 --- a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mysql/MySqlPlatform.java +++ b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mysql/MySqlPlatform.java @@ -26,7 +26,6 @@ import org.apache.commons.lang.StringUtils; import org.jumpmind.db.platform.AbstractJdbcDatabasePlatform; import org.jumpmind.db.platform.DatabasePlatformSettings; -import org.jumpmind.log.Log; /* * The platform implementation for MySQL. @@ -48,8 +47,8 @@ public class MySqlPlatform extends AbstractJdbcDatabasePlatform { /* * Creates a new platform instance. */ - public MySqlPlatform(DataSource dataSource, DatabasePlatformSettings settings, Log log) { - super(dataSource, overrideSettings(settings), log); + public MySqlPlatform(DataSource dataSource, DatabasePlatformSettings settings) { + super(dataSource, overrideSettings(settings)); info.setMaxIdentifierLength(64); info.setNullAsDefaultValueRequired(true); @@ -107,8 +106,8 @@ public MySqlPlatform(DataSource dataSource, DatabasePlatformSettings settings, L // which is different from the MySql 4 behaviour info.setSyntheticDefaultValueForRequiredReturned(false); - ddlReader = new MySqlDdlReader(log, this); - ddlBuilder = new MySqlBuilder(log, this); + ddlReader = new MySqlDdlReader(this); + ddlBuilder = new MySqlBuilder(this); } @Override diff --git a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/oracle/OracleBuilder.java b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/oracle/OracleBuilder.java index dc95570228..4370051811 100644 --- a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/oracle/OracleBuilder.java +++ b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/oracle/OracleBuilder.java @@ -43,7 +43,6 @@ import org.jumpmind.db.platform.DdlException; import org.jumpmind.db.platform.IDatabasePlatform; import org.jumpmind.db.platform.PlatformUtils; -import org.jumpmind.log.Log; /* * The SQL Builder for Oracle. @@ -62,8 +61,8 @@ public class OracleBuilder extends AbstractDdlBuilder { */ private Pattern isoTimestampPattern; - public OracleBuilder(Log log, IDatabasePlatform platform) { - super(log, platform); + public OracleBuilder(IDatabasePlatform platform) { + super(platform); addEscapedCharSequence("'", "''"); diff --git a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/oracle/OracleDdlReader.java b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/oracle/OracleDdlReader.java index f5c8b88185..dfedf50ad9 100644 --- a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/oracle/OracleDdlReader.java +++ b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/oracle/OracleDdlReader.java @@ -48,7 +48,6 @@ import org.jumpmind.db.platform.DdlException; import org.jumpmind.db.platform.IDatabasePlatform; import org.jumpmind.db.platform.IDdlBuilder; -import org.jumpmind.log.Log; /* * Reads a database model from an Oracle 8 database. @@ -67,8 +66,8 @@ public class OracleDdlReader extends AbstractJdbcDdlReader { */ private Pattern oracleIsoTimestampPattern; - public OracleDdlReader(Log log, IDatabasePlatform platform) { - super(log, platform); + public OracleDdlReader(IDatabasePlatform platform) { + super(platform); setDefaultCatalogPattern(null); setDefaultSchemaPattern(null); setDefaultTablePattern("%"); diff --git a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/oracle/OraclePlatform.java b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/oracle/OraclePlatform.java index 227906b1d9..81050f31f3 100644 --- a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/oracle/OraclePlatform.java +++ b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/oracle/OraclePlatform.java @@ -26,7 +26,6 @@ import org.apache.commons.lang.StringUtils; import org.jumpmind.db.platform.AbstractJdbcDatabasePlatform; import org.jumpmind.db.platform.DatabasePlatformSettings; -import org.jumpmind.log.Log; import org.springframework.jdbc.support.lob.OracleLobHandler; /* @@ -55,8 +54,8 @@ public class OraclePlatform extends AbstractJdbcDatabasePlatform { /* * Creates a new platform instance. */ - public OraclePlatform(DataSource dataSource, DatabasePlatformSettings settings, Log log) { - super(dataSource, settings, log); + public OraclePlatform(DataSource dataSource, DatabasePlatformSettings settings) { + super(dataSource, settings); info.setMaxIdentifierLength(30); info.setIdentityStatusReadingSupported(false); @@ -103,8 +102,8 @@ public OraclePlatform(DataSource dataSource, DatabasePlatformSettings settings, info.setCharColumnSpaceTrimmed(false); info.setEmptyStringNulled(true); - ddlReader = new OracleDdlReader(log, this); - ddlBuilder = new OracleBuilder(log, this); + ddlReader = new OracleDdlReader(this); + ddlBuilder = new OracleBuilder(this); } diff --git a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/postgresql/PostgreSqlBuilder.java b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/postgresql/PostgreSqlBuilder.java index af8b64d7a7..c0a60d0a0b 100644 --- a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/postgresql/PostgreSqlBuilder.java +++ b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/postgresql/PostgreSqlBuilder.java @@ -31,15 +31,14 @@ import org.jumpmind.db.model.Table; import org.jumpmind.db.platform.AbstractDdlBuilder; import org.jumpmind.db.platform.IDatabasePlatform; -import org.jumpmind.log.Log; /* * The SQL Builder for PostgresSql. */ public class PostgreSqlBuilder extends AbstractDdlBuilder { - public PostgreSqlBuilder(Log log, IDatabasePlatform platform) { - super(log, platform); + public PostgreSqlBuilder(IDatabasePlatform platform) { + super(platform); // we need to handle the backslash first otherwise the other // already escaped sequences would be affected diff --git a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/postgresql/PostgreSqlDdlReader.java b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/postgresql/PostgreSqlDdlReader.java index e9addb3f2e..1acb523ace 100644 --- a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/postgresql/PostgreSqlDdlReader.java +++ b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/postgresql/PostgreSqlDdlReader.java @@ -33,15 +33,14 @@ import org.jumpmind.db.platform.AbstractJdbcDdlReader; import org.jumpmind.db.platform.DatabaseMetaDataWrapper; import org.jumpmind.db.platform.IDatabasePlatform; -import org.jumpmind.log.Log; /* * Reads a database model from a PostgreSql database. */ public class PostgreSqlDdlReader extends AbstractJdbcDdlReader { - public PostgreSqlDdlReader(Log log, IDatabasePlatform platform) { - super(log, platform); + public PostgreSqlDdlReader(IDatabasePlatform platform) { + super(platform); setDefaultCatalogPattern(null); setDefaultSchemaPattern(null); setDefaultTablePattern(null); diff --git a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/postgresql/PostgreSqlPlatform.java b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/postgresql/PostgreSqlPlatform.java index 0e3eba33dd..ff91ec1f54 100644 --- a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/postgresql/PostgreSqlPlatform.java +++ b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/postgresql/PostgreSqlPlatform.java @@ -35,7 +35,6 @@ import org.jumpmind.db.sql.DmlStatement; import org.jumpmind.db.sql.DmlStatement.DmlType; import org.jumpmind.db.util.BinaryEncoding; -import org.jumpmind.log.Log; /* * The platform implementation for PostgresSql. @@ -51,8 +50,8 @@ public class PostgreSqlPlatform extends AbstractJdbcDatabasePlatform { /* * Creates a new platform instance. */ - public PostgreSqlPlatform(DataSource dataSource, DatabasePlatformSettings settings, Log log) { - super(dataSource, overrideSettings(settings), log); + public PostgreSqlPlatform(DataSource dataSource, DatabasePlatformSettings settings) { + super(dataSource, overrideSettings(settings)); // this is the default length though it might be changed when building // PostgreSQL @@ -95,8 +94,8 @@ public PostgreSqlPlatform(DataSource dataSource, DatabasePlatformSettings settin info.setCharColumnSpaceTrimmed(false); info.setEmptyStringNulled(false); - ddlReader = new PostgreSqlDdlReader(log, this); - ddlBuilder = new PostgreSqlBuilder(log, this); + ddlReader = new PostgreSqlDdlReader(this); + ddlBuilder = new PostgreSqlBuilder(this); } protected static DatabasePlatformSettings overrideSettings(DatabasePlatformSettings settings) { diff --git a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/sybase/SybaseBuilder.java b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/sybase/SybaseBuilder.java index 703ead6aa4..885f221e92 100644 --- a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/sybase/SybaseBuilder.java +++ b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/sybase/SybaseBuilder.java @@ -44,15 +44,14 @@ import org.jumpmind.db.platform.AbstractDdlBuilder; import org.jumpmind.db.platform.IDatabasePlatform; import org.jumpmind.db.platform.PlatformUtils; -import org.jumpmind.log.Log; /* * The SQL Builder for Sybase. */ public class SybaseBuilder extends AbstractDdlBuilder { - public SybaseBuilder(Log log, IDatabasePlatform platform) { - super(log, platform); + public SybaseBuilder(IDatabasePlatform platform) { + super(platform); addEscapedCharSequence("'", "''"); } diff --git a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/sybase/SybaseDdlReader.java b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/sybase/SybaseDdlReader.java index f524abe86a..f0a25c82e4 100644 --- a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/sybase/SybaseDdlReader.java +++ b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/sybase/SybaseDdlReader.java @@ -48,7 +48,6 @@ import org.jumpmind.db.platform.DatabaseMetaDataWrapper; import org.jumpmind.db.platform.DdlException; import org.jumpmind.db.platform.IDatabasePlatform; -import org.jumpmind.log.Log; /* * Reads a database model from a Sybase database. @@ -60,8 +59,8 @@ public class SybaseDdlReader extends AbstractJdbcDdlReader { /* The regular expression pattern for the ISO times. */ private Pattern _isoTimePattern; - public SybaseDdlReader(Log log, IDatabasePlatform platform) { - super(log, platform); + public SybaseDdlReader(IDatabasePlatform platform) { + super(platform); setDefaultCatalogPattern(null); setDefaultSchemaPattern(null); setDefaultTablePattern("%"); diff --git a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/sybase/SybasePlatform.java b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/sybase/SybasePlatform.java index f4ecbba370..94712bca4b 100644 --- a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/sybase/SybasePlatform.java +++ b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/sybase/SybasePlatform.java @@ -28,7 +28,6 @@ import org.apache.commons.lang.StringUtils; import org.jumpmind.db.platform.AbstractJdbcDatabasePlatform; import org.jumpmind.db.platform.DatabasePlatformSettings; -import org.jumpmind.log.Log; /* * The platform implementation for Sybase. @@ -52,8 +51,8 @@ public class SybasePlatform extends AbstractJdbcDatabasePlatform { private Map sqlScriptReplacementTokens; - public SybasePlatform(DataSource dataSource, DatabasePlatformSettings settings, Log log) { - super(dataSource, settings, log); + public SybasePlatform(DataSource dataSource, DatabasePlatformSettings settings) { + super(dataSource, settings); info.setMaxIdentifierLength(128); info.setNullAsDefaultValueRequired(true); @@ -100,8 +99,8 @@ public SybasePlatform(DataSource dataSource, DatabasePlatformSettings settings, info.setEmptyStringNulled(false); info.setAutoIncrementUpdateAllowed(false); - ddlReader = new SybaseDdlReader(log, this); - ddlBuilder = new SybaseBuilder(log, this); + ddlReader = new SybaseDdlReader(this); + ddlBuilder = new SybaseBuilder(this); sqlScriptReplacementTokens = new HashMap(); sqlScriptReplacementTokens.put("current_timestamp", "getdate()"); diff --git a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/sql/SqlScriptUnitTest.java b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/sql/SqlScriptUnitTest.java index 13edc537ff..10c6b9192d 100644 --- a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/sql/SqlScriptUnitTest.java +++ b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/sql/SqlScriptUnitTest.java @@ -27,7 +27,6 @@ import org.jumpmind.db.platform.DatabasePlatformSettings; import org.jumpmind.db.platform.IDatabasePlatform; import org.jumpmind.db.platform.JdbcDatabasePlatformFactory; -import org.jumpmind.db.sql.SqlScript; import org.junit.Test; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.datasource.SingleConnectionDataSource; diff --git a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/sql/jdbc/JdbcSqlTemplate.java b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/sql/jdbc/JdbcSqlTemplate.java index 351c67eba9..cf179dcd59 100644 --- a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/sql/jdbc/JdbcSqlTemplate.java +++ b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/sql/jdbc/JdbcSqlTemplate.java @@ -26,16 +26,15 @@ import org.jumpmind.db.sql.Row; import org.jumpmind.db.sql.SqlException; import org.jumpmind.db.sql.UniqueKeyException; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; -import org.jumpmind.log.LogLevel; import org.jumpmind.util.LinkedCaseInsensitiveMap; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.jdbc.support.lob.DefaultLobHandler; import org.springframework.jdbc.support.lob.LobHandler; public class JdbcSqlTemplate extends AbstractSqlTemplate implements ISqlTemplate { - static final Log log = LogFactory.getLog(JdbcSqlTemplate.class); + static final Logger log = LoggerFactory.getLogger(JdbcSqlTemplate.class); protected DataSource dataSource; @@ -264,12 +263,13 @@ public Integer execute(Connection con) throws SQLException { } } catch (SQLException ex) { if (!failOnError) { - LogLevel level = LogLevel.WARN; if (statement.toLowerCase().startsWith("drop")) { - level = LogLevel.DEBUG; + log.debug("%s. Failed to execute: %s.", ex.getMessage(), + statement); + } else { + log.warn("%s. Failed to execute: %s.", ex.getMessage(), + statement); } - log.log(level, "%s. Failed to execute: %s.", ex.getMessage(), - statement); } else { throw translate(statement, ex); } diff --git a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/sql/jdbc/JdbcSqlTransaction.java b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/sql/jdbc/JdbcSqlTransaction.java index 083ebaa630..4b32f5f35a 100644 --- a/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/sql/jdbc/JdbcSqlTransaction.java +++ b/symmetric/symmetric-jdbc/src/main/java/org/jumpmind/db/sql/jdbc/JdbcSqlTransaction.java @@ -13,15 +13,15 @@ import org.apache.commons.lang.ArrayUtils; import org.jumpmind.db.model.Table; import org.jumpmind.db.sql.ISqlTransaction; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * TODO Support Oracle's non-standard way of batching */ public class JdbcSqlTransaction implements ISqlTransaction { - protected final static Log log = LogFactory.getLog(JdbcSqlTransaction.class); + protected final static Logger log = LoggerFactory.getLogger(JdbcSqlTransaction.class); protected boolean inBatchMode = false; diff --git a/symmetric/symmetric-jdbc/src/test/java/org/jumpmind/db/AbstractDbTest.java b/symmetric/symmetric-jdbc/src/test/java/org/jumpmind/db/AbstractDbTest.java index b6ecafa0d7..aa4f05fc4d 100644 --- a/symmetric/symmetric-jdbc/src/test/java/org/jumpmind/db/AbstractDbTest.java +++ b/symmetric/symmetric-jdbc/src/test/java/org/jumpmind/db/AbstractDbTest.java @@ -1,17 +1,8 @@ package org.jumpmind.db; -import org.jumpmind.log.Log4jLog; -import org.jumpmind.log.LogFactory; -import org.junit.BeforeClass; abstract public class AbstractDbTest { - @BeforeClass - public static void setupLogger() { - LogFactory.setLogClass(Log4jLog.class); - } - - } diff --git a/symmetric/symmetric-parent/pom.xml b/symmetric/symmetric-parent/pom.xml index 385027e544..1dfb78f562 100644 --- a/symmetric/symmetric-parent/pom.xml +++ b/symmetric/symmetric-parent/pom.xml @@ -1,636 +1,641 @@ - - 4.0.0 - org.jumpmind.symmetric - symmetric-parent - pom - 3.0.0-SNAPSHOT - parent - http://symmetricds.org - 2007 + + 4.0.0 + org.jumpmind.symmetric + symmetric-parent + pom + 3.0.0-SNAPSHOT + parent + http://symmetricds.org + 2007 - + SymmetricDS is an open source database synchronization solution. It is platform-independent, web-enabled, and database-agnostic. SymmetricDS was first built to replicate changes between 'retail store' databases and ad centralized 'corporate' database. - - JumpMind, Inc. - http://www.jumpmind.com/ - + + JumpMind, Inc. + http://www.jumpmind.com/ + - - 3.0.7.RELEASE - 7.1.6.v20100715 - 10.5.3.0_1 - 2.2.4 - 1.2.140 - 8.4-701.jdbc4 - 5.1.17 - + + 3.0.7.RELEASE + 7.1.6.v20100715 + 10.5.3.0_1 + 2.2.4 + 1.2.140 + 8.4-701.jdbc4 + 5.1.17 + - - scm:svn:https://symmetricds.svn.sourceforge.net/svnroot/symmetricds/trunk/symmetric - scm:svn:https://symmetricds.svn.sourceforge.net/svnroot/symmetricds/trunk/symmetric - https://symmetricds.svn.sourceforge.net/svnroot/symmetricds/trunk/symmetric - + + scm:svn:https://symmetricds.svn.sourceforge.net/svnroot/symmetricds/trunk/symmetric + scm:svn:https://symmetricds.svn.sourceforge.net/svnroot/symmetricds/trunk/symmetric + https://symmetricds.svn.sourceforge.net/svnroot/symmetricds/trunk/symmetric + - - - - dav.codehaus.org - SymmetricDS Repo - dav:https://dav.codehaus.org/repository/symmetricds/ + + + + dav.codehaus.org + SymmetricDS Repo + dav:https://dav.codehaus.org/repository/symmetricds/ - - - - dav.codehaus.org - SymmetricDS Repo - dav:https://dav.codehaus.org/snapshots.repository/symmetricds/ + + + + dav.codehaus.org + SymmetricDS Repo + dav:https://dav.codehaus.org/snapshots.repository/symmetricds/ - false - - - dav.codehaus.org - dav:https://dav.codehaus.org/symmetricds/ - - + false + + + dav.codehaus.org + dav:https://dav.codehaus.org/symmetricds/ + + - - - java.net - http://download.java.net/maven/glassfish - - - snapshot - http://snapshots.repository.codehaus.org - - + + + java.net + http://download.java.net/maven/glassfish + + + snapshot + http://snapshots.repository.codehaus.org + + - - JIRA - http://jira.codehaus.org/BrowseProject.jspa?id=11906 - + + JIRA + http://jira.codehaus.org/BrowseProject.jspa?id=11906 + - - - SymmetricDS Development Forum - http://sourceforge.net/projects/symmetricds/forums/forum/739237 + + + SymmetricDS Development Forum + http://sourceforge.net/projects/symmetricds/forums/forum/739237 - - - SymmetricDS Help Forum - http://sourceforge.net/projects/symmetricds/forums/forum/739236 + + + SymmetricDS Help Forum + http://sourceforge.net/projects/symmetricds/forums/forum/739236 - - - SymmetricDS Open Discussion Forum - http://sourceforge.net/projects/symmetricds/forums/forum/739235 + + + SymmetricDS Open Discussion Forum + http://sourceforge.net/projects/symmetricds/forums/forum/739235 - - + + - - - chenson42 - Chris Henson - chenson42@users.sourceforge.net - + + + chenson42 + Chris Henson + chenson42@users.sourceforge.net + - JumpMind, Inc. - http://jumpmind.com/ - - developer - architect - - -5 - - - erilong - Eric Long - erilong@users.sourceforge.net - http://alstongrove.com/ - JumpMind, Inc. - http://jumpmind.com/ - - developer - architect - - -5 - - - eegeek - Mark Hanes - eegeek@users.sourceforge.net - JumpMind, Inc. - http://jumpmind.com/ - - developer - - -5 - - - eweimer - Eric Weimer - eweimer@users.sourceforge.net - - developer - - -5 - - - knaas - Keith Naas - knaas@users.sourceforge.net - - developer - - -5 - http://www.linkedin.com/in/keithnaas - 30xi - http://30xi.com - - - mmahawar - Manisha Mahawar - mmahawar@users.sourceforge.net - - developer - - -5 - - - - - Andrew Wilcox - andrewbwilcox@users.sourceforge.net - - developer - - -5 - - - Megha Shetty - megha_s@users.sourceforge.net - Big Lots - http://www.biglots.com/ - - developer - - -5 - - - Jon Krajewski - jkrajewski@users.sourceforge.net - - designer - - -5 - - - Dave Michels - dmichels2@users.sourceforge.net - Leading Edje - http://leadingedje.com/ - - developer - - -5 - - - Kunal Bajaj - kbajaj01@users.sourceforge.net - Big Lots - http://www.biglots.com/ - - developer - - -5 - - - Phil Marzullo - pmarzullo64@users.sourceforge.net - Abercrombie & Fitch - http://www.abercrombie.com/ - - developer - - -5 - - - Yasmany Cubela Medina - bitgandtter@users.sourceforge.net - - developer - - -5 - - - Hiro Rahandomal Gangwani - hiro.gangwani@tcs.com - http://www.linkedin.com/pub/hiro-gangwani/8/954/67a - Tata Consultancy Services Ltd - http://www.tcs.com - - designer - tester - - +4.5 - - + JumpMind, Inc. + http://jumpmind.com/ + + developer + architect + + -5 + + + erilong + Eric Long + erilong@users.sourceforge.net + http://alstongrove.com/ + JumpMind, Inc. + http://jumpmind.com/ + + developer + architect + + -5 + + + eegeek + Mark Hanes + eegeek@users.sourceforge.net + JumpMind, Inc. + http://jumpmind.com/ + + developer + + -5 + + + eweimer + Eric Weimer + eweimer@users.sourceforge.net + + developer + + -5 + + + knaas + Keith Naas + knaas@users.sourceforge.net + + developer + + -5 + http://www.linkedin.com/in/keithnaas + 30xi + http://30xi.com + + + mmahawar + Manisha Mahawar + mmahawar@users.sourceforge.net + + developer + + -5 + + + + + Andrew Wilcox + andrewbwilcox@users.sourceforge.net + + developer + + -5 + + + Megha Shetty + megha_s@users.sourceforge.net + Big Lots + http://www.biglots.com/ + + developer + + -5 + + + Jon Krajewski + jkrajewski@users.sourceforge.net + + designer + + -5 + + + Dave Michels + dmichels2@users.sourceforge.net + Leading Edje + http://leadingedje.com/ + + developer + + -5 + + + Kunal Bajaj + kbajaj01@users.sourceforge.net + Big Lots + http://www.biglots.com/ + + developer + + -5 + + + Phil Marzullo + pmarzullo64@users.sourceforge.net + Abercrombie & Fitch + http://www.abercrombie.com/ + + developer + + -5 + + + Yasmany Cubela Medina + bitgandtter@users.sourceforge.net + + developer + + -5 + + + Hiro Rahandomal Gangwani + hiro.gangwani@tcs.com + http://www.linkedin.com/pub/hiro-gangwani/8/954/67a + Tata Consultancy Services Ltd + http://www.tcs.com + + designer + tester + + +4.5 + + - - - - org.apache.maven.wagon - wagon-webdav - 1.0-beta-2 - - - - - maven-eclipse-plugin - - true - false - 1.5 - - - - maven-compiler-plugin - - 1.5 - 1.5 - true - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - verify - - jar - - - - - - + + + + org.apache.maven.wagon + wagon-webdav + 1.0-beta-2 + + + + + maven-eclipse-plugin + + true + false + 1.5 + + + + maven-compiler-plugin + + 1.5 + 1.5 + true + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + verify + + jar + + + + + + - - - - org.jumpmind.symmetric - symmetric-util - 3.0.0-SNAPSHOT - - - org.jumpmind.symmetric - symmetric-db - 3.0.0-SNAPSHOT - - - stax - stax-api - - - - - org.jumpmind.symmetric - symmetric-db - test-jar - 3.0.0-SNAPSHOT - - - stax - stax-api - - - - - org.jumpmind.symmetric - symmetric-jdbc - 3.0.0-SNAPSHOT - - - org.jumpmind.symmetric - symmetric-jdbc - test-jar - 3.0.0-SNAPSHOT - - - stax - stax-api - - - - - org.jumpmind.symmetric - symmetric-io - 3.0.0-SNAPSHOT - - - org.jumpmind.symmetric - symmetric-csv - 3.0.0-SNAPSHOT - - - org.jumpmind.symmetric - symmetric-core - 3.0.0-SNAPSHOT - - - org.jumpmind.symmetric - symmetric-core - test-jar - 3.0.0-SNAPSHOT - - - org.jumpmind.symmetric - symmetric-client - 3.0.0-SNAPSHOT - - - org.jumpmind.symmetric - symmetric-server - 3.0.0-SNAPSHOT - - - junit - junit - 4.7 - - - log4j - log4j - 1.2.15 - - - com.sun.jmx - jmxri - - - com.sun.jdmk - jmxtools - - - javax.jms - jms - - - - - - org.springframework - spring-core - ${version.springframwork} - - - org.springframework - spring-context - ${version.springframwork} - - - org.springframework - spring-jdbc - ${version.springframwork} - - - org.springframework - spring-web - ${version.springframwork} - - - org.springframework - spring-jms - ${version.springframwork} - - - org.springframework - spring-test - ${version.springframwork} - - - javax.annotation - jsr250-api - 1.0 - - - - javax.servlet - servlet-api - 2.5 - - - javax.jms - jms-api - 1.1-rev-1 - - - org.apache.ant - ant - 1.8.1 - - - - commons-io - commons-io - 2.1 - - - commons-collections - commons-collections - 3.2 - - - commons-logging - commons-logging - 1.1.1 - - - commons-lang - commons-lang - 2.3 - - - commons-math - commons-math - 1.1 - - - commons-cli - commons-cli - 1.2 - - - commons-codec - commons-codec - 1.3 - - - commons-betwixt - commons-betwixt - 0.8 - - - commons-collections - commons-collections - - - - - commons-beanutils - commons-beanutils - 1.8.3 - - - commons-digester - commons-digester - 1.7 - - - commons-pool - commons-pool - 1.5.4 - - - commons-dbcp - commons-dbcp - 1.2.1 - - - - xerces - xercesImpl - - - - xml-apis - xml-apis - - - - - dom4j - dom4j - 1.4 - - - stax - stax-api - 1.0.1 - - - oro - oro - 2.0.8 - - - woodstox - wstx-asl - 3.0.2 - - - cglib - cglib-nodep - 2.1_3 - - - org.beanshell - bsh - 2.0b4 - - - - org.eclipse.jetty - jetty-server - ${version.jetty} - - - org.eclipse.jetty - jetty-servlet - ${version.jetty} - - - org.eclipse.jetty - jetty-jmx - ${version.jetty} - - - - org.slf4j - slf4j-jcl - 1.0.1 - - - mx4j - mx4j-tools - 3.0.1 - - - org.jdom - jdom - 1.1 - - - - org.firebirdsql.jdbc - jaybird - 2.1.6 - - - geronimo-spec - geronimo-spec-j2ee - - - - - - org.apache.geronimo.specs - geronimo-j2ee-connector_1.6_spec - 1.0 - - - org.apache.derby - derby - ${version.derby} - - - org.apache.derby - derbytools - ${version.derby} - - - mysql - mysql-connector-java - ${version.mysql} - - - postgresql - postgresql - ${version.postgresql} - - - net.sourceforge.jtds - jtds - 1.2.4 - - - org.hsqldb - hsqldb - ${version.hsqldb} - - - com.h2database - h2 - ${version.h2} - - - + + + + org.jumpmind.symmetric + symmetric-util + 3.0.0-SNAPSHOT + + + org.jumpmind.symmetric + symmetric-db + 3.0.0-SNAPSHOT + + + stax + stax-api + + + + + org.jumpmind.symmetric + symmetric-db + test-jar + 3.0.0-SNAPSHOT + + + stax + stax-api + + + + + org.jumpmind.symmetric + symmetric-jdbc + 3.0.0-SNAPSHOT + + + org.jumpmind.symmetric + symmetric-jdbc + test-jar + 3.0.0-SNAPSHOT + + + stax + stax-api + + + + + org.jumpmind.symmetric + symmetric-io + 3.0.0-SNAPSHOT + + + org.jumpmind.symmetric + symmetric-csv + 3.0.0-SNAPSHOT + + + org.jumpmind.symmetric + symmetric-core + 3.0.0-SNAPSHOT + + + org.jumpmind.symmetric + symmetric-core + test-jar + 3.0.0-SNAPSHOT + + + org.jumpmind.symmetric + symmetric-client + 3.0.0-SNAPSHOT + + + org.jumpmind.symmetric + symmetric-server + 3.0.0-SNAPSHOT + + + junit + junit + 4.7 + + + org.slf4j + slf4j-api + 1.6.4 + + + org.slf4j + slf4j-log4j12 + 1.6.4 + + + log4j + log4j + 1.2.16 + + + com.sun.jmx + jmxri + + + com.sun.jdmk + jmxtools + + + javax.jms + jms + + + + + + org.springframework + spring-core + ${version.springframwork} + + + org.springframework + spring-context + ${version.springframwork} + + + org.springframework + spring-jdbc + ${version.springframwork} + + + org.springframework + spring-web + ${version.springframwork} + + + org.springframework + spring-jms + ${version.springframwork} + + + org.springframework + spring-test + ${version.springframwork} + + + javax.annotation + jsr250-api + 1.0 + + + + javax.servlet + servlet-api + 2.5 + + + javax.jms + jms-api + 1.1-rev-1 + + + org.apache.ant + ant + 1.8.1 + + + + commons-io + commons-io + 2.1 + + + commons-collections + commons-collections + 3.2 + + + commons-logging + commons-logging + 1.1.1 + + + commons-lang + commons-lang + 2.3 + + + commons-math + commons-math + 1.1 + + + commons-cli + commons-cli + 1.2 + + + commons-codec + commons-codec + 1.3 + + + commons-betwixt + commons-betwixt + 0.8 + + + commons-collections + commons-collections + + + + + commons-beanutils + commons-beanutils + 1.8.3 + + + commons-digester + commons-digester + 1.7 + + + commons-pool + commons-pool + 1.5.4 + + + commons-dbcp + commons-dbcp + 1.2.1 + + + + xerces + xercesImpl + + + + xml-apis + xml-apis + + + + + dom4j + dom4j + 1.4 + + + stax + stax-api + 1.0.1 + + + oro + oro + 2.0.8 + + + woodstox + wstx-asl + 3.0.2 + + + cglib + cglib-nodep + 2.1_3 + + + org.beanshell + bsh + 2.0b4 + + + + org.eclipse.jetty + jetty-server + ${version.jetty} + + + org.eclipse.jetty + jetty-servlet + ${version.jetty} + + + org.eclipse.jetty + jetty-jmx + ${version.jetty} + + + mx4j + mx4j-tools + 3.0.1 + + + org.jdom + jdom + 1.1 + + + + org.firebirdsql.jdbc + jaybird + 2.1.6 + + + geronimo-spec + geronimo-spec-j2ee + + + + + + org.apache.geronimo.specs + geronimo-j2ee-connector_1.6_spec + 1.0 + + + org.apache.derby + derby + ${version.derby} + + + org.apache.derby + derbytools + ${version.derby} + + + mysql + mysql-connector-java + ${version.mysql} + + + postgresql + postgresql + ${version.postgresql} + + + net.sourceforge.jtds + jtds + 1.2.4 + + + org.hsqldb + hsqldb + ${version.hsqldb} + + + com.h2database + h2 + ${version.h2} + + + diff --git a/symmetric/symmetric-server/pom.xml b/symmetric/symmetric-server/pom.xml index 768920b2ef..5d783cf3ab 100644 --- a/symmetric/symmetric-server/pom.xml +++ b/symmetric/symmetric-server/pom.xml @@ -200,12 +200,6 @@ jetty-jmx provided - - - org.slf4j - slf4j-jcl - provided - mx4j mx4j-tools diff --git a/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/SymmetricLauncher.java b/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/SymmetricLauncher.java index 237a974bea..955494c064 100644 --- a/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/SymmetricLauncher.java +++ b/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/SymmetricLauncher.java @@ -46,14 +46,12 @@ import org.apache.log4j.Appender; import org.apache.log4j.FileAppender; import org.apache.log4j.Layout; -import org.apache.log4j.Logger; import org.apache.log4j.PatternLayout; import org.apache.log4j.xml.DOMConfigurator; import org.jumpmind.db.io.DatabaseIO; import org.jumpmind.db.model.Database; import org.jumpmind.db.platform.IDatabasePlatform; import org.jumpmind.db.sql.SqlScript; -import org.jumpmind.log.LogFactory; import org.jumpmind.symmetric.common.Constants; import org.jumpmind.symmetric.common.SecurityConstants; import org.jumpmind.symmetric.db.ISymmetricDialect; @@ -67,6 +65,8 @@ import org.jumpmind.symmetric.transport.IOutgoingTransport; import org.jumpmind.symmetric.transport.internal.InternalOutgoingTransport; import org.jumpmind.symmetric.util.JarBuilder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Run SymmetricDS utilities and/or launch an embedded version of SymmetricDS. @@ -74,6 +74,8 @@ */ public class SymmetricLauncher { + static final Logger log = LoggerFactory.getLogger(SymmetricLauncher.class); + private static final String OPTION_DUMP_BATCH = "dump-batch"; private static final String OPTION_OPEN_REGISTRATION = "open-registration"; @@ -161,8 +163,8 @@ public void execute(String... args) throws Exception { if (line.getOptions() != null) { for (Option option : line.getOptions()) { - LogFactory.getLog(SymmetricLauncher.class).info("Option: name=%s, value=%s", option.getLongOpt(), - ArrayUtils.toString(option.getValues())); + log.info("Option: name=%s, value=%s", new Object[] { option.getLongOpt(), + ArrayUtils.toString(option.getValues()) }); } } @@ -179,7 +181,8 @@ public void execute(String... args) throws Exception { exception = ex; System.err .println("-----------------------------------------------------------------------------------------------"); - System.err.println(String.format("An exception occurred. Please see the following for details:")); + System.err.println(String + .format("An exception occurred. Please see the following for details:")); System.err .println("-----------------------------------------------------------------------------------------------"); @@ -249,7 +252,7 @@ private void configureLogging(CommandLine line) throws MalformedURLException { } if (line.hasOption(OPTION_VERBOSE_CONSOLE)) { - Appender consoleAppender = Logger.getRootLogger().getAppender("CONSOLE"); + Appender consoleAppender = org.apache.log4j.Logger.getRootLogger().getAppender("CONSOLE"); if (consoleAppender != null) { Layout layout = consoleAppender.getLayout(); if (layout instanceof PatternLayout) { @@ -259,13 +262,13 @@ private void configureLogging(CommandLine line) throws MalformedURLException { } if (line.hasOption(OPTION_NOCONSOLE)) { - Logger.getRootLogger().removeAppender("CONSOLE"); + org.apache.log4j.Logger.getRootLogger().removeAppender("CONSOLE"); } if (line.hasOption(OPTION_NOLOGFILE)) { - Logger.getRootLogger().removeAppender("ROLLING"); + org.apache.log4j.Logger.getRootLogger().removeAppender("ROLLING"); } else { - Appender appender = Logger.getRootLogger().getAppender("ROLLING"); + Appender appender = org.apache.log4j.Logger.getRootLogger().getAppender("ROLLING"); if (appender instanceof FileAppender) { FileAppender fileAppender = (FileAppender) appender; @@ -281,7 +284,8 @@ private void configureLogging(CommandLine line) throws MalformedURLException { fileAppender.activateOptions(); } - System.out.println(String.format("Log output will be written to %s", fileAppender.getFile())); + System.out.println(String.format("Log output will be written to %s", + fileAppender.getFile())); } } diff --git a/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/SymmetricWebServer.java b/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/SymmetricWebServer.java index 19bd1d606e..451cd19261 100644 --- a/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/SymmetricWebServer.java +++ b/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/SymmetricWebServer.java @@ -45,14 +45,14 @@ import org.eclipse.jetty.server.nio.SelectChannelConnector; import org.eclipse.jetty.server.ssl.SslSocketConnector; import org.eclipse.jetty.webapp.WebAppContext; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; import org.jumpmind.symmetric.common.Constants; import org.jumpmind.symmetric.common.SecurityConstants; import org.jumpmind.symmetric.common.SystemConstants; import org.jumpmind.symmetric.util.AppUtils; import org.jumpmind.symmetric.web.ServletUtils; import org.jumpmind.symmetric.web.SymmetricEngineHolder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Start up SymmetricDS through an embedded Jetty instance. @@ -61,7 +61,7 @@ */ public class SymmetricWebServer { - protected static final Log log = LogFactory.getLog(SymmetricWebServer.class); + protected static final Logger log = LoggerFactory.getLogger(SymmetricWebServer.class); protected static final String DEFAULT_WEBAPP_DIR = System.getProperty( Constants.SYS_PROP_WEB_DIR, "../web"); diff --git a/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/integrate/AbstractTextPublisherDataLoaderFilter.java b/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/integrate/AbstractTextPublisherDataLoaderFilter.java index cffe5e5c9e..29c47eff45 100644 --- a/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/integrate/AbstractTextPublisherDataLoaderFilter.java +++ b/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/integrate/AbstractTextPublisherDataLoaderFilter.java @@ -22,8 +22,6 @@ package org.jumpmind.symmetric.integrate; import org.jumpmind.db.model.Table; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; import org.jumpmind.symmetric.ext.INodeGroupExtensionPoint; import org.jumpmind.symmetric.io.data.CsvData; import org.jumpmind.symmetric.io.data.DataContext; @@ -31,6 +29,8 @@ import org.jumpmind.symmetric.io.data.IDataReader; import org.jumpmind.symmetric.io.data.IDataWriter; import org.jumpmind.symmetric.io.data.writer.DatabaseWriterFilterAdapter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.BeanNameAware; /** @@ -40,7 +40,7 @@ abstract public class AbstractTextPublisherDataLoaderFilter extends DatabaseWriterFilterAdapter implements IPublisherFilter, INodeGroupExtensionPoint, BeanNameAware { - private final Log log = LogFactory.getLog(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); private final String MSG_CACHE = "msg_CACHE" + hashCode(); @@ -64,7 +64,8 @@ protected abstract String addTextHeader( DataContext context); protected abstract String addTextElement( - DataContext context, Table table, CsvData data); + DataContext context, Table table, + CsvData data); protected abstract String addTextFooter( DataContext context); @@ -126,8 +127,8 @@ protected void logCount() { messagesSinceLastLogOutput++; long timeInMsSinceLastLogOutput = System.currentTimeMillis() - lastTimeInMsOutputLogged; if (timeInMsSinceLastLogOutput > minTimeInMsBetweenLogOutput) { - log.info("%s published %d messages in the last %d ms.", beanName, messagesSinceLastLogOutput, - timeInMsSinceLastLogOutput); + log.info("%s published %d messages in the last %d ms.", new Object[] { beanName, + messagesSinceLastLogOutput, timeInMsSinceLastLogOutput }); lastTimeInMsOutputLogged = System.currentTimeMillis(); messagesSinceLastLogOutput = 0; } diff --git a/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/integrate/AbstractXmlPublisherExtensionPoint.java b/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/integrate/AbstractXmlPublisherExtensionPoint.java index 53c1ae5745..5e1ceeccad 100644 --- a/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/integrate/AbstractXmlPublisherExtensionPoint.java +++ b/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/integrate/AbstractXmlPublisherExtensionPoint.java @@ -36,14 +36,14 @@ import org.jdom.output.Format; import org.jdom.output.XMLOutputter; import org.jumpmind.extension.IExtensionPoint; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; import org.jumpmind.symmetric.ext.INodeGroupExtensionPoint; import org.jumpmind.symmetric.io.data.DataContext; import org.jumpmind.symmetric.io.data.DataEventType; import org.jumpmind.symmetric.io.data.IDataReader; import org.jumpmind.symmetric.io.data.IDataWriter; import org.jumpmind.util.Context; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * An abstract class that accumulates data to publish. @@ -51,7 +51,7 @@ abstract public class AbstractXmlPublisherExtensionPoint implements IExtensionPoint, INodeGroupExtensionPoint { - protected final Log log = LogFactory.getLog(getClass()); + protected final Logger log = LoggerFactory.getLogger(getClass()); protected final String XML_CACHE = "XML_CACHE_" + this.hashCode(); diff --git a/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/integrate/SimpleJmsPublisher.java b/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/integrate/SimpleJmsPublisher.java index 56afebcd62..ff0cb8889c 100644 --- a/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/integrate/SimpleJmsPublisher.java +++ b/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/integrate/SimpleJmsPublisher.java @@ -21,9 +21,9 @@ package org.jumpmind.symmetric.integrate; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; import org.jumpmind.util.Context; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; @@ -31,7 +31,7 @@ public class SimpleJmsPublisher implements IPublisher, BeanFactoryAware { - static final Log log = LogFactory.getLog(SimpleJmsPublisher.class); + static final Logger log = LoggerFactory.getLogger(SimpleJmsPublisher.class); private BeanFactory beanFactory; diff --git a/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/map/ColumnDataFilters.java b/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/map/ColumnDataFilters.java index d7b50b8305..906421d330 100644 --- a/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/map/ColumnDataFilters.java +++ b/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/map/ColumnDataFilters.java @@ -24,8 +24,6 @@ import org.apache.commons.lang.exception.ExceptionUtils; import org.jumpmind.db.model.Table; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; import org.jumpmind.symmetric.ext.INodeGroupExtensionPoint; import org.jumpmind.symmetric.io.data.CsvData; import org.jumpmind.symmetric.io.data.DataContext; @@ -34,11 +32,13 @@ import org.jumpmind.symmetric.io.data.writer.DatabaseWriterFilterAdapter; import org.jumpmind.symmetric.io.data.writer.IDatabaseWriterFilter; import org.jumpmind.util.Context; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.scripting.ScriptCompilationException; public class ColumnDataFilters extends DatabaseWriterFilterAdapter implements IDatabaseWriterFilter, INodeGroupExtensionPoint { - final Log log = LogFactory.getLog(getClass()); + final Logger log = LoggerFactory.getLogger(getClass()); private boolean autoRegister = true; diff --git a/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/AbstractCompressionUriHandler.java b/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/AbstractCompressionUriHandler.java index 4bfb546e11..8a60cedc8e 100644 --- a/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/AbstractCompressionUriHandler.java +++ b/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/AbstractCompressionUriHandler.java @@ -7,16 +7,15 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.common.ParameterConstants; import org.jumpmind.symmetric.service.IParameterService; import org.jumpmind.symmetric.web.compression.CompressionServletResponseWrapper; abstract public class AbstractCompressionUriHandler extends AbstractUriHandler { - public AbstractCompressionUriHandler(Log log, String uriPattern, + public AbstractCompressionUriHandler(String uriPattern, IParameterService parameterService, IInterceptor... interceptors) { - super(log, uriPattern, parameterService, interceptors); + super(uriPattern, parameterService, interceptors); } final public void handle(HttpServletRequest req, HttpServletResponse res) throws IOException, diff --git a/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/AbstractUriHandler.java b/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/AbstractUriHandler.java index 4460fe7d04..8456ae682b 100644 --- a/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/AbstractUriHandler.java +++ b/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/AbstractUriHandler.java @@ -25,16 +25,16 @@ import java.util.ArrayList; import java.util.List; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; import org.jumpmind.symmetric.model.ChannelMap; import org.jumpmind.symmetric.service.IParameterService; import org.jumpmind.symmetric.transport.IOutgoingTransport; import org.jumpmind.symmetric.transport.internal.InternalOutgoingTransport; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; abstract public class AbstractUriHandler implements IUriHandler { - protected Log log = LogFactory.getLog(getClass()); + protected final Logger log = LoggerFactory.getLogger(getClass()); private String uriPattern; @@ -44,9 +44,8 @@ abstract public class AbstractUriHandler implements IUriHandler { private boolean enabled = true; - public AbstractUriHandler(Log log, String uriPattern, - IParameterService parameterService, IInterceptor... interceptors) { - this.log = log; + public AbstractUriHandler(String uriPattern, IParameterService parameterService, + IInterceptor... interceptors) { this.uriPattern = uriPattern; this.interceptors = new ArrayList(interceptors.length); for (IInterceptor i : interceptors) { diff --git a/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/AckUriHandler.java b/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/AckUriHandler.java index 2de807560f..c6bfa4fc2e 100644 --- a/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/AckUriHandler.java +++ b/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/AckUriHandler.java @@ -29,7 +29,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.model.BatchInfo; import org.jumpmind.symmetric.service.IAcknowledgeService; import org.jumpmind.symmetric.service.IParameterService; @@ -47,9 +46,9 @@ public int compare(BatchInfo batchInfo1, BatchInfo batchInfo2) { private IAcknowledgeService acknowledgeService; - public AckUriHandler(Log log, + public AckUriHandler( IParameterService parameterService, IAcknowledgeService acknowledgeService, IInterceptor...interceptors) { - super(log, "/ack/*", parameterService, interceptors); + super("/ack/*", parameterService, interceptors); this.acknowledgeService = acknowledgeService; } diff --git a/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/BandwidthSamplerUriHandler.java b/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/BandwidthSamplerUriHandler.java index 28293b71e7..6e0614f9c4 100644 --- a/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/BandwidthSamplerUriHandler.java +++ b/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/BandwidthSamplerUriHandler.java @@ -27,7 +27,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.service.IBandwidthService; import org.jumpmind.symmetric.service.IParameterService; import org.jumpmind.symmetric.util.AppUtils; @@ -44,8 +43,8 @@ public class BandwidthSamplerUriHandler extends AbstractUriHandler { protected long defaultTestSlowBandwidthDelay = 0; - public BandwidthSamplerUriHandler(Log log, IParameterService parameterService) { - super(log, "/bandwidth/*", parameterService); + public BandwidthSamplerUriHandler(IParameterService parameterService) { + super("/bandwidth/*", parameterService); } public void handle(HttpServletRequest req, HttpServletResponse res) throws IOException, diff --git a/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/BatchUriHandler.java b/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/BatchUriHandler.java index 2dbe222432..ce0ea60398 100644 --- a/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/BatchUriHandler.java +++ b/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/BatchUriHandler.java @@ -27,7 +27,6 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang.StringUtils; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.service.IDataExtractorService; import org.jumpmind.symmetric.service.IParameterService; import org.jumpmind.symmetric.transport.IOutgoingTransport; @@ -36,9 +35,9 @@ public class BatchUriHandler extends AbstractCompressionUriHandler { private IDataExtractorService dataExtractorService; - public BatchUriHandler(Log log, IParameterService parameterService, + public BatchUriHandler(IParameterService parameterService, IDataExtractorService dataExtractorService) { - super(log, "/batch/*", parameterService); + super("/batch/*", parameterService); this.dataExtractorService = dataExtractorService; } diff --git a/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/InfoUriHandler.java b/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/InfoUriHandler.java index 13afa77075..ab836c9133 100644 --- a/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/InfoUriHandler.java +++ b/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/InfoUriHandler.java @@ -28,7 +28,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.common.InfoConstants; import org.jumpmind.symmetric.common.ParameterConstants; import org.jumpmind.symmetric.model.Node; @@ -49,10 +48,10 @@ public class InfoUriHandler extends AbstractUriHandler { private IConfigurationService configurationService; - public InfoUriHandler(Log log, IParameterService parameterService, + public InfoUriHandler(IParameterService parameterService, INodeService nodeService, IConfigurationService configurationService) { - super(log, "/info/*", parameterService); + super("/info/*", parameterService); this.nodeService = nodeService; this.configurationService = configurationService; } diff --git a/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/PingUriHandler.java b/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/PingUriHandler.java index f4ccbee528..e7e8ba0fd1 100644 --- a/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/PingUriHandler.java +++ b/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/PingUriHandler.java @@ -26,7 +26,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.service.IParameterService; /** @@ -35,8 +34,8 @@ */ public class PingUriHandler extends AbstractUriHandler { - public PingUriHandler(Log log, IParameterService parameterService) { - super(log, "/ping/*", parameterService); + public PingUriHandler(IParameterService parameterService) { + super("/ping/*", parameterService); } public void handle(HttpServletRequest req, HttpServletResponse res) throws IOException, diff --git a/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/PullUriHandler.java b/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/PullUriHandler.java index 3721255048..cdb287eb49 100644 --- a/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/PullUriHandler.java +++ b/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/PullUriHandler.java @@ -27,7 +27,6 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang.StringUtils; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.model.ChannelMap; import org.jumpmind.symmetric.model.NodeSecurity; import org.jumpmind.symmetric.service.IConfigurationService; @@ -53,11 +52,11 @@ public class PullUriHandler extends AbstractCompressionUriHandler { private IStatisticManager statisticManager; - public PullUriHandler(Log log, IParameterService parameterService, + public PullUriHandler(IParameterService parameterService, INodeService nodeService, IConfigurationService configurationService, IDataExtractorService dataExtractorService, IRegistrationService registrationService, IStatisticManager statisticManager, IInterceptor... interceptors) { - super(log, "/pull/*", parameterService, interceptors); + super("/pull/*", parameterService, interceptors); this.nodeService = nodeService; this.configurationService = configurationService; this.dataExtractorService = dataExtractorService; diff --git a/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/PushUriHandler.java b/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/PushUriHandler.java index ecd71e29cf..862a36fa57 100644 --- a/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/PushUriHandler.java +++ b/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/PushUriHandler.java @@ -29,7 +29,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.service.IDataLoaderService; import org.jumpmind.symmetric.service.IParameterService; import org.jumpmind.symmetric.statistic.IStatisticManager; @@ -43,10 +42,10 @@ public class PushUriHandler extends AbstractUriHandler { private IStatisticManager statisticManager; - public PushUriHandler(Log log, IParameterService parameterService, IDataLoaderService dataLoaderService, + public PushUriHandler(IParameterService parameterService, IDataLoaderService dataLoaderService, IStatisticManager statisticManager, IInterceptor... interceptors) { - super(log, "/push/*", parameterService, interceptors); + super("/push/*", parameterService, interceptors); this.dataLoaderService = dataLoaderService; this.statisticManager = statisticManager; } diff --git a/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/RegistrationUriHandler.java b/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/RegistrationUriHandler.java index cf136f5552..6824c31f0d 100644 --- a/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/RegistrationUriHandler.java +++ b/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/RegistrationUriHandler.java @@ -28,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang.StringUtils; -import org.jumpmind.log.Log; import org.jumpmind.symmetric.model.Node; import org.jumpmind.symmetric.service.IParameterService; import org.jumpmind.symmetric.service.IRegistrationService; @@ -44,9 +43,9 @@ public class RegistrationUriHandler extends AbstractUriHandler { - public RegistrationUriHandler(Log log, IParameterService parameterService, + public RegistrationUriHandler( IParameterService parameterService, IRegistrationService registrationService, IInterceptor... interceptors) { - super(log, "/registration/*", parameterService, interceptors); + super("/registration/*", parameterService, interceptors); this.registrationService = registrationService; } diff --git a/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/ServerSymmetricEngine.java b/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/ServerSymmetricEngine.java index 4de72dedbf..2d3fe6bf46 100644 --- a/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/ServerSymmetricEngine.java +++ b/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/ServerSymmetricEngine.java @@ -24,21 +24,21 @@ protected void init() { concurrentConnectionManager, configurationService, statisticManager); this.uriHandlers = new ArrayList(); - this.uriHandlers.add(new AckUriHandler(log, parameterService, acknowledgeService, + this.uriHandlers.add(new AckUriHandler(parameterService, acknowledgeService, authInterceptor)); - this.uriHandlers.add(new PingUriHandler(log, parameterService)); - this.uriHandlers.add(new InfoUriHandler(log, parameterService, nodeService, - configurationService)); - this.uriHandlers.add(new BandwidthSamplerUriHandler(log, parameterService)); - this.uriHandlers.add(new PullUriHandler(log, parameterService, nodeService, + this.uriHandlers.add(new PingUriHandler(parameterService)); + this.uriHandlers + .add(new InfoUriHandler(parameterService, nodeService, configurationService)); + this.uriHandlers.add(new BandwidthSamplerUriHandler(parameterService)); + this.uriHandlers.add(new PullUriHandler(parameterService, nodeService, configurationService, dataExtractorService, registrationService, statisticManager, concurrencyInterceptor, authInterceptor)); - this.uriHandlers.add(new PushUriHandler(log, parameterService, dataLoaderService, + this.uriHandlers.add(new PushUriHandler(parameterService, dataLoaderService, statisticManager, concurrencyInterceptor, authInterceptor)); - this.uriHandlers.add(new RegistrationUriHandler(log, parameterService, registrationService, + this.uriHandlers.add(new RegistrationUriHandler(parameterService, registrationService, concurrencyInterceptor)); if (parameterService.is(ParameterConstants.WEB_BATCH_URI_HANDLER_ENABLE)) { - this.uriHandlers.add(new BatchUriHandler(log, parameterService, dataExtractorService)); + this.uriHandlers.add(new BatchUriHandler(parameterService, dataExtractorService)); } } diff --git a/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/SymmetricEngineHolder.java b/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/SymmetricEngineHolder.java index 55a5b9dd8b..7ecd72b414 100644 --- a/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/SymmetricEngineHolder.java +++ b/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/SymmetricEngineHolder.java @@ -32,16 +32,16 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; import org.jumpmind.symmetric.ISymmetricEngine; import org.jumpmind.symmetric.common.Constants; import org.jumpmind.symmetric.common.ParameterConstants; import org.jumpmind.symmetric.service.IRegistrationService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class SymmetricEngineHolder { - final Log log = LogFactory.getLog(getClass()); + final Logger log = LoggerFactory.getLogger(getClass()); private Map engines = new HashMap(); @@ -113,7 +113,7 @@ protected ISymmetricEngine create(String propertiesFile) { } return engine; } catch (Exception e) { - log.error(e); + log.error(e.getMessage(),e); return null; } } @@ -124,7 +124,7 @@ public ISymmetricEngine install(Properties properties) throws Exception { try { engines.get(engineName).stop(); } catch (Exception e) { - log.error(e); + log.error(e.getMessage(),e); } engines.remove(engineName); } diff --git a/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/SymmetricServlet.java b/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/SymmetricServlet.java index a7f3f6b0aa..e369cd2587 100644 --- a/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/SymmetricServlet.java +++ b/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/SymmetricServlet.java @@ -31,9 +31,9 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang.StringUtils; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; import org.jumpmind.symmetric.ISymmetricEngine; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This servlet handles web requests to SymmetricDS. @@ -60,7 +60,7 @@ public class SymmetricServlet extends HttpServlet { private static final long serialVersionUID = 1L; - protected final Log log = LogFactory.getLog(getClass()); + protected final Logger log = LoggerFactory.getLogger(getClass()); @Override protected void service(HttpServletRequest req, HttpServletResponse res) @@ -93,12 +93,14 @@ protected void service(HttpServletRequest req, HttpServletResponse res) } } } else { - log.error("No handlers were found to handle the request %s from the host %s with an ip address of %s. The query string was: %s", ServletUtils.normalizeRequestUri(req), - req.getRemoteHost(), req.getRemoteAddr(), req.getQueryString()); + log.error( + "No handlers were found to handle the request %s from the host %s with an ip address of %s. The query string was: %s", + new Object[] { ServletUtils.normalizeRequestUri(req), req.getRemoteHost(), + req.getRemoteAddr(), req.getQueryString() }); if (method.equals(WebConstants.METHOD_GET)) { res.sendRedirect("/"); } else { - ServletUtils.sendError(res, HttpServletResponse.SC_FORBIDDEN); + ServletUtils.sendError(res, HttpServletResponse.SC_FORBIDDEN); } } } @@ -190,11 +192,15 @@ protected void logException(HttpServletRequest req, Exception ex, boolean isErro String method = req instanceof HttpServletRequest ? ((HttpServletRequest) req).getMethod() : ""; if (isError) { - log.error("Error while processing %s request for externalId: %s, node: %s at %s (%s) with path: %s", ex, method, externalId, nodeId, address, - hostName, ServletUtils.normalizeRequestUri(req)); + log.error( + "Error while processing %s request for externalId: %s, node: %s at %s (%s) with path: %s", + new Object[] { method, externalId, nodeId, address, hostName, + ServletUtils.normalizeRequestUri(req) }); + log.error(ex.getMessage(), ex); } else { - log.warn("Error while processing %s request for externalId: %s, node: %s at %s (%s). The message is: %s", method, externalId, nodeId, address, - hostName, ex.getMessage()); + log.warn( + "Error while processing %s request for externalId: %s, node: %s at %s (%s). The message is: %s", + new Object[] { method, externalId, nodeId, address, hostName, ex.getMessage() }); } } diff --git a/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/compression/CompressionServletResponseWrapper.java b/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/compression/CompressionServletResponseWrapper.java index 16c5db7800..33fcb82f81 100644 --- a/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/compression/CompressionServletResponseWrapper.java +++ b/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/web/compression/CompressionServletResponseWrapper.java @@ -29,8 +29,8 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponseWrapper; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Implementation of HttpServletResponseWrapper that works with the @@ -48,7 +48,7 @@ public class CompressionServletResponseWrapper extends HttpServletResponseWrapper { - static final Log log = LogFactory.getLog(CompressionServletResponseWrapper.class); + static final Logger log = LoggerFactory.getLogger(CompressionServletResponseWrapper.class); int compressionLevel = Deflater.DEFAULT_COMPRESSION; diff --git a/symmetric/symmetric-util/pom.xml b/symmetric/symmetric-util/pom.xml index 9bebfc293b..35e3cc1638 100644 --- a/symmetric/symmetric-util/pom.xml +++ b/symmetric/symmetric-util/pom.xml @@ -23,6 +23,14 @@ commons-lang commons-lang + + org.slf4j + slf4j-api + + + org.slf4j + slf4j-log4j12 + log4j log4j diff --git a/symmetric/symmetric-util/src/main/java/org/jumpmind/log/ConsoleLog.java b/symmetric/symmetric-util/src/main/java/org/jumpmind/log/ConsoleLog.java deleted file mode 100644 index a9358b5f78..0000000000 --- a/symmetric/symmetric-util/src/main/java/org/jumpmind/log/ConsoleLog.java +++ /dev/null @@ -1,60 +0,0 @@ -package org.jumpmind.log; - -import org.apache.commons.lang.StringUtils; - - -public class ConsoleLog extends Log { - - @Override - public boolean isDebugEnabled() { - return getLogLevel().contains("debug"); - } - - public boolean isInfoEnabled() { - return isDebugEnabled() || getLogLevel().contains("info"); - } - - public boolean isWarnEnabled() { - return isInfoEnabled() || getLogLevel().contains("warn"); - } - - protected String getLogLevel() { - return System.getProperty("log", "info").toLowerCase(); - } - - protected boolean isLogLevelEnabled(LogLevel level) { - switch (level) { - case DEBUG: - return isDebugEnabled(); - case INFO: - return isInfoEnabled() || isDebugEnabled(); - case WARN: - return isWarnEnabled() || isInfoEnabled() || isDebugEnabled(); - case ERROR: - return true; - default: - return false; - } - } - - public void log(LogLevel level, Throwable error, String msg, Object... params) { - if (isLogLevelEnabled(level)) { - if (StringUtils.isNotBlank(msg) && params != null && params.length > 0) { - msg = String.format(msg, params); - } - - if (StringUtils.isNotBlank(msg)) { - if (msg.endsWith("\r")) { - System.out.print(msg); - } else { - System.out.println(msg); - } - } - - if (error != null) { - error.printStackTrace(); - } - } - - } -} diff --git a/symmetric/symmetric-util/src/main/java/org/jumpmind/log/Log.java b/symmetric/symmetric-util/src/main/java/org/jumpmind/log/Log.java deleted file mode 100644 index 55369513a7..0000000000 --- a/symmetric/symmetric-util/src/main/java/org/jumpmind/log/Log.java +++ /dev/null @@ -1,59 +0,0 @@ -package org.jumpmind.log; - -abstract public class Log { - - protected String category; - - public abstract void log(LogLevel level, Throwable error, String msg, Object... params); - - public void log(LogLevel level, String msg, Object... params) { - log(level, null, msg, params); - } - - public void log(LogLevel level, Throwable error) { - log(level, error, null); - } - - public void debug(String msg, Object... params) { - log(LogLevel.DEBUG, msg, params); - } - - public void info(String msg, Object... params) { - log(LogLevel.INFO, msg, params); - } - - public void warn(String msg, Object... params) { - log(LogLevel.WARN, msg, params); - } - - public void warn(Throwable ex) { - log(LogLevel.WARN, ex); - } - - public void warn(String msg, Throwable ex, Object... params) { - log(LogLevel.WARN, ex, msg, params); - } - - public void error(String msg, Object... params) { - log(LogLevel.ERROR, msg, params); - } - - public void error(String msg, Throwable ex, Object... params) { - log(LogLevel.ERROR, ex, msg, params); - } - - public void error(Throwable ex) { - log(LogLevel.ERROR, ex); - } - - public String getCategory() { - return category; - } - - public abstract boolean isDebugEnabled(); - - protected void initialize(String category) { - this.category = category; - } - -} diff --git a/symmetric/symmetric-util/src/main/java/org/jumpmind/log/Log4jLog.java b/symmetric/symmetric-util/src/main/java/org/jumpmind/log/Log4jLog.java deleted file mode 100644 index 927185e362..0000000000 --- a/symmetric/symmetric-util/src/main/java/org/jumpmind/log/Log4jLog.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.jumpmind.log; - -import org.apache.log4j.Level; -import org.apache.log4j.Logger; - -public class Log4jLog extends Log { - - Logger logger; - - @Override - protected void initialize(String clazz) { - super.initialize(clazz); - logger = Logger.getLogger(clazz); - } - - public void log(LogLevel level, String msg, Object... params) { - log(level, null, msg, params); - } - - public void log(LogLevel level, Throwable error) { - log(level, error, null); - } - - @Override - public void error(Throwable ex) { - log(LogLevel.ERROR, ex); - } - - @Override - public void debug(String msg, Object... params) { - log(LogLevel.DEBUG, msg, params); - } - - @Override - public boolean isDebugEnabled() { - return logger.isDebugEnabled(); - } - - public void log(LogLevel level, Throwable error, String msg, Object... params) { - Level loggerLevel = Level.FATAL; - - switch (level) { - case DEBUG: - loggerLevel = Level.DEBUG; - break; - case INFO: - loggerLevel = Level.INFO; - break; - case WARN: - loggerLevel = Level.WARN; - break; - } - - if (logger.isEnabledFor(loggerLevel)) { - if (error != null && msg == null ) { - logger.log(loggerLevel, msg, error); - } else if (error != null && msg != null && params != null) { - logger.log(loggerLevel, String.format(msg, params)); - logger.log(loggerLevel, error.getMessage(), error); - } else if (msg != null) { - logger.log(loggerLevel, String.format(msg, params)); - } - } - - } -} diff --git a/symmetric/symmetric-util/src/main/java/org/jumpmind/log/LogFactory.java b/symmetric/symmetric-util/src/main/java/org/jumpmind/log/LogFactory.java deleted file mode 100644 index 111fdddee4..0000000000 --- a/symmetric/symmetric-util/src/main/java/org/jumpmind/log/LogFactory.java +++ /dev/null @@ -1,59 +0,0 @@ -package org.jumpmind.log; - -import java.util.HashMap; -import java.util.Map; - - -public class LogFactory { - - private static Class logClass; - - private static Map logs = new HashMap(); - - public static void setLogClass(Class logClass) { - LogFactory.logClass = logClass; - logs.clear(); - } - - static void checkInitialization() { - if (logClass == null) { - String clazzName = System.getProperty(Log.class.getName(), ConsoleLog.class.getName()); - try { - logClass = Class.forName(clazzName); - Object log = logClass.newInstance(); - if (!(log instanceof Log)) { - throw new ClassCastException(log.getClass().getName() - + " was not an instance of " + Log.class.getName()); - } - } catch (Exception e) { - e.printStackTrace(); - logClass = Log4jLog.class; - } - } - } - - public static Log getLog(Class clazz) { - return getLog(clazz.getName()); - } - - public static Log getLog(String clazz) { - Log log = logs.get(clazz); - if (log == null) { - synchronized (logs) { - log = logs.get(clazz); - if (log == null) { - checkInitialization(); - try { - log = (Log) logClass.newInstance(); - } catch (Exception e) { - log = new Log4jLog(); - } - - log.initialize(clazz); - logs.put(clazz, log); - } - } - } - return log; - } -} diff --git a/symmetric/symmetric-util/src/main/java/org/jumpmind/log/LogLevel.java b/symmetric/symmetric-util/src/main/java/org/jumpmind/log/LogLevel.java deleted file mode 100644 index 378260814a..0000000000 --- a/symmetric/symmetric-util/src/main/java/org/jumpmind/log/LogLevel.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.jumpmind.log; - -public enum LogLevel { - DEBUG, INFO, WARN, ERROR, FATAL -} diff --git a/symmetric/symmetric-util/src/main/java/org/jumpmind/properties/TypedProperties.java b/symmetric/symmetric-util/src/main/java/org/jumpmind/properties/TypedProperties.java index dd981a9fe0..4d3482d9a3 100644 --- a/symmetric/symmetric-util/src/main/java/org/jumpmind/properties/TypedProperties.java +++ b/symmetric/symmetric-util/src/main/java/org/jumpmind/properties/TypedProperties.java @@ -4,15 +4,14 @@ import java.util.List; import java.util.Properties; -import org.jumpmind.log.Log; -import org.jumpmind.log.LogFactory; -import org.jumpmind.log.LogLevel; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class TypedProperties extends Properties { private static final long serialVersionUID = 1L; - protected static Log log = LogFactory.getLog(TypedProperties.class); + protected static Logger log = LoggerFactory.getLogger(TypedProperties.class); public TypedProperties() { } @@ -92,7 +91,7 @@ public List instantiate(String key) { } return objects; } catch (Exception ex) { - log.log(LogLevel.WARN, ex); + log.warn(ex.getMessage(), ex); return objects; } }