Author: dkatayev Date: 2009-11-13 10:45:47 -0500 (Fri, 13 Nov 2009) New Revision: 664 Removed: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/monitor/ Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/GenericConnectionFactory.java Log: EXOJCR-240 org.exoplatform.services.jcr.impl.storage.jdbc.monitor package removed Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/GenericConnectionFactory.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/GenericConnectionFactory.java 2009-11-13 15:32:27 UTC (rev 663) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/db/GenericConnectionFactory.java 2009-11-13 15:45:47 UTC (rev 664) @@ -18,7 +18,6 @@ */ package org.exoplatform.services.jcr.impl.storage.jdbc.db; -import org.exoplatform.services.jcr.impl.storage.jdbc.monitor.ManagedConnection; import org.exoplatform.services.jcr.impl.util.io.FileCleaner; import org.exoplatform.services.jcr.storage.WorkspaceStorageConnection; import org.exoplatform.services.jcr.storage.value.ValueStoragePluginProvider; @@ -43,7 +42,29 @@ */ public class GenericConnectionFactory implements WorkspaceStorageConnectionFactory { + + public static final String JCR_JDBC_CONNECTION_MONITOR = "org.exoplatform.jcr.monitor.jdbcMonitor"; + public static final String PREPARE_INTREST_NAME = "PREPARE"; + + public static final String COMMIT_INTEREST_NAME = "COMMIT"; + + public static final String CLOSE_INTEREST_NAME = "CLOSE"; + + public static final String OPEN_INTEREST_NAME = "OPEN"; + + public static final String EXECUTE_INTEREST_NAME = "EXECUTE"; + + public static final int PREPARE_INTREST = 1; + + public static final int COMMIT_INTREST = 2; + + public static final int CLOSE_INTREST = 4; + + public static final int OPEN_INTREST = 8; + + public static final int EXECUTE_INTREST = 16; + protected final Log log = ExoLogger.getLogger("jcr.GenericConnectionFactory"); protected final DataSource dbDataSource; @@ -239,7 +260,7 @@ if (readOnly) // set this feature only if it asked conn.setReadOnly(readOnly); - return monitorInterest == 0 ? conn : new ManagedConnection(conn, monitorInterest); + return monitorInterest == 0 ? conn : null; } catch (SQLException e) { @@ -264,7 +285,7 @@ */ private void initMonitor() { - String monitor = System.getProperty(ManagedConnection.JCR_JDBC_CONNECTION_MONITOR); + String monitor = System.getProperty(JCR_JDBC_CONNECTION_MONITOR); if (monitor != null) { // parse @@ -273,14 +294,14 @@ for (String s : ints) { s = s.trim(); - if (s.equalsIgnoreCase(ManagedConnection.EXECUTE_INTEREST_NAME)) - interest |= ManagedConnection.EXECUTE_INTREST; - else if (s.equalsIgnoreCase(ManagedConnection.COMMIT_INTEREST_NAME)) - interest |= ManagedConnection.COMMIT_INTREST; - else if (s.equalsIgnoreCase(ManagedConnection.CLOSE_INTEREST_NAME)) - interest |= ManagedConnection.CLOSE_INTREST; - else if (s.equalsIgnoreCase(ManagedConnection.OPEN_INTEREST_NAME)) - interest |= ManagedConnection.OPEN_INTREST; + if (s.equalsIgnoreCase(EXECUTE_INTEREST_NAME)) + interest |= EXECUTE_INTREST; + else if (s.equalsIgnoreCase(COMMIT_INTEREST_NAME)) + interest |= COMMIT_INTREST; + else if (s.equalsIgnoreCase(CLOSE_INTEREST_NAME)) + interest |= CLOSE_INTREST; + else if (s.equalsIgnoreCase(OPEN_INTEREST_NAME)) + interest |= OPEN_INTREST; } this.monitorInterest = interest;