From 624e78d88e2a53c9cfeca1aaf65a7b8bd4f5fdc6 Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Thu, 4 Oct 2012 21:07:48 +0000
Subject: [PATCH] Move trigger stuff from common to datamover.
SVN: 27012
---
.../source/java/ch/systemsx/cisd/datamover/DataMover.java | 4 ++--
.../java/ch/systemsx/cisd/datamover/DataMoverProcess.java | 2 +-
.../ch/systemsx/cisd/datamover/DataMoverShutdownHook.java | 2 +-
datamover/source/java/ch/systemsx/cisd/datamover/Main.java | 2 +-
.../systemsx/cisd/datamover/common}/CompoundTriggerable.java | 2 +-
.../java/ch/systemsx/cisd/datamover/common}/ITriggerable.java | 2 +-
.../systemsx/cisd/datamover/common}/TriggeringTimerTask.java | 3 ++-
7 files changed, 9 insertions(+), 8 deletions(-)
rename {common/source/java/ch/systemsx/cisd/common/utilities => datamover/source/java/ch/systemsx/cisd/datamover/common}/CompoundTriggerable.java (96%)
rename {common/source/java/ch/systemsx/cisd/common/utilities => datamover/source/java/ch/systemsx/cisd/datamover/common}/ITriggerable.java (94%)
rename {common/source/java/ch/systemsx/cisd/common/utilities => datamover/source/java/ch/systemsx/cisd/datamover/common}/TriggeringTimerTask.java (97%)
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/DataMover.java b/datamover/source/java/ch/systemsx/cisd/datamover/DataMover.java
index 70793203770..4661f264f70 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/DataMover.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/DataMover.java
@@ -35,10 +35,10 @@ import ch.systemsx.cisd.common.filesystem.highwatermark.HighwaterMarkDirectorySc
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
import ch.systemsx.cisd.common.process.ProcessExecutionHelper;
-import ch.systemsx.cisd.common.utilities.CompoundTriggerable;
import ch.systemsx.cisd.common.utilities.ITerminable;
-import ch.systemsx.cisd.common.utilities.TriggeringTimerTask;
+import ch.systemsx.cisd.datamover.common.CompoundTriggerable;
import ch.systemsx.cisd.datamover.common.StoreHandlerToMoverAdapter;
+import ch.systemsx.cisd.datamover.common.TriggeringTimerTask;
import ch.systemsx.cisd.datamover.filesystem.FileStoreFactory;
import ch.systemsx.cisd.datamover.filesystem.RemoteMonitoredMoverFactory;
import ch.systemsx.cisd.datamover.filesystem.intf.IFileStore;
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/DataMoverProcess.java b/datamover/source/java/ch/systemsx/cisd/datamover/DataMoverProcess.java
index d54157f124d..5683ebbbb66 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/DataMoverProcess.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/DataMoverProcess.java
@@ -25,7 +25,7 @@ import ch.systemsx.cisd.common.concurrent.TimerUtilities;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
import ch.systemsx.cisd.common.utilities.ITerminable;
-import ch.systemsx.cisd.common.utilities.ITriggerable;
+import ch.systemsx.cisd.datamover.common.ITriggerable;
import ch.systemsx.cisd.datamover.filesystem.intf.IRecoverableTimerTaskFactory;
/**
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/DataMoverShutdownHook.java b/datamover/source/java/ch/systemsx/cisd/datamover/DataMoverShutdownHook.java
index aaece887219..4b4e7a700ca 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/DataMoverShutdownHook.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/DataMoverShutdownHook.java
@@ -26,7 +26,7 @@ import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
import ch.systemsx.cisd.common.utilities.IExitHandler;
import ch.systemsx.cisd.common.utilities.ITerminable;
-import ch.systemsx.cisd.common.utilities.ITriggerable;
+import ch.systemsx.cisd.datamover.common.ITriggerable;
/**
* The <i>DataMover</i> shutdown hook.
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/Main.java b/datamover/source/java/ch/systemsx/cisd/datamover/Main.java
index cb59fd9d99b..a5684a3d892 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/Main.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/Main.java
@@ -33,7 +33,7 @@ import ch.systemsx.cisd.common.logging.LogFactory;
import ch.systemsx.cisd.common.logging.LogInitializer;
import ch.systemsx.cisd.common.utilities.ITerminable;
import ch.systemsx.cisd.common.utilities.SystemExit;
-import ch.systemsx.cisd.common.utilities.TriggeringTimerTask;
+import ch.systemsx.cisd.datamover.common.TriggeringTimerTask;
import ch.systemsx.cisd.datamover.filesystem.FileStoreFactory;
import ch.systemsx.cisd.datamover.filesystem.FileStoreSelfTestables;
import ch.systemsx.cisd.datamover.filesystem.FileSysOperationsFactory;
diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/CompoundTriggerable.java b/datamover/source/java/ch/systemsx/cisd/datamover/common/CompoundTriggerable.java
similarity index 96%
rename from common/source/java/ch/systemsx/cisd/common/utilities/CompoundTriggerable.java
rename to datamover/source/java/ch/systemsx/cisd/datamover/common/CompoundTriggerable.java
index 5655eec92b5..ac136bb75cc 100644
--- a/common/source/java/ch/systemsx/cisd/common/utilities/CompoundTriggerable.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/common/CompoundTriggerable.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.datamover.common;
/**
* A <code>ITriggerable</code> that chains a sequence of one or more {@link ITriggerable}s.
diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/ITriggerable.java b/datamover/source/java/ch/systemsx/cisd/datamover/common/ITriggerable.java
similarity index 94%
rename from common/source/java/ch/systemsx/cisd/common/utilities/ITriggerable.java
rename to datamover/source/java/ch/systemsx/cisd/datamover/common/ITriggerable.java
index 77550c71300..2490aeb9590 100644
--- a/common/source/java/ch/systemsx/cisd/common/utilities/ITriggerable.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/common/ITriggerable.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.datamover.common;
/**
* A role that allows to trigger some operation.
diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/TriggeringTimerTask.java b/datamover/source/java/ch/systemsx/cisd/datamover/common/TriggeringTimerTask.java
similarity index 97%
rename from common/source/java/ch/systemsx/cisd/common/utilities/TriggeringTimerTask.java
rename to datamover/source/java/ch/systemsx/cisd/datamover/common/TriggeringTimerTask.java
index 068c1dd7066..b31650eb932 100644
--- a/common/source/java/ch/systemsx/cisd/common/utilities/TriggeringTimerTask.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/common/TriggeringTimerTask.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.datamover.common;
import java.io.File;
import java.util.TimerTask;
@@ -23,6 +23,7 @@ import org.apache.log4j.Logger;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
+import ch.systemsx.cisd.common.utilities.SynchronizationMonitor;
/**
* A role that triggers an {@link ITriggerable} when a given trigger file has been found.
--
GitLab