From 7120d06b89e288737da8d5994c7c27e11f423d07 Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Wed, 10 Oct 2012 17:49:09 +0000
Subject: [PATCH] Move Script to sub-package db.
SVN: 27136
---
.../ch/systemsx/cisd/common/db/ISqlScriptExecutionLogger.java | 1 -
.../java/ch/systemsx/cisd/common/db/ISqlScriptExecutor.java | 1 -
common/source/java/ch/systemsx/cisd/common/{ => db}/Script.java | 2 +-
.../java/ch/systemsx/cisd/common/db/SqlUnitTestRunner.java | 1 -
.../java/ch/systemsx/cisd/common/db/SqlUnitTestRunnerTest.java | 1 -
.../java/ch/systemsx/cisd/dbmigration/DBMigrationEngine.java | 2 +-
.../ch/systemsx/cisd/dbmigration/DatabaseVersionLogDAO.java | 2 +-
.../ch/systemsx/cisd/dbmigration/IDatabaseVersionLogDAO.java | 2 +-
.../java/ch/systemsx/cisd/dbmigration/ISqlScriptProvider.java | 2 +-
.../java/ch/systemsx/cisd/dbmigration/SqlScriptExecutor.java | 2 +-
.../java/ch/systemsx/cisd/dbmigration/SqlScriptProvider.java | 2 +-
.../source/java/ch/systemsx/cisd/dbmigration/h2/H2AdminDAO.java | 2 +-
.../systemsx/cisd/dbmigration/java/IMigrationStepExecutor.java | 2 +-
.../systemsx/cisd/dbmigration/java/MigrationStepExecutor.java | 2 +-
.../cisd/dbmigration/postgresql/PostgreSQLAdminDAO.java | 2 +-
.../ch/systemsx/cisd/dbmigration/DBMigrationEngineTest.java | 2 +-
.../ch/systemsx/cisd/dbmigration/SqlScriptExecutorTest.java | 2 +-
.../ch/systemsx/cisd/dbmigration/SqlScriptProviderTest.java | 2 +-
.../cisd/dbmigration/java/MigrationStepExecutorTest.java | 2 +-
19 files changed, 15 insertions(+), 19 deletions(-)
rename common/source/java/ch/systemsx/cisd/common/{ => db}/Script.java (98%)
diff --git a/common/source/java/ch/systemsx/cisd/common/db/ISqlScriptExecutionLogger.java b/common/source/java/ch/systemsx/cisd/common/db/ISqlScriptExecutionLogger.java
index 6d5f0f5c052..578c5f2ad0a 100644
--- a/common/source/java/ch/systemsx/cisd/common/db/ISqlScriptExecutionLogger.java
+++ b/common/source/java/ch/systemsx/cisd/common/db/ISqlScriptExecutionLogger.java
@@ -16,7 +16,6 @@
package ch.systemsx.cisd.common.db;
-import ch.systemsx.cisd.common.Script;
/**
* Interface for logging of SQL script executions.
diff --git a/common/source/java/ch/systemsx/cisd/common/db/ISqlScriptExecutor.java b/common/source/java/ch/systemsx/cisd/common/db/ISqlScriptExecutor.java
index 5f27849abee..1bd21871e44 100644
--- a/common/source/java/ch/systemsx/cisd/common/db/ISqlScriptExecutor.java
+++ b/common/source/java/ch/systemsx/cisd/common/db/ISqlScriptExecutor.java
@@ -16,7 +16,6 @@
package ch.systemsx.cisd.common.db;
-import ch.systemsx.cisd.common.Script;
/**
* Executor of SQL scripts.
diff --git a/common/source/java/ch/systemsx/cisd/common/Script.java b/common/source/java/ch/systemsx/cisd/common/db/Script.java
similarity index 98%
rename from common/source/java/ch/systemsx/cisd/common/Script.java
rename to common/source/java/ch/systemsx/cisd/common/db/Script.java
index 213730b80d4..32ab820b61a 100644
--- a/common/source/java/ch/systemsx/cisd/common/Script.java
+++ b/common/source/java/ch/systemsx/cisd/common/db/Script.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.common;
+package ch.systemsx.cisd.common.db;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
diff --git a/common/source/java/ch/systemsx/cisd/common/db/SqlUnitTestRunner.java b/common/source/java/ch/systemsx/cisd/common/db/SqlUnitTestRunner.java
index 2d6147323eb..759c10e666c 100644
--- a/common/source/java/ch/systemsx/cisd/common/db/SqlUnitTestRunner.java
+++ b/common/source/java/ch/systemsx/cisd/common/db/SqlUnitTestRunner.java
@@ -28,7 +28,6 @@ import java.util.Comparator;
import java.util.List;
import ch.systemsx.cisd.base.utilities.OSUtilities;
-import ch.systemsx.cisd.common.Script;
import ch.systemsx.cisd.common.filesystem.FileUtilities;
/**
diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/db/SqlUnitTestRunnerTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/db/SqlUnitTestRunnerTest.java
index cab735728a2..3bd50742731 100644
--- a/common/sourceTest/java/ch/systemsx/cisd/common/db/SqlUnitTestRunnerTest.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/db/SqlUnitTestRunnerTest.java
@@ -37,7 +37,6 @@ import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import ch.systemsx.cisd.base.utilities.OSUtilities;
-import ch.systemsx.cisd.common.Script;
import ch.systemsx.cisd.common.filesystem.FileUtilities;
/**
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DBMigrationEngine.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DBMigrationEngine.java
index 9856b483a15..e8207f3ae64 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DBMigrationEngine.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DBMigrationEngine.java
@@ -20,8 +20,8 @@ import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import ch.rinn.restrictions.Private;
-import ch.systemsx.cisd.common.Script;
import ch.systemsx.cisd.common.db.ISqlScriptExecutor;
+import ch.systemsx.cisd.common.db.Script;
import ch.systemsx.cisd.common.exception.ConfigurationFailureException;
import ch.systemsx.cisd.common.exception.EnvironmentFailureException;
import ch.systemsx.cisd.common.logging.LogCategory;
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DatabaseVersionLogDAO.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DatabaseVersionLogDAO.java
index d13500cd547..35515903108 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DatabaseVersionLogDAO.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/DatabaseVersionLogDAO.java
@@ -40,7 +40,7 @@ import org.springframework.jdbc.support.lob.LobCreator;
import org.springframework.jdbc.support.lob.LobHandler;
import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
-import ch.systemsx.cisd.common.Script;
+import ch.systemsx.cisd.common.db.Script;
/**
* Class which logs database migration steps in the database.
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/IDatabaseVersionLogDAO.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/IDatabaseVersionLogDAO.java
index 117d2b2067d..ed6d8264929 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/IDatabaseVersionLogDAO.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/IDatabaseVersionLogDAO.java
@@ -16,8 +16,8 @@
package ch.systemsx.cisd.dbmigration;
-import ch.systemsx.cisd.common.Script;
import ch.systemsx.cisd.common.db.ISqlScriptExecutionLogger;
+import ch.systemsx.cisd.common.db.Script;
/**
* Interface for a Data Access Object for the database version log.
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/ISqlScriptProvider.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/ISqlScriptProvider.java
index f5f57a9f20b..960c1f2476e 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/ISqlScriptProvider.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/ISqlScriptProvider.java
@@ -18,7 +18,7 @@ package ch.systemsx.cisd.dbmigration;
import java.io.File;
-import ch.systemsx.cisd.common.Script;
+import ch.systemsx.cisd.common.db.Script;
/**
* Provider of SQL scripts for creation and migration of database.
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/SqlScriptExecutor.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/SqlScriptExecutor.java
index 5785edea664..1e5860072f5 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/SqlScriptExecutor.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/SqlScriptExecutor.java
@@ -28,9 +28,9 @@ import org.springframework.jdbc.core.support.JdbcDaoSupport;
import ch.rinn.restrictions.Private;
import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
-import ch.systemsx.cisd.common.Script;
import ch.systemsx.cisd.common.db.ISqlScriptExecutionLogger;
import ch.systemsx.cisd.common.db.ISqlScriptExecutor;
+import ch.systemsx.cisd.common.db.Script;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/SqlScriptProvider.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/SqlScriptProvider.java
index 7fe9f3a3c8b..0e8f74ad12f 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/SqlScriptProvider.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/SqlScriptProvider.java
@@ -24,7 +24,7 @@ import org.apache.commons.io.FileUtils;
import org.apache.log4j.Logger;
import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
-import ch.systemsx.cisd.common.Script;
+import ch.systemsx.cisd.common.db.Script;
import ch.systemsx.cisd.common.filesystem.FileUtilities;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/h2/H2AdminDAO.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/h2/H2AdminDAO.java
index b1274e05c23..fe5d264c6a6 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/h2/H2AdminDAO.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/h2/H2AdminDAO.java
@@ -29,8 +29,8 @@ import org.apache.log4j.Logger;
import org.h2.tools.DeleteDbFiles;
import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
-import ch.systemsx.cisd.common.Script;
import ch.systemsx.cisd.common.db.ISqlScriptExecutor;
+import ch.systemsx.cisd.common.db.Script;
import ch.systemsx.cisd.common.exception.ConfigurationFailureException;
import ch.systemsx.cisd.common.filesystem.FileUtilities;
import ch.systemsx.cisd.common.logging.LogCategory;
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/java/IMigrationStepExecutor.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/java/IMigrationStepExecutor.java
index 20bc5998d63..a55e5016d5b 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/java/IMigrationStepExecutor.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/java/IMigrationStepExecutor.java
@@ -16,7 +16,7 @@
package ch.systemsx.cisd.dbmigration.java;
-import ch.systemsx.cisd.common.Script;
+import ch.systemsx.cisd.common.db.Script;
/**
* A migration step executor.
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/java/MigrationStepExecutor.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/java/MigrationStepExecutor.java
index 2729f764675..7d275e5e4e3 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/java/MigrationStepExecutor.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/java/MigrationStepExecutor.java
@@ -21,7 +21,7 @@ import org.apache.log4j.Logger;
import org.springframework.jdbc.core.simple.SimpleJdbcDaoSupport;
import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
-import ch.systemsx.cisd.common.Script;
+import ch.systemsx.cisd.common.db.Script;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
import ch.systemsx.cisd.common.parser.ILine;
diff --git a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/postgresql/PostgreSQLAdminDAO.java b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/postgresql/PostgreSQLAdminDAO.java
index e51f349c159..637cd2479b2 100644
--- a/dbmigration/source/java/ch/systemsx/cisd/dbmigration/postgresql/PostgreSQLAdminDAO.java
+++ b/dbmigration/source/java/ch/systemsx/cisd/dbmigration/postgresql/PostgreSQLAdminDAO.java
@@ -26,8 +26,8 @@ import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.springframework.dao.DataAccessException;
-import ch.systemsx.cisd.common.Script;
import ch.systemsx.cisd.common.db.ISqlScriptExecutor;
+import ch.systemsx.cisd.common.db.Script;
import ch.systemsx.cisd.common.exception.ConfigurationFailureException;
import ch.systemsx.cisd.common.filesystem.FileUtilities;
import ch.systemsx.cisd.common.logging.LogCategory;
diff --git a/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/DBMigrationEngineTest.java b/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/DBMigrationEngineTest.java
index c3bae8f296f..1fd68f47943 100644
--- a/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/DBMigrationEngineTest.java
+++ b/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/DBMigrationEngineTest.java
@@ -37,8 +37,8 @@ import org.testng.annotations.Test;
import ch.rinn.restrictions.Friend;
import ch.systemsx.cisd.base.utilities.OSUtilities;
-import ch.systemsx.cisd.common.Script;
import ch.systemsx.cisd.common.db.ISqlScriptExecutor;
+import ch.systemsx.cisd.common.db.Script;
import ch.systemsx.cisd.common.exception.ConfigurationFailureException;
import ch.systemsx.cisd.common.exception.EnvironmentFailureException;
import ch.systemsx.cisd.common.logging.BufferedAppender;
diff --git a/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/SqlScriptExecutorTest.java b/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/SqlScriptExecutorTest.java
index 816f4d4eac2..9472eb78ee1 100644
--- a/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/SqlScriptExecutorTest.java
+++ b/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/SqlScriptExecutorTest.java
@@ -29,8 +29,8 @@ import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import ch.rinn.restrictions.Friend;
-import ch.systemsx.cisd.common.Script;
import ch.systemsx.cisd.common.db.ISqlScriptExecutionLogger;
+import ch.systemsx.cisd.common.db.Script;
import ch.systemsx.cisd.common.logging.LogInitializer;
/**
diff --git a/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/SqlScriptProviderTest.java b/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/SqlScriptProviderTest.java
index 676ed6742fa..4dbe37ff5f3 100644
--- a/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/SqlScriptProviderTest.java
+++ b/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/SqlScriptProviderTest.java
@@ -33,7 +33,7 @@ import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
-import ch.systemsx.cisd.common.Script;
+import ch.systemsx.cisd.common.db.Script;
import ch.systemsx.cisd.common.filesystem.FileUtilities;
/**
diff --git a/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/java/MigrationStepExecutorTest.java b/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/java/MigrationStepExecutorTest.java
index 26610b3b0d4..d4d3ef16ab3 100644
--- a/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/java/MigrationStepExecutorTest.java
+++ b/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/java/MigrationStepExecutorTest.java
@@ -31,7 +31,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
-import ch.systemsx.cisd.common.Script;
+import ch.systemsx.cisd.common.db.Script;
import ch.systemsx.cisd.common.logging.BufferedAppender;
import ch.systemsx.cisd.common.logging.LogInitializer;
import ch.systemsx.cisd.common.test.AssertionUtil;
--
GitLab