From 53ac3776b67bc370062bad2ea0bb57c15aa69486 Mon Sep 17 00:00:00 2001
From: Mirco Nasuti <mirco.nasuti@chuv.ch>
Date: Thu, 1 Sep 2016 12:33:36 +0200
Subject: [PATCH] work in progress (metadatasource working)
---
.../eu/hbp/mip/configuration/PersistenceConfiguration.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/eu/hbp/mip/configuration/PersistenceConfiguration.java b/src/main/java/eu/hbp/mip/configuration/PersistenceConfiguration.java
index 53d5ce5fc..09293cc42 100644
--- a/src/main/java/eu/hbp/mip/configuration/PersistenceConfiguration.java
+++ b/src/main/java/eu/hbp/mip/configuration/PersistenceConfiguration.java
@@ -27,8 +27,8 @@ import javax.sql.DataSource;
@EntityScan(basePackages = "eu.hbp.mip.model")
public class PersistenceConfiguration {
- @Bean(name = "datasource")
@Primary
+ @Bean(name = "datasource")
@ConfigurationProperties(prefix="spring.datasource")
public DataSource dataSource() {
return DataSourceBuilder.create().build();
@@ -51,7 +51,7 @@ public class PersistenceConfiguration {
@DependsOn("flyway")
public LocalContainerEntityManagerFactoryBean metaEntityManagerFactory() {
LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
- em.setDataSource(dataSource());
+ em.setDataSource(metaDataSource());
JpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
em.setJpaVendorAdapter(vendorAdapter);
return em;
--
GitLab