From e1a7052a4b0be30ba054cca32a23aad2107eb547 Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Tue, 24 Mar 2009 22:01:47 +0000
Subject: [PATCH] refactor: move NamingThreadPoolExecutor from common to base
SVN: 10363
---
.../ch/systemsx/cisd/base/exceptions/namedthread/.gitignore | 0
.../ch/systemsx/cisd/base/namedthread}/NamedCallable.java | 2 +-
.../ch/systemsx/cisd/base/namedthread}/NamedFutureTask.java | 2 +-
.../ch/systemsx/cisd/base/namedthread}/NamedRunnable.java | 2 +-
.../systemsx/cisd/base/namedthread}/NamingThreadFactory.java | 2 +-
.../cisd/base/namedthread}/NamingThreadPoolExecutor.java | 2 +-
.../ch/systemsx/cisd/base/namedthread}/PoolNameThread.java | 2 +-
common/.classpath | 1 +
.../ch/systemsx/cisd/common/concurrent/MonitoringProxy.java | 2 ++
.../systemsx/cisd/common/process/ProcessExecutionHelper.java | 4 ++--
.../cisd/common/concurrent/ConcurrencyUtilitiesTest.java | 1 +
.../cisd/common/concurrent/NamingThreadPoolExecutorTest.java | 4 ++++
.../cisd/datamover/filesystem/RetryingPathRemover.java | 2 +-
13 files changed, 17 insertions(+), 9 deletions(-)
delete mode 100644 base/source/java/ch/systemsx/cisd/base/exceptions/namedthread/.gitignore
rename {common/source/java/ch/systemsx/cisd/common/concurrent => base/source/java/ch/systemsx/cisd/base/namedthread}/NamedCallable.java (95%)
rename {common/source/java/ch/systemsx/cisd/common/concurrent => base/source/java/ch/systemsx/cisd/base/namedthread}/NamedFutureTask.java (96%)
rename {common/source/java/ch/systemsx/cisd/common/concurrent => base/source/java/ch/systemsx/cisd/base/namedthread}/NamedRunnable.java (94%)
rename {common/source/java/ch/systemsx/cisd/common/concurrent => base/source/java/ch/systemsx/cisd/base/namedthread}/NamingThreadFactory.java (98%)
rename {common/source/java/ch/systemsx/cisd/common/concurrent => base/source/java/ch/systemsx/cisd/base/namedthread}/NamingThreadPoolExecutor.java (99%)
rename {common/source/java/ch/systemsx/cisd/common/concurrent => base/source/java/ch/systemsx/cisd/base/namedthread}/PoolNameThread.java (97%)
diff --git a/base/source/java/ch/systemsx/cisd/base/exceptions/namedthread/.gitignore b/base/source/java/ch/systemsx/cisd/base/exceptions/namedthread/.gitignore
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/common/source/java/ch/systemsx/cisd/common/concurrent/NamedCallable.java b/base/source/java/ch/systemsx/cisd/base/namedthread/NamedCallable.java
similarity index 95%
rename from common/source/java/ch/systemsx/cisd/common/concurrent/NamedCallable.java
rename to base/source/java/ch/systemsx/cisd/base/namedthread/NamedCallable.java
index 4ae75955959..2a8d5eef851 100644
--- a/common/source/java/ch/systemsx/cisd/common/concurrent/NamedCallable.java
+++ b/base/source/java/ch/systemsx/cisd/base/namedthread/NamedCallable.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.common.concurrent;
+package ch.systemsx.cisd.base.namedthread;
import java.util.concurrent.Callable;
diff --git a/common/source/java/ch/systemsx/cisd/common/concurrent/NamedFutureTask.java b/base/source/java/ch/systemsx/cisd/base/namedthread/NamedFutureTask.java
similarity index 96%
rename from common/source/java/ch/systemsx/cisd/common/concurrent/NamedFutureTask.java
rename to base/source/java/ch/systemsx/cisd/base/namedthread/NamedFutureTask.java
index b84245d28e3..301ad3f4003 100644
--- a/common/source/java/ch/systemsx/cisd/common/concurrent/NamedFutureTask.java
+++ b/base/source/java/ch/systemsx/cisd/base/namedthread/NamedFutureTask.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.common.concurrent;
+package ch.systemsx.cisd.base.namedthread;
import java.util.concurrent.FutureTask;
diff --git a/common/source/java/ch/systemsx/cisd/common/concurrent/NamedRunnable.java b/base/source/java/ch/systemsx/cisd/base/namedthread/NamedRunnable.java
similarity index 94%
rename from common/source/java/ch/systemsx/cisd/common/concurrent/NamedRunnable.java
rename to base/source/java/ch/systemsx/cisd/base/namedthread/NamedRunnable.java
index 9ff5c8f0c96..d54d3d2f1fd 100644
--- a/common/source/java/ch/systemsx/cisd/common/concurrent/NamedRunnable.java
+++ b/base/source/java/ch/systemsx/cisd/base/namedthread/NamedRunnable.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.common.concurrent;
+package ch.systemsx.cisd.base.namedthread;
/**
* A {@link Runnable} with a name.
diff --git a/common/source/java/ch/systemsx/cisd/common/concurrent/NamingThreadFactory.java b/base/source/java/ch/systemsx/cisd/base/namedthread/NamingThreadFactory.java
similarity index 98%
rename from common/source/java/ch/systemsx/cisd/common/concurrent/NamingThreadFactory.java
rename to base/source/java/ch/systemsx/cisd/base/namedthread/NamingThreadFactory.java
index c87f18fb386..25bddc50b99 100644
--- a/common/source/java/ch/systemsx/cisd/common/concurrent/NamingThreadFactory.java
+++ b/base/source/java/ch/systemsx/cisd/base/namedthread/NamingThreadFactory.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.common.concurrent;
+package ch.systemsx.cisd.base.namedthread;
import java.util.concurrent.ThreadFactory;
diff --git a/common/source/java/ch/systemsx/cisd/common/concurrent/NamingThreadPoolExecutor.java b/base/source/java/ch/systemsx/cisd/base/namedthread/NamingThreadPoolExecutor.java
similarity index 99%
rename from common/source/java/ch/systemsx/cisd/common/concurrent/NamingThreadPoolExecutor.java
rename to base/source/java/ch/systemsx/cisd/base/namedthread/NamingThreadPoolExecutor.java
index 5ac6954e4ed..6f96e87233d 100644
--- a/common/source/java/ch/systemsx/cisd/common/concurrent/NamingThreadPoolExecutor.java
+++ b/base/source/java/ch/systemsx/cisd/base/namedthread/NamingThreadPoolExecutor.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.common.concurrent;
+package ch.systemsx.cisd.base.namedthread;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.Callable;
diff --git a/common/source/java/ch/systemsx/cisd/common/concurrent/PoolNameThread.java b/base/source/java/ch/systemsx/cisd/base/namedthread/PoolNameThread.java
similarity index 97%
rename from common/source/java/ch/systemsx/cisd/common/concurrent/PoolNameThread.java
rename to base/source/java/ch/systemsx/cisd/base/namedthread/PoolNameThread.java
index 3601019a2dc..550efeaf7f8 100644
--- a/common/source/java/ch/systemsx/cisd/common/concurrent/PoolNameThread.java
+++ b/base/source/java/ch/systemsx/cisd/base/namedthread/PoolNameThread.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.common.concurrent;
+package ch.systemsx.cisd.base.namedthread;
/**
* A {@link Thread} that knows its pool name.
diff --git a/common/.classpath b/common/.classpath
index c38c47afae0..cc089a2de62 100644
--- a/common/.classpath
+++ b/common/.classpath
@@ -17,5 +17,6 @@
<classpathentry kind="lib" path="/libraries/jmock/objenesis/objenesis-1.0.jar"/>
<classpathentry kind="lib" path="/libraries/jmock/hamcrest/hamcrest-library.jar"/>
<classpathentry kind="lib" path="/libraries/unix"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/base"/>
<classpathentry kind="output" path="targets/classes"/>
</classpath>
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 46ad3512b82..b6802ef2849 100644
--- a/common/source/java/ch/systemsx/cisd/common/concurrent/MonitoringProxy.java
+++ b/common/source/java/ch/systemsx/cisd/common/concurrent/MonitoringProxy.java
@@ -28,6 +28,8 @@ import java.util.Set;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
+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.exceptions.InterruptedExceptionUnchecked;
diff --git a/common/source/java/ch/systemsx/cisd/common/process/ProcessExecutionHelper.java b/common/source/java/ch/systemsx/cisd/common/process/ProcessExecutionHelper.java
index 64215d100f4..893aea8bf37 100644
--- a/common/source/java/ch/systemsx/cisd/common/process/ProcessExecutionHelper.java
+++ b/common/source/java/ch/systemsx/cisd/common/process/ProcessExecutionHelper.java
@@ -32,11 +32,11 @@ import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
+import ch.systemsx.cisd.base.namedthread.NamedCallable;
+import ch.systemsx.cisd.base.namedthread.NamingThreadPoolExecutor;
import ch.systemsx.cisd.common.concurrent.ConcurrencyUtilities;
import ch.systemsx.cisd.common.concurrent.ExecutionResult;
import ch.systemsx.cisd.common.concurrent.ExecutionStatus;
-import ch.systemsx.cisd.common.concurrent.NamedCallable;
-import ch.systemsx.cisd.common.concurrent.NamingThreadPoolExecutor;
import ch.systemsx.cisd.common.exceptions.InterruptedExceptionUnchecked;
import ch.systemsx.cisd.common.utilities.ITerminable;
diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/concurrent/ConcurrencyUtilitiesTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/concurrent/ConcurrencyUtilitiesTest.java
index 6f6e018ae47..bde3db7e93f 100644
--- a/common/sourceTest/java/ch/systemsx/cisd/common/concurrent/ConcurrencyUtilitiesTest.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/concurrent/ConcurrencyUtilitiesTest.java
@@ -35,6 +35,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;
+import ch.systemsx.cisd.base.namedthread.NamingThreadPoolExecutor;
import ch.systemsx.cisd.common.concurrent.ConcurrencyUtilities.ILogSettings;
import ch.systemsx.cisd.common.exceptions.CheckedExceptionTunnel;
import ch.systemsx.cisd.common.exceptions.InterruptedExceptionUnchecked;
diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/concurrent/NamingThreadPoolExecutorTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/concurrent/NamingThreadPoolExecutorTest.java
index 0f7d6a19f4b..39616431bff 100644
--- a/common/sourceTest/java/ch/systemsx/cisd/common/concurrent/NamingThreadPoolExecutorTest.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/concurrent/NamingThreadPoolExecutorTest.java
@@ -34,6 +34,10 @@ import java.util.concurrent.TimeUnit;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
+import ch.systemsx.cisd.base.namedthread.NamedCallable;
+import ch.systemsx.cisd.base.namedthread.NamedRunnable;
+import ch.systemsx.cisd.base.namedthread.NamingThreadFactory;
+import ch.systemsx.cisd.base.namedthread.NamingThreadPoolExecutor;
import ch.systemsx.cisd.common.logging.LogInitializer;
import ch.systemsx.cisd.common.test.Retry10;
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 801f267cad5..065ec5fbb37 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/RetryingPathRemover.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/RetryingPathRemover.java
@@ -25,12 +25,12 @@ import org.apache.commons.lang.time.DurationFormatUtils;
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.IActivityObserver;
import ch.systemsx.cisd.common.concurrent.InactivityMonitor;
-import ch.systemsx.cisd.common.concurrent.NamingThreadPoolExecutor;
import ch.systemsx.cisd.common.concurrent.InactivityMonitor.IDescribingActivitySensor;
import ch.systemsx.cisd.common.concurrent.InactivityMonitor.IInactivityObserver;
import ch.systemsx.cisd.common.exceptions.Status;
--
GitLab