Author: areshetnyak Date: 2009-11-25 05:57:20 -0500 (Wed, 25 Nov 2009) New Revision: 854 Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/BackupWorkspaceInitializer.java jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/SysViewWorkspaceInitializer.java Log: EXOJCR-203 : In SysViewWorkspaceinitializer and BackupWorkspaceInitializer was changed dependency from CacheableWorkspaceDataManager to WorkspacePersistentDataManager. Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/BackupWorkspaceInitializer.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/BackupWorkspaceInitializer.java 2009-11-25 10:44:59 UTC (rev 853) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/BackupWorkspaceInitializer.java 2009-11-25 10:57:20 UTC (rev 854) @@ -36,6 +36,7 @@ import org.exoplatform.services.jcr.impl.dataflow.TransientPropertyData; import org.exoplatform.services.jcr.impl.dataflow.TransientValueData; import org.exoplatform.services.jcr.impl.dataflow.persistent.CacheableWorkspaceDataManager; +import org.exoplatform.services.jcr.impl.dataflow.persistent.WorkspacePersistentDataManager; import org.exoplatform.services.jcr.impl.storage.JCRInvalidItemStateException; import org.exoplatform.services.jcr.impl.util.io.FileCleaner; import org.exoplatform.services.jcr.observation.ExtendedEvent; @@ -74,7 +75,7 @@ private FileCleaner fileCleaner; public BackupWorkspaceInitializer(WorkspaceEntry config, RepositoryEntry repConfig, - CacheableWorkspaceDataManager dataManager, NamespaceRegistryImpl namespaceRegistry, + WorkspacePersistentDataManager dataManager, NamespaceRegistryImpl namespaceRegistry, LocationFactory locationFactory, NodeTypeManagerImpl nodeTypeManager, ValueFactoryImpl valueFactory, AccessManager accessManager) throws RepositoryConfigurationException, PathNotFoundException, RepositoryException { Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/SysViewWorkspaceInitializer.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/SysViewWorkspaceInitializer.java 2009-11-25 10:44:59 UTC (rev 853) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/SysViewWorkspaceInitializer.java 2009-11-25 10:57:20 UTC (rev 854) @@ -18,6 +18,28 @@ */ package org.exoplatform.services.jcr.impl.core; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; +import java.util.Stack; + +import javax.jcr.NamespaceException; +import javax.jcr.PathNotFoundException; +import javax.jcr.PropertyType; +import javax.jcr.RepositoryException; +import javax.xml.stream.FactoryConfigurationError; +import javax.xml.stream.XMLInputFactory; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; +import javax.xml.stream.events.StartElement; + import org.apache.ws.commons.util.Base64; import org.exoplatform.services.jcr.access.AccessManager; import org.exoplatform.services.jcr.config.RepositoryConfigurationException; @@ -41,34 +63,13 @@ import org.exoplatform.services.jcr.impl.dataflow.TransientPropertyData; import org.exoplatform.services.jcr.impl.dataflow.TransientValueData; import org.exoplatform.services.jcr.impl.dataflow.persistent.CacheableWorkspaceDataManager; +import org.exoplatform.services.jcr.impl.dataflow.persistent.WorkspacePersistentDataManager; import org.exoplatform.services.jcr.impl.util.JCRDateFormat; import org.exoplatform.services.jcr.impl.util.io.FileCleaner; import org.exoplatform.services.jcr.storage.WorkspaceDataContainer; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; -import java.util.Stack; - -import javax.jcr.NamespaceException; -import javax.jcr.PathNotFoundException; -import javax.jcr.PropertyType; -import javax.jcr.RepositoryException; -import javax.xml.stream.FactoryConfigurationError; -import javax.xml.stream.XMLInputFactory; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamReader; -import javax.xml.stream.events.StartElement; - /** * Created by The eXo Platform SAS. <br/> * @@ -357,7 +358,7 @@ * @param repConfig * RepositoryEntry * @param dataManager - * CacheableWorkspaceDataManager + * WorkspacePersistentDataManager * @param namespaceRegistry * NamespaceRegistryImpl * @param locationFactory @@ -376,9 +377,10 @@ * if Repository error */ public SysViewWorkspaceInitializer(WorkspaceEntry config, RepositoryEntry repConfig, - CacheableWorkspaceDataManager dataManager, NamespaceRegistryImpl namespaceRegistry, - LocationFactory locationFactory, NodeTypeManagerImpl nodeTypeManager, ValueFactoryImpl valueFactory, - AccessManager accessManager) throws RepositoryConfigurationException, PathNotFoundException, RepositoryException + WorkspacePersistentDataManager dataManager, NamespaceRegistryImpl namespaceRegistry, + LocationFactory locationFactory, NodeTypeManagerImpl nodeTypeManager, ValueFactoryImpl valueFactory, + AccessManager accessManager) throws RepositoryConfigurationException, PathNotFoundException, + RepositoryException { this.workspaceName = config.getName(); @@ -409,7 +411,7 @@ * @param repConfig * RepositoryEntry * @param dataManager - * CacheableWorkspaceDataManager + * WorkspacePersistentDataManager * @param namespaceRegistry * NamespaceRegistryImpl * @param locationFactory @@ -426,7 +428,7 @@ * if Repository error */ public SysViewWorkspaceInitializer(WorkspaceEntry config, RepositoryEntry repConfig, - CacheableWorkspaceDataManager dataManager, NamespaceRegistryImpl namespaceRegistry, + WorkspacePersistentDataManager dataManager, NamespaceRegistryImpl namespaceRegistry, LocationFactory locationFactory, NodeTypeManagerImpl nodeTypeManager, ValueFactoryImpl valueFactory, AccessManager accessManager, String restorePath) throws RepositoryException {