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

[do-not-reply at jboss.org]

Author: tolusha
Date: 2010-12-10 03:27:02 -0500 (Fri, 10 Dec 2010)
New Revision: 3656

Modified:
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/cacheable/AbstractCacheableLockManager.java
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/WorkspaceDBCleaner.java
Log:
EXOJCR-939: get LockTableName from workspace configuration

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/cacheable/AbstractCacheableLockManager.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/cacheable/AbstractCacheableLockManager.java	2010-12-10 08:25:41 UTC (rev 3655)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/cacheable/AbstractCacheableLockManager.java	2010-12-10 08:27:02 UTC (rev 3656)
@@ -18,6 +18,7 @@
 
 import org.exoplatform.management.annotations.Managed;
 import org.exoplatform.management.annotations.ManagedDescription;
+import org.exoplatform.services.jcr.config.LockManagerEntry;
 import org.exoplatform.services.jcr.config.RepositoryConfigurationException;
 import org.exoplatform.services.jcr.config.SimpleParameterEntry;
 import org.exoplatform.services.jcr.config.WorkspaceEntry;
@@ -786,9 +787,9 @@
    /**
     * Return table name for lock data.
     */
-   public static String getLockTableName(WorkspaceEntry wsEntry)
+   public static String getLockTableName(LockManagerEntry lockManagerEntry)
    {
-      for (SimpleParameterEntry entry : wsEntry.getLockManager().getParameters())
+      for (SimpleParameterEntry entry : lockManagerEntry.getParameters())
       {
          if (entry.getName().contains(AbstractCacheableLockManager.JDBC_TABLE_NAME_SUFFIX))
          {

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/WorkspaceDBCleaner.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/WorkspaceDBCleaner.java	2010-12-10 08:25:41 UTC (rev 3655)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/cleaner/WorkspaceDBCleaner.java	2010-12-10 08:27:02 UTC (rev 3656)
@@ -81,7 +81,7 @@
       this.connection = connection;
       this.containerName = wsEntry.getName();
 
-      String lockTableName = AbstractCacheableLockManager.getLockTableName(wsEntry);
+      String lockTableName = AbstractCacheableLockManager.getLockTableName(wsEntry.getLockManager());
       if (lockTableName != null)
       {
          commonDBCleanScripts.add(lockTableName);