Author: sergiykarpenko Date: 2010-10-20 04:10:23 -0400 (Wed, 20 Oct 2010) New Revision: 3304 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/BackupWorkspaceInitializer.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SysViewWorkspaceInitializer.java Log: EXOJCR-999: make BackupWorkspaceInitializer and SysViewWorkspaceInitializer use ValueFactory.getFileCleaner(); WorkspaceFileCleanerHolder is per-repository now; Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java 2010-10-20 07:53:13 UTC (rev 3303) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java 2010-10-20 08:10:23 UTC (rev 3304) @@ -253,8 +253,8 @@ workspaceContainer.registerComponentImplementation(containerType); if (isSystem) { - registerComponentInstance(new SystemDataContainerHolder( - (WorkspaceDataContainer)workspaceContainer.getComponentInstanceOfType(WorkspaceDataContainer.class))); + registerComponentInstance(new SystemDataContainerHolder((WorkspaceDataContainer)workspaceContainer + .getComponentInstanceOfType(WorkspaceDataContainer.class))); } } catch (ClassNotFoundException e) @@ -369,7 +369,6 @@ } workspaceContainer.registerComponentImplementation(initilizerType); workspaceContainer.registerComponentImplementation(SessionFactory.class); - workspaceContainer.registerComponentImplementation(WorkspaceFileCleanerHolder.class); LocalWorkspaceDataManagerStub wsDataManager = (LocalWorkspaceDataManagerStub)workspaceContainer Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/BackupWorkspaceInitializer.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/BackupWorkspaceInitializer.java 2010-10-20 07:53:13 UTC (rev 3303) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/BackupWorkspaceInitializer.java 2010-10-20 08:10:23 UTC (rev 3304) @@ -90,7 +90,7 @@ super(config, repConfig, dataManager, namespaceRegistry, locationFactory, nodeTypeManager, valueFactory, accessManager); - this.fileCleaner = new FileCleaner(); + this.fileCleaner = valueFactory.getFileCleaner(); restoreDir = restorePath; @@ -366,8 +366,6 @@ restoreChangesLog.restore(); - TransactionChangesLog log = restoreChangesLog.getItemDataChangesLog(); - } else if (changesLogType == RestoreChangesLog.Type.ItemDataChangesLog_without_Streams) { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SysViewWorkspaceInitializer.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SysViewWorkspaceInitializer.java 2010-10-20 07:53:13 UTC (rev 3303) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SysViewWorkspaceInitializer.java 2010-10-20 08:10:23 UTC (rev 3304) @@ -405,7 +405,7 @@ this.namespaceRegistry = namespaceRegistry; this.locationFactory = locationFactory; - this.fileCleaner = new FileCleaner(false); // cleaner should be started! + this.fileCleaner = valueFactory.getFileCleaner(); this.maxBufferSize = config.getContainer().getParameterInteger(WorkspaceDataContainer.MAXBUFFERSIZE_PROP, WorkspaceDataContainer.DEF_MAXBUFFERSIZE); @@ -457,7 +457,7 @@ this.namespaceRegistry = namespaceRegistry; this.locationFactory = locationFactory; - this.fileCleaner = new FileCleaner(false); // cleaner should be started! + this.fileCleaner = valueFactory.getFileCleaner(); this.maxBufferSize = config.getContainer().getParameterInteger(WorkspaceDataContainer.MAXBUFFERSIZE_PROP, WorkspaceDataContainer.DEF_MAXBUFFERSIZE); @@ -819,7 +819,6 @@ public void start() { - fileCleaner.start(); } public void stop()