Skip to content

Commit

Permalink
refactor package
Browse files Browse the repository at this point in the history
  • Loading branch information
@chenson42
chenson42 committed Nov 12, 2011
1 parent 35a5c0b commit 49d3d02
Show file tree
Hide file tree
Showing 204 changed files with 855 additions and 908 deletions.
2 changes: 1 addition & 1 deletion symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/AbstractSymmetricEngine.java
View file
Expand Up @@ -38,7 +38,7 @@
import org.jumpmind.symmetric.common.logging.LogFactory;
import org.jumpmind.symmetric.config.PropertiesFactoryBean;
import org.jumpmind.symmetric.db.IDbDialect;
import org.jumpmind.symmetric.ddl.model.Table;
import org.jumpmind.symmetric.db.ddl.model.Table;
import org.jumpmind.symmetric.ext.IExtensionPointManager;
import org.jumpmind.symmetric.job.IJobManager;
import org.jumpmind.symmetric.model.Node;
Expand Down
19 changes: 10 additions & 9 deletions symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/db/AbstractDbDialect.java
View file
Expand Up @@ -57,17 +57,18 @@
import org.jumpmind.symmetric.common.ParameterConstants;
import org.jumpmind.symmetric.common.logging.ILog;
import org.jumpmind.symmetric.common.logging.LogFactory;
import org.jumpmind.symmetric.db.DmlStatement.DmlType;
import org.jumpmind.symmetric.db.ddl.Platform;
import org.jumpmind.symmetric.db.ddl.io.DatabaseIO;
import org.jumpmind.symmetric.db.ddl.model.Column;
import org.jumpmind.symmetric.db.ddl.model.Database;
import org.jumpmind.symmetric.db.ddl.model.ForeignKey;
import org.jumpmind.symmetric.db.ddl.model.Index;
import org.jumpmind.symmetric.db.ddl.model.Table;
import org.jumpmind.symmetric.db.ddl.platform.SqlBuilder;
import org.jumpmind.symmetric.db.interbase.InterbaseDbDialect;
import org.jumpmind.symmetric.db.sql.DmlStatement;
import org.jumpmind.symmetric.db.sql.DmlStatement.DmlType;
import org.jumpmind.symmetric.db.sybase.SybaseDbDialect;
import org.jumpmind.symmetric.ddl.Platform;
import org.jumpmind.symmetric.ddl.io.DatabaseIO;
import org.jumpmind.symmetric.ddl.model.Column;
import org.jumpmind.symmetric.ddl.model.Database;
import org.jumpmind.symmetric.ddl.model.ForeignKey;
import org.jumpmind.symmetric.ddl.model.Index;
import org.jumpmind.symmetric.ddl.model.Table;
import org.jumpmind.symmetric.ddl.platform.SqlBuilder;
import org.jumpmind.symmetric.ext.IDatabaseUpgradeListener;
import org.jumpmind.symmetric.load.IColumnFilter;
import org.jumpmind.symmetric.model.Channel;
Expand Down
2 changes: 1 addition & 1 deletion ...ric/symmetric-core/src/main/java/org/jumpmind/symmetric/db/AbstractEmbeddedDbDialect.java
View file
Expand Up @@ -20,7 +20,7 @@

package org.jumpmind.symmetric.db;

import org.jumpmind.symmetric.ddl.model.Table;
import org.jumpmind.symmetric.db.ddl.model.Table;
import org.jumpmind.symmetric.model.Channel;
import org.jumpmind.symmetric.model.Node;
import org.jumpmind.symmetric.model.Trigger;
Expand Down
6 changes: 3 additions & 3 deletions ...ric/symmetric-core/src/main/java/org/jumpmind/symmetric/db/AutoIncrementColumnFilter.java
View file
Expand Up @@ -24,9 +24,9 @@
import java.util.ArrayList;

import org.apache.commons.collections.CollectionUtils;
import org.jumpmind.symmetric.db.DmlStatement.DmlType;
import org.jumpmind.symmetric.ddl.model.Column;
import org.jumpmind.symmetric.ddl.model.Table;
import org.jumpmind.symmetric.db.ddl.model.Column;
import org.jumpmind.symmetric.db.ddl.model.Table;
import org.jumpmind.symmetric.db.sql.DmlStatement.DmlType;
import org.jumpmind.symmetric.load.IColumnFilter;
import org.jumpmind.symmetric.load.IDataLoaderContext;

