exo-jcr SVN: r3660 - in jcr/trunk/exo.jcr.component.ext: src/test/java/org/exoplatform/services/jcr/ext/backup and 1 other directories.
by do-not-reply＠jboss.org
Author: areshetnyak
Date: 2010-12-13 04:20:33 -0500 (Mon, 13 Dec 2010)
New Revision: 3660
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/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 : All resources was cleaned after backup/restore use cases of repository.
Modified: jcr/trunk/exo.jcr.component.ext/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.ext/pom.xml 2010-12-10 10:40:25 UTC (rev 3659)
+++ jcr/trunk/exo.jcr.component.ext/pom.xml 2010-12-13 09:20:33 UTC (rev 3660)
@@ -188,6 +188,7 @@
<include>**/backup/*.java</include>
</includes>
<excludes>
+ <exclude>**/backup/TestRDBMSBackupManager.java</exclude>
<exclude>**/backup/TestRdbmsWorkspaceInitializer.java</exclude>
<exclude>**/BaseStandaloneTest.java</exclude>
<exclude>**/backup/AbstractBackupTestCase.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 10:40:25 UTC (rev 3659)
+++ jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/AbstractBackupTestCase.java 2010-12-13 09:20:33 UTC (rev 3660)
@@ -78,8 +78,14 @@
protected String dataSourceToWorkspaceRestore = "jdbcjcr_workspace_restore";
- protected String repositoryNameToRestpre = "db8backup";
+ protected String dataSourceToRepositoryRestore = "jdbcjcr_to_repository_restore";
+
+ protected String dataSourceToRepositoryRestoreSingleDB = "jdbcjcr_to_repository_restore_singel_db";
+
+ protected String repositoryNameToBackupSingleDB = "db7";
+ protected String repositoryNameToRestore = "db8backup";
+
protected String workspaceNameToRestore = "ws1backup";
/**
@@ -131,6 +137,18 @@
}
}
+ RepositoryImpl repositoryDB7 = (RepositoryImpl) repositoryService.getRepository(repositoryNameToBackupSingleDB);
+
+ 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();
+ }
+
}
protected abstract ExtendedBackupManager getBackupManager();
@@ -158,6 +176,22 @@
}
}
+ RepositoryImpl repositoryDB7 = (RepositoryImpl) repositoryService.getRepository(repositoryNameToBackupSingleDB);
+
+ for (String wsName : repositoryDB7.getWorkspaceNames())
+ {
+ try
+ {
+ SessionImpl ws = (SessionImpl) repositoryDB7.login(credentials, wsName);
+ ws.getRootNode().getNode("backupTest").remove();
+ ws.save();
+ }
+ catch (PathNotFoundException e)
+ {
+ //skip
+ }
+ }
+
for (String wsName : getReposityToBackup().getWorkspaceNames())
{
if (wsName.equals(workspaceNameToRestore))
@@ -166,6 +200,16 @@
}
}
+ try
+ {
+ repositoryService.getConfig().getRepositoryConfiguration(repositoryNameToRestore);
+ removeRepositoryFully(repositoryNameToRestore);
+ }
+ catch (RepositoryConfigurationException e)
+ {
+ //skip
+ }
+
}
protected WorkspaceEntry makeWorkspaceEntry(String name, String sourceName)
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 10:40:25 UTC (rev 3659)
+++ jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/AbstractBackupUseCasesTest.java 2010-12-13 09:20:33 UTC (rev 3660)
@@ -16,17 +16,23 @@
*/
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;
/**
@@ -744,21 +750,21 @@
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");
+ File backDir = new File("target/backup/" + getUUIndex());
backDir.mkdirs();
RepositoryBackupConfig config = new RepositoryBackupConfig();
- config.setRepository(repository.getName());
+ config.setRepository(repositoryNameToBackup);
config.setBackupType(BackupManager.FULL_BACKUP_ONLY);
config.setBackupDir(backDir);
backup.startBackup(config);
- RepositoryBackupChain bch = backup.findRepositoryBackup(repository.getName());
+ RepositoryBackupChain bch = backup.findRepositoryBackup(repositoryNameToBackup);
// wait till full backup will be stopped
while (bch.getState() != RepositoryBackupChain.FINISHED)
@@ -772,12 +778,9 @@
backup.stopBackup(bch);
// restore
- 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(repositoryNameToRestore, getReposityToBackup().getConfiguration(),
+ dataSourceToRepositoryRestore, null);
File backLog = new File(bch.getLogFilePath());
if (backLog.exists())
@@ -792,7 +795,7 @@
newRepositoryEntry.getName()).getStateRestore());
// check
- ManageableRepository restoredRepository = repositoryService.getRepository(newRepositoryName);
+ ManageableRepository restoredRepository = repositoryService.getRepository(repositoryNameToRestore);
for (String wsName : restoredRepository.getWorkspaceNames())
{
@@ -823,11 +826,11 @@
public void testRepositoryFullAndIncrementalBackupRestore() throws Exception
{
// backup
- File backDir = new File("target/backup");
+ File backDir = new File("target/backup/" + getUUIndex());
backDir.mkdirs();
RepositoryBackupConfig config = new RepositoryBackupConfig();
- config.setRepository(repository.getName());
+ config.setRepository(repositoryNameToBackup);
config.setBackupType(BackupManager.FULL_AND_INCREMENTAL);
config.setIncrementalJobPeriod(1000);
@@ -835,7 +838,7 @@
backup.startBackup(config);
- RepositoryBackupChain bch = backup.findRepositoryBackup(repository.getName());
+ RepositoryBackupChain bch = backup.findRepositoryBackup(repositoryNameToBackup);
// wait till full backup will be stopped
while (bch.getState() != RepositoryBackupChain.FULL_BACKUP_FINISHED_INCREMENTAL_BACKUP_WORKING)
@@ -849,12 +852,9 @@
backup.stopBackup(bch);
// restore
- 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(repositoryNameToRestore, getReposityToBackup().getConfiguration(),
+ dataSourceToRepositoryRestore, null);
File backLog = new File(bch.getLogFilePath());
if (backLog.exists())
@@ -867,14 +867,14 @@
backup.restore(bchLog, newRepositoryEntry, false);
// check
- ManageableRepository restoredRepository = repositoryService.getRepository(newRepositoryName);
+ ManageableRepository restoredRepository = repositoryService.getRepository(repositoryNameToRestore);
for (String wsName : restoredRepository.getWorkspaceNames())
{
SessionImpl back1 = null;
try
{
- back1 = (SessionImpl) repository.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());
@@ -898,18 +898,18 @@
public void testRepositoryFullBackupAsynchronusRestore() throws Exception
{
// backup
- File backDir = new File("target/backup");
+ File backDir = new File("target/backup/" + getUUIndex());
backDir.mkdirs();
RepositoryBackupConfig config = new RepositoryBackupConfig();
- config.setRepository(repository.getName());
+ config.setRepository(repositoryNameToBackup);
config.setBackupType(BackupManager.FULL_BACKUP_ONLY);
config.setBackupDir(backDir);
backup.startBackup(config);
- RepositoryBackupChain bch = backup.findRepositoryBackup(repository.getName());
+ RepositoryBackupChain bch = backup.findRepositoryBackup(repositoryNameToBackup);
// wait till full backup will be stopped
while (bch.getState() != RepositoryBackupChain.FINISHED)
@@ -923,12 +923,9 @@
backup.stopBackup(bch);
// restore
- 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(repositoryNameToRestore, getReposityToBackup().getConfiguration(),
+ dataSourceToRepositoryRestore, null);
File backLog = new File(bch.getLogFilePath());
if (backLog.exists())
@@ -940,7 +937,7 @@
backup.restore(bchLog, newRepositoryEntry, true);
- JobRepositoryRestore job = backup.getLastRepositoryRestore(newRepositoryName);
+ JobRepositoryRestore job = backup.getLastRepositoryRestore(repositoryNameToRestore);
while (job.getStateRestore() != JobRepositoryRestore.REPOSITORY_RESTORE_SUCCESSFUL
|| job.getStateRestore() == JobRepositoryRestore.REPOSITORY_RESTORE_FAIL)
@@ -950,7 +947,7 @@
}
// check
- ManageableRepository restoredRepository = repositoryService.getRepository(newRepositoryName);
+ ManageableRepository restoredRepository = repositoryService.getRepository(repositoryNameToRestore);
for (String wsName : restoredRepository.getWorkspaceNames())
{
@@ -981,18 +978,18 @@
public void testRepositoryFullBackupAsynchronusRestoreWorkspaceMapping() throws Exception
{
// backup
- File backDir = new File("target/backup");
+ File backDir = new File("target/backup/" + getUUIndex());
backDir.mkdirs();
RepositoryBackupConfig config = new RepositoryBackupConfig();
- config.setRepository(repository.getName());
+ config.setRepository(repositoryNameToBackup);
config.setBackupType(BackupManager.FULL_BACKUP_ONLY);
config.setBackupDir(backDir);
backup.startBackup(config);
- RepositoryBackupChain bch = backup.findRepositoryBackup(repository.getName());
+ RepositoryBackupChain bch = backup.findRepositoryBackup(repositoryNameToBackup);
// wait till full backup will be stopped
while (bch.getState() != RepositoryBackupChain.FINISHED)
@@ -1006,12 +1003,9 @@
backup.stopBackup(bch);
// restore
- 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(repositoryNameToRestore, getReposityToBackup().getConfiguration(),
+ dataSourceToRepositoryRestore, null);
// create workspace mappingS
Map<String, String> workspaceMapping = new HashedMap();
@@ -1043,7 +1037,7 @@
backup.restore(bchLog, newRepositoryEntry, workspaceMapping, true);
- JobRepositoryRestore job = backup.getLastRepositoryRestore(newRepositoryName);
+ JobRepositoryRestore job = backup.getLastRepositoryRestore(repositoryNameToRestore);
while (job.getStateRestore() != JobRepositoryRestore.REPOSITORY_RESTORE_SUCCESSFUL
|| job.getStateRestore() == JobRepositoryRestore.REPOSITORY_RESTORE_FAIL)
@@ -1053,7 +1047,7 @@
}
// check
- ManageableRepository restoredRepository = repositoryService.getRepository(newRepositoryName);
+ ManageableRepository restoredRepository = repositoryService.getRepository(repositoryNameToRestore);
for (String wsName : restoredRepository.getWorkspaceNames())
{
@@ -1084,11 +1078,11 @@
public void testAutoStopRepositoryBackupIncrRepetion() throws Exception
{
// backup
- File backDir = new File("target/backup/" + repository.getName() + "_" + System.currentTimeMillis());
+ File backDir = new File("target/backup/" + getUUIndex());
backDir.mkdirs();
RepositoryBackupConfig config = new RepositoryBackupConfig();
- config.setRepository(repository.getName());
+ config.setRepository(repositoryNameToBackup);
config.setBackupType(BackupManager.FULL_AND_INCREMENTAL);
config.setBackupDir(backDir);
config.setIncrementalJobPeriod(4);
@@ -1108,12 +1102,9 @@
public void testRepositoryRestoreFail() throws Exception
{
// restore
- 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(repositoryNameToRestore, getReposityToBackup().getConfiguration(),
+ dataSourceToRepositoryRestore, null);
//create broken system workspaceEntry
newRepositoryEntry.getWorkspaceEntries().get(0).getQueryHandler().setType("gg");
@@ -1136,8 +1127,8 @@
try
{
- ManageableRepository restoredRepository = repositoryService.getRepository(newRepositoryName);
- fail("The repository " + newRepositoryName + "shoulde not exists.");
+ ManageableRepository restoredRepository = repositoryService.getRepository(repositoryNameToRestore);
+ fail("The repository " + repositoryNameToRestore + "shoulde not exists.");
}
catch (RepositoryException e)
{
@@ -1153,19 +1144,19 @@
File tempf = createBLOBTempFile("testIncrementalBackupRestore737-", 5 * 1024); // 5M
tempf.deleteOnExit();
- File backDir = new File("target/backup/ws1.incr737");
+ File backDir = new File("target/backup/" + 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)
@@ -1191,9 +1182,7 @@
ws1Session.getRootNode().save();
// restore
- RepositoryEntry re =
- (RepositoryEntry) ws1Session.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
- WorkspaceEntry ws1back = makeWorkspaceEntry("ws1back.incr737", "jdbcjcr25");
+ WorkspaceEntry ws1back = makeWorkspaceEntry(workspaceNameToRestore, dataSourceToWorkspaceRestore);
File backLog = new File(bch.getLogFilePath());
if (backLog.exists())
@@ -1203,13 +1192,13 @@
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 node_101 = back1.getRootNode().getNode("node_101");
assertNotNull(node_101);
@@ -1240,19 +1229,19 @@
public void testExistedWorkspaceRestore() throws Exception
{
// backup
- File backDir = new File("target/backup/ws1");
+ File backDir = new File("target/backup/" + 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)
@@ -1289,13 +1278,13 @@
assertNotNull(bchLog.getStartedTime());
assertNotNull(bchLog.getFinishedTime());
- backup.restoreExistingWorkspace(bchLog, re.getName(), ws1, false);
+ backup.restoreExistingWorkspace(bchLog, repositoryNameToBackup, ws1, false);
// check
SessionImpl back1 = null;
try
{
- back1 = (SessionImpl) repository.login(credentials, "ws1");
+ back1 = (SessionImpl) getReposityToBackup().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());
@@ -1318,19 +1307,19 @@
public void testExistedWorkspaceRestoreAsync() throws Exception
{
// backup
- File backDir = new File("target/backup/ws1");
+ File backDir = new File("target/backup/" + 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)
@@ -1367,10 +1356,10 @@
assertNotNull(bchLog.getStartedTime());
assertNotNull(bchLog.getFinishedTime());
- backup.restoreExistingWorkspace(bchLog, re.getName(), ws1, true);
+ backup.restoreExistingWorkspace(bchLog, repositoryNameToBackup, ws1, true);
- while (backup.getLastRestore(repository.getName(), ws1.getName()).getStateRestore() != JobWorkspaceRestore.RESTORE_SUCCESSFUL
- && backup.getLastRestore(repository.getName(), ws1.getName()).getStateRestore() != JobWorkspaceRestore.RESTORE_FAIL)
+ while (backup.getLastRestore(repositoryNameToBackup, ws1.getName()).getStateRestore() != JobWorkspaceRestore.RESTORE_SUCCESSFUL
+ && backup.getLastRestore(repositoryNameToBackup, ws1.getName()).getStateRestore() != JobWorkspaceRestore.RESTORE_FAIL)
{
Thread.sleep(50);
}
@@ -1379,7 +1368,7 @@
SessionImpl back1 = null;
try
{
- back1 = (SessionImpl) repository.login(credentials, "ws1");
+ back1 = (SessionImpl) getReposityToBackup().login(credentials, workspaceNameToBackup);
Node ws1backTestRoot = back1.getRootNode().getNode("backupTest");
assertEquals("Restored content should be same", "property-5", ws1backTestRoot.getNode("node_5")
.getProperty("exo:data").getString());
@@ -1402,19 +1391,19 @@
public void testExistedWorkspaceRestoreAsync2() throws Exception
{
// backup
- File backDir = new File("target/backup/ws1");
+ File backDir = new File("target/backup/" + 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)
@@ -1451,10 +1440,10 @@
assertNotNull(bchLog.getStartedTime());
assertNotNull(bchLog.getFinishedTime());
- backup.restoreExistingWorkspace(bchLog.getBackupId(), re.getName(), ws1, true);
+ backup.restoreExistingWorkspace(bchLog.getBackupId(), repositoryNameToBackup, ws1, true);
- while (backup.getLastRestore(repository.getName(), ws1.getName()).getStateRestore() != JobWorkspaceRestore.RESTORE_SUCCESSFUL
- && backup.getLastRestore(repository.getName(), ws1.getName()).getStateRestore() != JobWorkspaceRestore.RESTORE_FAIL)
+ while (backup.getLastRestore(repositoryNameToBackup, ws1.getName()).getStateRestore() != JobWorkspaceRestore.RESTORE_SUCCESSFUL
+ && backup.getLastRestore(repositoryNameToBackup, ws1.getName()).getStateRestore() != JobWorkspaceRestore.RESTORE_FAIL)
{
Thread.sleep(50);
}
@@ -1463,7 +1452,7 @@
SessionImpl back1 = null;
try
{
- back1 = (SessionImpl) repository.login(credentials, "ws1");
+ back1 = (SessionImpl) getReposityToBackup().login(credentials, workspaceNameToBackup);
Node ws1backTestRoot = back1.getRootNode().getNode("backupTest");
assertEquals("Restored content should be same", "property-5", ws1backTestRoot.getNode("node_5")
.getProperty("exo:data").getString());
@@ -1485,33 +1474,19 @@
public void testExistedRepositoryRestore() throws Exception
{
- RepositoryImpl repositoryDB8 = (RepositoryImpl) repositoryService.getRepository("db8");
-
- for (String wsName : repositoryDB8.getWorkspaceNames())
- {
- SessionImpl sessionWS = (SessionImpl) repositoryDB8.login(credentials, wsName);
-
- Node wsTestRoot = sessionWS.getRootNode().addNode("backupTest");
- sessionWS.getRootNode().save();
- addContent(wsTestRoot, 1, 10, 1);
- sessionWS.getRootNode().save();
- }
-
- SessionImpl sessionWS = (SessionImpl) repositoryDB8.login(credentials, WS_NAME);
-
// backup
- File backDir = new File("target/backup");
+ File backDir = new File("target/backup/" + getUUIndex());
backDir.mkdirs();
RepositoryBackupConfig config = new RepositoryBackupConfig();
- config.setRepository(repositoryDB8.getName());
+ config.setRepository(repositoryNameToBackup);
config.setBackupType(BackupManager.FULL_BACKUP_ONLY);
config.setBackupDir(backDir);
backup.startBackup(config);
- RepositoryBackupChain bch = backup.findRepositoryBackup(repositoryDB8.getName());
+ RepositoryBackupChain bch = backup.findRepositoryBackup(repositoryNameToBackup);
// wait till full backup will be stopped
while (bch.getState() != RepositoryBackupChain.FINISHED)
@@ -1525,9 +1500,8 @@
backup.stopBackup(bch);
// restore
- RepositoryEntry baseRE =
- (RepositoryEntry) sessionWS.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
- RepositoryEntry re = makeRepositoryEntry(baseRE.getName(), baseRE, null, null);
+ RepositoryEntry re =
+ makeRepositoryEntry(repositoryNameToBackup, getReposityToBackup().getConfiguration(), null, null);
File backLog = new File(bch.getLogFilePath());
if (backLog.exists())
@@ -1539,11 +1513,11 @@
backup.restoreExistingRepository(bchLog, re, false);
- assertEquals(JobWorkspaceRestore.RESTORE_SUCCESSFUL, backup.getLastRepositoryRestore(re.getName())
+ assertEquals(JobWorkspaceRestore.RESTORE_SUCCESSFUL, backup.getLastRepositoryRestore(repositoryNameToBackup)
.getStateRestore());
// check
- ManageableRepository restoredRepository = repositoryService.getRepository(re.getName());
+ ManageableRepository restoredRepository = repositoryService.getRepository(repositoryNameToBackup);
for (String wsName : restoredRepository.getWorkspaceNames())
{
@@ -1571,35 +1545,24 @@
fail("There are no backup files in " + backDir.getAbsolutePath());
}
- public void testExistedRepositoryRestoreMultiDB() throws Exception
+ public void testExistedRepositoryRestoreSingelDB() throws Exception
{
- RepositoryImpl repositoryDB7 = (RepositoryImpl) repositoryService.getRepository("db7");
+ RepositoryImpl repositoryDB7 = (RepositoryImpl) repositoryService.getRepository(repositoryNameToBackupSingleDB);
+ SessionImpl sessionWS = (SessionImpl) repositoryDB7.login(credentials, workspaceNameToBackup);
- 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");
+ File backDir = new File("target/backup/" + getUUIndex());
backDir.mkdirs();
RepositoryBackupConfig config = new RepositoryBackupConfig();
- config.setRepository(repositoryDB7.getName());
+ config.setRepository(repositoryNameToBackupSingleDB);
config.setBackupType(BackupManager.FULL_BACKUP_ONLY);
config.setBackupDir(backDir);
backup.startBackup(config);
- RepositoryBackupChain bch = backup.findRepositoryBackup(repositoryDB7.getName());
+ RepositoryBackupChain bch = backup.findRepositoryBackup(repositoryNameToBackupSingleDB);
// wait till full backup will be stopped
while (bch.getState() != RepositoryBackupChain.FINISHED)
@@ -1631,7 +1594,7 @@
.getStateRestore());
// check
- ManageableRepository restoredRepository = repositoryService.getRepository(re.getName());
+ ManageableRepository restoredRepository = repositoryService.getRepository(repositoryNameToBackupSingleDB);
for (String wsName : restoredRepository.getWorkspaceNames())
{
@@ -1661,33 +1624,19 @@
public void testExistedRepositoryRestoreAsync() throws Exception
{
- RepositoryImpl repositoryDB8 = (RepositoryImpl) repositoryService.getRepository("db8");
-
- for (String wsName : repositoryDB8.getWorkspaceNames())
- {
- SessionImpl sessionWS = (SessionImpl) repositoryDB8.login(credentials, wsName);
-
- Node wsTestRoot = sessionWS.getRootNode().addNode("backupTest");
- sessionWS.getRootNode().save();
- addContent(wsTestRoot, 1, 10, 1);
- sessionWS.getRootNode().save();
- }
-
- SessionImpl sessionWS = (SessionImpl) repositoryDB8.login(credentials, WS_NAME);
-
// backup
- File backDir = new File("target/backup");
+ File backDir = new File("target/backup/" + getUUIndex());
backDir.mkdirs();
RepositoryBackupConfig config = new RepositoryBackupConfig();
- config.setRepository(repositoryDB8.getName());
+ config.setRepository(repositoryNameToBackup);
config.setBackupType(BackupManager.FULL_BACKUP_ONLY);
config.setBackupDir(backDir);
backup.startBackup(config);
- RepositoryBackupChain bch = backup.findRepositoryBackup(repositoryDB8.getName());
+ RepositoryBackupChain bch = backup.findRepositoryBackup(repositoryNameToBackup);
// wait till full backup will be stopped
while (bch.getState() != RepositoryBackupChain.FINISHED)
@@ -1701,9 +1650,8 @@
backup.stopBackup(bch);
// restore
- RepositoryEntry baseRE =
- (RepositoryEntry) sessionWS.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
- RepositoryEntry re = makeRepositoryEntry(baseRE.getName(), baseRE, null, null);
+ RepositoryEntry re =
+ makeRepositoryEntry(repositoryNameToBackup, getReposityToBackup().getConfiguration(), null, null);
File backLog = new File(bch.getLogFilePath());
if (backLog.exists())
@@ -1715,7 +1663,7 @@
backup.restoreExistingRepository(bchLog, re, true);
- JobRepositoryRestore job = backup.getLastRepositoryRestore(re.getName());
+ JobRepositoryRestore job = backup.getLastRepositoryRestore(repositoryNameToBackup);
while (job.getStateRestore() != JobRepositoryRestore.REPOSITORY_RESTORE_SUCCESSFUL
&& job.getStateRestore() != JobRepositoryRestore.REPOSITORY_RESTORE_FAIL)
@@ -1723,11 +1671,12 @@
Thread.sleep(50);
}
- assertEquals(JobRepositoryRestore.REPOSITORY_RESTORE_SUCCESSFUL, backup.getLastRepositoryRestore(re.getName())
+ assertEquals(JobRepositoryRestore.REPOSITORY_RESTORE_SUCCESSFUL, backup.getLastRepositoryRestore(
+ repositoryNameToBackup)
.getStateRestore());
// check
- ManageableRepository restoredRepository = repositoryService.getRepository(re.getName());
+ ManageableRepository restoredRepository = repositoryService.getRepository(repositoryNameToBackup);
for (String wsName : restoredRepository.getWorkspaceNames())
{
@@ -1757,33 +1706,19 @@
public void testExistedRepositoryRestoreAsync2() throws Exception
{
- RepositoryImpl repositoryDB8 = (RepositoryImpl) repositoryService.getRepository("db8");
-
- for (String wsName : repositoryDB8.getWorkspaceNames())
- {
- SessionImpl sessionWS = (SessionImpl) repositoryDB8.login(credentials, wsName);
-
- Node wsTestRoot = sessionWS.getRootNode().addNode("backupTest");
- sessionWS.getRootNode().save();
- addContent(wsTestRoot, 1, 10, 1);
- sessionWS.getRootNode().save();
- }
-
- SessionImpl sessionWS = (SessionImpl) repositoryDB8.login(credentials, WS_NAME);
-
// backup
File backDir = new File("target/backup");
backDir.mkdirs();
RepositoryBackupConfig config = new RepositoryBackupConfig();
- config.setRepository(repositoryDB8.getName());
+ config.setRepository(repositoryNameToBackup);
config.setBackupType(BackupManager.FULL_BACKUP_ONLY);
config.setBackupDir(backDir);
backup.startBackup(config);
- RepositoryBackupChain bch = backup.findRepositoryBackup(repositoryDB8.getName());
+ RepositoryBackupChain bch = backup.findRepositoryBackup(repositoryNameToBackup);
// wait till full backup will be stopped
while (bch.getState() != RepositoryBackupChain.FINISHED)
@@ -1797,9 +1732,8 @@
backup.stopBackup(bch);
// restore
- RepositoryEntry baseRE =
- (RepositoryEntry) sessionWS.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
- RepositoryEntry re = makeRepositoryEntry(baseRE.getName(), baseRE, null, null);
+ RepositoryEntry re =
+ makeRepositoryEntry(repositoryNameToBackup, getReposityToBackup().getConfiguration(), null, null);
File backLog = new File(bch.getLogFilePath());
if (backLog.exists())
@@ -1811,7 +1745,7 @@
backup.restoreExistingRepository(bchLog.getBackupId(), re, true);
- JobRepositoryRestore job = backup.getLastRepositoryRestore(re.getName());
+ JobRepositoryRestore job = backup.getLastRepositoryRestore(repositoryNameToBackup);
while (job.getStateRestore() != JobRepositoryRestore.REPOSITORY_RESTORE_SUCCESSFUL
&& job.getStateRestore() != JobRepositoryRestore.REPOSITORY_RESTORE_FAIL)
@@ -1819,11 +1753,11 @@
Thread.sleep(50);
}
- assertEquals(JobWorkspaceRestore.RESTORE_SUCCESSFUL, backup.getLastRepositoryRestore(re.getName())
+ assertEquals(JobWorkspaceRestore.RESTORE_SUCCESSFUL, backup.getLastRepositoryRestore(repositoryNameToBackup)
.getStateRestore());
// check
- ManageableRepository restoredRepository = repositoryService.getRepository(re.getName());
+ ManageableRepository restoredRepository = repositoryService.getRepository(repositoryNameToBackup);
for (String wsName : restoredRepository.getWorkspaceNames())
{
@@ -1851,31 +1785,25 @@
fail("There are no backup files in " + backDir.getAbsolutePath());
}
- public void testExistedWorkspaceRestoreMultiDB() throws Exception
+ public void testExistedWorkspaceRestoreSingelDB() throws Exception
{
- RepositoryImpl repositoryDB7 = (RepositoryImpl) repositoryService.getRepository("db7");
+ RepositoryImpl repositoryDB7 = (RepositoryImpl) repositoryService.getRepository(repositoryNameToBackupSingleDB);
+ SessionImpl sessionWS = (SessionImpl) repositoryDB7.login(credentials, workspaceNameToBackup);
- 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");
+ File backDir = new File("target/backup/" + getUUIndex());
backDir.mkdirs();
BackupConfig config = new BackupConfig();
- config.setRepository(repositoryDB7.getName());
- config.setWorkspace("ws1");
+ config.setRepository(repositoryNameToBackupSingleDB);
+ config.setWorkspace(workspaceNameToBackup);
config.setBackupType(BackupManager.FULL_BACKUP_ONLY);
config.setBackupDir(backDir);
backup.startBackup(config);
- BackupChain bch = backup.findBackup(repositoryDB7.getName(), "ws1");
+ BackupChain bch = backup.findBackup(repositoryNameToBackupSingleDB, workspaceNameToBackup);
// wait till full backup will be stopped
while (bch.getFullBackupState() != BackupJob.FINISHED)
@@ -1911,13 +1839,14 @@
assertNotNull(bchLog.getStartedTime());
assertNotNull(bchLog.getFinishedTime());
- backup.restoreExistingWorkspace(bchLog, re.getName(), ws1, false);
+ backup.restoreExistingWorkspace(bchLog, repositoryNameToBackupSingleDB, ws1, false);
// check
SessionImpl back1 = null;
try
{
- back1 = (SessionImpl) repositoryDB7.login(credentials, "ws1");
+ repositoryDB7 = (RepositoryImpl) repositoryService.getRepository(repositoryNameToBackupSingleDB);
+ back1 = (SessionImpl) repositoryDB7.login(credentials, workspaceNameToBackup);
Node ws1backTestRoot = back1.getRootNode().getNode("backupTest");
assertEquals("Restored content should be same", "property-5", ws1backTestRoot.getNode("node_5")
.getProperty("exo:data").getString());
@@ -1940,19 +1869,19 @@
public void testExistedWorkspaceRestoreWithConfig() throws Exception
{
// backup
- File backDir = new File("target/backup/ws1");
+ File backDir = new File("target/backup/" + 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)
@@ -1983,7 +1912,7 @@
SessionImpl back1 = null;
try
{
- back1 = (SessionImpl) repository.login(credentials, "ws1");
+ back1 = (SessionImpl) getReposityToBackup().login(credentials, workspaceNameToBackup);
Node ws1backTestRoot = back1.getRootNode().getNode("backupTest");
assertEquals("Restored content should be same", "property-5", ws1backTestRoot.getNode("node_5")
.getProperty("exo:data").getString());
@@ -2005,34 +1934,19 @@
public void testExistedRepositoryRestoreWithConfig() throws Exception
{
- RepositoryImpl repositoryDB8 = (RepositoryImpl) repositoryService.getRepository("db8");
-
- for (String wsName : repositoryDB8.getWorkspaceNames())
- {
- SessionImpl sessionWS = (SessionImpl) repositoryDB8.login(credentials, wsName);
-
- Node wsTestRoot = sessionWS.getRootNode().addNode("backupTest");
- sessionWS.getRootNode().save();
- addContent(wsTestRoot, 1, 10, 1);
- sessionWS.getRootNode().save();
- }
-
- SessionImpl sessionWS = (SessionImpl) repositoryDB8.login(credentials, WS_NAME);
-
// backup
- File backDir = new File("target/backup/db1");
+ File backDir = new File("target/backup/" + getUUIndex());
backDir.mkdirs();
RepositoryBackupConfig config = new RepositoryBackupConfig();
- String repoName = repositoryDB8.getName();
- config.setRepository(repoName);
+ config.setRepository(repositoryNameToBackup);
config.setBackupType(BackupManager.FULL_BACKUP_ONLY);
config.setBackupDir(backDir);
backup.startBackup(config);
- RepositoryBackupChain bch = backup.findRepositoryBackup(repositoryDB8.getName());
+ RepositoryBackupChain bch = backup.findRepositoryBackup(repositoryNameToBackup);
// wait till full backup will be stopped
while (bch.getState() != RepositoryBackupChain.FINISHED)
@@ -2058,11 +1972,11 @@
backup.restoreExistingRepository(bchLog.getBackupId(), false);
- assertEquals(JobWorkspaceRestore.RESTORE_SUCCESSFUL, backup.getLastRepositoryRestore(repoName)
+ assertEquals(JobWorkspaceRestore.RESTORE_SUCCESSFUL, backup.getLastRepositoryRestore(repositoryNameToBackup)
.getStateRestore());
// check
- ManageableRepository restoredRepository = repositoryService.getRepository(repoName);
+ ManageableRepository restoredRepository = repositoryService.getRepository(repositoryNameToBackup);
for (String wsName : restoredRepository.getWorkspaceNames())
{
@@ -2093,19 +2007,19 @@
public void testWorkspaceRestoreWithConfig() throws Exception
{
// backup
- File backDir = new File("target/backup/ws1");
+ File backDir = new File("target/backup/" + 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)
@@ -2123,7 +2037,7 @@
//TODO
super.tearDown();
- removeWorkspaceFully(repository.getName(), "ws1");
+ removeWorkspaceFully(repositoryNameToBackup, workspaceNameToBackup);
File backLog = new File(bch.getLogFilePath());
if (backLog.exists())
@@ -2139,7 +2053,7 @@
SessionImpl back1 = null;
try
{
- back1 = (SessionImpl) repository.login(credentials, "ws1");
+ back1 = (SessionImpl) getReposityToBackup().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());
@@ -2161,34 +2075,19 @@
public void testRepositoryRestoreWithConfig() throws Exception
{
- RepositoryImpl repositoryDB8 = (RepositoryImpl) repositoryService.getRepository("db8");
-
- for (String wsName : repositoryDB8.getWorkspaceNames())
- {
- SessionImpl sessionWS = (SessionImpl) repositoryDB8.login(credentials, wsName);
-
- Node wsTestRoot = sessionWS.getRootNode().addNode("backupTest");
- sessionWS.getRootNode().save();
- addContent(wsTestRoot, 1, 10, 1);
- sessionWS.getRootNode().save();
- }
-
- SessionImpl sessionWS = (SessionImpl) repositoryDB8.login(credentials, WS_NAME);
-
// backup
- File backDir = new File("target/backup");
+ File backDir = new File("target/backup/" + getUUIndex());
backDir.mkdirs();
RepositoryBackupConfig config = new RepositoryBackupConfig();
- String repoName = repositoryDB8.getName();
- config.setRepository(repoName);
+ config.setRepository(repositoryNameToBackup);
config.setBackupType(BackupManager.FULL_BACKUP_ONLY);
config.setBackupDir(backDir);
backup.startBackup(config);
- RepositoryBackupChain bch = backup.findRepositoryBackup(repositoryDB8.getName());
+ RepositoryBackupChain bch = backup.findRepositoryBackup(repositoryNameToBackup);
// wait till full backup will be stopped
while (bch.getState() != RepositoryBackupChain.FINISHED)
@@ -2203,7 +2102,7 @@
//TODO
super.tearDown();
- removeRepositoryFully(repositoryDB8.getName());
+ removeRepositoryFully(repositoryNameToBackup);
// restore
File backLog = new File(bch.getLogFilePath());
@@ -2216,11 +2115,11 @@
backup.restoreRepository(bchLog.getBackupId(), false);
- assertEquals(JobWorkspaceRestore.RESTORE_SUCCESSFUL, backup.getLastRepositoryRestore(repoName)
+ assertEquals(JobWorkspaceRestore.RESTORE_SUCCESSFUL, backup.getLastRepositoryRestore(repositoryNameToBackup)
.getStateRestore());
// check
- ManageableRepository restoredRepository = repositoryService.getRepository(repoName);
+ ManageableRepository restoredRepository = repositoryService.getRepository(repositoryNameToBackup);
for (String wsName : restoredRepository.getWorkspaceNames())
{
@@ -2246,5 +2145,5 @@
}
else
fail("There are no backup files in " + backDir.getAbsolutePath());
- }*/
+ }
}
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 10:40:25 UTC (rev 3659)
+++ jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration.xml 2010-12-13 09:20:33 UTC (rev 3660)
@@ -1171,7 +1171,7 @@
<property name="password" value="" />
</properties-param>
</init-params>
- </component-plugin>
+ </component-plugin>
<component-plugin>
<name>bind.datasource</name>
<set-method>addPlugin</set-method>
@@ -1179,114 +1179,6 @@
<init-params>
<value-param>
<name>bind-name</name>
- <value>jdbcjcr_backup_only_use_5</value>
- </value-param>
- <value-param>
- <name>class-name</name>
- <value>javax.sql.DataSource</value>
- </value-param>
- <value-param>
- <name>factory</name>
- <value>org.apache.commons.dbcp.BasicDataSourceFactory</value>
- </value-param>
- <properties-param>
- <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_4" />
- <property name="username" value="sa" />
- <property name="password" value="" />
- </properties-param>
- </init-params>
- </component-plugin>
- <component-plugin>
- <name>bind.datasource</name>
- <set-method>addPlugin</set-method>
- <type>org.exoplatform.services.naming.BindReferencePlugin</type>
- <init-params>
- <value-param>
- <name>bind-name</name>
- <value>jdbcjcr_backup_only_use_6</value>
- </value-param>
- <value-param>
- <name>class-name</name>
- <value>javax.sql.DataSource</value>
- </value-param>
- <value-param>
- <name>factory</name>
- <value>org.apache.commons.dbcp.BasicDataSourceFactory</value>
- </value-param>
- <properties-param>
- <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_6" />
- <property name="username" value="sa" />
- <property name="password" value="" />
- </properties-param>
- </init-params>
- </component-plugin>
- <component-plugin>
- <name>bind.datasource</name>
- <set-method>addPlugin</set-method>
- <type>org.exoplatform.services.naming.BindReferencePlugin</type>
- <init-params>
- <value-param>
- <name>bind-name</name>
- <value>jdbcjcr_backup_only_use_7</value>
- </value-param>
- <value-param>
- <name>class-name</name>
- <value>javax.sql.DataSource</value>
- </value-param>
- <value-param>
- <name>factory</name>
- <value>org.apache.commons.dbcp.BasicDataSourceFactory</value>
- </value-param>
- <properties-param>
- <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_7" />
- <property name="username" value="sa" />
- <property name="password" value="" />
- </properties-param>
- </init-params>
- </component-plugin>
- <component-plugin>
- <name>bind.datasource</name>
- <set-method>addPlugin</set-method>
- <type>org.exoplatform.services.naming.BindReferencePlugin</type>
- <init-params>
- <value-param>
- <name>bind-name</name>
- <value>jdbcjcr_backup_only_use_8</value>
- </value-param>
- <value-param>
- <name>class-name</name>
- <value>javax.sql.DataSource</value>
- </value-param>
- <value-param>
- <name>factory</name>
- <value>org.apache.commons.dbcp.BasicDataSourceFactory</value>
- </value-param>
- <properties-param>
- <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_8" />
- <property name="username" value="sa" />
- <property name="password" value="" />
- </properties-param>
- </init-params>
- </component-plugin>
- <component-plugin>
- <name>bind.datasource</name>
- <set-method>addPlugin</set-method>
- <type>org.exoplatform.services.naming.BindReferencePlugin</type>
- <init-params>
- <value-param>
- <name>bind-name</name>
<value>jdbcjcr3</value>
</value-param>
<value-param>
@@ -2072,7 +1964,7 @@
<init-params>
<value-param>
<name>bind-name</name>
- <value>jdbcjcr_to_repository_restore_1</value>
+ <value>jdbcjcr_to_repository_restore</value>
</value-param>
<value-param>
<name>class-name</name>
@@ -2086,7 +1978,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_to_repository_restore_1" />
+ <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr_to_repository_restore" />
<property name="username" value="sa" />
<property name="password" value="" />
</properties-param>
@@ -2099,7 +1991,7 @@
<init-params>
<value-param>
<name>bind-name</name>
- <value>jdbcjcr_to_repository_restore_2</value>
+ <value>jdbcjcr_to_repository_restore_singel_db</value>
</value-param>
<value-param>
<name>class-name</name>
@@ -2113,7 +2005,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_to_repository_restore_2" />
+ <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr_to_repository_restore_singel_db" />
<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 10:40:25 UTC (rev 3659)
+++ jcr/trunk/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config.xml 2010-12-13 09:20:33 UTC (rev 3660)
@@ -357,9 +357,9 @@
<!-- for system storage -->
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
<properties>
- <property name="source-name" value="jdbcjcr26" />
+ <property name="source-name" value="jdbcjcr_to_repository_restore_singel_db" />
<property name="dialect" value="hsqldb" />
- <property name="multi-db" value="true" />
+ <property name="multi-db" value="false" />
<property name="update-storage" value="true" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/db7_ws" />
@@ -390,9 +390,9 @@
<workspace name="ws1">
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
<properties>
- <property name="source-name" value="jdbcjcr27" />
+ <property name="source-name" value="jdbcjcr_to_repository_restore_singel_db" />
<property name="dialect" value="hsqldb" />
- <property name="multi-db" value="true" />
+ <property name="multi-db" value="false" />
<property name="update-storage" value="true" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/db7_ws1" />
15 years, 5 months
- 1
- 0
exo-jcr SVN: r3659 - in jcr/trunk/exo.jcr.component.ext: src/test/java/org/exoplatform/services/jcr/ext/backup and 2 other directories.
by do-not-reply＠jboss.org
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(a)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" />
15 years, 5 months
- 1
- 0
exo-jcr SVN: r3658 - in jcr/trunk/exo.jcr.component.ext: src/test/java/org/exoplatform/services/jcr/ext/backup and 1 other directories.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2010-12-10 03:38:51 -0500 (Fri, 10 Dec 2010)
New Revision: 3658
Modified:
jcr/trunk/exo.jcr.component.ext/pom.xml
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/impl/core/RdbmsWorkspaceInitializerWrapper.java
Log:
EXOJCR-1078: temporary exclude test
Modified: jcr/trunk/exo.jcr.component.ext/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.ext/pom.xml 2010-12-10 08:32:32 UTC (rev 3657)
+++ jcr/trunk/exo.jcr.component.ext/pom.xml 2010-12-10 08:38:51 UTC (rev 3658)
@@ -188,6 +188,7 @@
<include>**/backup/*.java</include>
</includes>
<excludes>
+ <exclude>**/backup/TestRdbmsWorkspaceInitializer.java</exclude>
<exclude>**/backup/TestRDBMSBackupManager.java</exclude>
<exclude>**/BaseStandaloneTest.java</exclude>
<exclude>**/backup/AbstractBackupTestCase.java</exclude>
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:32:32 UTC (rev 3657)
+++ 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)
@@ -16,6 +16,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;
@@ -26,15 +35,6 @@
import javax.jcr.RepositoryException;
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.
*
@@ -158,8 +158,7 @@
fail("Can't get fullBackup chain");
// restore
- RepositoryEntry re =
- (RepositoryEntry) ws1Session.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
+ RepositoryEntry re = (RepositoryEntry)ws1Session.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
WorkspaceEntry ws1back = makeWorkspaceEntry("ws1back.incr", "jdbcjcr_backup_only_use_2");
File backLog = new File(bch.getLogFilePath());
@@ -176,16 +175,16 @@
SessionImpl back1 = null;
try
{
- back1 = (SessionImpl) repository.login(credentials, ws1back.getName());
+ back1 = (SessionImpl)repository.login(credentials, ws1back.getName());
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"));
}
@@ -253,7 +252,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
@@ -264,7 +263,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");
@@ -272,8 +271,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
@@ -283,8 +282,7 @@
fail("Can't get fullBackup chain");
// restore
- RepositoryEntry re =
- (RepositoryEntry) ws1Session.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
+ RepositoryEntry re = (RepositoryEntry)ws1Session.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
WorkspaceEntry ws1back = makeWorkspaceEntry("ws1back.incr2", "jdbcjcr_backup_only_use_3");
File backLog = new File(bch.getLogFilePath());
@@ -301,12 +299,12 @@
SessionImpl back1 = null;
try
{
- back1 = (SessionImpl) repository.login(credentials, ws1back.getName());
+ back1 = (SessionImpl)repository.login(credentials, ws1back.getName());
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"));
@@ -314,20 +312,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)
{
@@ -346,9 +344,9 @@
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)repository.login(credentials, "ws1");
+ sessionWS1.getRootNode().addNode("backupTest").addNode("node_5")
+ .setProperty("exo:data", "Restored content should be same");
sessionWS1.save();
// backup
@@ -394,22 +392,22 @@
backup.restore(bchLog, repository.getName(), ws1back, true);
while (backup.getLastRestore(repository.getName(), ws1back.getName()).getStateRestore() != JobWorkspaceRestore.RESTORE_SUCCESSFUL
- && backup.getLastRestore(repository.getName(), ws1back.getName()).getStateRestore() != JobWorkspaceRestore.RESTORE_FAIL)
+ && backup.getLastRestore(repository.getName(), ws1back.getName()).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();
+ throw (Exception)backup.getLastRestore(repository.getName(), ws1back.getName()).getRestoreException();
// check
SessionImpl back1 = null;
try
{
- back1 = (SessionImpl) repository.login(credentials, "ws1back5");
+ back1 = (SessionImpl)repository.login(credentials, "ws1back5");
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)
{
@@ -504,10 +502,10 @@
public void testTwoRestores() throws Exception
{
{
- SessionImpl sessionWS1 = (SessionImpl) repository.login(credentials, "ws3");
+ 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
@@ -540,12 +538,12 @@
backup.restore(bchLog, repository.getName(), ws1_restore_1, false);
// check
- SessionImpl back1 = (SessionImpl) repository.login(credentials, "ws1_restore_1");
+ SessionImpl back1 = (SessionImpl)repository.login(credentials, "ws1_restore_1");
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
@@ -583,7 +581,7 @@
backup.restore(bchLog, repository.getName(), ws1_restore_2, false);
// check
- SessionImpl back2 = (SessionImpl) repository.login(credentials, "ws1_restore_2");
+ SessionImpl back2 = (SessionImpl)repository.login(credentials, "ws1_restore_2");
assertNotNull(back2.getRootNode().getNode("gdfgrghfhf").getProperty("data"));
}
else
@@ -698,8 +696,7 @@
fail("Can't get fullBackup chain");
// restore
- RepositoryEntry re =
- (RepositoryEntry) ws1Session.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
+ RepositoryEntry re = (RepositoryEntry)ws1Session.getContainer().getComponentInstanceOfType(RepositoryEntry.class);
WorkspaceEntry ws1back = makeWorkspaceEntry("ws1backt", "jdbcjcr_backup_only_use_8_NOT_EXIST");
File backLog = new File(bch.getLogFilePath());
@@ -725,10 +722,10 @@
SessionImpl back1 = null;
try
{
- back1 = (SessionImpl) repository.login(credentials, "ws1back");
+ back1 = (SessionImpl)repository.login(credentials, "ws1back");
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)
{
@@ -773,12 +770,11 @@
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())
@@ -789,8 +785,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);
@@ -800,10 +796,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)
{
@@ -850,12 +846,11 @@
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())
@@ -875,10 +870,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)
{
@@ -924,12 +919,11 @@
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())
@@ -944,7 +938,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);
@@ -958,10 +952,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)
{
@@ -1007,12 +1001,11 @@
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();
@@ -1047,7 +1040,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);
@@ -1061,10 +1054,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)
{
@@ -1109,12 +1102,11 @@
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");
@@ -1192,8 +1184,7 @@
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());
@@ -1210,7 +1201,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);
@@ -1270,8 +1261,7 @@
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())
{
@@ -1296,10 +1286,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)
{
@@ -1348,8 +1338,7 @@
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())
{
@@ -1371,7 +1360,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);
}
@@ -1380,10 +1369,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)
{
@@ -1432,8 +1421,7 @@
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())
{
@@ -1455,7 +1443,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);
}
@@ -1464,10 +1452,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)
{
@@ -1486,11 +1474,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();
@@ -1498,7 +1486,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");
@@ -1527,7 +1515,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());
@@ -1541,7 +1529,7 @@
backup.restoreExistingRepository(bchLog, re, false);
assertEquals(JobWorkspaceRestore.RESTORE_SUCCESSFUL, backup.getLastRepositoryRestore(re.getName())
- .getStateRestore());
+ .getStateRestore());
// check
ManageableRepository restoredRepository = repositoryService.getRepository(re.getName());
@@ -1551,10 +1539,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)
{
@@ -1574,11 +1562,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();
@@ -1586,7 +1574,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");
@@ -1615,7 +1603,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());
@@ -1629,7 +1617,7 @@
backup.restoreExistingRepository(bchLog, re, false);
assertEquals(JobWorkspaceRestore.RESTORE_SUCCESSFUL, backup.getLastRepositoryRestore(re.getName())
- .getStateRestore());
+ .getStateRestore());
// check
ManageableRepository restoredRepository = repositoryService.getRepository(re.getName());
@@ -1639,10 +1627,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)
{
@@ -1662,11 +1650,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();
@@ -1674,7 +1662,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");
@@ -1703,7 +1691,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());
@@ -1719,13 +1707,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());
@@ -1735,10 +1723,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)
{
@@ -1758,11 +1746,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();
@@ -1770,7 +1758,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");
@@ -1799,7 +1787,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());
@@ -1815,13 +1803,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());
@@ -1831,10 +1819,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)
{
@@ -1854,9 +1842,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();
@@ -1893,7 +1881,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())
{
@@ -1918,10 +1906,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)
{
@@ -1984,10 +1972,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)
{
@@ -2006,11 +1994,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();
@@ -2018,7 +2006,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");
@@ -2060,7 +2048,7 @@
backup.restoreExistingRepository(bchLog.getBackupId(), false);
assertEquals(JobWorkspaceRestore.RESTORE_SUCCESSFUL, backup.getLastRepositoryRestore(repoName)
- .getStateRestore());
+ .getStateRestore());
// check
ManageableRepository restoredRepository = repositoryService.getRepository(repoName);
@@ -2070,10 +2058,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)
{
@@ -2140,10 +2128,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)
{
@@ -2162,11 +2150,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();
@@ -2174,7 +2162,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");
@@ -2218,7 +2206,7 @@
backup.restoreRepository(bchLog.getBackupId(), false);
assertEquals(JobWorkspaceRestore.RESTORE_SUCCESSFUL, backup.getLastRepositoryRestore(repoName)
- .getStateRestore());
+ .getStateRestore());
// check
ManageableRepository restoredRepository = repositoryService.getRepository(repoName);
@@ -2228,10 +2216,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)
{
Modified: jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/impl/core/RdbmsWorkspaceInitializerWrapper.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/impl/core/RdbmsWorkspaceInitializerWrapper.java 2010-12-10 08:32:32 UTC (rev 3657)
+++ jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/impl/core/RdbmsWorkspaceInitializerWrapper.java 2010-12-10 08:38:51 UTC (rev 3658)
@@ -68,7 +68,7 @@
public void restoreTables(Connection jdbcConn, String tableName) throws RepositoryConfigurationException,
IOException, SQLException
{
- super.restoreTable(jdbcConn, tableName);
+ // super.restoreTable(jdbcConn, new RestoreTableHelper(RestoreTableHelper, arg1));
}
}
15 years, 5 months
- 1
- 0
exo-jcr SVN: r3657 - in jcr/trunk/exo.jcr.component.ext/src: test/java/org/exoplatform/services/jcr/ext/backup and 1 other directory.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2010-12-10 03:32:32 -0500 (Fri, 10 Dec 2010)
New Revision: 3657
Modified:
jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/rdbms/FullBackupJob.java
jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/TestRdbmsWorkspaceInitializer.java
Log:
EXOJCR-1078: correct dump lock tables, lock table name is taken from configuration
Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/rdbms/FullBackupJob.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/rdbms/FullBackupJob.java 2010-12-10 08:27:02 UTC (rev 3656)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/rdbms/FullBackupJob.java 2010-12-10 08:32:32 UTC (rev 3657)
@@ -32,6 +32,7 @@
import org.exoplatform.services.jcr.ext.backup.impl.FileNameProducer;
import org.exoplatform.services.jcr.impl.Constants;
import org.exoplatform.services.jcr.impl.core.RdbmsWorkspaceInitializer;
+import org.exoplatform.services.jcr.impl.core.lock.cacheable.AbstractCacheableLockManager;
import org.exoplatform.services.jcr.impl.core.query.SystemSearchManager;
import org.exoplatform.services.jcr.impl.dataflow.serialization.ObjectWriterImpl;
import org.exoplatform.services.jcr.impl.storage.jdbc.DBConstants;
@@ -210,15 +211,14 @@
}
// dump LOCK data
- scripts =
- new String[][]{
- {"JCR_LOCK_" + workspaceName.toUpperCase(), "select * from JCR_LOCK_" + workspaceName.toUpperCase()},
- {"JCR_LOCK_" + workspaceName.toUpperCase() + "_D",
- "select * from JCR_LOCK_" + workspaceName.toUpperCase() + "_D"}};
+ String lockTableName = AbstractCacheableLockManager.getLockTableName(workspaceEntry.getLockManager());
+ if (lockTableName != null)
+ {
+ scripts =
+ new String[][]{{lockTableName, "select * from " + lockTableName},
+ {lockTableName + "_D", "select * from " + lockTableName + "_D"}};
- for (String script[] : scripts)
- {
- if (jdbcConn.getMetaData().getTables(null, null, script[0], new String[]{"TABLE"}).next())
+ for (String script[] : scripts)
{
dumpTable(jdbcConn, script[0], script[1]);
}
@@ -390,6 +390,7 @@
{
columnType[i] = metaData.getColumnType(i + 1);
contentWriter.writeInt(columnType[i]);
+ contentWriter.writeString(metaData.getColumnName(i + 1));
}
// Now we can output the actual data
Modified: jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/TestRdbmsWorkspaceInitializer.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/TestRdbmsWorkspaceInitializer.java 2010-12-10 08:27:02 UTC (rev 3656)
+++ jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/TestRdbmsWorkspaceInitializer.java 2010-12-10 08:32:32 UTC (rev 3657)
@@ -18,17 +18,6 @@
*/
package org.exoplatform.services.jcr.ext.backup;
-import java.io.File;
-import java.net.URL;
-import java.sql.Connection;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.List;
-
-import javax.naming.InitialContext;
-import javax.sql.DataSource;
-
import org.exoplatform.services.jcr.config.SimpleParameterEntry;
import org.exoplatform.services.jcr.config.WorkspaceEntry;
import org.exoplatform.services.jcr.config.WorkspaceInitializerEntry;
@@ -41,12 +30,22 @@
import org.exoplatform.services.jcr.util.IdGenerator;
import org.exoplatform.services.jcr.util.TesterConfigurationHelper;
+import java.io.File;
+import java.net.URL;
+import java.sql.Connection;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+
+import javax.naming.InitialContext;
+import javax.sql.DataSource;
+
/**
* @author <a href="mailto:anatoliy.bazko@gmail.com">Anatoliy Bazko</a>
* @version $Id: TestFullBackupJob.java 34360 2009-07-22 23:58:59Z tolusha $
*/
-public class TestRdbmsWorkspaceInitializer
- extends BaseRDBMSBackupTest
+public class TestRdbmsWorkspaceInitializer extends BaseRDBMSBackupTest
{
TesterConfigurationHelper helper = TesterConfigurationHelper.getInstence();
15 years, 5 months
- 1
- 0
exo-jcr SVN: r3656 - in jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl: util/jdbc/cleaner and 1 other directory.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2010-12-10 03:27:02 -0500 (Fri, 10 Dec 2010)
New Revision: 3656
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/cacheable/AbstractCacheableLockManager.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/WorkspaceDBCleaner.java
Log:
EXOJCR-939: get LockTableName from workspace configuration
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/cacheable/AbstractCacheableLockManager.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/cacheable/AbstractCacheableLockManager.java 2010-12-10 08:25:41 UTC (rev 3655)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/cacheable/AbstractCacheableLockManager.java 2010-12-10 08:27:02 UTC (rev 3656)
@@ -18,6 +18,7 @@
import org.exoplatform.management.annotations.Managed;
import org.exoplatform.management.annotations.ManagedDescription;
+import org.exoplatform.services.jcr.config.LockManagerEntry;
import org.exoplatform.services.jcr.config.RepositoryConfigurationException;
import org.exoplatform.services.jcr.config.SimpleParameterEntry;
import org.exoplatform.services.jcr.config.WorkspaceEntry;
@@ -786,9 +787,9 @@
/**
* Return table name for lock data.
*/
- public static String getLockTableName(WorkspaceEntry wsEntry)
+ public static String getLockTableName(LockManagerEntry lockManagerEntry)
{
- for (SimpleParameterEntry entry : wsEntry.getLockManager().getParameters())
+ for (SimpleParameterEntry entry : lockManagerEntry.getParameters())
{
if (entry.getName().contains(AbstractCacheableLockManager.JDBC_TABLE_NAME_SUFFIX))
{
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/WorkspaceDBCleaner.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/WorkspaceDBCleaner.java 2010-12-10 08:25:41 UTC (rev 3655)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/WorkspaceDBCleaner.java 2010-12-10 08:27:02 UTC (rev 3656)
@@ -81,7 +81,7 @@
this.connection = connection;
this.containerName = wsEntry.getName();
- String lockTableName = AbstractCacheableLockManager.getLockTableName(wsEntry);
+ String lockTableName = AbstractCacheableLockManager.getLockTableName(wsEntry.getLockManager());
if (lockTableName != null)
{
commonDBCleanScripts.add(lockTableName);
15 years, 5 months
- 1
- 0
exo-jcr SVN: r3655 - in jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl: core/lock/infinispan and 2 other directories.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2010-12-10 03:25:41 -0500 (Fri, 10 Dec 2010)
New Revision: 3655
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/cacheable/AbstractCacheableLockManager.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/infinispan/ISPNCacheableLockManagerImpl.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/DBCleanerService.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/HSQLSingleDBCleaner.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/IngresSQLMultiDBCleaner.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/IngresSQLSingleDBCleaner.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/MultiDBCleaner.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/MySQLSingleDBCleaner.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/OracleMultiDBCleaner.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/OracleSingleDBCleaner.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/PgSQLMultiDBCleaner.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/PgSQLSingleDBCleaner.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/SingleDBCleaner.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/WorkspaceDBCleaner.java
Log:
EXOJCR-939: get LockTableName from workspace configuration
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/cacheable/AbstractCacheableLockManager.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/cacheable/AbstractCacheableLockManager.java 2010-12-09 16:49:48 UTC (rev 3654)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/cacheable/AbstractCacheableLockManager.java 2010-12-10 08:25:41 UTC (rev 3655)
@@ -19,6 +19,7 @@
import org.exoplatform.management.annotations.Managed;
import org.exoplatform.management.annotations.ManagedDescription;
import org.exoplatform.services.jcr.config.RepositoryConfigurationException;
+import org.exoplatform.services.jcr.config.SimpleParameterEntry;
import org.exoplatform.services.jcr.config.WorkspaceEntry;
import org.exoplatform.services.jcr.dataflow.ChangesLogIterator;
import org.exoplatform.services.jcr.dataflow.CompositeChangesLog;
@@ -128,6 +129,8 @@
protected LockActionNonTxAware<List<LockData>, Object> getLockList;
+ public static final String JDBC_TABLE_NAME_SUFFIX = "jdbc.table.name";
+
/**
* Constructor.
*
@@ -779,4 +782,20 @@
{
R execute(A arg) throws LockException;
}
+
+ /**
+ * Return table name for lock data.
+ */
+ public static String getLockTableName(WorkspaceEntry wsEntry)
+ {
+ for (SimpleParameterEntry entry : wsEntry.getLockManager().getParameters())
+ {
+ if (entry.getName().contains(AbstractCacheableLockManager.JDBC_TABLE_NAME_SUFFIX))
+ {
+ return entry.getValue();
+ }
+ }
+
+ return null;
+ }
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/infinispan/ISPNCacheableLockManagerImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/infinispan/ISPNCacheableLockManagerImpl.java 2010-12-09 16:49:48 UTC (rev 3654)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/infinispan/ISPNCacheableLockManagerImpl.java 2010-12-10 08:25:41 UTC (rev 3655)
@@ -75,6 +75,8 @@
public static final String INFINISPAN_JDBC_CL_ID_COLUMN = "infinispan-cl-cache.jdbc.id.type";
+ public static final String INFINISPAN_JDBC_TABLE_NAME = "infinispan-cl-cache." + JDBC_TABLE_NAME_SUFFIX;
+
public static final String INFINISPAN_JDBC_CL_AUTO = "auto";
/**
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.java 2010-12-09 16:49:48 UTC (rev 3654)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.java 2010-12-10 08:25:41 UTC (rev 3655)
@@ -31,8 +31,8 @@
import org.exoplatform.services.jcr.impl.storage.jdbc.DBConstants;
import org.exoplatform.services.jcr.impl.storage.jdbc.DialectDetecter;
import org.exoplatform.services.jcr.jbosscache.ExoJBossCacheFactory;
+import org.exoplatform.services.jcr.jbosscache.ExoJBossCacheFactory.CacheType;
import org.exoplatform.services.jcr.jbosscache.PrivilegedJBossCacheHelper;
-import org.exoplatform.services.jcr.jbosscache.ExoJBossCacheFactory.CacheType;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
import org.exoplatform.services.naming.InitialContextInitializer;
@@ -82,6 +82,8 @@
public static final String JBOSSCACHE_JDBC_CL_FQN_COLUMN = "jbosscache-cl-cache.jdbc.fqn.type";
+ public static final String JBOSSCACHE_JDBC_TABLE_NAME = "jbosscache-cl-cache." + JDBC_TABLE_NAME_SUFFIX;
+
/**
* Indicate whether the JBoss Cache instance used can be shared with other caches
*/
@@ -559,4 +561,5 @@
}
node.setResident(true);
}
+
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/DBCleanerService.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/DBCleanerService.java 2010-12-09 16:49:48 UTC (rev 3654)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/DBCleanerService.java 2010-12-10 08:25:41 UTC (rev 3655)
@@ -132,46 +132,46 @@
{
if (dbDialect == DBConstants.DB_DIALECT_ORACLEOCI || dbDialect == DBConstants.DB_DIALECT_ORACLE)
{
- dbCleaner = new OracleMultiDBCleaner(wsEntry.getName(), conn);
+ dbCleaner = new OracleMultiDBCleaner(wsEntry, conn);
}
else if (dbDialect == DBConstants.DB_DIALECT_PGSQL)
{
- dbCleaner = new PgSQLMultiDBCleaner(wsEntry.getName(), conn);
+ dbCleaner = new PgSQLMultiDBCleaner(wsEntry, conn);
}
else if (dbDialect == DBConstants.DB_DIALECT_INGRES)
{
- dbCleaner = new IngresSQLMultiDBCleaner(wsEntry.getName(), conn);
+ dbCleaner = new IngresSQLMultiDBCleaner(wsEntry, conn);
}
else
{
- dbCleaner = new MultiDBCleaner(wsEntry.getName(), conn);
+ dbCleaner = new MultiDBCleaner(wsEntry, conn);
}
}
else
{
if (dbDialect == DBConstants.DB_DIALECT_ORACLEOCI || dbDialect == DBConstants.DB_DIALECT_ORACLE)
{
- dbCleaner = new OracleSingleDBCleaner(wsEntry.getName(), conn);
+ dbCleaner = new OracleSingleDBCleaner(wsEntry, conn);
}
else if (dbDialect == DBConstants.DB_DIALECT_PGSQL)
{
- dbCleaner = new PgSQLSingleDBCleaner(wsEntry.getName(), conn);
+ dbCleaner = new PgSQLSingleDBCleaner(wsEntry, conn);
}
else if (dbDialect == DBConstants.DB_DIALECT_INGRES)
{
- dbCleaner = new IngresSQLSingleDBCleaner(wsEntry.getName(), conn);
+ dbCleaner = new IngresSQLSingleDBCleaner(wsEntry, conn);
}
else if (dbDialect == DBConstants.DB_DIALECT_HSQLDB)
{
- dbCleaner = new HSQLSingleDBCleaner(wsEntry.getName(), conn);
+ dbCleaner = new HSQLSingleDBCleaner(wsEntry, conn);
}
else if (dbDialect == DBConstants.DB_DIALECT_MYSQL || dbDialect == DBConstants.DB_DIALECT_MYSQL_UTF8)
{
- dbCleaner = new MySQLSingleDBCleaner(wsEntry.getName(), conn);
+ dbCleaner = new MySQLSingleDBCleaner(wsEntry, conn);
}
else
{
- dbCleaner = new SingleDBCleaner(wsEntry.getName(), conn);
+ dbCleaner = new SingleDBCleaner(wsEntry, conn);
}
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/HSQLSingleDBCleaner.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/HSQLSingleDBCleaner.java 2010-12-09 16:49:48 UTC (rev 3654)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/HSQLSingleDBCleaner.java 2010-12-10 08:25:41 UTC (rev 3655)
@@ -16,6 +16,8 @@
*/
package org.exoplatform.services.jcr.impl.util.jdbc.cleaner;
+import org.exoplatform.services.jcr.config.WorkspaceEntry;
+
import java.sql.Connection;
import java.util.ArrayList;
import java.util.List;
@@ -30,9 +32,9 @@
/**
* HSQLSingleDBCleaner constructor.
*/
- public HSQLSingleDBCleaner(String containerName, Connection connection)
+ public HSQLSingleDBCleaner(WorkspaceEntry wsEntry, Connection connection)
{
- super(containerName, connection, true);
+ super(wsEntry, connection, true);
}
/**
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/IngresSQLMultiDBCleaner.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/IngresSQLMultiDBCleaner.java 2010-12-09 16:49:48 UTC (rev 3654)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/IngresSQLMultiDBCleaner.java 2010-12-10 08:25:41 UTC (rev 3655)
@@ -16,6 +16,8 @@
*/
package org.exoplatform.services.jcr.impl.util.jdbc.cleaner;
+import org.exoplatform.services.jcr.config.WorkspaceEntry;
+
import java.sql.Connection;
import java.sql.SQLException;
@@ -29,9 +31,9 @@
/**
* IngresSQLMultiDBCleaner constructor.
*/
- public IngresSQLMultiDBCleaner(String containerName, Connection connection)
+ public IngresSQLMultiDBCleaner(WorkspaceEntry wsEntry, Connection connection)
{
- super(containerName, connection);
+ super(wsEntry, connection);
}
/**
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/IngresSQLSingleDBCleaner.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/IngresSQLSingleDBCleaner.java 2010-12-09 16:49:48 UTC (rev 3654)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/IngresSQLSingleDBCleaner.java 2010-12-10 08:25:41 UTC (rev 3655)
@@ -16,6 +16,8 @@
*/
package org.exoplatform.services.jcr.impl.util.jdbc.cleaner;
+import org.exoplatform.services.jcr.config.WorkspaceEntry;
+
import java.sql.Connection;
import java.sql.SQLException;
@@ -32,9 +34,9 @@
/**
* IngresSQLSingleDBCleaner constructor.
*/
- public IngresSQLSingleDBCleaner(String containerName, Connection connection)
+ public IngresSQLSingleDBCleaner(WorkspaceEntry wsEntry, Connection connection)
{
- super(containerName, connection);
+ super(wsEntry, connection);
}
/**
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/MultiDBCleaner.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/MultiDBCleaner.java 2010-12-09 16:49:48 UTC (rev 3654)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/MultiDBCleaner.java 2010-12-10 08:25:41 UTC (rev 3655)
@@ -16,6 +16,8 @@
*/
package org.exoplatform.services.jcr.impl.util.jdbc.cleaner;
+import org.exoplatform.services.jcr.config.WorkspaceEntry;
+
import java.sql.Connection;
import java.util.ArrayList;
import java.util.List;
@@ -35,15 +37,14 @@
/**
* MultiDBCleaner constructor.
*/
- public MultiDBCleaner(String containerName, Connection connection)
+ public MultiDBCleaner(WorkspaceEntry wsEntry, Connection connection)
{
- super(containerName, connection);
+ super(wsEntry, connection);
commonMutliDBCleanScripts.add("drop table JCR_MREF");
commonMutliDBCleanScripts.add("drop table JCR_MVALUE");
commonMutliDBCleanScripts.add("drop table JCR_MITEM");
- commonMutliDBCleanScripts.add("drop table JCR_LOCK_" + containerName.toUpperCase());
- commonMutliDBCleanScripts.add("drop table JCR_LOCK_" + containerName.toUpperCase() + "_D");
+ commonMutliDBCleanScripts.addAll(commonDBCleanScripts);
}
/**
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/MySQLSingleDBCleaner.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/MySQLSingleDBCleaner.java 2010-12-09 16:49:48 UTC (rev 3654)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/MySQLSingleDBCleaner.java 2010-12-10 08:25:41 UTC (rev 3655)
@@ -16,6 +16,8 @@
*/
package org.exoplatform.services.jcr.impl.util.jdbc.cleaner;
+import org.exoplatform.services.jcr.config.WorkspaceEntry;
+
import java.sql.Connection;
import java.util.ArrayList;
import java.util.List;
@@ -30,9 +32,9 @@
/**
* MySQLSingleDBCleaner constructor.
*/
- public MySQLSingleDBCleaner(String containerName, Connection connection)
+ public MySQLSingleDBCleaner(WorkspaceEntry wsEntry, Connection connection)
{
- super(containerName, connection, true);
+ super(wsEntry, connection, true);
}
/**
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/OracleMultiDBCleaner.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/OracleMultiDBCleaner.java 2010-12-09 16:49:48 UTC (rev 3654)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/OracleMultiDBCleaner.java 2010-12-10 08:25:41 UTC (rev 3655)
@@ -16,6 +16,8 @@
*/
package org.exoplatform.services.jcr.impl.util.jdbc.cleaner;
+import org.exoplatform.services.jcr.config.WorkspaceEntry;
+
import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
@@ -30,9 +32,9 @@
/**
* Constructor OracleMultiDBCleaner.
*/
- public OracleMultiDBCleaner(String containerName, Connection connection)
+ public OracleMultiDBCleaner(WorkspaceEntry wsEntry, Connection connection)
{
- super(containerName, connection);
+ super(wsEntry, connection);
}
/**
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/OracleSingleDBCleaner.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/OracleSingleDBCleaner.java 2010-12-09 16:49:48 UTC (rev 3654)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/OracleSingleDBCleaner.java 2010-12-10 08:25:41 UTC (rev 3655)
@@ -16,6 +16,8 @@
*/
package org.exoplatform.services.jcr.impl.util.jdbc.cleaner;
+import org.exoplatform.services.jcr.config.WorkspaceEntry;
+
import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
@@ -34,9 +36,9 @@
/**
* OracleSingleDBCleaner constructor.
*/
- public OracleSingleDBCleaner(String containerName, Connection connection)
+ public OracleSingleDBCleaner(WorkspaceEntry wsEntry, Connection connection)
{
- super(containerName, connection);
+ super(wsEntry, connection);
}
/**
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/PgSQLMultiDBCleaner.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/PgSQLMultiDBCleaner.java 2010-12-09 16:49:48 UTC (rev 3654)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/PgSQLMultiDBCleaner.java 2010-12-10 08:25:41 UTC (rev 3655)
@@ -16,6 +16,8 @@
*/
package org.exoplatform.services.jcr.impl.util.jdbc.cleaner;
+import org.exoplatform.services.jcr.config.WorkspaceEntry;
+
import java.sql.Connection;
import java.sql.SQLException;
@@ -29,9 +31,9 @@
/**
* Constructor PgSQLMultiDBCleaner.
*/
- public PgSQLMultiDBCleaner(String containerName, Connection connection)
+ public PgSQLMultiDBCleaner(WorkspaceEntry wsEntry, Connection connection)
{
- super(containerName, connection);
+ super(wsEntry, connection);
}
/**
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/PgSQLSingleDBCleaner.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/PgSQLSingleDBCleaner.java 2010-12-09 16:49:48 UTC (rev 3654)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/PgSQLSingleDBCleaner.java 2010-12-10 08:25:41 UTC (rev 3655)
@@ -16,6 +16,8 @@
*/
package org.exoplatform.services.jcr.impl.util.jdbc.cleaner;
+import org.exoplatform.services.jcr.config.WorkspaceEntry;
+
import java.sql.Connection;
import java.sql.SQLException;
@@ -32,9 +34,9 @@
/**
* PgSQLSingleDBCleaner constructor.
*/
- public PgSQLSingleDBCleaner(String containerName, Connection connection)
+ public PgSQLSingleDBCleaner(WorkspaceEntry wsEntry, Connection connection)
{
- super(containerName, connection);
+ super(wsEntry, connection);
}
/**
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/SingleDBCleaner.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/SingleDBCleaner.java 2010-12-09 16:49:48 UTC (rev 3654)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/SingleDBCleaner.java 2010-12-10 08:25:41 UTC (rev 3655)
@@ -16,6 +16,8 @@
*/
package org.exoplatform.services.jcr.impl.util.jdbc.cleaner;
+import org.exoplatform.services.jcr.config.WorkspaceEntry;
+
import java.sql.Connection;
import java.util.ArrayList;
import java.util.List;
@@ -45,17 +47,17 @@
/**
* SingleDBCleaner constructor.
*/
- public SingleDBCleaner(String containerName, Connection connection)
+ public SingleDBCleaner(WorkspaceEntry wsEntry, Connection connection)
{
- this(containerName, connection, false);
+ this(wsEntry, connection, false);
}
/**
* SingleDBCleaner constructor.
*/
- public SingleDBCleaner(String containerName, Connection connection, boolean postHelpClean)
+ public SingleDBCleaner(WorkspaceEntry wsEntry, Connection connection, boolean postHelpClean)
{
- super(containerName, connection);
+ super(wsEntry, connection);
this.postHelpClean = postHelpClean;
this.dbCleanHelper = new DBCleanHelper(containerName, connection);
@@ -66,8 +68,7 @@
commonSingleDBCleanScripts
.add("delete from JCR_SVALUE where exists(select * from JCR_SITEM where JCR_SITEM.ID=JCR_SVALUE.PROPERTY_ID and JCR_SITEM.CONTAINER_NAME='"
+ containerName + "')");
- commonSingleDBCleanScripts.add("drop table JCR_LOCK_" + containerName.toUpperCase());
- commonSingleDBCleanScripts.add("drop table JCR_LOCK_" + containerName.toUpperCase() + "_D");
+ commonSingleDBCleanScripts.addAll(commonDBCleanScripts);
}
/**
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/WorkspaceDBCleaner.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/WorkspaceDBCleaner.java 2010-12-09 16:49:48 UTC (rev 3654)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/WorkspaceDBCleaner.java 2010-12-10 08:25:41 UTC (rev 3655)
@@ -17,7 +17,9 @@
package org.exoplatform.services.jcr.impl.util.jdbc.cleaner;
import org.exoplatform.commons.utils.SecurityHelper;
+import org.exoplatform.services.jcr.config.WorkspaceEntry;
import org.exoplatform.services.jcr.core.security.JCRRuntimePermissions;
+import org.exoplatform.services.jcr.impl.core.lock.cacheable.AbstractCacheableLockManager;
import org.exoplatform.services.jcr.impl.util.jdbc.DBInitializer;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
@@ -27,6 +29,7 @@
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
+import java.util.ArrayList;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -60,6 +63,11 @@
protected final Pattern dbObjectNamePattern;
/**
+ * Common clean scripts for database.
+ */
+ protected final List<String> commonDBCleanScripts = new ArrayList<String>();
+
+ /**
* WorkspaceDBCleaner constructor.
*
* @param containerName
@@ -67,11 +75,18 @@
* @param connection
* connection to database where workspace tables is placed
*/
- public WorkspaceDBCleaner(String containerName, Connection connection)
+ public WorkspaceDBCleaner(WorkspaceEntry wsEntry, Connection connection)
{
this.dbObjectNamePattern = Pattern.compile(DBInitializer.SQL_OBJECTNAME, Pattern.CASE_INSENSITIVE);
this.connection = connection;
- this.containerName = containerName;
+ this.containerName = wsEntry.getName();
+
+ String lockTableName = AbstractCacheableLockManager.getLockTableName(wsEntry);
+ if (lockTableName != null)
+ {
+ commonDBCleanScripts.add(lockTableName);
+ commonDBCleanScripts.add(lockTableName + "_D");
+ }
}
/**
15 years, 5 months
- 1
- 0
exo-jcr SVN: r3654 - jcr/branches/1.12.x.
by do-not-reply＠jboss.org
Author: aheritier
Date: 2010-12-09 11:49:48 -0500 (Thu, 09 Dec 2010)
New Revision: 3654
Modified:
jcr/branches/1.12.x/pom.xml
Log:
[REL-638] Upgrade dependencies to next snapshots
Modified: jcr/branches/1.12.x/pom.xml
===================================================================
--- jcr/branches/1.12.x/pom.xml 2010-12-09 16:12:18 UTC (rev 3653)
+++ jcr/branches/1.12.x/pom.xml 2010-12-09 16:49:48 UTC (rev 3654)
@@ -42,9 +42,9 @@
<properties>
<exo.product.name>exo-jcr</exo.product.name>
<exo.product.specification>1.12</exo.product.specification>
- <org.exoplatform.kernel.version>2.2.6-GA</org.exoplatform.kernel.version>
- <org.exoplatform.core.version>2.3.6-GA</org.exoplatform.core.version>
- <org.exoplatform.ws.version>2.1.6-GA</org.exoplatform.ws.version>
+ <org.exoplatform.kernel.version>2.2.7-GA-SNAPSHOT</org.exoplatform.kernel.version>
+ <org.exoplatform.core.version>2.3.7-GA-SNAPSHOT</org.exoplatform.core.version>
+ <org.exoplatform.ws.version>2.1.7-GA-SNAPSHOT</org.exoplatform.ws.version>
<org.exoplatform.doc-style.version>1</org.exoplatform.doc-style.version>
</properties>
15 years, 5 months
- 1
- 0
exo-jcr SVN: r3653 - in jcr/branches/1.12.x: applications and 23 other directories.
by do-not-reply＠jboss.org
Author: aheritier
Date: 2010-12-09 11:12:18 -0500 (Thu, 09 Dec 2010)
New Revision: 3653
Modified:
jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.applications.browser/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.applications.config/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.applications.fckeditor/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.applications.jboss/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.applications.jonas/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.applications.rest/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.applications.tomcat/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.cluster.testclient/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.ear/pom.xml
jcr/branches/1.12.x/applications/pom.xml
jcr/branches/1.12.x/exo.jcr.component.core/pom.xml
jcr/branches/1.12.x/exo.jcr.component.ext/pom.xml
jcr/branches/1.12.x/exo.jcr.component.ftp/pom.xml
jcr/branches/1.12.x/exo.jcr.component.statistics/pom.xml
jcr/branches/1.12.x/exo.jcr.component.webdav/pom.xml
jcr/branches/1.12.x/exo.jcr.connectors.localadapter/pom.xml
jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml
jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/pom.xml
jcr/branches/1.12.x/exo.jcr.docs/pom.xml
jcr/branches/1.12.x/exo.jcr.framework.command/pom.xml
jcr/branches/1.12.x/exo.jcr.framework.ftpclient/pom.xml
jcr/branches/1.12.x/exo.jcr.framework.web/pom.xml
jcr/branches/1.12.x/packaging/module/pom.xml
jcr/branches/1.12.x/pom.xml
Log:
[maven-release-plugin] [REL-638]prepare for next development iteration
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole/pom.xml 2010-12-09 16:11:26 UTC (rev 3652)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole/pom.xml 2010-12-09 16:12:18 UTC (rev 3653)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.6-GA</version>
+ <version>1.12.7-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.backupconsole</artifactId>
<name>eXo JCR :: Applications :: Backup Console</name>
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.browser/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.browser/pom.xml 2010-12-09 16:11:26 UTC (rev 3652)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.browser/pom.xml 2010-12-09 16:12:18 UTC (rev 3653)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.6-GA</version>
+ <version>1.12.7-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.browser</artifactId>
<packaging>war</packaging>
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.config/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.config/pom.xml 2010-12-09 16:11:26 UTC (rev 3652)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.config/pom.xml 2010-12-09 16:12:18 UTC (rev 3653)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.6-GA</version>
+ <version>1.12.7-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.config</artifactId>
<packaging>pom</packaging>
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.fckeditor/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.fckeditor/pom.xml 2010-12-09 16:11:26 UTC (rev 3652)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.fckeditor/pom.xml 2010-12-09 16:12:18 UTC (rev 3653)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.6-GA</version>
+ <version>1.12.7-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.fckeditor</artifactId>
<packaging>war</packaging>
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.jboss/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.jboss/pom.xml 2010-12-09 16:11:26 UTC (rev 3652)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.jboss/pom.xml 2010-12-09 16:12:18 UTC (rev 3653)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.12.6-GA</version>
+ <version>1.12.7-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.ear</artifactId>
- <version>1.12.6-GA</version>
+ <version>1.12.7-GA-SNAPSHOT</version>
<type>ear</type>
<scope>runtime</scope>
</dependency>
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.jonas/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.jonas/pom.xml 2010-12-09 16:11:26 UTC (rev 3652)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.jonas/pom.xml 2010-12-09 16:12:18 UTC (rev 3653)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.12.6-GA</version>
+ <version>1.12.7-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.ear</artifactId>
- <version>1.12.6-GA</version>
+ <version>1.12.7-GA-SNAPSHOT</version>
<type>ear</type>
<scope>runtime</scope>
</dependency>
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.rest/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.rest/pom.xml 2010-12-09 16:11:26 UTC (rev 3652)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.rest/pom.xml 2010-12-09 16:12:18 UTC (rev 3653)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.6-GA</version>
+ <version>1.12.7-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.rest</artifactId>
<packaging>war</packaging>
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.tomcat/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.tomcat/pom.xml 2010-12-09 16:11:26 UTC (rev 3652)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.tomcat/pom.xml 2010-12-09 16:12:18 UTC (rev 3653)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.12.6-GA</version>
+ <version>1.12.7-GA-SNAPSHOT</version>
<relativePath>exo.jcr.applications.config</relativePath>
</parent>
Modified: jcr/branches/1.12.x/applications/exo.jcr.cluster.testclient/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.cluster.testclient/pom.xml 2010-12-09 16:11:26 UTC (rev 3652)
+++ jcr/branches/1.12.x/applications/exo.jcr.cluster.testclient/pom.xml 2010-12-09 16:12:18 UTC (rev 3653)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.6-GA</version>
+ <version>1.12.7-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.cluster.testclient</artifactId>
<name>eXo JCR :: Cluster :: Test Client</name>
Modified: jcr/branches/1.12.x/applications/exo.jcr.ear/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.ear/pom.xml 2010-12-09 16:11:26 UTC (rev 3652)
+++ jcr/branches/1.12.x/applications/exo.jcr.ear/pom.xml 2010-12-09 16:12:18 UTC (rev 3653)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.6-GA</version>
+ <version>1.12.7-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.ear</artifactId>
<packaging>ear</packaging>
Modified: jcr/branches/1.12.x/applications/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/pom.xml 2010-12-09 16:11:26 UTC (rev 3652)
+++ jcr/branches/1.12.x/applications/pom.xml 2010-12-09 16:12:18 UTC (rev 3653)
@@ -22,12 +22,12 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.6-GA</version>
+ <version>1.12.7-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.6-GA</version>
+ <version>1.12.7-GA-SNAPSHOT</version>
<name>eXo JCR :: Applications :: Reactor</name>
<packaging>pom</packaging>
Modified: jcr/branches/1.12.x/exo.jcr.component.core/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.core/pom.xml 2010-12-09 16:11:26 UTC (rev 3652)
+++ jcr/branches/1.12.x/exo.jcr.component.core/pom.xml 2010-12-09 16:12:18 UTC (rev 3653)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.6-GA</version>
+ <version>1.12.7-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.core</artifactId>
<name>eXo JCR :: Component :: Core Service</name>
Modified: jcr/branches/1.12.x/exo.jcr.component.ext/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.ext/pom.xml 2010-12-09 16:11:26 UTC (rev 3652)
+++ jcr/branches/1.12.x/exo.jcr.component.ext/pom.xml 2010-12-09 16:12:18 UTC (rev 3653)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.6-GA</version>
+ <version>1.12.7-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.ext</artifactId>
<name>eXo JCR :: Component :: Extension Service</name>
Modified: jcr/branches/1.12.x/exo.jcr.component.ftp/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.ftp/pom.xml 2010-12-09 16:11:26 UTC (rev 3652)
+++ jcr/branches/1.12.x/exo.jcr.component.ftp/pom.xml 2010-12-09 16:12:18 UTC (rev 3653)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.6-GA</version>
+ <version>1.12.7-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.ftp</artifactId>
<name>eXo JCR :: Component :: FTP Service</name>
Modified: jcr/branches/1.12.x/exo.jcr.component.statistics/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.statistics/pom.xml 2010-12-09 16:11:26 UTC (rev 3652)
+++ jcr/branches/1.12.x/exo.jcr.component.statistics/pom.xml 2010-12-09 16:12:18 UTC (rev 3653)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.6-GA</version>
+ <version>1.12.7-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.statistics</artifactId>
<name>eXo JCR :: Component :: Statistics Provider</name>
Modified: jcr/branches/1.12.x/exo.jcr.component.webdav/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.webdav/pom.xml 2010-12-09 16:11:26 UTC (rev 3652)
+++ jcr/branches/1.12.x/exo.jcr.component.webdav/pom.xml 2010-12-09 16:12:18 UTC (rev 3653)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.6-GA</version>
+ <version>1.12.7-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.webdav</artifactId>
<name>eXo JCR :: Component :: Webdav Service</name>
Modified: jcr/branches/1.12.x/exo.jcr.connectors.localadapter/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.connectors.localadapter/pom.xml 2010-12-09 16:11:26 UTC (rev 3652)
+++ jcr/branches/1.12.x/exo.jcr.connectors.localadapter/pom.xml 2010-12-09 16:12:18 UTC (rev 3653)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.6-GA</version>
+ <version>1.12.7-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.connectors.localadapter</artifactId>
<packaging>rar</packaging>
Modified: jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml 2010-12-09 16:11:26 UTC (rev 3652)
+++ jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml 2010-12-09 16:12:18 UTC (rev 3653)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.docs.developer</artifactId>
- <version>1.12.6-GA</version>
+ <version>1.12.7-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/pom.xml 2010-12-09 16:11:26 UTC (rev 3652)
+++ jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/pom.xml 2010-12-09 16:12:18 UTC (rev 3653)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.docs</artifactId>
- <version>1.12.6-GA</version>
+ <version>1.12.7-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/branches/1.12.x/exo.jcr.docs/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.docs/pom.xml 2010-12-09 16:11:26 UTC (rev 3652)
+++ jcr/branches/1.12.x/exo.jcr.docs/pom.xml 2010-12-09 16:12:18 UTC (rev 3653)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.6-GA</version>
+ <version>1.12.7-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/branches/1.12.x/exo.jcr.framework.command/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.framework.command/pom.xml 2010-12-09 16:11:26 UTC (rev 3652)
+++ jcr/branches/1.12.x/exo.jcr.framework.command/pom.xml 2010-12-09 16:12:18 UTC (rev 3653)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.6-GA</version>
+ <version>1.12.7-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.framework.command</artifactId>
<name>eXo JCR :: Framework :: Command</name>
Modified: jcr/branches/1.12.x/exo.jcr.framework.ftpclient/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.framework.ftpclient/pom.xml 2010-12-09 16:11:26 UTC (rev 3652)
+++ jcr/branches/1.12.x/exo.jcr.framework.ftpclient/pom.xml 2010-12-09 16:12:18 UTC (rev 3653)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.6-GA</version>
+ <version>1.12.7-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.framework.ftpclient</artifactId>
<name>eXo JCR :: Framework :: FTP Client</name>
Modified: jcr/branches/1.12.x/exo.jcr.framework.web/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.framework.web/pom.xml 2010-12-09 16:11:26 UTC (rev 3652)
+++ jcr/branches/1.12.x/exo.jcr.framework.web/pom.xml 2010-12-09 16:12:18 UTC (rev 3653)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.6-GA</version>
+ <version>1.12.7-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.framework.web</artifactId>
<name>eXo JCR :: Framework :: Web</name>
Modified: jcr/branches/1.12.x/packaging/module/pom.xml
===================================================================
--- jcr/branches/1.12.x/packaging/module/pom.xml 2010-12-09 16:11:26 UTC (rev 3652)
+++ jcr/branches/1.12.x/packaging/module/pom.xml 2010-12-09 16:12:18 UTC (rev 3653)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.6-GA</version>
+ <version>1.12.7-GA-SNAPSHOT</version>
</parent>
<artifactId>jcr.packaging.module</artifactId>
<packaging>pom</packaging>
Modified: jcr/branches/1.12.x/pom.xml
===================================================================
--- jcr/branches/1.12.x/pom.xml 2010-12-09 16:11:26 UTC (rev 3652)
+++ jcr/branches/1.12.x/pom.xml 2010-12-09 16:12:18 UTC (rev 3653)
@@ -29,14 +29,14 @@
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.6-GA</version>
+ <version>1.12.7-GA-SNAPSHOT</version>
<packaging>pom</packaging>
<name>eXo JCR</name>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/jcr/tags/1.12.6-GA</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/jcr/tags/1.12.6-GA</developerConnection>
- <url>http://fisheye.jboss.org/browse/exo-jcr/jcr/tags/1.12.6-GA</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/jcr/branches/1.12.x/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/jcr/branches/1.12.x/</developerConnection>
+ <url>http://fisheye.jboss.org/browse/exo-jcr/jcr/branches/1.12.x</url>
</scm>
<properties>
15 years, 5 months
- 1
- 0
exo-jcr SVN: r3652 - jcr/tags.
by do-not-reply＠jboss.org
Author: aheritier
Date: 2010-12-09 11:11:26 -0500 (Thu, 09 Dec 2010)
New Revision: 3652
Added:
jcr/tags/1.12.6-GA/
Log:
[maven-release-plugin] [REL-638] copy for tag 1.12.6-GA
Copied: jcr/tags/1.12.6-GA (from rev 3651, jcr/branches/1.12.x)
15 years, 5 months
- 1
- 0
exo-jcr SVN: r3651 - in jcr/branches/1.12.x: applications and 23 other directories.
by do-not-reply＠jboss.org
Author: aheritier
Date: 2010-12-09 11:10:54 -0500 (Thu, 09 Dec 2010)
New Revision: 3651
Modified:
jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.applications.browser/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.applications.config/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.applications.fckeditor/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.applications.jboss/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.applications.jonas/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.applications.rest/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.applications.tomcat/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.cluster.testclient/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.ear/pom.xml
jcr/branches/1.12.x/applications/pom.xml
jcr/branches/1.12.x/exo.jcr.component.core/pom.xml
jcr/branches/1.12.x/exo.jcr.component.ext/pom.xml
jcr/branches/1.12.x/exo.jcr.component.ftp/pom.xml
jcr/branches/1.12.x/exo.jcr.component.statistics/pom.xml
jcr/branches/1.12.x/exo.jcr.component.webdav/pom.xml
jcr/branches/1.12.x/exo.jcr.connectors.localadapter/pom.xml
jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml
jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/pom.xml
jcr/branches/1.12.x/exo.jcr.docs/pom.xml
jcr/branches/1.12.x/exo.jcr.framework.command/pom.xml
jcr/branches/1.12.x/exo.jcr.framework.ftpclient/pom.xml
jcr/branches/1.12.x/exo.jcr.framework.web/pom.xml
jcr/branches/1.12.x/packaging/module/pom.xml
jcr/branches/1.12.x/pom.xml
Log:
[maven-release-plugin] [REL-638]prepare release 1.12.6-GA
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole/pom.xml 2010-12-09 16:04:24 UTC (rev 3650)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole/pom.xml 2010-12-09 16:10:54 UTC (rev 3651)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.6-GA-SNAPSHOT</version>
+ <version>1.12.6-GA</version>
</parent>
<artifactId>exo.jcr.applications.backupconsole</artifactId>
<name>eXo JCR :: Applications :: Backup Console</name>
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.browser/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.browser/pom.xml 2010-12-09 16:04:24 UTC (rev 3650)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.browser/pom.xml 2010-12-09 16:10:54 UTC (rev 3651)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.6-GA-SNAPSHOT</version>
+ <version>1.12.6-GA</version>
</parent>
<artifactId>exo.jcr.applications.browser</artifactId>
<packaging>war</packaging>
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.config/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.config/pom.xml 2010-12-09 16:04:24 UTC (rev 3650)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.config/pom.xml 2010-12-09 16:10:54 UTC (rev 3651)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.6-GA-SNAPSHOT</version>
+ <version>1.12.6-GA</version>
</parent>
<artifactId>exo.jcr.applications.config</artifactId>
<packaging>pom</packaging>
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.fckeditor/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.fckeditor/pom.xml 2010-12-09 16:04:24 UTC (rev 3650)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.fckeditor/pom.xml 2010-12-09 16:10:54 UTC (rev 3651)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.6-GA-SNAPSHOT</version>
+ <version>1.12.6-GA</version>
</parent>
<artifactId>exo.jcr.applications.fckeditor</artifactId>
<packaging>war</packaging>
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.jboss/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.jboss/pom.xml 2010-12-09 16:04:24 UTC (rev 3650)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.jboss/pom.xml 2010-12-09 16:10:54 UTC (rev 3651)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.12.6-GA-SNAPSHOT</version>
+ <version>1.12.6-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.ear</artifactId>
- <version>1.12.6-GA-SNAPSHOT</version>
+ <version>1.12.6-GA</version>
<type>ear</type>
<scope>runtime</scope>
</dependency>
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.jonas/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.jonas/pom.xml 2010-12-09 16:04:24 UTC (rev 3650)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.jonas/pom.xml 2010-12-09 16:10:54 UTC (rev 3651)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.12.6-GA-SNAPSHOT</version>
+ <version>1.12.6-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.ear</artifactId>
- <version>1.12.6-GA-SNAPSHOT</version>
+ <version>1.12.6-GA</version>
<type>ear</type>
<scope>runtime</scope>
</dependency>
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.rest/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.rest/pom.xml 2010-12-09 16:04:24 UTC (rev 3650)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.rest/pom.xml 2010-12-09 16:10:54 UTC (rev 3651)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.6-GA-SNAPSHOT</version>
+ <version>1.12.6-GA</version>
</parent>
<artifactId>exo.jcr.applications.rest</artifactId>
<packaging>war</packaging>
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.tomcat/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.tomcat/pom.xml 2010-12-09 16:04:24 UTC (rev 3650)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.tomcat/pom.xml 2010-12-09 16:10:54 UTC (rev 3651)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.12.6-GA-SNAPSHOT</version>
+ <version>1.12.6-GA</version>
<relativePath>exo.jcr.applications.config</relativePath>
</parent>
Modified: jcr/branches/1.12.x/applications/exo.jcr.cluster.testclient/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.cluster.testclient/pom.xml 2010-12-09 16:04:24 UTC (rev 3650)
+++ jcr/branches/1.12.x/applications/exo.jcr.cluster.testclient/pom.xml 2010-12-09 16:10:54 UTC (rev 3651)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.6-GA-SNAPSHOT</version>
+ <version>1.12.6-GA</version>
</parent>
<artifactId>exo.jcr.cluster.testclient</artifactId>
<name>eXo JCR :: Cluster :: Test Client</name>
Modified: jcr/branches/1.12.x/applications/exo.jcr.ear/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.ear/pom.xml 2010-12-09 16:04:24 UTC (rev 3650)
+++ jcr/branches/1.12.x/applications/exo.jcr.ear/pom.xml 2010-12-09 16:10:54 UTC (rev 3651)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.6-GA-SNAPSHOT</version>
+ <version>1.12.6-GA</version>
</parent>
<artifactId>exo.jcr.ear</artifactId>
<packaging>ear</packaging>
Modified: jcr/branches/1.12.x/applications/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/pom.xml 2010-12-09 16:04:24 UTC (rev 3650)
+++ jcr/branches/1.12.x/applications/pom.xml 2010-12-09 16:10:54 UTC (rev 3651)
@@ -22,12 +22,12 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.6-GA-SNAPSHOT</version>
+ <version>1.12.6-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.6-GA-SNAPSHOT</version>
+ <version>1.12.6-GA</version>
<name>eXo JCR :: Applications :: Reactor</name>
<packaging>pom</packaging>
Modified: jcr/branches/1.12.x/exo.jcr.component.core/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.core/pom.xml 2010-12-09 16:04:24 UTC (rev 3650)
+++ jcr/branches/1.12.x/exo.jcr.component.core/pom.xml 2010-12-09 16:10:54 UTC (rev 3651)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.6-GA-SNAPSHOT</version>
+ <version>1.12.6-GA</version>
</parent>
<artifactId>exo.jcr.component.core</artifactId>
<name>eXo JCR :: Component :: Core Service</name>
Modified: jcr/branches/1.12.x/exo.jcr.component.ext/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.ext/pom.xml 2010-12-09 16:04:24 UTC (rev 3650)
+++ jcr/branches/1.12.x/exo.jcr.component.ext/pom.xml 2010-12-09 16:10:54 UTC (rev 3651)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.6-GA-SNAPSHOT</version>
+ <version>1.12.6-GA</version>
</parent>
<artifactId>exo.jcr.component.ext</artifactId>
<name>eXo JCR :: Component :: Extension Service</name>
Modified: jcr/branches/1.12.x/exo.jcr.component.ftp/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.ftp/pom.xml 2010-12-09 16:04:24 UTC (rev 3650)
+++ jcr/branches/1.12.x/exo.jcr.component.ftp/pom.xml 2010-12-09 16:10:54 UTC (rev 3651)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.6-GA-SNAPSHOT</version>
+ <version>1.12.6-GA</version>
</parent>
<artifactId>exo.jcr.component.ftp</artifactId>
<name>eXo JCR :: Component :: FTP Service</name>
Modified: jcr/branches/1.12.x/exo.jcr.component.statistics/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.statistics/pom.xml 2010-12-09 16:04:24 UTC (rev 3650)
+++ jcr/branches/1.12.x/exo.jcr.component.statistics/pom.xml 2010-12-09 16:10:54 UTC (rev 3651)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.6-GA-SNAPSHOT</version>
+ <version>1.12.6-GA</version>
</parent>
<artifactId>exo.jcr.component.statistics</artifactId>
<name>eXo JCR :: Component :: Statistics Provider</name>
Modified: jcr/branches/1.12.x/exo.jcr.component.webdav/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.webdav/pom.xml 2010-12-09 16:04:24 UTC (rev 3650)
+++ jcr/branches/1.12.x/exo.jcr.component.webdav/pom.xml 2010-12-09 16:10:54 UTC (rev 3651)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.6-GA-SNAPSHOT</version>
+ <version>1.12.6-GA</version>
</parent>
<artifactId>exo.jcr.component.webdav</artifactId>
<name>eXo JCR :: Component :: Webdav Service</name>
Modified: jcr/branches/1.12.x/exo.jcr.connectors.localadapter/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.connectors.localadapter/pom.xml 2010-12-09 16:04:24 UTC (rev 3650)
+++ jcr/branches/1.12.x/exo.jcr.connectors.localadapter/pom.xml 2010-12-09 16:10:54 UTC (rev 3651)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.6-GA-SNAPSHOT</version>
+ <version>1.12.6-GA</version>
</parent>
<artifactId>exo.jcr.connectors.localadapter</artifactId>
<packaging>rar</packaging>
Modified: jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml 2010-12-09 16:04:24 UTC (rev 3650)
+++ jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml 2010-12-09 16:10:54 UTC (rev 3651)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.docs.developer</artifactId>
- <version>1.12.6-GA-SNAPSHOT</version>
+ <version>1.12.6-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/pom.xml 2010-12-09 16:04:24 UTC (rev 3650)
+++ jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/pom.xml 2010-12-09 16:10:54 UTC (rev 3651)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.docs</artifactId>
- <version>1.12.6-GA-SNAPSHOT</version>
+ <version>1.12.6-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/branches/1.12.x/exo.jcr.docs/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.docs/pom.xml 2010-12-09 16:04:24 UTC (rev 3650)
+++ jcr/branches/1.12.x/exo.jcr.docs/pom.xml 2010-12-09 16:10:54 UTC (rev 3651)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.6-GA-SNAPSHOT</version>
+ <version>1.12.6-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/branches/1.12.x/exo.jcr.framework.command/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.framework.command/pom.xml 2010-12-09 16:04:24 UTC (rev 3650)
+++ jcr/branches/1.12.x/exo.jcr.framework.command/pom.xml 2010-12-09 16:10:54 UTC (rev 3651)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.6-GA-SNAPSHOT</version>
+ <version>1.12.6-GA</version>
</parent>
<artifactId>exo.jcr.framework.command</artifactId>
<name>eXo JCR :: Framework :: Command</name>
Modified: jcr/branches/1.12.x/exo.jcr.framework.ftpclient/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.framework.ftpclient/pom.xml 2010-12-09 16:04:24 UTC (rev 3650)
+++ jcr/branches/1.12.x/exo.jcr.framework.ftpclient/pom.xml 2010-12-09 16:10:54 UTC (rev 3651)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.6-GA-SNAPSHOT</version>
+ <version>1.12.6-GA</version>
</parent>
<artifactId>exo.jcr.framework.ftpclient</artifactId>
<name>eXo JCR :: Framework :: FTP Client</name>
Modified: jcr/branches/1.12.x/exo.jcr.framework.web/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.framework.web/pom.xml 2010-12-09 16:04:24 UTC (rev 3650)
+++ jcr/branches/1.12.x/exo.jcr.framework.web/pom.xml 2010-12-09 16:10:54 UTC (rev 3651)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.6-GA-SNAPSHOT</version>
+ <version>1.12.6-GA</version>
</parent>
<artifactId>exo.jcr.framework.web</artifactId>
<name>eXo JCR :: Framework :: Web</name>
Modified: jcr/branches/1.12.x/packaging/module/pom.xml
===================================================================
--- jcr/branches/1.12.x/packaging/module/pom.xml 2010-12-09 16:04:24 UTC (rev 3650)
+++ jcr/branches/1.12.x/packaging/module/pom.xml 2010-12-09 16:10:54 UTC (rev 3651)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.6-GA-SNAPSHOT</version>
+ <version>1.12.6-GA</version>
</parent>
<artifactId>jcr.packaging.module</artifactId>
<packaging>pom</packaging>
Modified: jcr/branches/1.12.x/pom.xml
===================================================================
--- jcr/branches/1.12.x/pom.xml 2010-12-09 16:04:24 UTC (rev 3650)
+++ jcr/branches/1.12.x/pom.xml 2010-12-09 16:10:54 UTC (rev 3651)
@@ -29,14 +29,14 @@
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.6-GA-SNAPSHOT</version>
+ <version>1.12.6-GA</version>
<packaging>pom</packaging>
<name>eXo JCR</name>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/jcr/branches/1.12.x/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/jcr/branches/1.12.x/</developerConnection>
- <url>http://fisheye.jboss.org/browse/exo-jcr/jcr/branches/1.12.x</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/jcr/tags/1.12.6-GA</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/jcr/tags/1.12.6-GA</developerConnection>
+ <url>http://fisheye.jboss.org/browse/exo-jcr/jcr/tags/1.12.6-GA</url>
</scm>
<properties>
15 years, 5 months
- 1
- 0