From 561ec82250fdd96bd8696324a8b32899c4e58b2a Mon Sep 17 00:00:00 2001
From: eugenp <hanriseldon@gmail.com>
Date: Thu, 4 Jul 2013 12:51:44 +0300
Subject: [PATCH] connection pooling work

---
 .../main/java/org/baeldung/spring/PersistenceConfig.java    | 6 +++---
 spring-hibernate3/src/main/resources/persistenceConfig.xml  | 2 +-
 .../{HibernateXmlConfig.java => PersistenceXmlConfig.java}  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename spring-hibernate4/src/main/java/org/baeldung/spring/{HibernateXmlConfig.java => PersistenceXmlConfig.java} (87%)

diff --git a/spring-hibernate3/src/main/java/org/baeldung/spring/PersistenceConfig.java b/spring-hibernate3/src/main/java/org/baeldung/spring/PersistenceConfig.java
index b205c27cdc..473c0c1714 100644
--- a/spring-hibernate3/src/main/java/org/baeldung/spring/PersistenceConfig.java
+++ b/spring-hibernate3/src/main/java/org/baeldung/spring/PersistenceConfig.java
@@ -4,6 +4,7 @@ import java.util.Properties;
 
 import javax.sql.DataSource;
 
+import org.apache.tomcat.dbcp.dbcp.BasicDataSource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -11,7 +12,6 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.env.Environment;
 import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
-import org.springframework.jdbc.datasource.DriverManagerDataSource;
 import org.springframework.orm.hibernate3.HibernateTransactionManager;
 import org.springframework.orm.hibernate3.annotation.AnnotationSessionFactoryBean;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
@@ -35,7 +35,7 @@ public class PersistenceConfig {
     public AnnotationSessionFactoryBean sessionFactory() {
         final AnnotationSessionFactoryBean sessionFactory = new AnnotationSessionFactoryBean();
         sessionFactory.setDataSource(dataSource());
-        sessionFactory.setPackagesToScan(new String[] { "org.baeldung.spring.persistence.model" });
+        sessionFactory.setPackagesToScan(new String[] { "org.baeldung.persistence.model" });
         sessionFactory.setHibernateProperties(hibernateProperties());
 
         return sessionFactory;
@@ -43,7 +43,7 @@ public class PersistenceConfig {
 
     @Bean
     public DataSource dataSource() {
-        final DriverManagerDataSource dataSource = new DriverManagerDataSource();
+        final BasicDataSource dataSource = new BasicDataSource();
         dataSource.setDriverClassName(Preconditions.checkNotNull(env.getProperty("jdbc.driverClassName")));
         dataSource.setUrl(Preconditions.checkNotNull(env.getProperty("jdbc.url")));
         dataSource.setUsername(Preconditions.checkNotNull(env.getProperty("jdbc.user")));
diff --git a/spring-hibernate3/src/main/resources/persistenceConfig.xml b/spring-hibernate3/src/main/resources/persistenceConfig.xml
index 0dc729f815..62bccc1f22 100644
--- a/spring-hibernate3/src/main/resources/persistenceConfig.xml
+++ b/spring-hibernate3/src/main/resources/persistenceConfig.xml
@@ -19,7 +19,7 @@
         </property>
     </bean>
 
-    <bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
+    <bean id="dataSource" class="org.apache.tomcat.dbcp.dbcp.BasicDataSource">
         <property name="driverClassName" value="${jdbc.driverClassName}" />
         <property name="url" value="${jdbc.url}" />
         <property name="username" value="${jdbc.user}" />
diff --git a/spring-hibernate4/src/main/java/org/baeldung/spring/HibernateXmlConfig.java b/spring-hibernate4/src/main/java/org/baeldung/spring/PersistenceXmlConfig.java
similarity index 87%
rename from spring-hibernate4/src/main/java/org/baeldung/spring/HibernateXmlConfig.java
rename to spring-hibernate4/src/main/java/org/baeldung/spring/PersistenceXmlConfig.java
index 10ead2fd6c..f7b11b19a2 100644
--- a/spring-hibernate4/src/main/java/org/baeldung/spring/HibernateXmlConfig.java
+++ b/spring-hibernate4/src/main/java/org/baeldung/spring/PersistenceXmlConfig.java
@@ -9,9 +9,9 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableTransactionManagement
 @ComponentScan({ "org.baeldung.spring.persistence.dao", "org.baeldung.spring.persistence.service" })
 @ImportResource({ "classpath:hibernate4Config.xml" })
-public class HibernateXmlConfig {
+public class PersistenceXmlConfig {
 
-    public HibernateXmlConfig() {
+    public PersistenceXmlConfig() {
         super();
     }