Skip to content

Commit

Permalink
first pass at converting to slf4j
Browse files Browse the repository at this point in the history
  • Loading branch information
@chenson42
chenson42 committed Jan 16, 2012
1 parent 369a13c commit dfade97
Show file tree
Hide file tree
Showing 158 changed files with 1,243 additions and 1,613 deletions.
19 changes: 9 additions & 10 deletions symmetric/symmetric-client/src/main/java/org/jumpmind/symmetric/ClientSymmetricEngine.java
View file
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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));
Expand Down Expand Up @@ -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]);
}
}
Expand All @@ -107,15 +106,15 @@ 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
protected IDatabasePlatform createDatabasePlatform(TypedProperties properties) {
createDataSource(properties);
waitForAvailableDatabase();
return JdbcDatabasePlatformFactory.createNewPlatformInstance(this.dataSource,
createDatabasePlatformSettings(properties), log);
createDatabasePlatformSettings(properties));
}

protected DatabasePlatformSettings createDatabasePlatformSettings(TypedProperties properties) {
Expand All @@ -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() {
Expand Down
7 changes: 3 additions & 4 deletions ...tric-client/src/main/java/org/jumpmind/symmetric/db/AbstractEmbeddedSymmetricDialect.java
View file
Expand Up @@ -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;
Expand All @@ -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);
}

/**
Expand Down
40 changes: 19 additions & 21 deletions ...symmetric-client/src/main/java/org/jumpmind/symmetric/db/JdbcSymmetricDialectFactory.java
View file
Expand Up @@ -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;
Expand All @@ -54,64 +52,64 @@
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
* {@link ISymmetricDialect} for the configured database.
*/
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() {

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();
}
Expand Down
5 changes: 2 additions & 3 deletions ...ric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/db2/Db2SymmetricDialect.java
View file
Expand Up @@ -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;
Expand All @@ -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();
}

Expand Down
5 changes: 2 additions & 3 deletions ...c/symmetric-client/src/main/java/org/jumpmind/symmetric/db/db2/Db2v9SymmetricDialect.java
View file
Expand Up @@ -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;
Expand All @@ -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
Expand Down
5 changes: 2 additions & 3 deletions ...symmetric-client/src/main/java/org/jumpmind/symmetric/db/derby/DerbySymmetricDialect.java
View file
Expand Up @@ -24,16 +24,15 @@
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;
import org.jumpmind.symmetric.service.IParameterService;

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();
}

Expand Down
5 changes: 2 additions & 3 deletions ...ric-client/src/main/java/org/jumpmind/symmetric/db/firebird/FirebirdSymmetricDialect.java
View file
Expand Up @@ -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;
Expand All @@ -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();
}

Expand Down
5 changes: 2 additions & 3 deletions ...etric/symmetric-client/src/main/java/org/jumpmind/symmetric/db/h2/H2SymmetricDialect.java
View file
Expand Up @@ -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;
Expand All @@ -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();
}

Expand Down
5 changes: 2 additions & 3 deletions ...mmetric-client/src/main/java/org/jumpmind/symmetric/db/hsqldb/HsqlDbSymmetricDialect.java
View file
Expand Up @@ -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;
Expand All @@ -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");
Expand Down
5 changes: 2 additions & 3 deletions ...etric-client/src/main/java/org/jumpmind/symmetric/db/hsqldb2/HsqlDb2SymmetricDialect.java
View file
Expand Up @@ -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;
Expand All @@ -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");
}
Expand Down
5 changes: 2 additions & 3 deletions ...ric-client/src/main/java/org/jumpmind/symmetric/db/informix/InformixSymmetricDialect.java
View file
Expand Up @@ -22,16 +22,15 @@

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;
import org.jumpmind.symmetric.service.IParameterService;

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();
}

Expand Down
5 changes: 2 additions & 3 deletions ...c-client/src/main/java/org/jumpmind/symmetric/db/interbase/InterbaseSymmetricDialect.java
View file
Expand Up @@ -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;
Expand All @@ -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();
}

Expand Down
5 changes: 2 additions & 3 deletions ...symmetric-client/src/main/java/org/jumpmind/symmetric/db/mssql/MsSqlSymmetricDialect.java
View file
Expand Up @@ -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;
Expand All @@ -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();
}

Expand Down

0 comments on commit dfade97

Please sign in to comment.