[LMS-2172] dependencies

SVN: 20830

datastore_server/source/java/ch/systemsx/cisd/etlserver/hdf5/Hdf5StorageProcessor.java

@@ -24,6 +24,7 @@ import ch.systemsx.cisd.common.mail.IMailClient;
 import ch.systemsx.cisd.common.utilities.PropertyUtils;
 import ch.systemsx.cisd.etlserver.AbstractStorageProcessor;
 import ch.systemsx.cisd.etlserver.ITypeExtractor;
+import ch.systemsx.cisd.openbis.dss.generic.shared.content.Hdf5Container;
 import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
 
 /**

datastore_server/source/java/ch/systemsx/cisd/etlserver/hdf5/HierarchicalStructureDuplicatorFileToHdf5.java

@@ -25,6 +25,7 @@ import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel;
 import ch.systemsx.cisd.base.exceptions.IOExceptionUnchecked;
 import ch.systemsx.cisd.common.filesystem.FileUtilities;
 import ch.systemsx.cisd.hdf5.IHDF5SimpleWriter;
+import ch.systemsx.cisd.openbis.dss.generic.shared.content.Hdf5Container;
 
 /**
  * Takes the hierarchical structure of a file and applies it to an HDF5 container.

datastore_server/source/java/ch/systemsx/cisd/etlserver/hdf5/CompressingHdf5WriterWrapper.java → datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/CompressingHdf5WriterWrapper.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.etlserver.hdf5;
+package ch.systemsx.cisd.openbis.dss.generic.shared.content;
 
 import java.util.BitSet;
 import java.util.Date;

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/HDF5ContainerBasedHierarchicalContentNode.java

@@ -30,7 +30,6 @@ import ch.systemsx.cisd.common.io.IContent;
 import ch.systemsx.cisd.common.io.IHierarchicalContent;
 import ch.systemsx.cisd.common.io.IHierarchicalContentFactory;
 import ch.systemsx.cisd.common.io.IHierarchicalContentNode;
-import ch.systemsx.cisd.etlserver.hdf5.Hdf5Container;
 import ch.systemsx.cisd.hdf5.IHDF5SimpleReader;
 
 /**
@@ -38,8 +37,7 @@ import ch.systemsx.cisd.hdf5.IHDF5SimpleReader;
  * 
  * @author Piotr Buczek
  */
-public class HDF5ContainerBasedHierarchicalContentNode extends
-        DefaultFileBasedHierarchicalContentNode // TODO make package protected
+class HDF5ContainerBasedHierarchicalContentNode extends DefaultFileBasedHierarchicalContentNode
 {
     private final Hdf5Container hdf5Container;
 

datastore_server/source/java/ch/systemsx/cisd/etlserver/hdf5/Hdf5Container.java → datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/Hdf5Container.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.etlserver.hdf5;
+package ch.systemsx.cisd.openbis.dss.generic.shared.content;
 
 import java.io.File;
 

datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/AbstractHdf5StorageProcessorTest.java

@@ -22,8 +22,9 @@ import java.util.Properties;
 import ch.systemsx.cisd.base.tests.AbstractFileSystemTestCase;
 import ch.systemsx.cisd.common.filesystem.FileUtilities;
 import ch.systemsx.cisd.etlserver.IStorageProcessorTransactional.IStorageProcessorTransaction;
-import ch.systemsx.cisd.etlserver.hdf5.Hdf5Container.IHdf5ReaderClient;
 import ch.systemsx.cisd.hdf5.IHDF5SimpleReader;
+import ch.systemsx.cisd.openbis.dss.generic.shared.content.Hdf5Container;
+import ch.systemsx.cisd.openbis.dss.generic.shared.content.Hdf5Container.IHdf5ReaderClient;
 
 /**
  * Tests for {@link Hdf5StorageProcessor}.

datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/FileToHdf5DuplicationVerifier.java

@@ -22,8 +22,9 @@ import java.io.IOException;
 import org.apache.commons.io.FileUtils;
 import org.testng.AssertJUnit;
 
-import ch.systemsx.cisd.etlserver.hdf5.Hdf5Container.IHdf5ReaderClient;
 import ch.systemsx.cisd.hdf5.IHDF5SimpleReader;
+import ch.systemsx.cisd.openbis.dss.generic.shared.content.Hdf5Container;
+import ch.systemsx.cisd.openbis.dss.generic.shared.content.Hdf5Container.IHdf5ReaderClient;
 
 /**
  * Helper class that verifies that a file structure is matched by the HDF5 structure.

datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/Hdf5ContainerTest.java

@@ -24,10 +24,11 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import ch.systemsx.cisd.base.tests.AbstractFileSystemTestCase;
-import ch.systemsx.cisd.etlserver.hdf5.Hdf5Container.IHdf5ReaderClient;
-import ch.systemsx.cisd.etlserver.hdf5.Hdf5Container.IHdf5WriterClient;
 import ch.systemsx.cisd.hdf5.IHDF5SimpleReader;
 import ch.systemsx.cisd.hdf5.IHDF5SimpleWriter;
+import ch.systemsx.cisd.openbis.dss.generic.shared.content.Hdf5Container;
+import ch.systemsx.cisd.openbis.dss.generic.shared.content.Hdf5Container.IHdf5ReaderClient;
+import ch.systemsx.cisd.openbis.dss.generic.shared.content.Hdf5Container.IHdf5WriterClient;
 
 /**
  * @author Chandrasekhar Ramakrishnan

datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/HierarchicalStructureDuplicatorFileToHdf5Test.java

@@ -23,8 +23,9 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import ch.systemsx.cisd.base.tests.AbstractFileSystemTestCase;
-import ch.systemsx.cisd.etlserver.hdf5.Hdf5Container.IHdf5ReaderClient;
 import ch.systemsx.cisd.hdf5.IHDF5SimpleReader;
+import ch.systemsx.cisd.openbis.dss.generic.shared.content.Hdf5Container;
+import ch.systemsx.cisd.openbis.dss.generic.shared.content.Hdf5Container.IHdf5ReaderClient;
 
 /**
  * @author Chandrasekhar Ramakrishnan