[exo-jcr-commits] exo-jcr SVN: r3249 - in jcr/trunk/exo.jcr.component.ext/src: main/java/org/exoplatform/services/jcr/ext/backup/impl and 1 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Wed Oct 6 03:47:53 EDT 2010
Author: areshetnyak
Date: 2010-10-06 03:47:53 -0400 (Wed, 06 Oct 2010)
New Revision: 3249
Modified:
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/ExtendedBackupManager.java
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java
jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/TestBackupManager.java
Log:
EXOJCR-747 : Make backup restore easier implementation.
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/ExtendedBackupManager.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/ExtendedBackupManager.java 2010-10-06 06:56:19 UTC (rev 3248)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/ExtendedBackupManager.java 2010-10-06 07:47:53 UTC (rev 3249)
@@ -30,7 +30,7 @@
public interface ExtendedBackupManager extends BackupManager
{
/**
- * Restore existed workspace. Previous data will be deleted.
+ * Restore existing workspace. Previous data will be deleted.
* For getting status of workspace restore can use
* BackupManager.getLastRestore(String repositoryName, String workspaceName) method
*
@@ -45,11 +45,11 @@
* @throws BackupConfigurationException
* if configuration exception occurred
*/
- void restoreExistedWorkspace(String workspaceBackupIdentifier, String repositoryName, WorkspaceEntry workspaceEntry,
+ void restoreExistingWorkspace(String workspaceBackupIdentifier, String repositoryName, WorkspaceEntry workspaceEntry,
boolean asynchronous) throws BackupOperationException, BackupConfigurationException;
/**
- * Restore existed workspace. Previous data will be deleted.
+ * Restore existing workspace. Previous data will be deleted.
* For getting status of workspace restore can use
* BackupManager.getLastRestore(String repositoryName, String workspaceName) method
*
@@ -64,10 +64,10 @@
* @throws BackupConfigurationException
* if configuration exception occurred
*/
- void restoreExistedWorkspace(BackupChainLog log, String repositoryName, WorkspaceEntry workspaceEntry, boolean asynchronous) throws BackupOperationException, BackupConfigurationException;
+ void restoreExistingWorkspace(BackupChainLog log, String repositoryName, WorkspaceEntry workspaceEntry, boolean asynchronous) throws BackupOperationException, BackupConfigurationException;
/**
- * Restore existed repository. Previous data will be deleted.
+ * Restore existing repository. Previous data will be deleted.
* For getting status of repository restore can use
* BackupManager.getLastRestore(String repositoryName) method
*
@@ -82,10 +82,10 @@
* @throws BackupConfigurationException
* if configuration exception occurred
*/
- void restoreExistedRepository(String repositoryBackupIdentifier, RepositoryEntry repositoryEntry, boolean asynchronous) throws BackupOperationException, BackupConfigurationException;
+ void restoreExistingRepository(String repositoryBackupIdentifier, RepositoryEntry repositoryEntry, boolean asynchronous) throws BackupOperationException, BackupConfigurationException;
/**
- * Restore existed repository. Previous data will be deleted.
+ * Restore existing repository. Previous data will be deleted.
* For getting status of repository restore can use
* BackupManager.getLastRestore(String repositoryName) method
*
@@ -100,7 +100,7 @@
* @throws BackupConfigurationException
* if configuration exception occurred
*/
- void restoreExistedRepository(RepositoryBackupChainLog log, RepositoryEntry repositoryEntry, boolean asynchronous)
+ void restoreExistingRepository(RepositoryBackupChainLog log, RepositoryEntry repositoryEntry, boolean asynchronous)
throws BackupOperationException, BackupConfigurationException;
}
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java 2010-10-06 06:56:19 UTC (rev 3248)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java 2010-10-06 07:47:53 UTC (rev 3249)
@@ -1610,7 +1610,7 @@
/**
* {@inheritDoc}
*/
- public void restoreExistedRepository(RepositoryBackupChainLog rblog, RepositoryEntry repositoryEntry,
+ public void restoreExistingRepository(RepositoryBackupChainLog rblog, RepositoryEntry repositoryEntry,
boolean asynchronous) throws BackupOperationException, BackupConfigurationException
{
try
@@ -1682,7 +1682,7 @@
/**
* {@inheritDoc}
*/
- public void restoreExistedRepository(String repositoryBackupIdentifier, RepositoryEntry repositoryEntry,
+ public void restoreExistingRepository(String repositoryBackupIdentifier, RepositoryEntry repositoryEntry,
boolean asynchronous) throws BackupOperationException, BackupConfigurationException
{
RepositoryBackupChainLog backupChainLog = null;
@@ -1701,13 +1701,13 @@
throw new BackupConfigurationException("Can not founf backup of repository with id \"" + repositoryBackupIdentifier + "\"");
}
- this.restoreExistedRepository(backupChainLog, repositoryEntry, asynchronous);
+ this.restoreExistingRepository(backupChainLog, repositoryEntry, asynchronous);
}
/**
* {@inheritDoc}
*/
- public void restoreExistedWorkspace(BackupChainLog log, String repositoryName, WorkspaceEntry workspaceEntry,
+ public void restoreExistingWorkspace(BackupChainLog log, String repositoryName, WorkspaceEntry workspaceEntry,
boolean asynchronous) throws BackupOperationException, BackupConfigurationException
{
try
@@ -1748,7 +1748,7 @@
/**
* {@inheritDoc}
*/
- public void restoreExistedWorkspace(String workspaceBackupIdentifier, String repositoryName,
+ public void restoreExistingWorkspace(String workspaceBackupIdentifier, String repositoryName,
WorkspaceEntry workspaceEntry, boolean asynchronous) throws BackupOperationException,
BackupConfigurationException
{
@@ -1768,7 +1768,7 @@
throw new BackupConfigurationException("Can not founf backup of workspace with id \"" + workspaceBackupIdentifier + "\"");
}
- this.restoreExistedWorkspace(backupChainLog, repositoryName, workspaceEntry, asynchronous);
+ this.restoreExistingWorkspace(backupChainLog, repositoryName, workspaceEntry, asynchronous);
}
}
Modified: jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/TestBackupManager.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/TestBackupManager.java 2010-10-06 06:56:19 UTC (rev 3248)
+++ jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/TestBackupManager.java 2010-10-06 07:47:53 UTC (rev 3249)
@@ -1279,7 +1279,7 @@
assertNotNull(bchLog.getStartedTime());
assertNotNull(bchLog.getFinishedTime());
- backup.restoreExistedWorkspace(bchLog, re.getName(), ws1, false);
+ backup.restoreExistingWorkspace(bchLog, re.getName(), ws1, false);
// check
SessionImpl back1 = null;
@@ -1356,7 +1356,7 @@
assertNotNull(bchLog.getStartedTime());
assertNotNull(bchLog.getFinishedTime());
- backup.restoreExistedWorkspace(bchLog, re.getName(), ws1, true);
+ backup.restoreExistingWorkspace(bchLog, re.getName(), ws1, true);
while (backup.getLastRestore(repository.getName(), ws1.getName()).getStateRestore() != JobWorkspaceRestore.RESTORE_SUCCESSFUL
&& backup.getLastRestore(repository.getName(), ws1.getName()).getStateRestore() != JobWorkspaceRestore.RESTORE_FAIL)
@@ -1439,7 +1439,7 @@
assertNotNull(bchLog.getStartedTime());
assertNotNull(bchLog.getFinishedTime());
- backup.restoreExistedWorkspace(bchLog.getBackupId(), re.getName(), ws1, true);
+ backup.restoreExistingWorkspace(bchLog.getBackupId(), re.getName(), ws1, true);
while (backup.getLastRestore(repository.getName(), ws1.getName()).getStateRestore() != JobWorkspaceRestore.RESTORE_SUCCESSFUL
&& backup.getLastRestore(repository.getName(), ws1.getName()).getStateRestore() != JobWorkspaceRestore.RESTORE_FAIL)
@@ -1511,7 +1511,7 @@
assertNotNull(bchLog.getStartedTime());
assertNotNull(bchLog.getFinishedTime());
- backup.restoreExistedRepository(bchLog, re, false);
+ backup.restoreExistingRepository(bchLog, re, false);
assertEquals(JobWorkspaceRestore.RESTORE_SUCCESSFUL, backup.getLastRepositoryRestore(re.getName())
.getStateRestore());
@@ -1599,7 +1599,7 @@
assertNotNull(bchLog.getStartedTime());
assertNotNull(bchLog.getFinishedTime());
- backup.restoreExistedRepository(bchLog, re, false);
+ backup.restoreExistingRepository(bchLog, re, false);
assertEquals(JobWorkspaceRestore.RESTORE_SUCCESSFUL, backup.getLastRepositoryRestore(re.getName())
.getStateRestore());
@@ -1673,7 +1673,7 @@
assertNotNull(bchLog.getStartedTime());
assertNotNull(bchLog.getFinishedTime());
- backup.restoreExistedRepository(bchLog, re, true);
+ backup.restoreExistingRepository(bchLog, re, true);
JobRepositoryRestore job = backup.getLastRepositoryRestore(re.getName());
@@ -1755,7 +1755,7 @@
assertNotNull(bchLog.getStartedTime());
assertNotNull(bchLog.getFinishedTime());
- backup.restoreExistedRepository(bchLog.getBackupId(), re, true);
+ backup.restoreExistingRepository(bchLog.getBackupId(), re, true);
JobRepositoryRestore job = backup.getLastRepositoryRestore(re.getName());
@@ -1857,7 +1857,7 @@
assertNotNull(bchLog.getStartedTime());
assertNotNull(bchLog.getFinishedTime());
- backup.restoreExistedWorkspace(bchLog, re.getName(), ws1, false);
+ backup.restoreExistingWorkspace(bchLog, re.getName(), ws1, false);
// check
SessionImpl back1 = null;
More information about the exo-jcr-commits
mailing list