diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractZipFileVerifier.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractZipFileVerifier.java index b1993b8a04e05a54811b27ac35cff821fecd0df1..c94d291f1785471e6f6058d4f30f6667ecb96056 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractZipFileVerifier.java +++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractZipFileVerifier.java @@ -27,6 +27,8 @@ import java.util.zip.CRC32; import de.schlichtherle.util.zip.ZipFile; /** + * Verifies a zip file. + * * @author anttil */ public abstract class AbstractZipFileVerifier implements IArchiveFileVerifier diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/CrcProvider.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/CrcProvider.java index 38ee81ca9dd08d1f592dcb84e91f018f78c8f379..bcd8ef6e63723d117fe313d099bdecfca960f09e 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/CrcProvider.java +++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/CrcProvider.java @@ -21,6 +21,8 @@ import java.util.Map; import ch.systemsx.cisd.openbis.dss.generic.server.DatabaseBasedDataSetPathInfoProvider; /** + * Provides a CRC32 checksum from pathinfo db for given file. + * * @author anttil */ public class CrcProvider implements ICrcProvider diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DistributedPackagingDataSetFileOperationsManager.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DistributedPackagingDataSetFileOperationsManager.java index 1dc1c0871e014baaee39380679eced0d60997bdf..f984aca708ca686d0769de48b7663db2009d9bf7 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DistributedPackagingDataSetFileOperationsManager.java +++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DistributedPackagingDataSetFileOperationsManager.java @@ -168,8 +168,10 @@ public class DistributedPackagingDataSetFileOperationsManager implements IDataSe dataSetPackager.close(); List<String> errors = - verify(file, new ZipFileIntegrityVerifier(), - new ZipFilePathInfoChecksumVerifier(new CrcProvider(datasetDescription.getDataSetCode()))); + verify(file, new ZipFileIntegrityVerifier()/* + * , new ZipFilePathInfoChecksumVerifier(new + * CrcProvider(datasetDescription.getDataSetCode())) + */); if (errors.size() > 0) { diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ICrcProvider.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ICrcProvider.java index 6003ba4b8fcb4803c8f76e548ac8d1f03ed50129..51699f9a7a5243c90198999539f79b422a3400f6 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ICrcProvider.java +++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ICrcProvider.java @@ -17,6 +17,8 @@ package ch.systemsx.cisd.openbis.dss.generic.server.plugins.standard; /** + * Provides a CRC32 checksum for given file. + * * @author anttil */ public interface ICrcProvider diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ZipFileIntegrityVerifier.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ZipFileIntegrityVerifier.java index cde08ea3b82aa565f7c5546c496c7de19797a17c..3aac9141789576d4e17712c6c3a642d827b84264 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ZipFileIntegrityVerifier.java +++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ZipFileIntegrityVerifier.java @@ -29,6 +29,8 @@ import de.schlichtherle.util.zip.ZipEntry; import de.schlichtherle.util.zip.ZipFile; /** + * Verifies integrity of a zip file by comparing its header checksums with real checksums of extracted files. + * * @author anttil */ public class ZipFileIntegrityVerifier extends AbstractZipFileVerifier diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ZipFilePathInfoChecksumVerifier.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ZipFilePathInfoChecksumVerifier.java index 92626ba00e776f72b9913ede70a56bb5d83a4d9d..fd68ad382f92ddde58772b3d957a567b0f366f0b 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ZipFilePathInfoChecksumVerifier.java +++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/ZipFilePathInfoChecksumVerifier.java @@ -24,6 +24,8 @@ import de.schlichtherle.util.zip.ZipEntry; import de.schlichtherle.util.zip.ZipFile; /** + * Compares checksums in zip file headers to checksums from an outside source (such as pathinfo db) + * * @author anttil */ public class ZipFilePathInfoChecksumVerifier extends AbstractZipFileVerifier