diff --git a/NOTICE.TXT b/NOTICE.TXT
index f1b6390fb29e6c83c0534f057036cde4c201565a..ee6bd8fe3adbe21c23026bd59253ab561cd64f0b 100644
--- a/NOTICE.TXT
+++ b/NOTICE.TXT
@@ -111,6 +111,7 @@ This product uses software based on the Apache Software License like
* fmath (Apache Software License, Version 2.0) [http://www.fmath.info]
* undertow (Apache Software License, Version 2.0) [http://undertow.io]
* jshashtable (Apache Software License, Version 2.0) [http://www.timdown.co.uk/jshashtable]
+* Hikari CP (Apache Software License, Version 2.0) [https://github.com/brettwooldridge/HikariCP]
-----------------------------------------------------------------------
This produce uses software based on the MIT License
@@ -148,7 +149,6 @@ This product uses software based on the Common Public License Version
This product uses software based on the Lesser General Public License (LGPL)
* JGraphT (GNU Lesser General Public License Version 2.1) [http://www.jgrapht.org]
* Hibernate (GNU Lesser General Public License Version 2.1) [http://www.hibernate.org]
-* c3p0 (GNU Lesser General Public License) [http://sourceforge.net/projects/c3p0]
* BeanShell (GNU LESSER GENERAL PUBLIC LICENSE) [http://www.beanshell.org]
* Jmep (GNU Lesser Public License) [http://jmep.tigris.org]
* gnu-regexp (GNU Lesser General Public License) [http://savannah.gnu.org/projects/gnu-regexp]
diff --git a/pom.xml b/pom.xml
index 4a703c1d9cd499f2ebfdda8de9de4a3e3e8d7ae1..8d19201038bc65512656288d676735e60238c4f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -350,7 +350,7 @@
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-c3p0</artifactId>
+ <artifactId>hibernate-hikaricp</artifactId>
<version>${org.hibernate.version}</version>
</dependency>
@@ -534,12 +534,6 @@
<version>${org.hibernate.version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-c3p0</artifactId>
- <version>${org.hibernate.version}</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.infinispan</groupId>
@@ -1991,7 +1985,7 @@
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-c3p0</artifactId>
+ <artifactId>hibernate-hikaricp</artifactId>
<version>${org.hibernate.version}</version>
<scope>test</scope>
</dependency>
diff --git a/src/main/java/org/olat/core/commons/persistence/_spring/databaseCorecontext.xml b/src/main/java/org/olat/core/commons/persistence/_spring/databaseCorecontext.xml
index 0e80934ea5617abc1b5a0307786467868add825f..b90647316a80d21ce76f677c5440d6676b604e7c 100644
--- a/src/main/java/org/olat/core/commons/persistence/_spring/databaseCorecontext.xml
+++ b/src/main/java/org/olat/core/commons/persistence/_spring/databaseCorecontext.xml
@@ -58,7 +58,7 @@
<prop key="hibernate.dialect">org.hibernate.dialect.MySQL5Dialect</prop>
</props>
</constructor-arg>
- <property name="addMoreProperties" ref="c3p0HibernateProperties" />
+ <property name="addMoreProperties" ref="hikariHibernateProperties" />
</bean>
<bean id="mysql_jndi_HibernateProperties" class="org.olat.core.commons.persistence.DBVendorHibernatePropertiesSimplification">
@@ -82,7 +82,7 @@
<prop key="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</prop>
</props>
</constructor-arg>
- <property name="addMoreProperties" ref="c3p0HibernateProperties" />
+ <property name="addMoreProperties" ref="hikariHibernateProperties" />
</bean>
<bean id="postgresql_jndi_HibernateProperties" class="org.olat.core.commons.persistence.DBVendorHibernatePropertiesSimplification">
@@ -107,7 +107,7 @@
<prop key="hibernate.default_schema">${db.default.schema}</prop>
</props>
</constructor-arg>
- <property name="addMoreProperties" ref="c3p0HibernateProperties" />
+ <property name="addMoreProperties" ref="hikariHibernateProperties" />
</bean>
<bean id="oracle_jndi_HibernateProperties" class="org.olat.core.commons.persistence.DBVendorHibernatePropertiesSimplification">
@@ -191,76 +191,25 @@
</constructor-arg>
</bean>
- <bean id="c3p0HibernateProperties" class="org.olat.core.commons.persistence.DBVendorHibernatePropertiesSimplification">
+ <bean id="hikariHibernateProperties" class="org.olat.core.commons.persistence.DBVendorHibernatePropertiesSimplification">
<constructor-arg>
<props>
- <prop key="hibernate.connection.provider_class">org.hibernate.connection.C3P0ConnectionProvider</prop>
+ <prop key="hibernate.connection.provider_class">com.zaxxer.hikari.hibernate.HikariConnectionProvider</prop>
<!-- Min pool size -->
- <prop key="hibernate.c3p0.min_size">${db.hibernate.c3p0.minsize}</prop>
+ <prop key="hibernate.hikari.minimumPoolSize">${db.hibernate.hikari.minsize}</prop>
<!-- Max pool size , mysql-default value is 100, If you need to support more connections, you should set a larger value for this variable in mysql config -->
- <prop key="hibernate.c3p0.max_size">${db.hibernate.c3p0.maxsize}</prop>
- <!-- Connection timeout in sec -->
- <prop key="hibernate.c3p0.timeout">1800</prop>
- <!-- Size of prepared statements -->
- <prop key="hibernate.c3p0.max_statements">10000</prop>
- <!-- Commit on connection close -->
- <prop key="hibernate.c3p0.autoCommitOnClose">false</prop>
- <!-- Number of connection acquired when pool is exhausted -->
- <prop key="hibernate.c3p0.acquire_increment">2</prop>
- <!-- Idle time (in sec) before pooled connection is validated -->
- <prop key="hibernate.c3p0.idle_test_period">500</prop>
- <!-- for debug purposes -->
- <prop key="hibernate.c3p0.debugUnreturnedConnectionStackTraces">${db.hibernate.c3p0.debugUnreturnedConnectionStackTraces}</prop>
- <prop key="hibernate.c3p0.unreturnedConnectionTimeout">${db.hibernate.c3p0.unreturnedConnectionTimeout}</prop>
-
- <!-- OLAT-5528: under heavy load situations threads have been seen to deadlock on acquire/release of a connection.
- increasing number of helper threads from 3 to 10 plus limiting the max time for administrative tasks to 2min
- is expected to allow these situations to resolve themselves -->
- <!-- Number of c3p0 helper threads - default is 3 -->
- <prop key="hibernate.c3p0.numHelperThreads">10</prop>
- <!-- Maximum time spent by c3p0 for administrative tasks in seconds - default infinity=0 -->
- <prop key="hibernate.c3p0.maxAdministrativeTaskTime">120</prop>
+ <prop key="hibernate.hikari.maximumPoolSize">${db.hibernate.hikari.maxsize}</prop>
+ <prop key="hibernate.hikari.minimumIdle">4</prop>
+ <prop key="hibernate.hikari.idleTimeout">1800000</prop>
+ <prop key="hibernate.hikari.autoCommit">false</prop>
+ <prop key="hibernate.hikari.leakDetectionThreshold">120000</prop>
+ <prop key="hibernate.hikari.transactionIsolation">TRANSACTION_READ_COMMITTED</prop>
+ <prop key="hibernate.hikari.registerMbeans">true</prop>
</props>
</constructor-arg>
<property name="addMoreProperties" ref="hibernateProps" />
</bean>
- <!-- c3p0 pooled JDBC connection
- <bean id="mysql_local_DataSource"
- class="com.mchange.v2.c3p0.ComboPooledDataSource" lazy-init="true" destroy-method="close">
- <property name="driverClass"><value>com.mysql.jdbc.Driver</value></property>
- <property name="jdbcUrl"><value>jdbc:mysql://${db.host}:${db.host.port}/${db.name}?useUnicode=true&characterEncoding=UTF-8</value></property>
- <property name="user" value="${db.user}" />
- <property name="password" value="${db.pass}" />
- <property name="minPoolSize" value="${db.hibernate.c3p0.minsize}" />
- <property name="maxPoolSize" value="${db.hibernate.c3p0.maxsize}" />
- <property name="maxIdleTime" value="1800" />
- <property name="maxStatements" value="10000" />
- <property name="autoCommitOnClose" value="false" />
- <property name="acquireIncrement" value="2" />
- <property name="idleConnectionTestPeriod" value="500" />
- <property name="hibernate.c3p0.numHelperThreads" value="10">
- <property name="maxAdministrativeTaskTime" value="120" />
- </bean> -->
-
- <!-- c3p0 pooled JDBC connection
- <bean id="postgresql_local_DataSource"
- class="com.mchange.v2.c3p0.ComboPooledDataSource" lazy-init="true" destroy-method="close">
- <property name="driverClass"><value>org.postgresql.Driver</value></property>
- <property name="jdbcUrl"><value>jdbc:postgresql://${db.host}:${db.host.port}/${db.name}</value></property>
- <property name="user" value="${db.user}" />
- <property name="password" value="${db.pass}" />
- <property name="minPoolSize" value="${db.hibernate.c3p0.minsize}" />
- <property name="maxPoolSize" value="${db.hibernate.c3p0.maxsize}" />
- <property name="maxIdleTime" value="1800" />
- <property name="maxStatements" value="10000" />
- <property name="autoCommitOnClose" value="false" />
- <property name="acquireIncrement" value="2" />
- <property name="idleConnectionTestPeriod" value="500" />
- < property name="hibernate.c3p0.numHelperThreads" value="10">
- <property name="maxAdministrativeTaskTime" value="120" />
- </bean> -->
-
<!-- The following dataresources are referenced from the statisticContext.xml and upgradeContext.xml, but are not used in the SessionFactory!
The SessionFactory's DB Connection is configured with the bean "${db.vendor}HibernateProperties".-->
diff --git a/src/main/java/org/olat/restapi/system/DatabaseWebService.java b/src/main/java/org/olat/restapi/system/DatabaseWebService.java
index df29d592915c7c57df8f622c68aea02afeb0f353..3f4586b3ba67596da156134a53dbc45f1d6a4427 100644
--- a/src/main/java/org/olat/restapi/system/DatabaseWebService.java
+++ b/src/main/java/org/olat/restapi/system/DatabaseWebService.java
@@ -97,7 +97,7 @@ public class DatabaseWebService {
try {
JMXManager jmxManager = CoreSpringFactory.getImpl(JMXManager.class);
MBeanServer mBeanServer = jmxManager.getMBeanServer();
- boolean found = searchC3P0DataSources(mBeanServer, vo) || searchTomcatDataSources(mBeanServer, vo);
+ boolean found = searchHikariDataSources(mBeanServer, vo) || searchTomcatDataSources(mBeanServer, vo) || searchC3P0DataSources(mBeanServer, vo);
if(log.isDebug()) {
log.debug("MBean for datasource found: " + found);
}
@@ -117,14 +117,12 @@ public class DatabaseWebService {
for(ObjectName name:names) {
String cName = name.getCanonicalName();
- System.out.println("cName: " + cName);
if(cName.startsWith("com.mchange.v2.c3p0:") && cName.indexOf("type=PooledDataSource") > 0) {
MBeanInfo info = mBeanServer.getMBeanInfo(name);
MBeanAttributeInfo[] attrs = info.getAttributes();
for(MBeanAttributeInfo attr:attrs) {
String attrName = attr.getName();
- System.out.println(attrName);
if("numBusyConnectionsAllUsers".equals(attrName)) {
Number obj = (Number)mBeanServer.getAttribute(name, "numBusyConnectionsAllUsers");
activeConnectionCount += obj.intValue();
@@ -146,6 +144,42 @@ public class DatabaseWebService {
return false;
}
+ private boolean searchHikariDataSources(MBeanServer mBeanServer, DatabaseConnectionVO vo) {
+ try {
+ ObjectName poolName = new ObjectName("com.zaxxer.hikari:type=*");
+ Set<ObjectName> names = mBeanServer.queryNames(poolName, null);
+ if(names.size() > 0) {
+ int activeConnectionCount = 0;
+ int currentConnectionCount = 0;
+
+ for(ObjectName name:names) {
+ String cName = name.getCanonicalName();
+ if(cName.startsWith("com.zaxxer.hikari:") && cName.indexOf("type=Pool") > 0 && cName.indexOf("type=PoolConfig") <= 0) {
+ MBeanInfo info = mBeanServer.getMBeanInfo(name);
+ MBeanAttributeInfo[] attrs = info.getAttributes();
+ for(MBeanAttributeInfo attr:attrs) {
+ String attrName = attr.getName();
+ if("ActiveConnections".equals(attrName)) {
+ Number obj = (Number)mBeanServer.getAttribute(name, "ActiveConnections");
+ activeConnectionCount += obj.intValue();
+ } else if("TotalConnections".equals(attrName)) {
+ Number obj = (Number)mBeanServer.getAttribute(name, "TotalConnections");
+ currentConnectionCount += obj.intValue();
+ }
+ }
+ }
+ }
+
+ vo.setActiveConnectionCount(activeConnectionCount);
+ vo.setCurrentConnectionCount(currentConnectionCount);
+ return true;
+ }
+ } catch (Exception e) {
+ log.error("", e);
+ }
+ return false;
+ }
+
private boolean searchTomcatDataSources(MBeanServer mBeanServer, DatabaseConnectionVO vo) {
try {
ObjectName poolName = new ObjectName("Catalina:type=DataSource,*");
diff --git a/src/main/resources/serviceconfig/olat.properties b/src/main/resources/serviceconfig/olat.properties
index 1f85442867fb7c0159c001bdcc3bd07a762d934b..1821bde5127d4ea11acbe2c5d78809591d19145c 100644
--- a/src/main/resources/serviceconfig/olat.properties
+++ b/src/main/resources/serviceconfig/olat.properties
@@ -495,9 +495,8 @@ db.vendor=mysql
db.vendor.values=mysql,postgresql,oracle
db.vendor.values.comment=supported vendors currently include "mysql", "postgresql" and "oracle"
-# The local data source works out of the box with the c3p0 database connection pool. However, we stronlgy
-# recommend using a jndi container managed data source for better stability and realibility. The local data source
-# and c3p0 connection pool will be removed in future releases!
+# The local data source works out of the box with the Hikari database connection pool. However, we stronlgy
+# recommend using a jndi container managed data source for better stability and realibility.
# When using jndi, make sure you copy the database connector to your application server lib directory and remove it from
# the OpenOLAT release.
db.source=local
@@ -528,11 +527,14 @@ db.url.options.mysql=?useUnicode=true&characterEncoding=UTF-8
# enable database debugging (seldom required except for developers)
db.show_sql=false
-# configure the c3p0 pool with hibernate
+# configure the Hikari pool with hibernate (c3p0 is only for legacy purpose and backwards compatibilty)
+db.hibernate.hikari.minsize=${db.hibernate.c3p0.minsize}
+db.hibernate.hikari.maxsize=${db.hibernate.c3p0.maxsize}
+# 0 to disable leak detection, otherwise a value in milliseconds
+db.hibernate.hikari.leakDetectionThreshold=0
+
db.hibernate.c3p0.minsize=20
db.hibernate.c3p0.maxsize=50
-db.hibernate.c3p0.debugUnreturnedConnectionStackTraces=false
-db.hibernate.c3p0.unreturnedConnectionTimeout=120
########################################################################
# Infinispan
diff --git a/src/test/profile/mysql/olat.arquillian.properties b/src/test/profile/mysql/olat.arquillian.properties
deleted file mode 100644
index 8b8876d4017218cc6532717803b74ace318b1abc..0000000000000000000000000000000000000000
--- a/src/test/profile/mysql/olat.arquillian.properties
+++ /dev/null
@@ -1,66 +0,0 @@
-#########################
-#
-# This olat.local.properties file is only used when running junit tests! (Unit tests run in its own classpath environment)
-# Use this file to set properties that affect or are a prerequisite for your tests.
-#
-#########################
-tomcat.id=2
-
-defaultlang=de
-db.show_sql=false
-#force use of java.io.tmpDir for unit tests
-archive.dir=
-log.dir=
-folder.root=
-restapi.enable=true
-
-instance.id=2
-
-generate.index.at.startup=false
-
-#disable debugging
-olat.debug=false
-localization.cache=true
-is.translation.server=disabled
-deploy.course.exports=false
-
-# for UserTest
-keepUserEmailAfterDeletion=true
-keepUserLoginAfterDeletion=true
-
-# do not run upgrades and scheduled jobs and such
-cluster.singleton.services = disabled
-jmx.rmi.port=1009
-
-# SingleVM jms.broker.url
-jms.broker.url=vm://embedded?broker.persistent=false
-search.broker.url=vm://embedded?broker.persistent=false
-
-smtp.host=disabled
-
-#
-# if you like to run your tests against mysql just uncomment the following. Please do not commit it!
-#
-db.vendor=mysql
-db.name=${test.env.db.name:olattest}
-db.user=olat
-db.pass=olat
-db.host.port=3306
-db.database.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
-auto.upgrade.database=false
-
-#site we need
-site.portal.enable=true
-
-#make sure it works it mimic the pre 8.3 behavior
-group.mandatory.enrolment.email.users=false
-group.mandatory.enrolment.email.authors=false
-group.mandatory.enrolment.email.usermanagers=false
-group.mandatory.enrolment.email.groupmanagers=false
-group.mandatory.enrolment.email.administrators=false
-
-group.accept.membership.users=false
-group.accept.membership.authors=false
-group.accept.membership.usermanagers=false
-group.accept.membership.groupmanagers=false
-group.accept.membership.administrators=false
\ No newline at end of file
diff --git a/src/test/profile/mysql/olat.eclipse.properties b/src/test/profile/mysql/olat.eclipse.properties
deleted file mode 100644
index 332fe4e6f359fa484c7abd072211f92928d1b311..0000000000000000000000000000000000000000
--- a/src/test/profile/mysql/olat.eclipse.properties
+++ /dev/null
@@ -1,62 +0,0 @@
-#########################
-#
-# This olat.local.properties file is only used when running junit tests! (Unit tests run in its own classpath environment)
-# Use this file to set properties that affect or are a prerequisite for your tests.
-#
-#########################
-tomcat.id=2
-
-defaultlang=de
-db.show_sql=true
-#force use of java.io.tmpDir for unit tests
-archive.dir=
-log.dir=
-folder.root=
-restapi.enable=true
-
-instance.id=2
-
-generate.index.at.startup=false
-
-# for UserTest
-keepUserEmailAfterDeletion=true
-keepUserLoginAfterDeletion=true
-
-# do not run upgrades and scheduled jobs and such
-cluster.singleton.services = disabled
-jmx.rmi.port=1009
-
-# SingleVM jms.broker.url
-jms.broker.url=vm://embedded?broker.persistent=false
-search.broker.url=vm://embedded?broker.persistent=false
-# Cluster (remote) jms.broker.url
-#jms.broker.url=failover:(tcp://localhost:${test.env.jms.broker.port}?wireFormat.maxInactivityDuration=0)
-#search.broker.url=failover:(tcp://localhost:${test.env.jms.broker.port}?wireFormat.maxInactivityDuration=0)
-
-smtp.host=testing
-
-#
-# if you like to run your tests against mysql just uncomment the following. Please do not commit it!
-#
-db.vendor=mysql
-db.name=olattest
-db.user=olat
-db.pass=olat
-db.host.port=3306
-db.show_sql=false
-db.database.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
-auto.upgrade.database=false
-db.hibernate.c3p0.debugUnreturnedConnectionStackTraces=true
-
-#make sure it works it mimic the pre 8.3 behavior
-group.mandatory.enrolment.email.users=false
-group.mandatory.enrolment.email.authors=false
-group.mandatory.enrolment.email.usermanagers=false
-group.mandatory.enrolment.email.groupmanagers=false
-group.mandatory.enrolment.email.administrators=false
-
-group.accept.membership.users=false
-group.accept.membership.authors=false
-group.accept.membership.usermanagers=false
-group.accept.membership.groupmanagers=false
-group.accept.membership.administrators=false
diff --git a/src/test/profile/mysql/olat.local.properties b/src/test/profile/mysql/olat.local.properties
index d2418187b5af59132abccca6c2a6496c8697974f..6389b20ece7760533196cca415c337ed0fa696af 100644
--- a/src/test/profile/mysql/olat.local.properties
+++ b/src/test/profile/mysql/olat.local.properties
@@ -37,7 +37,7 @@ search.broker.url=vm://embedded?broker.persistent=false
smtp.host=disabled
-# mysql with c3p0
+# mysql with local connection pool
db.vendor=mysql
db.show_sql=false
db.name=${test.env.db.name:olattest}
@@ -46,7 +46,6 @@ db.pass=${test.env.db.pass:olat}
db.host.port=${test.env.db.host.port:3306}
db.database.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
auto.upgrade.database=false
-db.hibernate.c3p0.debugUnreturnedConnectionStackTraces=true
#site we need
site.portal.enable=true
diff --git a/src/test/profile/oracle/olat.eclipse.properties b/src/test/profile/oracle/olat.eclipse.properties
deleted file mode 100644
index 21a8137078043db46a5d9eb740c7a0f53b9814be..0000000000000000000000000000000000000000
--- a/src/test/profile/oracle/olat.eclipse.properties
+++ /dev/null
@@ -1,62 +0,0 @@
-#########################
-#
-# This olat.local.properties file is only used when running junit tests! (Unit tests run in its own classpath environment)
-# Use this file to set properties that affect or are a prerequisite for your tests.
-#
-#########################
-tomcat.id=2
-
-defaultlang=de
-db.show_sql=false
-#force use of java.io.tmpDir for unit tests
-archive.dir=
-log.dir=
-folder.root=
-restapi.enable=true
-
-instance.id=2
-
-generate.index.at.startup=false
-
-# for UserTest
-keepUserEmailAfterDeletion=true
-keepUserLoginAfterDeletion=true
-
-# do not run upgrades and scheduled jobs and such
-cluster.singleton.services = disabled
-jmx.rmi.port=1009
-
-# SingleVM jms.broker.url
-jms.broker.url=vm://embedded?broker.persistent=false
-search.broker.url=vm://embedded?broker.persistent=false
-# Cluster (remote) jms.broker.url
-#jms.broker.url=failover:(tcp://localhost:${test.env.jms.broker.port}?wireFormat.maxInactivityDuration=0)
-#search.broker.url=failover:(tcp://localhost:${test.env.jms.broker.port}?wireFormat.maxInactivityDuration=0)
-
-smtp.host=testing
-
-#
-# if you like to run your tests against mysql just uncomment the following. Please do not commit it!
-#
-db.vendor=oracle
-db.name=xe
-db.user=OLATTEST
-db.pass=oracle
-db.host=192.168.1.202
-db.host.port=1521
-db.default.schema=olattest
-db.database.dialect=org.hibernate.dialect.Oracle10gDialect
-auto.upgrade.database=false
-
-#make sure it works it mimic the pre 8.3 behavior
-group.mandatory.enrolment.email.users=false
-group.mandatory.enrolment.email.authors=false
-group.mandatory.enrolment.email.usermanagers=false
-group.mandatory.enrolment.email.groupmanagers=false
-group.mandatory.enrolment.email.administrators=false
-
-group.accept.membership.users=false
-group.accept.membership.authors=false
-group.accept.membership.usermanagers=false
-group.accept.membership.groupmanagers=false
-group.accept.membership.administrators=false
\ No newline at end of file
diff --git a/src/test/profile/postgresql/olat.eclipse.properties b/src/test/profile/postgresql/olat.eclipse.properties
deleted file mode 100644
index 048850fae3f8f45f52d9dd1598841371cdfa3a65..0000000000000000000000000000000000000000
--- a/src/test/profile/postgresql/olat.eclipse.properties
+++ /dev/null
@@ -1,59 +0,0 @@
-#########################
-#
-# This olat.local.properties file is only used when running junit tests! (Unit tests run in its own classpath environment)
-# Use this file to set properties that affect or are a prerequisite for your tests.
-#
-#########################
-tomcat.id=2
-
-defaultlang=de
-db.show_sql=false
-#force use of java.io.tmpDir for unit tests
-archive.dir=
-log.dir=
-folder.root=
-restapi.enable=true
-
-instance.id=2
-
-generate.index.at.startup=false
-
-# for UserTest
-keepUserEmailAfterDeletion=true
-keepUserLoginAfterDeletion=true
-
-# do not run upgrades and scheduled jobs and such
-cluster.singleton.services = disabled
-jmx.rmi.port=1009
-
-# SingleVM jms.broker.url
-jms.broker.url=vm://embedded?broker.persistent=false
-search.broker.url=vm://embedded?broker.persistent=false
-# Cluster (remote) jms.broker.url
-#jms.broker.url=failover:(tcp://localhost:${test.env.jms.broker.port}?wireFormat.maxInactivityDuration=0)
-#search.broker.url=failover:(tcp://localhost:${test.env.jms.broker.port}?wireFormat.maxInactivityDuration=0)
-
-smtp.host=testing
-
-#
-# if you like to run your tests against mysql just uncomment the following. Please do not commit it!
-#
-db.vendor=postgresql
-db.name=olattest
-db.user=postgres
-db.pass=postgres
-db.host.port=5432
-db.database.dialect=org.hibernate.dialect.PostgreSQLDialect
-
-#make sure it works it mimic the pre 8.3 behavior
-group.mandatory.enrolment.email.users=false
-group.mandatory.enrolment.email.authors=false
-group.mandatory.enrolment.email.usermanagers=false
-group.mandatory.enrolment.email.groupmanagers=false
-group.mandatory.enrolment.email.administrators=false
-
-group.accept.membership.users=false
-group.accept.membership.authors=false
-group.accept.membership.usermanagers=false
-group.accept.membership.groupmanagers=false
-group.accept.membership.administrators=false
\ No newline at end of file
diff --git a/src/test/profile/postgresql/olat.local.properties b/src/test/profile/postgresql/olat.local.properties
index 7cd170639e39aaba39e614560d5438145f7753bd..b0ea8812370cb1631f8a729aca60d908221b4bf8 100644
--- a/src/test/profile/postgresql/olat.local.properties
+++ b/src/test/profile/postgresql/olat.local.properties
@@ -37,7 +37,7 @@ search.broker.url=vm://embedded?broker.persistent=false
smtp.host=disabled
-# postgresql with c3p0
+# postgresql local connection pool
db.vendor=postgresql
db.show_sql=false
db.name=${test.env.db.name:olattest}
@@ -46,7 +46,7 @@ db.pass=${test.env.db.postgresql.pass:postgres}
db.host.port=${test.env.db.postgresql.host.port:5432}
db.database.dialect=org.hibernate.dialect.PostgreSQLDialect
auto.upgrade.database=false
-db.hibernate.c3p0.debugUnreturnedConnectionStackTraces=true
+db.hibernate.hikari.leakDetectionThreshold=120000
#site we need
site.portal.enable=true