[exo-jcr-commits] exo-jcr SVN: r3626 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core.

[do-not-reply at jboss.org]

Author: tolusha
Date: 2010-12-09 03:39:07 -0500 (Thu, 09 Dec 2010)
New Revision: 3626

Modified:
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/RdbmsBackupWorkspaceInitializer.java
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/RdbmsWorkspaceInitializer.java
Log:
EXOJCR-1078: small fix

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/RdbmsBackupWorkspaceInitializer.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/RdbmsBackupWorkspaceInitializer.java	2010-12-09 08:35:18 UTC (rev 3625)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/RdbmsBackupWorkspaceInitializer.java	2010-12-09 08:39:07 UTC (rev 3626)
@@ -16,9 +16,6 @@
  */
 package org.exoplatform.services.jcr.impl.core;
 
-import javax.jcr.PathNotFoundException;
-import javax.jcr.RepositoryException;
-
 import org.exoplatform.services.jcr.access.AccessManager;
 import org.exoplatform.services.jcr.config.RepositoryConfigurationException;
 import org.exoplatform.services.jcr.config.RepositoryEntry;
@@ -31,6 +28,9 @@
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
 
+import javax.jcr.PathNotFoundException;
+import javax.jcr.RepositoryException;
+
 /**
  * Created by The eXo Platform SAS.
  * 
@@ -39,8 +39,7 @@
  * @author <a href="mailto:alex.reshetnyak at exoplatform.com.ua">Alex Reshetnyak</a> 
  * @version $Id$
  */
-public class RdbmsBackupWorkspaceInitializer
-   extends RdbmsWorkspaceInitializer
+public class RdbmsBackupWorkspaceInitializer extends RdbmsWorkspaceInitializer
 {
    /**
     * Logger.
@@ -51,37 +50,37 @@
     * Constructor RdbmsBackupWorkspaceInitializer.
     */
    public RdbmsBackupWorkspaceInitializer(WorkspaceEntry config, RepositoryEntry repConfig,
-            CacheableWorkspaceDataManager dataManager, NamespaceRegistryImpl namespaceRegistry,
-            LocationFactory locationFactory, NodeTypeManagerImpl nodeTypeManager, ValueFactoryImpl valueFactory,
-            AccessManager accessManager) throws RepositoryConfigurationException, PathNotFoundException,
-            RepositoryException
+      CacheableWorkspaceDataManager dataManager, NamespaceRegistryImpl namespaceRegistry,
+      LocationFactory locationFactory, NodeTypeManagerImpl nodeTypeManager, ValueFactoryImpl valueFactory,
+      AccessManager accessManager) throws RepositoryConfigurationException, PathNotFoundException, RepositoryException
    {
       super(config, repConfig, dataManager, namespaceRegistry, locationFactory, nodeTypeManager, valueFactory,
-               accessManager);
+         accessManager);
    }
 
-
    /**
     * {@inheritDoc}
     */
+   @Override
    public NodeData initWorkspace() throws RepositoryException
    {
       if (isWorkspaceInitialized())
       {
-         return (NodeData) dataManager.getItemData(Constants.ROOT_UUID);
+         return (NodeData)dataManager.getItemData(Constants.ROOT_UUID);
       }
 
       long start = System.currentTimeMillis();
 
-      rdbmsRestore();
+      // restore from full rdbms backup
+      fullRdbmsRestore();
 
       // restore from incremental backup
       incrementalRead();
 
-      final NodeData root = (NodeData) dataManager.getItemData(Constants.ROOT_UUID);
+      final NodeData root = (NodeData)dataManager.getItemData(Constants.ROOT_UUID);
 
       log.info("Workspace [" + workspaceName + "] restored from storage " + restorePath + " in "
-               + (System.currentTimeMillis() - start) * 1d / 1000 + "sec");
+         + (System.currentTimeMillis() - start) * 1d / 1000 + "sec");
 
       return root;
    }

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/RdbmsWorkspaceInitializer.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/RdbmsWorkspaceInitializer.java	2010-12-09 08:35:18 UTC (rev 3625)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/RdbmsWorkspaceInitializer.java	2010-12-09 08:39:07 UTC (rev 3626)
@@ -18,28 +18,6 @@
  */
 package org.exoplatform.services.jcr.impl.core;
 
-import java.io.ByteArrayInputStream;
-import java.io.EOFException;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.security.PrivilegedExceptionAction;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.sql.Types;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jcr.PathNotFoundException;
-import javax.jcr.RepositoryException;
-import javax.naming.InitialContext;
-import javax.naming.NameNotFoundException;
-import javax.naming.NamingException;
-import javax.sql.DataSource;
-
 import org.exoplatform.commons.utils.PrivilegedFileHelper;
 import org.exoplatform.commons.utils.SecurityHelper;
 import org.exoplatform.services.jcr.access.AccessManager;
@@ -63,6 +41,28 @@
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
 
+import java.io.ByteArrayInputStream;
+import java.io.EOFException;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.security.PrivilegedExceptionAction;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.sql.Types;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.jcr.PathNotFoundException;
+import javax.jcr.RepositoryException;
+import javax.naming.InitialContext;
+import javax.naming.NameNotFoundException;
+import javax.naming.NamingException;
+import javax.sql.DataSource;
+
 /**
  * @author <a href="mailto:anatoliy.bazko at gmail.com">Anatoliy Bazko</a>
  * @version $Id: RdbmsWorkspaceInitializer.java 34360 2009-07-22 23:58:59Z tolusha $
@@ -150,6 +150,7 @@
    /**
     * {@inheritDoc}
     */
+   @Override
    public NodeData initWorkspace() throws RepositoryException
    {
       if (isWorkspaceInitialized())
@@ -159,17 +160,20 @@
 
       long start = System.currentTimeMillis();
 
-      rdbmsRestore();
+      fullRdbmsRestore();
 
-      final NodeData root = (NodeData) dataManager.getItemData(Constants.ROOT_UUID);
+      final NodeData root = (NodeData)dataManager.getItemData(Constants.ROOT_UUID);
 
       log.info("Workspace [" + workspaceName + "] restored from storage " + restorePath + " in "
-               + (System.currentTimeMillis() - start) * 1d / 1000 + "sec");
+         + (System.currentTimeMillis() - start) * 1d / 1000 + "sec");
 
       return root;
    }
 
-   protected void rdbmsRestore() throws RepositoryException
+   /**
+    * Restore from full backup.
+    */
+   protected void fullRdbmsRestore() throws RepositoryException
    {
       Connection jdbcConn = null;
       Integer transactionIsolation = null;