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 c15b79a36493293e820b47750ecf25147cc3b208..7dc27502b7be1933fffe5a7af77f1e6a680b92f1 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 b1d2b0290d2485266d28d50d638fe3b41fec2e2e..a11886e473f1409128f0130380801a29bf4243d3 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 7cc589432705af224946c79581c78caf549f8f44..af4cf1e56183e20dd146c7bfe2ecd12a79fc326d 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 69449ef71f6155fd964022138a25cd1d75e36afb..d573ea4edfc26feca78aa7ab260d31505a99f47f 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 7155fad4c2f59ed14f7525a68c48c14b9692bb61..514bbc17422f7d99e27ce53a0f59378894ed40cd 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 80601dab0ec5ee093c8813924ce68d39e6d57538..a4d7d8451718b02676a943233cecbbdaa558c794 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 7bf04ccd6d99c736e79630e68acb45e8a28ec78f..439ce8b8e8dd863438a30f00f4d3cdccbe327040 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 3ef67fbffba6f666047653cc345fffde828f4326..f3481e589736665dd51216b2c1df4297f077cc3d 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 94322ddb9a3ac24f7d337a6bfefb278f4af34c33..546c4374441971cd4126aeb1f5ff711b1624611d 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 949666bc00cc074765ec2cc5570278cbc70acb34..1e16b8b4417397d2a8db60aca30401638a56d830 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 ed4272da2f65ff6f9a396cfcae3fc7c8b42e560b..9987d9a0dbe9ea2d0d9a90c7c0af9c46d063b53f 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; /**