[exo-jcr-commits] exo-jcr SVN: r3220 - in jcr/trunk: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core and 2 other directories.

Author: tolusha Date: 2010-09-30 05:29:30 -0400 (Thu, 30 Sep 2010) New Revision: 3220 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/RepositoryImpl.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/JobExistedWorkspaceRestore.java jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/TestBackupManager.java Log: EXOJCR-747: avoid restore of system workspace only as part of repository restore Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java 2010-09-30 07:40:51 UTC (rev 3219) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java 2010-09-30 09:29:30 UTC (rev 3220) @@ -253,10 +253,6 @@ workspaceContainer.registerComponentImplementation(containerType); if (isSystem) { - if (getComponentInstanceOfType(SystemDataContainerHolder.class) != null) - { - unregisterComponent(SystemDataContainerHolder.class); - } registerComponentInstance(new SystemDataContainerHolder( (WorkspaceDataContainer)workspaceContainer.getComponentInstanceOfType(WorkspaceDataContainer.class))); } @@ -383,11 +379,6 @@ { // system workspace systemDataManager = wsDataManager; - - if (getComponentInstanceOfType(LocalWorkspaceDataManagerStub.class) != null) - { - unregisterComponent(LocalWorkspaceDataManagerStub.class); - } registerComponentInstance(systemDataManager); } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/RepositoryImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/RepositoryImpl.java 2010-09-30 07:40:51 UTC (rev 3219) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/RepositoryImpl.java 2010-09-30 09:29:30 UTC (rev 3220) @@ -81,8 +81,8 @@ /** * SYSTEM credentials. */ - private static final CredentialsImpl SYSTEM_CREDENTIALS = - new CredentialsImpl(SystemIdentity.SYSTEM, "".toCharArray()); + private static final CredentialsImpl SYSTEM_CREDENTIALS = new CredentialsImpl(SystemIdentity.SYSTEM, + "".toCharArray()); /** * Logger. @@ -181,7 +181,16 @@ */ public boolean canRemoveWorkspace(String workspaceName) throws NoSuchWorkspaceException { - return canRemoveWorkspace(workspaceName, false); + if (repositoryContainer.getWorkspaceEntry(workspaceName) == null) + throw new NoSuchWorkspaceException("No such workspace " + workspaceName); + + if (workspaceName.equals(config.getSystemWorkspaceName())) + return false; + + SessionRegistry sessionRegistry = + (SessionRegistry)repositoryContainer.getComponentInstance(SessionRegistry.class); + + return sessionRegistry != null && !sessionRegistry.isInUse(workspaceName); } /** @@ -462,9 +471,9 @@ StreamImporter importer = eiFactory.getWorkspaceImporter(rootData, ImportUUIDBehavior.IMPORT_UUID_COLLISION_THROW, dataManager, - dataManager, sysSession.getWorkspace().getNodeTypesHolder(), sysSession.getLocationFactory(), sysSession - .getValueFactory(), getNamespaceRegistry(), sysSession.getAccessManager(), sysSession.getUserState(), - context, this, wsName); + dataManager, sysSession.getWorkspace().getNodeTypesHolder(), sysSession.getLocationFactory(), + sysSession.getValueFactory(), getNamespaceRegistry(), sysSession.getAccessManager(), + sysSession.getUserState(), context, this, wsName); importer.importStream(xmlStream); } finally @@ -627,18 +636,13 @@ */ public void removeWorkspace(String workspaceName) throws RepositoryException { - removeWorkspace(workspaceName, false); - } + if (!canRemoveWorkspace(workspaceName)) - /** - * Remove system workspace. - * Workspace become stopped, removed from container and removed from repository configuration. - * - * @throws RepositoryException - if workspace is in use, or can't be removed for other reason - */ - public void removeSystemWorkspace() throws RepositoryException - { - removeWorkspace(config.getSystemWorkspaceName(), true); + throw new RepositoryException("Workspace " + workspaceName + " in use. If you want to " + + " remove workspace close all open sessions"); + + internalRemoveWorkspace(workspaceName); + config.getWorkspaceEntries().remove(repositoryContainer.getWorkspaceEntry(workspaceName)); } /** @@ -703,55 +707,6 @@ } } - /** - * Remove workspace. - * - * @param workspaceName - * workspace name - * @param allowRemoveSystemWorkspacew - * allow to remove system workspace - * @throws RepositoryException - * if any Exception is occurred - */ - private void removeWorkspace(String workspaceName, boolean allowRemoveSystemWorkspacew) throws RepositoryException - { - if (!canRemoveWorkspace(workspaceName, allowRemoveSystemWorkspacew)) - - throw new RepositoryException("Workspace " + workspaceName + " in use. If you want to " - + " remove workspace close all open sessions"); - - internalRemoveWorkspace(workspaceName); - config.getWorkspaceEntries().remove(repositoryContainer.getWorkspaceEntry(workspaceName)); - } - - /** - * Indicates if specific workspace can be removed. - * - * @param workspaceName - * workspace name - * @param allowRemoveSystemWorkspace - * allow to remove system workspacw - * @return - * true if workspace can be removed or false in ather case - * @throws NoSuchWorkspaceException - * if any Exception is occured - */ - private boolean canRemoveWorkspace(String workspaceName, boolean allowRemoveSystemWorkspace) - throws NoSuchWorkspaceException - { - if (repositoryContainer.getWorkspaceEntry(workspaceName) == null) - throw new NoSuchWorkspaceException("No such workspace " + workspaceName); - - if (!allowRemoveSystemWorkspace && workspaceName.equals(config.getSystemWorkspaceName())) - return false; - - SessionRegistry sessionRegistry = - (SessionRegistry)repositoryContainer.getComponentInstance(SessionRegistry.class); - - return sessionRegistry != null && !sessionRegistry.isInUse(workspaceName); - - } - @Override public String toString() { Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/JobExistedWorkspaceRestore.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/JobExistedWorkspaceRestore.java 2010-09-30 07:40:51 UTC (rev 3219) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/JobExistedWorkspaceRestore.java 2010-09-30 09:29:30 UTC (rev 3220) @@ -24,7 +24,6 @@ import org.exoplatform.services.jcr.ext.backup.BackupChainLog; import org.exoplatform.services.jcr.ext.backup.BackupManager; import org.exoplatform.services.jcr.ext.backup.WorkspaceRestoreException; -import org.exoplatform.services.jcr.impl.core.RepositoryImpl; import org.exoplatform.services.jcr.impl.core.SessionRegistry; import org.exoplatform.services.jcr.impl.util.jdbc.cleaner.DBCleanerService; import org.exoplatform.services.log.ExoLogger; @@ -91,16 +90,7 @@ //close all session forceCloseSession(repositoryName, wEntry.getName()); - //remove workspace - if (isSystem) - { - RepositoryImpl repositoryImpl = (RepositoryImpl)repositoryService.getRepository(repositoryName); - repositoryImpl.removeSystemWorkspace(); - } - else - { - repositoryService.getRepository(repositoryName).removeWorkspace(wEntry.getName()); - } + repositoryService.getRepository(repositoryName).removeWorkspace(wEntry.getName()); //clean database dbCleanerService.cleanWorkspaceData(wEntry); 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-09-30 07:40:51 UTC (rev 3219) +++ jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/TestBackupManager.java 2010-09-30 09:29:30 UTC (rev 3220) @@ -18,6 +18,15 @@ */ package org.exoplatform.services.jcr.ext.backup; +import org.apache.commons.collections.map.HashedMap; +import org.exoplatform.services.jcr.config.RepositoryEntry; +import org.exoplatform.services.jcr.config.WorkspaceEntry; +import org.exoplatform.services.jcr.core.ManageableRepository; +import org.exoplatform.services.jcr.ext.backup.impl.JobRepositoryRestore; +import org.exoplatform.services.jcr.ext.backup.impl.JobWorkspaceRestore; +import org.exoplatform.services.jcr.impl.core.RepositoryImpl; +import org.exoplatform.services.jcr.impl.core.SessionImpl; + import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileInputStream; @@ -25,20 +34,9 @@ import java.util.Map; import javax.jcr.Node; -import javax.jcr.Repository; import javax.jcr.RepositoryException; -import javax.jcr.Session; import javax.jcr.lock.Lock; -import org.apache.commons.collections.map.HashedMap; -import org.exoplatform.services.jcr.config.RepositoryEntry; -import org.exoplatform.services.jcr.config.WorkspaceEntry; -import org.exoplatform.services.jcr.core.ManageableRepository; -import org.exoplatform.services.jcr.ext.backup.impl.JobRepositoryRestore; -import org.exoplatform.services.jcr.ext.backup.impl.JobWorkspaceRestore; -import org.exoplatform.services.jcr.impl.core.RepositoryImpl; -import org.exoplatform.services.jcr.impl.core.SessionImpl; - /** * Created by The eXo Platform SAS. * Author : Peter Nedonosko peter.nedonosko(a)exoplatform.com.ua @@ -272,8 +270,8 @@ ws1TestRoot.save(); // log here via listener // before(*), log here via listener - ws1TestRoot.getSession().getWorkspace().move(ws1TestRoot.getNode("node_6").getPath(), - ws1TestRoot.getPath() + "/node_4"); // in place of + ws1TestRoot.getSession().getWorkspace() + .move(ws1TestRoot.getNode("node_6").getPath(), ws1TestRoot.getPath() + "/node_4"); // in place of // 4 removed // stop all @@ -319,14 +317,14 @@ assertFalse("Property should be removed", ws1backTestRoot.getNode("node_2").hasProperty("exo:data")); - compareStream(new ByteArrayInputStream("aaa".getBytes()), ws1backTestRoot.getNode("node_3").getProperty( - "exo:data").getStream()); + compareStream(new ByteArrayInputStream("aaa".getBytes()), + ws1backTestRoot.getNode("node_3").getProperty("exo:data").getStream()); assertTrue("Node should be mix:lockable ", ws1backTestRoot.getNode("node_5").isNodeType("mix:lockable")); assertFalse("Node should be not locked ", ws1backTestRoot.getNode("node_5").isLocked()); - assertEquals("Node should be mix:referenceable and UUID should be " + id6, id6, ws1backTestRoot.getNode( - "node_4").getUUID()); + assertEquals("Node should be mix:referenceable and UUID should be " + id6, id6, + ws1backTestRoot.getNode("node_4").getUUID()); } catch (Exception e) { @@ -346,8 +344,8 @@ public void testFullBackupRestoreAsync() throws Exception { SessionImpl sessionWS1 = (SessionImpl)repository.login(credentials, "ws1"); - sessionWS1.getRootNode().addNode("backupTest").addNode("node_5").setProperty("exo:data", - "Restored content should be same"); + sessionWS1.getRootNode().addNode("backupTest").addNode("node_5") + .setProperty("exo:data", "Restored content should be same"); sessionWS1.save(); // backup @@ -505,8 +503,8 @@ { SessionImpl sessionWS1 = (SessionImpl)repository.login(credentials, "ws3"); - sessionWS1.getRootNode().addNode("asdasdasda", "nt:unstructured").setProperty("data", - new FileInputStream(createBLOBTempFile(1024))); + sessionWS1.getRootNode().addNode("asdasdasda", "nt:unstructured") + .setProperty("data", new FileInputStream(createBLOBTempFile(1024))); sessionWS1.save(); // 1-st backup @@ -543,8 +541,8 @@ assertNotNull(back1.getRootNode().getNode("asdasdasda").getProperty("data")); // add date to restored workspace - back1.getRootNode().addNode("gdfgrghfhf", "nt:unstructured").setProperty("data", - new FileInputStream(createBLOBTempFile(1024))); + back1.getRootNode().addNode("gdfgrghfhf", "nt:unstructured") + .setProperty("data", new FileInputStream(createBLOBTempFile(1024))); back1.save(); } else @@ -786,8 +784,8 @@ assertNotNull(bchLog.getFinishedTime()); backup.restore(bchLog, newRepositoryEntry, false); - assertEquals(JobWorkspaceRestore.RESTORE_SUCCESSFUL, backup.getLastRepositoryRestore( - newRepositoryEntry.getName()).getStateRestore()); + assertEquals(JobWorkspaceRestore.RESTORE_SUCCESSFUL, + backup.getLastRepositoryRestore(newRepositoryEntry.getName()).getStateRestore()); // check ManageableRepository restoredRepository = repositoryService.getRepository(newRepositoryName); @@ -1229,7 +1227,7 @@ else fail("There are no backup files in " + backDir.getAbsolutePath()); } - + public void testExistedWorkspaceRestore() throws Exception { // backup @@ -1306,7 +1304,7 @@ else fail("There are no backup files in " + backDir.getAbsolutePath()); } - + public void testExistedWorkspaceRestoreAsync() throws Exception { // backup @@ -1359,9 +1357,9 @@ assertNotNull(bchLog.getFinishedTime()); backup.restoreExistedWorkspace(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) + && backup.getLastRestore(repository.getName(), ws1.getName()).getStateRestore() != JobWorkspaceRestore.RESTORE_FAIL) { Thread.sleep(50); } @@ -1389,7 +1387,7 @@ else fail("There are no backup files in " + backDir.getAbsolutePath()); } - + public void testExistedWorkspaceRestoreAsync2() throws Exception { // backup @@ -1442,9 +1440,9 @@ assertNotNull(bchLog.getFinishedTime()); backup.restoreExistedWorkspace(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) + && backup.getLastRestore(repository.getName(), ws1.getName()).getStateRestore() != JobWorkspaceRestore.RESTORE_FAIL) { Thread.sleep(50); } @@ -1472,7 +1470,7 @@ else fail("There are no backup files in " + backDir.getAbsolutePath()); } - + public void testExistedRepositoryRestore() throws Exception { // backup @@ -1501,8 +1499,9 @@ backup.stopBackup(bch); // restore - RepositoryEntry baseRE = (RepositoryEntry)ws1Session.getContainer().getComponentInstanceOfType(RepositoryEntry.class); - RepositoryEntry re = makeRepositoryEntry(baseRE.getName() , baseRE, null, null); + RepositoryEntry baseRE = + (RepositoryEntry)ws1Session.getContainer().getComponentInstanceOfType(RepositoryEntry.class); + RepositoryEntry re = makeRepositoryEntry(baseRE.getName(), baseRE, null, null); File backLog = new File(bch.getLogFilePath()); if (backLog.exists()) @@ -1513,10 +1512,10 @@ assertNotNull(bchLog.getFinishedTime()); backup.restoreExistedRepository(bchLog, re, false); - - assertEquals(JobWorkspaceRestore.RESTORE_SUCCESSFUL, backup.getLastRepositoryRestore( - re.getName()).getStateRestore()); + assertEquals(JobWorkspaceRestore.RESTORE_SUCCESSFUL, backup.getLastRepositoryRestore(re.getName()) + .getStateRestore()); + // check ManageableRepository restoredRepository = repositoryService.getRepository(re.getName()); @@ -1545,7 +1544,7 @@ else fail("There are no backup files in " + backDir.getAbsolutePath()); } - + public void testExistedRepositoryRestoreMultiDB() throws Exception { RepositoryImpl repositoryDB7 = (RepositoryImpl)repositoryService.getRepository("db7"); @@ -1553,15 +1552,15 @@ for (String wsName : repositoryDB7.getWorkspaceNames()) { SessionImpl sessionWS = (SessionImpl)repositoryDB7.login(credentials, wsName); - + Node wsTestRoot = sessionWS.getRootNode().addNode("backupTest"); sessionWS.getRootNode().save(); addContent(wsTestRoot, 1, 10, 1); sessionWS.getRootNode().save(); } - + SessionImpl sessionWS = (SessionImpl)repositoryDB7.login(credentials, WS_NAME); - + // backup File backDir = new File("target/backup"); backDir.mkdirs(); @@ -1588,8 +1587,9 @@ backup.stopBackup(bch); // restore - RepositoryEntry baseRE = (RepositoryEntry)sessionWS.getContainer().getComponentInstanceOfType(RepositoryEntry.class); - RepositoryEntry re = makeRepositoryEntry(baseRE.getName() , baseRE, null, null); + RepositoryEntry baseRE = + (RepositoryEntry)sessionWS.getContainer().getComponentInstanceOfType(RepositoryEntry.class); + RepositoryEntry re = makeRepositoryEntry(baseRE.getName(), baseRE, null, null); File backLog = new File(bch.getLogFilePath()); if (backLog.exists()) @@ -1600,10 +1600,10 @@ assertNotNull(bchLog.getFinishedTime()); backup.restoreExistedRepository(bchLog, re, false); - - assertEquals(JobWorkspaceRestore.RESTORE_SUCCESSFUL, backup.getLastRepositoryRestore( - re.getName()).getStateRestore()); + assertEquals(JobWorkspaceRestore.RESTORE_SUCCESSFUL, backup.getLastRepositoryRestore(re.getName()) + .getStateRestore()); + // check ManageableRepository restoredRepository = repositoryService.getRepository(re.getName()); @@ -1632,7 +1632,7 @@ else fail("There are no backup files in " + backDir.getAbsolutePath()); } - + public void testExistedRepositoryRestoreAsync() throws Exception { // backup @@ -1661,8 +1661,9 @@ backup.stopBackup(bch); // restore - RepositoryEntry baseRE = (RepositoryEntry)ws1Session.getContainer().getComponentInstanceOfType(RepositoryEntry.class); - RepositoryEntry re = makeRepositoryEntry(baseRE.getName() , baseRE, null, null); + RepositoryEntry baseRE = + (RepositoryEntry)ws1Session.getContainer().getComponentInstanceOfType(RepositoryEntry.class); + RepositoryEntry re = makeRepositoryEntry(baseRE.getName(), baseRE, null, null); File backLog = new File(bch.getLogFilePath()); if (backLog.exists()) @@ -1673,18 +1674,18 @@ assertNotNull(bchLog.getFinishedTime()); backup.restoreExistedRepository(bchLog, re, true); - + JobRepositoryRestore job = backup.getLastRepositoryRestore(re.getName()); - + while (job.getStateRestore() != JobRepositoryRestore.REPOSITORY_RESTORE_SUCCESSFUL - && job.getStateRestore() != JobRepositoryRestore.REPOSITORY_RESTORE_FAIL) + && job.getStateRestore() != JobRepositoryRestore.REPOSITORY_RESTORE_FAIL) { Thread.sleep(50); } - - assertEquals(JobRepositoryRestore.REPOSITORY_RESTORE_SUCCESSFUL, backup.getLastRepositoryRestore( - re.getName()).getStateRestore()); + assertEquals(JobRepositoryRestore.REPOSITORY_RESTORE_SUCCESSFUL, backup.getLastRepositoryRestore(re.getName()) + .getStateRestore()); + // check ManageableRepository restoredRepository = repositoryService.getRepository(re.getName()); @@ -1713,7 +1714,7 @@ else fail("There are no backup files in " + backDir.getAbsolutePath()); } - + public void testExistedRepositoryRestoreAsync2() throws Exception { // backup @@ -1742,8 +1743,9 @@ backup.stopBackup(bch); // restore - RepositoryEntry baseRE = (RepositoryEntry)ws1Session.getContainer().getComponentInstanceOfType(RepositoryEntry.class); - RepositoryEntry re = makeRepositoryEntry(baseRE.getName() , baseRE, null, null); + RepositoryEntry baseRE = + (RepositoryEntry)ws1Session.getContainer().getComponentInstanceOfType(RepositoryEntry.class); + RepositoryEntry re = makeRepositoryEntry(baseRE.getName(), baseRE, null, null); File backLog = new File(bch.getLogFilePath()); if (backLog.exists()) @@ -1754,18 +1756,18 @@ assertNotNull(bchLog.getFinishedTime()); backup.restoreExistedRepository(bchLog.getBackupId(), re, true); - + JobRepositoryRestore job = backup.getLastRepositoryRestore(re.getName()); - + while (job.getStateRestore() != JobRepositoryRestore.REPOSITORY_RESTORE_SUCCESSFUL - && job.getStateRestore() != JobRepositoryRestore.REPOSITORY_RESTORE_FAIL) + && job.getStateRestore() != JobRepositoryRestore.REPOSITORY_RESTORE_FAIL) { Thread.sleep(50); } - - assertEquals(JobWorkspaceRestore.RESTORE_SUCCESSFUL, backup.getLastRepositoryRestore( - re.getName()).getStateRestore()); + assertEquals(JobWorkspaceRestore.RESTORE_SUCCESSFUL, backup.getLastRepositoryRestore(re.getName()) + .getStateRestore()); + // check ManageableRepository restoredRepository = repositoryService.getRepository(re.getName()); @@ -1794,182 +1796,18 @@ else fail("There are no backup files in " + backDir.getAbsolutePath()); } - - public void testExistedSystemWorkspaceRestore() throws Exception - { - String systemWS = repository.getSystemWorkspaceName(); - - // backup - File backDir = new File("target/backup/" + systemWS); - backDir.mkdirs(); - BackupConfig config = new BackupConfig(); - config.setRepository(repository.getName()); - config.setWorkspace(systemWS); - config.setBackupType(BackupManager.FULL_BACKUP_ONLY); - - config.setBackupDir(backDir); - - backup.startBackup(config); - - BackupChain bch = backup.findBackup(repository.getName(), systemWS); - - // wait till full backup will be stopped - while (bch.getFullBackupState() != BackupJob.FINISHED) - { - Thread.yield(); - Thread.sleep(50); - } - - // stop fullBackup - - if (bch != null) - backup.stopBackup(bch); - else - fail("Can't get fullBackup chain"); - - // restore - RepositoryEntry re = (RepositoryEntry)ws1Session.getContainer().getComponentInstanceOfType(RepositoryEntry.class); - WorkspaceEntry ws1 = null; - for (WorkspaceEntry we : re.getWorkspaceEntries()) - { - if (systemWS.equals(we.getName())) - { - ws1 = we; - break; - } - } - - File backLog = new File(bch.getLogFilePath()); - if (backLog.exists()) - { - BackupChainLog bchLog = new BackupChainLog(backLog); - - assertNotNull(bchLog.getStartedTime()); - assertNotNull(bchLog.getFinishedTime()); - - backup.restoreExistedWorkspace(bchLog, re.getName(), ws1, false); - - // check - SessionImpl back1 = null; - try - { - back1 = (SessionImpl)repository.login(credentials, systemWS); - Node ws1backTestRoot = back1.getRootNode().getNode("backupTest"); - assertEquals("Restored content should be same", "property-5", ws1backTestRoot.getNode("node_5") - .getProperty("exo:data").getString()); - } - catch (Exception e) - { - e.printStackTrace(); - fail(e.getMessage()); - } - finally - { - if (back1 != null) - back1.logout(); - } - } - else - fail("There are no backup files in " + backDir.getAbsolutePath()); - } - - public void testExistedSystemWorkspaceRestoreAsync() throws Exception - { - String systemWS = repository.getSystemWorkspaceName(); - - // backup - File backDir = new File("target/backup/" + systemWS); - backDir.mkdirs(); - - BackupConfig config = new BackupConfig(); - config.setRepository(repository.getName()); - config.setWorkspace(systemWS); - config.setBackupType(BackupManager.FULL_BACKUP_ONLY); - - config.setBackupDir(backDir); - - backup.startBackup(config); - - BackupChain bch = backup.findBackup(repository.getName(), systemWS); - - // wait till full backup will be stopped - while (bch.getFullBackupState() != BackupJob.FINISHED) - { - Thread.yield(); - Thread.sleep(50); - } - - // stop fullBackup - - if (bch != null) - backup.stopBackup(bch); - else - fail("Can't get fullBackup chain"); - - // restore - RepositoryEntry re = (RepositoryEntry)ws1Session.getContainer().getComponentInstanceOfType(RepositoryEntry.class); - WorkspaceEntry ws1 = null; - for (WorkspaceEntry we : re.getWorkspaceEntries()) - { - if (systemWS.equals(we.getName())) - { - ws1 = we; - break; - } - } - - File backLog = new File(bch.getLogFilePath()); - if (backLog.exists()) - { - BackupChainLog bchLog = new BackupChainLog(backLog); - - assertNotNull(bchLog.getStartedTime()); - assertNotNull(bchLog.getFinishedTime()); - - backup.restoreExistedWorkspace(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) - { - Thread.sleep(50); - } - - // check - SessionImpl back1 = null; - try - { - back1 = (SessionImpl)repository.login(credentials, systemWS); - Node ws1backTestRoot = back1.getRootNode().getNode("backupTest"); - assertEquals("Restored content should be same", "property-5", ws1backTestRoot.getNode("node_5") - .getProperty("exo:data").getString()); - } - catch (Exception e) - { - e.printStackTrace(); - fail(e.getMessage()); - } - finally - { - if (back1 != null) - back1.logout(); - } - } - else - fail("There are no backup files in " + backDir.getAbsolutePath()); - } - public void testExistedWorkspaceRestoreMultiDB() throws Exception { RepositoryImpl repositoryDB7 = (RepositoryImpl)repositoryService.getRepository("db7"); - SessionImpl sessionWS = (SessionImpl) repositoryDB7.login(credentials, "ws1"); + SessionImpl sessionWS = (SessionImpl)repositoryDB7.login(credentials, "ws1"); Node wsTestRoot = sessionWS.getRootNode().addNode("backupTest"); sessionWS.getRootNode().save(); addContent(wsTestRoot, 1, 10, 1); sessionWS.getRootNode().save(); - + // backup File backDir = new File("target/backup/ws1"); backDir.mkdirs();