proxool-cvs Mailing List for Proxool: Proxy JDBC Connection Pool (Page 2)

UNMAINTAINED!

Brought to you by: billhorsman

proxool-cvs — Mailing list for CVS commit messages

You can subscribe to this list here.

2002	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (2)	Dec (9)
2003	Jan (12)	Feb (17)	Mar (20)	Apr (22)	May (4)	Jun (3)	Jul (11)	Aug (23)	Sep (60)	Oct (41)	Nov (15)	Dec (29)
2004	Jan	Feb	Mar	Apr (1)	May (5)	Jun (29)	Jul (6)	Aug (1)	Sep (2)	Oct	Nov	Dec
2005	Jan	Feb	Mar	Apr	May (8)	Jun	Jul (1)	Aug	Sep (8)	Oct (19)	Nov	Dec
2006	Jan (17)	Feb	Mar (5)	Apr (1)	May (2)	Jun (2)	Jul	Aug	Sep	Oct	Nov (3)	Dec
2007	Jan (9)	Feb	Mar	Apr	May (4)	Jun (4)	Jul (1)	Aug	Sep	Oct	Nov	Dec (3)
2008	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (4)	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 2 3 4 .. 17 > >> (Page 2 of 17)

[Proxool-cvs] proxool build.xml,1.75,1.76

From: <bil...@us...> - 2006-11-02 10:01:34

Update of /cvsroot/proxool/proxool
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22631

Modified Files:
	build.xml 
Log Message:
0.9.0RC2+

Index: build.xml
===================================================================
RCS file: /cvsroot/proxool/proxool/build.xml,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** build.xml	24 Mar 2006 00:06:33 -0000	1.75
--- build.xml	2 Nov 2006 10:01:32 -0000	1.76
***************
*** 27,31 ****
  
      <!-- Currect release, e.g. 0.6 -->
!     <property name="release" value="0.9.0RC1+"/>
  
      <!-- Currect release, e.g. 0.6 -->
--- 27,31 ----
  
      <!-- Currect release, e.g. 0.6 -->
!     <property name="release" value="0.9.0RC2+"/>
  
      <!-- Currect release, e.g. 0.6 -->

[Proxool-cvs] proxool CHANGES.txt,1.44,1.45

From: <bil...@us...> - 2006-11-02 10:01:13

Update of /cvsroot/proxool/proxool
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22599

Modified Files:
	CHANGES.txt 
Log Message:
Added ProxoolFacade.disableShutdownHook.

Index: CHANGES.txt
===================================================================
RCS file: /cvsroot/proxool/proxool/CHANGES.txt,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** CHANGES.txt	9 Jun 2006 18:39:17 -0000	1.44
--- CHANGES.txt	2 Nov 2006 10:01:11 -0000	1.45
***************
*** 14,17 ****
--- 14,22 ----
      $java/lang/Object$$FastClassByCGLIB$$3f697993
  
+ - Added ProxoolFacade.disableShutdownHook so that you can choose to explicitly shutdown
+   Proxool programatically. This is useful because the order that the JVM calls shutdown
+   hooks isn't easily controlled and you might want to shutdown Proxool *after* you've 
+   done some cleaning up yourself.
+ 
  - Fixed bug in ProxoolDataSource to add in maximum-active-time. Credit to Paolo Di Tommaso.

[Proxool-cvs] proxool/src/java/org/logicalcobwebs/proxool ProxoolFacade.java, 1.84, 1.85 ShutdownHook.java, 1.12, 1.13

From: <bil...@us...> - 2006-11-02 10:00:38

Update of /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22237/src/java/org/logicalcobwebs/proxool

Modified Files:
	ProxoolFacade.java ShutdownHook.java 
Log Message:
Added ProxoolFacade.disableShutdownHook.

