You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2019/09/17 14:52:52 UTC
[syncope] branch 2_1_X updated: (Finally) Adjusting conf to latest
HikariCP
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new 348dc80 (Finally) Adjusting conf to latest HikariCP
348dc80 is described below
commit 348dc8044bd46a2b485c0da9a829c23f76fab3e2
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Tue Sep 17 16:52:36 2019 +0200
(Finally) Adjusting conf to latest HikariCP
---
core/persistence-jpa/src/main/resources/domains/MasterDomain.xml | 9 ++-------
core/persistence-jpa/src/test/resources/domains/TwoDomain.xml | 4 +---
2 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/core/persistence-jpa/src/main/resources/domains/MasterDomain.xml b/core/persistence-jpa/src/main/resources/domains/MasterDomain.xml
index 03c11e0..9849515 100644
--- a/core/persistence-jpa/src/main/resources/domains/MasterDomain.xml
+++ b/core/persistence-jpa/src/main/resources/domains/MasterDomain.xml
@@ -20,13 +20,10 @@ under the License.
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tx="http://www.springframework.org/schema/tx"
- xmlns:util="http://www.springframework.org/schema/util"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/tx
- http://www.springframework.org/schema/tx/spring-tx.xsd
- http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util.xsd">
+ http://www.springframework.org/schema/tx/spring-tx.xsd">
<bean id="MasterContentXML" class="org.apache.syncope.core.spring.ResourceWithFallbackLoader">
<property name="primary" value="file:${content.directory}/domains/MasterContent.xml"/>
@@ -54,9 +51,7 @@ under the License.
<property name="username" value="${Master.username}"/>
<property name="password" value="${Master.password}"/>
<!-- connection pool configuration - transaction isolation, default READ_COMMITTED (see SYNCOPE-202) -->
- <property name="transactionIsolation">
- <util:constant static-field="${Master.pool.transactionIsolation:TRANSACTION_READ_COMMITTED}"/>
- </property>
+ <property name="transactionIsolation" value="${Master.pool.transactionIsolation:TRANSACTION_READ_COMMITTED}"/>
<!-- connection pool configuration - default values taken from HikariConfig default values -->
<property name="maximumPoolSize" value="${Master.pool.maxActive:8}"/>
<property name="minimumIdle" value="${Master.pool.minIdle:0}"/>
diff --git a/core/persistence-jpa/src/test/resources/domains/TwoDomain.xml b/core/persistence-jpa/src/test/resources/domains/TwoDomain.xml
index d0b741f..3ec79d0 100644
--- a/core/persistence-jpa/src/test/resources/domains/TwoDomain.xml
+++ b/core/persistence-jpa/src/test/resources/domains/TwoDomain.xml
@@ -54,9 +54,7 @@ under the License.
<property name="username" value="${Two.username}"/>
<property name="password" value="${Two.password}"/>
<!-- connection pool configuration - transaction isolation, default READ_COMMITTED (see SYNCOPE-202) -->
- <property name="transactionIsolation">
- <util:constant static-field="${Two.pool.transactionIsolation:java.sql.Connection.TRANSACTION_READ_COMMITTED}"/>
- </property>
+ <property name="transactionIsolation" value="${Two.pool.transactionIsolation:TRANSACTION_READ_COMMITTED}"/>
<!-- connection pool configuration - default values taken from HikariConfig default values -->
<property name="maximumPoolSize" value="${Two.pool.maxActive:8}"/>
<property name="minimumIdle" value="${Two.pool.minIdle:0}"/>