Author: tolusha Date: 2010-09-29 05:52:33 -0400 (Wed, 29 Sep 2010) New Revision: 3217 Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/RepositoryRestoreExeption.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/JobExistedRepositoryRestore.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/JobExistedWorkspaceRestore.java Log: EXOJCR-747: during cleaning database need to use current configuration of repository/workspace Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/RepositoryRestoreExeption.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/RepositoryRestoreExeption.java 2010-09-29 09:12:45 UTC (rev 3216) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/RepositoryRestoreExeption.java 2010-09-29 09:52:33 UTC (rev 3217) @@ -16,7 +16,6 @@ */ package org.exoplatform.services.jcr.ext.backup; -import javax.jcr.InvalidItemStateException; /** * Created by The eXo Platform SAS. @@ -26,8 +25,7 @@ * @author <a href="mailto:alex.reshetnyak@exoplatform.com.ua">Alex Reshetnyak</a> * @version $Id$ */ -public class RepositoryRestoreExeption - extends BackupConfigurationException +public class RepositoryRestoreExeption extends BackupConfigurationException { /** @@ -42,4 +40,15 @@ { super(message, e); } + + /** + * RepositoryRestoreExeption constructor. + * + * @param message + * String, the exception message + */ + public RepositoryRestoreExeption(String message) + { + super(message); + } } Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/JobExistedRepositoryRestore.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/JobExistedRepositoryRestore.java 2010-09-29 09:12:45 UTC (rev 3216) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/JobExistedRepositoryRestore.java 2010-09-29 09:52:33 UTC (rev 3217) @@ -65,6 +65,15 @@ { try { + RepositoryEntry repositoryEntry = + repositoryService.getConfig().getRepositoryConfiguration(this.repositoryEntry.getName()); + + if (repositoryEntry == null) + { + throw new RepositoryRestoreExeption("Repository " + this.repositoryEntry.getName() + + " did not found configuration"); + } + boolean isDefault = repositoryService.getDefaultRepository().getConfiguration().getName().equals(repositoryEntry.getName()); Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/JobExistedWorkspaceRestore.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/JobExistedWorkspaceRestore.java 2010-09-29 09:12:45 UTC (rev 3216) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/JobExistedWorkspaceRestore.java 2010-09-29 09:52:33 UTC (rev 3217) @@ -67,6 +67,23 @@ { try { + WorkspaceEntry wEntry = null;; + for (WorkspaceEntry entry : repositoryService.getRepository(repositoryName).getConfiguration() + .getWorkspaceEntries()) + { + if (entry.getName().equals(this.wEntry.getName())) + { + wEntry = entry; + break; + } + } + + if (wEntry == null) + { + throw new WorkspaceRestoreException("Workspace " + this.wEntry.getName() + " did not found in repository " + + repositoryName + " configuration"); + } + boolean isSystem = repositoryService.getRepository(repositoryName).getConfiguration().getSystemWorkspaceName() .equals(wEntry.getName());