From 3b87251c679d61bb7d5895bcf62e00d17eff0506 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 4 Oct 2012 17:32:24 +0000 Subject: [PATCH] Rename property git-svn-id: https://svn.argeo.org/commons/trunk@5589 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../java/org/argeo/server/backup/SystemBackup.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/backup/SystemBackup.java b/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/backup/SystemBackup.java index 92b38c50b..54bb29384 100644 --- a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/backup/SystemBackup.java +++ b/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/backup/SystemBackup.java @@ -29,7 +29,7 @@ public class SystemBackup implements Runnable { private UserAuthenticator userAuthenticator = null; private String backupsBase; - private String name; + private String systemName; private List atomicBackups = new ArrayList(); private BackupPurge backupPurge = new SimpleBackupPurge(); @@ -43,7 +43,7 @@ public class SystemBackup implements Runnable { List failures = new ArrayList(); SimpleBackupContext backupContext = new SimpleBackupContext( - fileSystemManager, backupsBase, name); + fileSystemManager, backupsBase, systemName); // purge older backups FileSystemOptions opts = new FileSystemOptions(); @@ -56,7 +56,7 @@ public class SystemBackup implements Runnable { try { - backupPurge.purge(fileSystemManager, backupsBase, name, + backupPurge.purge(fileSystemManager, backupsBase, systemName, backupContext.getDateFormat(), opts); } catch (Exception e) { failures.add(e.getMessage()); @@ -87,7 +87,7 @@ public class SystemBackup implements Runnable { FileSystemOptions remoteOpts = new FileSystemOptions(); DefaultFileSystemConfigBuilder.getInstance() .setUserAuthenticator(remoteOpts, auth); - backupPurge.purge(fileSystemManager, remoteBase, name, + backupPurge.purge(fileSystemManager, remoteBase, systemName, backupContext.getDateFormat(), remoteOpts); localBaseFo = fileSystemManager.resolveFile(backupsBase + '/' @@ -127,8 +127,8 @@ public class SystemBackup implements Runnable { this.backupsBase = backupsBase; } - public void setName(String name) { - this.name = name; + public void setSystemName(String name) { + this.systemName = name; } public void setAtomicBackups(List atomicBackups) { @@ -154,7 +154,7 @@ public class SystemBackup implements Runnable { fsm.init(); SystemBackup systemBackup = new SystemBackup(); - systemBackup.setName("mySystem"); + systemBackup.setSystemName("mySystem"); systemBackup .setBackupsBase("/home/mbaudier/dev/src/commons/server/runtime/org.argeo.server.core/target"); systemBackup.setFileSystemManager(fsm); -- 2.30.2