diff --git a/common/.classpath b/common/.classpath index 98ba3a933407fdb75deb69870e405866b3bd379d..fb4d4ee9b717335ec91b71f481f33df989c4c113 100644 --- a/common/.classpath +++ b/common/.classpath @@ -37,8 +37,6 @@ <classpathentry kind="lib" path="/libraries/spring/webmvc/spring-webmvc.jar" sourcepath="/libraries/spring/webmvc/src.jar"/> <classpathentry kind="lib" path="/libraries/gwt2.4/gwt-servlet.jar"/> <classpathentry kind="lib" path="/libraries/spring/third-party/stream-supporting-httpinvoker.jar" sourcepath="/libraries/spring/third-party/stream-supporting-httpinvoker-src.zip"/> - <classpathentry kind="lib" path="/libraries/cisd-jhdf5/cisd-jhdf5-core.jar" sourcepath="/libraries/cisd-jhdf5/cisd-jhdf5-src.zip"/> - <classpathentry kind="lib" path="/libraries/cisd-jhdf5/cisd-jhdf5-tools.jar"/> <classpathentry kind="lib" path="/libraries/cisd-jhdf5/hdf5-linux-intel.jar"/> <classpathentry kind="lib" path="/libraries/cisd-jhdf5/hdf5-macosx-intel.jar"/> <classpathentry kind="lib" path="/libraries/cisd-jhdf5/hdf5-windows-intel.jar"/> diff --git a/openbis-common/.classpath b/openbis-common/.classpath index e9e6fefd93d107d126a18692e4b9a6894d93b6d9..dc0b2c433021dd4195ca808bbda9f5e9e357b702 100644 --- a/openbis-common/.classpath +++ b/openbis-common/.classpath @@ -53,5 +53,7 @@ <classpathentry kind="lib" path="/libraries/jackson/jackson-core.jar" sourcepath="/libraries/jackson/jackson-core-src.zip"/> <classpathentry kind="lib" path="/libraries/jackson/jackson-databind.jar" sourcepath="/libraries/jackson/jackson-databind-src.zip"/> <classpathentry kind="lib" path="/libraries/jsonrpc4j/jsonrpc4j.jar" sourcepath="/libraries/jsonrpc4j/jsonrpc4j-sources.jar"/> + <classpathentry kind="lib" path="/libraries/cisd-jhdf5/cisd-jhdf5-core.jar" sourcepath="/libraries/cisd-jhdf5/cisd-jhdf5-src.zip"/> + <classpathentry kind="lib" path="/libraries/cisd-jhdf5/cisd-jhdf5-tools.jar"/> <classpathentry kind="output" path="targets/classes"/> </classpath> diff --git a/common/source/java/ch/systemsx/cisd/common/hdf5/HDF5Container.java b/openbis-common/source/java/ch/systemsx/cisd/common/hdf5/HDF5Container.java similarity index 100% rename from common/source/java/ch/systemsx/cisd/common/hdf5/HDF5Container.java rename to openbis-common/source/java/ch/systemsx/cisd/common/hdf5/HDF5Container.java diff --git a/common/source/java/ch/systemsx/cisd/common/hdf5/HDF5ContainerReader.java b/openbis-common/source/java/ch/systemsx/cisd/common/hdf5/HDF5ContainerReader.java similarity index 100% rename from common/source/java/ch/systemsx/cisd/common/hdf5/HDF5ContainerReader.java rename to openbis-common/source/java/ch/systemsx/cisd/common/hdf5/HDF5ContainerReader.java diff --git a/common/source/java/ch/systemsx/cisd/common/hdf5/HDF5ContainerWriter.java b/openbis-common/source/java/ch/systemsx/cisd/common/hdf5/HDF5ContainerWriter.java similarity index 100% rename from common/source/java/ch/systemsx/cisd/common/hdf5/HDF5ContainerWriter.java rename to openbis-common/source/java/ch/systemsx/cisd/common/hdf5/HDF5ContainerWriter.java diff --git a/common/source/java/ch/systemsx/cisd/common/hdf5/HierarchicalStructureDuplicatorFileToHDF5.java b/openbis-common/source/java/ch/systemsx/cisd/common/hdf5/HierarchicalStructureDuplicatorFileToHDF5.java similarity index 100% rename from common/source/java/ch/systemsx/cisd/common/hdf5/HierarchicalStructureDuplicatorFileToHDF5.java rename to openbis-common/source/java/ch/systemsx/cisd/common/hdf5/HierarchicalStructureDuplicatorFileToHDF5.java diff --git a/common/source/java/ch/systemsx/cisd/common/hdf5/IHDF5ContainerReader.java b/openbis-common/source/java/ch/systemsx/cisd/common/hdf5/IHDF5ContainerReader.java similarity index 100% rename from common/source/java/ch/systemsx/cisd/common/hdf5/IHDF5ContainerReader.java rename to openbis-common/source/java/ch/systemsx/cisd/common/hdf5/IHDF5ContainerReader.java diff --git a/common/source/java/ch/systemsx/cisd/common/hdf5/IHDF5ContainerWriter.java b/openbis-common/source/java/ch/systemsx/cisd/common/hdf5/IHDF5ContainerWriter.java similarity index 100% rename from common/source/java/ch/systemsx/cisd/common/hdf5/IHDF5ContainerWriter.java rename to openbis-common/source/java/ch/systemsx/cisd/common/hdf5/IHDF5ContainerWriter.java diff --git a/common/source/java/ch/systemsx/cisd/common/io/hierarchical_content/AbstractHierarchicalContentNode.java b/openbis-common/source/java/ch/systemsx/cisd/common/io/hierarchical_content/AbstractHierarchicalContentNode.java similarity index 100% rename from common/source/java/ch/systemsx/cisd/common/io/hierarchical_content/AbstractHierarchicalContentNode.java rename to openbis-common/source/java/ch/systemsx/cisd/common/io/hierarchical_content/AbstractHierarchicalContentNode.java diff --git a/common/source/java/ch/systemsx/cisd/common/io/hierarchical_content/AbstractHierarchicalDirectoryContentNode.java b/openbis-common/source/java/ch/systemsx/cisd/common/io/hierarchical_content/AbstractHierarchicalDirectoryContentNode.java similarity index 100% rename from common/source/java/ch/systemsx/cisd/common/io/hierarchical_content/AbstractHierarchicalDirectoryContentNode.java rename to openbis-common/source/java/ch/systemsx/cisd/common/io/hierarchical_content/AbstractHierarchicalDirectoryContentNode.java diff --git a/common/source/java/ch/systemsx/cisd/common/io/hierarchical_content/AbstractHierarchicalFileContentNode.java b/openbis-common/source/java/ch/systemsx/cisd/common/io/hierarchical_content/AbstractHierarchicalFileContentNode.java similarity index 100% rename from common/source/java/ch/systemsx/cisd/common/io/hierarchical_content/AbstractHierarchicalFileContentNode.java rename to openbis-common/source/java/ch/systemsx/cisd/common/io/hierarchical_content/AbstractHierarchicalFileContentNode.java diff --git a/common/source/java/ch/systemsx/cisd/common/io/hierarchical_content/DefaultFileBasedHierarchicalContent.java b/openbis-common/source/java/ch/systemsx/cisd/common/io/hierarchical_content/DefaultFileBasedHierarchicalContent.java similarity index 100% rename from common/source/java/ch/systemsx/cisd/common/io/hierarchical_content/DefaultFileBasedHierarchicalContent.java rename to openbis-common/source/java/ch/systemsx/cisd/common/io/hierarchical_content/DefaultFileBasedHierarchicalContent.java diff --git a/common/source/java/ch/systemsx/cisd/common/io/hierarchical_content/DefaultFileBasedHierarchicalContentFactory.java b/openbis-common/source/java/ch/systemsx/cisd/common/io/hierarchical_content/DefaultFileBasedHierarchicalContentFactory.java similarity index 100% rename from common/source/java/ch/systemsx/cisd/common/io/hierarchical_content/DefaultFileBasedHierarchicalContentFactory.java rename to openbis-common/source/java/ch/systemsx/cisd/common/io/hierarchical_content/DefaultFileBasedHierarchicalContentFactory.java diff --git a/common/source/java/ch/systemsx/cisd/common/io/hierarchical_content/DefaultFileBasedHierarchicalContentNode.java b/openbis-common/source/java/ch/systemsx/cisd/common/io/hierarchical_content/DefaultFileBasedHierarchicalContentNode.java similarity index 100% rename from common/source/java/ch/systemsx/cisd/common/io/hierarchical_content/DefaultFileBasedHierarchicalContentNode.java rename to openbis-common/source/java/ch/systemsx/cisd/common/io/hierarchical_content/DefaultFileBasedHierarchicalContentNode.java diff --git a/common/source/java/ch/systemsx/cisd/common/io/hierarchical_content/HDF5ContainerBasedHierarchicalContentNode.java b/openbis-common/source/java/ch/systemsx/cisd/common/io/hierarchical_content/HDF5ContainerBasedHierarchicalContentNode.java similarity index 100% rename from common/source/java/ch/systemsx/cisd/common/io/hierarchical_content/HDF5ContainerBasedHierarchicalContentNode.java rename to openbis-common/source/java/ch/systemsx/cisd/common/io/hierarchical_content/HDF5ContainerBasedHierarchicalContentNode.java diff --git a/common/source/java/ch/systemsx/cisd/common/io/hierarchical_content/IHierarchicalContentFactory.java b/openbis-common/source/java/ch/systemsx/cisd/common/io/hierarchical_content/IHierarchicalContentFactory.java similarity index 100% rename from common/source/java/ch/systemsx/cisd/common/io/hierarchical_content/IHierarchicalContentFactory.java rename to openbis-common/source/java/ch/systemsx/cisd/common/io/hierarchical_content/IHierarchicalContentFactory.java diff --git a/common/source/java/ch/systemsx/cisd/common/io/hierarchical_content/IHierarchicalContentNodeFilter.java b/openbis-common/source/java/ch/systemsx/cisd/common/io/hierarchical_content/IHierarchicalContentNodeFilter.java similarity index 100% rename from common/source/java/ch/systemsx/cisd/common/io/hierarchical_content/IHierarchicalContentNodeFilter.java rename to openbis-common/source/java/ch/systemsx/cisd/common/io/hierarchical_content/IHierarchicalContentNodeFilter.java diff --git a/common/source/java/ch/systemsx/cisd/common/io/hierarchical_content/VirtualHierarchicalContent.java b/openbis-common/source/java/ch/systemsx/cisd/common/io/hierarchical_content/VirtualHierarchicalContent.java similarity index 100% rename from common/source/java/ch/systemsx/cisd/common/io/hierarchical_content/VirtualHierarchicalContent.java rename to openbis-common/source/java/ch/systemsx/cisd/common/io/hierarchical_content/VirtualHierarchicalContent.java diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/hdf5/FileToHDF5DuplicationVerifier.java b/openbis-common/sourceTest/java/ch/systemsx/cisd/common/hdf5/FileToHDF5DuplicationVerifier.java similarity index 100% rename from common/sourceTest/java/ch/systemsx/cisd/common/hdf5/FileToHDF5DuplicationVerifier.java rename to openbis-common/sourceTest/java/ch/systemsx/cisd/common/hdf5/FileToHDF5DuplicationVerifier.java diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/hdf5/HDF5ContainerTest.java b/openbis-common/sourceTest/java/ch/systemsx/cisd/common/hdf5/HDF5ContainerTest.java similarity index 100% rename from common/sourceTest/java/ch/systemsx/cisd/common/hdf5/HDF5ContainerTest.java rename to openbis-common/sourceTest/java/ch/systemsx/cisd/common/hdf5/HDF5ContainerTest.java diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/hdf5/HierarchicalStructureDuplicatorFileToHDF5Test.java b/openbis-common/sourceTest/java/ch/systemsx/cisd/common/hdf5/HierarchicalStructureDuplicatorFileToHDF5Test.java similarity index 100% rename from common/sourceTest/java/ch/systemsx/cisd/common/hdf5/HierarchicalStructureDuplicatorFileToHDF5Test.java rename to openbis-common/sourceTest/java/ch/systemsx/cisd/common/hdf5/HierarchicalStructureDuplicatorFileToHDF5Test.java diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/hdf5/basic-file-structure/file0.txt b/openbis-common/sourceTest/java/ch/systemsx/cisd/common/hdf5/basic-file-structure/file0.txt similarity index 100% rename from common/sourceTest/java/ch/systemsx/cisd/common/hdf5/basic-file-structure/file0.txt rename to openbis-common/sourceTest/java/ch/systemsx/cisd/common/hdf5/basic-file-structure/file0.txt diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/hdf5/basic-file-structure/sub-folder1/file1.txt b/openbis-common/sourceTest/java/ch/systemsx/cisd/common/hdf5/basic-file-structure/sub-folder1/file1.txt similarity index 100% rename from common/sourceTest/java/ch/systemsx/cisd/common/hdf5/basic-file-structure/sub-folder1/file1.txt rename to openbis-common/sourceTest/java/ch/systemsx/cisd/common/hdf5/basic-file-structure/sub-folder1/file1.txt diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/hdf5/basic-file-structure/sub-folder1/subfolder2/file2.txt b/openbis-common/sourceTest/java/ch/systemsx/cisd/common/hdf5/basic-file-structure/sub-folder1/subfolder2/file2.txt similarity index 100% rename from common/sourceTest/java/ch/systemsx/cisd/common/hdf5/basic-file-structure/sub-folder1/subfolder2/file2.txt rename to openbis-common/sourceTest/java/ch/systemsx/cisd/common/hdf5/basic-file-structure/sub-folder1/subfolder2/file2.txt diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/hdf5/file-structure-with-links/file0.txt b/openbis-common/sourceTest/java/ch/systemsx/cisd/common/hdf5/file-structure-with-links/file0.txt similarity index 100% rename from common/sourceTest/java/ch/systemsx/cisd/common/hdf5/file-structure-with-links/file0.txt rename to openbis-common/sourceTest/java/ch/systemsx/cisd/common/hdf5/file-structure-with-links/file0.txt diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/hdf5/file-structure-with-links/file1.txt b/openbis-common/sourceTest/java/ch/systemsx/cisd/common/hdf5/file-structure-with-links/file1.txt similarity index 100% rename from common/sourceTest/java/ch/systemsx/cisd/common/hdf5/file-structure-with-links/file1.txt rename to openbis-common/sourceTest/java/ch/systemsx/cisd/common/hdf5/file-structure-with-links/file1.txt diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/io/hierarchical_content/AbstractHierarchicalContentNodeTest.java b/openbis-common/sourceTest/java/ch/systemsx/cisd/common/io/hierarchical_content/AbstractHierarchicalContentNodeTest.java similarity index 100% rename from common/sourceTest/java/ch/systemsx/cisd/common/io/hierarchical_content/AbstractHierarchicalContentNodeTest.java rename to openbis-common/sourceTest/java/ch/systemsx/cisd/common/io/hierarchical_content/AbstractHierarchicalContentNodeTest.java diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/io/hierarchical_content/DefaultFileBasedHierarchicalContentFactoryTest.java b/openbis-common/sourceTest/java/ch/systemsx/cisd/common/io/hierarchical_content/DefaultFileBasedHierarchicalContentFactoryTest.java similarity index 100% rename from common/sourceTest/java/ch/systemsx/cisd/common/io/hierarchical_content/DefaultFileBasedHierarchicalContentFactoryTest.java rename to openbis-common/sourceTest/java/ch/systemsx/cisd/common/io/hierarchical_content/DefaultFileBasedHierarchicalContentFactoryTest.java diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/io/hierarchical_content/DefaultFileBasedHierarchicalContentTest.java b/openbis-common/sourceTest/java/ch/systemsx/cisd/common/io/hierarchical_content/DefaultFileBasedHierarchicalContentTest.java similarity index 100% rename from common/sourceTest/java/ch/systemsx/cisd/common/io/hierarchical_content/DefaultFileBasedHierarchicalContentTest.java rename to openbis-common/sourceTest/java/ch/systemsx/cisd/common/io/hierarchical_content/DefaultFileBasedHierarchicalContentTest.java diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/io/hierarchical_content/HDF5ContainerBasedHierarchicalContentNodeTest.java b/openbis-common/sourceTest/java/ch/systemsx/cisd/common/io/hierarchical_content/HDF5ContainerBasedHierarchicalContentNodeTest.java similarity index 100% rename from common/sourceTest/java/ch/systemsx/cisd/common/io/hierarchical_content/HDF5ContainerBasedHierarchicalContentNodeTest.java rename to openbis-common/sourceTest/java/ch/systemsx/cisd/common/io/hierarchical_content/HDF5ContainerBasedHierarchicalContentNodeTest.java diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/io/hierarchical_content/VirtualHierarchicalContentTest.java b/openbis-common/sourceTest/java/ch/systemsx/cisd/common/io/hierarchical_content/VirtualHierarchicalContentTest.java similarity index 100% rename from common/sourceTest/java/ch/systemsx/cisd/common/io/hierarchical_content/VirtualHierarchicalContentTest.java rename to openbis-common/sourceTest/java/ch/systemsx/cisd/common/io/hierarchical_content/VirtualHierarchicalContentTest.java diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/io/hierarchical_content/VirtualNodeMergingTest.java b/openbis-common/sourceTest/java/ch/systemsx/cisd/common/io/hierarchical_content/VirtualNodeMergingTest.java similarity index 100% rename from common/sourceTest/java/ch/systemsx/cisd/common/io/hierarchical_content/VirtualNodeMergingTest.java rename to openbis-common/sourceTest/java/ch/systemsx/cisd/common/io/hierarchical_content/VirtualNodeMergingTest.java diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/io/hierarchical_content/VirtualNodeTest.java b/openbis-common/sourceTest/java/ch/systemsx/cisd/common/io/hierarchical_content/VirtualNodeTest.java similarity index 100% rename from common/sourceTest/java/ch/systemsx/cisd/common/io/hierarchical_content/VirtualNodeTest.java rename to openbis-common/sourceTest/java/ch/systemsx/cisd/common/io/hierarchical_content/VirtualNodeTest.java diff --git a/openbis-common/sourceTest/java/ch/systemsx/cisd/etlserver/.gitignore b/openbis-common/sourceTest/java/ch/systemsx/cisd/etlserver/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391