[exo-jcr-commits] exo-jcr SVN: r3660 - in jcr/trunk/exo.jcr.component.ext: src/test/java/org/exoplatform/services/jcr/ext/backup and 1 other directories.

Monday, 13 December 2010

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" />


    

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

[exo-jcr-commits] exo-jcr SVN: r3660 - in jcr/trunk/exo.jcr.component.ext: src/test/java/org/exoplatform/services/jcr/ext/backup and 1 other directories.