From 8e78b789d3838e892ad9cb6b4340f67b8a2d0dcc Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Thu, 4 Oct 2012 21:59:19 +0000
Subject: [PATCH] Move IStopSignaler to package filesystem.
SVN: 27030
---
.../common/filesystem/FaultyPathDirectoryScanningHandler.java | 1 -
.../java/ch/systemsx/cisd/common/filesystem/IPathHandler.java | 1 -
.../cisd/common/{utilities => filesystem}/IStopSignaler.java | 2 +-
.../java/ch/systemsx/cisd/common/filesystem/IStoreHandler.java | 1 -
.../java/ch/systemsx/cisd/datamover/common/IStoreMover.java | 2 +-
.../source/java/ch/systemsx/cisd/etlserver/ETLDaemon.java | 2 +-
6 files changed, 3 insertions(+), 6 deletions(-)
rename common/source/java/ch/systemsx/cisd/common/{utilities => filesystem}/IStopSignaler.java (96%)
diff --git a/common/source/java/ch/systemsx/cisd/common/filesystem/FaultyPathDirectoryScanningHandler.java b/common/source/java/ch/systemsx/cisd/common/filesystem/FaultyPathDirectoryScanningHandler.java
index 70d33cbd98c..32260bf59c2 100644
--- a/common/source/java/ch/systemsx/cisd/common/filesystem/FaultyPathDirectoryScanningHandler.java
+++ b/common/source/java/ch/systemsx/cisd/common/filesystem/FaultyPathDirectoryScanningHandler.java
@@ -30,7 +30,6 @@ import ch.systemsx.cisd.common.exceptions.Status;
import ch.systemsx.cisd.common.filesystem.DirectoryScanningTimerTask.IScannedStore;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
-import ch.systemsx.cisd.common.utilities.IStopSignaler;
/**
* An <code>IDirectoryScanningHandler</code> which manages faulty paths.
diff --git a/common/source/java/ch/systemsx/cisd/common/filesystem/IPathHandler.java b/common/source/java/ch/systemsx/cisd/common/filesystem/IPathHandler.java
index 118957178d5..2f5c37423ed 100644
--- a/common/source/java/ch/systemsx/cisd/common/filesystem/IPathHandler.java
+++ b/common/source/java/ch/systemsx/cisd/common/filesystem/IPathHandler.java
@@ -18,7 +18,6 @@ package ch.systemsx.cisd.common.filesystem;
import java.io.File;
-import ch.systemsx.cisd.common.utilities.IStopSignaler;
/**
* A role for handling paths. The paths are supposed to go away when they have been handled
diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/IStopSignaler.java b/common/source/java/ch/systemsx/cisd/common/filesystem/IStopSignaler.java
similarity index 96%
rename from common/source/java/ch/systemsx/cisd/common/utilities/IStopSignaler.java
rename to common/source/java/ch/systemsx/cisd/common/filesystem/IStopSignaler.java
index 6563a0b8e20..5c40c1af7ae 100644
--- a/common/source/java/ch/systemsx/cisd/common/utilities/IStopSignaler.java
+++ b/common/source/java/ch/systemsx/cisd/common/filesystem/IStopSignaler.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.common.filesystem;
/**
* A role that allows to signal that a worker was stopped.
diff --git a/common/source/java/ch/systemsx/cisd/common/filesystem/IStoreHandler.java b/common/source/java/ch/systemsx/cisd/common/filesystem/IStoreHandler.java
index eab14cff96a..de8b2e5b539 100644
--- a/common/source/java/ch/systemsx/cisd/common/filesystem/IStoreHandler.java
+++ b/common/source/java/ch/systemsx/cisd/common/filesystem/IStoreHandler.java
@@ -16,7 +16,6 @@
package ch.systemsx.cisd.common.filesystem;
-import ch.systemsx.cisd.common.utilities.IStopSignaler;
/**
* Handles items in the file store.
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/common/IStoreMover.java b/datamover/source/java/ch/systemsx/cisd/datamover/common/IStoreMover.java
index bf238b178b4..f1d016e8621 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/common/IStoreMover.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/common/IStoreMover.java
@@ -16,9 +16,9 @@
package ch.systemsx.cisd.datamover.common;
+import ch.systemsx.cisd.common.filesystem.IStopSignaler;
import ch.systemsx.cisd.common.filesystem.IStoreHandler;
import ch.systemsx.cisd.common.filesystem.StoreItem;
-import ch.systemsx.cisd.common.utilities.IStopSignaler;
/**
* Moves items in the file store.
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/ETLDaemon.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/ETLDaemon.java
index e9d00ef7e84..bba6fc19716 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/ETLDaemon.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/ETLDaemon.java
@@ -51,6 +51,7 @@ import ch.systemsx.cisd.common.filesystem.highwatermark.HostAwareFileWithHighwat
import ch.systemsx.cisd.common.filesystem.FileUtilities;
import ch.systemsx.cisd.common.filesystem.HostAwareFile;
import ch.systemsx.cisd.common.filesystem.IDirectoryScanningHandler;
+import ch.systemsx.cisd.common.filesystem.IStopSignaler;
import ch.systemsx.cisd.common.filesystem.IStoreItemFilter;
import ch.systemsx.cisd.common.filesystem.LastModificationChecker;
import ch.systemsx.cisd.common.filesystem.QueueingPathRemoverService;
@@ -68,7 +69,6 @@ import ch.systemsx.cisd.common.properties.PropertyUtils;
import ch.systemsx.cisd.common.reflection.ClassUtils;
import ch.systemsx.cisd.common.utilities.IExitHandler;
import ch.systemsx.cisd.common.utilities.ISelfTestable;
-import ch.systemsx.cisd.common.utilities.IStopSignaler;
import ch.systemsx.cisd.common.utilities.SystemExit;
import ch.systemsx.cisd.etlserver.plugins.DeleteDataSetsAlreadyDeletedInApplicationServerMaintenanceTask;
import ch.systemsx.cisd.etlserver.postregistration.PostRegistrationMaintenanceTask;
--
GitLab