diff --git a/common/source/java/ch/systemsx/cisd/common/Constants.java b/common/source/java/ch/systemsx/cisd/common/Constants.java
deleted file mode 100644
index 1d053c6f7c8e5c36345e76808b1b0c6012ad7625..0000000000000000000000000000000000000000
--- a/common/source/java/ch/systemsx/cisd/common/Constants.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2007 ETH Zuerich, CISD
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package ch.systemsx.cisd.common;
-
-
-import org.apache.commons.lang.time.DateUtils;
-
-
-
-/**
- * Constants common to more than one CISD project.
- *
- * @author Bernd Rinn
- */
-public final class Constants
-{
-
- private Constants()
- {
- // This class can not be instantiated.
- }
-
- //
- // Timing
- //
-
- /** Time in seconds to wait before a timeout occurs. */
- public static final int TIMEOUT_SECONDS = 60;
-
- /** Time in milli-seconds to wait before a timeout occurs.. */
- public static final long MILLIS_TO_WAIT_BEFORE_TIMEOUT =
- TIMEOUT_SECONDS * DateUtils.MILLIS_PER_SECOND;
-
- /** Time interval in seconds to wait after an operation failed before retrying it. */
- public static final int INTERVAL_TO_WAIT_AFTER_FAILURE_SECONDS = 10;
-
- /** Time interval in milli-seconds to wait after an operation failed before retrying it. */
- public static final long MILLIS_TO_SLEEP_BEFORE_RETRYING =
- INTERVAL_TO_WAIT_AFTER_FAILURE_SECONDS * DateUtils.MILLIS_PER_SECOND;
-
- /** Maximal number of retries when an operation fails. */
- public static final int MAXIMUM_RETRY_COUNT = 11;
-
-}
diff --git a/common/source/java/ch/systemsx/cisd/common/concurrent/MonitoringProxy.java b/common/source/java/ch/systemsx/cisd/common/concurrent/MonitoringProxy.java
index 9f5800482bc640c46a4c599cbf3840d4a2a7f70b..550acd6a435b633b4bfcf120d6cf9fc2d5923270 100644
--- a/common/source/java/ch/systemsx/cisd/common/concurrent/MonitoringProxy.java
+++ b/common/source/java/ch/systemsx/cisd/common/concurrent/MonitoringProxy.java
@@ -37,10 +37,10 @@ import ch.systemsx.cisd.base.exceptions.InterruptedExceptionUnchecked;
import ch.systemsx.cisd.base.exceptions.TimeoutExceptionUnchecked;
import ch.systemsx.cisd.base.namedthread.NamedCallable;
import ch.systemsx.cisd.base.namedthread.NamingThreadPoolExecutor;
-import ch.systemsx.cisd.common.TimingParameters;
import ch.systemsx.cisd.common.concurrent.ConcurrencyUtilities.ILogSettings;
import ch.systemsx.cisd.common.logging.ISimpleLogger;
import ch.systemsx.cisd.common.logging.LogLevel;
+import ch.systemsx.cisd.common.time.TimingParameters;
/**
* A class that can provide a dynamic {@link Proxy} for an interface that delegates the method
diff --git a/common/source/java/ch/systemsx/cisd/common/filesystem/FastHardLinkMaker.java b/common/source/java/ch/systemsx/cisd/common/filesystem/FastHardLinkMaker.java
index 1b56ec7f60525deaa7b27080dfb0a7ec0a2b249f..f16c85ca4506949cc4143ea975277300ba3dad16 100644
--- a/common/source/java/ch/systemsx/cisd/common/filesystem/FastHardLinkMaker.java
+++ b/common/source/java/ch/systemsx/cisd/common/filesystem/FastHardLinkMaker.java
@@ -23,9 +23,9 @@ import org.apache.commons.io.FileCopyUtils;
import ch.systemsx.cisd.base.exceptions.IOExceptionUnchecked;
import ch.systemsx.cisd.base.unix.Unix;
-import ch.systemsx.cisd.common.TimingParameters;
import ch.systemsx.cisd.common.concurrent.MonitoringProxy;
import ch.systemsx.cisd.common.exception.Status;
+import ch.systemsx.cisd.common.time.TimingParameters;
/**
* A {@link IFileImmutableCopier} that uses a native method to create hard links.
diff --git a/common/source/java/ch/systemsx/cisd/common/filesystem/FastRecursiveHardLinkMaker.java b/common/source/java/ch/systemsx/cisd/common/filesystem/FastRecursiveHardLinkMaker.java
index d3faddfb8d66c4931cc01a2f462fd8928f0b08a2..359d25c27ff5846cbfbac60a1abc707d87c41909 100644
--- a/common/source/java/ch/systemsx/cisd/common/filesystem/FastRecursiveHardLinkMaker.java
+++ b/common/source/java/ch/systemsx/cisd/common/filesystem/FastRecursiveHardLinkMaker.java
@@ -22,12 +22,12 @@ import org.apache.log4j.Logger;
import ch.systemsx.cisd.base.exceptions.IOExceptionUnchecked;
import ch.systemsx.cisd.base.utilities.OSUtilities;
-import ch.systemsx.cisd.common.TimingParameters;
import ch.systemsx.cisd.common.exception.ConfigurationFailureException;
import ch.systemsx.cisd.common.exception.Status;
import ch.systemsx.cisd.common.filesystem.rsync.RsyncBasedRecursiveHardLinkMaker;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
+import ch.systemsx.cisd.common.time.TimingParameters;
/**
* A fast {@link IImmutableCopier} that uses a fallback option whenever one of the fast copiers for
diff --git a/common/source/java/ch/systemsx/cisd/common/filesystem/FileOperations.java b/common/source/java/ch/systemsx/cisd/common/filesystem/FileOperations.java
index e4bc94a686de86b3d34ae150e30db424c951f3e8..05934efb59bd60751ba68cb3c609eff418fda2a5 100644
--- a/common/source/java/ch/systemsx/cisd/common/filesystem/FileOperations.java
+++ b/common/source/java/ch/systemsx/cisd/common/filesystem/FileOperations.java
@@ -43,7 +43,6 @@ import ch.systemsx.cisd.base.io.AdapterInputStreamToIInputStream;
import ch.systemsx.cisd.base.io.AdapterOutputStreamToIOutputStream;
import ch.systemsx.cisd.base.io.IInputStream;
import ch.systemsx.cisd.base.io.IOutputStream;
-import ch.systemsx.cisd.common.TimingParameters;
import ch.systemsx.cisd.common.concurrent.IActivityObserver;
import ch.systemsx.cisd.common.concurrent.MonitoringProxy;
import ch.systemsx.cisd.common.concurrent.RecordingActivityObserverSensor;
@@ -51,6 +50,7 @@ import ch.systemsx.cisd.common.exception.UnknownLastChangedException;
import ch.systemsx.cisd.common.logging.Log4jSimpleLogger;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
+import ch.systemsx.cisd.common.time.TimingParameters;
/**
* Monitoring for (potentially hanging) file operations. Supposed to be used on remote file systems.
diff --git a/common/source/java/ch/systemsx/cisd/common/filesystem/HardLinkMaker.java b/common/source/java/ch/systemsx/cisd/common/filesystem/HardLinkMaker.java
index 90e0c0ee0fb0d2ad3bd6be232e0d27807f1ab1cf..900df11147d37cd3e715c00222733601001076ae 100644
--- a/common/source/java/ch/systemsx/cisd/common/filesystem/HardLinkMaker.java
+++ b/common/source/java/ch/systemsx/cisd/common/filesystem/HardLinkMaker.java
@@ -28,13 +28,13 @@ import org.springframework.util.FileCopyUtils;
import ch.systemsx.cisd.base.exceptions.InterruptedExceptionUnchecked;
import ch.systemsx.cisd.base.utilities.OSUtilities;
-import ch.systemsx.cisd.common.TimingParameters;
import ch.systemsx.cisd.common.exception.Status;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
import ch.systemsx.cisd.common.process.CallableExecutor;
import ch.systemsx.cisd.common.process.ProcessExecutionHelper;
import ch.systemsx.cisd.common.process.ProcessResult;
+import ch.systemsx.cisd.common.time.TimingParameters;
/**
* A class for creating hard links based on the Unix 'ln' program.
diff --git a/common/source/java/ch/systemsx/cisd/common/filesystem/NonHangingFreeSpaceProvider.java b/common/source/java/ch/systemsx/cisd/common/filesystem/NonHangingFreeSpaceProvider.java
index 3c4bb19c5cc9adeafb3afa5a97729dad05cca138..9b2e4bbec48cd8aee1df902a5518775383096954 100644
--- a/common/source/java/ch/systemsx/cisd/common/filesystem/NonHangingFreeSpaceProvider.java
+++ b/common/source/java/ch/systemsx/cisd/common/filesystem/NonHangingFreeSpaceProvider.java
@@ -22,9 +22,9 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
-import ch.systemsx.cisd.common.Constants;
import ch.systemsx.cisd.common.concurrent.ConcurrencyUtilities;
import ch.systemsx.cisd.common.concurrent.ExecutionResult;
+import ch.systemsx.cisd.common.time.TimingParameters;
/**
* A <code>DelegateFreeSpaceProvider</code> which does not block, computing the free space in its
@@ -51,7 +51,7 @@ public final class NonHangingFreeSpaceProvider extends DelegateFreeSpaceProvider
final Future<Long> future =
executorService.submit(new FreeSpaceCallable(getFreeSpaceProvider(), path));
final ExecutionResult<Long> executionResult =
- ConcurrencyUtilities.getResult(future, Constants.MILLIS_TO_WAIT_BEFORE_TIMEOUT);
+ ConcurrencyUtilities.getResult(future, TimingParameters.DEFAULT_TIMEOUT_MILLIS);
final Long resultOrNull = executionResult.tryGetResult();
if (resultOrNull != null)
{
diff --git a/common/source/java/ch/systemsx/cisd/common/filesystem/QueueingPathRemoverService.java b/common/source/java/ch/systemsx/cisd/common/filesystem/QueueingPathRemoverService.java
index b8239909af93d2b68b89baa8af8b949dedbae2bf..99176e4c86965da896af236e20e1bbbfd7ddbe30 100644
--- a/common/source/java/ch/systemsx/cisd/common/filesystem/QueueingPathRemoverService.java
+++ b/common/source/java/ch/systemsx/cisd/common/filesystem/QueueingPathRemoverService.java
@@ -25,7 +25,6 @@ import org.apache.log4j.Logger;
import ch.rinn.restrictions.Private;
import ch.systemsx.cisd.base.exceptions.InterruptedExceptionUnchecked;
import ch.systemsx.cisd.base.io.ICloseable;
-import ch.systemsx.cisd.common.TimingParameters;
import ch.systemsx.cisd.common.collection.ExtendedBlockingQueueFactory;
import ch.systemsx.cisd.common.collection.ExtendedLinkedBlockingQueue;
import ch.systemsx.cisd.common.collection.IExtendedBlockingQueue;
@@ -35,6 +34,7 @@ import ch.systemsx.cisd.common.logging.ISimpleLogger;
import ch.systemsx.cisd.common.logging.Log4jSimpleLogger;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
+import ch.systemsx.cisd.common.time.TimingParameters;
/**
* A service for removing (deep) paths. It provides a method {@link #removeRecursively(File)} that
diff --git a/common/source/java/ch/systemsx/cisd/common/filesystem/highwatermark/HighwaterMarkWatcher.java b/common/source/java/ch/systemsx/cisd/common/filesystem/highwatermark/HighwaterMarkWatcher.java
index afaccaf53b3346ba1d5dab8e9c700f67410dc242..ac76835670f420d4bf0d8180ae3de2c203f25679 100644
--- a/common/source/java/ch/systemsx/cisd/common/filesystem/highwatermark/HighwaterMarkWatcher.java
+++ b/common/source/java/ch/systemsx/cisd/common/filesystem/highwatermark/HighwaterMarkWatcher.java
@@ -28,7 +28,6 @@ import org.apache.commons.io.FileSystemUtils;
import org.apache.commons.io.FileUtils;
import org.apache.log4j.Logger;
-import ch.systemsx.cisd.common.Constants;
import ch.systemsx.cisd.common.exception.EnvironmentFailureException;
import ch.systemsx.cisd.common.filesystem.FileUtilities;
import ch.systemsx.cisd.common.filesystem.HostAwareFile;
@@ -38,6 +37,7 @@ import ch.systemsx.cisd.common.filesystem.SimpleFreeSpaceProvider;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
import ch.systemsx.cisd.common.process.CallableExecutor;
+import ch.systemsx.cisd.common.time.TimingParameters;
/**
* A high water mark watcher.
@@ -180,7 +180,7 @@ public final class HighwaterMarkWatcher implements Runnable
final String errorMsg =
String.format("Could not compute available free space for '%s'.", file);
final Long freeSpaceInKb =
- new CallableExecutor(5, Constants.MILLIS_TO_SLEEP_BEFORE_RETRYING)
+ new CallableExecutor(5, TimingParameters.DEFAULT_MILLIS_TO_SLEEP_BEFORE_RETRYING)
.executeCallable(new Callable<Long>()
{
diff --git a/common/source/java/ch/systemsx/cisd/common/filesystem/rsync/RsyncBasedRecursiveHardLinkMaker.java b/common/source/java/ch/systemsx/cisd/common/filesystem/rsync/RsyncBasedRecursiveHardLinkMaker.java
index f4394eaca24b8e60f1d72c60200639e341453b75..07124d8f7422720c1d8a3c6e674d374809446da4 100644
--- a/common/source/java/ch/systemsx/cisd/common/filesystem/rsync/RsyncBasedRecursiveHardLinkMaker.java
+++ b/common/source/java/ch/systemsx/cisd/common/filesystem/rsync/RsyncBasedRecursiveHardLinkMaker.java
@@ -21,7 +21,6 @@ import java.io.File;
import org.apache.log4j.Logger;
import ch.systemsx.cisd.base.utilities.OSUtilities;
-import ch.systemsx.cisd.common.TimingParameters;
import ch.systemsx.cisd.common.concurrent.ConcurrencyUtilities;
import ch.systemsx.cisd.common.concurrent.InactivityMonitor;
import ch.systemsx.cisd.common.concurrent.InactivityMonitor.IInactivityObserver;
@@ -32,6 +31,7 @@ import ch.systemsx.cisd.common.filesystem.IDirectoryImmutableCopier;
import ch.systemsx.cisd.common.filesystem.RemoteDirectoryCopyActivitySensor;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
+import ch.systemsx.cisd.common.time.TimingParameters;
/**
* A hard link maker based on <code>rsync</code>.
diff --git a/common/source/java/ch/systemsx/cisd/common/filesystem/rsync/RsyncVersionChecker.java b/common/source/java/ch/systemsx/cisd/common/filesystem/rsync/RsyncVersionChecker.java
index b4cef3a3d9beebfe2633ee3ecb5d8bece3d8b3a1..f30695b84d3726cd0c95fde99b6b778edadf3ecf 100644
--- a/common/source/java/ch/systemsx/cisd/common/filesystem/rsync/RsyncVersionChecker.java
+++ b/common/source/java/ch/systemsx/cisd/common/filesystem/rsync/RsyncVersionChecker.java
@@ -21,12 +21,12 @@ import java.util.List;
import org.apache.log4j.Logger;
-import ch.systemsx.cisd.common.Constants;
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.process.ProcessIOStrategy;
import ch.systemsx.cisd.common.process.ProcessResult;
+import ch.systemsx.cisd.common.time.TimingParameters;
/**
* A class that helps checking an <code>rsync</code> binary for its version.
@@ -241,7 +241,7 @@ final class RsyncVersionChecker
{
final ProcessResult result =
ProcessExecutionHelper.run(Arrays.asList(rsyncExecutableToCheck, "--version"),
- operationLog, machineLog, Constants.MILLIS_TO_WAIT_BEFORE_TIMEOUT,
+ operationLog, machineLog, TimingParameters.DEFAULT_TIMEOUT_MILLIS,
ProcessIOStrategy.DEFAULT_IO_STRATEGY, false);
result.log();
final List<String> processOutput = result.getOutput();
diff --git a/common/source/java/ch/systemsx/cisd/common/process/CallableExecutor.java b/common/source/java/ch/systemsx/cisd/common/process/CallableExecutor.java
index f36cf5f5591e221a0257bd5b7cdb9a085b3aeaaf..d635de6ff7710834eb80c8ab4d554a19d9e13af9 100644
--- a/common/source/java/ch/systemsx/cisd/common/process/CallableExecutor.java
+++ b/common/source/java/ch/systemsx/cisd/common/process/CallableExecutor.java
@@ -20,7 +20,7 @@ import java.util.concurrent.Callable;
import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
import ch.systemsx.cisd.base.exceptions.InterruptedExceptionUnchecked;
-import ch.systemsx.cisd.common.Constants;
+import ch.systemsx.cisd.common.time.TimingParameters;
/**
* Executes given {@link Callable}.
@@ -35,7 +35,7 @@ public final class CallableExecutor
public CallableExecutor()
{
- this(Constants.MAXIMUM_RETRY_COUNT, Constants.MILLIS_TO_SLEEP_BEFORE_RETRYING);
+ this(TimingParameters.DEFAULT_MAXIMUM_RETRY_COUNT, TimingParameters.DEFAULT_MILLIS_TO_SLEEP_BEFORE_RETRYING);
}
public CallableExecutor(final int maxRetriesOnFailure, final long millisToSleepOnFailure)
diff --git a/common/source/java/ch/systemsx/cisd/common/TimingParameters.java b/common/source/java/ch/systemsx/cisd/common/time/TimingParameters.java
similarity index 77%
rename from common/source/java/ch/systemsx/cisd/common/TimingParameters.java
rename to common/source/java/ch/systemsx/cisd/common/time/TimingParameters.java
index 2185c818e48dd8000d6cf388d5bdf3ed0059bb0b..2af4f4f186f650eba63a1aae895b1747a58fa0f0 100644
--- a/common/source/java/ch/systemsx/cisd/common/TimingParameters.java
+++ b/common/source/java/ch/systemsx/cisd/common/time/TimingParameters.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.common;
+package ch.systemsx.cisd.common.time;
import java.util.Properties;
@@ -32,9 +32,43 @@ import ch.systemsx.cisd.common.properties.PropertyUtils;
public class TimingParameters
{
+ /** Time in seconds to wait before a timeout occurs. */
+ public static final int DEFAULT_TIMEOUT_SECONDS = 60;
+
+ /** Time interval in seconds to wait after an operation failed before retrying it. */
+ public static final int DEFAULT_INTERVAL_TO_WAIT_AFTER_FAILURE_SECONDS = 10;
+
+ /** Maximal number of retries when an operation fails. */
+ public static final int DEFAULT_MAXIMUM_RETRY_COUNT = 11;
+
+ /** Time interval in milli-seconds to wait after an operation failed before retrying it. */
+ public static final long DEFAULT_MILLIS_TO_SLEEP_BEFORE_RETRYING =
+ DEFAULT_INTERVAL_TO_WAIT_AFTER_FAILURE_SECONDS * DateUtils.MILLIS_PER_SECOND;
+
+ /** Time in milli-seconds to wait before a timeout occurs.. */
+ public static final long DEFAULT_TIMEOUT_MILLIS =
+ DEFAULT_TIMEOUT_SECONDS * DateUtils.MILLIS_PER_SECOND;
+
+ /**
+ * Name of the property to specify a timeout (in seconds).
+ */
+ public static final String TIMEOUT_PROPERTY_NAME = "timeout";
+
+ /**
+ * Name of the property to specify the maximum number of retries.
+ */
+ public static final String MAX_RETRY_PROPERTY_NAME = "max-retries";
+
+ /**
+ * Name of the property to specify the interval to sleep after a failure and before a retry (in
+ * seconds).
+ */
+ public static final String FAILURE_INTERVAL_NAME = "failure-interval";
+
private final static TimingParameters standardParameters =
- new TimingParameters(Constants.MILLIS_TO_WAIT_BEFORE_TIMEOUT,
- Constants.MAXIMUM_RETRY_COUNT, Constants.MILLIS_TO_SLEEP_BEFORE_RETRYING);
+ new TimingParameters(TimingParameters.DEFAULT_TIMEOUT_MILLIS,
+ TimingParameters.DEFAULT_MAXIMUM_RETRY_COUNT,
+ TimingParameters.DEFAULT_MILLIS_TO_SLEEP_BEFORE_RETRYING);
private final static TimingParameters defaultParameters =
new TimingParameters(standardParameters);
@@ -66,12 +100,6 @@ public class TimingParameters
return noTimeoutNoRetriesParameters;
}
- public static final String TIMEOUT_PROPERTY = "timeout";
-
- public static final String MAX_RETRY_PROPERTY = "max-retries";
-
- public static final String FAILURE_INTERVAL = "failure-interval";
-
private volatile long timeoutMillis;
private volatile int maxRetriesOnFailure;
@@ -89,9 +117,9 @@ public class TimingParameters
*/
public static boolean hasTimingParameters(Properties properties)
{
- return properties.containsKey(TIMEOUT_PROPERTY)
- || properties.containsKey(MAX_RETRY_PROPERTY)
- || properties.containsKey(FAILURE_INTERVAL);
+ return properties.containsKey(TIMEOUT_PROPERTY_NAME)
+ || properties.containsKey(MAX_RETRY_PROPERTY_NAME)
+ || properties.containsKey(FAILURE_INTERVAL_NAME);
}
/**
@@ -130,20 +158,22 @@ public class TimingParameters
private static long getIntervalToWaitAfterFailureMillis(Properties properties)
{
- return PropertyUtils.getInt(properties, FAILURE_INTERVAL,
- Constants.INTERVAL_TO_WAIT_AFTER_FAILURE_SECONDS)
+ return PropertyUtils.getInt(properties, FAILURE_INTERVAL_NAME,
+ TimingParameters.DEFAULT_INTERVAL_TO_WAIT_AFTER_FAILURE_SECONDS)
* DateUtils.MILLIS_PER_SECOND;
}
private static int getMaxRetriesOnFailure(Properties properties)
{
- return PropertyUtils.getInt(properties, MAX_RETRY_PROPERTY, Constants.MAXIMUM_RETRY_COUNT);
+ return PropertyUtils.getInt(properties, MAX_RETRY_PROPERTY_NAME,
+ TimingParameters.DEFAULT_MAXIMUM_RETRY_COUNT);
}
private static long getTimeoutMillis(Properties properties)
{
final long timeoutSpecified =
- PropertyUtils.getInt(properties, TIMEOUT_PROPERTY, Constants.TIMEOUT_SECONDS)
+ PropertyUtils.getInt(properties, TIMEOUT_PROPERTY_NAME,
+ TimingParameters.DEFAULT_TIMEOUT_SECONDS)
* DateUtils.MILLIS_PER_SECOND;
return (timeoutSpecified == 0) ? Long.MAX_VALUE : timeoutSpecified;
}
@@ -157,8 +187,8 @@ public class TimingParameters
public static TimingParameters create(final long timeoutMillis)
{
- return new TimingParameters(timeoutMillis, Constants.MAXIMUM_RETRY_COUNT,
- Constants.MILLIS_TO_SLEEP_BEFORE_RETRYING);
+ return new TimingParameters(timeoutMillis, TimingParameters.DEFAULT_MAXIMUM_RETRY_COUNT,
+ TimingParameters.DEFAULT_MILLIS_TO_SLEEP_BEFORE_RETRYING);
}
public static TimingParameters createNoRetries(final long timeoutMillis)
diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/TimingParametersTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/TimingParametersTest.java
index 86dc893c885a893c651c34644eacc9be5f412b86..09656058ab7438ccc14caa2c1f42db49cf2a9024 100644
--- a/common/sourceTest/java/ch/systemsx/cisd/common/TimingParametersTest.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/TimingParametersTest.java
@@ -21,6 +21,8 @@ import java.util.Properties;
import org.apache.commons.lang.time.DateUtils;
import org.testng.annotations.Test;
+import ch.systemsx.cisd.common.time.TimingParameters;
+
import static org.testng.AssertJUnit.*;
/**
@@ -46,9 +48,9 @@ public class TimingParametersTest
final int maxRetries = 7;
final int failureInterval = 13;
final Properties props = new Properties();
- props.put(TimingParameters.TIMEOUT_PROPERTY, Integer.toString(timeout));
- props.put(TimingParameters.MAX_RETRY_PROPERTY, Integer.toString(maxRetries));
- props.put(TimingParameters.FAILURE_INTERVAL, Integer.toString(failureInterval));
+ props.put(TimingParameters.TIMEOUT_PROPERTY_NAME, Integer.toString(timeout));
+ props.put(TimingParameters.MAX_RETRY_PROPERTY_NAME, Integer.toString(maxRetries));
+ props.put(TimingParameters.FAILURE_INTERVAL_NAME, Integer.toString(failureInterval));
final TimingParameters parameters = TimingParameters.create(props);
assertEquals(timeout * DateUtils.MILLIS_PER_SECOND, parameters.getTimeoutMillis());
assertEquals(maxRetries, parameters.getMaxRetriesOnFailure());
@@ -67,7 +69,7 @@ public class TimingParametersTest
public void testHasTimingParametersTrue()
{
final Properties props = new Properties();
- props.put(TimingParameters.TIMEOUT_PROPERTY, "30");
+ props.put(TimingParameters.TIMEOUT_PROPERTY_NAME, "30");
assertTrue(TimingParameters.hasTimingParameters(props));
}
@@ -75,7 +77,7 @@ public class TimingParametersTest
public void testHasTimingParametersTrue2()
{
final Properties props = new Properties();
- props.put(TimingParameters.MAX_RETRY_PROPERTY, "2");
+ props.put(TimingParameters.MAX_RETRY_PROPERTY_NAME, "2");
assertTrue(TimingParameters.hasTimingParameters(props));
}
@@ -83,7 +85,7 @@ public class TimingParametersTest
public void testHasTimingParametersTrue3()
{
final Properties props = new Properties();
- props.put(TimingParameters.FAILURE_INTERVAL, "xxx");
+ props.put(TimingParameters.FAILURE_INTERVAL_NAME, "xxx");
assertTrue(TimingParameters.hasTimingParameters(props));
}
}
diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/concurrent/MonitoringProxyTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/concurrent/MonitoringProxyTest.java
index b448812726d99fd5e187cfcb584ef39e7c0f36f7..6057f4f54e537a72ed5ad967daba6bda08dfb0ca 100644
--- a/common/sourceTest/java/ch/systemsx/cisd/common/concurrent/MonitoringProxyTest.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/concurrent/MonitoringProxyTest.java
@@ -40,12 +40,12 @@ import ch.systemsx.cisd.base.exceptions.InterruptedExceptionUnchecked;
import ch.systemsx.cisd.base.exceptions.TimeoutExceptionUnchecked;
import ch.systemsx.cisd.base.namedthread.NamingThreadPoolExecutor;
import ch.systemsx.cisd.base.tests.Retry50;
-import ch.systemsx.cisd.common.TimingParameters;
import ch.systemsx.cisd.common.concurrent.MonitoringProxy.IMonitorCommunicator;
import ch.systemsx.cisd.common.logging.AssertingLogger;
import ch.systemsx.cisd.common.logging.ConsoleLogger;
import ch.systemsx.cisd.common.logging.ISimpleLogger;
import ch.systemsx.cisd.common.logging.LogLevel;
+import ch.systemsx.cisd.common.time.TimingParameters;
/**
* Test cases for the {@link MonitoringProxy}.
diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/filesystem/FileOperationsTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/filesystem/FileOperationsTest.java
index a4a60b70d62c60c4028ce635d4927e49b6d4cf05..ac5c097558626fc3b0514f8208f8f272d2f12cb6 100644
--- a/common/sourceTest/java/ch/systemsx/cisd/common/filesystem/FileOperationsTest.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/filesystem/FileOperationsTest.java
@@ -31,12 +31,12 @@ import ch.systemsx.cisd.base.exceptions.TimeoutExceptionUnchecked;
import ch.systemsx.cisd.base.io.IInputStream;
import ch.systemsx.cisd.base.tests.AbstractFileSystemTestCase;
import ch.systemsx.cisd.base.tests.Retry10;
-import ch.systemsx.cisd.common.TimingParameters;
import ch.systemsx.cisd.common.concurrent.ConcurrencyUtilities;
import ch.systemsx.cisd.common.concurrent.IActivityObserver;
import ch.systemsx.cisd.common.concurrent.MonitoringProxy;
import ch.systemsx.cisd.common.concurrent.RecordingActivityObserverSensor;
import ch.systemsx.cisd.common.logging.Log4jSimpleLogger;
+import ch.systemsx.cisd.common.time.TimingParameters;
/**
* Test cases for {@link FileOperations}.
diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/reflection/ClassUtilsTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/reflection/ClassUtilsTest.java
index 19d4182218f82a2733fe1203be684abdba5ab5b3..1d780ef2503df44eed2072ce52f5a41125bae9e0 100644
--- a/common/sourceTest/java/ch/systemsx/cisd/common/reflection/ClassUtilsTest.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/reflection/ClassUtilsTest.java
@@ -34,9 +34,9 @@ import java.util.Properties;
import org.testng.annotations.Test;
import org.testng.remote.SuiteSlave;
-import ch.systemsx.cisd.common.TimingParameters;
import ch.systemsx.cisd.common.TimingParametersTest;
import ch.systemsx.cisd.common.reflection.ClassUtils;
+import ch.systemsx.cisd.common.time.TimingParameters;
/**
* Test cases for the {@link ClassUtils} class.
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/RetryingPathRemover.java b/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/RetryingPathRemover.java
index 2c1d49b529a0de50ec64980943103a67fca8b8b8..e53eeea0c2601dc2c18710caca73130c41907e63 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/RetryingPathRemover.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/RetryingPathRemover.java
@@ -26,7 +26,6 @@ import org.apache.log4j.Logger;
import ch.rinn.restrictions.Private;
import ch.systemsx.cisd.base.namedthread.NamingThreadPoolExecutor;
-import ch.systemsx.cisd.common.Constants;
import ch.systemsx.cisd.common.concurrent.ConcurrencyUtilities;
import ch.systemsx.cisd.common.concurrent.ExecutionResult;
import ch.systemsx.cisd.common.concurrent.ExecutionStatus;
@@ -38,6 +37,7 @@ import ch.systemsx.cisd.common.exception.Status;
import ch.systemsx.cisd.common.filesystem.FileUtilities;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
+import ch.systemsx.cisd.common.time.TimingParameters;
import ch.systemsx.cisd.datamover.filesystem.intf.IPathRemover;
/**
@@ -50,7 +50,7 @@ import ch.systemsx.cisd.datamover.filesystem.intf.IPathRemover;
final class RetryingPathRemover implements IPathRemover
{
private static final long DELETE_ONE_FILE_TIMEOUT_MILLIS =
- Constants.MILLIS_TO_WAIT_BEFORE_TIMEOUT;
+ TimingParameters.DEFAULT_TIMEOUT_MILLIS;
private static final Logger operationLog =
LogFactory.getLogger(LogCategory.OPERATION, RetryingPathRemover.class);
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 04d196478772e3ce0ecb2ff85ba3323199a3b79c..941090294b08642d264a88ed399795543665b84c 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
@@ -23,7 +23,6 @@ import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
-import ch.systemsx.cisd.common.Constants;
import ch.systemsx.cisd.common.exception.ConfigurationFailureException;
import ch.systemsx.cisd.common.exception.EnvironmentFailureException;
import ch.systemsx.cisd.common.exception.Status;
@@ -32,6 +31,7 @@ import ch.systemsx.cisd.common.filesystem.FileUtilities;
import ch.systemsx.cisd.common.filesystem.IPathCopier;
import ch.systemsx.cisd.common.filesystem.StoreItem;
import ch.systemsx.cisd.common.filesystem.highwatermark.HostAwareFileWithHighwaterMark;
+import ch.systemsx.cisd.common.time.TimingParameters;
import ch.systemsx.cisd.datamover.DatamoverConstants;
/**
@@ -233,7 +233,7 @@ public abstract class AbstractFileStore implements IFileStore
public void check() throws EnvironmentFailureException, ConfigurationFailureException
{
final BooleanStatus result =
- checkDirectoryFullyAccessible(Constants.MILLIS_TO_WAIT_BEFORE_TIMEOUT);
+ checkDirectoryFullyAccessible(TimingParameters.DEFAULT_TIMEOUT_MILLIS);
if (result.isSuccess() == false)
{
throw new ConfigurationFailureException(result.tryGetMessage());
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/remote/RemotePathMover.java b/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/remote/RemotePathMover.java
index 92c41149e76af0cc0e6983982393f63366d32e2b..72e32d05b616e00cda83aaca67244dcc3ccf6f7d 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/remote/RemotePathMover.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/remote/RemotePathMover.java
@@ -18,7 +18,6 @@ package ch.systemsx.cisd.datamover.filesystem.remote;
import org.apache.log4j.Logger;
-import ch.systemsx.cisd.common.Constants;
import ch.systemsx.cisd.common.concurrent.InactivityMonitor;
import ch.systemsx.cisd.common.concurrent.InactivityMonitor.IInactivityObserver;
import ch.systemsx.cisd.common.exception.ConfigurationFailureException;
@@ -30,6 +29,7 @@ import ch.systemsx.cisd.common.logging.ConditionalNotificationLogger;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
import ch.systemsx.cisd.common.logging.LogLevel;
+import ch.systemsx.cisd.common.time.TimingParameters;
import ch.systemsx.cisd.datamover.common.IStoreMover;
import ch.systemsx.cisd.datamover.common.MarkerFile;
import ch.systemsx.cisd.datamover.filesystem.intf.IExtendedFileStore;
@@ -191,7 +191,7 @@ public final class RemotePathMover implements IStoreMover
{
final BooleanStatus status =
destinationStore
- .checkDirectoryFullyAccessible(Constants.MILLIS_TO_WAIT_BEFORE_TIMEOUT);
+ .checkDirectoryFullyAccessible(TimingParameters.DEFAULT_TIMEOUT_MILLIS);
if (status.isSuccess() == false)
{
conditionalLogger.log(LogLevel.ERROR, status.tryGetMessage());
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/store/FileStoreRemoteMounted.java b/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/store/FileStoreRemoteMounted.java
index 37046b959ef693804229aea9d9eb4a4789eb9971..c3a77fb89459b217335cf47cb726323443a54f8a 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/store/FileStoreRemoteMounted.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/store/FileStoreRemoteMounted.java
@@ -17,7 +17,6 @@
package ch.systemsx.cisd.datamover.filesystem.store;
import ch.systemsx.cisd.base.exceptions.TimeoutExceptionUnchecked;
-import ch.systemsx.cisd.common.TimingParameters;
import ch.systemsx.cisd.common.concurrent.MonitoringProxy;
import ch.systemsx.cisd.common.exception.ConfigurationFailureException;
import ch.systemsx.cisd.common.exception.EnvironmentFailureException;
@@ -29,6 +28,7 @@ import ch.systemsx.cisd.common.filesystem.highwatermark.HighwaterMarkWatcher;
import ch.systemsx.cisd.common.filesystem.highwatermark.HostAwareFileWithHighwaterMark;
import ch.systemsx.cisd.common.logging.ISimpleLogger;
import ch.systemsx.cisd.common.logging.LogLevel;
+import ch.systemsx.cisd.common.time.TimingParameters;
import ch.systemsx.cisd.datamover.filesystem.intf.AbstractFileStore;
import ch.systemsx.cisd.datamover.filesystem.intf.IExtendedFileStore;
import ch.systemsx.cisd.datamover.filesystem.intf.IFileStore;
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/store/RemoteFreeSpaceProvider.java b/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/store/RemoteFreeSpaceProvider.java
index bdea16e64b7d6f6e071a14b801b06b66fcfc236a..b16f5274243080395b3e16719318c601cf2ebe82 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/store/RemoteFreeSpaceProvider.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/store/RemoteFreeSpaceProvider.java
@@ -22,7 +22,6 @@ import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
-import ch.systemsx.cisd.common.Constants;
import ch.systemsx.cisd.common.filesystem.HostAwareFile;
import ch.systemsx.cisd.common.filesystem.IFreeSpaceProvider;
import ch.systemsx.cisd.common.filesystem.ssh.ISshCommandBuilder;
@@ -30,6 +29,7 @@ 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.process.ProcessResult;
+import ch.systemsx.cisd.common.time.TimingParameters;
/**
* An <code>IFreeSpaceProvider</code> implementation for computing the free space on a remote
@@ -51,7 +51,7 @@ final class RemoteFreeSpaceProvider implements IFreeSpaceProvider
private final ISshCommandBuilder sshCommandBuilder;
- private final long millisToWaitForCompletion = Constants.MILLIS_TO_WAIT_BEFORE_TIMEOUT;
+ private final long millisToWaitForCompletion = TimingParameters.DEFAULT_TIMEOUT_MILLIS;
public RemoteFreeSpaceProvider(final ISshCommandBuilder sshCommandBuilder)
{
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 146d5ce2d90e54beabb18fd2422857c9c71b228f..a1d7263520b11e5160bd3f0d54609c388d35c543 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/ETLDaemon.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/ETLDaemon.java
@@ -35,7 +35,6 @@ import org.apache.log4j.Logger;
import ch.rinn.restrictions.Private;
import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
import ch.systemsx.cisd.base.exceptions.InterruptedExceptionUnchecked;
-import ch.systemsx.cisd.common.TimingParameters;
import ch.systemsx.cisd.common.concurrent.TimerUtilities;
import ch.systemsx.cisd.common.exception.ConfigurationFailureException;
import ch.systemsx.cisd.common.exception.HighLevelException;
@@ -67,6 +66,7 @@ import ch.systemsx.cisd.common.maintenance.MaintenanceTaskParameters;
import ch.systemsx.cisd.common.maintenance.MaintenanceTaskUtils;
import ch.systemsx.cisd.common.properties.PropertyUtils;
import ch.systemsx.cisd.common.reflection.ClassUtils;
+import ch.systemsx.cisd.common.time.TimingParameters;
import ch.systemsx.cisd.common.utilities.IExitHandler;
import ch.systemsx.cisd.common.utilities.ISelfTestable;
import ch.systemsx.cisd.common.utilities.SystemExit;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/FileBasedFileFactory.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/FileBasedFileFactory.java
index 556fbd7a134a4c6b180076d9bca0ab40811c6a74..15f357be2620f64c71c782a9acfbecb026f8bd74 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/FileBasedFileFactory.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/FileBasedFileFactory.java
@@ -20,9 +20,9 @@ import java.io.File;
import org.apache.commons.io.FilenameUtils;
-import ch.systemsx.cisd.common.TimingParameters;
import ch.systemsx.cisd.common.filesystem.FastRecursiveHardLinkMaker;
import ch.systemsx.cisd.common.filesystem.IImmutableCopier;
+import ch.systemsx.cisd.common.time.TimingParameters;
/**
* File factory based on {@link File}. Files are copies by creating hard links (if possible) if the
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/Parameters.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/Parameters.java
index 00c4dbb9577817dd3c46000a3be1b2e074d1c29b..0b3fb9f379b852cb9b5b702c5e8b30c24efee310 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/Parameters.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/Parameters.java
@@ -25,7 +25,6 @@ import ch.systemsx.cisd.args4j.CmdLineException;
import ch.systemsx.cisd.args4j.CmdLineParser;
import ch.systemsx.cisd.args4j.ExampleMode;
import ch.systemsx.cisd.args4j.Option;
-import ch.systemsx.cisd.common.TimingParameters;
import ch.systemsx.cisd.common.exception.ConfigurationFailureException;
import ch.systemsx.cisd.common.exception.UserFailureException;
import ch.systemsx.cisd.common.logging.LogCategory;
@@ -37,6 +36,7 @@ import ch.systemsx.cisd.common.properties.ExtendedProperties;
import ch.systemsx.cisd.common.properties.PropertyParametersUtil;
import ch.systemsx.cisd.common.properties.PropertyUtils;
import ch.systemsx.cisd.common.properties.PropertyParametersUtil.SectionProperties;
+import ch.systemsx.cisd.common.time.TimingParameters;
import ch.systemsx.cisd.common.utilities.IExitHandler;
import ch.systemsx.cisd.common.utilities.SystemExit;
import ch.systemsx.cisd.common.utilities.VoidExitHandler;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/QueueingDataSetStatusUpdaterService.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/QueueingDataSetStatusUpdaterService.java
index 3c5c27a67751edb9e125d0232441042ef0fffb0c..a1ca3dd67602f8263979f32ddef0a688d1e2e3ed 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/QueueingDataSetStatusUpdaterService.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/QueueingDataSetStatusUpdaterService.java
@@ -24,7 +24,6 @@ import org.springframework.remoting.RemoteAccessException;
import ch.systemsx.cisd.base.exceptions.InterruptedExceptionUnchecked;
import ch.systemsx.cisd.base.io.ICloseable;
-import ch.systemsx.cisd.common.TimingParameters;
import ch.systemsx.cisd.common.collection.CollectionUtils;
import ch.systemsx.cisd.common.collection.ExtendedBlockingQueueFactory;
import ch.systemsx.cisd.common.collection.IExtendedBlockingQueue;
@@ -33,6 +32,7 @@ import ch.systemsx.cisd.common.collection.QueuePersister;
import ch.systemsx.cisd.common.exception.UserFailureException;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
+import ch.systemsx.cisd.common.time.TimingParameters;
import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetCodesWithStatus;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSetArchivingStatus;
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/FileBasedFileTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/FileBasedFileTest.java
index 95968568d63a05a0b3f099fd47c23d9a6287097d..b92e8388c0f80f6f7b5612e590e5e68ee6dad00a 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/FileBasedFileTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/FileBasedFileTest.java
@@ -24,9 +24,9 @@ import java.io.File;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;
-import ch.systemsx.cisd.common.TimingParameters;
import ch.systemsx.cisd.common.filesystem.FileUtilities;
import ch.systemsx.cisd.common.logging.LogInitializer;
+import ch.systemsx.cisd.common.time.TimingParameters;
/**
* Test cases for corresponding {@link FileBasedFile} class.
diff --git a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/dss/FlowLaneFeeder.java b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/dss/FlowLaneFeeder.java
index 8fd80986cd6aae9633096415c64e6f6995b4a0db..6c876e96576566ac094b453f788547ad96468b8d 100644
--- a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/dss/FlowLaneFeeder.java
+++ b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/dss/FlowLaneFeeder.java
@@ -38,7 +38,6 @@ import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.log4j.Logger;
-import ch.systemsx.cisd.common.TimingParameters;
import ch.systemsx.cisd.common.concurrent.ConcurrencyUtilities;
import ch.systemsx.cisd.common.exception.ConfigurationFailureException;
import ch.systemsx.cisd.common.exception.EnvironmentFailureException;
@@ -56,6 +55,7 @@ import ch.systemsx.cisd.common.process.ProcessIOStrategy;
import ch.systemsx.cisd.common.process.ProcessResult;
import ch.systemsx.cisd.common.properties.ExtendedProperties;
import ch.systemsx.cisd.common.properties.PropertyUtils;
+import ch.systemsx.cisd.common.time.TimingParameters;
import ch.systemsx.cisd.etlserver.AbstractPostRegistrationDataSetHandlerForFileBasedUndo;
import ch.systemsx.cisd.openbis.dss.generic.shared.IEncapsulatedOpenBISService;
import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/DataStoreServiceFactory.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/DataStoreServiceFactory.java
index 3fb678253937d8c151ba38640eef569d86443538..e629fb0bc026c045d8bf51336ba748105b62e1fd 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/DataStoreServiceFactory.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/DataStoreServiceFactory.java
@@ -28,13 +28,13 @@ import org.springframework.remoting.RemoteAccessException;
import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
import ch.systemsx.cisd.base.namedthread.NamingThreadPoolExecutor;
-import ch.systemsx.cisd.common.TimingParameters;
import ch.systemsx.cisd.common.concurrent.MonitoringProxy;
import ch.systemsx.cisd.common.logging.Log4jSimpleLogger;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
import ch.systemsx.cisd.common.logging.LogLevel;
import ch.systemsx.cisd.common.spring.HttpInvokerUtils;
+import ch.systemsx.cisd.common.time.TimingParameters;
import ch.systemsx.cisd.openbis.generic.shared.IDataStoreService;
/**