From 18ffe16ca701d364e9c24a47df1187f096ef8c0b Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Wed, 2 Jul 2008 17:04:15 +0000
Subject: [PATCH] refactor: move RSyncCopier to common (new package
ch.systemsx.cisd.common.filesystem.rsync)
SVN: 7016
---
.../ch/systemsx/cisd/common/filesystem}/IPathCopier.java | 2 +-
.../systemsx/cisd/common/filesystem}/rsync/RsyncCopier.java | 6 +++---
.../common/filesystem}/rsync/RsyncExitValueTranslator.java | 2 +-
.../cisd/common/filesystem}/rsync/RsyncVersionChecker.java | 2 +-
.../cisd/common/filesystem}/rsync/RsyncCopierTest.java | 4 +++-
datamover/source/java/ch/systemsx/cisd/datamover/Main.java | 2 +-
.../source/java/ch/systemsx/cisd/datamover/SelfTest.java | 2 +-
.../cisd/datamover/filesystem/FileSysOperationsFactory.java | 4 ++--
.../cisd/datamover/filesystem/intf/AbstractFileStore.java | 1 +
.../filesystem/intf/IFileSysOperationsFactory.java | 1 +
.../java/ch/systemsx/cisd/datamover/SelfTestTest.java | 2 +-
11 files changed, 16 insertions(+), 12 deletions(-)
rename {datamover/source/java/ch/systemsx/cisd/datamover/filesystem/intf => common/source/java/ch/systemsx/cisd/common/filesystem}/IPathCopier.java (98%)
rename {datamover/source/java/ch/systemsx/cisd/datamover/filesystem/remote => common/source/java/ch/systemsx/cisd/common/filesystem}/rsync/RsyncCopier.java (98%)
rename {datamover/source/java/ch/systemsx/cisd/datamover/filesystem/remote => common/source/java/ch/systemsx/cisd/common/filesystem}/rsync/RsyncExitValueTranslator.java (98%)
rename {datamover/source/java/ch/systemsx/cisd/datamover/filesystem/remote => common/source/java/ch/systemsx/cisd/common/filesystem}/rsync/RsyncVersionChecker.java (99%)
rename {datamover/sourceTest/java/ch/systemsx/cisd/datamover/filesystem/remote => common/sourceTest/java/ch/systemsx/cisd/common/filesystem}/rsync/RsyncCopierTest.java (98%)
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/intf/IPathCopier.java b/common/source/java/ch/systemsx/cisd/common/filesystem/IPathCopier.java
similarity index 98%
rename from datamover/source/java/ch/systemsx/cisd/datamover/filesystem/intf/IPathCopier.java
rename to common/source/java/ch/systemsx/cisd/common/filesystem/IPathCopier.java
index c15b79a3649..7dc27502b7b 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/intf/IPathCopier.java
+++ b/common/source/java/ch/systemsx/cisd/common/filesystem/IPathCopier.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.datamover.filesystem.intf;
+package ch.systemsx.cisd.common.filesystem;
import java.io.File;
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/remote/rsync/RsyncCopier.java b/common/source/java/ch/systemsx/cisd/common/filesystem/rsync/RsyncCopier.java
similarity index 98%
rename from datamover/source/java/ch/systemsx/cisd/datamover/filesystem/remote/rsync/RsyncCopier.java
rename to common/source/java/ch/systemsx/cisd/common/filesystem/rsync/RsyncCopier.java
index b1d2b0290d2..a11886e473f 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/remote/rsync/RsyncCopier.java
+++ b/common/source/java/ch/systemsx/cisd/common/filesystem/rsync/RsyncCopier.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.datamover.filesystem.remote.rsync;
+package ch.systemsx.cisd.common.filesystem.rsync;
import java.io.File;
import java.util.ArrayList;
@@ -27,6 +27,8 @@ import org.apache.log4j.Logger;
import ch.systemsx.cisd.common.exceptions.ConfigurationFailureException;
import ch.systemsx.cisd.common.exceptions.Status;
import ch.systemsx.cisd.common.exceptions.StatusFlag;
+import ch.systemsx.cisd.common.filesystem.IPathCopier;
+import ch.systemsx.cisd.common.filesystem.rsync.RsyncVersionChecker.RsyncVersion;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
import ch.systemsx.cisd.common.process.ProcessExecutionHelper;
@@ -35,8 +37,6 @@ import ch.systemsx.cisd.common.process.ProcessExecutionHelper.IProcessHandler;
import ch.systemsx.cisd.common.utilities.IDirectoryImmutableCopier;
import ch.systemsx.cisd.common.utilities.ITerminable;
import ch.systemsx.cisd.common.utilities.OSUtilities;
-import ch.systemsx.cisd.datamover.filesystem.intf.IPathCopier;
-import ch.systemsx.cisd.datamover.filesystem.remote.rsync.RsyncVersionChecker.RsyncVersion;
/**
* A class that encapsulates the <code>rsync</code> call for doing an archive copy.
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/remote/rsync/RsyncExitValueTranslator.java b/common/source/java/ch/systemsx/cisd/common/filesystem/rsync/RsyncExitValueTranslator.java
similarity index 98%
rename from datamover/source/java/ch/systemsx/cisd/datamover/filesystem/remote/rsync/RsyncExitValueTranslator.java
rename to common/source/java/ch/systemsx/cisd/common/filesystem/rsync/RsyncExitValueTranslator.java
index 7cc58943270..af4cf1e5618 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/remote/rsync/RsyncExitValueTranslator.java
+++ b/common/source/java/ch/systemsx/cisd/common/filesystem/rsync/RsyncExitValueTranslator.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.datamover.filesystem.remote.rsync;
+package ch.systemsx.cisd.common.filesystem.rsync;
import ch.systemsx.cisd.common.exceptions.StatusFlag;
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/remote/rsync/RsyncVersionChecker.java b/common/source/java/ch/systemsx/cisd/common/filesystem/rsync/RsyncVersionChecker.java
similarity index 99%
rename from datamover/source/java/ch/systemsx/cisd/datamover/filesystem/remote/rsync/RsyncVersionChecker.java
rename to common/source/java/ch/systemsx/cisd/common/filesystem/rsync/RsyncVersionChecker.java
index 69449ef71f6..d573ea4edfc 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/remote/rsync/RsyncVersionChecker.java
+++ b/common/source/java/ch/systemsx/cisd/common/filesystem/rsync/RsyncVersionChecker.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.datamover.filesystem.remote.rsync;
+package ch.systemsx.cisd.common.filesystem.rsync;
import java.util.Arrays;
import java.util.List;
diff --git a/datamover/sourceTest/java/ch/systemsx/cisd/datamover/filesystem/remote/rsync/RsyncCopierTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/filesystem/rsync/RsyncCopierTest.java
similarity index 98%
rename from datamover/sourceTest/java/ch/systemsx/cisd/datamover/filesystem/remote/rsync/RsyncCopierTest.java
rename to common/sourceTest/java/ch/systemsx/cisd/common/filesystem/rsync/RsyncCopierTest.java
index 7155fad4c2f..514bbc17422 100644
--- a/datamover/sourceTest/java/ch/systemsx/cisd/datamover/filesystem/remote/rsync/RsyncCopierTest.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/filesystem/rsync/RsyncCopierTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.datamover.filesystem.remote.rsync;
+package ch.systemsx.cisd.common.filesystem.rsync;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertFalse;
@@ -33,6 +33,8 @@ import org.testng.annotations.Test;
import ch.systemsx.cisd.common.collections.CollectionIO;
import ch.systemsx.cisd.common.exceptions.Status;
import ch.systemsx.cisd.common.exceptions.StatusFlag;
+import ch.systemsx.cisd.common.filesystem.rsync.RsyncCopier;
+import ch.systemsx.cisd.common.filesystem.rsync.RsyncExitValueTranslator;
import ch.systemsx.cisd.common.logging.LogInitializer;
import ch.systemsx.cisd.common.test.StoringUncaughtExceptionHandler;
import ch.systemsx.cisd.common.utilities.FileUtilities;
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/Main.java b/datamover/source/java/ch/systemsx/cisd/datamover/Main.java
index 80601dab0ec..a4d7d845171 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/Main.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/Main.java
@@ -25,6 +25,7 @@ import org.apache.log4j.Logger;
import ch.rinn.restrictions.Private;
import ch.systemsx.cisd.common.exceptions.HighLevelException;
+import ch.systemsx.cisd.common.filesystem.IPathCopier;
import ch.systemsx.cisd.common.highwatermark.HostAwareFileWithHighwaterMark;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
@@ -38,7 +39,6 @@ import ch.systemsx.cisd.datamover.filesystem.FileStoreFactory;
import ch.systemsx.cisd.datamover.filesystem.FileSysOperationsFactory;
import ch.systemsx.cisd.datamover.filesystem.intf.IFileStore;
import ch.systemsx.cisd.datamover.filesystem.intf.IFileSysOperationsFactory;
-import ch.systemsx.cisd.datamover.filesystem.intf.IPathCopier;
import ch.systemsx.cisd.datamover.utils.LocalBufferDirs;
/**
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/SelfTest.java b/datamover/source/java/ch/systemsx/cisd/datamover/SelfTest.java
index 7bf04ccd6d9..439ce8b8e8d 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/SelfTest.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/SelfTest.java
@@ -21,12 +21,12 @@ import org.apache.log4j.Logger;
import ch.systemsx.cisd.common.exceptions.ConfigurationFailureException;
import ch.systemsx.cisd.common.exceptions.EnvironmentFailureException;
import ch.systemsx.cisd.common.exceptions.HighLevelException;
+import ch.systemsx.cisd.common.filesystem.IPathCopier;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
import ch.systemsx.cisd.common.logging.LogInitializer;
import ch.systemsx.cisd.common.utilities.ISelfTestable;
import ch.systemsx.cisd.datamover.filesystem.intf.IFileStore;
-import ch.systemsx.cisd.datamover.filesystem.intf.IPathCopier;
/**
* A class that can perform a self test of the data mover.
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/FileSysOperationsFactory.java b/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/FileSysOperationsFactory.java
index 3ef67fbffba..f3481e58973 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/FileSysOperationsFactory.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/FileSysOperationsFactory.java
@@ -25,16 +25,16 @@ import ch.systemsx.cisd.common.Constants;
import ch.systemsx.cisd.common.exceptions.ConfigurationFailureException;
import ch.systemsx.cisd.common.exceptions.Status;
import ch.systemsx.cisd.common.exceptions.StatusFlag;
+import ch.systemsx.cisd.common.filesystem.IPathCopier;
+import ch.systemsx.cisd.common.filesystem.rsync.RsyncCopier;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
import ch.systemsx.cisd.common.utilities.IDirectoryImmutableCopier;
import ch.systemsx.cisd.common.utilities.OSUtilities;
import ch.systemsx.cisd.common.utilities.RecursiveHardLinkMaker;
import ch.systemsx.cisd.datamover.filesystem.intf.IFileSysOperationsFactory;
-import ch.systemsx.cisd.datamover.filesystem.intf.IPathCopier;
import ch.systemsx.cisd.datamover.filesystem.intf.IPathMover;
import ch.systemsx.cisd.datamover.filesystem.intf.IPathRemover;
-import ch.systemsx.cisd.datamover.filesystem.remote.rsync.RsyncCopier;
import ch.systemsx.cisd.datamover.intf.IFileSysParameters;
/**
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/intf/AbstractFileStore.java b/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/intf/AbstractFileStore.java
index 94322ddb9a3..546c4374441 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/intf/AbstractFileStore.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/intf/AbstractFileStore.java
@@ -26,6 +26,7 @@ import ch.systemsx.cisd.common.Constants;
import ch.systemsx.cisd.common.exceptions.ConfigurationFailureException;
import ch.systemsx.cisd.common.exceptions.EnvironmentFailureException;
import ch.systemsx.cisd.common.exceptions.Status;
+import ch.systemsx.cisd.common.filesystem.IPathCopier;
import ch.systemsx.cisd.common.highwatermark.HostAwareFileWithHighwaterMark;
import ch.systemsx.cisd.common.utilities.FileUtilities;
import ch.systemsx.cisd.common.utilities.StoreItem;
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/intf/IFileSysOperationsFactory.java b/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/intf/IFileSysOperationsFactory.java
index 949666bc00c..1e16b8b4417 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/intf/IFileSysOperationsFactory.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/intf/IFileSysOperationsFactory.java
@@ -17,6 +17,7 @@ package ch.systemsx.cisd.datamover.filesystem.intf;
import java.io.File;
+import ch.systemsx.cisd.common.filesystem.IPathCopier;
import ch.systemsx.cisd.common.utilities.IDirectoryImmutableCopier;
/**
diff --git a/datamover/sourceTest/java/ch/systemsx/cisd/datamover/SelfTestTest.java b/datamover/sourceTest/java/ch/systemsx/cisd/datamover/SelfTestTest.java
index ed4272da2f6..9987d9a0dbe 100644
--- a/datamover/sourceTest/java/ch/systemsx/cisd/datamover/SelfTestTest.java
+++ b/datamover/sourceTest/java/ch/systemsx/cisd/datamover/SelfTestTest.java
@@ -25,11 +25,11 @@ import org.testng.annotations.Test;
import ch.systemsx.cisd.common.exceptions.ConfigurationFailureException;
import ch.systemsx.cisd.common.exceptions.EnvironmentFailureException;
import ch.systemsx.cisd.common.exceptions.Status;
+import ch.systemsx.cisd.common.filesystem.IPathCopier;
import ch.systemsx.cisd.common.logging.LogInitializer;
import ch.systemsx.cisd.common.utilities.FileUtilities;
import ch.systemsx.cisd.datamover.filesystem.FileStoreFactory;
import ch.systemsx.cisd.datamover.filesystem.intf.IFileStore;
-import ch.systemsx.cisd.datamover.filesystem.intf.IPathCopier;
import ch.systemsx.cisd.datamover.testhelper.FileOperationsUtil;
/**
--
GitLab