From 4f3108373d1e33b73f51a0695da80a6e10630e0d Mon Sep 17 00:00:00 2001
From: ribeaudc <ribeaudc>
Date: Mon, 25 Feb 2008 21:27:11 +0000
Subject: [PATCH] add: - New package 'ch.systemsx.cisd.common.process'.
SVN: 4482
---
common/resource/dependency-structure.ddf | 12 ++++++++----
.../compression/file/InPlaceCompressionMethod.java | 2 +-
.../compression/tiff/TiffZipCompressionMethod.java | 4 ++--
.../{utilities => process}/CleanUpCallable.java | 3 ++-
.../{utilities => process}/CleanUpRegistry.java | 3 ++-
.../{utilities => process}/FileRenamingProcess.java | 2 +-
.../{utilities => process}/ICallableWithCleanUp.java | 2 +-
.../{utilities => process}/ICleanUpRegistry.java | 2 +-
.../cisd/common/{utilities => process}/IProcess.java | 2 +-
.../ProcessExecutionHelper.java | 4 +++-
.../common/{utilities => process}/ProcessResult.java | 2 +-
.../common/{utilities => process}/ProcessRunner.java | 2 +-
.../common/utilities/RecursiveHardLinkMaker.java | 3 +++
.../ProcessExecutionHelperTest.java | 8 ++++++--
.../{utilities => process}/ProcessRunnerTest.java | 5 ++++-
15 files changed, 37 insertions(+), 19 deletions(-)
rename common/source/java/ch/systemsx/cisd/common/{utilities => process}/CleanUpCallable.java (97%)
rename common/source/java/ch/systemsx/cisd/common/{utilities => process}/CleanUpRegistry.java (97%)
rename common/source/java/ch/systemsx/cisd/common/{utilities => process}/FileRenamingProcess.java (98%)
rename common/source/java/ch/systemsx/cisd/common/{utilities => process}/ICallableWithCleanUp.java (95%)
rename common/source/java/ch/systemsx/cisd/common/{utilities => process}/ICleanUpRegistry.java (95%)
rename common/source/java/ch/systemsx/cisd/common/{utilities => process}/IProcess.java (97%)
rename common/source/java/ch/systemsx/cisd/common/{utilities => process}/ProcessExecutionHelper.java (99%)
rename common/source/java/ch/systemsx/cisd/common/{utilities => process}/ProcessResult.java (99%)
rename common/source/java/ch/systemsx/cisd/common/{utilities => process}/ProcessRunner.java (97%)
rename common/sourceTest/java/ch/systemsx/cisd/common/{utilities => process}/ProcessExecutionHelperTest.java (96%)
rename common/sourceTest/java/ch/systemsx/cisd/common/{utilities => process}/ProcessRunnerTest.java (96%)
diff --git a/common/resource/dependency-structure.ddf b/common/resource/dependency-structure.ddf
index ad85468ede1..b4b257b8c81 100644
--- a/common/resource/dependency-structure.ddf
+++ b/common/resource/dependency-structure.ddf
@@ -18,16 +18,20 @@ check sets [logging]
[parser] = ${package}.parser.*
check sets [parser]
+[process] = ${package}.process.*
+check sets [process]
+
[test] = ${package}.test.*
check sets [test]
-[utilities] = ${package}.utilities.*
+[utilities] = ${package}.utilities.* excluding ${package}.utilities.RecursiveHardLinkMaker
check sets [utilities]
layer layer0 = [annotation] [exceptions] [logging] [test]
-layer layer1 = [utilities]
-layer layer2 = [db] [parser]
+layer layer1 = [utilities]
+layer layer2 = [process]
+layer layer3 = [db] [parser]
-check layeringOf layer0 layer1 layer2
+check layeringOf layer0 layer1 layer2 layer3
check [parser] independentOf ${package}.exceptions.UserFailureException
\ No newline at end of file
diff --git a/common/source/java/ch/systemsx/cisd/common/compression/file/InPlaceCompressionMethod.java b/common/source/java/ch/systemsx/cisd/common/compression/file/InPlaceCompressionMethod.java
index 65cdedf9fef..a3a8ac385e2 100644
--- a/common/source/java/ch/systemsx/cisd/common/compression/file/InPlaceCompressionMethod.java
+++ b/common/source/java/ch/systemsx/cisd/common/compression/file/InPlaceCompressionMethod.java
@@ -27,8 +27,8 @@ import ch.systemsx.cisd.common.exceptions.Status;
import ch.systemsx.cisd.common.exceptions.StatusFlag;
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.ISelfTestable;
-import ch.systemsx.cisd.common.utilities.ProcessExecutionHelper;
/**
* An {@link ICompressionMethod} that performs in-place compression of a bulk of files by means of calling an external
diff --git a/common/source/java/ch/systemsx/cisd/common/compression/tiff/TiffZipCompressionMethod.java b/common/source/java/ch/systemsx/cisd/common/compression/tiff/TiffZipCompressionMethod.java
index cef175f4300..ffe837e39b7 100644
--- a/common/source/java/ch/systemsx/cisd/common/compression/tiff/TiffZipCompressionMethod.java
+++ b/common/source/java/ch/systemsx/cisd/common/compression/tiff/TiffZipCompressionMethod.java
@@ -25,9 +25,9 @@ import ch.systemsx.cisd.common.compression.file.InPlaceCompressionMethod;
import ch.systemsx.cisd.common.exceptions.ConfigurationFailureException;
import ch.systemsx.cisd.common.exceptions.EnvironmentFailureException;
import ch.systemsx.cisd.common.logging.LogInitializer;
-import ch.systemsx.cisd.common.utilities.ProcessExecutionHelper;
+import ch.systemsx.cisd.common.process.ProcessExecutionHelper;
+import ch.systemsx.cisd.common.process.ProcessResult;
import ch.systemsx.cisd.common.utilities.OSUtilities;
-import ch.systemsx.cisd.common.utilities.ProcessResult;
/**
* A compression method for TIFF files using the ImageMagick <code>convert</code> utility with compression
diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/CleanUpCallable.java b/common/source/java/ch/systemsx/cisd/common/process/CleanUpCallable.java
similarity index 97%
rename from common/source/java/ch/systemsx/cisd/common/utilities/CleanUpCallable.java
rename to common/source/java/ch/systemsx/cisd/common/process/CleanUpCallable.java
index 4b10233797d..d0a57d7e04c 100644
--- a/common/source/java/ch/systemsx/cisd/common/utilities/CleanUpCallable.java
+++ b/common/source/java/ch/systemsx/cisd/common/process/CleanUpCallable.java
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.common.process;
+
/**
* A class that implements the logic of cleaning up a resource even in case of an exception but re-throws an exception
diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/CleanUpRegistry.java b/common/source/java/ch/systemsx/cisd/common/process/CleanUpRegistry.java
similarity index 97%
rename from common/source/java/ch/systemsx/cisd/common/utilities/CleanUpRegistry.java
rename to common/source/java/ch/systemsx/cisd/common/process/CleanUpRegistry.java
index 2917e37d04b..afc7e5c76a0 100644
--- a/common/source/java/ch/systemsx/cisd/common/utilities/CleanUpRegistry.java
+++ b/common/source/java/ch/systemsx/cisd/common/process/CleanUpRegistry.java
@@ -14,11 +14,12 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.common.process;
import java.util.ArrayList;
import java.util.List;
+
/**
* A class that allows registering items for clean up and that allows to perform the clean up later.
*
diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/FileRenamingProcess.java b/common/source/java/ch/systemsx/cisd/common/process/FileRenamingProcess.java
similarity index 98%
rename from common/source/java/ch/systemsx/cisd/common/utilities/FileRenamingProcess.java
rename to common/source/java/ch/systemsx/cisd/common/process/FileRenamingProcess.java
index c2f12f3bc5c..97dd5f2fa09 100644
--- a/common/source/java/ch/systemsx/cisd/common/utilities/FileRenamingProcess.java
+++ b/common/source/java/ch/systemsx/cisd/common/process/FileRenamingProcess.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.common.process;
import java.io.File;
diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/ICallableWithCleanUp.java b/common/source/java/ch/systemsx/cisd/common/process/ICallableWithCleanUp.java
similarity index 95%
rename from common/source/java/ch/systemsx/cisd/common/utilities/ICallableWithCleanUp.java
rename to common/source/java/ch/systemsx/cisd/common/process/ICallableWithCleanUp.java
index 7c9bcb063ec..b60287510be 100644
--- a/common/source/java/ch/systemsx/cisd/common/utilities/ICallableWithCleanUp.java
+++ b/common/source/java/ch/systemsx/cisd/common/process/ICallableWithCleanUp.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.common.process;
/**
* A role that calls a method which requires one or more clean-up steps that need to be run reliably at the end of the
diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/ICleanUpRegistry.java b/common/source/java/ch/systemsx/cisd/common/process/ICleanUpRegistry.java
similarity index 95%
rename from common/source/java/ch/systemsx/cisd/common/utilities/ICleanUpRegistry.java
rename to common/source/java/ch/systemsx/cisd/common/process/ICleanUpRegistry.java
index 53d0b0620af..d78a39be4b0 100644
--- a/common/source/java/ch/systemsx/cisd/common/utilities/ICleanUpRegistry.java
+++ b/common/source/java/ch/systemsx/cisd/common/process/ICleanUpRegistry.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.common.process;
/**
* A role that allows to register a clean-up method that is called regardless of whether an exception occurs or not.
diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/IProcess.java b/common/source/java/ch/systemsx/cisd/common/process/IProcess.java
similarity index 97%
rename from common/source/java/ch/systemsx/cisd/common/utilities/IProcess.java
rename to common/source/java/ch/systemsx/cisd/common/process/IProcess.java
index be4db76f6dd..2e48694b000 100644
--- a/common/source/java/ch/systemsx/cisd/common/utilities/IProcess.java
+++ b/common/source/java/ch/systemsx/cisd/common/process/IProcess.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.common.process;
/**
* A <code>Runnable</code> extension that describes a process.
diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/ProcessExecutionHelper.java b/common/source/java/ch/systemsx/cisd/common/process/ProcessExecutionHelper.java
similarity index 99%
rename from common/source/java/ch/systemsx/cisd/common/utilities/ProcessExecutionHelper.java
rename to common/source/java/ch/systemsx/cisd/common/process/ProcessExecutionHelper.java
index b923bc3fce7..ef192bf08a6 100644
--- a/common/source/java/ch/systemsx/cisd/common/utilities/ProcessExecutionHelper.java
+++ b/common/source/java/ch/systemsx/cisd/common/process/ProcessExecutionHelper.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.common.process;
import java.io.BufferedReader;
import java.io.IOException;
@@ -28,6 +28,8 @@ import org.apache.commons.io.IOUtils;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
+import ch.systemsx.cisd.common.utilities.OSUtilities;
+
/**
* Utility to execute a command from a command line and log all events.
*
diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/ProcessResult.java b/common/source/java/ch/systemsx/cisd/common/process/ProcessResult.java
similarity index 99%
rename from common/source/java/ch/systemsx/cisd/common/utilities/ProcessResult.java
rename to common/source/java/ch/systemsx/cisd/common/process/ProcessResult.java
index 31623f0dbbb..a0a72e0d231 100644
--- a/common/source/java/ch/systemsx/cisd/common/utilities/ProcessResult.java
+++ b/common/source/java/ch/systemsx/cisd/common/process/ProcessResult.java
@@ -1,4 +1,4 @@
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.common.process;
import java.io.File;
import java.io.IOException;
diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/ProcessRunner.java b/common/source/java/ch/systemsx/cisd/common/process/ProcessRunner.java
similarity index 97%
rename from common/source/java/ch/systemsx/cisd/common/utilities/ProcessRunner.java
rename to common/source/java/ch/systemsx/cisd/common/process/ProcessRunner.java
index d93a6b7f53d..fd930f64952 100644
--- a/common/source/java/ch/systemsx/cisd/common/utilities/ProcessRunner.java
+++ b/common/source/java/ch/systemsx/cisd/common/process/ProcessRunner.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.common.process;
import ch.systemsx.cisd.common.exceptions.CheckedExceptionTunnel;
diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/RecursiveHardLinkMaker.java b/common/source/java/ch/systemsx/cisd/common/utilities/RecursiveHardLinkMaker.java
index 8f163b5b61b..ac8eba0e301 100644
--- a/common/source/java/ch/systemsx/cisd/common/utilities/RecursiveHardLinkMaker.java
+++ b/common/source/java/ch/systemsx/cisd/common/utilities/RecursiveHardLinkMaker.java
@@ -24,6 +24,9 @@ import org.apache.log4j.Logger;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
+import ch.systemsx.cisd.common.process.IProcess;
+import ch.systemsx.cisd.common.process.ProcessExecutionHelper;
+import ch.systemsx.cisd.common.process.ProcessRunner;
/**
* Utility to create a hard link of a file or copy recursively a directories structure, creating a hard link for each
diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/utilities/ProcessExecutionHelperTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/process/ProcessExecutionHelperTest.java
similarity index 96%
rename from common/sourceTest/java/ch/systemsx/cisd/common/utilities/ProcessExecutionHelperTest.java
rename to common/sourceTest/java/ch/systemsx/cisd/common/process/ProcessExecutionHelperTest.java
index 70e2fd48523..f400362e6ae 100644
--- a/common/sourceTest/java/ch/systemsx/cisd/common/utilities/ProcessExecutionHelperTest.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/process/ProcessExecutionHelperTest.java
@@ -14,13 +14,16 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.common.process;
-import static org.testng.AssertJUnit.*;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertFalse;
+import static org.testng.AssertJUnit.assertTrue;
import java.io.File;
import java.io.IOException;
import java.util.Arrays;
+
import org.apache.log4j.Logger;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
@@ -29,6 +32,7 @@ import org.testng.annotations.Test;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
import ch.systemsx.cisd.common.logging.LogInitializer;
+import ch.systemsx.cisd.common.utilities.CollectionIO;
/**
* Test cases for the {@link ProcessExecutionHelper}.
diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/utilities/ProcessRunnerTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/process/ProcessRunnerTest.java
similarity index 96%
rename from common/sourceTest/java/ch/systemsx/cisd/common/utilities/ProcessRunnerTest.java
rename to common/sourceTest/java/ch/systemsx/cisd/common/process/ProcessRunnerTest.java
index 34aea6a4e45..8c040babafe 100644
--- a/common/sourceTest/java/ch/systemsx/cisd/common/utilities/ProcessRunnerTest.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/process/ProcessRunnerTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.common.process;
import static org.testng.AssertJUnit.fail;
@@ -24,6 +24,9 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import ch.systemsx.cisd.common.process.IProcess;
+import ch.systemsx.cisd.common.process.ProcessRunner;
+
/**
* Test cases for the {@link ProcessRunner}.
*
--
GitLab