From 19e43c5954428af06be24fa5105d010e583f92ad Mon Sep 17 00:00:00 2001 From: chenson42 Date: Thu, 14 Apr 2011 10:51:45 +0000 Subject: [PATCH] --- future/symmetric-data/.project | 2 +- .../{data => core}/common/BinaryEncoding.java | 2 +- .../{data => core}/common/DefaultLog.java | 2 +- .../symmetric/{data => core}/common/Log.java | 2 +- .../{data => core}/common/LogFactory.java | 2 +- .../{data => core}/common/LogLevel.java | 2 +- .../{data => core}/common/StringUtils.java | 2 +- .../{data => core}/db/AbstractPlatform.java | 4 +-- .../{data => core}/db/IPlatform.java | 4 +-- .../{data => core}/db/PlatformInfo.java | 8 ++--- .../symmetric/{data => core}/model/Batch.java | 2 +- .../{data => core}/model/Column.java | 2 +- .../jumpmind/symmetric/core/model/Data.java | 5 +++ .../{data => core}/model/Database.java | 4 +-- .../{data => core}/model/ForeignKey.java | 2 +- .../symmetric/{data => core}/model/Index.java | 2 +- .../{data => core}/model/IndexColumn.java | 2 +- .../{data => core}/model/NonUniqueIndex.java | 2 +- .../{data => core}/model/Parameters.java | 2 +- .../{data => core}/model/Reference.java | 2 +- .../symmetric/{data => core}/model/Table.java | 2 +- .../{data => core}/model/TypeCategory.java | 2 +- .../{data => core}/model/TypeMap.java | 2 +- .../{data => core}/model/UniqueIndex.java | 2 +- .../{data => core}/process/DataContext.java | 6 ++-- .../{data => core}/process/DataProcessor.java | 8 ++--- .../process/IDataProcessorListener.java | 4 +-- .../{data => core}/process/IDataReader.java | 8 ++--- .../{data => core}/process/IDataWriter.java | 6 ++-- .../process/IDataWriterErrorHandler.java | 6 ++-- .../core/process/binary/ObjectDataReader.java | 5 +++ .../core/process/binary/ObjectDataWriter.java | 5 +++ .../process/csv/CsvDataReader.java | 12 +++---- .../core/process/file/FileDataWriter.java | 5 +++ .../process/jdbc/JdbcDataContext.java | 4 +-- .../process/jdbc/JdbcDataWriter.java | 8 ++--- .../process/sql/DataException.java | 2 +- .../sql/DataIntegrityViolationException.java | 2 +- .../jumpmind/symmetric/data/model/Data.java | 5 --- .../data/process/binary/ObjectDataReader.java | 5 --- .../data/process/binary/ObjectDataWriter.java | 5 --- .../data/process/file/FileDataWriter.java | 5 --- future/symmetric-jdbc/.classpath | 2 +- future/symmetric-jdbc/.project | 2 +- .../jdbc/db/AbstractJdbcPlatform.java | 4 +-- .../symmetric/jdbc/db/JdbcModelReader.java | 32 +++++++++---------- .../jdbc/db/JdbcPlatformFactory.java | 4 +-- .../jdbc/db/oracle/OracleJdbcModelReader.java | 12 +++---- .../jdbc/db/oracle/OraclePlatform.java | 4 +-- .../jdbc/sql/StatementCreatorUtil.java | 6 ++-- .../jumpmind/symmetric/jdbc/sql/Template.java | 2 +- 51 files changed, 116 insertions(+), 116 deletions(-) rename future/symmetric-data/src/main/java/org/jumpmind/symmetric/{data => core}/common/BinaryEncoding.java (55%) rename future/symmetric-data/src/main/java/org/jumpmind/symmetric/{data => core}/common/DefaultLog.java (96%) rename future/symmetric-data/src/main/java/org/jumpmind/symmetric/{data => core}/common/Log.java (89%) rename future/symmetric-data/src/main/java/org/jumpmind/symmetric/{data => core}/common/LogFactory.java (96%) rename future/symmetric-data/src/main/java/org/jumpmind/symmetric/{data => core}/common/LogLevel.java (58%) rename future/symmetric-data/src/main/java/org/jumpmind/symmetric/{data => core}/common/StringUtils.java (99%) rename future/symmetric-data/src/main/java/org/jumpmind/symmetric/{data => core}/db/AbstractPlatform.java (97%) rename future/symmetric-data/src/main/java/org/jumpmind/symmetric/{data => core}/db/IPlatform.java (93%) rename future/symmetric-data/src/main/java/org/jumpmind/symmetric/{data => core}/db/PlatformInfo.java (96%) rename future/symmetric-data/src/main/java/org/jumpmind/symmetric/{data => core}/model/Batch.java (90%) rename future/symmetric-data/src/main/java/org/jumpmind/symmetric/{data => core}/model/Column.java (99%) create mode 100644 future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/model/Data.java rename future/symmetric-data/src/main/java/org/jumpmind/symmetric/{data => core}/model/Database.java (99%) rename future/symmetric-data/src/main/java/org/jumpmind/symmetric/{data => core}/model/ForeignKey.java (99%) rename future/symmetric-data/src/main/java/org/jumpmind/symmetric/{data => core}/model/Index.java (94%) rename future/symmetric-data/src/main/java/org/jumpmind/symmetric/{data => core}/model/IndexColumn.java (99%) rename future/symmetric-data/src/main/java/org/jumpmind/symmetric/{data => core}/model/NonUniqueIndex.java (94%) rename future/symmetric-data/src/main/java/org/jumpmind/symmetric/{data => core}/model/Parameters.java (92%) rename future/symmetric-data/src/main/java/org/jumpmind/symmetric/{data => core}/model/Reference.java (99%) rename future/symmetric-data/src/main/java/org/jumpmind/symmetric/{data => core}/model/Table.java (99%) rename future/symmetric-data/src/main/java/org/jumpmind/symmetric/{data => core}/model/TypeCategory.java (74%) rename future/symmetric-data/src/main/java/org/jumpmind/symmetric/{data => core}/model/TypeMap.java (99%) rename future/symmetric-data/src/main/java/org/jumpmind/symmetric/{data => core}/model/UniqueIndex.java (98%) rename future/symmetric-data/src/main/java/org/jumpmind/symmetric/{data => core}/process/DataContext.java (82%) rename future/symmetric-data/src/main/java/org/jumpmind/symmetric/{data => core}/process/DataProcessor.java (94%) rename future/symmetric-data/src/main/java/org/jumpmind/symmetric/{data => core}/process/IDataProcessorListener.java (81%) rename future/symmetric-data/src/main/java/org/jumpmind/symmetric/{data => core}/process/IDataReader.java (59%) rename future/symmetric-data/src/main/java/org/jumpmind/symmetric/{data => core}/process/IDataWriter.java (71%) rename future/symmetric-data/src/main/java/org/jumpmind/symmetric/{data => core}/process/IDataWriterErrorHandler.java (50%) create mode 100644 future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/binary/ObjectDataReader.java create mode 100644 future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/binary/ObjectDataWriter.java rename future/symmetric-data/src/main/java/org/jumpmind/symmetric/{data => core}/process/csv/CsvDataReader.java (73%) create mode 100644 future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/file/FileDataWriter.java rename future/symmetric-data/src/main/java/org/jumpmind/symmetric/{data => core}/process/jdbc/JdbcDataContext.java (83%) rename future/symmetric-data/src/main/java/org/jumpmind/symmetric/{data => core}/process/jdbc/JdbcDataWriter.java (87%) rename future/symmetric-data/src/main/java/org/jumpmind/symmetric/{data => core}/process/sql/DataException.java (89%) rename future/symmetric-data/src/main/java/org/jumpmind/symmetric/{data => core}/process/sql/DataIntegrityViolationException.java (91%) delete mode 100644 future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/model/Data.java delete mode 100644 future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/binary/ObjectDataReader.java delete mode 100644 future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/binary/ObjectDataWriter.java delete mode 100644 future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/file/FileDataWriter.java diff --git a/future/symmetric-data/.project b/future/symmetric-data/.project index 319fa4dafe..0dd883fc46 100644 --- a/future/symmetric-data/.project +++ b/future/symmetric-data/.project @@ -1,6 +1,6 @@ - symmetric-data + symmetric3-core diff --git a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/common/BinaryEncoding.java b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/common/BinaryEncoding.java similarity index 55% rename from future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/common/BinaryEncoding.java rename to future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/common/BinaryEncoding.java index 94e5e4dbcd..132c2098f5 100644 --- a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/common/BinaryEncoding.java +++ b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/common/BinaryEncoding.java @@ -1,4 +1,4 @@ -package org.jumpmind.symmetric.data.common; +package org.jumpmind.symmetric.core.common; public enum BinaryEncoding { NONE, BASE64, HEX; diff --git a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/common/DefaultLog.java b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/common/DefaultLog.java similarity index 96% rename from future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/common/DefaultLog.java rename to future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/common/DefaultLog.java index cc8a7ab4d0..cccf6d50ae 100644 --- a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/common/DefaultLog.java +++ b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/common/DefaultLog.java @@ -1,4 +1,4 @@ -package org.jumpmind.symmetric.data.common; +package org.jumpmind.symmetric.core.common; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/common/Log.java b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/common/Log.java similarity index 89% rename from future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/common/Log.java rename to future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/common/Log.java index f48cca41ec..3087dda8f4 100644 --- a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/common/Log.java +++ b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/common/Log.java @@ -1,4 +1,4 @@ -package org.jumpmind.symmetric.data.common; +package org.jumpmind.symmetric.core.common; abstract public class Log { diff --git a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/common/LogFactory.java b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/common/LogFactory.java similarity index 96% rename from future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/common/LogFactory.java rename to future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/common/LogFactory.java index ea1c8bc2ee..06e0a9b801 100644 --- a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/common/LogFactory.java +++ b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/common/LogFactory.java @@ -1,4 +1,4 @@ -package org.jumpmind.symmetric.data.common; +package org.jumpmind.symmetric.core.common; import java.util.HashMap; import java.util.Map; diff --git a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/common/LogLevel.java b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/common/LogLevel.java similarity index 58% rename from future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/common/LogLevel.java rename to future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/common/LogLevel.java index 5bd6d3c99d..9a0e4109e3 100644 --- a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/common/LogLevel.java +++ b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/common/LogLevel.java @@ -1,4 +1,4 @@ -package org.jumpmind.symmetric.data.common; +package org.jumpmind.symmetric.core.common; public enum LogLevel { DEBUG, INFO, WARN, ERROR, FATAL diff --git a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/common/StringUtils.java b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/common/StringUtils.java similarity index 99% rename from future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/common/StringUtils.java rename to future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/common/StringUtils.java index 5aade96ff9..59e479c319 100644 --- a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/common/StringUtils.java +++ b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/common/StringUtils.java @@ -1,4 +1,4 @@ -package org.jumpmind.symmetric.data.common; +package org.jumpmind.symmetric.core.common; public class StringUtils { diff --git a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/db/AbstractPlatform.java b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/db/AbstractPlatform.java similarity index 97% rename from future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/db/AbstractPlatform.java rename to future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/db/AbstractPlatform.java index db79948c92..a11a72ec4b 100644 --- a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/db/AbstractPlatform.java +++ b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/db/AbstractPlatform.java @@ -1,6 +1,6 @@ -package org.jumpmind.symmetric.data.db; +package org.jumpmind.symmetric.core.db; -import org.jumpmind.symmetric.data.model.Table; +import org.jumpmind.symmetric.core.model.Table; abstract public class AbstractPlatform implements IPlatform { diff --git a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/db/IPlatform.java b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/db/IPlatform.java similarity index 93% rename from future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/db/IPlatform.java rename to future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/db/IPlatform.java index 391d892583..bf7f0c5f5d 100644 --- a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/db/IPlatform.java +++ b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/db/IPlatform.java @@ -1,8 +1,8 @@ -package org.jumpmind.symmetric.data.db; +package org.jumpmind.symmetric.core.db; import java.util.List; -import org.jumpmind.symmetric.data.model.Table; +import org.jumpmind.symmetric.core.model.Table; public interface IPlatform { diff --git a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/db/PlatformInfo.java b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/db/PlatformInfo.java similarity index 96% rename from future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/db/PlatformInfo.java rename to future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/db/PlatformInfo.java index 7f00dfb1e6..82f586c184 100644 --- a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/db/PlatformInfo.java +++ b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/db/PlatformInfo.java @@ -1,4 +1,4 @@ -package org.jumpmind.symmetric.data.db; +package org.jumpmind.symmetric.core.db; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,9 +24,9 @@ import java.util.HashMap; import java.util.HashSet; -import org.jumpmind.symmetric.data.common.Log; -import org.jumpmind.symmetric.data.common.LogFactory; -import org.jumpmind.symmetric.data.common.LogLevel; +import org.jumpmind.symmetric.core.common.Log; +import org.jumpmind.symmetric.core.common.LogFactory; +import org.jumpmind.symmetric.core.common.LogLevel; /** * Contains information about the database platform such as supported features diff --git a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/model/Batch.java b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/model/Batch.java similarity index 90% rename from future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/model/Batch.java rename to future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/model/Batch.java index 9f851df10d..dc24304e74 100644 --- a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/model/Batch.java +++ b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/model/Batch.java @@ -1,4 +1,4 @@ -package org.jumpmind.symmetric.data.model; +package org.jumpmind.symmetric.core.model; public class Batch { diff --git a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/model/Column.java b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/model/Column.java similarity index 99% rename from future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/model/Column.java rename to future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/model/Column.java index 1fa5fedbf4..5448e197b7 100644 --- a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/model/Column.java +++ b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/model/Column.java @@ -1,4 +1,4 @@ -package org.jumpmind.symmetric.data.model; +package org.jumpmind.symmetric.core.model; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/model/Data.java b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/model/Data.java new file mode 100644 index 0000000000..f2e9453c8a --- /dev/null +++ b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/model/Data.java @@ -0,0 +1,5 @@ +package org.jumpmind.symmetric.core.model; + +public class Data { + +} diff --git a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/model/Database.java b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/model/Database.java similarity index 99% rename from future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/model/Database.java rename to future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/model/Database.java index c5db94f7d7..cfd791d67c 100644 --- a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/model/Database.java +++ b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/model/Database.java @@ -1,4 +1,4 @@ -package org.jumpmind.symmetric.data.model; +package org.jumpmind.symmetric.core.model; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -26,7 +26,7 @@ import java.util.HashSet; import java.util.Iterator; -import org.jumpmind.symmetric.data.process.sql.DataException; +import org.jumpmind.symmetric.core.process.sql.DataException; /** * Represents the database model, ie. the tables in the database. It also diff --git a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/model/ForeignKey.java b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/model/ForeignKey.java similarity index 99% rename from future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/model/ForeignKey.java rename to future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/model/ForeignKey.java index a3fb68d785..61eb39956e 100644 --- a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/model/ForeignKey.java +++ b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/model/ForeignKey.java @@ -1,4 +1,4 @@ -package org.jumpmind.symmetric.data.model; +package org.jumpmind.symmetric.core.model; import java.util.ArrayList; import java.util.Iterator; diff --git a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/model/Index.java b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/model/Index.java similarity index 94% rename from future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/model/Index.java rename to future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/model/Index.java index d9a47c1d52..1959a2a104 100644 --- a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/model/Index.java +++ b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/model/Index.java @@ -1,4 +1,4 @@ -package org.jumpmind.symmetric.data.model; +package org.jumpmind.symmetric.core.model; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/model/IndexColumn.java b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/model/IndexColumn.java similarity index 99% rename from future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/model/IndexColumn.java rename to future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/model/IndexColumn.java index c579442bd5..ee02422422 100644 --- a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/model/IndexColumn.java +++ b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/model/IndexColumn.java @@ -1,4 +1,4 @@ -package org.jumpmind.symmetric.data.model; +package org.jumpmind.symmetric.core.model; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/model/NonUniqueIndex.java b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/model/NonUniqueIndex.java similarity index 94% rename from future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/model/NonUniqueIndex.java rename to future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/model/NonUniqueIndex.java index 6f4af01732..995c4f9613 100644 --- a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/model/NonUniqueIndex.java +++ b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/model/NonUniqueIndex.java @@ -1,4 +1,4 @@ -package org.jumpmind.symmetric.data.model; +package org.jumpmind.symmetric.core.model; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/model/Parameters.java b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/model/Parameters.java similarity index 92% rename from future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/model/Parameters.java rename to future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/model/Parameters.java index db8fb9dff8..6e3249fb46 100644 --- a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/model/Parameters.java +++ b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/model/Parameters.java @@ -1,4 +1,4 @@ -package org.jumpmind.symmetric.data.model; +package org.jumpmind.symmetric.core.model; import java.util.HashMap; diff --git a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/model/Reference.java b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/model/Reference.java similarity index 99% rename from future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/model/Reference.java rename to future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/model/Reference.java index 016cdfc28b..f3cd329c91 100644 --- a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/model/Reference.java +++ b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/model/Reference.java @@ -1,4 +1,4 @@ -package org.jumpmind.symmetric.data.model; +package org.jumpmind.symmetric.core.model; import java.io.Serializable; diff --git a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/model/Table.java b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/model/Table.java similarity index 99% rename from future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/model/Table.java rename to future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/model/Table.java index a8d7165246..9983603d91 100644 --- a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/model/Table.java +++ b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/model/Table.java @@ -1,4 +1,4 @@ -package org.jumpmind.symmetric.data.model; +package org.jumpmind.symmetric.core.model; import java.io.Serializable; import java.text.Collator; diff --git a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/model/TypeCategory.java b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/model/TypeCategory.java similarity index 74% rename from future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/model/TypeCategory.java rename to future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/model/TypeCategory.java index 05b59d427a..24b23912f5 100644 --- a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/model/TypeCategory.java +++ b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/model/TypeCategory.java @@ -1,4 +1,4 @@ -package org.jumpmind.symmetric.data.model; +package org.jumpmind.symmetric.core.model; /** * Represents the different categories of jdbc types. diff --git a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/model/TypeMap.java b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/model/TypeMap.java similarity index 99% rename from future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/model/TypeMap.java rename to future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/model/TypeMap.java index 7488850842..8e6814ff7a 100644 --- a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/model/TypeMap.java +++ b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/model/TypeMap.java @@ -1,4 +1,4 @@ -package org.jumpmind.symmetric.data.model; +package org.jumpmind.symmetric.core.model; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/model/UniqueIndex.java b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/model/UniqueIndex.java similarity index 98% rename from future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/model/UniqueIndex.java rename to future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/model/UniqueIndex.java index 943cbdaf4a..cfb8e8b4d6 100644 --- a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/model/UniqueIndex.java +++ b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/model/UniqueIndex.java @@ -1,4 +1,4 @@ -package org.jumpmind.symmetric.data.model; +package org.jumpmind.symmetric.core.model; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/DataContext.java b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/DataContext.java similarity index 82% rename from future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/DataContext.java rename to future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/DataContext.java index b95ab5a0d1..937f163426 100644 --- a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/DataContext.java +++ b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/DataContext.java @@ -1,10 +1,10 @@ -package org.jumpmind.symmetric.data.process; +package org.jumpmind.symmetric.core.process; import java.util.HashMap; import java.util.Map; -import org.jumpmind.symmetric.data.model.Batch; -import org.jumpmind.symmetric.data.model.Table; +import org.jumpmind.symmetric.core.model.Batch; +import org.jumpmind.symmetric.core.model.Table; public class DataContext { diff --git a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/DataProcessor.java b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/DataProcessor.java similarity index 94% rename from future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/DataProcessor.java rename to future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/DataProcessor.java index a0011e00e4..9569b0fe37 100644 --- a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/DataProcessor.java +++ b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/DataProcessor.java @@ -1,8 +1,8 @@ -package org.jumpmind.symmetric.data.process; +package org.jumpmind.symmetric.core.process; -import org.jumpmind.symmetric.data.model.Batch; -import org.jumpmind.symmetric.data.model.Data; -import org.jumpmind.symmetric.data.model.Table; +import org.jumpmind.symmetric.core.model.Batch; +import org.jumpmind.symmetric.core.model.Data; +import org.jumpmind.symmetric.core.model.Table; public class DataProcessor { diff --git a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/IDataProcessorListener.java b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/IDataProcessorListener.java similarity index 81% rename from future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/IDataProcessorListener.java rename to future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/IDataProcessorListener.java index 886ac0c52c..3ffb0284e8 100644 --- a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/IDataProcessorListener.java +++ b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/IDataProcessorListener.java @@ -1,6 +1,6 @@ -package org.jumpmind.symmetric.data.process; +package org.jumpmind.symmetric.core.process; -import org.jumpmind.symmetric.data.model.Batch; +import org.jumpmind.symmetric.core.model.Batch; public interface IDataProcessorListener { diff --git a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/IDataReader.java b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/IDataReader.java similarity index 59% rename from future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/IDataReader.java rename to future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/IDataReader.java index ae05044359..c09cc55f14 100644 --- a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/IDataReader.java +++ b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/IDataReader.java @@ -1,8 +1,8 @@ -package org.jumpmind.symmetric.data.process; +package org.jumpmind.symmetric.core.process; -import org.jumpmind.symmetric.data.model.Batch; -import org.jumpmind.symmetric.data.model.Data; -import org.jumpmind.symmetric.data.model.Table; +import org.jumpmind.symmetric.core.model.Batch; +import org.jumpmind.symmetric.core.model.Data; +import org.jumpmind.symmetric.core.model.Table; public interface IDataReader { diff --git a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/IDataWriter.java b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/IDataWriter.java similarity index 71% rename from future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/IDataWriter.java rename to future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/IDataWriter.java index 2d85d6f14a..5d179aa5e1 100644 --- a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/IDataWriter.java +++ b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/IDataWriter.java @@ -1,7 +1,7 @@ -package org.jumpmind.symmetric.data.process; +package org.jumpmind.symmetric.core.process; -import org.jumpmind.symmetric.data.common.BinaryEncoding; -import org.jumpmind.symmetric.data.model.Data; +import org.jumpmind.symmetric.core.common.BinaryEncoding; +import org.jumpmind.symmetric.core.model.Data; public interface IDataWriter { diff --git a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/IDataWriterErrorHandler.java b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/IDataWriterErrorHandler.java similarity index 50% rename from future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/IDataWriterErrorHandler.java rename to future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/IDataWriterErrorHandler.java index 3db709cc2e..e5bd9585dd 100644 --- a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/IDataWriterErrorHandler.java +++ b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/IDataWriterErrorHandler.java @@ -1,7 +1,7 @@ -package org.jumpmind.symmetric.data.process; +package org.jumpmind.symmetric.core.process; -import org.jumpmind.symmetric.data.model.Batch; -import org.jumpmind.symmetric.data.model.Data; +import org.jumpmind.symmetric.core.model.Batch; +import org.jumpmind.symmetric.core.model.Data; public interface IDataWriterErrorHandler { diff --git a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/binary/ObjectDataReader.java b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/binary/ObjectDataReader.java new file mode 100644 index 0000000000..463bcffe68 --- /dev/null +++ b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/binary/ObjectDataReader.java @@ -0,0 +1,5 @@ +package org.jumpmind.symmetric.core.process.binary; + +public class ObjectDataReader { + +} diff --git a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/binary/ObjectDataWriter.java b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/binary/ObjectDataWriter.java new file mode 100644 index 0000000000..a459d1514f --- /dev/null +++ b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/binary/ObjectDataWriter.java @@ -0,0 +1,5 @@ +package org.jumpmind.symmetric.core.process.binary; + +public class ObjectDataWriter { + +} diff --git a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/csv/CsvDataReader.java b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/csv/CsvDataReader.java similarity index 73% rename from future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/csv/CsvDataReader.java rename to future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/csv/CsvDataReader.java index 48944c611f..31c81d144b 100644 --- a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/csv/CsvDataReader.java +++ b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/csv/CsvDataReader.java @@ -1,10 +1,10 @@ -package org.jumpmind.symmetric.data.process.csv; +package org.jumpmind.symmetric.core.process.csv; -import org.jumpmind.symmetric.data.model.Batch; -import org.jumpmind.symmetric.data.model.Data; -import org.jumpmind.symmetric.data.model.Table; -import org.jumpmind.symmetric.data.process.DataContext; -import org.jumpmind.symmetric.data.process.IDataReader; +import org.jumpmind.symmetric.core.model.Batch; +import org.jumpmind.symmetric.core.model.Data; +import org.jumpmind.symmetric.core.model.Table; +import org.jumpmind.symmetric.core.process.DataContext; +import org.jumpmind.symmetric.core.process.IDataReader; public class CsvDataReader implements IDataReader { diff --git a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/file/FileDataWriter.java b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/file/FileDataWriter.java new file mode 100644 index 0000000000..7092a8c4ce --- /dev/null +++ b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/file/FileDataWriter.java @@ -0,0 +1,5 @@ +package org.jumpmind.symmetric.core.process.file; + +public class FileDataWriter { + +} diff --git a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/jdbc/JdbcDataContext.java b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/jdbc/JdbcDataContext.java similarity index 83% rename from future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/jdbc/JdbcDataContext.java rename to future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/jdbc/JdbcDataContext.java index 49d173e492..4d945a2327 100644 --- a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/jdbc/JdbcDataContext.java +++ b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/jdbc/JdbcDataContext.java @@ -1,8 +1,8 @@ -package org.jumpmind.symmetric.data.process.jdbc; +package org.jumpmind.symmetric.core.process.jdbc; import java.sql.Connection; -import org.jumpmind.symmetric.data.process.DataContext; +import org.jumpmind.symmetric.core.process.DataContext; public class JdbcDataContext extends DataContext { diff --git a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/jdbc/JdbcDataWriter.java b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/jdbc/JdbcDataWriter.java similarity index 87% rename from future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/jdbc/JdbcDataWriter.java rename to future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/jdbc/JdbcDataWriter.java index 10ed42375c..6731b1bdd2 100644 --- a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/jdbc/JdbcDataWriter.java +++ b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/jdbc/JdbcDataWriter.java @@ -1,12 +1,12 @@ -package org.jumpmind.symmetric.data.process.jdbc; +package org.jumpmind.symmetric.core.process.jdbc; import java.sql.SQLException; import javax.sql.DataSource; -import org.jumpmind.symmetric.data.common.BinaryEncoding; -import org.jumpmind.symmetric.data.model.Data; -import org.jumpmind.symmetric.data.process.IDataWriter; +import org.jumpmind.symmetric.core.common.BinaryEncoding; +import org.jumpmind.symmetric.core.model.Data; +import org.jumpmind.symmetric.core.process.IDataWriter; public class JdbcDataWriter implements IDataWriter { diff --git a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/sql/DataException.java b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/sql/DataException.java similarity index 89% rename from future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/sql/DataException.java rename to future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/sql/DataException.java index 521ac18287..e84cb0bbca 100644 --- a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/sql/DataException.java +++ b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/sql/DataException.java @@ -1,4 +1,4 @@ -package org.jumpmind.symmetric.data.process.sql; +package org.jumpmind.symmetric.core.process.sql; public class DataException extends RuntimeException { diff --git a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/sql/DataIntegrityViolationException.java b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/sql/DataIntegrityViolationException.java similarity index 91% rename from future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/sql/DataIntegrityViolationException.java rename to future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/sql/DataIntegrityViolationException.java index 717dc1b56c..c7a563c3d0 100644 --- a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/sql/DataIntegrityViolationException.java +++ b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/core/process/sql/DataIntegrityViolationException.java @@ -1,4 +1,4 @@ -package org.jumpmind.symmetric.data.process.sql; +package org.jumpmind.symmetric.core.process.sql; public class DataIntegrityViolationException extends DataException { diff --git a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/model/Data.java b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/model/Data.java deleted file mode 100644 index e80080df20..0000000000 --- a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/model/Data.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.jumpmind.symmetric.data.model; - -public class Data { - -} diff --git a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/binary/ObjectDataReader.java b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/binary/ObjectDataReader.java deleted file mode 100644 index d575c1cbc9..0000000000 --- a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/binary/ObjectDataReader.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.jumpmind.symmetric.data.process.binary; - -public class ObjectDataReader { - -} diff --git a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/binary/ObjectDataWriter.java b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/binary/ObjectDataWriter.java deleted file mode 100644 index f1c71b2900..0000000000 --- a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/binary/ObjectDataWriter.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.jumpmind.symmetric.data.process.binary; - -public class ObjectDataWriter { - -} diff --git a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/file/FileDataWriter.java b/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/file/FileDataWriter.java deleted file mode 100644 index 6de50864ed..0000000000 --- a/future/symmetric-data/src/main/java/org/jumpmind/symmetric/data/process/file/FileDataWriter.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.jumpmind.symmetric.data.process.file; - -public class FileDataWriter { - -} diff --git a/future/symmetric-jdbc/.classpath b/future/symmetric-jdbc/.classpath index 7ac258f3b2..dec2d9d678 100644 --- a/future/symmetric-jdbc/.classpath +++ b/future/symmetric-jdbc/.classpath @@ -2,6 +2,6 @@ - + diff --git a/future/symmetric-jdbc/.project b/future/symmetric-jdbc/.project index cc7edb124e..304b0ad6a8 100644 --- a/future/symmetric-jdbc/.project +++ b/future/symmetric-jdbc/.project @@ -1,6 +1,6 @@ - symmetric-jdbc + symmetric3-jdbc diff --git a/future/symmetric-jdbc/src/main/java/org/jumpmind/symmetric/jdbc/db/AbstractJdbcPlatform.java b/future/symmetric-jdbc/src/main/java/org/jumpmind/symmetric/jdbc/db/AbstractJdbcPlatform.java index c41ba6352c..dedc073a70 100644 --- a/future/symmetric-jdbc/src/main/java/org/jumpmind/symmetric/jdbc/db/AbstractJdbcPlatform.java +++ b/future/symmetric-jdbc/src/main/java/org/jumpmind/symmetric/jdbc/db/AbstractJdbcPlatform.java @@ -2,8 +2,8 @@ import javax.sql.DataSource; -import org.jumpmind.symmetric.data.db.AbstractPlatform; -import org.jumpmind.symmetric.data.model.Table; +import org.jumpmind.symmetric.core.db.AbstractPlatform; +import org.jumpmind.symmetric.core.model.Table; abstract public class AbstractJdbcPlatform extends AbstractPlatform { diff --git a/future/symmetric-jdbc/src/main/java/org/jumpmind/symmetric/jdbc/db/JdbcModelReader.java b/future/symmetric-jdbc/src/main/java/org/jumpmind/symmetric/jdbc/db/JdbcModelReader.java index 82e9bc0898..fcf447fd58 100644 --- a/future/symmetric-jdbc/src/main/java/org/jumpmind/symmetric/jdbc/db/JdbcModelReader.java +++ b/future/symmetric-jdbc/src/main/java/org/jumpmind/symmetric/jdbc/db/JdbcModelReader.java @@ -39,22 +39,22 @@ import javax.sql.DataSource; -import org.jumpmind.symmetric.data.common.Log; -import org.jumpmind.symmetric.data.common.LogFactory; -import org.jumpmind.symmetric.data.common.LogLevel; -import org.jumpmind.symmetric.data.common.StringUtils; -import org.jumpmind.symmetric.data.db.IPlatform; -import org.jumpmind.symmetric.data.db.PlatformInfo; -import org.jumpmind.symmetric.data.model.Column; -import org.jumpmind.symmetric.data.model.Database; -import org.jumpmind.symmetric.data.model.ForeignKey; -import org.jumpmind.symmetric.data.model.Index; -import org.jumpmind.symmetric.data.model.IndexColumn; -import org.jumpmind.symmetric.data.model.NonUniqueIndex; -import org.jumpmind.symmetric.data.model.Reference; -import org.jumpmind.symmetric.data.model.Table; -import org.jumpmind.symmetric.data.model.UniqueIndex; -import org.jumpmind.symmetric.data.process.sql.DataException; +import org.jumpmind.symmetric.core.common.Log; +import org.jumpmind.symmetric.core.common.LogFactory; +import org.jumpmind.symmetric.core.common.LogLevel; +import org.jumpmind.symmetric.core.common.StringUtils; +import org.jumpmind.symmetric.core.db.IPlatform; +import org.jumpmind.symmetric.core.db.PlatformInfo; +import org.jumpmind.symmetric.core.model.Column; +import org.jumpmind.symmetric.core.model.Database; +import org.jumpmind.symmetric.core.model.ForeignKey; +import org.jumpmind.symmetric.core.model.Index; +import org.jumpmind.symmetric.core.model.IndexColumn; +import org.jumpmind.symmetric.core.model.NonUniqueIndex; +import org.jumpmind.symmetric.core.model.Reference; +import org.jumpmind.symmetric.core.model.Table; +import org.jumpmind.symmetric.core.model.UniqueIndex; +import org.jumpmind.symmetric.core.process.sql.DataException; import org.jumpmind.symmetric.jdbc.sql.IConnectionCallback; import org.jumpmind.symmetric.jdbc.sql.Template; diff --git a/future/symmetric-jdbc/src/main/java/org/jumpmind/symmetric/jdbc/db/JdbcPlatformFactory.java b/future/symmetric-jdbc/src/main/java/org/jumpmind/symmetric/jdbc/db/JdbcPlatformFactory.java index 2ced6f0f0d..647cc379ce 100644 --- a/future/symmetric-jdbc/src/main/java/org/jumpmind/symmetric/jdbc/db/JdbcPlatformFactory.java +++ b/future/symmetric-jdbc/src/main/java/org/jumpmind/symmetric/jdbc/db/JdbcPlatformFactory.java @@ -8,8 +8,8 @@ import javax.sql.DataSource; -import org.jumpmind.symmetric.data.db.IPlatform; -import org.jumpmind.symmetric.data.process.sql.DataException; +import org.jumpmind.symmetric.core.db.IPlatform; +import org.jumpmind.symmetric.core.process.sql.DataException; import org.jumpmind.symmetric.jdbc.db.oracle.OraclePlatform; public class JdbcPlatformFactory { diff --git a/future/symmetric-jdbc/src/main/java/org/jumpmind/symmetric/jdbc/db/oracle/OracleJdbcModelReader.java b/future/symmetric-jdbc/src/main/java/org/jumpmind/symmetric/jdbc/db/oracle/OracleJdbcModelReader.java index e963a5024f..fd31ace601 100644 --- a/future/symmetric-jdbc/src/main/java/org/jumpmind/symmetric/jdbc/db/oracle/OracleJdbcModelReader.java +++ b/future/symmetric-jdbc/src/main/java/org/jumpmind/symmetric/jdbc/db/oracle/OracleJdbcModelReader.java @@ -17,12 +17,12 @@ import javax.sql.DataSource; -import org.jumpmind.symmetric.data.common.LogLevel; -import org.jumpmind.symmetric.data.db.IPlatform; -import org.jumpmind.symmetric.data.model.Column; -import org.jumpmind.symmetric.data.model.Index; -import org.jumpmind.symmetric.data.model.Table; -import org.jumpmind.symmetric.data.model.TypeMap; +import org.jumpmind.symmetric.core.common.LogLevel; +import org.jumpmind.symmetric.core.db.IPlatform; +import org.jumpmind.symmetric.core.model.Column; +import org.jumpmind.symmetric.core.model.Index; +import org.jumpmind.symmetric.core.model.Table; +import org.jumpmind.symmetric.core.model.TypeMap; import org.jumpmind.symmetric.jdbc.db.DatabaseMetaDataWrapper; import org.jumpmind.symmetric.jdbc.db.JdbcModelReader; diff --git a/future/symmetric-jdbc/src/main/java/org/jumpmind/symmetric/jdbc/db/oracle/OraclePlatform.java b/future/symmetric-jdbc/src/main/java/org/jumpmind/symmetric/jdbc/db/oracle/OraclePlatform.java index 1b0a275bce..0935f70e51 100644 --- a/future/symmetric-jdbc/src/main/java/org/jumpmind/symmetric/jdbc/db/oracle/OraclePlatform.java +++ b/future/symmetric-jdbc/src/main/java/org/jumpmind/symmetric/jdbc/db/oracle/OraclePlatform.java @@ -2,8 +2,8 @@ import java.sql.Types; -import org.jumpmind.symmetric.data.common.StringUtils; -import org.jumpmind.symmetric.data.db.PlatformInfo; +import org.jumpmind.symmetric.core.common.StringUtils; +import org.jumpmind.symmetric.core.db.PlatformInfo; import org.jumpmind.symmetric.jdbc.db.AbstractJdbcPlatform; import org.jumpmind.symmetric.jdbc.sql.Template; diff --git a/future/symmetric-jdbc/src/main/java/org/jumpmind/symmetric/jdbc/sql/StatementCreatorUtil.java b/future/symmetric-jdbc/src/main/java/org/jumpmind/symmetric/jdbc/sql/StatementCreatorUtil.java index 4d534b648c..866735b1e3 100644 --- a/future/symmetric-jdbc/src/main/java/org/jumpmind/symmetric/jdbc/sql/StatementCreatorUtil.java +++ b/future/symmetric-jdbc/src/main/java/org/jumpmind/symmetric/jdbc/sql/StatementCreatorUtil.java @@ -29,9 +29,9 @@ import java.util.HashMap; import java.util.Map; -import org.jumpmind.symmetric.data.common.Log; -import org.jumpmind.symmetric.data.common.LogFactory; -import org.jumpmind.symmetric.data.common.LogLevel; +import org.jumpmind.symmetric.core.common.Log; +import org.jumpmind.symmetric.core.common.LogFactory; +import org.jumpmind.symmetric.core.common.LogLevel; public abstract class StatementCreatorUtil { diff --git a/future/symmetric-jdbc/src/main/java/org/jumpmind/symmetric/jdbc/sql/Template.java b/future/symmetric-jdbc/src/main/java/org/jumpmind/symmetric/jdbc/sql/Template.java index 13be8f8b7a..2d08df5c0c 100644 --- a/future/symmetric-jdbc/src/main/java/org/jumpmind/symmetric/jdbc/sql/Template.java +++ b/future/symmetric-jdbc/src/main/java/org/jumpmind/symmetric/jdbc/sql/Template.java @@ -7,7 +7,7 @@ import javax.sql.DataSource; -import org.jumpmind.symmetric.data.process.sql.DataException; +import org.jumpmind.symmetric.core.process.sql.DataException; public class Template {