Author: tolusha Date: 2011-04-28 08:11:42 -0400 (Thu, 28 Apr 2011) New Revision: 4326 Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/JobExistingRepositorySameConfigRestore.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/JobExistingWorkspaceSameConfigRestore.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/rdbms/RdbmsBackupWorkspaceInitializer.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/rdbms/RdbmsWorkspaceInitializer.java Log: EXOJCR-1324: Misspelling in some class names Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java 2011-04-28 12:11:15 UTC (rev 4325) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/BackupManagerImpl.java 2011-04-28 12:11:42 UTC (rev 4326) @@ -53,7 +53,7 @@ import org.exoplatform.services.jcr.ext.common.SessionProvider; import org.exoplatform.services.jcr.ext.registry.RegistryEntry; import org.exoplatform.services.jcr.ext.registry.RegistryService; -import org.exoplatform.services.jcr.impl.backup.JCRRestor; +import org.exoplatform.services.jcr.impl.backup.JCRRestore; import org.exoplatform.services.jcr.impl.core.RepositoryImpl; import org.exoplatform.services.jcr.impl.core.SysViewWorkspaceInitializer; import org.exoplatform.services.jcr.impl.dataflow.persistent.WorkspacePersistentDataManager; @@ -995,7 +995,7 @@ (WorkspacePersistentDataManager)repoService.getRepository(repositoryName).getWorkspaceContainer(workspaceName) .getComponent(WorkspacePersistentDataManager.class); - JCRRestor restorer = new JCRRestor(dataManager, fileCleaner); + JCRRestore restorer = new JCRRestore(dataManager, fileCleaner); restorer.incrementalRestore(new File(pathBackupFile)); } Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/JobExistingRepositorySameConfigRestore.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/JobExistingRepositorySameConfigRestore.java 2011-04-28 12:11:15 UTC (rev 4325) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/JobExistingRepositorySameConfigRestore.java 2011-04-28 12:11:42 UTC (rev 4326) @@ -28,8 +28,8 @@ import org.exoplatform.services.jcr.ext.backup.RepositoryRestoreExeption; import org.exoplatform.services.jcr.impl.backup.BackupException; import org.exoplatform.services.jcr.impl.backup.Backupable; -import org.exoplatform.services.jcr.impl.backup.DataRestor; -import org.exoplatform.services.jcr.impl.backup.JCRRestor; +import org.exoplatform.services.jcr.impl.backup.DataRestore; +import org.exoplatform.services.jcr.impl.backup.JCRRestore; import org.exoplatform.services.jcr.impl.backup.JdbcBackupable; import org.exoplatform.services.jcr.impl.dataflow.persistent.WorkspacePersistentDataManager; import org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer; @@ -75,7 +75,7 @@ protected void restoreRepository() throws RepositoryRestoreExeption { // list of data restorers - List<DataRestor> dataRestorer = new ArrayList<DataRestor>(); + List<DataRestore> dataRestorer = new ArrayList<DataRestore>(); try { @@ -115,7 +115,7 @@ .getComponentInstancesOfType(Backupable.class); File fullBackupDir = - JCRRestor.getFullBackupFile(workspacesMapping.get(wEntry.getName()).getBackupConfig().getBackupDir()); + JCRRestore.getFullBackupFile(workspacesMapping.get(wEntry.getName()).getBackupConfig().getBackupDir()); for (Backupable component : backupable) { @@ -130,17 +130,17 @@ } } - for (DataRestor restorer : dataRestorer) + for (DataRestore restorer : dataRestorer) { restorer.clean(); } - for (DataRestor restorer : dataRestorer) + for (DataRestore restorer : dataRestorer) { restorer.restore(); } - for (DataRestor restorer : dataRestorer) + for (DataRestore restorer : dataRestorer) { restorer.commit(); } @@ -163,10 +163,10 @@ .getWorkspaceContainer(wEntry.getName()).getComponent(FileCleanerHolder.class); File storageDir = - JCRRestor.getFullBackupFile(workspacesMapping.get(wEntry.getName()).getBackupConfig().getBackupDir()); + JCRRestore.getFullBackupFile(workspacesMapping.get(wEntry.getName()).getBackupConfig().getBackupDir()); - JCRRestor restorer = new JCRRestor(dataManager, fileCleanHolder.getFileCleaner()); - for (File incrBackupFile : JCRRestor.getIncrementalFiles(storageDir)) + JCRRestore restorer = new JCRRestore(dataManager, fileCleanHolder.getFileCleaner()); + for (File incrBackupFile : JCRRestore.getIncrementalFiles(storageDir)) { restorer.incrementalRestore(incrBackupFile); } @@ -175,7 +175,7 @@ catch (Throwable t) { // rollback - for (DataRestor restorer : dataRestorer) + for (DataRestore restorer : dataRestorer) { try { @@ -192,7 +192,7 @@ finally { // close - for (DataRestor restorer : dataRestorer) + for (DataRestore restorer : dataRestorer) { try { Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/JobExistingWorkspaceSameConfigRestore.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/JobExistingWorkspaceSameConfigRestore.java 2011-04-28 12:11:15 UTC (rev 4325) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/JobExistingWorkspaceSameConfigRestore.java 2011-04-28 12:11:42 UTC (rev 4326) @@ -26,8 +26,8 @@ import org.exoplatform.services.jcr.ext.backup.WorkspaceRestoreException; import org.exoplatform.services.jcr.impl.backup.BackupException; import org.exoplatform.services.jcr.impl.backup.Backupable; -import org.exoplatform.services.jcr.impl.backup.DataRestor; -import org.exoplatform.services.jcr.impl.backup.JCRRestor; +import org.exoplatform.services.jcr.impl.backup.DataRestore; +import org.exoplatform.services.jcr.impl.backup.JCRRestore; import org.exoplatform.services.jcr.impl.dataflow.persistent.WorkspacePersistentDataManager; import org.exoplatform.services.jcr.impl.util.io.FileCleanerHolder; import org.exoplatform.services.log.ExoLogger; @@ -70,7 +70,7 @@ protected void restore() throws WorkspaceRestoreException { // list of data restorers - List<DataRestor> dataRestorer = new ArrayList<DataRestor>(); + List<DataRestore> dataRestorer = new ArrayList<DataRestore>(); try { @@ -86,21 +86,21 @@ for (Backupable component : backupable) { - File fullBackupDir = JCRRestor.getFullBackupFile(storageDir); + File fullBackupDir = JCRRestore.getFullBackupFile(storageDir); dataRestorer.add(component.getDataRestorer(fullBackupDir)); } - for (DataRestor restorer : dataRestorer) + for (DataRestore restorer : dataRestorer) { restorer.clean(); } - for (DataRestor restorer : dataRestorer) + for (DataRestore restorer : dataRestorer) { restorer.restore(); } - for (DataRestor restorer : dataRestorer) + for (DataRestore restorer : dataRestorer) { restorer.commit(); } @@ -117,8 +117,8 @@ (FileCleanerHolder)repositoryService.getRepository(repositoryName).getWorkspaceContainer(wEntry.getName()) .getComponent(FileCleanerHolder.class); - JCRRestor restorer = new JCRRestor(dataManager, fileCleanHolder.getFileCleaner()); - for (File incrBackupFile : JCRRestor.getIncrementalFiles(storageDir)) + JCRRestore restorer = new JCRRestore(dataManager, fileCleanHolder.getFileCleaner()); + for (File incrBackupFile : JCRRestore.getIncrementalFiles(storageDir)) { restorer.incrementalRestore(incrBackupFile); } @@ -126,7 +126,7 @@ catch (Throwable t) { // rollback - for (DataRestor restorer : dataRestorer) + for (DataRestore restorer : dataRestorer) { try { @@ -143,7 +143,7 @@ finally { // close - for (DataRestor restorer : dataRestorer) + for (DataRestore restorer : dataRestorer) { try { Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/rdbms/RdbmsBackupWorkspaceInitializer.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/rdbms/RdbmsBackupWorkspaceInitializer.java 2011-04-28 12:11:15 UTC (rev 4325) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/rdbms/RdbmsBackupWorkspaceInitializer.java 2011-04-28 12:11:42 UTC (rev 4326) @@ -21,7 +21,7 @@ import org.exoplatform.services.jcr.config.RepositoryConfigurationException; import org.exoplatform.services.jcr.config.RepositoryEntry; import org.exoplatform.services.jcr.config.WorkspaceEntry; -import org.exoplatform.services.jcr.impl.backup.JCRRestor; +import org.exoplatform.services.jcr.impl.backup.JCRRestore; import org.exoplatform.services.jcr.impl.core.LocationFactory; import org.exoplatform.services.jcr.impl.core.NamespaceRegistryImpl; import org.exoplatform.services.jcr.impl.core.nodetype.NodeTypeManagerImpl; @@ -76,8 +76,8 @@ fullRdbmsRestore(); // restore from incremental backup - JCRRestor restorer = new JCRRestor(dataManager, fileCleaner); - for (File incrBackupFile : JCRRestor.getIncrementalFiles(new File(restoreDir))) + JCRRestore restorer = new JCRRestore(dataManager, fileCleaner); + for (File incrBackupFile : JCRRestore.getIncrementalFiles(new File(restoreDir))) { try { Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/rdbms/RdbmsWorkspaceInitializer.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/rdbms/RdbmsWorkspaceInitializer.java 2011-04-28 12:11:15 UTC (rev 4325) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/impl/rdbms/RdbmsWorkspaceInitializer.java 2011-04-28 12:11:42 UTC (rev 4326) @@ -28,7 +28,7 @@ import org.exoplatform.services.jcr.impl.Constants; import org.exoplatform.services.jcr.impl.backup.BackupException; import org.exoplatform.services.jcr.impl.backup.Backupable; -import org.exoplatform.services.jcr.impl.backup.DataRestor; +import org.exoplatform.services.jcr.impl.backup.DataRestore; import org.exoplatform.services.jcr.impl.core.BackupWorkspaceInitializer; import org.exoplatform.services.jcr.impl.core.LocationFactory; import org.exoplatform.services.jcr.impl.core.NamespaceRegistryImpl; @@ -115,7 +115,7 @@ */ protected void fullRdbmsRestore() throws RepositoryException { - List<DataRestor> dataRestorers = new ArrayList<DataRestor>(); + List<DataRestore> dataRestorers = new ArrayList<DataRestore>(); ManageableRepository repository = null; try @@ -138,24 +138,24 @@ dataRestorers.add(component.getDataRestorer(new File(restorePath))); } - for (DataRestor restorer : dataRestorers) + for (DataRestore restorer : dataRestorers) { restorer.clean(); } - for (DataRestor restorer : dataRestorers) + for (DataRestore restorer : dataRestorers) { restorer.restore(); } - for (DataRestor restorer : dataRestorers) + for (DataRestore restorer : dataRestorers) { restorer.commit(); } } catch (Throwable e) { - for (DataRestor restorer : dataRestorers) + for (DataRestore restorer : dataRestorers) { try { @@ -171,7 +171,7 @@ } finally { - for (DataRestor restorer : dataRestorers) + for (DataRestore restorer : dataRestorers) { try {