Index: ProxoolFacade.java
===================================================================
RCS file: /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/ProxoolFacade.java,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -d -r1.84 -r1.85
*** ProxoolFacade.java	18 Jan 2006 14:40:01 -0000	1.84
--- ProxoolFacade.java	2 Nov 2006 10:00:34 -0000	1.85
***************
*** 54,57 ****
--- 54,63 ----
  
      /**
+      * If you setthis to false then it us up to you to call shutdown explicitly
+      * @see #shutdown(String, int)
+      */
+     private static boolean shutdownHookEnabled = true;
+ 
+     /**
       * Build a ConnectionPool based on this definition and then start it.
       * @param url defines the delegate driver and delegate url.
***************
*** 243,246 ****
--- 249,279 ----
  
      /**
+      * If you call this then you'll have to call shutdown explicitly
+      * @see #shutdown(String, int)
+      */
+     public static void disableShutdownHook() {
+         ProxoolFacade.shutdownHookEnabled = false;
+     }
+ 
+     /**
+      * Call this if you change your mind about {@link #disableShutdownHook() disabling} it.
+      * The default behaviour is to have it enabled so unless you have disabled it then
+      * there's nothing to do.
+      */
+     public static void enableShutdownHook() {
+         ProxoolFacade.shutdownHookEnabled = true;
+     }
+ 
+     /**
+      * Whether the {@link ShutdownHook} should do anything.
+      * @see #disableShutdownHook()
+      * @see #enableShutdownHook()
+      * @return true if the shutdown hook should clean up
+      */
+     public static boolean isShutdownHookEnabled() {
+         return shutdownHookEnabled;
+     }
+ 
+     /**
       * Like {@link #removeConnectionPool(java.lang.String, int)} but uses no delay. (Kills
       * everything as quickly as possible).
***************
*** 822,825 ****
--- 855,861 ----
   Revision history:
   $Log$
+  Revision 1.85  2006/11/02 10:00:34  billhorsman
+  Added ProxoolFacade.disableShutdownHook.
+ 
   Revision 1.84  2006/01/18 14:40:01  billhorsman
   Unbundled Jakarta's Commons Logging.

Index: ShutdownHook.java
===================================================================
RCS file: /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/ShutdownHook.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ShutdownHook.java	18 Jan 2006 14:40:02 -0000	1.12
--- ShutdownHook.java	2 Nov 2006 10:00:34 -0000	1.13
***************
*** 85,95 ****
  
      /**
!      * Remove all connection pools without delay
       * @see ProxoolFacade#removeAllConnectionPools
       */
      public void run() {
!         LOG.debug("Running ShutdownHook");
!         Thread.currentThread().setName("Shutdown Hook");
!         ProxoolFacade.shutdown(0);
      }
  
--- 85,100 ----
  
      /**
!      * Remove all connection pools without delay. Only runs if the
!      * shutdown hook is {@link org.logicalcobwebs.proxool.ProxoolFacade#isShutdownHookEnabled() enabled}.
       * @see ProxoolFacade#removeAllConnectionPools
       */
      public void run() {
!         if (ProxoolFacade.isShutdownHookEnabled()) {
!             LOG.debug("Running ShutdownHook");
!             Thread.currentThread().setName("Shutdown Hook");
!             ProxoolFacade.shutdown(0);
!         } else {
!             LOG.debug("Skipping ShutdownHook because it's been disabled");
!         }
      }
  
***************
*** 100,103 ****
--- 105,111 ----
   Revision history:
   $Log$
+  Revision 1.13  2006/11/02 10:00:34  billhorsman
+  Added ProxoolFacade.disableShutdownHook.
+ 
   Revision 1.12  2006/01/18 14:40:02  billhorsman
   Unbundled Jakarta's Commons Logging.

[Proxool-cvs] proxool CHANGES.txt,1.43,1.44

From: <bil...@us...> - 2006-06-09 18:39:24

Update of /cvsroot/proxool/proxool
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19318

Modified Files:
	CHANGES.txt 
Log Message:
Changes for 0.9.0RC3

Index: CHANGES.txt
===================================================================
RCS file: /cvsroot/proxool/proxool/CHANGES.txt,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** CHANGES.txt	24 Mar 2006 00:07:12 -0000	1.43
--- CHANGES.txt	9 Jun 2006 18:39:17 -0000	1.44
***************
*** 6,9 ****
--- 6,22 ----
  $Author$
  
+ 0.9.0RC3
+ 
+ - New naming policy for Cglib stops conflicts with other Cglib instances that are running
+   (Even ones in different packages). Without using our own naming policy we end
+   up with exceptions like:
+     java.lang.LinkageError: duplicate class definition:
+     $java/lang/Object$$FastClassByCGLIB$$3f697993
+ 
+ - Fixed bug in ProxoolDataSource to add in maximum-active-time. Credit to Paolo Di Tommaso.
+ 
+ - Fixed bug in AdminServlet where select HTML tag was not closed properly. Credit to Paolo Di
+   Tommaso.
+ 
  0.9.0RC2

