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

Author: areshetnyak Date: 2010-09-29 05:12:45 -0400 (Wed, 29 Sep 2010) New Revision: 3216 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/JobExistedWorkspaceRestore.java 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/TestBackupManager.java Log: EXOJCR-747 : Make backup restore easier implementation. 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 08:47:40 UTC (rev 3215) +++ 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) @@ -58,7 +58,10 @@ } @Override - protected void restore() throws RepositoryRestoreExeption + /** + * {@inheritDoc} + */ + protected void restoreRepository() throws RepositoryRestoreExeption { try { @@ -97,7 +100,7 @@ ValueStorageCleanerService.removeWorkspaceValueStorage(wEntry); } - super.restore(); + super.restoreRepository(); } catch (Throwable t) { 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 08:47:40 UTC (rev 3215) +++ 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) @@ -24,7 +24,6 @@ import org.exoplatform.services.jcr.ext.backup.BackupChainLog; import org.exoplatform.services.jcr.ext.backup.BackupManager; import org.exoplatform.services.jcr.ext.backup.WorkspaceRestoreException; -import org.exoplatform.services.jcr.impl.RepositoryContainer; import org.exoplatform.services.jcr.impl.core.RepositoryImpl; import org.exoplatform.services.jcr.impl.core.SessionRegistry; import org.exoplatform.services.jcr.impl.util.jdbc.cleaner.DBCleanerService; @@ -43,23 +42,6 @@ */ public class JobExistedWorkspaceRestore extends JobWorkspaceRestore { - - class RepositoryImplHelper extends RepositoryImpl - { - - public RepositoryImplHelper(RepositoryContainer container) throws RepositoryException, - RepositoryConfigurationException - { - super(container); - } - - @Override - public void removeSystemWorkspace() throws RepositoryException - { - super.removeSystemWorkspace(); - } - } - /** * The apache logger. */ @@ -144,19 +126,3 @@ return sessionRegistry.closeSessions(workspaceName); } } - -class ExtendedRepository extends RepositoryImpl -{ - - public ExtendedRepository(RepositoryContainer container) throws RepositoryException, - RepositoryConfigurationException - { - super(container); - } - - @Override - public void removeSystemWorkspace() throws RepositoryException - { - super.removeSystemWorkspace(); - } -} 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-09-29 08:47:40 UTC (rev 3215) +++ jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/AbstractBackupTestCase.java 2010-09-29 09:12:45 UTC (rev 3216) @@ -152,7 +152,7 @@ ArrayList qParams = new ArrayList(); // qParams.add(new SimpleParameterEntry("indexDir", "target" + File.separator+ "temp" + // File.separator +"index" + name)); - qParams.add(new SimpleParameterEntry("indexDir", "target" + File.separator + name + System.currentTimeMillis())); + qParams.add(new SimpleParameterEntry(QueryHandlerParams.PARAM_INDEX_DIR, "target" + File.separator + name + System.currentTimeMillis())); QueryHandlerEntry qEntry = new QueryHandlerEntry("org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex", qParams); Modified: jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/TestBackupManager.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/TestBackupManager.java 2010-09-29 08:47:40 UTC (rev 3215) +++ jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/TestBackupManager.java 2010-09-29 09:12:45 UTC (rev 3216) @@ -1587,8 +1587,6 @@ JobRepositoryRestore job = backup.getLastRepositoryRestore(re.getName()); - Thread.sleep(30*1000); - while (job.getStateRestore() != JobRepositoryRestore.REPOSITORY_RESTORE_SUCCESSFUL && job.getStateRestore() != JobRepositoryRestore.REPOSITORY_RESTORE_FAIL) {