diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/Template.java b/common/source/java/ch/systemsx/cisd/common/string/Template.java
similarity index 99%
rename from common/source/java/ch/systemsx/cisd/common/utilities/Template.java
rename to common/source/java/ch/systemsx/cisd/common/string/Template.java
index c8468294805037de3069661a8d89d000064dc2a7..fc3a57255e02ac4744ca85f18d7a068a75b4bb6f 100644
--- a/common/source/java/ch/systemsx/cisd/common/utilities/Template.java
+++ b/common/source/java/ch/systemsx/cisd/common/string/Template.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.common.string;
import java.util.ArrayList;
import java.util.LinkedHashMap;
diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/IPredicate.java b/common/source/java/ch/systemsx/cisd/common/test/IPredicate.java
similarity index 94%
rename from common/source/java/ch/systemsx/cisd/common/utilities/IPredicate.java
rename to common/source/java/ch/systemsx/cisd/common/test/IPredicate.java
index 77bbe1ee95477a6b39eaf2c2cf2f5d85a3b948f3..dd98ec6fe035c68a7e026e7a2f9c0d23dc4d23ff 100644
--- a/common/source/java/ch/systemsx/cisd/common/utilities/IPredicate.java
+++ b/common/source/java/ch/systemsx/cisd/common/test/IPredicate.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.common.utilities;
+package ch.systemsx.cisd.common.test;
/**
* Delegate for a function T => boolean
diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/utilities/TemplateTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/string/TemplateTest.java
similarity index 98%
rename from common/sourceTest/java/ch/systemsx/cisd/common/utilities/TemplateTest.java
rename to common/sourceTest/java/ch/systemsx/cisd/common/string/TemplateTest.java
index 16f3181fa49b84312ceb3ee5d8034ae3fb913244..c4fbf275ccc9fc6a68890ff8160b6a3dec264fdf 100644
--- a/common/sourceTest/java/ch/systemsx/cisd/common/utilities/TemplateTest.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/string/TemplateTest.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.fail;
@@ -23,6 +23,8 @@ import java.util.Set;
import org.testng.annotations.Test;
+import ch.systemsx.cisd.common.string.Template;
+
/**
* Test cases for the {@link Template}.
*
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/postregistration/NotifyingTask.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/postregistration/NotifyingTask.java
index 5b41a0080ff07ac23ae59935879f8c6b88675870..d5ee65272ba7387ce7331a02fdfa3873f0f35939 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/postregistration/NotifyingTask.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/postregistration/NotifyingTask.java
@@ -29,7 +29,7 @@ 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.properties.PropertyUtils;
-import ch.systemsx.cisd.common.utilities.Template;
+import ch.systemsx.cisd.common.string.Template;
import ch.systemsx.cisd.openbis.dss.generic.shared.IEncapsulatedOpenBISService;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.IEntityProperty;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SimpleHTMLDirectoryRenderer.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SimpleHTMLDirectoryRenderer.java
index 124e2fa531d25b692f45960ba569e29e7b856b40..19dbbf882e8846cd3368201cee8e4759acf61672 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SimpleHTMLDirectoryRenderer.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/SimpleHTMLDirectoryRenderer.java
@@ -23,7 +23,7 @@ import java.net.URLEncoder;
import org.apache.commons.lang.StringUtils;
import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
-import ch.systemsx.cisd.common.utilities.Template;
+import ch.systemsx.cisd.common.string.Template;
/**
* An <code>IDirectoryRenderer</code> implementation which renders on simple HTML pages - without
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/TemplateBasedDataSetResourceResolver.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/TemplateBasedDataSetResourceResolver.java
index d29309c94b1f4ff8d448f69279870a2d668f9547..095863d1f8afe8f51cfc70563bcd8f49ee591bd4 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/TemplateBasedDataSetResourceResolver.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ftp/resolver/TemplateBasedDataSetResourceResolver.java
@@ -37,7 +37,7 @@ import ch.systemsx.cisd.common.io.hierarchical_content.api.IHierarchicalContent;
import ch.systemsx.cisd.common.io.hierarchical_content.api.IHierarchicalContentNode;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
-import ch.systemsx.cisd.common.utilities.Template;
+import ch.systemsx.cisd.common.string.Template;
import ch.systemsx.cisd.openbis.dss.generic.server.ftp.FtpConstants;
import ch.systemsx.cisd.openbis.dss.generic.server.ftp.FtpFileFactory;
import ch.systemsx.cisd.openbis.dss.generic.server.ftp.FtpPathResolverContext;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractDropboxProcessingPlugin.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractDropboxProcessingPlugin.java
index 378730005a3b0167b9e9f76c32f2d3c5ccc8eb80..6a15ab172570a90a859a10d5ed62211fb28a2c94 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractDropboxProcessingPlugin.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractDropboxProcessingPlugin.java
@@ -28,9 +28,9 @@ import ch.systemsx.cisd.common.filesystem.FileUtilities;
import ch.systemsx.cisd.common.mail.EMailAddress;
import ch.systemsx.cisd.common.mail.IMailClient;
import ch.systemsx.cisd.common.properties.PropertyUtils;
+import ch.systemsx.cisd.common.string.Template;
import ch.systemsx.cisd.common.utilities.ITimeProvider;
import ch.systemsx.cisd.common.utilities.SystemTimeProvider;
-import ch.systemsx.cisd.common.utilities.Template;
import ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks.IProcessingPluginTask;
import ch.systemsx.cisd.openbis.dss.generic.shared.DataSetProcessingContext;
import ch.systemsx.cisd.openbis.dss.generic.shared.IPostRegistrationDatasetHandler;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/DssPropertyParametersUtil.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/DssPropertyParametersUtil.java
index dc81444656d2aae6aa1a629cfaa148ac8171cf9e..96e1ed1edef0324ffe1043e6439f88dca19abe1e 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/DssPropertyParametersUtil.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/DssPropertyParametersUtil.java
@@ -28,7 +28,7 @@ import ch.systemsx.cisd.common.filesystem.FileUtilities;
import ch.systemsx.cisd.common.filesystem.IFileOperations;
import ch.systemsx.cisd.common.properties.ExtendedProperties;
import ch.systemsx.cisd.common.properties.PropertyUtils;
-import ch.systemsx.cisd.common.utilities.Template;
+import ch.systemsx.cisd.common.string.Template;
import ch.systemsx.cisd.openbis.generic.shared.coreplugin.CorePluginScanner.ScannerType;
import ch.systemsx.cisd.openbis.generic.shared.coreplugin.CorePluginsInjector;
import ch.systemsx.cisd.openbis.generic.shared.coreplugin.CorePluginsUtils;
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetRegistratorTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetRegistratorTest.java
index 2e44223d000325464024a1e7adc105591fb8ce88..488fbf2f480fc73e34cb6f3438c530cb22d174b3 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetRegistratorTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetRegistratorTest.java
@@ -50,8 +50,8 @@ import ch.systemsx.cisd.common.exception.UserFailureException;
import ch.systemsx.cisd.common.filesystem.FileUtilities;
import ch.systemsx.cisd.common.filesystem.TestBigStructureCreator;
import ch.systemsx.cisd.common.test.AssertionUtil;
+import ch.systemsx.cisd.common.test.IPredicate;
import ch.systemsx.cisd.common.test.RecordingMatcher;
-import ch.systemsx.cisd.common.utilities.IPredicate;
import ch.systemsx.cisd.etlserver.IStorageProcessorTransactional;
import ch.systemsx.cisd.etlserver.IStorageProcessorTransactional.UnstoreDataAction;
import ch.systemsx.cisd.etlserver.ThreadParameters;
diff --git a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/dss/plugins/DataSetToSOFT.java b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/dss/plugins/DataSetToSOFT.java
index 1b9900aaad28344016947f3ab9350c2bd8cde0cf..88592dd42c5e607b496aa5c70d735ef3d3e44b47 100644
--- a/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/dss/plugins/DataSetToSOFT.java
+++ b/deep_sequencing_unit/source/java/ch/ethz/bsse/cisd/dsu/dss/plugins/DataSetToSOFT.java
@@ -37,7 +37,7 @@ import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
import ch.systemsx.cisd.common.mail.EMailAddress;
import ch.systemsx.cisd.common.security.MD5ChecksumCalculator;
-import ch.systemsx.cisd.common.utilities.Template;
+import ch.systemsx.cisd.common.string.Template;
import ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks.IProcessingPluginTask;
import ch.systemsx.cisd.openbis.dss.generic.shared.DataSetProcessingContext;
import ch.systemsx.cisd.openbis.dss.generic.shared.IEncapsulatedOpenBISService;
diff --git a/deep_sequencing_unit/sourceTest/java/ch/ethz/bsse/cisd/dsu/dss/plugins/DataSetToSOFTTest.java b/deep_sequencing_unit/sourceTest/java/ch/ethz/bsse/cisd/dsu/dss/plugins/DataSetToSOFTTest.java
index a7fd2448a598cdca5ccdb04210fa81ddf344f38f..a49227965576f12b452c837facde53a8865356d7 100644
--- a/deep_sequencing_unit/sourceTest/java/ch/ethz/bsse/cisd/dsu/dss/plugins/DataSetToSOFTTest.java
+++ b/deep_sequencing_unit/sourceTest/java/ch/ethz/bsse/cisd/dsu/dss/plugins/DataSetToSOFTTest.java
@@ -42,8 +42,8 @@ import ch.systemsx.cisd.common.filesystem.FileUtilities;
import ch.systemsx.cisd.common.logging.BufferedAppender;
import ch.systemsx.cisd.common.mail.EMailAddress;
import ch.systemsx.cisd.common.mail.IMailClient;
+import ch.systemsx.cisd.common.string.Template;
import ch.systemsx.cisd.common.test.RecordingMatcher;
-import ch.systemsx.cisd.common.utilities.Template;
import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.MockDataSetDirectoryProvider;
import ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks.IProcessingPluginTask;
import ch.systemsx.cisd.openbis.dss.generic.shared.DataSetProcessingContext;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/AbstractWebStartClientServingServlet.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/AbstractWebStartClientServingServlet.java
index f565e1de35ed06294ab38a1bf1a408ad07873a97..8414a131dfd3c2fcaba224c4624dcda630942acd 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/AbstractWebStartClientServingServlet.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/AbstractWebStartClientServingServlet.java
@@ -31,7 +31,7 @@ import ch.systemsx.cisd.common.exception.EnvironmentFailureException;
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.utilities.Template;
+import ch.systemsx.cisd.common.string.Template;
import ch.systemsx.cisd.openbis.generic.client.web.server.AbstractServlet;
import ch.systemsx.cisd.openbis.generic.shared.basic.BasicConstant;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/DataSetUploadClientServingServlet.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/DataSetUploadClientServingServlet.java
index 02190b2879741a9ded132ad899573344c7c213e7..bb1acec69b452d4bfb7518cadcfe729a5f81c3c2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/DataSetUploadClientServingServlet.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/api/gui/DataSetUploadClientServingServlet.java
@@ -24,7 +24,7 @@ import javax.servlet.http.HttpServletRequest;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
-import ch.systemsx.cisd.common.utilities.Template;
+import ch.systemsx.cisd.common.string.Template;
import ch.systemsx.cisd.openbis.generic.client.web.server.WebClientConfigurationProvider;
import ch.systemsx.cisd.openbis.generic.shared.ICommonServer;
import ch.systemsx.cisd.openbis.generic.shared.ResourceNames;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/console/ScriptContext.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/console/ScriptContext.java
index c08dc92da4b9f3006d9fc9ee49c4b4d86a8073da..e9c609d2cda0a45eda36f6fea4d694f35c2df68b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/console/ScriptContext.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/console/ScriptContext.java
@@ -22,7 +22,7 @@ import java.util.Properties;
import java.util.Set;
import java.util.Map.Entry;
-import ch.systemsx.cisd.common.utilities.Template;
+import ch.systemsx.cisd.common.string.Template;
/**
*
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/HelpRedirectServlet.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/HelpRedirectServlet.java
index 03e41e88022260d5b4e1f46c5a6c5564ef16de85..1667cbb0e637bdf2df393462ae863444ff6963ac 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/HelpRedirectServlet.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/HelpRedirectServlet.java
@@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.mvc.AbstractController;
-import ch.systemsx.cisd.common.utilities.Template;
+import ch.systemsx.cisd.common.string.Template;
import ch.systemsx.cisd.openbis.generic.client.web.client.IOnlineHelpResourceLocatorService;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants;
import ch.systemsx.cisd.openbis.generic.shared.ResourceNames;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/RowCalculator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/RowCalculator.java
index 9d5408205f4700bfbef7a26d9e5025575b932f77..64987713ef4ffb2c9b0e83dfb9abe31fa00cc5cb 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/RowCalculator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/RowCalculator.java
@@ -21,7 +21,7 @@ import java.util.List;
import java.util.Set;
import ch.systemsx.cisd.common.jython.evaluator.Evaluator;
-import ch.systemsx.cisd.common.utilities.Template;
+import ch.systemsx.cisd.common.string.Template;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ParameterWithValue;
import ch.systemsx.cisd.openbis.generic.shared.calculator.AbstractCalculator;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/IndexCreationUtil.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/IndexCreationUtil.java
index 5b98f57f72789d082d7b4ba4b4a680b71e32fc4f..60e37137dc33175d5eec4ca55fe3aad57663d0cd 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/IndexCreationUtil.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/IndexCreationUtil.java
@@ -33,7 +33,7 @@ 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.process.ProcessExecutionHelper;
-import ch.systemsx.cisd.common.utilities.Template;
+import ch.systemsx.cisd.common.string.Template;
import ch.systemsx.cisd.dbmigration.postgresql.DumpPreparator;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.search.FullTextIndexerRunnable;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.search.HibernateSearchContext;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/task/DataSetRegistrationSummaryTask.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/task/DataSetRegistrationSummaryTask.java
index 527bf4496a6d26c83284aae483eb1713a43a8742..bfb235963370c114da657d382cbdf46a42d43447 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/task/DataSetRegistrationSummaryTask.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/task/DataSetRegistrationSummaryTask.java
@@ -39,9 +39,9 @@ import ch.systemsx.cisd.common.mail.EMailAddress;
import ch.systemsx.cisd.common.mail.IMailClient;
import ch.systemsx.cisd.common.maintenance.IMaintenanceTask;
import ch.systemsx.cisd.common.properties.PropertyUtils;
+import ch.systemsx.cisd.common.string.Template;
import ch.systemsx.cisd.common.utilities.ITimeProvider;
import ch.systemsx.cisd.common.utilities.SystemTimeProvider;
-import ch.systemsx.cisd.common.utilities.Template;
import ch.systemsx.cisd.openbis.generic.server.CommonServiceProvider;
import ch.systemsx.cisd.openbis.generic.server.ICommonServerForInternalUse;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSetAttributeSearchFieldKind;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/server/DAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/server/DAO.java
index f4b8a3d7de20f353fa1c6a30054878084410ee74..c886b06b008f855142bc3869a07e12517383b26d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/server/DAO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/server/DAO.java
@@ -36,8 +36,8 @@ import org.springframework.jdbc.core.simple.SimpleJdbcDaoSupport;
import org.springframework.jdbc.support.JdbcUtils;
import ch.systemsx.cisd.common.exception.UserFailureException;
+import ch.systemsx.cisd.common.string.Template;
import ch.systemsx.cisd.common.utilities.Counters;
-import ch.systemsx.cisd.common.utilities.Template;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DateTableCell;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DoubleTableCell;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityKind;
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/dss/proteomics/server/plugins/APMSReport.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/dss/proteomics/server/plugins/APMSReport.java
index 50643013c87a2925841900faa4d7494f8ab3cd34..c61fe1de35686655b02ac5c456a7f00bd4536a9d 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/dss/proteomics/server/plugins/APMSReport.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/dss/proteomics/server/plugins/APMSReport.java
@@ -43,7 +43,7 @@ import ch.systemsx.cisd.common.exception.EnvironmentFailureException;
import ch.systemsx.cisd.common.exception.Status;
import ch.systemsx.cisd.common.exception.UserFailureException;
import ch.systemsx.cisd.common.mail.EMailAddress;
-import ch.systemsx.cisd.common.utilities.Template;
+import ch.systemsx.cisd.common.string.Template;
import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.AbstractTableModelReportingPlugin;
import ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks.IProcessingPluginTask;
import ch.systemsx.cisd.openbis.dss.generic.shared.DataSetProcessingContext;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/ImageViewerLaunchServlet.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/ImageViewerLaunchServlet.java
index e7a669e82906d6cffa2d0454b17291991d17339e..ffd17233051ad3f7098343d084bc75c332cb1692 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/ImageViewerLaunchServlet.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/ImageViewerLaunchServlet.java
@@ -37,7 +37,7 @@ import ch.systemsx.cisd.common.exception.EnvironmentFailureException;
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.utilities.Template;
+import ch.systemsx.cisd.common.string.Template;
import ch.systemsx.cisd.openbis.generic.client.web.server.AbstractServlet;
import ch.systemsx.cisd.openbis.plugin.screening.client.web.client.ParameterNames;