From 2b95df23b59d63ba0ca24f6296e63a46ef6176b6 Mon Sep 17 00:00:00 2001 From: jakubs <jakubs> Date: Wed, 8 Jun 2016 08:43:08 +0000 Subject: [PATCH] SSDM-3678: hierarchical store: Move meta data builder to shared package SVN: 36647 --- .../cisd/etlserver/plugins/HierarchicalStorageUpdater.java | 2 +- .../openbis/dss/generic/server/AbstractDataSetPackager.java | 1 + .../dss/generic/{server => shared/utils}/MetaDataBuilder.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) rename datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/{server => shared/utils}/MetaDataBuilder.java (99%) diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/plugins/HierarchicalStorageUpdater.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/plugins/HierarchicalStorageUpdater.java index 755f1d24d59..542c8d17aad 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/plugins/HierarchicalStorageUpdater.java +++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/plugins/HierarchicalStorageUpdater.java @@ -45,10 +45,10 @@ import ch.systemsx.cisd.common.maintenance.IDataStoreLockingMaintenanceTask; import ch.systemsx.cisd.common.properties.ExtendedProperties; import ch.systemsx.cisd.common.properties.PropertyUtils; import ch.systemsx.cisd.common.reflection.ClassUtils; -import ch.systemsx.cisd.openbis.dss.generic.server.MetaDataBuilder; import ch.systemsx.cisd.openbis.dss.generic.shared.IEncapsulatedOpenBISService; import ch.systemsx.cisd.openbis.dss.generic.shared.ServiceProvider; import ch.systemsx.cisd.openbis.dss.generic.shared.utils.DssPropertyParametersUtil; +import ch.systemsx.cisd.openbis.dss.generic.shared.utils.MetaDataBuilder; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.AbstractExternalData; import ch.systemsx.cisd.openbis.generic.shared.dto.SimpleDataSetInformationDTO; diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDataSetPackager.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDataSetPackager.java index b92a867a7cd..b446e05945f 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDataSetPackager.java +++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDataSetPackager.java @@ -27,6 +27,7 @@ import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchical import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchicalContentNode; import ch.systemsx.cisd.openbis.dss.generic.shared.IHierarchicalContentProvider; import ch.systemsx.cisd.openbis.dss.generic.shared.utils.DataSetExistenceChecker; +import ch.systemsx.cisd.openbis.dss.generic.shared.utils.MetaDataBuilder; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.AbstractExternalData; import ch.systemsx.cisd.openbis.generic.shared.translator.DataSetTranslator; diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/MetaDataBuilder.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/MetaDataBuilder.java similarity index 99% rename from datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/MetaDataBuilder.java rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/MetaDataBuilder.java index 2929dea9e7a..d3d31dbb041 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/MetaDataBuilder.java +++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/MetaDataBuilder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ch.systemsx.cisd.openbis.dss.generic.server; +package ch.systemsx.cisd.openbis.dss.generic.shared.utils; import java.text.DateFormat; import java.text.SimpleDateFormat; -- GitLab