From 73d8482261ee101218e6bae900831e1bfb25cbdb Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 10 Mar 2009 08:21:01 +0000
Subject: [PATCH] LMS-769 bug in build.xml fixed, bug in
dependency-structure.ddf fixed, DataSetInformation moved from etlserver
package to dss.generic.shared.dto
SVN: 10143
---
datastore_server/build/build.xml | 3 +++
.../resource/dependency-structure.ddf | 24 +++++++++++++++----
.../cisd/etlserver/BDSStorageProcessor.java | 1 +
.../cisd/etlserver/DataStrategyStore.java | 1 +
.../DefaultDataSetInfoExtractor.java | 1 +
.../etlserver/DefaultStorageProcessor.java | 1 +
.../cisd/etlserver/IDataSetInfoExtractor.java | 1 +
.../cisd/etlserver/IDataStoreStrategy.java | 1 +
.../cisd/etlserver/IDataStrategyStore.java | 2 ++
.../etlserver/IHCSImageFileExtractor.java | 1 +
.../systemsx/cisd/etlserver/IProcessor.java | 1 +
.../cisd/etlserver/IStorageProcessor.java | 1 +
.../etlserver/IdentifiedDataStrategy.java | 1 +
.../cisd/etlserver/NamedDataStrategy.java | 1 +
.../cisd/etlserver/StandardProcessor.java | 1 +
.../etlserver/TransferredDataSetHandler.java | 1 +
.../etlserver/imsb/HCSImageFileExtractor.java | 2 +-
.../AbstractDataSetInfoExtractorFor3V.java | 2 +-
...ataSetInfoExtractorForDataAcquisition.java | 2 +-
.../DataSetInfoExtractorForImageAnalysis.java | 2 +-
.../threev/HCSImageFileExtractor.java | 2 +-
.../server/EncapsulatedOpenBISService.java | 2 +-
.../shared/IEncapsulatedOpenBISService.java | 2 +-
.../shared/dto}/DataSetInformation.java | 5 ++--
.../etlserver/BDSStorageProcessorTest.java | 1 +
.../cisd/etlserver/DataStrategyStoreTest.java | 1 +
.../DefaultDataSetInfoExtractorTest.java | 1 +
.../EncapsulatedLimsServiceTest.java | 1 +
.../etlserver/IdentifiedDataStrategyTest.java | 1 +
.../cisd/etlserver/StandardProcessorTest.java | 1 +
.../TransferredDataSetHandlerTest.java | 1 +
.../imsb/HCSImageFileExtractorTest.java | 2 +-
...etInfoExtractorForDataAcquisitionTest.java | 2 +-
...aSetInfoExtractorForImageAnalysisTest.java | 2 +-
34 files changed, 57 insertions(+), 17 deletions(-)
rename datastore_server/source/java/ch/systemsx/cisd/{etlserver => openbis/dss/generic/shared/dto}/DataSetInformation.java (97%)
diff --git a/datastore_server/build/build.xml b/datastore_server/build/build.xml
index 3cfcb13002b..4de1d69a7b0 100644
--- a/datastore_server/build/build.xml
+++ b/datastore_server/build/build.xml
@@ -38,6 +38,9 @@
<include name="**/*.class" />
<include name="${build.info.filename}" />
</fileset>
+ <fileset dir="${sources}">
+ <include name="**/*.xml" />
+ </fileset>
<fileset dir="${nativeroot}">
<include name="**/unix.so"/>
</fileset>
diff --git a/datastore_server/resource/dependency-structure.ddf b/datastore_server/resource/dependency-structure.ddf
index f05d29b3583..3062517985b 100644
--- a/datastore_server/resource/dependency-structure.ddf
+++ b/datastore_server/resource/dependency-structure.ddf
@@ -4,15 +4,31 @@
#show allResults
{root} = ch.systemsx.cisd
+{openbis} = ${root}.openbis
+{dss} = ${openbis}.dss
{etlserver} = ${root}.etlserver
######################################################################
# Check dependencies to openbis
-{openbis} = ${root}.openbis
[etlserver] = ${etlserver}.*
-[private_openbis] = ${openbis}.* excluding ${openbis}.generic.shared.dto.* ${openbis}.generic.shared.IETLLIMSService
+[dss] = ${dss}.*
+[private_openbis] = ${openbis}.* excluding [dss] ${openbis}.generic.shared.*
+
+check sets [dss] [etlserver]
+
+check [dss] [etlserver] independentOf [private_openbis]
+
+######################################################################
+# Check dependencies of etlserver to dss
+
+[dss.shared] = ${dss}.generic.shared.*
+[private_dss] = ${dss}.* excluding [dss.shared] ${dss}.generic.DataStoreServer
+
+check sets [dss.shared] [private_dss]
+
+layer l1 = [dss.shared]
+layer l2 = [etlserver] [private_dss]
-check sets [etlserver]
+check layeringOf l1 l2
-check [etlserver] independentOf [private_openbis]
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/BDSStorageProcessor.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/BDSStorageProcessor.java
index 031f801a490..bc53c0c2092 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/BDSStorageProcessor.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/BDSStorageProcessor.java
@@ -70,6 +70,7 @@ import ch.systemsx.cisd.common.logging.LogFactory;
import ch.systemsx.cisd.common.mail.IMailClient;
import ch.systemsx.cisd.common.utilities.ClassUtils;
import ch.systemsx.cisd.etlserver.HCSImageCheckList.FullLocation;
+import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
import ch.systemsx.cisd.openbis.generic.shared.dto.DataSetType;
import ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.PersonPE;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/DataStrategyStore.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/DataStrategyStore.java
index 378e1a76604..72e90f178e4 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/DataStrategyStore.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/DataStrategyStore.java
@@ -28,6 +28,7 @@ import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
import ch.systemsx.cisd.common.mail.IMailClient;
import ch.systemsx.cisd.openbis.dss.generic.shared.IEncapsulatedOpenBISService;
+import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
import ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.GroupPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.PersonPE;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/DefaultDataSetInfoExtractor.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/DefaultDataSetInfoExtractor.java
index fea627bdb96..41aec42f962 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/DefaultDataSetInfoExtractor.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/DefaultDataSetInfoExtractor.java
@@ -26,6 +26,7 @@ import ch.rinn.restrictions.Private;
import ch.systemsx.cisd.common.exceptions.EnvironmentFailureException;
import ch.systemsx.cisd.common.exceptions.UserFailureException;
import ch.systemsx.cisd.common.utilities.PropertyUtils;
+import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
/**
* Default implementation which assumes that the information can be extracted from the file name.
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/DefaultStorageProcessor.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/DefaultStorageProcessor.java
index 356a50764a1..0e57861d326 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/DefaultStorageProcessor.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/DefaultStorageProcessor.java
@@ -21,6 +21,7 @@ import java.util.Properties;
import ch.systemsx.cisd.common.exceptions.EnvironmentFailureException;
import ch.systemsx.cisd.common.mail.IMailClient;
+import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
import ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.StorageFormat;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/IDataSetInfoExtractor.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/IDataSetInfoExtractor.java
index bbabefb64ba..0c4a2980e24 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/IDataSetInfoExtractor.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/IDataSetInfoExtractor.java
@@ -20,6 +20,7 @@ import java.io.File;
import ch.systemsx.cisd.common.exceptions.EnvironmentFailureException;
import ch.systemsx.cisd.common.exceptions.UserFailureException;
+import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
/**
* A role to extract {@link DataSetInformation} from an incoming data set. Implementations of this
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/IDataStoreStrategy.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/IDataStoreStrategy.java
index 1ecea806c76..485e447864e 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/IDataStoreStrategy.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/IDataStoreStrategy.java
@@ -18,6 +18,7 @@ package ch.systemsx.cisd.etlserver;
import java.io.File;
+import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
import ch.systemsx.cisd.openbis.generic.shared.dto.DataSetType;
/**
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/IDataStrategyStore.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/IDataStrategyStore.java
index c88817c6ecb..9abb175b4da 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/IDataStrategyStore.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/IDataStrategyStore.java
@@ -18,6 +18,8 @@ package ch.systemsx.cisd.etlserver;
import java.io.File;
+import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
+
/**
* The main purpose of this interface is to return a <code>IDataStoreStrategy</code> for a given
* <code>DataSetInformation</code>.
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/IHCSImageFileExtractor.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/IHCSImageFileExtractor.java
index c412b147add..38655ca0d06 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/IHCSImageFileExtractor.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/IHCSImageFileExtractor.java
@@ -19,6 +19,7 @@ package ch.systemsx.cisd.etlserver;
import java.util.Properties;
import ch.systemsx.cisd.bds.storage.IDirectory;
+import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
/**
* This role is supposed to be implemented by classes that can extract HCS image files from an
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/IProcessor.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/IProcessor.java
index 662d1a5ca49..20c837f8db3 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/IProcessor.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/IProcessor.java
@@ -18,6 +18,7 @@ package ch.systemsx.cisd.etlserver;
import java.io.File;
+import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
import ch.systemsx.cisd.openbis.generic.shared.dto.ProcessingInstructionDTO;
import ch.systemsx.cisd.openbis.generic.shared.dto.StorageFormat;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/IStorageProcessor.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/IStorageProcessor.java
index 8d8dc3c4292..74771af803e 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/IStorageProcessor.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/IStorageProcessor.java
@@ -20,6 +20,7 @@ import java.io.File;
import java.util.Properties;
import ch.systemsx.cisd.common.mail.IMailClient;
+import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
import ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.StorageFormat;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/IdentifiedDataStrategy.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/IdentifiedDataStrategy.java
index 98dc811072e..6aa128ffd5c 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/IdentifiedDataStrategy.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/IdentifiedDataStrategy.java
@@ -19,6 +19,7 @@ package ch.systemsx.cisd.etlserver;
import java.io.File;
import ch.systemsx.cisd.common.exceptions.EnvironmentFailureException;
+import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
import ch.systemsx.cisd.openbis.generic.shared.dto.DataSetType;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ExperimentIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifier;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/NamedDataStrategy.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/NamedDataStrategy.java
index 2fb39810001..a84902895d9 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/NamedDataStrategy.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/NamedDataStrategy.java
@@ -20,6 +20,7 @@ import java.io.File;
import java.util.regex.Pattern;
import ch.systemsx.cisd.common.filesystem.FileUtilities;
+import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
import ch.systemsx.cisd.openbis.generic.shared.dto.DataSetType;
/**
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/StandardProcessor.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/StandardProcessor.java
index 20e54118205..9a9c3942381 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/StandardProcessor.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/StandardProcessor.java
@@ -29,6 +29,7 @@ import ch.systemsx.cisd.common.exceptions.StopException;
import ch.systemsx.cisd.common.filesystem.PathPrefixPrepender;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
+import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
import ch.systemsx.cisd.openbis.generic.shared.dto.ProcessingInstructionDTO;
import ch.systemsx.cisd.openbis.generic.shared.dto.StorageFormat;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/TransferredDataSetHandler.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/TransferredDataSetHandler.java
index fabecc77da3..15f623a6182 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/TransferredDataSetHandler.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/TransferredDataSetHandler.java
@@ -54,6 +54,7 @@ import ch.systemsx.cisd.common.utilities.BeanUtils;
import ch.systemsx.cisd.common.utilities.ISelfTestable;
import ch.systemsx.cisd.common.utilities.OSUtilities;
import ch.systemsx.cisd.openbis.dss.generic.shared.IEncapsulatedOpenBISService;
+import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
import ch.systemsx.cisd.openbis.generic.shared.dto.DataSetType;
import ch.systemsx.cisd.openbis.generic.shared.dto.DatabaseInstancePE;
import ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentPE;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/imsb/HCSImageFileExtractor.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/imsb/HCSImageFileExtractor.java
index 6112d16c551..397dae971bc 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/imsb/HCSImageFileExtractor.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/imsb/HCSImageFileExtractor.java
@@ -41,10 +41,10 @@ import ch.systemsx.cisd.common.exceptions.StopException;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
import ch.systemsx.cisd.etlserver.ChannelSetHelper;
-import ch.systemsx.cisd.etlserver.DataSetInformation;
import ch.systemsx.cisd.etlserver.HCSImageFileExtractionResult;
import ch.systemsx.cisd.etlserver.IHCSImageFileAccepter;
import ch.systemsx.cisd.etlserver.IHCSImageFileExtractor;
+import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
/**
* A <code>IHCSImageFileExtractor</code> implementation suitable for <i>3V</i>.
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/threev/AbstractDataSetInfoExtractorFor3V.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/threev/AbstractDataSetInfoExtractorFor3V.java
index 2b04add8cbd..8bedbf972d0 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/threev/AbstractDataSetInfoExtractorFor3V.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/threev/AbstractDataSetInfoExtractorFor3V.java
@@ -27,9 +27,9 @@ import ch.systemsx.cisd.common.exceptions.EnvironmentFailureException;
import ch.systemsx.cisd.common.exceptions.UserFailureException;
import ch.systemsx.cisd.common.utilities.PropertyUtils;
import ch.systemsx.cisd.etlserver.AbstractDataSetInfoExtractor;
-import ch.systemsx.cisd.etlserver.DataSetInformation;
import ch.systemsx.cisd.etlserver.DataSetNameEntitiesProvider;
import ch.systemsx.cisd.etlserver.DefaultDataSetInfoExtractor;
+import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
/**
* @author Franz-Josef Elmer
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/threev/DataSetInfoExtractorForDataAcquisition.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/threev/DataSetInfoExtractorForDataAcquisition.java
index 283b58a2195..263aa5033db 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/threev/DataSetInfoExtractorForDataAcquisition.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/threev/DataSetInfoExtractorForDataAcquisition.java
@@ -19,8 +19,8 @@ package ch.systemsx.cisd.etlserver.threev;
import java.util.Properties;
import ch.rinn.restrictions.Private;
-import ch.systemsx.cisd.etlserver.DataSetInformation;
import ch.systemsx.cisd.etlserver.DefaultDataSetInfoExtractor;
+import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
/**
* Implementation which assumes that the information can be extracted from the file name. Following
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/threev/DataSetInfoExtractorForImageAnalysis.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/threev/DataSetInfoExtractorForImageAnalysis.java
index 211c053e724..a3e5d52eeee 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/threev/DataSetInfoExtractorForImageAnalysis.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/threev/DataSetInfoExtractorForImageAnalysis.java
@@ -19,8 +19,8 @@ package ch.systemsx.cisd.etlserver.threev;
import java.util.Properties;
import ch.rinn.restrictions.Private;
-import ch.systemsx.cisd.etlserver.DataSetInformation;
import ch.systemsx.cisd.etlserver.DefaultDataSetInfoExtractor;
+import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
/**
* Implementation which assumes that the information can be extracted from the file name. Following
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/threev/HCSImageFileExtractor.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/threev/HCSImageFileExtractor.java
index c250dfaebfe..f918fa47b20 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/threev/HCSImageFileExtractor.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/threev/HCSImageFileExtractor.java
@@ -35,10 +35,10 @@ import ch.systemsx.cisd.common.exceptions.StopException;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
import ch.systemsx.cisd.etlserver.ChannelSetHelper;
-import ch.systemsx.cisd.etlserver.DataSetInformation;
import ch.systemsx.cisd.etlserver.HCSImageFileExtractionResult;
import ch.systemsx.cisd.etlserver.IHCSImageFileAccepter;
import ch.systemsx.cisd.etlserver.IHCSImageFileExtractor;
+import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
/**
* A <code>IHCSImageFileExtractor</code> implementation suitable for <i>3V</i>.
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedOpenBISService.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedOpenBISService.java
index 212be42508b..571e0ab2106 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedOpenBISService.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedOpenBISService.java
@@ -25,8 +25,8 @@ import ch.systemsx.cisd.common.exceptions.UserFailureException;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
import ch.systemsx.cisd.common.spring.HttpInvokerUtils;
-import ch.systemsx.cisd.etlserver.DataSetInformation;
import ch.systemsx.cisd.openbis.dss.generic.shared.IEncapsulatedOpenBISService;
+import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
import ch.systemsx.cisd.openbis.generic.shared.IETLLIMSService;
import ch.systemsx.cisd.openbis.generic.shared.dto.DatabaseInstancePE;
import ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentPE;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IEncapsulatedOpenBISService.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IEncapsulatedOpenBISService.java
index c2d17a03dc0..1b4a499e3d2 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IEncapsulatedOpenBISService.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IEncapsulatedOpenBISService.java
@@ -17,7 +17,7 @@
package ch.systemsx.cisd.openbis.dss.generic.shared;
import ch.systemsx.cisd.common.exceptions.UserFailureException;
-import ch.systemsx.cisd.etlserver.DataSetInformation;
+import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
import ch.systemsx.cisd.openbis.generic.shared.IETLLIMSService;
import ch.systemsx.cisd.openbis.generic.shared.dto.DatabaseInstancePE;
import ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentPE;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/DataSetInformation.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/DataSetInformation.java
similarity index 97%
rename from datastore_server/source/java/ch/systemsx/cisd/etlserver/DataSetInformation.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/DataSetInformation.java
index 1713d9768c9..0bb54f9483d 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/DataSetInformation.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/dto/DataSetInformation.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.etlserver;
+package ch.systemsx.cisd.openbis.dss.generic.shared.dto;
import java.io.Serializable;
import java.util.Date;
@@ -59,8 +59,7 @@ public final class DataSetInformation implements Serializable
private String instanceCode;
/**
- * The group code (set by the {@link IDataSetInfoExtractor} or as specified in the
- * <code>service.properties</code> file).
+ * The group code.
*/
private String groupCode;
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/BDSStorageProcessorTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/BDSStorageProcessorTest.java
index 93fed037522..c576e14fb49 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/BDSStorageProcessorTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/BDSStorageProcessorTest.java
@@ -63,6 +63,7 @@ import ch.systemsx.cisd.common.filesystem.QueueingPathRemoverService;
import ch.systemsx.cisd.common.logging.BufferedAppender;
import ch.systemsx.cisd.common.mail.IMailClient;
import ch.systemsx.cisd.common.types.BooleanOrUnknown;
+import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
import ch.systemsx.cisd.openbis.generic.shared.dto.DataTypePE;
import ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.GroupPE;
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/DataStrategyStoreTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/DataStrategyStoreTest.java
index 997f0b3a238..4ed9c5eb240 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/DataStrategyStoreTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/DataStrategyStoreTest.java
@@ -33,6 +33,7 @@ import ch.systemsx.cisd.common.filesystem.AbstractFileSystemTestCase;
import ch.systemsx.cisd.common.logging.BufferedAppender;
import ch.systemsx.cisd.common.mail.IMailClient;
import ch.systemsx.cisd.openbis.dss.generic.shared.IEncapsulatedOpenBISService;
+import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
import ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.GroupPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.InvalidationPE;
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/DefaultDataSetInfoExtractorTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/DefaultDataSetInfoExtractorTest.java
index 985e19f131a..4a2d40113b1 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/DefaultDataSetInfoExtractorTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/DefaultDataSetInfoExtractorTest.java
@@ -27,6 +27,7 @@ import java.util.Properties;
import org.testng.annotations.Test;
import ch.systemsx.cisd.common.exceptions.UserFailureException;
+import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
/**
* Test cases for the {@link DefaultDataSetInfoExtractor}.
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/EncapsulatedLimsServiceTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/EncapsulatedLimsServiceTest.java
index 4503fa002d5..1a8ee430be5 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/EncapsulatedLimsServiceTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/EncapsulatedLimsServiceTest.java
@@ -25,6 +25,7 @@ import org.testng.annotations.Test;
import ch.systemsx.cisd.common.exceptions.InvalidSessionException;
import ch.systemsx.cisd.openbis.dss.generic.server.EncapsulatedOpenBISService;
import ch.systemsx.cisd.openbis.dss.generic.shared.IEncapsulatedOpenBISService;
+import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
import ch.systemsx.cisd.openbis.generic.shared.IETLLIMSService;
import ch.systemsx.cisd.openbis.generic.shared.dto.ExternalData;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifier;
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/IdentifiedDataStrategyTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/IdentifiedDataStrategyTest.java
index 2e6aa25956a..a8e37b9a003 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/IdentifiedDataStrategyTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/IdentifiedDataStrategyTest.java
@@ -30,6 +30,7 @@ import org.testng.annotations.Test;
import ch.systemsx.cisd.common.exceptions.EnvironmentFailureException;
import ch.systemsx.cisd.common.filesystem.AbstractFileSystemTestCase;
+import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
import ch.systemsx.cisd.openbis.generic.shared.dto.DataSetType;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ExperimentIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.dto.types.DataSetTypeCode;
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/StandardProcessorTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/StandardProcessorTest.java
index a1ff51e182e..70df5170d03 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/StandardProcessorTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/StandardProcessorTest.java
@@ -34,6 +34,7 @@ import org.testng.annotations.Test;
import ch.systemsx.cisd.common.exceptions.ConfigurationFailureException;
import ch.systemsx.cisd.common.filesystem.AbstractFileSystemTestCase;
import ch.systemsx.cisd.common.filesystem.PathPrefixPrepender;
+import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
import ch.systemsx.cisd.openbis.generic.shared.dto.ProcessingInstructionDTO;
import ch.systemsx.cisd.openbis.generic.shared.dto.StorageFormat;
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/TransferredDataSetHandlerTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/TransferredDataSetHandlerTest.java
index 514d84255d5..53342e341f8 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/TransferredDataSetHandlerTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/TransferredDataSetHandlerTest.java
@@ -57,6 +57,7 @@ import ch.systemsx.cisd.common.test.LogMonitoringAppender;
import ch.systemsx.cisd.common.utilities.OSUtilities;
import ch.systemsx.cisd.openbis.dss.generic.server.EncapsulatedOpenBISService;
import ch.systemsx.cisd.openbis.dss.generic.shared.IEncapsulatedOpenBISService;
+import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
import ch.systemsx.cisd.openbis.generic.shared.IETLLIMSService;
import ch.systemsx.cisd.openbis.generic.shared.dto.DataSetType;
import ch.systemsx.cisd.openbis.generic.shared.dto.DatabaseInstancePE;
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/imsb/HCSImageFileExtractorTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/imsb/HCSImageFileExtractorTest.java
index 1c017bbdf2c..d49fa03a760 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/imsb/HCSImageFileExtractorTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/imsb/HCSImageFileExtractorTest.java
@@ -40,8 +40,8 @@ import ch.systemsx.cisd.bds.storage.IFile;
import ch.systemsx.cisd.bds.storage.filesystem.NodeFactory;
import ch.systemsx.cisd.common.filesystem.AbstractFileSystemTestCase;
import ch.systemsx.cisd.common.logging.BufferedAppender;
-import ch.systemsx.cisd.etlserver.DataSetInformation;
import ch.systemsx.cisd.etlserver.IHCSImageFileAccepter;
+import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
/**
* Test cases for the {@link HCSImageFileExtractor}.
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/threev/DataSetInfoExtractorForDataAcquisitionTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/threev/DataSetInfoExtractorForDataAcquisitionTest.java
index bea0c12945e..eaf462a0521 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/threev/DataSetInfoExtractorForDataAcquisitionTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/threev/DataSetInfoExtractorForDataAcquisitionTest.java
@@ -27,8 +27,8 @@ import org.testng.annotations.Test;
import ch.systemsx.cisd.common.exceptions.ConfigurationFailureException;
import ch.systemsx.cisd.etlserver.CodeExtractortTestCase;
-import ch.systemsx.cisd.etlserver.DataSetInformation;
import ch.systemsx.cisd.etlserver.IDataSetInfoExtractor;
+import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
/**
* @author Franz-Josef Elmer
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/threev/DataSetInfoExtractorForImageAnalysisTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/threev/DataSetInfoExtractorForImageAnalysisTest.java
index 46ae5ddb907..fa733630214 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/threev/DataSetInfoExtractorForImageAnalysisTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/threev/DataSetInfoExtractorForImageAnalysisTest.java
@@ -26,8 +26,8 @@ import org.testng.annotations.Test;
import ch.systemsx.cisd.common.exceptions.ConfigurationFailureException;
import ch.systemsx.cisd.etlserver.CodeExtractortTestCase;
-import ch.systemsx.cisd.etlserver.DataSetInformation;
import ch.systemsx.cisd.etlserver.IDataSetInfoExtractor;
+import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
/**
* @author Franz-Josef Elmer
--
GitLab