From b7f010393c7048641eb412e4bd57f44408b2ee58 Mon Sep 17 00:00:00 2001
From: Ioannis Kalyvas <ikalyvas@cite.gr>
Date: Wed, 23 Jan 2019 14:42:26 +0200
Subject: [PATCH] Changes transaction management in development environment

---
 .../DevelDatabaseConfiguration.java               |  3 ---
 .../main/resources/application-devel.properties   |  7 ++-----
 .../resources/application-production.properties   | 15 +++++++++++++--
 .../web/src/main/resources/application.properties | 11 -----------
 4 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/configurations/DevelDatabaseConfiguration.java b/dmp-backend/web/src/main/java/eu/eudat/configurations/DevelDatabaseConfiguration.java
index aff90c1ff..1c5c48bed 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/configurations/DevelDatabaseConfiguration.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/configurations/DevelDatabaseConfiguration.java
@@ -69,9 +69,6 @@ public class DevelDatabaseConfiguration {
         properties.setProperty("hibernate.dialect", "org.hibernate.dialect.PostgreSQL92Dialect");
         properties.setProperty("hibernate.show_sql", "true");
         properties.setProperty("hibernate.temp.use_jdbc_metadata_defaults", "false");
-        properties.setProperty("hibernate.c3p0.maxPoolSize", "70");
-        properties.setProperty("hibernate.c3p0.timeout", "5000");
-        properties.setProperty("hibernate.connection.release_mode", "after_transaction");
         return properties;
     }
 }
\ No newline at end of file
diff --git a/dmp-backend/web/src/main/resources/application-devel.properties b/dmp-backend/web/src/main/resources/application-devel.properties
index 8c13e6b1a..913a2ee88 100644
--- a/dmp-backend/web/src/main/resources/application-devel.properties
+++ b/dmp-backend/web/src/main/resources/application-devel.properties
@@ -4,9 +4,6 @@ dmp.domain = http://localhost:4200
 database.url=jdbc:postgresql://dbserver02.local.cite.gr:5432/dmptool
 database.username=dmtadm
 database.password=t00L4DM@18!
-spring.datasource.maxIdle: 2
-spring.datasource.max-active: 4
-spring.datasource.max-wait: 10000
 ####################ELASTIIC SEARCH TAGS OVERRIDES CONFIGURATIONS##########
 elasticsearch.host = localhost
 elasticsearch.port = 9200
@@ -15,9 +12,9 @@ elasticsearch.port = 9200
 http-logger.server-address = http://localhost:31311
 
 ####################PDF OVERRIDES CONFIGURATIONS##########
-pdf.converter.url=http://localhost/
+pdf.converter.url=http://localhost:88/
 
 ####################CONFIGURATION FILES OVERRIDES CONFIGURATIONS##########
 configuration.externalUrls=/tmp/ExternalUrls.xml
 configuration.dynamicProjectUrl=/tmp/ProjectConfiguration.xml
-configuration.h2020template=/tmp/h2020.docx
\ No newline at end of file
+configuration.h2020template=C:\\Users\\ikalyvas\\Documents\\OpenAIRE-EUDAT-DMP-service-pilot\\dmp-backend\\web\\src\\main\\resources\\documents\\h2020.docx
\ No newline at end of file
diff --git a/dmp-backend/web/src/main/resources/application-production.properties b/dmp-backend/web/src/main/resources/application-production.properties
index 46e81dae7..201e6ca13 100644
--- a/dmp-backend/web/src/main/resources/application-production.properties
+++ b/dmp-backend/web/src/main/resources/application-production.properties
@@ -53,5 +53,16 @@ twitter.login.redirect_uri=https://opendmp.eu/login/twitter
 b2access.externallogin.user_info_url=https://b2access-integration.fz-juelich.de:443/oauth2/userinfo
 b2access.externallogin.access_token_url=https://b2access-integration.fz-juelich.de:443/oauth2/token
 b2access.externallogin.redirect_uri=https://opendmp.eu/api/oauth/authorized/b2access
-b2access.externallogin.clientid=eudatdmptool
-b2access.externallogin.clientSecret=A3b*1*92
\ No newline at end of file
+b2access.externallogin.clientid=
+b2access.externallogin.clientSecret=
+#############SPRING DATASOURCE CONFIGURATIONS#########
+spring.datasource.maxIdle: 10
+spring.datasource.max-active: 70
+spring.datasource.max-wait: 10000
+spring.datasource.validationQuery: select 1
+spring.datasource.removeAbandoned: true
+spring.datasource.removeAbandonedTimeout: 1
+spring.datasource.logAbandoned: true
+spring.datasource.testOnBorrow: true
+spring.datasource.testOnConnect: false
+spring.datasource.testWhileIdle: false
diff --git a/dmp-backend/web/src/main/resources/application.properties b/dmp-backend/web/src/main/resources/application.properties
index b1aab715d..22f79f6ea 100644
--- a/dmp-backend/web/src/main/resources/application.properties
+++ b/dmp-backend/web/src/main/resources/application.properties
@@ -68,14 +68,3 @@ http-logger.delay = 10
 ##########################PERISTENCE##########################################
 #############GENERIC DATASOURCE CONFIGURATIONS#########
 database.driver-class-name=org.postgresql.Driver
-#############SPRING DATASOURCE CONFIGURATIONS#########
-spring.datasource.maxIdle: 10
-spring.datasource.max-active: 70
-spring.datasource.max-wait: 10000
-spring.datasource.validationQuery: select 1
-spring.datasource.removeAbandoned: true
-spring.datasource.removeAbandonedTimeout: 1
-spring.datasource.logAbandoned: true
-spring.datasource.testOnBorrow: true
-spring.datasource.testOnConnect: false
-spring.datasource.testWhileIdle: false
\ No newline at end of file