diff --git a/authentication/source/java/ch/systemsx/cisd/authentication/file/Parameters.java b/authentication/source/java/ch/systemsx/cisd/authentication/file/Parameters.java
index 14756f24f60e2d0b996cb6a9a355a456eacdfd99..d43daab8180bdd098c3790eefbaa84d3bb6e0282 100644
--- a/authentication/source/java/ch/systemsx/cisd/authentication/file/Parameters.java
+++ b/authentication/source/java/ch/systemsx/cisd/authentication/file/Parameters.java
@@ -26,8 +26,8 @@ import ch.systemsx.cisd.args4j.ExampleMode;
import ch.systemsx.cisd.args4j.Option;
import ch.systemsx.cisd.common.exceptions.HighLevelException;
import ch.systemsx.cisd.common.exceptions.UserFailureException;
+import ch.systemsx.cisd.common.string.StringUtilities;
import ch.systemsx.cisd.common.utilities.IExitHandler;
-import ch.systemsx.cisd.common.utilities.StringUtilities;
import ch.systemsx.cisd.common.utilities.SystemExit;
/**
diff --git a/common/source/java/ch/systemsx/cisd/common/filesystem/FileUtilities.java b/common/source/java/ch/systemsx/cisd/common/filesystem/FileUtilities.java
index e37ed9e474ce12c035a8e2d74185da151c75c0bb..d33b97bd25241b23bca6203de383f6853982d30d 100644
--- a/common/source/java/ch/systemsx/cisd/common/filesystem/FileUtilities.java
+++ b/common/source/java/ch/systemsx/cisd/common/filesystem/FileUtilities.java
@@ -69,8 +69,8 @@ import ch.systemsx.cisd.common.logging.LogLevel;
import ch.systemsx.cisd.common.parser.Line;
import ch.systemsx.cisd.common.parser.filter.AlwaysAcceptLineFilter;
import ch.systemsx.cisd.common.parser.filter.ILineFilter;
-import ch.systemsx.cisd.common.utilities.StringUtilities;
-import ch.systemsx.cisd.common.utilities.StringUtilities.IUniquenessChecker;
+import ch.systemsx.cisd.common.string.StringUtilities;
+import ch.systemsx.cisd.common.string.StringUtilities.IUniquenessChecker;
/**
* Some useful utility methods for files and directories.
diff --git a/common/source/java/ch/systemsx/cisd/common/parser/DefaultPropertyMapper.java b/common/source/java/ch/systemsx/cisd/common/parser/DefaultPropertyMapper.java
index 172fcb7a587905f07e9a20acc318a024eab6c08c..06224cb90a2b0d49387827df453caa0c11d790e2 100644
--- a/common/source/java/ch/systemsx/cisd/common/parser/DefaultPropertyMapper.java
+++ b/common/source/java/ch/systemsx/cisd/common/parser/DefaultPropertyMapper.java
@@ -26,7 +26,7 @@ import org.apache.commons.lang.StringUtils;
import ch.systemsx.cisd.common.collections.IKeyExtractor;
import ch.systemsx.cisd.common.collections.TableMap;
-import ch.systemsx.cisd.common.utilities.StringUtilities;
+import ch.systemsx.cisd.common.string.StringUtilities;
/**
* A default <code>IPropertyMapper</code> implementation.
diff --git a/common/source/java/ch/systemsx/cisd/common/parser/IndexOutOfBoundsException.java b/common/source/java/ch/systemsx/cisd/common/parser/IndexOutOfBoundsException.java
index cde91345126d65ea54ba80b62ec0262d36438e78..cbf040441c76a25e86108b2562f19ca8196f85e8 100644
--- a/common/source/java/ch/systemsx/cisd/common/parser/IndexOutOfBoundsException.java
+++ b/common/source/java/ch/systemsx/cisd/common/parser/IndexOutOfBoundsException.java
@@ -18,7 +18,7 @@ package ch.systemsx.cisd.common.parser;
import ch.systemsx.cisd.common.collections.CollectionStyle;
import ch.systemsx.cisd.common.collections.CollectionUtils;
-import ch.systemsx.cisd.common.utilities.StringUtilities;
+import ch.systemsx.cisd.common.string.StringUtilities;
/**
* A <code>ParserException</code> extension which signalizes a lookup index outside of the
diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/MatrixComparator.java b/common/source/java/ch/systemsx/cisd/common/string/MatrixComparator.java
similarity index 98%
rename from common/source/java/ch/systemsx/cisd/common/utilities/MatrixComparator.java
rename to common/source/java/ch/systemsx/cisd/common/string/MatrixComparator.java
index f673f14a44fb2bf172d93e31d09dfdb2ebbcf131..ae76dafac2bd80f8bee298fdc3fa5c8778cef186 100644
--- a/common/source/java/ch/systemsx/cisd/common/utilities/MatrixComparator.java
+++ b/common/source/java/ch/systemsx/cisd/common/string/MatrixComparator.java
@@ -14,11 +14,12 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.common.string;
import java.io.Serializable;
import java.util.Comparator;
+
/**
* A <code>Comparator</code> implementation that is based on matrix labelling having the following
* form: <code>[a-zA-Z]+[0-9]+</code>.
diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/ReflectingStringEscaper.java b/common/source/java/ch/systemsx/cisd/common/string/ReflectingStringEscaper.java
similarity index 99%
rename from common/source/java/ch/systemsx/cisd/common/utilities/ReflectingStringEscaper.java
rename to common/source/java/ch/systemsx/cisd/common/string/ReflectingStringEscaper.java
index 64e8974ee3a58e0080a5017a83e125988aa3a76e..9d3d4274c892f2b8f374412ec7d112a3929bab80 100644
--- a/common/source/java/ch/systemsx/cisd/common/utilities/ReflectingStringEscaper.java
+++ b/common/source/java/ch/systemsx/cisd/common/string/ReflectingStringEscaper.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.common.string;
import java.io.Serializable;
import java.lang.reflect.Field;
diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/ReflectingStringUnescaper.java b/common/source/java/ch/systemsx/cisd/common/string/ReflectingStringUnescaper.java
similarity index 98%
rename from common/source/java/ch/systemsx/cisd/common/utilities/ReflectingStringUnescaper.java
rename to common/source/java/ch/systemsx/cisd/common/string/ReflectingStringUnescaper.java
index c5b2d7b75c35267bf7d9139148e19044586e3e6a..ce3cb1c43e63e63defdfe910195cfd069bd03b86 100644
--- a/common/source/java/ch/systemsx/cisd/common/utilities/ReflectingStringUnescaper.java
+++ b/common/source/java/ch/systemsx/cisd/common/string/ReflectingStringUnescaper.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.common.string;
import java.lang.reflect.Field;
diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/ReflectionStringTraverser.java b/common/source/java/ch/systemsx/cisd/common/string/ReflectionStringTraverser.java
similarity index 99%
rename from common/source/java/ch/systemsx/cisd/common/utilities/ReflectionStringTraverser.java
rename to common/source/java/ch/systemsx/cisd/common/string/ReflectionStringTraverser.java
index 93a6e366af879aeb4b8c4b58ce65f217cc5ec820..2b4ae9466c42db455780331140c716726760125d 100644
--- a/common/source/java/ch/systemsx/cisd/common/utilities/ReflectionStringTraverser.java
+++ b/common/source/java/ch/systemsx/cisd/common/string/ReflectionStringTraverser.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.common.string;
import java.lang.reflect.Array;
import java.lang.reflect.Field;
diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/StringUtilities.java b/common/source/java/ch/systemsx/cisd/common/string/StringUtilities.java
similarity index 99%
rename from common/source/java/ch/systemsx/cisd/common/utilities/StringUtilities.java
rename to common/source/java/ch/systemsx/cisd/common/string/StringUtilities.java
index 542b3f0e43b59a3c6ce23e773af74df9c60fe122..be2935f9eefcb22893bf2d4896eed658e66719a7 100644
--- a/common/source/java/ch/systemsx/cisd/common/utilities/StringUtilities.java
+++ b/common/source/java/ch/systemsx/cisd/common/string/StringUtilities.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.common.string;
import java.security.MessageDigest;
import java.util.ArrayList;
diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/collections/CollectionUtilsTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/collections/CollectionUtilsTest.java
index 4a6e904b74be6055935ad95a5e8752a554b58ea3..f4281803521eeeec3f2b93b067be3bf55b670a0b 100644
--- a/common/sourceTest/java/ch/systemsx/cisd/common/collections/CollectionUtilsTest.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/collections/CollectionUtilsTest.java
@@ -26,7 +26,7 @@ import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.testng.annotations.Test;
-import ch.systemsx.cisd.common.utilities.StringUtilities;
+import ch.systemsx.cisd.common.string.StringUtilities;
/**
* Test cases for the {@link CollectionUtils} class.
diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/utilities/MatrixComparatorTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/string/MatrixComparatorTest.java
similarity index 94%
rename from common/sourceTest/java/ch/systemsx/cisd/common/utilities/MatrixComparatorTest.java
rename to common/sourceTest/java/ch/systemsx/cisd/common/string/MatrixComparatorTest.java
index 5f4d5c377f2114156191c523d7cc3415dd3848e0..9d8bc87e6ce61c08af6330a61572cfedf5966e5d 100644
--- a/common/sourceTest/java/ch/systemsx/cisd/common/utilities/MatrixComparatorTest.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/string/MatrixComparatorTest.java
@@ -14,13 +14,15 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.common.string;
import java.util.Arrays;
import org.apache.commons.lang.ArrayUtils;
import org.testng.annotations.Test;
+import ch.systemsx.cisd.common.string.MatrixComparator;
+
/**
* Test cases for the {@link MatrixComparator}.
*
diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/utilities/ReflectingStringEscaperTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/string/ReflectingStringEscaperTest.java
similarity index 98%
rename from common/sourceTest/java/ch/systemsx/cisd/common/utilities/ReflectingStringEscaperTest.java
rename to common/sourceTest/java/ch/systemsx/cisd/common/string/ReflectingStringEscaperTest.java
index 210ee5ebe973a1aac6ccff80aa87078039753efd..bf07a68386dce87805e8ded009cc6256b4a872fa 100644
--- a/common/sourceTest/java/ch/systemsx/cisd/common/utilities/ReflectingStringEscaperTest.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/string/ReflectingStringEscaperTest.java
@@ -14,13 +14,15 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.common.string;
import java.io.Serializable;
import org.testng.AssertJUnit;
import org.testng.annotations.Test;
+import ch.systemsx.cisd.common.string.ReflectingStringEscaper;
+
/**
* @author Chandrasekhar Ramakrishnan
*/
diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/utilities/ReflectingStringUnescaperTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/string/ReflectingStringUnescaperTest.java
similarity index 93%
rename from common/sourceTest/java/ch/systemsx/cisd/common/utilities/ReflectingStringUnescaperTest.java
rename to common/sourceTest/java/ch/systemsx/cisd/common/string/ReflectingStringUnescaperTest.java
index 456a7bc0fa5e42b4f58031dd3b1dbf38481874dd..81d611ebe082832fc6a7be01fabc85d39eee6ae1 100644
--- a/common/sourceTest/java/ch/systemsx/cisd/common/utilities/ReflectingStringUnescaperTest.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/string/ReflectingStringUnescaperTest.java
@@ -14,11 +14,14 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.common.string;
import org.testng.AssertJUnit;
import org.testng.annotations.Test;
+import ch.systemsx.cisd.common.string.ReflectingStringEscaper;
+import ch.systemsx.cisd.common.string.ReflectingStringUnescaper;
+
/**
* @author Piotr Buczek
*/
diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/utilities/ReflectionFieldTraverserTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/string/ReflectionFieldTraverserTest.java
similarity index 97%
rename from common/sourceTest/java/ch/systemsx/cisd/common/utilities/ReflectionFieldTraverserTest.java
rename to common/sourceTest/java/ch/systemsx/cisd/common/string/ReflectionFieldTraverserTest.java
index 933c18832e78fee3179f4cac9a34170b8be1bc82..1909ccdd8c9d5b0157891d29af1e13d6fcaa26d7 100644
--- a/common/sourceTest/java/ch/systemsx/cisd/common/utilities/ReflectionFieldTraverserTest.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/string/ReflectionFieldTraverserTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.common.string;
import java.lang.reflect.Field;
import java.util.ArrayList;
@@ -29,7 +29,8 @@ import java.util.TreeSet;
import org.testng.AssertJUnit;
import org.testng.annotations.Test;
-import ch.systemsx.cisd.common.utilities.ReflectionStringTraverser.ReflectionFieldVisitor;
+import ch.systemsx.cisd.common.string.ReflectionStringTraverser;
+import ch.systemsx.cisd.common.string.ReflectionStringTraverser.ReflectionFieldVisitor;
/**
* Tests for {@link ReflectionStringTraverser}
diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/utilities/StringUtilitiesTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/string/StringUtilitiesTest.java
similarity index 96%
rename from common/sourceTest/java/ch/systemsx/cisd/common/utilities/StringUtilitiesTest.java
rename to common/sourceTest/java/ch/systemsx/cisd/common/string/StringUtilitiesTest.java
index 7bc39b0605bd150b7f4f61961a02efdc772f383d..55fbd1238d6e318c53fd04bb735554801a51b72d 100644
--- a/common/sourceTest/java/ch/systemsx/cisd/common/utilities/StringUtilitiesTest.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/string/StringUtilitiesTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.common.string;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertTrue;
@@ -25,7 +25,8 @@ import java.util.List;
import org.testng.annotations.Test;
-import ch.systemsx.cisd.common.utilities.StringUtilities.IUniquenessChecker;
+import ch.systemsx.cisd.common.string.StringUtilities;
+import ch.systemsx.cisd.common.string.StringUtilities.IUniquenessChecker;
/**
* Test cases for the {@link StringUtilities}.
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/RemoteDataSetFileOperationsExecutor.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/RemoteDataSetFileOperationsExecutor.java
index 1fb784714108784e08a47864e0a3323cad64116b..4f39eca0a21a60b45e92fa4852e048e491c10c04 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/RemoteDataSetFileOperationsExecutor.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/RemoteDataSetFileOperationsExecutor.java
@@ -34,7 +34,7 @@ import ch.systemsx.cisd.common.filesystem.ssh.ISshCommandExecutor;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
import ch.systemsx.cisd.common.process.ProcessResult;
-import ch.systemsx.cisd.common.utilities.StringUtilities;
+import ch.systemsx.cisd.common.string.StringUtilities;
import ch.systemsx.cisd.openbis.dss.generic.server.LocalDataSetFileOperationsExcecutor.FolderFileSizesReportGenerator;
public final class RemoteDataSetFileOperationsExecutor implements IDataSetFileOperationsExecutor
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.java
index 7e6b7bf2531d41c9d9c3a6d251882d2b54beacef..d009e227ef3999cdda34c2c95cd622aa0ba4ac8a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.java
@@ -43,7 +43,7 @@ import ch.systemsx.cisd.common.parser.ParserException;
import ch.systemsx.cisd.common.reflection.BeanUtils;
import ch.systemsx.cisd.common.servlet.IRequestContextProvider;
import ch.systemsx.cisd.common.spring.IUncheckedMultipartFile;
-import ch.systemsx.cisd.common.utilities.ReflectingStringUnescaper;
+import ch.systemsx.cisd.common.string.ReflectingStringUnescaper;
import ch.systemsx.cisd.common.utilities.UnicodeUtils;
import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientService;
import ch.systemsx.cisd.openbis.generic.client.web.client.dto.ArchivingResult;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/StringHtmlEscapingPointcutAdvisor.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/StringHtmlEscapingPointcutAdvisor.java
index ab40b41357bfefb7e41c18bc44f603e511cf268d..5557e14444c4daa6047f66fd2bebae7118ac65ad 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/StringHtmlEscapingPointcutAdvisor.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/StringHtmlEscapingPointcutAdvisor.java
@@ -28,7 +28,7 @@ import org.springframework.aop.support.StaticMethodMatcherPointcut;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
-import ch.systemsx.cisd.common.utilities.ReflectingStringEscaper;
+import ch.systemsx.cisd.common.string.ReflectingStringEscaper;
import ch.systemsx.cisd.openbis.generic.client.web.client.IClientService;
import ch.systemsx.cisd.openbis.generic.shared.basic.annotation.DoNotEscape;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/translator/ResultSetTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/translator/ResultSetTranslator.java
index 44ee7fce9f35877ad8b300e5f22f1698e4176d31..c0e1ac90e3c6ab9a0419447c2ccc08e8076bcf39 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/translator/ResultSetTranslator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/translator/ResultSetTranslator.java
@@ -16,7 +16,7 @@
package ch.systemsx.cisd.openbis.generic.client.web.server.translator;
-import ch.systemsx.cisd.common.utilities.ReflectingStringEscaper;
+import ch.systemsx.cisd.common.string.ReflectingStringEscaper;
import ch.systemsx.cisd.openbis.generic.client.web.client.dto.GridRowModels;
import ch.systemsx.cisd.openbis.generic.client.web.client.dto.ResultSet;
import ch.systemsx.cisd.openbis.generic.client.web.server.resultset.IResultSet;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/DatabaseInstanceIdentifier.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/DatabaseInstanceIdentifier.java
index ff16b0d7eed1d421111c6c4d02edd9b3c036cc52..759868ca0f5f2b5b21773d82567b335baada6d6c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/DatabaseInstanceIdentifier.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/DatabaseInstanceIdentifier.java
@@ -22,7 +22,7 @@ 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.utilities.StringUtilities;
+import ch.systemsx.cisd.common.string.StringUtilities;
import ch.systemsx.cisd.openbis.generic.shared.IServer;
/**
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SpaceIdentifier.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SpaceIdentifier.java
index 0b1ece67e57ff6035e56416acd733b1c7b9521a1..bd676fc62e9a8f32ec2b5103d7642c2b7fcd2f65 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SpaceIdentifier.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SpaceIdentifier.java
@@ -20,7 +20,7 @@ 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.utilities.StringUtilities;
+import ch.systemsx.cisd.common.string.StringUtilities;
import ch.systemsx.cisd.openbis.generic.shared.IServer;
import ch.systemsx.cisd.openbis.generic.shared.util.SpaceCodeHelper;
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/DefaultReturnValueFilterTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/DefaultReturnValueFilterTest.java
index 30ea76333d3819d670857549f2d5085624ee7a95..44d23897b69288cf1b1f3150b848afca20fcefa3 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/DefaultReturnValueFilterTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/DefaultReturnValueFilterTest.java
@@ -40,8 +40,8 @@ import ch.rinn.restrictions.Friend;
import ch.systemsx.cisd.common.logging.BufferedAppender;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogInitializer;
+import ch.systemsx.cisd.common.string.StringUtilities;
import ch.systemsx.cisd.common.test.LogMonitoringAppender;
-import ch.systemsx.cisd.common.utilities.StringUtilities;
import ch.systemsx.cisd.openbis.generic.server.authorization.validator.IValidator;
import ch.systemsx.cisd.openbis.generic.shared.dto.PersonPE;
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/PredicateExecutorTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/PredicateExecutorTest.java
index cd479009cabebc49a04736dc05249d85aeb27cd0..c302e76fb531076d5392e2166590de83e84ba58e 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/PredicateExecutorTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/PredicateExecutorTest.java
@@ -26,7 +26,7 @@ import org.testng.annotations.Test;
import ch.rinn.restrictions.Friend;
import ch.systemsx.cisd.common.exceptions.Status;
-import ch.systemsx.cisd.common.utilities.StringUtilities;
+import ch.systemsx.cisd.common.string.StringUtilities;
import ch.systemsx.cisd.openbis.generic.server.authorization.predicate.IPredicate;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IAuthorizationDAOFactory;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDatabaseInstanceDAO;