From 2def9d025a76d48bb04944396928fe87671e1596 Mon Sep 17 00:00:00 2001 From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com> Date: Sat, 27 Jun 2020 21:48:31 +0200 Subject: [PATCH] datasouce for rest service now using spring datasource --- .../java/pro/taskana/common/rest/RestConfiguration.java | 6 ------ .../src/test/resources/application.properties | 8 ++++---- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/common/rest/RestConfiguration.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/common/rest/RestConfiguration.java index 2c3c461f3..9a4a2e4c9 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/common/rest/RestConfiguration.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/common/rest/RestConfiguration.java @@ -64,12 +64,6 @@ public class RestConfiguration { return new SpringTaskanaEngineConfiguration(dataSource, true, true, schemaName); } - @Bean - @ConditionalOnMissingBean(DataSource.class) - public DataSource dataSource() { - return TaskanaEngineConfiguration.createDefaultDataSource(); - } - // Needed for injection into jackson deserializer. @Bean public HandlerInstantiator handlerInstantiator(ApplicationContext context) { diff --git a/rest/taskana-rest-spring/src/test/resources/application.properties b/rest/taskana-rest-spring/src/test/resources/application.properties index 9b76554ed..6a3dead47 100644 --- a/rest/taskana-rest-spring/src/test/resources/application.properties +++ b/rest/taskana-rest-spring/src/test/resources/application.properties @@ -2,10 +2,10 @@ logging.level.pro.taskana=INFO logging.level.org.springframework.security=INFO ######## Taskana DB ####### -datasource.url=jdbc:h2:mem:taskana;IGNORECASE=TRUE;LOCK_MODE=0 -datasource.driverClassName=org.h2.Driver -datasource.username=sa -datasource.password=sa +spring.datasource.url=jdbc:h2:mem:taskana;IGNORECASE=TRUE;LOCK_MODE=0; +spring.datasource.driverClassName=org.h2.Driver +spring.datasource.username=sa +spring.datasource.password=sa taskana.schemaName=TASKANA ####### property that control rest api security deploy use true for no security.