From e79ddb178b4e69a7e9a701f7e9863be225bdcc0b Mon Sep 17 00:00:00 2001
From: Joze RIHTARSIC <joze.rihtarsic@ext.ec.europa.eu>
Date: Tue, 10 Sep 2019 13:40:37 +0200
Subject: [PATCH] fix pull comments
---
pom.xml | 2 +-
.../eu/europa/ec/edelivery/smp/config/DatabaseConfig.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2ecd0276a..59ce3dbef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<modules>
<module>smp-parent-pom</module>
<module>smp-api</module>
- <!-- module>smp-angular</module -->
+ <module>smp-angular</module>
<module>smp-server-library</module>
<module>smp-webapp</module>
</modules>
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/DatabaseConfig.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/DatabaseConfig.java
index 8943b8df8..893824315 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/DatabaseConfig.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/DatabaseConfig.java
@@ -67,11 +67,11 @@ public class DatabaseConfig {
@Bean(name = "dataSource")
- public DataSource jndiDataSource() {
+ public DataSource getDataSource() {
DataSource dataSource = null;
if (!StringUtils.isBlank(url)) {
- LOG.info("Retrieve datasource with JNDI: " + jndiDatasourceName);
+ LOG.info("create datasource with URL: " + url);
DriverManagerDataSource driverManagerDataSource = new DriverManagerDataSource();
driverManagerDataSource.setDriverClassName(driver);
driverManagerDataSource.setUrl(url);
@@ -116,7 +116,7 @@ public class DatabaseConfig {
public JpaVendorAdapter jpaVendorAdapter() {
HibernateJpaVendorAdapter hibernateJpaVendorAdapter = new HibernateJpaVendorAdapter();
if (!StringUtils.isBlank(hibernateDialect)) {
- // hibernateJpaVendorAdapter.setDatabasePlatform(hibernateDialect);
+ hibernateJpaVendorAdapter.setDatabasePlatform(hibernateDialect);
}
hibernateJpaVendorAdapter.setGenerateDdl(true);
return hibernateJpaVendorAdapter;
--
GitLab