From c2cce3f6ac324f5f4046d45a02cb21ccdb194525 Mon Sep 17 00:00:00 2001
From: Ludovic Claude <ludovic.claude54@gmail.com>
Date: Fri, 25 Jan 2019 10:59:22 +0100
Subject: [PATCH] Rollback explicit transaction management
---
.../mip/configuration/PersistenceConfiguration.java | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/src/main/java/eu/hbp/mip/configuration/PersistenceConfiguration.java b/src/main/java/eu/hbp/mip/configuration/PersistenceConfiguration.java
index 9d346ecf9..a1525ee96 100644
--- a/src/main/java/eu/hbp/mip/configuration/PersistenceConfiguration.java
+++ b/src/main/java/eu/hbp/mip/configuration/PersistenceConfiguration.java
@@ -11,12 +11,9 @@ import org.springframework.boot.orm.jpa.EntityScan;
import org.springframework.context.annotation.*;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.orm.jpa.JpaTransactionManager;
import org.springframework.orm.jpa.JpaVendorAdapter;
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 javax.sql.DataSource;
@@ -26,7 +23,6 @@ import javax.sql.DataSource;
@Configuration
@EnableJpaRepositories("eu.hbp.mip.repositories")
-@EnableTransactionManagement
@EntityScan(basePackages = "eu.hbp.mip.model")
public class PersistenceConfiguration {
@@ -71,20 +67,11 @@ public class PersistenceConfiguration {
public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
em.setDataSource(portalDataSource());
- //em.setPackagesToScan("eu.hbp.mip.model");
- em.setPersistenceUnitName("portal");
JpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
em.setJpaVendorAdapter(vendorAdapter);
return em;
}
- @Bean
- public PlatformTransactionManager transactionManager() {
- JpaTransactionManager txManager = new JpaTransactionManager();
- txManager.setEntityManagerFactory(entityManagerFactory().getNativeEntityManagerFactory());
- return txManager;
- }
-
@Bean(name = "flyway", initMethod = "migrate")
public Flyway migrations() {
Flyway flyway = new Flyway();
--
GitLab