refactor: move NamingThreadPoolExecutor from common to base

SVN: 10363

common/source/java/ch/systemsx/cisd/common/concurrent/NamedCallable.java → 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;
 

common/source/java/ch/systemsx/cisd/common/concurrent/NamedFutureTask.java → 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;
 

common/source/java/ch/systemsx/cisd/common/concurrent/NamedRunnable.java → 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.

common/source/java/ch/systemsx/cisd/common/concurrent/NamingThreadFactory.java → 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;
 

common/source/java/ch/systemsx/cisd/common/concurrent/NamingThreadPoolExecutor.java → 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;

common/source/java/ch/systemsx/cisd/common/concurrent/PoolNameThread.java → 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.

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>

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;

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;
 

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;

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;
 

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;