[exo-jcr-commits] exo-jcr SVN: r4561 - in jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc: update and 1 other directory.

[do-not-reply at jboss.org]

Author: sergiykarpenko
Date: 2011-06-23 11:04:40 -0400 (Thu, 23 Jun 2011)
New Revision: 4561

Modified:
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/update/StorageUpdateManager.java
Log:
EXOJCR-1404: Deprecate StorageUpdateManager. Remove "update-storage" parameter reading, since it useless.

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java	2011-06-22 11:46:51 UTC (rev 4560)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java	2011-06-23 15:04:40 UTC (rev 4561)
@@ -460,21 +460,8 @@
 
       initDatabase();
 
-      String suParam = null;
+      // enableStorageUpdate left unchanged since it is never used in StorageUpdateManager.checkVersion
       boolean enableStorageUpdate = false;
-      try
-      {
-         suParam = wsConfig.getContainer().getParameterValue("update-storage");
-         enableStorageUpdate = Boolean.parseBoolean(suParam);
-      }
-      catch (RepositoryConfigurationException e)
-      {
-         if (LOG.isDebugEnabled())
-         {
-            LOG.debug("update-storage parameter is not set " + dbSourceName);
-         }
-      }
-
       this.storageVersion =
          StorageUpdateManager.checkVersion(dbSourceName, this.connFactory.getJdbcConnection(), multiDb,
             enableStorageUpdate);

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/update/StorageUpdateManager.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/update/StorageUpdateManager.java	2011-06-22 11:46:51 UTC (rev 4560)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/update/StorageUpdateManager.java	2011-06-23 15:04:40 UTC (rev 4561)
@@ -36,12 +36,13 @@
 import javax.jcr.RepositoryException;
 
 /**
- * Created by The eXo Platform SAS.
+ * Created by The eXo Platform SAS.<p>
+ * This feature is deprecated and going to be removed in 1.15 version.
  * 
  * @author <a href="mailto:gennady.azarenkov at exoplatform.com">Gennady Azarenkov</a>
  * @version $Id: StorageUpdateManager.java 34801 2009-07-31 15:44:50Z dkatayev $
  */
-
+ at Deprecated
 public class StorageUpdateManager
 {
 
@@ -258,12 +259,15 @@
 
    /**
     * Check current storage version and update if updateNow==true
+    * <p>
+    * This feature is deprecated and going to be removed in 1.15 version.
     * 
     * @param ds
     * @param updateNow
     * @return
     * @throws RepositoryException
     */
+   @Deprecated
    public static synchronized String checkVersion(String sourceName, Connection connection, boolean multiDB,
       boolean updateNow) throws RepositoryException
    {