diff --git a/spring-security-rest-full/pom.xml b/spring-security-rest-full/pom.xml
index 5753002691..00a2194f91 100644
--- a/spring-security-rest-full/pom.xml
+++ b/spring-security-rest-full/pom.xml
@@ -87,7 +87,7 @@
org.hibernate
- hibernate-core
+ hibernate-entitymanager
${hibernate.version}
diff --git a/spring-security-rest-full/src/main/java/org/baeldung/spring/PersistenceConfig.java b/spring-security-rest-full/src/main/java/org/baeldung/spring/PersistenceConfig.java
index 93f7f3622f..91e501b390 100644
--- a/spring-security-rest-full/src/main/java/org/baeldung/spring/PersistenceConfig.java
+++ b/spring-security-rest-full/src/main/java/org/baeldung/spring/PersistenceConfig.java
@@ -13,8 +13,10 @@ 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.hibernate4.HibernateTransactionManager;
-import org.springframework.orm.hibernate4.LocalSessionFactoryBean;
+import org.springframework.orm.jpa.JpaTransactionManager;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
+import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.annotation.EnableTransactionManagement;
import com.google.common.base.Preconditions;
@@ -34,17 +36,21 @@ public class PersistenceConfig {
}
@Bean
- public LocalSessionFactoryBean sessionFactory() {
- final LocalSessionFactoryBean sessionFactory = new LocalSessionFactoryBean();
- sessionFactory.setDataSource(restDataSource());
- sessionFactory.setPackagesToScan(new String[] { "org.baeldung.spring.persistence.model" });
- sessionFactory.setHibernateProperties(hibernateProperties());
+ public LocalContainerEntityManagerFactoryBean entityManagerFactoryBean() {
+ final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
+ em.setDataSource(dataSource());
+ em.setPackagesToScan(new String[] { "org.baeldung.persistence.model" });
- return sessionFactory;
+ final HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
+ // vendorAdapter.set
+ em.setJpaVendorAdapter(vendorAdapter);
+ em.setJpaProperties(additionalProperties());
+
+ return em;
}
@Bean
- public DataSource restDataSource() {
+ public DataSource dataSource() {
final DriverManagerDataSource dataSource = new DriverManagerDataSource();
dataSource.setDriverClassName(Preconditions.checkNotNull(env.getProperty("jdbc.driverClassName")));
dataSource.setUrl(Preconditions.checkNotNull(env.getProperty("jdbc.url")));
@@ -55,11 +61,11 @@ public class PersistenceConfig {
}
@Bean
- public HibernateTransactionManager transactionManager() {
- final HibernateTransactionManager txManager = new HibernateTransactionManager();
- txManager.setSessionFactory(sessionFactory().getObject());
+ public PlatformTransactionManager transactionManager() {
+ final JpaTransactionManager transactionManager = new JpaTransactionManager();
+ transactionManager.setEntityManagerFactory(entityManagerFactoryBean().getObject());
- return txManager;
+ return transactionManager;
}
@Bean
@@ -67,7 +73,7 @@ public class PersistenceConfig {
return new PersistenceExceptionTranslationPostProcessor();
}
- final Properties hibernateProperties() {
+ final Properties additionalProperties() {
return new Properties() {
{
setProperty("hibernate.hbm2ddl.auto", env.getProperty("hibernate.hbm2ddl.auto"));
@@ -78,4 +84,5 @@ public class PersistenceConfig {
}
};
}
+
}
\ No newline at end of file
diff --git a/spring-security-rest-full/src/main/resources/persistence-mysql.properties b/spring-security-rest-full/src/main/resources/persistence-mysql.properties
new file mode 100644
index 0000000000..8263b0d9ac
--- /dev/null
+++ b/spring-security-rest-full/src/main/resources/persistence-mysql.properties
@@ -0,0 +1,10 @@
+# jdbc.X
+jdbc.driverClassName=com.mysql.jdbc.Driver
+jdbc.url=jdbc:mysql://localhost:3306/spring_hibernate4_01?createDatabaseIfNotExist=true
+jdbc.user=tutorialuser
+jdbc.pass=tutorialmy5ql
+
+# hibernate.X
+hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
+hibernate.show_sql=false
+hibernate.hbm2ddl.auto=create-drop
diff --git a/spring-security-rest-full/src/main/webapp/WEB-INF/web.xml b/spring-security-rest-full/src/main/webapp/WEB-INF/web.xml
index 461f32bde5..b02f62911e 100644
--- a/spring-security-rest-full/src/main/webapp/WEB-INF/web.xml
+++ b/spring-security-rest-full/src/main/webapp/WEB-INF/web.xml
@@ -6,7 +6,7 @@
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
id="WebApp_ID" version="3.0">
- Spring Security Basic Auth Application
+ Spring Security REST Application