From do-not-reply at jboss.org Thu Jun 23 11:04:41 2011
Content-Type: multipart/mixed; boundary="===============7589883074958739114=="
MIME-Version: 1.0
From: do-not-reply at jboss.org
To: exo-jcr-commits at lists.jboss.org
Subject: [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.
Date: Thu, 23 Jun 2011 11:04:41 -0400
Message-ID: <201106231504.p5NF4fFt009909@svn01.web.mwc.hst.phx2.redhat.com>

--===============7589883074958739114==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

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" parame=
ter reading, since it useless.

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/se=
rvices/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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 =3D null;
+      // enableStorageUpdate left unchanged since it is never used in Stor=
ageUpdateManager.checkVersion
       boolean enableStorageUpdate =3D false;
-      try
-      {
-         suParam =3D wsConfig.getContainer().getParameterValue("update-sto=
rage");
-         enableStorageUpdate =3D Boolean.parseBoolean(suParam);
-      }
-      catch (RepositoryConfigurationException e)
-      {
-         if (LOG.isDebugEnabled())
-         {
-            LOG.debug("update-storage parameter is not set " + dbSourceNam=
e);
-         }
-      }
-
       this.storageVersion =3D
          StorageUpdateManager.checkVersion(dbSourceName, this.connFactory.=
getJdbcConnection(), multiDb,
             enableStorageUpdate);

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/se=
rvices/jcr/impl/storage/jdbc/update/StorageUpdateManager.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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=3D"mailto:gennady.azarenkov(a)exoplatform.com">Gennady =
Azarenkov</a>
  * @version $Id: StorageUpdateManager.java 34801 2009-07-31 15:44:50Z dkat=
ayev $
  */
-
+(a)Deprecated
 public class StorageUpdateManager
 {
 =

@@ -258,12 +259,15 @@
 =

    /**
     * Check current storage version and update if updateNow=3D=3Dtrue
+    * <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, Conne=
ction connection, boolean multiDB,
       boolean updateNow) throws RepositoryException
    {


--===============7589883074958739114==--