Author: tolusha Date: 2011-03-10 13:04:31 -0500 (Thu, 10 Mar 2011) New Revision: 4074 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/infinispan/ISPNCacheableLockManagerImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/cas/JDBCValueContentAddressStorageImpl.java Log: EXOJCR-833: adopt ISPN for testing on MySQL Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/infinispan/ISPNCacheableLockManagerImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/infinispan/ISPNCacheableLockManagerImpl.java 2011-03-10 18:03:20 UTC (rev 4073) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/infinispan/ISPNCacheableLockManagerImpl.java 2011-03-10 18:04:31 UTC (rev 4074) @@ -115,7 +115,8 @@ // configure cache loader parameters with correct DB data-types configureJDBCCacheLoader(config.getLockManager()); - cache = factory.createCache("Lock_" + config.getUniqueName(), config.getLockManager()); + // ISPN adds regionId to table name and therefore for some db table name is too long + cache = factory.createCache("Lock_" + config.getUniqueName().hashCode(), config.getLockManager()); // Context recall is a workaround of JDBCCacheLoader starting. context.recall(); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/cas/JDBCValueContentAddressStorageImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/cas/JDBCValueContentAddressStorageImpl.java 2011-03-10 18:03:20 UTC (rev 4073) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/cas/JDBCValueContentAddressStorageImpl.java 2011-03-10 18:04:31 UTC (rev 4074) @@ -25,8 +25,6 @@ import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; -import java.security.AccessController; -import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; import java.sql.Connection; import java.sql.DatabaseMetaData; @@ -156,34 +154,7 @@ try { - PrivilegedExceptionAction<DataSource> action = new PrivilegedExceptionAction<DataSource>() - { - public DataSource run() throws Exception - { - return (DataSource)new InitialContext().lookup(sn); - } - }; - try - { - dataSource = AccessController.doPrivileged(action); - } - catch (PrivilegedActionException pae) - { - Throwable cause = pae.getCause(); - if (cause instanceof NamingException) - { - throw (NamingException)cause; - } - else if (cause instanceof RuntimeException) - { - throw (RuntimeException)cause; - } - else - { - throw new RuntimeException(cause); - } - } - + dataSource = (DataSource)new InitialContext().lookup(sn); Connection conn = null; Statement st = null;