diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDatasetArchiver.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiver.java
similarity index 97%
rename from datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDatasetArchiver.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiver.java
index b4134f3fe8c43f0ad6685aa1632bdd388e903bb1..54efc79116a95dfe81ea636fe58ad2f6f8a06878 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDatasetArchiver.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiver.java
@@ -36,12 +36,12 @@ import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.AbstractArch
import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.RsyncArchiveCopierFactory;
import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.RsyncArchiver;
import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.SshCommandExecutorFactory;
+import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver.dataaccess.IMultiDataSetArchiverDBTransaction;
import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver.dataaccess.IMultiDataSetArchiverReadonlyQueryDAO;
-import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver.dataaccess.IMultiDatasetArchiverDBTransaction;
import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver.dataaccess.MultiDataSetArchiverContainerDTO;
+import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver.dataaccess.MultiDataSetArchiverDBTransaction;
import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver.dataaccess.MultiDataSetArchiverDataSetDTO;
-import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver.dataaccess.MultiDatasetArchiverDBTransaction;
-import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver.dataaccess.MultiDatasetArchiverDataSourceUtil;
+import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver.dataaccess.MultiDataSetArchiverDataSourceUtil;
import ch.systemsx.cisd.openbis.dss.generic.shared.ArchiverTaskContext;
import ch.systemsx.cisd.openbis.dss.generic.shared.IShareFinder;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.AbstractExternalData;
@@ -52,7 +52,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.DatasetDescription;
/**
* @author Jakub Straszewski
*/
-public class MultiDatasetArchiver extends AbstractArchiverProcessingPlugin
+public class MultiDataSetArchiver extends AbstractArchiverProcessingPlugin
{
private static final long serialVersionUID = 1L;
@@ -89,11 +89,11 @@ public class MultiDatasetArchiver extends AbstractArchiverProcessingPlugin
public static final Long DEFAULT_MAXIMUM_CONTAINER_SIZE_IN_BYTES = 80L * 1024 * 1024 * 1024;
- private transient IMultiDatasetArchiverDBTransaction transaction;
+ private transient IMultiDataSetArchiverDBTransaction transaction;
private transient IMultiDataSetArchiverReadonlyQueryDAO readonlyQuery;
- public MultiDatasetArchiver(Properties properties, File storeRoot)
+ public MultiDataSetArchiver(Properties properties, File storeRoot)
{
super(properties, storeRoot, null, null);
this.minimumContainerSize = PropertyUtils.getLong(properties, MINIMUM_CONTAINER_SIZE_IN_BYTES, DEFAULT_MINIMUM_CONTAINER_SIZE_IN_BYTES);
@@ -478,11 +478,11 @@ public class MultiDatasetArchiver extends AbstractArchiverProcessingPlugin
}
@Private
- IMultiDatasetArchiverDBTransaction getTransaction()
+ IMultiDataSetArchiverDBTransaction getTransaction()
{
if (transaction == null)
{
- transaction = new MultiDatasetArchiverDBTransaction();
+ transaction = new MultiDataSetArchiverDBTransaction();
}
return transaction;
}
@@ -491,7 +491,7 @@ public class MultiDatasetArchiver extends AbstractArchiverProcessingPlugin
{
if (readonlyQuery == null)
{
- readonlyQuery = MultiDatasetArchiverDataSourceUtil.getReadonlyQueryDAO();
+ readonlyQuery = MultiDataSetArchiverDataSourceUtil.getReadonlyQueryDAO();
}
return readonlyQuery;
}
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/IMultiDatasetArchiverDBTransaction.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/IMultiDataSetArchiverDBTransaction.java
similarity index 96%
rename from datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/IMultiDatasetArchiverDBTransaction.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/IMultiDataSetArchiverDBTransaction.java
index bf86efbe9a7b1f030f585136fb3158f107d27cd5..827935488009aedc34705b095db2c463b82ed099 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/IMultiDatasetArchiverDBTransaction.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/IMultiDataSetArchiverDBTransaction.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.DatasetDescription;
/**
* @author Franz-Josef Elmer
*/
-public interface IMultiDatasetArchiverDBTransaction
+public interface IMultiDataSetArchiverDBTransaction
{
public List<MultiDataSetArchiverDataSetDTO> getDataSetsForContainer(MultiDataSetArchiverContainerDTO container);
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/MultiDatasetArchiverDBTransaction.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/MultiDataSetArchiverDBTransaction.java
similarity index 93%
rename from datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/MultiDatasetArchiverDBTransaction.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/MultiDataSetArchiverDBTransaction.java
index 191e77f3796147bff89c3fda51870754d2689794..d3bc07260016b8f74ce4843f5cda927660e20d90 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/MultiDatasetArchiverDBTransaction.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/MultiDataSetArchiverDBTransaction.java
@@ -23,14 +23,14 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.DatasetDescription;
/**
* @author Jakub Straszewski
*/
-public class MultiDatasetArchiverDBTransaction implements IMultiDatasetArchiverDBTransaction
+public class MultiDataSetArchiverDBTransaction implements IMultiDataSetArchiverDBTransaction
{
private IMultiDataSetArchiverQueryDAO transaction;
- public MultiDatasetArchiverDBTransaction()
+ public MultiDataSetArchiverDBTransaction()
{
- this.transaction = MultiDatasetArchiverDataSourceUtil.getTransactionalQuery();
+ this.transaction = MultiDataSetArchiverDataSourceUtil.getTransactionalQuery();
}
@Override
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/MultiDatasetArchiverDataSourceUtil.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/MultiDataSetArchiverDataSourceUtil.java
similarity index 96%
rename from datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/MultiDatasetArchiverDataSourceUtil.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/MultiDataSetArchiverDataSourceUtil.java
index 2dcf48d0c8c0ac1df551a5a3e5b21ab4a12910ff..0a166cf14f7a07040c581b9b60e6c07071cf71cc 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/MultiDatasetArchiverDataSourceUtil.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/dataaccess/MultiDataSetArchiverDataSourceUtil.java
@@ -25,7 +25,7 @@ import ch.systemsx.cisd.openbis.dss.generic.shared.ServiceProvider;
/**
* @author Jakub Straszewski
*/
-public class MultiDatasetArchiverDataSourceUtil
+public class MultiDataSetArchiverDataSourceUtil
{
private static DataSource dataSource = ServiceProvider.getDataSourceProvider().getDataSource("multi-dataset-archiver-db");
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDatasetArchiverTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiverTest.java
similarity index 95%
rename from datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDatasetArchiverTest.java
rename to datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiverTest.java
index 213155e3822902702859bbd806267acb6df87df1..4daa97757a42ab1b2fa477d59675cd647e6d99fe 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDatasetArchiverTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/archiver/MultiDataSetArchiverTest.java
@@ -16,10 +16,10 @@
package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver;
+import static ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver.MultiDataSetArchiver.MAXIMUM_CONTAINER_SIZE_IN_BYTES;
+import static ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver.MultiDataSetArchiver.MINIMUM_CONTAINER_SIZE_IN_BYTES;
import static ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver.MultiDataSetFileOperationsManager.FINAL_DESTINATION_KEY;
import static ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver.MultiDataSetFileOperationsManager.STAGING_DESTINATION_KEY;
-import static ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver.MultiDatasetArchiver.MAXIMUM_CONTAINER_SIZE_IN_BYTES;
-import static ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver.MultiDatasetArchiver.MINIMUM_CONTAINER_SIZE_IN_BYTES;
import java.io.BufferedReader;
import java.io.File;
@@ -51,8 +51,8 @@ import ch.systemsx.cisd.common.time.TimingParameters;
import ch.systemsx.cisd.openbis.common.io.hierarchical_content.TarBasedHierarchicalContent;
import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchicalContentNode;
import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.MockDataSetDirectoryProvider;
+import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver.dataaccess.IMultiDataSetArchiverDBTransaction;
import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver.dataaccess.IMultiDataSetArchiverReadonlyQueryDAO;
-import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver.dataaccess.IMultiDatasetArchiverDBTransaction;
import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver.dataaccess.MultiDataSetArchiverContainerDTO;
import ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard.archiver.dataaccess.MultiDataSetArchiverDataSetDTO;
import ch.systemsx.cisd.openbis.dss.generic.shared.ArchiverTaskContext;
@@ -78,8 +78,8 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ExperimentIdentifi
/**
* @author Franz-Josef Elmer
*/
-@Friend(toClasses = MultiDatasetArchiver.class)
-public class MultiDatasetArchiverTest extends AbstractFileSystemTestCase
+@Friend(toClasses = MultiDataSetArchiver.class)
+public class MultiDataSetArchiverTest extends AbstractFileSystemTestCase
{
private static final class RecordingStatusUpdater implements IDataSetStatusUpdater
{
@@ -99,7 +99,7 @@ public class MultiDatasetArchiverTest extends AbstractFileSystemTestCase
}
}
- private static final class MockMultiDatasetArchiverDBTransaction implements IMultiDatasetArchiverDBTransaction
+ private static final class MockMultiDataSetArchiverDBTransaction implements IMultiDataSetArchiverDBTransaction
{
private int id;
@@ -198,19 +198,19 @@ public class MultiDatasetArchiverTest extends AbstractFileSystemTestCase
}
- private static final class MockMultiDatasetArchiver extends MultiDatasetArchiver
+ private static final class MockMultiDataSetArchiver extends MultiDataSetArchiver
{
private static final long serialVersionUID = 1L;
- private IMultiDatasetArchiverDBTransaction transaction;
+ private IMultiDataSetArchiverDBTransaction transaction;
private IMultiDataSetFileOperationsManager fileManager;
private IMultiDataSetArchiverReadonlyQueryDAO readonlyDAO;
- public MockMultiDatasetArchiver(Properties properties, File storeRoot,
+ public MockMultiDataSetArchiver(Properties properties, File storeRoot,
IEncapsulatedOpenBISService openBISService, IShareIdManager shareIdManager,
- IDataSetStatusUpdater statusUpdater, IMultiDatasetArchiverDBTransaction transaction,
+ IDataSetStatusUpdater statusUpdater, IMultiDataSetArchiverDBTransaction transaction,
IMultiDataSetFileOperationsManager fileManager, IMultiDataSetArchiverReadonlyQueryDAO readonlyDAO)
{
super(properties, storeRoot);
@@ -228,7 +228,7 @@ public class MultiDatasetArchiverTest extends AbstractFileSystemTestCase
}
@Override
- IMultiDatasetArchiverDBTransaction getTransaction()
+ IMultiDataSetArchiverDBTransaction getTransaction()
{
return transaction;
}
@@ -246,7 +246,7 @@ public class MultiDatasetArchiverTest extends AbstractFileSystemTestCase
private Mockery context;
- private IMultiDatasetArchiverDBTransaction transaction;
+ private IMultiDataSetArchiverDBTransaction transaction;
private IMultiDataSetArchiverReadonlyQueryDAO readonlyDAO;
@@ -292,7 +292,7 @@ public class MultiDatasetArchiverTest extends AbstractFileSystemTestCase
public void setUpTestEnvironment()
{
logRecorder = new BufferedAppender("%-5p %c - %m%n", Level.INFO, "OPERATION.*");
- transaction = new MockMultiDatasetArchiverDBTransaction();
+ transaction = new MockMultiDataSetArchiverDBTransaction();
store = new File(workingDirectory, "store");
share = new File(store, "1");
share.mkdirs();
@@ -361,7 +361,7 @@ public class MultiDatasetArchiverTest extends AbstractFileSystemTestCase
prepareUpdateShareIdAndSize(ds2, 20);
properties.setProperty(MINIMUM_CONTAINER_SIZE_IN_BYTES, "35");
- MultiDatasetArchiver archiver = createArchiver(null);
+ MultiDataSetArchiver archiver = createArchiver(null);
ProcessingStatus status = archiver.archive(Arrays.asList(ds1, ds2), archiverContext, false);
assertEquals("[ERROR: \"Set of data sets specified for archiving is too small (30 bytes) "
@@ -380,7 +380,7 @@ public class MultiDatasetArchiverTest extends AbstractFileSystemTestCase
properties.setProperty(MINIMUM_CONTAINER_SIZE_IN_BYTES, "25");
properties.setProperty(MAXIMUM_CONTAINER_SIZE_IN_BYTES, "27");
- MultiDatasetArchiver archiver = createArchiver(null);
+ MultiDataSetArchiver archiver = createArchiver(null);
ProcessingStatus status = archiver.archive(Arrays.asList(ds1, ds2), archiverContext, false);
assertEquals("[ERROR: \"Set of data sets specified for archiving is too big (30 bytes) "
@@ -398,7 +398,7 @@ public class MultiDatasetArchiverTest extends AbstractFileSystemTestCase
prepareLockAndReleaseDataSet(ds2);
properties.setProperty(MINIMUM_CONTAINER_SIZE_IN_BYTES, "15");
- MultiDatasetArchiver archiver = createArchiver(null);
+ MultiDataSetArchiver archiver = createArchiver(null);
ProcessingStatus status = archiver.archive(Arrays.asList(ds2), archiverContext, false);
assertEquals("INFO OPERATION.AbstractDatastorePlugin - "
@@ -444,7 +444,7 @@ public class MultiDatasetArchiverTest extends AbstractFileSystemTestCase
prepareLockAndReleaseDataSet(ds2);
properties.setProperty(MINIMUM_CONTAINER_SIZE_IN_BYTES, "15");
- MultiDatasetArchiver archiver = createArchiver(null);
+ MultiDataSetArchiver archiver = createArchiver(null);
ProcessingStatus status = archiver.archive(Arrays.asList(ds1, ds2), archiverContext, false);
assertEquals("INFO OPERATION.AbstractDatastorePlugin - "
@@ -509,7 +509,7 @@ public class MultiDatasetArchiverTest extends AbstractFileSystemTestCase
ds2.setDataSetSize(20L);
transaction.insertDataset(ds2, container);
- MultiDatasetArchiver archiver = createArchiver(null);
+ MultiDataSetArchiver archiver = createArchiver(null);
ProcessingStatus status = archiver.archive(Arrays.asList(ds2), archiverContext, false);
assertEquals("INFO OPERATION.AbstractDatastorePlugin - "
@@ -535,7 +535,7 @@ public class MultiDatasetArchiverTest extends AbstractFileSystemTestCase
transaction.insertDataset(ds2, container);
prepareScheduleDeletion(ds1, ds2);
- MultiDatasetArchiver archiver = createArchiver(null);
+ MultiDataSetArchiver archiver = createArchiver(null);
ProcessingStatus status = archiver.archive(Arrays.asList(ds1, ds2), archiverContext, true);
assertEquals("INFO OPERATION.AbstractDatastorePlugin - "
@@ -591,7 +591,7 @@ public class MultiDatasetArchiverTest extends AbstractFileSystemTestCase
});
prepareFileOperationsDelete(containerPath);
- MultiDatasetArchiver archiver = createArchiver(fileOperations);
+ MultiDataSetArchiver archiver = createArchiver(fileOperations);
ProcessingStatus status = archiver.archive(Arrays.asList(ds2), archiverContext, false);
assertEquals("[ERROR: \"Archiving failed to calculate dataset sizes:Oohps!\"]", status.getErrorStatuses().toString());
@@ -710,9 +710,9 @@ public class MultiDatasetArchiverTest extends AbstractFileSystemTestCase
});
}
- private MultiDatasetArchiver createArchiver(IMultiDataSetFileOperationsManager fileManagerOrNull)
+ private MultiDataSetArchiver createArchiver(IMultiDataSetFileOperationsManager fileManagerOrNull)
{
- return new MockMultiDatasetArchiver(properties, store, openBISService, shareIdManager, statusUpdater,
+ return new MockMultiDataSetArchiver(properties, store, openBISService, shareIdManager, statusUpdater,
transaction, fileManagerOrNull, readonlyDAO);
}