From f7ffe2a3693df148f80f2053820f9ff25787865e Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sun, 31 Jan 2021 09:20:33 +0100 Subject: [PATCH] Use latest Argeo Commons. --- .../backup/vfs/AbstractAtomicBackup.java | 1 - .../backup/vfs/BackupFileSystemManager.java | 1 - .../backup/vfs/MaintenanceException.java | 15 +++++++++++++++ .../maintenance/backup/vfs/OpenLdapBackup.java | 1 - .../maintenance/backup/vfs/OsCallBackup.java | 1 - .../maintenance/backup/vfs/SimpleBackupPurge.java | 1 - .../maintenance/backup/vfs/SystemBackup.java | 1 - cms/pom.xml | 2 +- legacy/pom.xml | 2 +- pom.xml | 2 +- rcp/pom.xml | 2 +- 11 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/MaintenanceException.java diff --git a/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/AbstractAtomicBackup.java b/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/AbstractAtomicBackup.java index 78c0e75dc..9ef7b0a7c 100644 --- a/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/AbstractAtomicBackup.java +++ b/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/AbstractAtomicBackup.java @@ -4,7 +4,6 @@ import org.apache.commons.vfs2.FileObject; import org.apache.commons.vfs2.FileSystemManager; import org.apache.commons.vfs2.FileSystemOptions; import org.apache.commons.vfs2.provider.sftp.SftpFileSystemConfigBuilder; -import org.argeo.maintenance.MaintenanceException; /** * Simplify atomic backups implementation, especially by managing VFS. diff --git a/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/BackupFileSystemManager.java b/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/BackupFileSystemManager.java index 9c5f2f09a..5651b0722 100644 --- a/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/BackupFileSystemManager.java +++ b/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/BackupFileSystemManager.java @@ -9,7 +9,6 @@ import org.apache.commons.vfs2.provider.local.DefaultLocalFileProvider; import org.apache.commons.vfs2.provider.ram.RamFileProvider; import org.apache.commons.vfs2.provider.sftp.SftpFileProvider; import org.apache.commons.vfs2.provider.url.UrlFileProvider; -import org.argeo.maintenance.MaintenanceException; /** * Programatically configured VFS file system manager which can be declared as a diff --git a/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/MaintenanceException.java b/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/MaintenanceException.java new file mode 100644 index 000000000..b0232b656 --- /dev/null +++ b/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/MaintenanceException.java @@ -0,0 +1,15 @@ +package org.argeo.maintenance.backup.vfs; + +@Deprecated +class MaintenanceException extends RuntimeException { + private static final long serialVersionUID = -5770049663929537270L; + + public MaintenanceException(String message, Throwable cause) { + super(message, cause); + } + + public MaintenanceException(String message) { + super(message); + } + +} diff --git a/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/OpenLdapBackup.java b/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/OpenLdapBackup.java index 60e17a98c..fb3bdf163 100644 --- a/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/OpenLdapBackup.java +++ b/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/OpenLdapBackup.java @@ -1,7 +1,6 @@ package org.argeo.maintenance.backup.vfs; import org.apache.commons.vfs2.FileObject; -import org.argeo.maintenance.MaintenanceException; /** Backups an OpenLDAP server using slapcat */ public class OpenLdapBackup extends OsCallBackup { diff --git a/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/OsCallBackup.java b/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/OsCallBackup.java index afd4783fd..c8f20bd7e 100644 --- a/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/OsCallBackup.java +++ b/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/OsCallBackup.java @@ -15,7 +15,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.commons.vfs2.FileContent; import org.apache.commons.vfs2.FileObject; -import org.argeo.maintenance.MaintenanceException; /** * Runs an OS command and save its standard output as a file. Typically used for diff --git a/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/SimpleBackupPurge.java b/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/SimpleBackupPurge.java index 2d4abaa97..6e747019b 100644 --- a/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/SimpleBackupPurge.java +++ b/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/SimpleBackupPurge.java @@ -14,7 +14,6 @@ import org.apache.commons.vfs2.FileObject; import org.apache.commons.vfs2.FileSystemManager; import org.apache.commons.vfs2.FileSystemOptions; import org.apache.commons.vfs2.Selectors; -import org.argeo.maintenance.MaintenanceException; /** Simple backup purge which keeps backups only for a given number of days */ public class SimpleBackupPurge implements BackupPurge { diff --git a/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/SystemBackup.java b/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/SystemBackup.java index 331b77613..a70267844 100644 --- a/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/SystemBackup.java +++ b/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/SystemBackup.java @@ -14,7 +14,6 @@ import org.apache.commons.vfs2.FileSystemOptions; import org.apache.commons.vfs2.Selectors; import org.apache.commons.vfs2.UserAuthenticator; import org.apache.commons.vfs2.impl.DefaultFileSystemConfigBuilder; -import org.argeo.maintenance.MaintenanceException; import org.argeo.util.LangUtils; /** diff --git a/cms/pom.xml b/cms/pom.xml index 86fcdc9a6..4864e5e44 100644 --- a/cms/pom.xml +++ b/cms/pom.xml @@ -15,7 +15,7 @@ 2.1.27 2.1.13 - 2.1.90-SNAPSHOT + 2.1.91-SNAPSHOT 2.1.17-SNAPSHOT 2015-02-12 diff --git a/legacy/pom.xml b/legacy/pom.xml index 38cdd0c51..2a7f16168 100644 --- a/legacy/pom.xml +++ b/legacy/pom.xml @@ -15,7 +15,7 @@ 2.1.27 2.1.13 - 2.1.89-SNAPSHOT + 2.1.91-SNAPSHOT org.argeo.legacy.fake.java8 diff --git a/pom.xml b/pom.xml index f98f3006b..992346450 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ 2.1.27 2.1.13 - 2.1.90-SNAPSHOT + 2.1.91-SNAPSHOT 2.1.17-SNAPSHOT 2015-02-12 diff --git a/rcp/pom.xml b/rcp/pom.xml index 0fb86d23f..285aa73a3 100644 --- a/rcp/pom.xml +++ b/rcp/pom.xml @@ -16,7 +16,7 @@ 2.1.27 2.1.13 - 2.1.90-SNAPSHOT + 2.1.91-SNAPSHOT org.argeo.minidesktop -- 2.39.2