[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

[<bil...@us...>]

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.