[Proxool-cvs] proxool/src/java/org/logicalcobwebs/proxool AbstractProxyStatement.java,1.20,1.21 Comp
UNMAINTAINED!
Brought to you by:
billhorsman
Menu
▾
▴
[Proxool-cvs] proxool/src/java/org/logicalcobwebs/proxool AbstractProxyStatement.java,1.20,1.21 CompositeConfigurationListener.java,1.6,1.7 CompositeConnectionListener.java,1.5,1.6 CompositeProxoolListener.java,1.5,1.6 CompositeStateListener.java,1.5,1.6 ConnectionPool.java,1.82,1.83 ConnectionPoolDefinition.java,1.33,1.34 ConnectionPoolManager.java,1.15,1.16 ConnectionResetter.java,1.15,1.16 DefaultConnectionValidator.java,1.1,1.2 FatalSqlExceptionHelper.java,1.4,1.5 HouseKeeper.java,1.4,1.5 HouseKeeperController.java,1.5,1.6 HouseKeeperThread.java,1.4,1.5 Prototyper.java,1.12,1.13 PrototyperController.java,1.9,1.10 PrototyperThread.java,1.5,1.6 ProxoolDataSource.java,1.4,1.5 ProxoolDriver.java,1.27,1.28 ProxoolFacade.java,1.83,1.84 ProxyConnection.java,1.36,1.37 ProxyDatabaseMetaData.java,1.8,1.9 ProxyFactory.java,1.31,1.32 ProxyStatement.java,1.30,1.31 ShutdownHook.java,1.11,1.12 Version.java,1.19,1.20 WrappedConnection.java,1.5,1.6
Update of /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30852/src/java/org/logicalcobwebs/proxool Modified Files: AbstractProxyStatement.java CompositeConfigurationListener.java CompositeConnectionListener.java CompositeProxoolListener.java CompositeStateListener.java ConnectionPool.java ConnectionPoolDefinition.java ConnectionPoolManager.java ConnectionResetter.java DefaultConnectionValidator.java FatalSqlExceptionHelper.java HouseKeeper.java HouseKeeperController.java HouseKeeperThread.java Prototyper.java PrototyperController.java PrototyperThread.java ProxoolDataSource.java ProxoolDriver.java ProxoolFacade.java ProxyConnection.java ProxyDatabaseMetaData.java ProxyFactory.java ProxyStatement.java ShutdownHook.java Version.java WrappedConnection.java Log Message: Unbundled Jakarta's Commons Logging. Index: AbstractProxyStatement.java =================================================================== RCS file: /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/AbstractProxyStatement.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** AbstractProxyStatement.java 7 Oct 2005 08:25:15 -0000 1.20 --- AbstractProxyStatement.java 18 Jan 2006 14:40:00 -0000 1.21 *************** *** 6,11 **** package org.logicalcobwebs.proxool; ! import org.logicalcobwebs.logging.Log; ! import org.logicalcobwebs.logging.LogFactory; import java.sql.SQLException; --- 6,11 ---- package org.logicalcobwebs.proxool; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import java.sql.SQLException; *************** *** 272,275 **** --- 272,278 ---- Revision history: $Log$ + Revision 1.21 2006/01/18 14:40:00 billhorsman + Unbundled Jakarta's Commons Logging. + Revision 1.20 2005/10/07 08:25:15 billhorsman Support new sqlCalls list and isTrace() is now true if the connection pool is being listened to or if trace is on. It no longer depends on the log level. This is because the sqlCalls are available in AdminServlet and not just the logs. Index: CompositeConfigurationListener.java =================================================================== RCS file: /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/CompositeConfigurationListener.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CompositeConfigurationListener.java 16 Mar 2004 08:48:32 -0000 1.6 --- CompositeConfigurationListener.java 18 Jan 2006 14:40:01 -0000 1.7 *************** *** 8,13 **** import java.util.Properties; ! import org.logicalcobwebs.logging.Log; ! import org.logicalcobwebs.logging.LogFactory; import org.logicalcobwebs.proxool.util.AbstractListenerContainer; --- 8,13 ---- import java.util.Properties; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.logicalcobwebs.proxool.util.AbstractListenerContainer; *************** *** 52,58 **** Revision history: $Log$ Revision 1.6 2004/03/16 08:48:32 brenuart ! Changes in the AbstractListenerContainer: ! - provide more efficient concurrent handling; - better handling of RuntimeException thrown by external listeners. --- 52,61 ---- Revision history: $Log$ + Revision 1.7 2006/01/18 14:40:01 billhorsman + Unbundled Jakarta's Commons Logging. + Revision 1.6 2004/03/16 08:48:32 brenuart ! Changes in the AbstractListenerContainer: ! - provide more efficient concurrent handling; - better handling of RuntimeException thrown by external listeners. Index: CompositeConnectionListener.java =================================================================== RCS file: /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/CompositeConnectionListener.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** CompositeConnectionListener.java 16 Mar 2004 08:48:32 -0000 1.5 --- CompositeConnectionListener.java 18 Jan 2006 14:40:01 -0000 1.6 *************** *** 9,14 **** import java.sql.SQLException; ! import org.logicalcobwebs.logging.Log; ! import org.logicalcobwebs.logging.LogFactory; import org.logicalcobwebs.proxool.util.AbstractListenerContainer; --- 9,14 ---- import java.sql.SQLException; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.logicalcobwebs.proxool.util.AbstractListenerContainer; *************** *** 113,119 **** Revision history: $Log$ Revision 1.5 2004/03/16 08:48:32 brenuart ! Changes in the AbstractListenerContainer: ! - provide more efficient concurrent handling; - better handling of RuntimeException thrown by external listeners. --- 113,122 ---- Revision history: $Log$ + Revision 1.6 2006/01/18 14:40:01 billhorsman + Unbundled Jakarta's Commons Logging. + Revision 1.5 2004/03/16 08:48:32 brenuart ! Changes in the AbstractListenerContainer: ! - provide more efficient concurrent handling; - better handling of RuntimeException thrown by external listeners. Index: CompositeProxoolListener.java =================================================================== RCS file: /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/CompositeProxoolListener.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** CompositeProxoolListener.java 16 Mar 2004 08:48:32 -0000 1.5 --- CompositeProxoolListener.java 18 Jan 2006 14:40:01 -0000 1.6 *************** *** 8,13 **** import java.util.Properties; ! import org.logicalcobwebs.logging.Log; ! import org.logicalcobwebs.logging.LogFactory; import org.logicalcobwebs.proxool.util.AbstractListenerContainer; --- 8,13 ---- import java.util.Properties; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.logicalcobwebs.proxool.util.AbstractListenerContainer; *************** *** 69,75 **** Revision history: $Log$ Revision 1.5 2004/03/16 08:48:32 brenuart ! Changes in the AbstractListenerContainer: ! - provide more efficient concurrent handling; - better handling of RuntimeException thrown by external listeners. --- 69,78 ---- Revision history: $Log$ + Revision 1.6 2006/01/18 14:40:01 billhorsman + Unbundled Jakarta's Commons Logging. + Revision 1.5 2004/03/16 08:48:32 brenuart ! Changes in the AbstractListenerContainer: ! - provide more efficient concurrent handling; - better handling of RuntimeException thrown by external listeners. Index: CompositeStateListener.java =================================================================== RCS file: /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/CompositeStateListener.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** CompositeStateListener.java 16 Mar 2004 08:48:32 -0000 1.5 --- CompositeStateListener.java 18 Jan 2006 14:40:01 -0000 1.6 *************** *** 6,11 **** package org.logicalcobwebs.proxool; ! import org.logicalcobwebs.logging.Log; ! import org.logicalcobwebs.logging.LogFactory; import org.logicalcobwebs.proxool.util.AbstractListenerContainer; --- 6,11 ---- package org.logicalcobwebs.proxool; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.logicalcobwebs.proxool.util.AbstractListenerContainer; *************** *** 48,54 **** Revision history: $Log$ Revision 1.5 2004/03/16 08:48:32 brenuart ! Changes in the AbstractListenerContainer: ! - provide more efficient concurrent handling; - better handling of RuntimeException thrown by external listeners. --- 48,57 ---- Revision history: $Log$ + Revision 1.6 2006/01/18 14:40:01 billhorsman + Unbundled Jakarta's Commons Logging. + Revision 1.5 2004/03/16 08:48:32 brenuart ! Changes in the AbstractListenerContainer: ! - provide more efficient concurrent handling; - better handling of RuntimeException thrown by external listeners. Index: ConnectionPool.java =================================================================== RCS file: /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/ConnectionPool.java,v retrieving revision 1.82 retrieving revision 1.83 diff -C2 -d -r1.82 -r1.83 *** ConnectionPool.java 7 Oct 2005 08:19:05 -0000 1.82 --- ConnectionPool.java 18 Jan 2006 14:40:01 -0000 1.83 *************** *** 18,23 **** import org.logicalcobwebs.concurrent.ReaderPreferenceReadWriteLock; import org.logicalcobwebs.concurrent.WriterPreferenceReadWriteLock; ! import org.logicalcobwebs.logging.Log; ! import org.logicalcobwebs.logging.LogFactory; import org.logicalcobwebs.proxool.admin.Admin; import org.logicalcobwebs.proxool.util.FastArrayList; --- 18,23 ---- import org.logicalcobwebs.concurrent.ReaderPreferenceReadWriteLock; import org.logicalcobwebs.concurrent.WriterPreferenceReadWriteLock; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.logicalcobwebs.proxool.admin.Admin; import org.logicalcobwebs.proxool.util.FastArrayList; *************** *** 1115,1118 **** --- 1115,1121 ---- Revision history: $Log$ + Revision 1.83 2006/01/18 14:40:01 billhorsman + Unbundled Jakarta's Commons Logging. + Revision 1.82 2005/10/07 08:19:05 billhorsman New sqlCalls gives list of SQL calls rather than just he most recent (for when a connection makes more than one call before being returned to the pool) Index: ConnectionPoolDefinition.java =================================================================== RCS file: /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/ConnectionPoolDefinition.java,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** ConnectionPoolDefinition.java 4 May 2005 16:24:59 -0000 1.33 --- ConnectionPoolDefinition.java 18 Jan 2006 14:40:01 -0000 1.34 *************** *** 6,11 **** package org.logicalcobwebs.proxool; ! import org.logicalcobwebs.logging.Log; ! import org.logicalcobwebs.logging.LogFactory; import java.sql.Driver; --- 6,11 ---- package org.logicalcobwebs.proxool; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import java.sql.Driver; *************** *** 1361,1364 **** --- 1361,1367 ---- Revision history: $Log$ + Revision 1.34 2006/01/18 14:40:01 billhorsman + Unbundled Jakarta's Commons Logging. + Revision 1.33 2005/05/04 16:24:59 billhorsman Now supports cloning. Index: ConnectionPoolManager.java =================================================================== RCS file: /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/ConnectionPoolManager.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** ConnectionPoolManager.java 11 Mar 2003 14:51:51 -0000 1.15 --- ConnectionPoolManager.java 18 Jan 2006 14:40:01 -0000 1.16 *************** *** 6,11 **** package org.logicalcobwebs.proxool; ! import org.logicalcobwebs.logging.Log; ! import org.logicalcobwebs.logging.LogFactory; import java.util.HashMap; --- 6,11 ---- package org.logicalcobwebs.proxool; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import java.util.HashMap; *************** *** 115,118 **** --- 115,121 ---- Revision history: $Log$ + Revision 1.16 2006/01/18 14:40:01 billhorsman + Unbundled Jakarta's Commons Logging. + Revision 1.15 2003/03/11 14:51:51 billhorsman more concurrency fixes relating to snapshots Index: ConnectionResetter.java =================================================================== RCS file: /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/ConnectionResetter.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** ConnectionResetter.java 7 Oct 2005 08:21:53 -0000 1.15 --- ConnectionResetter.java 18 Jan 2006 14:40:01 -0000 1.16 *************** *** 6,10 **** package org.logicalcobwebs.proxool; ! import org.logicalcobwebs.logging.Log; import java.lang.reflect.Method; --- 6,11 ---- package org.logicalcobwebs.proxool; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.Log; import java.lang.reflect.Method; *************** *** 328,331 **** --- 329,335 ---- Revision history: $Log$ + Revision 1.16 2006/01/18 14:40:01 billhorsman + Unbundled Jakarta's Commons Logging. + Revision 1.15 2005/10/07 08:21:53 billhorsman New hook to allow unit tests to trigger a deliberate exception during reset Index: DefaultConnectionValidator.java =================================================================== RCS file: /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/DefaultConnectionValidator.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DefaultConnectionValidator.java 25 Mar 2004 22:02:15 -0000 1.1 --- DefaultConnectionValidator.java 18 Jan 2006 14:40:01 -0000 1.2 *************** *** 9,14 **** import java.sql.Statement; ! import org.logicalcobwebs.logging.Log; ! import org.logicalcobwebs.logging.LogFactory; /** --- 9,14 ---- import java.sql.Statement; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; /** *************** *** 86,91 **** Revision history: $Log$ Revision 1.1 2004/03/25 22:02:15 brenuart ! First step towards pluggable ConnectionBuilderIF & ConnectionValidatorIF. Include some minor refactoring that lead to deprecation of some PrototyperController methods. --- 86,94 ---- Revision history: $Log$ + Revision 1.2 2006/01/18 14:40:01 billhorsman + Unbundled Jakarta's Commons Logging. + Revision 1.1 2004/03/25 22:02:15 brenuart ! First step towards pluggable ConnectionBuilderIF & ConnectionValidatorIF. Include some minor refactoring that lead to deprecation of some PrototyperController methods. Index: FatalSqlExceptionHelper.java =================================================================== RCS file: /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/FatalSqlExceptionHelper.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** FatalSqlExceptionHelper.java 1 Jul 2005 08:02:50 -0000 1.4 --- FatalSqlExceptionHelper.java 18 Jan 2006 14:40:01 -0000 1.5 *************** *** 6,11 **** package org.logicalcobwebs.proxool; ! import org.logicalcobwebs.logging.Log; ! import org.logicalcobwebs.logging.LogFactory; import java.lang.reflect.Constructor; --- 6,11 ---- package org.logicalcobwebs.proxool; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import java.lang.reflect.Constructor; *************** *** 198,201 **** --- 198,204 ---- Revision history: $Log$ + Revision 1.5 2006/01/18 14:40:01 billhorsman + Unbundled Jakarta's Commons Logging. + Revision 1.4 2005/07/01 08:02:50 billhorsman Check for exception message being null Index: HouseKeeper.java =================================================================== RCS file: /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/HouseKeeper.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** HouseKeeper.java 2 Oct 2005 12:35:06 -0000 1.4 --- HouseKeeper.java 18 Jan 2006 14:40:01 -0000 1.5 *************** *** 6,11 **** package org.logicalcobwebs.proxool; ! import org.logicalcobwebs.logging.Log; ! import org.logicalcobwebs.logging.LogFactory; import java.sql.Connection; --- 6,11 ---- package org.logicalcobwebs.proxool; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import java.sql.Connection; *************** *** 260,263 **** --- 260,266 ---- Revision history: $Log$ + Revision 1.5 2006/01/18 14:40:01 billhorsman + Unbundled Jakarta's Commons Logging. + Revision 1.4 2005/10/02 12:35:06 billhorsman Improve message when closing a connection that has been active for too long Index: HouseKeeperController.java =================================================================== RCS file: /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/HouseKeeperController.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** HouseKeeperController.java 2 Jun 2004 20:38:32 -0000 1.5 --- HouseKeeperController.java 18 Jan 2006 14:40:01 -0000 1.6 *************** *** 6,11 **** package org.logicalcobwebs.proxool; ! import org.logicalcobwebs.logging.Log; ! import org.logicalcobwebs.logging.LogFactory; import org.logicalcobwebs.proxool.util.FastArrayList; --- 6,11 ---- package org.logicalcobwebs.proxool; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.logicalcobwebs.proxool.util.FastArrayList; *************** *** 131,134 **** --- 131,137 ---- Revision history: $Log$ + Revision 1.6 2006/01/18 14:40:01 billhorsman + Unbundled Jakarta's Commons Logging. + Revision 1.5 2004/06/02 20:38:32 billhorsman More robust round robin of house keepers. Index: HouseKeeperThread.java =================================================================== RCS file: /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/HouseKeeperThread.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** HouseKeeperThread.java 26 Mar 2004 15:58:56 -0000 1.4 --- HouseKeeperThread.java 18 Jan 2006 14:40:01 -0000 1.5 *************** *** 6,11 **** package org.logicalcobwebs.proxool; ! import org.logicalcobwebs.logging.Log; ! import org.logicalcobwebs.logging.LogFactory; /** --- 6,11 ---- package org.logicalcobwebs.proxool; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; /** *************** *** 62,65 **** --- 62,68 ---- Revision history: $Log$ + Revision 1.5 2006/01/18 14:40:01 billhorsman + Unbundled Jakarta's Commons Logging. + Revision 1.4 2004/03/26 15:58:56 billhorsman Fixes to ensure that house keeper and prototyper threads finish after shutdown. Index: Prototyper.java =================================================================== RCS file: /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/Prototyper.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Prototyper.java 16 Jan 2006 23:10:41 -0000 1.12 --- Prototyper.java 18 Jan 2006 14:40:01 -0000 1.13 *************** *** 9,14 **** import java.sql.SQLException; ! import org.logicalcobwebs.logging.Log; ! import org.logicalcobwebs.logging.LogFactory; /** --- 9,14 ---- import java.sql.SQLException; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; /** *************** *** 314,317 **** --- 314,320 ---- Revision history: $Log$ + Revision 1.13 2006/01/18 14:40:01 billhorsman + Unbundled Jakarta's Commons Logging. + Revision 1.12 2006/01/16 23:10:41 billhorsman Doh. /Do/ decrement connectionCount if we didn't make one. Index: PrototyperController.java =================================================================== RCS file: /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/PrototyperController.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** PrototyperController.java 5 Apr 2004 22:54:57 -0000 1.9 --- PrototyperController.java 18 Jan 2006 14:40:01 -0000 1.10 *************** *** 6,11 **** package org.logicalcobwebs.proxool; ! import org.logicalcobwebs.logging.Log; ! import org.logicalcobwebs.logging.LogFactory; import java.util.Iterator; --- 6,11 ---- package org.logicalcobwebs.proxool; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import java.util.Iterator; *************** *** 110,113 **** --- 110,116 ---- Revision history: $Log$ + Revision 1.10 2006/01/18 14:40:01 billhorsman + Unbundled Jakarta's Commons Logging. + Revision 1.9 2004/04/05 22:54:57 billhorsman Check if notify thread has been shutdown before triggering it. Index: PrototyperThread.java =================================================================== RCS file: /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/PrototyperThread.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** PrototyperThread.java 26 Mar 2004 15:58:56 -0000 1.5 --- PrototyperThread.java 18 Jan 2006 14:40:01 -0000 1.6 *************** *** 6,11 **** package org.logicalcobwebs.proxool; ! import org.logicalcobwebs.logging.Log; ! import org.logicalcobwebs.logging.LogFactory; /** --- 6,11 ---- package org.logicalcobwebs.proxool; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; /** *************** *** 83,86 **** --- 83,89 ---- Revision history: $Log$ + Revision 1.6 2006/01/18 14:40:01 billhorsman + Unbundled Jakarta's Commons Logging. + Revision 1.5 2004/03/26 15:58:56 billhorsman Fixes to ensure that house keeper and prototyper threads finish after shutdown. Index: ProxoolDataSource.java =================================================================== RCS file: /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/ProxoolDataSource.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ProxoolDataSource.java 19 Aug 2004 12:28:28 -0000 1.4 --- ProxoolDataSource.java 18 Jan 2006 14:40:01 -0000 1.5 *************** *** 6,11 **** package org.logicalcobwebs.proxool; ! import org.logicalcobwebs.logging.Log; ! import org.logicalcobwebs.logging.LogFactory; import javax.naming.spi.ObjectFactory; --- 6,11 ---- package org.logicalcobwebs.proxool; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import javax.naming.spi.ObjectFactory; *************** *** 646,649 **** --- 646,652 ---- Revision history: $Log$ + Revision 1.5 2006/01/18 14:40:01 billhorsman + Unbundled Jakarta's Commons Logging. + Revision 1.4 2004/08/19 12:28:28 chr32 Removed factory type test. Index: ProxoolDriver.java =================================================================== RCS file: /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/ProxoolDriver.java,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** ProxoolDriver.java 2 Jun 2004 20:41:13 -0000 1.27 --- ProxoolDriver.java 18 Jan 2006 14:40:01 -0000 1.28 *************** *** 6,11 **** package org.logicalcobwebs.proxool; ! import org.logicalcobwebs.logging.Log; ! import org.logicalcobwebs.logging.LogFactory; import org.logicalcobwebs.proxool.resources.ResourceNamesIF; --- 6,11 ---- package org.logicalcobwebs.proxool; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.logicalcobwebs.proxool.resources.ResourceNamesIF; *************** *** 227,230 **** --- 227,233 ---- Revision history: $Log$ + Revision 1.28 2006/01/18 14:40:01 billhorsman + Unbundled Jakarta's Commons Logging. + Revision 1.27 2004/06/02 20:41:13 billhorsman Don't log SQLExceptions. Leave that up to the client. Index: ProxoolFacade.java =================================================================== RCS file: /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/ProxoolFacade.java,v retrieving revision 1.83 retrieving revision 1.84 diff -C2 -d -r1.83 -r1.84 *** ProxoolFacade.java 26 Sep 2005 09:54:14 -0000 1.83 --- ProxoolFacade.java 18 Jan 2006 14:40:01 -0000 1.84 *************** *** 6,11 **** package org.logicalcobwebs.proxool; ! import org.logicalcobwebs.logging.Log; ! import org.logicalcobwebs.logging.LogFactory; import org.logicalcobwebs.proxool.admin.Admin; import org.logicalcobwebs.proxool.admin.SnapshotIF; --- 6,11 ---- package org.logicalcobwebs.proxool; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.logicalcobwebs.proxool.admin.Admin; import org.logicalcobwebs.proxool.admin.SnapshotIF; *************** *** 822,825 **** --- 822,828 ---- Revision history: $Log$ + Revision 1.84 2006/01/18 14:40:01 billhorsman + Unbundled Jakarta's Commons Logging. + Revision 1.83 2005/09/26 09:54:14 billhorsman Avoid suspected deadlock when getting a detailed snapshot. Only attempt to get the concurrent lock for 10 seconds before giving up. Index: ProxyConnection.java =================================================================== RCS file: /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/ProxyConnection.java,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** ProxyConnection.java 7 Oct 2005 08:18:24 -0000 1.36 --- ProxyConnection.java 18 Jan 2006 14:40:02 -0000 1.37 *************** *** 7,12 **** import org.logicalcobwebs.concurrent.WriterPreferenceReadWriteLock; ! import org.logicalcobwebs.logging.Log; ! import org.logicalcobwebs.logging.LogFactory; import org.logicalcobwebs.proxool.util.FastArrayList; --- 7,12 ---- import org.logicalcobwebs.concurrent.WriterPreferenceReadWriteLock; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.logicalcobwebs.proxool.util.FastArrayList; Index: ProxyDatabaseMetaData.java =================================================================== RCS file: /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/ProxyDatabaseMetaData.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ProxyDatabaseMetaData.java 2 Jun 2004 20:50:47 -0000 1.8 --- ProxyDatabaseMetaData.java 18 Jan 2006 14:40:02 -0000 1.9 *************** *** 6,11 **** package org.logicalcobwebs.proxool; ! import org.logicalcobwebs.logging.Log; ! import org.logicalcobwebs.logging.LogFactory; import org.logicalcobwebs.cglib.proxy.MethodInterceptor; --- 6,11 ---- package org.logicalcobwebs.proxool; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.logicalcobwebs.cglib.proxy.MethodInterceptor; *************** *** 111,114 **** --- 111,117 ---- Revision history: $Log$ + Revision 1.9 2006/01/18 14:40:02 billhorsman + Unbundled Jakarta's Commons Logging. + Revision 1.8 2004/06/02 20:50:47 billhorsman Dropped obsolete InvocationHandler reference and injectable interface stuff. Index: ProxyFactory.java =================================================================== RCS file: /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/ProxyFactory.java,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** ProxyFactory.java 26 Sep 2005 09:59:22 -0000 1.31 --- ProxyFactory.java 18 Jan 2006 14:40:02 -0000 1.32 *************** *** 9,14 **** import org.logicalcobwebs.cglib.proxy.Factory; import org.logicalcobwebs.cglib.proxy.Callback; ! import org.logicalcobwebs.logging.Log; ! import org.logicalcobwebs.logging.LogFactory; import java.sql.Connection; --- 9,14 ---- import org.logicalcobwebs.cglib.proxy.Factory; import org.logicalcobwebs.cglib.proxy.Callback; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import java.sql.Connection; *************** *** 245,248 **** --- 245,251 ---- Revision history: $Log$ + Revision 1.32 2006/01/18 14:40:02 billhorsman + Unbundled Jakarta's Commons Logging. + Revision 1.31 2005/09/26 09:59:22 billhorsman Explicitly use the ProxyFactory class loader when using Cglib's Enhancer to avoid class loading issues. Index: ProxyStatement.java =================================================================== RCS file: /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/ProxyStatement.java,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** ProxyStatement.java 16 Jan 2006 23:09:28 -0000 1.30 --- ProxyStatement.java 18 Jan 2006 14:40:02 -0000 1.31 *************** *** 6,11 **** package org.logicalcobwebs.proxool; ! import org.logicalcobwebs.logging.Log; ! import org.logicalcobwebs.logging.LogFactory; import org.logicalcobwebs.cglib.proxy.MethodInterceptor; --- 6,11 ---- package org.logicalcobwebs.proxool; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.logicalcobwebs.cglib.proxy.MethodInterceptor; *************** *** 162,165 **** --- 162,168 ---- Revision history: $Log$ + Revision 1.31 2006/01/18 14:40:02 billhorsman + Unbundled Jakarta's Commons Logging. + Revision 1.30 2006/01/16 23:09:28 billhorsman Call concrete finalize() method Index: ShutdownHook.java =================================================================== RCS file: /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/ShutdownHook.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ShutdownHook.java 16 Dec 2003 09:09:32 -0000 1.11 --- ShutdownHook.java 18 Jan 2006 14:40:02 -0000 1.12 *************** *** 6,11 **** package org.logicalcobwebs.proxool; ! import org.logicalcobwebs.logging.Log; ! import org.logicalcobwebs.logging.LogFactory; import java.lang.reflect.Method; --- 6,11 ---- package org.logicalcobwebs.proxool; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import java.lang.reflect.Method; *************** *** 100,103 **** --- 100,106 ---- Revision history: $Log$ + Revision 1.12 2006/01/18 14:40:02 billhorsman + Unbundled Jakarta's Commons Logging. + Revision 1.11 2003/12/16 09:09:32 billhorsman Switched from getCause() to getTargetException() so that we can trap the IllegalStateException in all JDKs. Index: Version.java =================================================================== RCS file: /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/Version.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Version.java 26 Sep 2005 21:47:46 -0000 1.19 --- Version.java 18 Jan 2006 14:40:02 -0000 1.20 *************** *** 6,11 **** package org.logicalcobwebs.proxool; ! import org.logicalcobwebs.logging.Log; ! import org.logicalcobwebs.logging.LogFactory; /** --- 6,11 ---- package org.logicalcobwebs.proxool; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; /** *************** *** 77,80 **** --- 77,83 ---- Revision history: $Log$ + Revision 1.20 2006/01/18 14:40:02 billhorsman + Unbundled Jakarta's Commons Logging. + Revision 1.19 2005/09/26 21:47:46 billhorsman no message Index: WrappedConnection.java =================================================================== RCS file: /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/WrappedConnection.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** WrappedConnection.java 2 Oct 2005 12:32:58 -0000 1.5 --- WrappedConnection.java 18 Jan 2006 14:40:02 -0000 1.6 *************** *** 9,14 **** import org.logicalcobwebs.cglib.proxy.MethodInterceptor; import org.logicalcobwebs.cglib.proxy.MethodProxy; ! import org.logicalcobwebs.logging.Log; ! import org.logicalcobwebs.logging.LogFactory; import org.logicalcobwebs.proxool.proxy.InvokerFacade; --- 9,14 ---- import org.logicalcobwebs.cglib.proxy.MethodInterceptor; import org.logicalcobwebs.cglib.proxy.MethodProxy; ! import org.apache.commons.logging.Log; ! import org.apache.commons.logging.LogFactory; import org.logicalcobwebs.proxool.proxy.InvokerFacade; *************** *** 267,270 **** --- 267,273 ---- Revision history: $Log$ + Revision 1.6 2006/01/18 14:40:02 billhorsman + Unbundled Jakarta's Commons Logging. + Revision 1.5 2005/10/02 12:32:58 billhorsman Improve the trapping of operations after a wrapped connection is closed. |