[Proxool-cvs] proxool/src/java/org/logicalcobwebs/proxool/admin/servlet AdminServlet.java, 1.13, 1.14

From: <bil...@us...> - 2006-06-09 17:32:59

Update of /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/admin/servlet
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21589/src/java/org/logicalcobwebs/proxool/admin/servlet

Modified Files:
	AdminServlet.java 
Log Message:
Fix closing tag for select. Credit to Paolo Di Tommaso.

Index: AdminServlet.java
===================================================================
RCS file: /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/admin/servlet/AdminServlet.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** AdminServlet.java	18 Jan 2006 14:39:56 -0000	1.13
--- AdminServlet.java	9 Jun 2006 17:32:54 -0000	1.14
***************
*** 805,809 ****
          } else {
              out.println("<form action=\"" + link + "\" method=\"GET\" name=\"alias\">");
!             out.println("<select name=\"alias\" size=\"" + Math.min(aliases.length, 5) + "\"");
              for (int i = 0; i < aliases.length; i++) {
                  out.print("  <option value=\"");
--- 805,809 ----
          } else {
              out.println("<form action=\"" + link + "\" method=\"GET\" name=\"alias\">");
!             out.println("<select name=\"alias\" size=\"" + Math.min(aliases.length, 5) + "\">");
              for (int i = 0; i < aliases.length; i++) {
                  out.print("  <option value=\"");
***************
*** 840,843 ****
--- 840,846 ----
  Revision history:
  $Log$
+ Revision 1.14  2006/06/09 17:32:54  billhorsman
+ Fix closing tag for select. Credit to Paolo Di Tommaso.
+ 
  Revision 1.13  2006/01/18 14:39:56  billhorsman
  Unbundled Jakarta's Commons Logging.

[Proxool-cvs] proxool/src/java-test/org/logicalcobwebs/proxool KillTest.java,1.1,1.2

From: <bil...@us...> - 2006-05-23 21:34:07

Update of /cvsroot/proxool/proxool/src/java-test/org/logicalcobwebs/proxool
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17446/src/java-test/org/logicalcobwebs/proxool

Modified Files:
	KillTest.java 
Log Message:
More asserts

Index: KillTest.java
===================================================================
RCS file: /cvsroot/proxool/proxool/src/java-test/org/logicalcobwebs/proxool/KillTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** KillTest.java	23 Mar 2004 21:14:24 -0000	1.1
--- KillTest.java	23 May 2006 21:33:52 -0000	1.2
***************
*** 98,104 ****
--- 98,107 ----
          // One left
          assertEquals("Connection count", 1, ProxoolFacade.getSnapshot(alias, DETAILED).getConnectionInfos().length);
+         assertEquals("Active count", 0, ProxoolFacade.getSnapshot(alias, DETAILED).getActiveConnectionCount());
          Connection c3 = DriverManager.getConnection(url, info);
+         assertEquals("Active count", 1, ProxoolFacade.getSnapshot(alias, DETAILED).getActiveConnectionCount());
          long id3 = ProxoolFacade.getId(c3);
          Connection c4 = DriverManager.getConnection(url, info);
+         assertEquals("Active count", 2, ProxoolFacade.getSnapshot(alias, DETAILED).getActiveConnectionCount());
          long id4 = ProxoolFacade.getId(c4);
          c3.close();
***************
*** 144,147 ****
--- 147,153 ----
   Revision history:
   $Log$
+  Revision 1.2  2006/05/23 21:33:52  billhorsman
+  More asserts
+ 
   Revision 1.1  2004/03/23 21:14:24  billhorsman
   new tests

[Proxool-cvs] proxool/src/java/org/logicalcobwebs/proxool ProxoolDataSource.java,1.6,1.7

From: <bil...@us...> - 2006-05-23 21:17:58

Update of /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11600/src/java/org/logicalcobwebs/proxool

Modified Files:
	ProxoolDataSource.java 
Log Message:
Add in maximum-active-time. Credit to Paolo Di Tommaso.

Index: ProxoolDataSource.java
===================================================================
RCS file: /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/ProxoolDataSource.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ProxoolDataSource.java	23 Mar 2006 11:51:23 -0000	1.6
--- ProxoolDataSource.java	23 May 2006 21:17:55 -0000	1.7
***************
*** 556,559 ****
--- 556,563 ----
              setMaximumConnectionLifetime(Integer.valueOf(property.getContent().toString()).intValue());
          }
+         property = reference.get(ProxoolConstants.MAXIMUM_ACTIVE_TIME_PROPERTY);
+         if (property != null) {
+             setMaximumActiveTime(Integer.valueOf(property.getContent().toString()).intValue());
+         }
          property = reference.get(ProxoolConstants.MINIMUM_CONNECTION_COUNT_PROPERTY);
          if (property != null) {
***************
*** 680,683 ****
--- 684,690 ----
   Revision history:
   $Log$
+  Revision 1.7  2006/05/23 21:17:55  billhorsman
+  Add in maximum-active-time. Credit to Paolo Di Tommaso.
+ 
   Revision 1.6  2006/03/23 11:51:23  billhorsman
   Allow for delegate properties

[Proxool-cvs] proxool/src/java/org/logicalcobwebs/proxool ProxyFactory.java,1.32,1.33

From: <bil...@us...> - 2006-04-09 21:08:51

Update of /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24115/src/java/org/logicalcobwebs/proxool

Modified Files:
	ProxyFactory.java 
Log Message:
Use our own naming policy for Cglib to avoid duplicate class definition exceptions.

Index: ProxyFactory.java
===================================================================
RCS file: /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/ProxyFactory.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** ProxyFactory.java	18 Jan 2006 14:40:02 -0000	1.32
--- ProxyFactory.java	9 Apr 2006 21:08:43 -0000	1.33
***************
*** 9,12 ****
--- 9,14 ----
  import org.logicalcobwebs.cglib.proxy.Factory;
  import org.logicalcobwebs.cglib.proxy.Callback;
+ import org.logicalcobwebs.cglib.core.NamingPolicy;
+ import org.logicalcobwebs.cglib.core.Predicate;
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
***************
*** 38,41 ****
--- 40,78 ----
  
      /**
+      * This naming policy stops conflicts with other Cglib instances that are running
+      * (Even ones in different packages). Without using our own naming policy we end
+      * up with exceptions like:
+      * <pre>
+      * java.lang.LinkageError: duplicate class definition:
+      *   $java/lang/Object$$FastClassByCGLIB$$3f697993
+      * </pre>
+      */
+     private static NamingPolicy NAMING_POLICY = new NamingPolicy() {
+         public String getClassName(String prefix, String source, Object key, Predicate names) {
+             StringBuffer sb = new StringBuffer();
+             sb.append(
+                     (prefix != null) ?
+                             (
+                                     prefix.startsWith("java") ?
+                                             "$" + prefix : prefix
+                             )
+                             : "net.sf.cglib.empty.Object"
+             );
+             sb.append("$$");
+             sb.append(source.substring(source.lastIndexOf('.') + 1));
+             sb.append("ByProxool$$");
+             sb.append(Integer.toHexString(key.hashCode()));
+             String base = sb.toString();
+             String attempt = base;
+             int index = 2;
+             while (names.evaluate(attempt)) {
+                 attempt = base + "_" + index++;
+             }
+ 
+             return attempt;
+         }
+     };
+ 
+     /**
       * Wraps up a proxyConnection inside a {@link WrappedConnection} and then proxies it as a
       * simple {@link Connection}. You should call this immediately before the connection is served
***************
*** 73,76 ****
--- 110,114 ----
      private static Object getProxy(Object delegate, Callback callback, ConnectionPoolDefinitionIF def) {
          Enhancer e = new Enhancer();
+         e.setNamingPolicy(NAMING_POLICY);
          e.setInterfaces(getInterfaces(delegate.getClass(), def));
          e.setCallback(callback);
***************
*** 245,248 ****
--- 283,289 ----
   Revision history:
   $Log$
+  Revision 1.33  2006/04/09 21:08:43  billhorsman
+  Use our own naming policy for Cglib to avoid duplicate class definition exceptions.
+ 
   Revision 1.32  2006/01/18 14:40:02  billhorsman
   Unbundled Jakarta's Commons Logging.

[Proxool-cvs] proxool/src/java-test/org/logicalcobwebs/proxool AbstractSpringIntegrationTestBase.java,NONE,1.1 applicationContext.xml,NONE,1.1 Hibernate3SpringTest.java,NONE,1.1 HibernateTest.java,1.2,1.3

From: <bil...@us...> - 2006-03-24 00:15:06

Update of /cvsroot/proxool/proxool/src/java-test/org/logicalcobwebs/proxool
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20536/src/java-test/org/logicalcobwebs/proxool

Modified Files:
	HibernateTest.java 
Added Files:
	AbstractSpringIntegrationTestBase.java applicationContext.xml 
	Hibernate3SpringTest.java 
Log Message:
Changes for Hibernate 3

--- NEW FILE: AbstractSpringIntegrationTestBase.java ---
package org.logicalcobwebs.proxool;

import org.springframework.test.AbstractTransactionalSpringContextTests;

/**
 * TODO: Document!
 *
 * @author Mark Eagle
 * @author Phil Barnes
 * @since Mar 16, 2006 @ 7:55:30 AM
 */
public abstract class AbstractSpringIntegrationTestBase extends AbstractTransactionalSpringContextTests {
    protected String[] getConfigLocations() {
        return new String[]{
                "classpath:org/logicalcobwebs/proxool/applicationContext.xml"
        };
    }

    protected void onSetUpBeforeTransaction() throws Exception {
        GlobalTest.globalSetup();
    }

    
}

--- NEW FILE: applicationContext.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC
        "-//SPRING//DTD BEAN//EN"
        "http://www.springframework.org/dtd/spring-beans.dtd">

<beans>

    <!-- ============================== PERSISTENCE DEFINITIONS ============================== -->

    <bean id="dataSource" class="org.logicalcobwebs.proxool.ProxoolDataSource" destroy-method="close">
        <property name="alias" value="memtest"/>
        <property name="driver" value="org.hsqldb.jdbcDriver"/>
        <property name="driverUrl" value="jdbc:hsqldb:mem:test"/>
        <property name="user" value="sa"/>
        <property name="password" value=""/>
        <property name="minimumConnectionCount" value="1"/>
        <property name="maximumConnectionCount" value="10"/>
        <property name="delegateProperties" value="autoCommit=true, foo=5"/>
        <!--<property name="houseKeepingTestSql" value="values(current TimeStamp)"/>-->
        <!--<property name="testBeforeUse" value="true"/>-->
        <!--<property name="testAfterUse" value="true"/>-->
    </bean>

    <!-- Choose the dialect that matches your "dataSource" definition -->
    <bean id="sessionFactory"
          class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
        <property name="schemaUpdate">
            <value>false</value>
        </property>
        <property name="dataSource">
            <ref local="dataSource"/>
        </property>
        <!--<property name="annotatedClasses">
            <list>
                <value></value>
            </list>
        </property>-->
        <property name="hibernateProperties">
            <props>
                <prop key="hibernate.dialect">org.hibernate.dialect.HSQLDialect</prop>
                <!-- This property is required for DB2 and required to be *COMMENTED* for MySQL -->
                <!--<prop key="hibernate.default_schema"></prop>-->
                <prop key="hibernate.show_sql">false</prop>
                <prop key="hibernate.cglib.use_reflection_optimizer">true</prop>
                <!-- these properties are unique to Hibernate 3.1+ -->
                <!--<prop key="hibernate.query.factory_class">org.hibernate.hql.ast.ASTQueryTranslatorFactory</prop>-->
                <prop key="hibernate.query.factory_class">
                    org.hibernate.hql.classic.ClassicQueryTranslatorFactory</prop>
                <!--<prop key="hibernate.connection.release_mode">on_close</prop>-->

            </props>
        </property>
    </bean>

    <!-- Transaction manager for a single Hibernate SessionFactory (alternative to JTA) -->
    <bean id="transactionManager" class="org.springframework.orm.hibernate3.HibernateTransactionManager">
        <property name="sessionFactory">
            <ref local="sessionFactory"/>
        </property>
    </bean>

    <!-- ***** ABSTRACT TRANSACTIONPROXYFACTORYBEAN DEFINITION *****-->
   <!-- <bean id="abstractTxDefinition"
          class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean"
          lazy-init="true" abstract="true">
        <property name="transactionManager">
            <ref bean="transactionManager"/>
        </property>
        <property name="transactionAttributes">
            <props>
                <prop key="*">PROPAGATION_REQUIRED</prop>
            </props>
        </property>
    </bean>-->

</beans>

--- NEW FILE: Hibernate3SpringTest.java ---
package org.logicalcobwebs.proxool;

import org.hibernate.Session;
import org.hibernate.SessionFactory;
import org.hibernate.HibernateException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

/**
 * Tests the Proxool pool configured as a datasource in Spring and tested against Hibernate 3.1.x
 *
 * @author Mark Eagle
 * @author Phil Barnes
 * @since Mar 16, 2006 @ 8:19:48 AM
 */
public class Hibernate3SpringTest extends AbstractSpringIntegrationTestBase {

    private static final Log LOG = LogFactory.getLog(Hibernate3SpringTest.class);

    public void testSimpleConnection() throws ProxoolException {
        String alias = "memtest";

        SessionFactory sf = (SessionFactory) applicationContext.getBean("sessionFactory");
        Session session = null;
        try {
            session = sf.openSession();
        } catch (HibernateException e) {
            fail("Could not open a Hibernate connection from the pool " + e.getMessage());
            throw e;
        } finally {
            try {
                session.close();
            } catch (HibernateException e) {
                fail("Could not return a Hibernate connection to the pool " + e.getMessage());
                throw e;
            }
        }
    }
}

Index: HibernateTest.java
===================================================================
RCS file: /cvsroot/proxool/proxool/src/java-test/org/logicalcobwebs/proxool/HibernateTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** HibernateTest.java	18 Jan 2006 14:40:06 -0000	1.2
--- HibernateTest.java	24 Mar 2006 00:14:59 -0000	1.3
***************
*** 19,23 ****
  /**
   * Tests that we are able to get a connection from
!  * <a href="http://www.hibernate.org">Hibernate</a>.
   * (Code contributed by Mark Eagle)
   * @version $Revision$, $Date$
--- 19,23 ----
  /**
   * Tests that we are able to get a connection from
!  * <a href="http://www.hibernate.org">Hibernate 2.x</a>.
   * (Code contributed by Mark Eagle)
   * @version $Revision$, $Date$
***************
*** 232,235 ****
--- 232,238 ----
  Revision history:
  $Log$
+ Revision 1.3  2006/03/24 00:14:59  billhorsman
+ Changes for Hibernate 3
+ 
  Revision 1.2  2006/01/18 14:40:06  billhorsman
  Unbundled Jakarta's Commons Logging.

[Proxool-cvs] proxool/lib hsqldb.jar,1.2,1.3

From: <bil...@us...> - 2006-03-24 00:08:42

Update of /cvsroot/proxool/proxool/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17059/lib

Modified Files:
	hsqldb.jar 
Log Message:
Upgrade to 1.8.0

Index: hsqldb.jar
===================================================================
RCS file: /cvsroot/proxool/proxool/lib/hsqldb.jar,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvsXSIkFO and /tmp/cvsi0J9h2 differ

[Proxool-cvs] proxool CHANGES.txt,1.42,1.43 proxool-ant.properties,1.12,1.13

From: <bil...@us...> - 2006-03-24 00:07:17

Update of /cvsroot/proxool/proxool
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16115

Modified Files:
	CHANGES.txt proxool-ant.properties 
Log Message:
New version

Index: CHANGES.txt
===================================================================
RCS file: /cvsroot/proxool/proxool/CHANGES.txt,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** CHANGES.txt	9 Mar 2006 10:29:14 -0000	1.42
--- CHANGES.txt	24 Mar 2006 00:07:12 -0000	1.43
***************
*** 17,20 ****
--- 17,22 ----
    unimplemented methods in DataSource).
  
+ - You can now configure the DataSource with delegate properties. Use the delegateProperties property.
+ 
  0.9.0RC1 (3 March 2006)
  

Index: proxool-ant.properties
===================================================================
RCS file: /cvsroot/proxool/proxool/proxool-ant.properties,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** proxool-ant.properties	26 Sep 2005 21:47:46 -0000	1.12
--- proxool-ant.properties	24 Mar 2006 00:07:12 -0000	1.13
***************
*** 43,45 ****
  #  default: org.logicalcobwebs.proxool.GlobalTest
  
! version=0.8.9
\ No newline at end of file
--- 43,45 ----
  #  default: org.logicalcobwebs.proxool.GlobalTest
  
! version=0.9.0RC2
\ No newline at end of file

[Proxool-cvs] proxool/jarjar cglib-nodep-2.1_3.jar,1.1,1.2

From: <bil...@us...> - 2006-03-09 11:13:30

Update of /cvsroot/proxool/proxool/jarjar
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25794/jarjar

Modified Files:
	cglib-nodep-2.1_3.jar 
Log Message:
Patched version.

Index: cglib-nodep-2.1_3.jar
===================================================================
RCS file: /cvsroot/proxool/proxool/jarjar/cglib-nodep-2.1_3.jar,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvszqz5J1 and /tmp/cvskLutfI differ

[Proxool-cvs] proxool/src/java/org/logicalcobwebs/proxool AbstractProxyStatement.java,1.21,1.22 ProxyStatement.java,1.31,1.32

From: <bil...@us...> - 2006-03-03 09:58:29

Update of /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23089/src/java/org/logicalcobwebs/proxool

Modified Files:
	AbstractProxyStatement.java ProxyStatement.java 
Log Message:
Fix for statement.getConnection(). See bug 1149834.

Index: AbstractProxyStatement.java
===================================================================
RCS file: /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/AbstractProxyStatement.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** AbstractProxyStatement.java	18 Jan 2006 14:40:00 -0000	1.21
--- AbstractProxyStatement.java	3 Mar 2006 09:58:26 -0000	1.22
***************
*** 11,14 ****
--- 11,15 ----
  import java.sql.SQLException;
  import java.sql.Statement;
+ import java.sql.Connection;
  import java.util.*;
  import java.text.DateFormat;
***************
*** 116,119 ****
--- 117,124 ----
      }
  
+     protected Connection getConnection() {
+         return ProxyFactory.getWrappedConnection((ProxyConnection) proxyConnection);
+     }
+ 
      /**
       * Whether the delegate statements are the same
***************
*** 272,275 ****
--- 277,283 ----
   Revision history:
   $Log$
+  Revision 1.22  2006/03/03 09:58:26  billhorsman
+  Fix for statement.getConnection(). See bug 1149834.
+ 
   Revision 1.21  2006/01/18 14:40:00  billhorsman
   Unbundled Jakarta's Commons Logging.

Index: ProxyStatement.java
===================================================================
RCS file: /cvsroot/proxool/proxool/src/java/org/logicalcobwebs/proxool/ProxyStatement.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** ProxyStatement.java	18 Jan 2006 14:40:02 -0000	1.31
--- ProxyStatement.java	3 Mar 2006 09:58:26 -0000	1.32
***************
*** 17,20 ****
--- 17,21 ----
  import java.lang.reflect.Method;
  import java.sql.Statement;
+ import java.sql.Connection;
  
  /**
***************
*** 41,44 ****
--- 42,47 ----
      private static final String CLOSE_METHOD = "close";
  
+     private static final String GET_CONNECTION_METHOD = "getConnection";
+ 
      private static final String FINALIZE_METHOD = "finalize";
  
***************
*** 89,92 ****
--- 92,97 ----
              } else if (concreteMethod.getName().equals(CLOSE_METHOD) && argCount == 0) {
                  close();
+             } else if (concreteMethod.getName().equals(GET_CONNECTION_METHOD) && argCount == 0) {
+                 result = getConnection();
              } else if (concreteMethod.getName().equals(FINALIZE_METHOD) && argCount == 0) {
                  finalize();
***************
*** 162,165 ****
--- 167,173 ----
   Revision history:
   $Log$
+  Revision 1.32  2006/03/03 09:58:26  billhorsman
+  Fix for statement.getConnection(). See bug 1149834.
+ 
   Revision 1.31  2006/01/18 14:40:02  billhorsman
   Unbundled Jakarta's Commons Logging.

[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