Expand Down
4 changes: 2 additions & 2 deletions symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/db/DatabaseModel.java
View file
Expand Up @@ -22,15 +22,15 @@
import java.util.HashMap;
import java.util.Map;

import org.jumpmind.symmetric.ddl.model.Table;
import org.jumpmind.symmetric.db.ddl.model.Table;

/**
* Adds Catalog & Schema aware finder for ddlutils Database class.
*
* Also caches the index of the table to speed up Table lookup.
*
*/
public class DatabaseModel extends org.jumpmind.symmetric.ddl.model.Database {
public class DatabaseModel extends org.jumpmind.symmetric.db.ddl.model.Database {

private static final long serialVersionUID = 1L;
private Map<String, Integer> tableIndexCache = new HashMap<String, Integer>();
Expand Down
40 changes: 20 additions & 20 deletions symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/db/DbDialectFactory.java
View file
Expand Up @@ -26,26 +26,26 @@

import org.jumpmind.symmetric.common.logging.ILog;
import org.jumpmind.symmetric.common.logging.LogFactory;
import org.jumpmind.symmetric.ddl.Platform;
import org.jumpmind.symmetric.ddl.PlatformFactory;
import org.jumpmind.symmetric.ddl.PlatformUtils;
import org.jumpmind.symmetric.ddl.platform.db2.Db2Platform;
import org.jumpmind.symmetric.ddl.platform.derby.DerbyPlatform;
import org.jumpmind.symmetric.ddl.platform.firebird.FirebirdPlatform;
import org.jumpmind.symmetric.ddl.platform.greenplum.GreenplumPlatform;
import org.jumpmind.symmetric.ddl.platform.h2.H2Platform;
import org.jumpmind.symmetric.ddl.platform.hsqldb.HsqlDbPlatform;
import org.jumpmind.symmetric.ddl.platform.hsqldb2.HsqlDb2Platform;
import org.jumpmind.symmetric.ddl.platform.informix.InformixPlatform;
import org.jumpmind.symmetric.ddl.platform.interbase.InterbasePlatform;
import org.jumpmind.symmetric.ddl.platform.mssql.MSSqlPlatform;
import org.jumpmind.symmetric.ddl.platform.mysql.MySqlPlatform;
import org.jumpmind.symmetric.ddl.platform.oracle.Oracle10Platform;
import org.jumpmind.symmetric.ddl.platform.oracle.Oracle8Platform;
import org.jumpmind.symmetric.ddl.platform.oracle.Oracle9Platform;
import org.jumpmind.symmetric.ddl.platform.postgresql.PostgreSqlPlatform;
import org.jumpmind.symmetric.ddl.platform.sqlite.SqLitePlatform;
import org.jumpmind.symmetric.ddl.platform.sybase.SybasePlatform;
import org.jumpmind.symmetric.db.ddl.Platform;
import org.jumpmind.symmetric.db.ddl.PlatformFactory;
import org.jumpmind.symmetric.db.ddl.PlatformUtils;
import org.jumpmind.symmetric.db.ddl.platform.db2.Db2Platform;
import org.jumpmind.symmetric.db.ddl.platform.derby.DerbyPlatform;
import org.jumpmind.symmetric.db.ddl.platform.firebird.FirebirdPlatform;
import org.jumpmind.symmetric.db.ddl.platform.greenplum.GreenplumPlatform;
import org.jumpmind.symmetric.db.ddl.platform.h2.H2Platform;
import org.jumpmind.symmetric.db.ddl.platform.hsqldb.HsqlDbPlatform;
import org.jumpmind.symmetric.db.ddl.platform.hsqldb2.HsqlDb2Platform;
import org.jumpmind.symmetric.db.ddl.platform.informix.InformixPlatform;
import org.jumpmind.symmetric.db.ddl.platform.interbase.InterbasePlatform;
import org.jumpmind.symmetric.db.ddl.platform.mssql.MSSqlPlatform;
import org.jumpmind.symmetric.db.ddl.platform.mysql.MySqlPlatform;
import org.jumpmind.symmetric.db.ddl.platform.oracle.Oracle10Platform;
import org.jumpmind.symmetric.db.ddl.platform.oracle.Oracle8Platform;
import org.jumpmind.symmetric.db.ddl.platform.oracle.Oracle9Platform;
import org.jumpmind.symmetric.db.ddl.platform.postgresql.PostgreSqlPlatform;
import org.jumpmind.symmetric.db.ddl.platform.sqlite.SqLitePlatform;
import org.jumpmind.symmetric.db.ddl.platform.sybase.SybasePlatform;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
import org.springframework.beans.factory.FactoryBean;
Expand Down
11 changes: 6 additions & 5 deletions symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/db/IDbDialect.java
View file
Expand Up @@ -23,11 +23,12 @@
import java.util.Map;
import java.util.Set;

import org.jumpmind.symmetric.db.DmlStatement.DmlType;
import org.jumpmind.symmetric.ddl.Platform;
import org.jumpmind.symmetric.ddl.model.Column;
import org.jumpmind.symmetric.ddl.model.Database;
import org.jumpmind.symmetric.ddl.model.Table;
import org.jumpmind.symmetric.db.ddl.Platform;
import org.jumpmind.symmetric.db.ddl.model.Column;
import org.jumpmind.symmetric.db.ddl.model.Database;
import org.jumpmind.symmetric.db.ddl.model.Table;
import org.jumpmind.symmetric.db.sql.DmlStatement;
import org.jumpmind.symmetric.db.sql.DmlStatement.DmlType;
import org.jumpmind.symmetric.ext.IDatabaseUpgradeListener;
import org.jumpmind.symmetric.load.IColumnFilter;
import org.jumpmind.symmetric.model.Channel;
Expand Down
4 changes: 2 additions & 2 deletions symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/db/SqlTemplate.java
View file
Expand Up @@ -28,10 +28,10 @@
import org.apache.commons.lang.StringUtils;
import org.jumpmind.symmetric.Version;
import org.jumpmind.symmetric.common.Constants;
import org.jumpmind.symmetric.db.ddl.model.Column;
import org.jumpmind.symmetric.db.ddl.model.Table;
import org.jumpmind.symmetric.db.mssql.MsSqlDbDialect;
import org.jumpmind.symmetric.db.postgresql.PostgreSqlDbDialect;
import org.jumpmind.symmetric.ddl.model.Column;
import org.jumpmind.symmetric.ddl.model.Table;
import org.jumpmind.symmetric.model.Channel;
import org.jumpmind.symmetric.model.DataEventType;
import org.jumpmind.symmetric.model.Node;
Expand Down
4 changes: 2 additions & 2 deletions symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/db/hsqldb/HsqlDbDialect.java
View file
Expand Up @@ -24,8 +24,8 @@
import org.jumpmind.symmetric.db.AbstractEmbeddedDbDialect;
import org.jumpmind.symmetric.db.BinaryEncoding;
import org.jumpmind.symmetric.db.IDbDialect;
import org.jumpmind.symmetric.ddl.Platform;
import org.jumpmind.symmetric.ddl.model.Table;
import org.jumpmind.symmetric.db.ddl.Platform;
import org.jumpmind.symmetric.db.ddl.model.Table;
import org.jumpmind.symmetric.model.Trigger;
import org.jumpmind.symmetric.model.TriggerHistory;
import org.springframework.jdbc.core.JdbcTemplate;
Expand Down
2 changes: 1 addition & 1 deletion symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/db/hsqldb2/HsqlDb2Dialect.java
View file
Expand Up @@ -24,7 +24,7 @@
import org.jumpmind.symmetric.db.AbstractDbDialect;
import org.jumpmind.symmetric.db.BinaryEncoding;
import org.jumpmind.symmetric.db.IDbDialect;
import org.jumpmind.symmetric.ddl.Platform;
import org.jumpmind.symmetric.db.ddl.Platform;
import org.jumpmind.symmetric.model.Trigger;
import org.jumpmind.symmetric.model.TriggerHistory;
import org.springframework.jdbc.core.JdbcTemplate;
Expand Down
2 changes: 1 addition & 1 deletion ...ic/symmetric-core/src/main/java/org/jumpmind/symmetric/db/informix/InformixDbDialect.java
View file
Expand Up @@ -27,7 +27,7 @@
import org.jumpmind.symmetric.db.AbstractDbDialect;
import org.jumpmind.symmetric.db.AutoIncrementColumnFilter;
import org.jumpmind.symmetric.db.IDbDialect;
import org.jumpmind.symmetric.ddl.Platform;
import org.jumpmind.symmetric.db.ddl.Platform;
import org.jumpmind.symmetric.load.IColumnFilter;
import org.jumpmind.symmetric.model.Trigger;
import org.springframework.jdbc.core.JdbcTemplate;
Expand Down
2 changes: 1 addition & 1 deletion symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/db/mssql/MsSqlDbDialect.java
View file
Expand Up @@ -33,7 +33,7 @@
import org.jumpmind.symmetric.db.AutoIncrementColumnFilter;
import org.jumpmind.symmetric.db.BinaryEncoding;
import org.jumpmind.symmetric.db.IDbDialect;
import org.jumpmind.symmetric.ddl.model.Table;
import org.jumpmind.symmetric.db.ddl.model.Table;
import org.jumpmind.symmetric.load.IColumnFilter;
import org.jumpmind.symmetric.model.Trigger;
import org.jumpmind.symmetric.model.TriggerHistory;
Expand Down
2 changes: 1 addition & 1 deletion symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/db/mysql/MySqlDbDialect.java
View file
Expand Up @@ -32,7 +32,7 @@
import org.jumpmind.symmetric.db.AbstractDbDialect;
import org.jumpmind.symmetric.db.BinaryEncoding;
import org.jumpmind.symmetric.db.IDbDialect;
import org.jumpmind.symmetric.ddl.Platform;
import org.jumpmind.symmetric.db.ddl.Platform;
import org.jumpmind.symmetric.model.Trigger;
import org.jumpmind.symmetric.model.TriggerHistory;
import org.springframework.jdbc.core.JdbcTemplate;
Expand Down
4 changes: 2 additions & 2 deletions symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/db/oracle/OracleDbDialect.java
View file
Expand Up @@ -31,8 +31,8 @@
import org.jumpmind.symmetric.db.BinaryEncoding;
import org.jumpmind.symmetric.db.IDbDialect;
import org.jumpmind.symmetric.db.SequenceIdentifier;
import org.jumpmind.symmetric.ddl.Platform;
import org.jumpmind.symmetric.ddl.model.Table;
import org.jumpmind.symmetric.db.ddl.Platform;
import org.jumpmind.symmetric.db.ddl.model.Table;
import org.jumpmind.symmetric.model.Channel;
import org.jumpmind.symmetric.model.DataEventType;
import org.jumpmind.symmetric.model.Trigger;
Expand Down
8 changes: 4 additions & 4 deletions ...ymmetric-core/src/main/java/org/jumpmind/symmetric/db/postgresql/PostgreSqlDbDialect.java
View file
Expand Up @@ -33,11 +33,11 @@
import org.jumpmind.symmetric.common.ParameterConstants;
import org.jumpmind.symmetric.db.AbstractDbDialect;
import org.jumpmind.symmetric.db.BinaryEncoding;
import org.jumpmind.symmetric.db.DmlStatement;
import org.jumpmind.symmetric.db.IDbDialect;
import org.jumpmind.symmetric.db.DmlStatement.DmlType;
import org.jumpmind.symmetric.ddl.Platform;
import org.jumpmind.symmetric.ddl.model.Column;
import org.jumpmind.symmetric.db.ddl.Platform;
import org.jumpmind.symmetric.db.ddl.model.Column;
import org.jumpmind.symmetric.db.sql.DmlStatement;
import org.jumpmind.symmetric.db.sql.DmlStatement.DmlType;
import org.jumpmind.symmetric.model.Trigger;
import org.jumpmind.symmetric.model.TriggerHistory;
import org.springframework.jdbc.core.JdbcTemplate;
Expand Down
4 changes: 2 additions & 2 deletions ...mmetric-core/src/main/java/org/jumpmind/symmetric/db/postgresql/PostgresDmlStatement.java
View file
Expand Up @@ -21,8 +21,8 @@
package org.jumpmind.symmetric.db.postgresql;

import org.apache.commons.lang.ArrayUtils;
import org.jumpmind.symmetric.db.DmlStatement;
import org.jumpmind.symmetric.ddl.model.Column;
import org.jumpmind.symmetric.db.ddl.model.Column;
import org.jumpmind.symmetric.db.sql.DmlStatement;

public class PostgresDmlStatement extends DmlStatement {

Expand Down
2 changes: 1 addition & 1 deletion symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/db/sybase/SybaseDbDialect.java
View file
Expand Up @@ -36,7 +36,7 @@
import org.jumpmind.symmetric.db.AutoIncrementColumnFilter;
import org.jumpmind.symmetric.db.BinaryEncoding;
import org.jumpmind.symmetric.db.IDbDialect;
import org.jumpmind.symmetric.ddl.model.Table;
import org.jumpmind.symmetric.db.ddl.model.Table;
import org.jumpmind.symmetric.load.IColumnFilter;
import org.jumpmind.symmetric.model.Trigger;
import org.jumpmind.symmetric.model.TriggerHistory;
Expand Down
2 changes: 1 addition & 1 deletion ...ric/symmetric-core/src/main/java/org/jumpmind/symmetric/ext/IDatabaseUpgradeListener.java
View file
Expand Up @@ -3,7 +3,7 @@
import java.io.IOException;

import org.jumpmind.symmetric.db.IDbDialect;
import org.jumpmind.symmetric.ddl.model.Database;
import org.jumpmind.symmetric.db.ddl.model.Database;

public interface IDatabaseUpgradeListener extends IExtensionPoint {

Expand Down
4 changes: 2 additions & 2 deletions ...tric-core/src/main/java/org/jumpmind/symmetric/extract/csv/AbstractStreamDataCommand.java
View file
Expand Up @@ -31,8 +31,8 @@
import org.jumpmind.symmetric.common.logging.ILog;
import org.jumpmind.symmetric.common.logging.LogFactory;
import org.jumpmind.symmetric.db.IDbDialect;
import org.jumpmind.symmetric.ddl.model.Column;
import org.jumpmind.symmetric.ddl.model.Table;
import org.jumpmind.symmetric.db.ddl.model.Column;
import org.jumpmind.symmetric.db.ddl.model.Table;
import org.jumpmind.symmetric.extract.DataExtractorContext;
import org.jumpmind.symmetric.model.Data;
import org.jumpmind.symmetric.model.Trigger;
Expand Down
2 changes: 1 addition & 1 deletion symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/load/DataLoaderContext.java
View file
Expand Up @@ -26,7 +26,7 @@
import org.jumpmind.symmetric.common.logging.ILog;
import org.jumpmind.symmetric.common.logging.LogFactory;
import org.jumpmind.symmetric.db.BinaryEncoding;
import org.jumpmind.symmetric.ddl.model.Table;
import org.jumpmind.symmetric.db.ddl.model.Table;
import org.jumpmind.symmetric.model.IncomingBatch;
import org.jumpmind.symmetric.model.Node;
import org.jumpmind.symmetric.model.NodeGroupLink;
Expand Down
4 changes: 2 additions & 2 deletions symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/load/IColumnFilter.java
View file
Expand Up @@ -20,8 +20,8 @@

package org.jumpmind.symmetric.load;

import org.jumpmind.symmetric.db.DmlStatement.DmlType;
import org.jumpmind.symmetric.ddl.model.Table;
import org.jumpmind.symmetric.db.ddl.model.Table;
import org.jumpmind.symmetric.db.sql.DmlStatement.DmlType;
import org.jumpmind.symmetric.ext.IExtensionPoint;

/**
Expand Down
2 changes: 1 addition & 1 deletion symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/load/IDataLoaderContext.java
View file
Expand Up @@ -19,8 +19,8 @@
* under the License. */
package org.jumpmind.symmetric.load;

import org.jumpmind.symmetric.ddl.model.Table;
import org.jumpmind.symmetric.db.BinaryEncoding;
import org.jumpmind.symmetric.db.ddl.model.Table;
import org.jumpmind.symmetric.ext.ICacheContext;
import org.jumpmind.symmetric.model.IncomingBatch;
import org.jumpmind.symmetric.model.Node;
Expand Down
8 changes: 4 additions & 4 deletions symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/load/TableTemplate.java
View file
Expand Up @@ -28,11 +28,11 @@

import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
import org.jumpmind.symmetric.db.DmlStatement;
import org.jumpmind.symmetric.db.IDbDialect;
import org.jumpmind.symmetric.db.DmlStatement.DmlType;
import org.jumpmind.symmetric.ddl.model.Column;
import org.jumpmind.symmetric.ddl.model.Table;
import org.jumpmind.symmetric.db.ddl.model.Column;
import org.jumpmind.symmetric.db.ddl.model.Table;
import org.jumpmind.symmetric.db.sql.DmlStatement;
import org.jumpmind.symmetric.db.sql.DmlStatement.DmlType;
import org.jumpmind.symmetric.util.ArgTypePreparedStatementSetter;
import org.springframework.jdbc.core.JdbcTemplate;

Expand Down
2 changes: 1 addition & 1 deletion symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/model/DataMetaData.java
View file
Expand Up @@ -20,7 +20,7 @@

package org.jumpmind.symmetric.model;

import org.jumpmind.symmetric.ddl.model.Table;
import org.jumpmind.symmetric.db.ddl.model.Table;

/**
*
Expand Down
4 changes: 2 additions & 2 deletions symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/model/Trigger.java
View file
Expand Up @@ -31,8 +31,8 @@
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jumpmind.symmetric.ddl.model.Column;
import org.jumpmind.symmetric.ddl.model.Table;
import org.jumpmind.symmetric.db.ddl.model.Column;
import org.jumpmind.symmetric.db.ddl.model.Table;

/**
* Defines the trigger via which a table will be synchronized.
Expand Down
4 changes: 2 additions & 2 deletions symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/model/TriggerHistory.java
View file
Expand Up @@ -24,8 +24,8 @@
import java.io.Serializable;
import java.util.Date;

import org.jumpmind.symmetric.ddl.model.Column;
import org.jumpmind.symmetric.ddl.model.Table;
import org.jumpmind.symmetric.db.ddl.model.Column;
import org.jumpmind.symmetric.db.ddl.model.Table;

/**
* Maps to the table sync audit table which tracks the history of sync trigger
Expand Down
4 changes: 2 additions & 2 deletions symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/model/TriggerRouter.java
View file
Expand Up @@ -27,8 +27,8 @@
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jumpmind.symmetric.ddl.model.Column;
import org.jumpmind.symmetric.ddl.model.Table;
import org.jumpmind.symmetric.db.ddl.model.Column;
import org.jumpmind.symmetric.db.ddl.model.Table;

/**
* Defines the trigger via which a table will be synchronized.
Expand Down
2 changes: 1 addition & 1 deletion ...ic/symmetric-core/src/main/java/org/jumpmind/symmetric/service/ITriggerRouterService.java
View file
Expand Up @@ -25,7 +25,7 @@
import java.util.Set;

import org.jumpmind.symmetric.config.ITriggerCreationListener;
import org.jumpmind.symmetric.ddl.model.Table;
import org.jumpmind.symmetric.db.ddl.model.Table;
import org.jumpmind.symmetric.ext.IExtraConfigTables;
import org.jumpmind.symmetric.model.NodeGroupLink;
import org.jumpmind.symmetric.model.Router;
Expand Down
6 changes: 3 additions & 3 deletions ...ymmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ConfigurationService.java
View file
Expand Up @@ -34,9 +34,9 @@
import org.apache.commons.lang.StringUtils;
import org.jumpmind.symmetric.common.ParameterConstants;
import org.jumpmind.symmetric.db.SqlScript;
import org.jumpmind.symmetric.ddl.Platform;
import org.jumpmind.symmetric.ddl.io.DatabaseIO;
import org.jumpmind.symmetric.ddl.model.Database;
import org.jumpmind.symmetric.db.ddl.Platform;
import org.jumpmind.symmetric.db.ddl.io.DatabaseIO;
import org.jumpmind.symmetric.db.ddl.model.Database;
import org.jumpmind.symmetric.model.Channel;
import org.jumpmind.symmetric.model.ChannelMap;
import org.jumpmind.symmetric.model.Node;
Expand Down
2 changes: 1 addition & 1 deletion ...ymmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataExtractorService.java
View file
Expand Up @@ -47,7 +47,7 @@
import org.jumpmind.symmetric.common.TableConstants;
import org.jumpmind.symmetric.common.csv.CsvConstants;
import org.jumpmind.symmetric.csv.CsvReader;
import org.jumpmind.symmetric.ddl.model.Table;
import org.jumpmind.symmetric.db.ddl.model.Table;
import org.jumpmind.symmetric.extract.DataExtractorContext;
import org.jumpmind.symmetric.extract.IDataExtractor;
import org.jumpmind.symmetric.extract.IExtractorFilter;
Expand Down
2 changes: 1 addition & 1 deletion symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataService.java
View file
Expand Up @@ -51,7 +51,7 @@
import org.jumpmind.symmetric.csv.CsvWriter;
import org.jumpmind.symmetric.db.JdbcBatchPreparedStatementCallback;
import org.jumpmind.symmetric.db.SequenceIdentifier;
import org.jumpmind.symmetric.ddl.model.Table;
import org.jumpmind.symmetric.db.ddl.model.Table;
import org.jumpmind.symmetric.ext.IHeartbeatListener;
import org.jumpmind.symmetric.load.IReloadListener;
import org.jumpmind.symmetric.model.Data;
Expand Down

0 comments on commit 49d3d02

Please sign in to comment.