[exo-jcr-commits] exo-jcr SVN: r3659 - in jcr/trunk/exo.jcr.component.ext: src/test/java/org/exoplatform/services/jcr/ext/backup and 2 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Fri Dec 10 05:40:31 EST 2010
Author: areshetnyak
Date: 2010-12-10 05:40:25 -0500 (Fri, 10 Dec 2010)
New Revision: 3659
Modified:
jcr/trunk/exo.jcr.component.ext/pom.xml
jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/AbstractBackupTestCase.java
jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/AbstractBackupUseCasesTest.java
jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/TestBackupRestart.java
jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/TestBackupScheduler.java
jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/repository/creation/TestRepositoryCreationService.java
jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration.xml
jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config.xml
Log:
EXOJCR-1078 : Remove from excludes TestRDBMSBAckupManager.
Modified: jcr/trunk/exo.jcr.component.ext/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.ext/pom.xml 2010-12-10 08:38:51 UTC (rev 3658)
+++ jcr/trunk/exo.jcr.component.ext/pom.xml 2010-12-10 10:40:25 UTC (rev 3659)
@@ -189,7 +189,6 @@
</includes>
<excludes>
<exclude>**/backup/TestRdbmsWorkspaceInitializer.java</exclude>
- <exclude>**/backup/TestRDBMSBackupManager.java</exclude>
<exclude>**/BaseStandaloneTest.java</exclude>
<exclude>**/backup/AbstractBackupTestCase.java</exclude>
<exclude>**/backup/BaseRDBMSBackupTest.java</exclude>
Modified: jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/AbstractBackupTestCase.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/AbstractBackupTestCase.java 2010-12-10 08:38:51 UTC (rev 3658)
+++ jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/AbstractBackupTestCase.java 2010-12-10 10:40:25 UTC (rev 3659)
@@ -18,29 +18,14 @@
*/
package org.exoplatform.services.jcr.ext.backup;
-import java.io.File;
-import java.io.FileFilter;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.jcr.ItemExistsException;
-import javax.jcr.Node;
-import javax.jcr.PathNotFoundException;
-import javax.jcr.RepositoryException;
-import javax.jcr.ValueFormatException;
-import javax.jcr.lock.LockException;
-import javax.jcr.nodetype.ConstraintViolationException;
-import javax.jcr.version.VersionException;
-
import org.exoplatform.services.jcr.config.ContainerEntry;
import org.exoplatform.services.jcr.config.QueryHandlerEntry;
import org.exoplatform.services.jcr.config.QueryHandlerParams;
import org.exoplatform.services.jcr.config.RepositoryConfigurationException;
import org.exoplatform.services.jcr.config.RepositoryEntry;
import org.exoplatform.services.jcr.config.SimpleParameterEntry;
+import org.exoplatform.services.jcr.config.ValueStorageEntry;
+import org.exoplatform.services.jcr.config.ValueStorageFilterEntry;
import org.exoplatform.services.jcr.config.WorkspaceEntry;
import org.exoplatform.services.jcr.core.ManageableRepository;
import org.exoplatform.services.jcr.core.WorkspaceContainerFacade;
@@ -53,6 +38,23 @@
import org.exoplatform.services.jcr.impl.core.SessionRegistry;
import org.exoplatform.services.jcr.impl.util.jdbc.cleaner.DBCleanerService;
+import java.io.File;
+import java.io.FileFilter;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.jcr.ItemExistsException;
+import javax.jcr.Node;
+import javax.jcr.PathNotFoundException;
+import javax.jcr.RepositoryException;
+import javax.jcr.ValueFormatException;
+import javax.jcr.lock.LockException;
+import javax.jcr.nodetype.ConstraintViolationException;
+import javax.jcr.version.VersionException;
+
/**
* Created by The eXo Platform SAS Author : Peter Nedonosko peter.nedonosko at exoplatform.com.ua
* 04.02.2008
@@ -68,10 +70,18 @@
protected Node ws1TestRoot;
- protected SessionImpl ws2Session;
-
protected ExtendedBackupManager backup;
+ protected String repositoryNameToBackup = "db8";
+
+ protected String workspaceNameToBackup = "ws1";
+
+ protected String dataSourceToWorkspaceRestore = "jdbcjcr_workspace_restore";
+
+ protected String repositoryNameToRestpre = "db8backup";
+
+ protected String workspaceNameToRestore = "ws1backup";
+
/**
* Database cleaner.
*/
@@ -107,54 +117,40 @@
if (backup == null)
throw new Exception("There are no BackupManagerImpl in configuration");
- // ws1
+ for (String wsName : getReposityToBackup().getWorkspaceNames())
+ {
+ SessionImpl ws = (SessionImpl) getReposityToBackup().login(credentials, wsName);
+ Node wsTestRoot = ws.getRootNode().addNode("backupTest");
+ ws.save();
+ addContent(wsTestRoot, 1, 10, 1);
- for (String wsName : repository.getWorkspaceNames())
- {
if ("ws1".equals(wsName))
{
- ws1Session = (SessionImpl) repository.login(credentials, "ws1");
- ws1TestRoot = ws1Session.getRootNode().addNode("backupTest");
- ws1Session.save();
- addContent(ws1TestRoot, 1, 10, 1);
-
+ ws1Session = ws;
+ ws1TestRoot = wsTestRoot;
}
- else
- {
- SessionImpl ws = (SessionImpl) repository.login(credentials, wsName);
- Node wsTestRoot = ws.getRootNode().addNode("backupTest");
- ws.save();
- addContent(wsTestRoot, 1, 10, 1);
- }
}
- // ws2
- ws2Session = (SessionImpl) repository.login(credentials, "ws2");
}
protected abstract ExtendedBackupManager getBackupManager();
-
+ protected RepositoryImpl getReposityToBackup() throws RepositoryException, RepositoryConfigurationException
+ {
+ return (RepositoryImpl) repositoryService.getRepository(repositoryNameToBackup);
+ }
+
@Override
protected void tearDown() throws Exception
{
- for (String wsName : repository.getWorkspaceNames())
+ for (String wsName : getReposityToBackup().getWorkspaceNames())
{
try
{
- if ("ws1".equals(wsName))
- {
- ws1Session = (SessionImpl) repository.login(credentials, "ws1");
- ws1Session.getRootNode().getNode("backupTest").remove();
- ws1Session.save();
- }
- else
- {
- SessionImpl ws = (SessionImpl) repository.login(credentials, wsName);
- ws.getRootNode().getNode("backupTest").remove();
- ws.save();
- }
+ SessionImpl ws = (SessionImpl) getReposityToBackup().login(credentials, wsName);
+ ws.getRootNode().getNode("backupTest").remove();
+ ws.save();
}
catch (PathNotFoundException e)
{
@@ -162,6 +158,14 @@
}
}
+ for (String wsName : getReposityToBackup().getWorkspaceNames())
+ {
+ if (wsName.equals(workspaceNameToRestore))
+ {
+ removeWorkspaceFully(getReposityToBackup().getName(), workspaceNameToRestore);
+ }
+ }
+
}
protected WorkspaceEntry makeWorkspaceEntry(String name, String sourceName)
@@ -205,8 +209,32 @@
params.add(newp);
}
+ //Value storage
+ ArrayList<ValueStorageEntry> valueStorages = new ArrayList<ValueStorageEntry>();
+
+ ValueStorageFilterEntry filterEntry = new ValueStorageFilterEntry();
+ filterEntry.setPropertyType("Binary");
+
+ ArrayList<ValueStorageFilterEntry> filterEntries = new ArrayList<ValueStorageFilterEntry>();
+ filterEntries.add(filterEntry);
+
+
+ ValueStorageEntry valueStorageEntry = new ValueStorageEntry();
+ valueStorageEntry.setType("org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage");
+ valueStorageEntry.setId("draft");
+ valueStorageEntry.setFilters(filterEntries);
+
+ ArrayList<SimpleParameterEntry> parameterEntries = new ArrayList<SimpleParameterEntry>();
+ parameterEntries.add(new SimpleParameterEntry("path", "target/temp/values/" + ws1back.getName()));
+
+ valueStorageEntry.setParameters(parameterEntries);
+
+ valueStorages.add(valueStorageEntry);
+
ContainerEntry ce =
new ContainerEntry("org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer", params);
+ ce.setValueStorages(valueStorages);
+
ws1back.setContainer(ce);
return ws1back;
@@ -388,8 +416,8 @@
if (wEntry == null)
{
- throw new WorkspaceRestoreException("Workspace " + workspaceName
- + " did not found in current repository " + repositoryName + " configuration");
+ throw new WorkspaceRestoreException("Workspace " + workspaceName + " did not found in current repository "
+ + repositoryName + " configuration");
}
boolean isSystem =
Modified: jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/AbstractBackupUseCasesTest.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/AbstractBackupUseCasesTest.java 2010-12-10 08:38:51 UTC (rev 3658)
+++ jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/AbstractBackupUseCasesTest.java 2010-12-10 10:40:25 UTC (rev 3659)
@@ -16,23 +16,17 @@
*/
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;
import java.io.InputStream;
-import java.util.Map;
import javax.jcr.Node;
-import javax.jcr.RepositoryException;
import javax.jcr.lock.Lock;
/**
@@ -47,22 +41,29 @@
extends AbstractBackupTestCase
{
+ protected static volatile int uuIndex = 0;
+
+ protected static synchronized int getUUIndex()
+ {
+ return uuIndex++;
+ }
+
public void testFullBackupRestore() throws Exception
{
// backup
- File backDir = new File("target/backup/ws1");
+ File backDir = new File("target/backup/" + workspaceNameToBackup + getUUIndex());
backDir.mkdirs();
BackupConfig config = new BackupConfig();
- config.setRepository(repository.getName());
- config.setWorkspace("ws1");
+ config.setRepository(repositoryNameToBackup);
+ config.setWorkspace(workspaceNameToBackup);
config.setBackupType(BackupManager.FULL_BACKUP_ONLY);
config.setBackupDir(backDir);
backup.startBackup(config);
- BackupChain bch = backup.findBackup(repository.getName(), "ws1");
+ BackupChain bch = backup.findBackup(repositoryNameToBackup, workspaceNameToBackup);
// wait till full backup will be stopped
while (bch.getFullBackupState() != BackupJob.FINISHED)
@@ -81,7 +82,7 @@
// restore
RepositoryEntry re =
(RepositoryEntry) ws1Session.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
- WorkspaceEntry ws1back = makeWorkspaceEntry("ws1back", "jdbcjcr_backup_only_use_1");
+ WorkspaceEntry ws1back = makeWorkspaceEntry(workspaceNameToRestore, dataSourceToWorkspaceRestore);
// BackupChainLog bchLog = new BackupChainLog(backDir, rconfig);
File backLog = new File(bch.getLogFilePath());
@@ -98,7 +99,7 @@
SessionImpl back1 = null;
try
{
- back1 = (SessionImpl) repository.login(credentials, "ws1back");
+ back1 = (SessionImpl) getReposityToBackup().login(credentials, workspaceNameToRestore);
Node ws1backTestRoot = back1.getRootNode().getNode("backupTest");
assertEquals("Restored content should be same", "property-5", ws1backTestRoot.getNode("node_5")
.getProperty("exo:data").getString());
@@ -121,19 +122,19 @@
public void testIncrementalBackupRestore() throws Exception
{
// full backup & incremental
- File backDir = new File("target/backup/ws1.incr");
+ File backDir = new File("target/backup/" + workspaceNameToBackup + getUUIndex());
backDir.mkdirs();
BackupConfig config = new BackupConfig();
- config.setRepository(repository.getName());
- config.setWorkspace("ws1");
+ config.setRepository(repositoryNameToBackup);
+ config.setWorkspace(workspaceNameToBackup);
config.setBackupType(BackupManager.FULL_AND_INCREMENTAL);
config.setBackupDir(backDir);
backup.startBackup(config);
- BackupChain bch = backup.findBackup(repository.getName(), "ws1");
+ BackupChain bch = backup.findBackup(repositoryNameToBackup, workspaceNameToBackup);
// wait till full backup will be stopped
while (bch.getFullBackupState() != BackupJob.FINISHED)
@@ -158,8 +159,9 @@
fail("Can't get fullBackup chain");
// restore
- RepositoryEntry re = (RepositoryEntry)ws1Session.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
- WorkspaceEntry ws1back = makeWorkspaceEntry("ws1back.incr", "jdbcjcr_backup_only_use_2");
+ RepositoryEntry re =
+ (RepositoryEntry) ws1Session.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
+ WorkspaceEntry ws1back = makeWorkspaceEntry(workspaceNameToRestore, dataSourceToWorkspaceRestore);
File backLog = new File(bch.getLogFilePath());
if (backLog.exists())
@@ -169,22 +171,22 @@
assertNotNull(bchLog.getStartedTime());
assertNotNull(bchLog.getFinishedTime());
- backup.restore(bchLog, re.getName(), ws1back, false);
+ backup.restore(bchLog, repositoryNameToBackup, ws1back, false);
// check
SessionImpl back1 = null;
try
{
- back1 = (SessionImpl)repository.login(credentials, ws1back.getName());
+ back1 = (SessionImpl) getReposityToBackup().login(credentials, workspaceNameToRestore);
Node ws1backTestRoot = back1.getRootNode().getNode("backupTest");
assertFalse("Node should be removed", ws1backTestRoot.hasNode("node_3"));
assertFalse("Node should be removed", ws1backTestRoot.hasNode("node_4"));
assertFalse("Node should be removed", ws1backTestRoot.hasNode("node_5"));
assertEquals("Restored content should be same", "property #3", ws1backTestRoot.getNode("node #3")
- .getProperty("exo:data").getString());
+ .getProperty("exo:data").getString());
assertEquals("Restored content should be same", "property #5", ws1backTestRoot.getNode("node #5")
- .getProperty("exo:extraData").getString());
+ .getProperty("exo:extraData").getString());
assertFalse("Proeprty should be removed", ws1backTestRoot.getNode("node #5").hasProperty("exo:data"));
}
@@ -203,12 +205,6 @@
fail("There are no backup files in " + backDir.getAbsolutePath());
}
- /**
- * With BLOBs, locks, copy and move
- *
- * @throws Exception
- */
-
public void testIncrementalBackupRestore2() throws Exception
{
// full backup with BLOBs & incremental with BLOBs
@@ -219,19 +215,19 @@
ws1TestRoot.addNode("node_101").setProperty("exo:data", new FileInputStream(tempf));
ws1TestRoot.addNode("node_102").setProperty("exo:extraData", new FileInputStream(tempf));
- File backDir = new File("target/backup/ws1.incr2");
+ File backDir = new File("target/backup/" + workspaceNameToBackup + getUUIndex());
backDir.mkdirs();
BackupConfig config = new BackupConfig();
- config.setRepository(repository.getName());
- config.setWorkspace("ws1");
+ config.setRepository(repositoryNameToBackup);
+ config.setWorkspace(workspaceNameToBackup);
config.setBackupType(BackupManager.FULL_AND_INCREMENTAL);
config.setBackupDir(backDir);
backup.startBackup(config);
- BackupChain bch = backup.findBackup(repository.getName(), "ws1");
+ BackupChain bch = backup.findBackup(repositoryNameToBackup, workspaceNameToBackup);
// wait till full backup will be stopped
while (bch.getFullBackupState() != BackupJob.FINISHED)
@@ -252,7 +248,7 @@
ws1TestRoot.addNode("node_102").setProperty("exo:data", new FileInputStream(tempf));
ws1TestRoot.save(); // log here via listener
- ws1TestRoot.getNode("node_2").setProperty("exo:data", (InputStream)null); // remove property
+ ws1TestRoot.getNode("node_2").setProperty("exo:data", (InputStream) null); // remove property
ws1TestRoot.getNode("node_3").setProperty("exo:data", new ByteArrayInputStream("aaa".getBytes())); // set
// aaa
// bytes
@@ -263,7 +259,7 @@
ws1TestRoot.save(); // log here via listener
Lock n107lock = ws1TestRoot.getNode("node_5").lock(true, false);
ws1TestRoot.getSession().move(ws1TestRoot.getNode("node #53").getPath(),
- ws1TestRoot.getNode("node_5").getPath() + "/node #53");
+ ws1TestRoot.getNode("node_5").getPath() + "/node #53");
ws1TestRoot.save(); // log here via listener
ws1TestRoot.getNode("node_6").addMixin("mix:referenceable");
@@ -271,8 +267,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
@@ -282,8 +278,9 @@
fail("Can't get fullBackup chain");
// restore
- RepositoryEntry re = (RepositoryEntry)ws1Session.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
- WorkspaceEntry ws1back = makeWorkspaceEntry("ws1back.incr2", "jdbcjcr_backup_only_use_3");
+ RepositoryEntry re =
+ (RepositoryEntry) ws1Session.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
+ WorkspaceEntry ws1back = makeWorkspaceEntry(workspaceNameToRestore, dataSourceToWorkspaceRestore);
File backLog = new File(bch.getLogFilePath());
if (backLog.exists())
@@ -293,18 +290,18 @@
assertNotNull(bchLog.getStartedTime());
assertNotNull(bchLog.getFinishedTime());
- backup.restore(bchLog, re.getName(), ws1back, false);
+ backup.restore(bchLog, repositoryNameToBackup, ws1back, false);
// check
SessionImpl back1 = null;
try
{
- back1 = (SessionImpl)repository.login(credentials, ws1back.getName());
+ back1 = (SessionImpl) getReposityToBackup().login(credentials, workspaceNameToRestore);
Node ws1backTestRoot = back1.getRootNode().getNode("backupTest");
assertTrue("Node should exists", ws1backTestRoot.getNode("node_5").hasNode("node #53"));
assertTrue("Property should exists", ws1backTestRoot.getNode("node_5")
- .hasProperty("node #53/exo:extraData"));
+ .hasProperty("node #53/exo:extraData"));
assertTrue("Node should exists", ws1backTestRoot.hasNode("node_7"));
assertTrue("Property should exists", ws1backTestRoot.hasProperty("node_5/exo:data"));
@@ -312,20 +309,20 @@
assertTrue("Node should exists", ws1backTestRoot.hasNode("node_102"));
compareStream(new FileInputStream(tempf), ws1backTestRoot.getNode("node_5").getProperty("exo:data")
- .getStream());
+ .getStream());
compareStream(new FileInputStream(tempf), ws1backTestRoot.getNode("node_1").getProperty("exo:extraData")
- .getStream());
+ .getStream());
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)
{
@@ -344,25 +341,25 @@
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");
+ SessionImpl sessionWS1 = (SessionImpl) getReposityToBackup().login(credentials, workspaceNameToBackup);
+ sessionWS1.getRootNode().getNode("backupTest").getNode("node_5").setProperty("exo:data",
+ "Restored content should be same");
sessionWS1.save();
// backup
- File backDir = new File("target/backup/ws1_a");
+ File backDir = new File("target/backup/" + workspaceNameToBackup + getUUIndex());
backDir.mkdirs();
BackupConfig config = new BackupConfig();
- config.setRepository(repository.getName());
- config.setWorkspace("ws1");
+ config.setRepository(repositoryNameToBackup);
+ config.setWorkspace(workspaceNameToBackup);
config.setBackupType(BackupManager.FULL_BACKUP_ONLY);
config.setBackupDir(backDir);
backup.startBackup(config);
- BackupChain bch = backup.findBackup(repository.getName(), "ws1");
+ BackupChain bch = backup.findBackup(repositoryNameToBackup, workspaceNameToBackup);
// wait till full backup will be stopped
while (bch.getFullBackupState() != BackupJob.FINISHED)
@@ -379,7 +376,7 @@
fail("Can't get fullBackup chain");
// restore
- WorkspaceEntry ws1back = makeWorkspaceEntry("ws1back5", "jdbcjcr_backup_only_use_5");
+ WorkspaceEntry ws1back = makeWorkspaceEntry(workspaceNameToRestore, dataSourceToWorkspaceRestore);
File backLog = new File(bch.getLogFilePath());
if (backLog.exists())
@@ -389,25 +386,27 @@
assertNotNull(bchLog.getStartedTime());
assertNotNull(bchLog.getFinishedTime());
- backup.restore(bchLog, repository.getName(), ws1back, true);
+ backup.restore(bchLog, repositoryNameToBackup, ws1back, true);
- while (backup.getLastRestore(repository.getName(), ws1back.getName()).getStateRestore() != JobWorkspaceRestore.RESTORE_SUCCESSFUL
- && backup.getLastRestore(repository.getName(), ws1back.getName()).getStateRestore() != JobWorkspaceRestore.RESTORE_FAIL)
+ while (backup.getLastRestore(repositoryNameToBackup, workspaceNameToRestore).getStateRestore() != JobWorkspaceRestore.RESTORE_SUCCESSFUL
+ && backup.getLastRestore(repositoryNameToBackup, workspaceNameToRestore).getStateRestore() != JobWorkspaceRestore.RESTORE_FAIL)
{
Thread.sleep(50);
}
- if (backup.getLastRestore(repository.getName(), ws1back.getName()).getStateRestore() == JobWorkspaceRestore.RESTORE_FAIL)
- throw (Exception)backup.getLastRestore(repository.getName(), ws1back.getName()).getRestoreException();
+ if (backup.getLastRestore(repositoryNameToBackup, workspaceNameToRestore).getStateRestore() == JobWorkspaceRestore.RESTORE_FAIL)
+ throw (Exception) backup.getLastRestore(repositoryNameToBackup, workspaceNameToRestore)
+ .getRestoreException();
// check
SessionImpl back1 = null;
try
{
- back1 = (SessionImpl)repository.login(credentials, "ws1back5");
+ back1 = (SessionImpl) getReposityToBackup().login(credentials, workspaceNameToRestore);
Node ws1backTestRoot = back1.getRootNode().getNode("backupTest");
- assertEquals("Restored content should be same", "property-5", ws1backTestRoot.getNode("node_5")
- .getProperty("exo:data").getString());
+ assertEquals("Restored content should be same", "Restored content should be same", ws1backTestRoot.getNode(
+ "node_5")
+ .getProperty("exo:data").getString());
}
catch (Exception e)
{
@@ -427,12 +426,12 @@
public void testAutoStopBackupFull() throws Exception
{
// backup
- File backDir = new File("target/backup/ws1_123");
+ File backDir = new File("target/backup/" + workspaceNameToBackup + getUUIndex());
backDir.mkdirs();
BackupConfig config = new BackupConfig();
- config.setRepository(repository.getName());
- config.setWorkspace("ws1");
+ config.setRepository(repositoryNameToBackup);
+ config.setWorkspace(workspaceNameToBackup);
config.setBackupType(BackupManager.FULL_BACKUP_ONLY);
config.setBackupDir(backDir);
@@ -449,12 +448,12 @@
public void testAutoStopBackupIncr() throws Exception
{
// backup
- File backDir = new File("target/backup/ws1_123_321");
+ File backDir = new File("target/backup/" + workspaceNameToBackup + getUUIndex());
backDir.mkdirs();
BackupConfig config = new BackupConfig();
- config.setRepository(repository.getName());
- config.setWorkspace("ws1");
+ config.setRepository(repositoryNameToBackup);
+ config.setWorkspace(workspaceNameToBackup);
config.setBackupType(BackupManager.FULL_AND_INCREMENTAL);
config.setBackupDir(backDir);
config.setIncrementalJobPeriod(3);
@@ -477,12 +476,12 @@
public void testAutoStopBackupIncrRepetion() throws Exception
{
// backup
- File backDir = new File("target/backup/ws1_123321");
+ File backDir = new File("target/backup/" + workspaceNameToBackup + getUUIndex());
backDir.mkdirs();
BackupConfig config = new BackupConfig();
- config.setRepository(repository.getName());
- config.setWorkspace("ws1");
+ config.setRepository(repositoryNameToBackup);
+ config.setWorkspace(workspaceNameToBackup);
config.setBackupType(BackupManager.FULL_AND_INCREMENTAL);
config.setBackupDir(backDir);
config.setIncrementalJobPeriod(4);
@@ -502,19 +501,19 @@
public void testTwoRestores() throws Exception
{
{
- SessionImpl sessionWS1 = (SessionImpl)repository.login(credentials, "ws3");
+ SessionImpl sessionWS1 = (SessionImpl) getReposityToBackup().login(credentials, workspaceNameToBackup);
- 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
- File backDir = new File("target/backup/ws1_restore_1");
+ File backDir = new File("target/backup/" + workspaceNameToBackup + getUUIndex());
backDir.mkdirs();
BackupConfig config = new BackupConfig();
- config.setRepository(repository.getName());
- config.setWorkspace("ws3");
+ config.setRepository(repositoryNameToBackup);
+ config.setWorkspace(workspaceNameToBackup);
config.setBackupType(BackupManager.FULL_BACKUP_ONLY);
config.setBackupDir(backDir);
@@ -528,22 +527,22 @@
}
// 1-st restore
- WorkspaceEntry ws1_restore_1 = makeWorkspaceEntry("ws1_restore_1", "jdbcjcr_backup_only_use_6");
+ WorkspaceEntry ws1_restore_1 = makeWorkspaceEntry(workspaceNameToRestore, dataSourceToWorkspaceRestore);
File backLog = new File(bch.getLogFilePath());
if (backLog.exists())
{
BackupChainLog bchLog = new BackupChainLog(backLog);
- backup.restore(bchLog, repository.getName(), ws1_restore_1, false);
+ backup.restore(bchLog, repositoryNameToBackup, ws1_restore_1, false);
// check
- SessionImpl back1 = (SessionImpl)repository.login(credentials, "ws1_restore_1");
+ SessionImpl back1 = (SessionImpl) getReposityToBackup().login(credentials, workspaceNameToRestore);
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
@@ -552,12 +551,12 @@
{
// 2-st backup
- File backDir = new File("target/backup/ws1_restore_2");
+ File backDir = new File("target/backup/" + workspaceNameToBackup + getUUIndex());
backDir.mkdirs();
BackupConfig config = new BackupConfig();
- config.setRepository(repository.getName());
- config.setWorkspace("ws1_restore_1");
+ config.setRepository(repositoryNameToBackup);
+ config.setWorkspace(workspaceNameToRestore);
config.setBackupType(BackupManager.FULL_BACKUP_ONLY);
config.setBackupDir(backDir);
@@ -570,18 +569,20 @@
Thread.sleep(50);
}
+ removeWorkspaceFully(repositoryNameToBackup, workspaceNameToRestore);
+
// 2-st restore
- WorkspaceEntry ws1_restore_2 = makeWorkspaceEntry("ws1_restore_2", "jdbcjcr_backup_only_use_7");
+ WorkspaceEntry ws1_restore_2 = makeWorkspaceEntry(workspaceNameToRestore, dataSourceToWorkspaceRestore);
File backLog = new File(bch.getLogFilePath());
if (backLog.exists())
{
BackupChainLog bchLog = new BackupChainLog(backLog);
- backup.restore(bchLog, repository.getName(), ws1_restore_2, false);
+ backup.restore(bchLog, repositoryNameToBackup, ws1_restore_2, false);
// check
- SessionImpl back2 = (SessionImpl)repository.login(credentials, "ws1_restore_2");
+ SessionImpl back2 = (SessionImpl) getReposityToBackup().login(credentials, workspaceNameToRestore);
assertNotNull(back2.getRootNode().getNode("gdfgrghfhf").getProperty("data"));
}
else
@@ -592,19 +593,19 @@
public void testStartFullBackupWIthJobPeriod() throws Exception
{
// backup
- File backDir = new File("target/backup/ws1_fwp");
+ File backDir = new File("target/backup" + workspaceNameToBackup + getUUIndex());
backDir.mkdirs();
BackupConfig config = new BackupConfig();
- config.setRepository(repository.getName());
- config.setWorkspace("ws1");
+ config.setRepository(repositoryNameToBackup);
+ config.setWorkspace(workspaceNameToBackup);
config.setBackupType(BackupManager.FULL_BACKUP_ONLY);
config.setBackupDir(backDir);
config.setIncrementalJobPeriod(3600);
backup.startBackup(config);
- BackupChain bch = backup.findBackup(repository.getName(), "ws1");
+ BackupChain bch = backup.findBackup(repositoryNameToBackup, workspaceNameToBackup);
// wait till full backup will be stopped
while (bch.getFullBackupState() != BackupJob.FINISHED)
@@ -617,12 +618,12 @@
public void testNegativeIncremetalJobPeriod() throws Exception
{
// backup
- File backDir = new File("target/backup/ws1_negative_period");
+ File backDir = new File("target/backup/ws1_negative_period" + getUUIndex());
backDir.mkdirs();
BackupConfig config = new BackupConfig();
- config.setRepository(repository.getName());
- config.setWorkspace("ws1");
+ config.setRepository(repositoryNameToBackup);
+ config.setWorkspace(workspaceNameToBackup);
config.setBackupType(BackupManager.FULL_AND_INCREMENTAL);
config.setIncrementalJobPeriod(-1000);
@@ -642,12 +643,12 @@
public void testNegativeIncremetalJobNumber() throws Exception
{
// backup
- File backDir = new File("target/backup/ws1_negative_job_number");
+ File backDir = new File("target/backup/ws1_negative_job_number" + getUUIndex());
backDir.mkdirs();
BackupConfig config = new BackupConfig();
- config.setRepository(repository.getName());
- config.setWorkspace("ws1");
+ config.setRepository(repositoryNameToBackup);
+ config.setWorkspace(workspaceNameToBackup);
config.setBackupType(BackupManager.FULL_AND_INCREMENTAL);
config.setIncrementalJobNumber(-5);
@@ -667,19 +668,19 @@
public void testRestoreAfterFAilureRestore() throws Exception
{
// backup
- File backDir = new File("target/backup/ws1");
+ File backDir = new File("target/backup/" + workspaceNameToBackup + getUUIndex());
backDir.mkdirs();
BackupConfig config = new BackupConfig();
- config.setRepository(repository.getName());
- config.setWorkspace("ws1");
+ config.setRepository(repositoryNameToBackup);
+ config.setWorkspace(workspaceNameToBackup);
config.setBackupType(BackupManager.FULL_BACKUP_ONLY);
config.setBackupDir(backDir);
backup.startBackup(config);
- BackupChain bch = backup.findBackup(repository.getName(), "ws1");
+ BackupChain bch = backup.findBackup(repositoryNameToBackup, workspaceNameToBackup);
// wait till full backup will be stopped
while (bch.getFullBackupState() != BackupJob.FINISHED)
@@ -696,8 +697,9 @@
fail("Can't get fullBackup chain");
// restore
- RepositoryEntry re = (RepositoryEntry)ws1Session.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
- WorkspaceEntry ws1back = makeWorkspaceEntry("ws1backt", "jdbcjcr_backup_only_use_8_NOT_EXIST");
+ RepositoryEntry re =
+ (RepositoryEntry) ws1Session.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
+ WorkspaceEntry ws1back = makeWorkspaceEntry(workspaceNameToRestore, dataSourceToWorkspaceRestore + "NOT_EXIST");
File backLog = new File(bch.getLogFilePath());
if (backLog.exists())
@@ -706,26 +708,26 @@
try
{
- backup.restore(bchLog, re.getName(), ws1back, false);
+ backup.restore(bchLog, repositoryNameToBackup, ws1back, false);
fail("The backup can not be restored.");
}
catch (Exception e)
{
//ok
- WorkspaceEntry ws1backTwo = makeWorkspaceEntry("ws1backt", "jdbcjcr_backup_only_use_8");
+ WorkspaceEntry ws1backTwo = makeWorkspaceEntry(workspaceNameToRestore, dataSourceToWorkspaceRestore);
- backup.restore(bchLog, re.getName(), ws1backTwo, false);
+ backup.restore(bchLog, repositoryNameToBackup, ws1backTwo, false);
}
// check
SessionImpl back1 = null;
try
{
- back1 = (SessionImpl)repository.login(credentials, "ws1back");
+ back1 = (SessionImpl) getReposityToBackup().login(credentials, workspaceNameToRestore);
Node ws1backTestRoot = back1.getRootNode().getNode("backupTest");
assertEquals("Restored content should be same", "property-5", ws1backTestRoot.getNode("node_5")
- .getProperty("exo:data").getString());
+ .getProperty("exo:data").getString());
}
catch (Exception e)
{
@@ -742,7 +744,7 @@
fail("There are no backup files in " + backDir.getAbsolutePath());
}
- public void testRepositoryFullBackupRestore() throws Exception
+ /*public void testRepositoryFullBackupRestore() throws Exception
{
// backup
File backDir = new File("target/backup");
@@ -770,11 +772,12 @@
backup.stopBackup(bch);
// restore
- RepositoryEntry re = (RepositoryEntry)ws1Session.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
+ RepositoryEntry re =
+ (RepositoryEntry) ws1Session.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
String newRepositoryName = "repo_restored_1";
RepositoryEntry newRepositoryEntry =
- makeRepositoryEntry(newRepositoryName, re, "jdbcjcr_to_repository_restore_1", null);
+ makeRepositoryEntry(newRepositoryName, re, "jdbcjcr_to_repository_restore_1", null);
File backLog = new File(bch.getLogFilePath());
if (backLog.exists())
@@ -785,8 +788,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);
@@ -796,10 +799,10 @@
SessionImpl back1 = null;
try
{
- back1 = (SessionImpl)restoredRepository.login(credentials, wsName);
+ back1 = (SessionImpl) restoredRepository.login(credentials, wsName);
Node ws1backTestRoot = back1.getRootNode().getNode("backupTest");
assertEquals("Restored content should be same", "property-5", ws1backTestRoot.getNode("node_5")
- .getProperty("exo:data").getString());
+ .getProperty("exo:data").getString());
}
catch (Exception e)
{
@@ -846,11 +849,12 @@
backup.stopBackup(bch);
// restore
- RepositoryEntry re = (RepositoryEntry)ws1Session.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
+ RepositoryEntry re =
+ (RepositoryEntry) ws1Session.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
String newRepositoryName = "repo_restored_4";
RepositoryEntry newRepositoryEntry =
- makeRepositoryEntry(newRepositoryName, re, "jdbcjcr_to_repository_restore_4", null);
+ makeRepositoryEntry(newRepositoryName, re, "jdbcjcr_to_repository_restore_4", null);
File backLog = new File(bch.getLogFilePath());
if (backLog.exists())
@@ -870,10 +874,10 @@
SessionImpl back1 = null;
try
{
- back1 = (SessionImpl)repository.login(credentials, wsName);
+ back1 = (SessionImpl) repository.login(credentials, wsName);
Node ws1backTestRoot = back1.getRootNode().getNode("backupTest");
assertEquals("Restored content should be same", "property-5", ws1backTestRoot.getNode("node_5")
- .getProperty("exo:data").getString());
+ .getProperty("exo:data").getString());
}
catch (Exception e)
{
@@ -919,11 +923,12 @@
backup.stopBackup(bch);
// restore
- RepositoryEntry re = (RepositoryEntry)ws1Session.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
+ RepositoryEntry re =
+ (RepositoryEntry) ws1Session.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
String newRepositoryName = "repo_restored_2";
RepositoryEntry newRepositoryEntry =
- makeRepositoryEntry(newRepositoryName, re, "jdbcjcr_to_repository_restore_2", null);
+ makeRepositoryEntry(newRepositoryName, re, "jdbcjcr_to_repository_restore_2", null);
File backLog = new File(bch.getLogFilePath());
if (backLog.exists())
@@ -938,7 +943,7 @@
JobRepositoryRestore job = backup.getLastRepositoryRestore(newRepositoryName);
while (job.getStateRestore() != JobRepositoryRestore.REPOSITORY_RESTORE_SUCCESSFUL
- || job.getStateRestore() == JobRepositoryRestore.REPOSITORY_RESTORE_FAIL)
+ || job.getStateRestore() == JobRepositoryRestore.REPOSITORY_RESTORE_FAIL)
{
Thread.yield();
Thread.sleep(50);
@@ -952,10 +957,10 @@
SessionImpl back1 = null;
try
{
- back1 = (SessionImpl)restoredRepository.login(credentials, wsName);
+ back1 = (SessionImpl) restoredRepository.login(credentials, wsName);
Node ws1backTestRoot = back1.getRootNode().getNode("backupTest");
assertEquals("Restored content should be same", "property-5", ws1backTestRoot.getNode("node_5")
- .getProperty("exo:data").getString());
+ .getProperty("exo:data").getString());
}
catch (Exception e)
{
@@ -1001,11 +1006,12 @@
backup.stopBackup(bch);
// restore
- RepositoryEntry re = (RepositoryEntry)ws1Session.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
+ RepositoryEntry re =
+ (RepositoryEntry) ws1Session.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
String newRepositoryName = "repo_restored_3";
RepositoryEntry newRepositoryEntry =
- makeRepositoryEntry(newRepositoryName, re, "jdbcjcr_to_repository_restore_3", null);
+ makeRepositoryEntry(newRepositoryName, re, "jdbcjcr_to_repository_restore_3", null);
// create workspace mappingS
Map<String, String> workspaceMapping = new HashedMap();
@@ -1040,7 +1046,7 @@
JobRepositoryRestore job = backup.getLastRepositoryRestore(newRepositoryName);
while (job.getStateRestore() != JobRepositoryRestore.REPOSITORY_RESTORE_SUCCESSFUL
- || job.getStateRestore() == JobRepositoryRestore.REPOSITORY_RESTORE_FAIL)
+ || job.getStateRestore() == JobRepositoryRestore.REPOSITORY_RESTORE_FAIL)
{
Thread.yield();
Thread.sleep(50);
@@ -1054,10 +1060,10 @@
SessionImpl back1 = null;
try
{
- back1 = (SessionImpl)restoredRepository.login(credentials, workspaceMapping.get(wsName));
+ back1 = (SessionImpl) restoredRepository.login(credentials, workspaceMapping.get(wsName));
Node ws1backTestRoot = back1.getRootNode().getNode("backupTest");
assertEquals("Restored content should be same", "property-5", ws1backTestRoot.getNode("node_5")
- .getProperty("exo:data").getString());
+ .getProperty("exo:data").getString());
}
catch (Exception e)
{
@@ -1102,11 +1108,12 @@
public void testRepositoryRestoreFail() throws Exception
{
// restore
- RepositoryEntry re = (RepositoryEntry)ws1Session.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
+ RepositoryEntry re =
+ (RepositoryEntry) ws1Session.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
String newRepositoryName = "repo_restored_5";
RepositoryEntry newRepositoryEntry =
- makeRepositoryEntry(newRepositoryName, re, "jdbcjcr_to_repository_restore_5", null);
+ makeRepositoryEntry(newRepositoryName, re, "jdbcjcr_to_repository_restore_5", null);
//create broken system workspaceEntry
newRepositoryEntry.getWorkspaceEntries().get(0).getQueryHandler().setType("gg");
@@ -1184,7 +1191,8 @@
ws1Session.getRootNode().save();
// restore
- RepositoryEntry re = (RepositoryEntry)ws1Session.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
+ RepositoryEntry re =
+ (RepositoryEntry) ws1Session.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
WorkspaceEntry ws1back = makeWorkspaceEntry("ws1back.incr737", "jdbcjcr25");
File backLog = new File(bch.getLogFilePath());
@@ -1201,7 +1209,7 @@
SessionImpl back1 = null;
try
{
- back1 = (SessionImpl)repository.login(credentials, ws1back.getName());
+ back1 = (SessionImpl) repository.login(credentials, ws1back.getName());
Node node_101 = back1.getRootNode().getNode("node_101");
assertNotNull(node_101);
@@ -1261,7 +1269,8 @@
fail("Can't get fullBackup chain");
// restore
- RepositoryEntry re = (RepositoryEntry)ws1Session.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
+ RepositoryEntry re =
+ (RepositoryEntry) ws1Session.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
WorkspaceEntry ws1 = null;
for (WorkspaceEntry we : re.getWorkspaceEntries())
{
@@ -1286,10 +1295,10 @@
SessionImpl back1 = null;
try
{
- back1 = (SessionImpl)repository.login(credentials, "ws1");
+ back1 = (SessionImpl) repository.login(credentials, "ws1");
Node ws1backTestRoot = back1.getRootNode().getNode("backupTest");
assertEquals("Restored content should be same", "property-5", ws1backTestRoot.getNode("node_5")
- .getProperty("exo:data").getString());
+ .getProperty("exo:data").getString());
}
catch (Exception e)
{
@@ -1338,7 +1347,8 @@
fail("Can't get fullBackup chain");
// restore
- RepositoryEntry re = (RepositoryEntry)ws1Session.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
+ RepositoryEntry re =
+ (RepositoryEntry) ws1Session.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
WorkspaceEntry ws1 = null;
for (WorkspaceEntry we : re.getWorkspaceEntries())
{
@@ -1360,7 +1370,7 @@
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)
+ && backup.getLastRestore(repository.getName(), ws1.getName()).getStateRestore() != JobWorkspaceRestore.RESTORE_FAIL)
{
Thread.sleep(50);
}
@@ -1369,10 +1379,10 @@
SessionImpl back1 = null;
try
{
- back1 = (SessionImpl)repository.login(credentials, "ws1");
+ back1 = (SessionImpl) repository.login(credentials, "ws1");
Node ws1backTestRoot = back1.getRootNode().getNode("backupTest");
assertEquals("Restored content should be same", "property-5", ws1backTestRoot.getNode("node_5")
- .getProperty("exo:data").getString());
+ .getProperty("exo:data").getString());
}
catch (Exception e)
{
@@ -1421,7 +1431,8 @@
fail("Can't get fullBackup chain");
// restore
- RepositoryEntry re = (RepositoryEntry)ws1Session.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
+ RepositoryEntry re =
+ (RepositoryEntry) ws1Session.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
WorkspaceEntry ws1 = null;
for (WorkspaceEntry we : re.getWorkspaceEntries())
{
@@ -1443,7 +1454,7 @@
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)
+ && backup.getLastRestore(repository.getName(), ws1.getName()).getStateRestore() != JobWorkspaceRestore.RESTORE_FAIL)
{
Thread.sleep(50);
}
@@ -1452,10 +1463,10 @@
SessionImpl back1 = null;
try
{
- back1 = (SessionImpl)repository.login(credentials, "ws1");
+ back1 = (SessionImpl) repository.login(credentials, "ws1");
Node ws1backTestRoot = back1.getRootNode().getNode("backupTest");
assertEquals("Restored content should be same", "property-5", ws1backTestRoot.getNode("node_5")
- .getProperty("exo:data").getString());
+ .getProperty("exo:data").getString());
}
catch (Exception e)
{
@@ -1474,11 +1485,11 @@
public void testExistedRepositoryRestore() throws Exception
{
- RepositoryImpl repositoryDB8 = (RepositoryImpl)repositoryService.getRepository("db8");
+ RepositoryImpl repositoryDB8 = (RepositoryImpl) repositoryService.getRepository("db8");
for (String wsName : repositoryDB8.getWorkspaceNames())
{
- SessionImpl sessionWS = (SessionImpl)repositoryDB8.login(credentials, wsName);
+ SessionImpl sessionWS = (SessionImpl) repositoryDB8.login(credentials, wsName);
Node wsTestRoot = sessionWS.getRootNode().addNode("backupTest");
sessionWS.getRootNode().save();
@@ -1486,7 +1497,7 @@
sessionWS.getRootNode().save();
}
- SessionImpl sessionWS = (SessionImpl)repositoryDB8.login(credentials, WS_NAME);
+ SessionImpl sessionWS = (SessionImpl) repositoryDB8.login(credentials, WS_NAME);
// backup
File backDir = new File("target/backup");
@@ -1515,7 +1526,7 @@
// restore
RepositoryEntry baseRE =
- (RepositoryEntry)sessionWS.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
+ (RepositoryEntry) sessionWS.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
RepositoryEntry re = makeRepositoryEntry(baseRE.getName(), baseRE, null, null);
File backLog = new File(bch.getLogFilePath());
@@ -1529,7 +1540,7 @@
backup.restoreExistingRepository(bchLog, re, false);
assertEquals(JobWorkspaceRestore.RESTORE_SUCCESSFUL, backup.getLastRepositoryRestore(re.getName())
- .getStateRestore());
+ .getStateRestore());
// check
ManageableRepository restoredRepository = repositoryService.getRepository(re.getName());
@@ -1539,10 +1550,10 @@
SessionImpl back1 = null;
try
{
- back1 = (SessionImpl)restoredRepository.login(credentials, wsName);
+ back1 = (SessionImpl) restoredRepository.login(credentials, wsName);
Node ws1backTestRoot = back1.getRootNode().getNode("backupTest");
assertEquals("Restored content should be same", "property-5", ws1backTestRoot.getNode("node_5")
- .getProperty("exo:data").getString());
+ .getProperty("exo:data").getString());
}
catch (Exception e)
{
@@ -1562,11 +1573,11 @@
public void testExistedRepositoryRestoreMultiDB() throws Exception
{
- RepositoryImpl repositoryDB7 = (RepositoryImpl)repositoryService.getRepository("db7");
+ RepositoryImpl repositoryDB7 = (RepositoryImpl) repositoryService.getRepository("db7");
for (String wsName : repositoryDB7.getWorkspaceNames())
{
- SessionImpl sessionWS = (SessionImpl)repositoryDB7.login(credentials, wsName);
+ SessionImpl sessionWS = (SessionImpl) repositoryDB7.login(credentials, wsName);
Node wsTestRoot = sessionWS.getRootNode().addNode("backupTest");
sessionWS.getRootNode().save();
@@ -1574,7 +1585,7 @@
sessionWS.getRootNode().save();
}
- SessionImpl sessionWS = (SessionImpl)repositoryDB7.login(credentials, WS_NAME);
+ SessionImpl sessionWS = (SessionImpl) repositoryDB7.login(credentials, WS_NAME);
// backup
File backDir = new File("target/backup");
@@ -1603,7 +1614,7 @@
// restore
RepositoryEntry baseRE =
- (RepositoryEntry)sessionWS.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
+ (RepositoryEntry) sessionWS.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
RepositoryEntry re = makeRepositoryEntry(baseRE.getName(), baseRE, null, null);
File backLog = new File(bch.getLogFilePath());
@@ -1617,7 +1628,7 @@
backup.restoreExistingRepository(bchLog, re, false);
assertEquals(JobWorkspaceRestore.RESTORE_SUCCESSFUL, backup.getLastRepositoryRestore(re.getName())
- .getStateRestore());
+ .getStateRestore());
// check
ManageableRepository restoredRepository = repositoryService.getRepository(re.getName());
@@ -1627,10 +1638,10 @@
SessionImpl back1 = null;
try
{
- back1 = (SessionImpl)restoredRepository.login(credentials, wsName);
+ back1 = (SessionImpl) restoredRepository.login(credentials, wsName);
Node ws1backTestRoot = back1.getRootNode().getNode("backupTest");
assertEquals("Restored content should be same", "property-5", ws1backTestRoot.getNode("node_5")
- .getProperty("exo:data").getString());
+ .getProperty("exo:data").getString());
}
catch (Exception e)
{
@@ -1650,11 +1661,11 @@
public void testExistedRepositoryRestoreAsync() throws Exception
{
- RepositoryImpl repositoryDB8 = (RepositoryImpl)repositoryService.getRepository("db8");
+ RepositoryImpl repositoryDB8 = (RepositoryImpl) repositoryService.getRepository("db8");
for (String wsName : repositoryDB8.getWorkspaceNames())
{
- SessionImpl sessionWS = (SessionImpl)repositoryDB8.login(credentials, wsName);
+ SessionImpl sessionWS = (SessionImpl) repositoryDB8.login(credentials, wsName);
Node wsTestRoot = sessionWS.getRootNode().addNode("backupTest");
sessionWS.getRootNode().save();
@@ -1662,7 +1673,7 @@
sessionWS.getRootNode().save();
}
- SessionImpl sessionWS = (SessionImpl)repositoryDB8.login(credentials, WS_NAME);
+ SessionImpl sessionWS = (SessionImpl) repositoryDB8.login(credentials, WS_NAME);
// backup
File backDir = new File("target/backup");
@@ -1691,7 +1702,7 @@
// restore
RepositoryEntry baseRE =
- (RepositoryEntry)sessionWS.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
+ (RepositoryEntry) sessionWS.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
RepositoryEntry re = makeRepositoryEntry(baseRE.getName(), baseRE, null, null);
File backLog = new File(bch.getLogFilePath());
@@ -1707,13 +1718,13 @@
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());
+ .getStateRestore());
// check
ManageableRepository restoredRepository = repositoryService.getRepository(re.getName());
@@ -1723,10 +1734,10 @@
SessionImpl back1 = null;
try
{
- back1 = (SessionImpl)restoredRepository.login(credentials, wsName);
+ back1 = (SessionImpl) restoredRepository.login(credentials, wsName);
Node ws1backTestRoot = back1.getRootNode().getNode("backupTest");
assertEquals("Restored content should be same", "property-5", ws1backTestRoot.getNode("node_5")
- .getProperty("exo:data").getString());
+ .getProperty("exo:data").getString());
}
catch (Exception e)
{
@@ -1746,11 +1757,11 @@
public void testExistedRepositoryRestoreAsync2() throws Exception
{
- RepositoryImpl repositoryDB8 = (RepositoryImpl)repositoryService.getRepository("db8");
+ RepositoryImpl repositoryDB8 = (RepositoryImpl) repositoryService.getRepository("db8");
for (String wsName : repositoryDB8.getWorkspaceNames())
{
- SessionImpl sessionWS = (SessionImpl)repositoryDB8.login(credentials, wsName);
+ SessionImpl sessionWS = (SessionImpl) repositoryDB8.login(credentials, wsName);
Node wsTestRoot = sessionWS.getRootNode().addNode("backupTest");
sessionWS.getRootNode().save();
@@ -1758,7 +1769,7 @@
sessionWS.getRootNode().save();
}
- SessionImpl sessionWS = (SessionImpl)repositoryDB8.login(credentials, WS_NAME);
+ SessionImpl sessionWS = (SessionImpl) repositoryDB8.login(credentials, WS_NAME);
// backup
File backDir = new File("target/backup");
@@ -1787,7 +1798,7 @@
// restore
RepositoryEntry baseRE =
- (RepositoryEntry)sessionWS.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
+ (RepositoryEntry) sessionWS.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
RepositoryEntry re = makeRepositoryEntry(baseRE.getName(), baseRE, null, null);
File backLog = new File(bch.getLogFilePath());
@@ -1803,13 +1814,13 @@
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());
+ .getStateRestore());
// check
ManageableRepository restoredRepository = repositoryService.getRepository(re.getName());
@@ -1819,10 +1830,10 @@
SessionImpl back1 = null;
try
{
- back1 = (SessionImpl)restoredRepository.login(credentials, wsName);
+ back1 = (SessionImpl) restoredRepository.login(credentials, wsName);
Node ws1backTestRoot = back1.getRootNode().getNode("backupTest");
assertEquals("Restored content should be same", "property-5", ws1backTestRoot.getNode("node_5")
- .getProperty("exo:data").getString());
+ .getProperty("exo:data").getString());
}
catch (Exception e)
{
@@ -1842,9 +1853,9 @@
public void testExistedWorkspaceRestoreMultiDB() throws Exception
{
- RepositoryImpl repositoryDB7 = (RepositoryImpl)repositoryService.getRepository("db7");
+ 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();
@@ -1881,7 +1892,7 @@
fail("Can't get fullBackup chain");
// restore
- RepositoryEntry re = (RepositoryEntry)sessionWS.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
+ RepositoryEntry re = (RepositoryEntry) sessionWS.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
WorkspaceEntry ws1 = null;
for (WorkspaceEntry we : re.getWorkspaceEntries())
{
@@ -1906,10 +1917,10 @@
SessionImpl back1 = null;
try
{
- back1 = (SessionImpl)repositoryDB7.login(credentials, "ws1");
+ back1 = (SessionImpl) repositoryDB7.login(credentials, "ws1");
Node ws1backTestRoot = back1.getRootNode().getNode("backupTest");
assertEquals("Restored content should be same", "property-5", ws1backTestRoot.getNode("node_5")
- .getProperty("exo:data").getString());
+ .getProperty("exo:data").getString());
}
catch (Exception e)
{
@@ -1972,10 +1983,10 @@
SessionImpl back1 = null;
try
{
- back1 = (SessionImpl)repository.login(credentials, "ws1");
+ back1 = (SessionImpl) repository.login(credentials, "ws1");
Node ws1backTestRoot = back1.getRootNode().getNode("backupTest");
assertEquals("Restored content should be same", "property-5", ws1backTestRoot.getNode("node_5")
- .getProperty("exo:data").getString());
+ .getProperty("exo:data").getString());
}
catch (Exception e)
{
@@ -1994,11 +2005,11 @@
public void testExistedRepositoryRestoreWithConfig() throws Exception
{
- RepositoryImpl repositoryDB8 = (RepositoryImpl)repositoryService.getRepository("db8");
+ RepositoryImpl repositoryDB8 = (RepositoryImpl) repositoryService.getRepository("db8");
for (String wsName : repositoryDB8.getWorkspaceNames())
{
- SessionImpl sessionWS = (SessionImpl)repositoryDB8.login(credentials, wsName);
+ SessionImpl sessionWS = (SessionImpl) repositoryDB8.login(credentials, wsName);
Node wsTestRoot = sessionWS.getRootNode().addNode("backupTest");
sessionWS.getRootNode().save();
@@ -2006,7 +2017,7 @@
sessionWS.getRootNode().save();
}
- SessionImpl sessionWS = (SessionImpl)repositoryDB8.login(credentials, WS_NAME);
+ SessionImpl sessionWS = (SessionImpl) repositoryDB8.login(credentials, WS_NAME);
// backup
File backDir = new File("target/backup/db1");
@@ -2048,7 +2059,7 @@
backup.restoreExistingRepository(bchLog.getBackupId(), false);
assertEquals(JobWorkspaceRestore.RESTORE_SUCCESSFUL, backup.getLastRepositoryRestore(repoName)
- .getStateRestore());
+ .getStateRestore());
// check
ManageableRepository restoredRepository = repositoryService.getRepository(repoName);
@@ -2058,10 +2069,10 @@
SessionImpl back1 = null;
try
{
- back1 = (SessionImpl)restoredRepository.login(credentials, wsName);
+ back1 = (SessionImpl) restoredRepository.login(credentials, wsName);
Node ws1backTestRoot = back1.getRootNode().getNode("backupTest");
assertEquals("Restored content should be same", "property-5", ws1backTestRoot.getNode("node_5")
- .getProperty("exo:data").getString());
+ .getProperty("exo:data").getString());
}
catch (Exception e)
{
@@ -2128,10 +2139,10 @@
SessionImpl back1 = null;
try
{
- back1 = (SessionImpl)repository.login(credentials, "ws1");
+ back1 = (SessionImpl) repository.login(credentials, "ws1");
Node ws1backTestRoot = back1.getRootNode().getNode("backupTest");
assertEquals("Restored content should be same", "property-5", ws1backTestRoot.getNode("node_5")
- .getProperty("exo:data").getString());
+ .getProperty("exo:data").getString());
}
catch (Exception e)
{
@@ -2150,11 +2161,11 @@
public void testRepositoryRestoreWithConfig() throws Exception
{
- RepositoryImpl repositoryDB8 = (RepositoryImpl)repositoryService.getRepository("db8");
+ RepositoryImpl repositoryDB8 = (RepositoryImpl) repositoryService.getRepository("db8");
for (String wsName : repositoryDB8.getWorkspaceNames())
{
- SessionImpl sessionWS = (SessionImpl)repositoryDB8.login(credentials, wsName);
+ SessionImpl sessionWS = (SessionImpl) repositoryDB8.login(credentials, wsName);
Node wsTestRoot = sessionWS.getRootNode().addNode("backupTest");
sessionWS.getRootNode().save();
@@ -2162,7 +2173,7 @@
sessionWS.getRootNode().save();
}
- SessionImpl sessionWS = (SessionImpl)repositoryDB8.login(credentials, WS_NAME);
+ SessionImpl sessionWS = (SessionImpl) repositoryDB8.login(credentials, WS_NAME);
// backup
File backDir = new File("target/backup");
@@ -2206,7 +2217,7 @@
backup.restoreRepository(bchLog.getBackupId(), false);
assertEquals(JobWorkspaceRestore.RESTORE_SUCCESSFUL, backup.getLastRepositoryRestore(repoName)
- .getStateRestore());
+ .getStateRestore());
// check
ManageableRepository restoredRepository = repositoryService.getRepository(repoName);
@@ -2216,10 +2227,10 @@
SessionImpl back1 = null;
try
{
- back1 = (SessionImpl)restoredRepository.login(credentials, wsName);
+ back1 = (SessionImpl) restoredRepository.login(credentials, wsName);
Node ws1backTestRoot = back1.getRootNode().getNode("backupTest");
assertEquals("Restored content should be same", "property-5", ws1backTestRoot.getNode("node_5")
- .getProperty("exo:data").getString());
+ .getProperty("exo:data").getString());
}
catch (Exception e)
{
@@ -2235,5 +2246,5 @@
}
else
fail("There are no backup files in " + backDir.getAbsolutePath());
- }
+ }*/
}
Modified: jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/TestBackupRestart.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/TestBackupRestart.java 2010-12-10 08:38:51 UTC (rev 3658)
+++ jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/TestBackupRestart.java 2010-12-10 10:40:25 UTC (rev 3659)
@@ -18,12 +18,12 @@
*/
package org.exoplatform.services.jcr.ext.backup;
+import org.exoplatform.services.jcr.ext.backup.impl.BackupScheduler;
+
import java.io.File;
import java.util.Calendar;
import java.util.Date;
-import org.exoplatform.services.jcr.ext.backup.impl.BackupScheduler;
-
/**
* Created by The eXo Platform SAS
*
Modified: jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/TestBackupScheduler.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/TestBackupScheduler.java 2010-12-10 08:38:51 UTC (rev 3658)
+++ jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/TestBackupScheduler.java 2010-12-10 10:40:25 UTC (rev 3659)
@@ -18,17 +18,17 @@
*/
package org.exoplatform.services.jcr.ext.backup;
+import org.exoplatform.services.jcr.ext.backup.impl.BackupMessagesLog;
+import org.exoplatform.services.jcr.ext.backup.impl.BackupScheduler;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
+
import java.io.File;
import java.util.Calendar;
import java.util.Date;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import org.exoplatform.services.jcr.ext.backup.impl.BackupMessagesLog;
-import org.exoplatform.services.jcr.ext.backup.impl.BackupScheduler;
-import org.exoplatform.services.log.ExoLogger;
-import org.exoplatform.services.log.Log;
-
/**
* Created by The eXo Platform SAS
*
Modified: jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/repository/creation/TestRepositoryCreationService.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/repository/creation/TestRepositoryCreationService.java 2010-12-10 08:38:51 UTC (rev 3658)
+++ jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/repository/creation/TestRepositoryCreationService.java 2010-12-10 10:40:25 UTC (rev 3659)
@@ -16,10 +16,6 @@
*/
package org.exoplatform.services.jcr.ext.repository.creation;
-import java.io.File;
-
-import javax.jcr.Node;
-
import org.exoplatform.services.jcr.RepositoryService;
import org.exoplatform.services.jcr.config.RepositoryConfigurationException;
import org.exoplatform.services.jcr.config.RepositoryEntry;
@@ -31,6 +27,10 @@
import org.exoplatform.services.jcr.ext.backup.RepositoryBackupConfig;
import org.exoplatform.services.jcr.impl.core.SessionImpl;
+import java.io.File;
+
+import javax.jcr.Node;
+
/**
* Created by The eXo Platform SAS.
*
Modified: jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration.xml
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration.xml 2010-12-10 08:38:51 UTC (rev 3658)
+++ jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration.xml 2010-12-10 10:40:25 UTC (rev 3659)
@@ -1152,7 +1152,7 @@
<init-params>
<value-param>
<name>bind-name</name>
- <value>jdbcjcr_backup_only_use_3</value>
+ <value>jdbcjcr_workspace_restore</value>
</value-param>
<value-param>
<name>class-name</name>
@@ -1166,7 +1166,7 @@
<name>ref-addresses</name>
<description>ref-addresses</description>
<property name="driverClassName" value="org.hsqldb.jdbcDriver" />
- <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr_backup_only_use_3" />
+ <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr_workspace_restore" />
<property name="username" value="sa" />
<property name="password" value="" />
</properties-param>
Modified: jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config.xml
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config.xml 2010-12-10 08:38:51 UTC (rev 3658)
+++ jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config.xml 2010-12-10 10:40:25 UTC (rev 3659)
@@ -431,9 +431,9 @@
<!-- for system storage -->
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
<properties>
- <property name="source-name" value="jdbcjcr28" />
+ <property name="source-name" value="jdbcjcr_backup_only_use_1" />
<property name="dialect" value="hsqldb" />
- <property name="multi-db" value="false" />
+ <property name="multi-db" value="true" />
<property name="update-storage" value="true" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/db8_ws" />
@@ -464,9 +464,9 @@
<workspace name="ws1">
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
<properties>
- <property name="source-name" value="jdbcjcr28" />
+ <property name="source-name" value="jdbcjcr_backup_only_use_2" />
<property name="dialect" value="hsqldb" />
- <property name="multi-db" value="false" />
+ <property name="multi-db" value="true" />
<property name="update-storage" value="true" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/db8_ws1" />
More information about the exo-jcr-commits
mailing list