From 79cd7d3c2c539e5f13cceaaf4b7cec4666ba7ce2 Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Tue, 12 Apr 2011 10:05:04 +0000
Subject: [PATCH] [LMS-2172] dependencies
SVN: 20830
---
.../systemsx/cisd/etlserver/hdf5/Hdf5StorageProcessor.java | 1 +
.../hdf5/HierarchicalStructureDuplicatorFileToHdf5.java | 1 +
.../shared/content}/CompressingHdf5WriterWrapper.java | 2 +-
.../content/HDF5ContainerBasedHierarchicalContentNode.java | 4 +---
.../dss/generic/shared/content}/Hdf5Container.java | 2 +-
.../etlserver/hdf5/AbstractHdf5StorageProcessorTest.java | 3 ++-
.../cisd/etlserver/hdf5/FileToHdf5DuplicationVerifier.java | 3 ++-
.../ch/systemsx/cisd/etlserver/hdf5/Hdf5ContainerTest.java | 5 +++--
.../hdf5/HierarchicalStructureDuplicatorFileToHdf5Test.java | 3 ++-
9 files changed, 14 insertions(+), 10 deletions(-)
rename datastore_server/source/java/ch/systemsx/cisd/{etlserver/hdf5 => openbis/dss/generic/shared/content}/CompressingHdf5WriterWrapper.java (99%)
rename datastore_server/source/java/ch/systemsx/cisd/{etlserver/hdf5 => openbis/dss/generic/shared/content}/Hdf5Container.java (98%)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/hdf5/Hdf5StorageProcessor.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/hdf5/Hdf5StorageProcessor.java
index 8d0a9611304..8d87700ab57 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/hdf5/Hdf5StorageProcessor.java
+++ b/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;
/**
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/hdf5/HierarchicalStructureDuplicatorFileToHdf5.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/hdf5/HierarchicalStructureDuplicatorFileToHdf5.java
index 5cc97aa2ebc..72c620cdc03 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/hdf5/HierarchicalStructureDuplicatorFileToHdf5.java
+++ b/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.
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/hdf5/CompressingHdf5WriterWrapper.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/CompressingHdf5WriterWrapper.java
similarity index 99%
rename from datastore_server/source/java/ch/systemsx/cisd/etlserver/hdf5/CompressingHdf5WriterWrapper.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/CompressingHdf5WriterWrapper.java
index c811d459910..e2677a710e1 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/hdf5/CompressingHdf5WriterWrapper.java
+++ b/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;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/HDF5ContainerBasedHierarchicalContentNode.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/HDF5ContainerBasedHierarchicalContentNode.java
index f0e7026dac2..c7928dc9eb2 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/HDF5ContainerBasedHierarchicalContentNode.java
+++ b/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;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/hdf5/Hdf5Container.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/Hdf5Container.java
similarity index 98%
rename from datastore_server/source/java/ch/systemsx/cisd/etlserver/hdf5/Hdf5Container.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/Hdf5Container.java
index 37dca08ae6d..031396510f4 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/hdf5/Hdf5Container.java
+++ b/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;
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/AbstractHdf5StorageProcessorTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/AbstractHdf5StorageProcessorTest.java
index a9e9db4f6c3..f1093af651b 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/AbstractHdf5StorageProcessorTest.java
+++ b/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}.
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/FileToHdf5DuplicationVerifier.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/FileToHdf5DuplicationVerifier.java
index ea50d497ef4..152413bd17a 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/FileToHdf5DuplicationVerifier.java
+++ b/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.
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/Hdf5ContainerTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/Hdf5ContainerTest.java
index b7da4daeced..25380f0cb89 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/Hdf5ContainerTest.java
+++ b/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
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/HierarchicalStructureDuplicatorFileToHdf5Test.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/HierarchicalStructureDuplicatorFileToHdf5Test.java
index e3880138d79..bfc424a64fe 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/HierarchicalStructureDuplicatorFileToHdf5Test.java
+++ b/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
--
GitLab