You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2019/02/03 02:47:20 UTC
[openmeetings] branch master updated: no-jira: dbcp parameters are
improved
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 330b191 no-jira: dbcp parameters are improved
330b191 is described below
commit 330b191b306eb082c30a8c2bc78aa1faa177b571
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Sun Feb 3 09:47:06 2019 +0700
no-jira: dbcp parameters are improved
---
.../WEB-INF/classes/META-INF/db2_persistence.xml | 7 ++++---
.../WEB-INF/classes/META-INF/derby_persistence.xml | 19 ++++++++++---------
.../WEB-INF/classes/META-INF/mssql_persistence.xml | 7 ++++---
.../WEB-INF/classes/META-INF/mysql_persistence.xml | 7 ++++---
.../WEB-INF/classes/META-INF/oracle_persistence.xml | 17 +++++++++--------
.../classes/META-INF/postgresql_persistence.xml | 7 ++++---
6 files changed, 35 insertions(+), 29 deletions(-)
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml
index 9628c88..4381c72 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml
@@ -63,9 +63,10 @@
<property name="openjpa.ConnectionProperties"
value="DriverClassName=com.ibm.db2.jcc.DB2Driver
, Url=jdbc:db2://localhost:50000/openmeet
- , MaxActive=100
- , MaxIdle=100
- , MaxWait=10000
+ , maxTotal=100
+ , maxIdle=100
+ , minIdle=0
+ , maxWaitMillis=10000
, TestOnBorrow=true
, poolPreparedStatements=true
, Username=${db_user}
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml
index 6f75adb..0e49842 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml
@@ -61,15 +61,16 @@
<property name="openjpa.RuntimeUnenhancedClasses" value="unsupported" />
<property name="openjpa.ConnectionDriverName" value="org.apache.commons.dbcp2.BasicDataSource" />
<property name="openjpa.ConnectionProperties"
- value="DriverClassName=org.apache.derby.jdbc.EmbeddedDriver,
- Url=jdbc:derby:openmeetings;create=true,
- create=true,
- MaxActive=100,
- MaxIdle=100,
- MaxWait=10000,
- TestOnBorrow=true,
- Username=omdbuser,
- Password=" />
+ value="DriverClassName=org.apache.derby.jdbc.EmbeddedDriver
+ , Url=jdbc:derby:openmeetings;create=true
+ , create=true
+ , maxTotal=100
+ , maxIdle=100
+ , minIdle=0
+ , maxWaitMillis=10000
+ , TestOnBorrow=true
+ , Username=omdbuser
+ , Password=" />
<property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema" />
<property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO" />
<property name="openjpa.DataCache" value="true" />
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml
index 1ffe245..4ea39f0 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml
@@ -63,9 +63,10 @@
<property name="openjpa.ConnectionProperties"
value="DriverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver
, Url=jdbc:sqlserver://localhost:1433;databaseName=openmeetings
- , MaxActive=100
- , MaxIdle=100
- , MaxWait=10000
+ , maxTotal=100
+ , maxIdle=100
+ , minIdle=0
+ , maxWaitMillis=10000
, Username=${db_user}
, Password=${db_pass}" />
<property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema" />
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
index ce4487c..d1127c0 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
@@ -63,9 +63,10 @@
<property name="openjpa.ConnectionProperties"
value="DriverClassName=com.mysql.cj.jdbc.Driver
, Url=jdbc:mysql://localhost:3306/openmeetings?autoReconnect=true&useUnicode=true&createDatabaseIfNotExist=true&characterEncoding=utf-8&connectionCollation=utf8_general_ci&cachePrepStmts=true&cacheCallableStatements=true&cacheServerConfiguration=true&useLocalSessionState=true&elideSetAutoCommits=true&alwaysSendSetIsolation=false&enableQueryTimeouts=false&prepStmtCacheSize=3000&prepStmtCacheSqlLimit=1000&useSSL=false&nullNam [...]
- , MaxActive=100
- , MaxIdle=100
- , MaxWait=10000
+ , maxTotal=100
+ , maxIdle=100
+ , minIdle=0
+ , maxWaitMillis=10000
, TestOnBorrow=true
, poolPreparedStatements=true
, Username=${db_user}
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml
index c9956e2..8a183ae 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml
@@ -62,14 +62,15 @@
<property name="openjpa.ConnectionDriverName" value="org.apache.commons.dbcp2.BasicDataSource" />
<property name="openjpa.ConnectionProperties"
value="DriverClassName=oracle.jdbc.driver.OracleDriver
- , Url=jdbc:oracle:thin:@localhost:1521:openmeetings
- , create=true
- , MaxActive=100
- , MaxIdle=100
- , MaxWait=10000
- , TestOnBorrow=true
- , Username=${db_user}
- , Password=${db_pass}" />
+ , Url=jdbc:oracle:thin:@localhost:1521:openmeetings
+ , create=true
+ , maxTotal=100
+ , maxIdle=100
+ , minIdle=0
+ , maxWaitMillis=10000
+ , TestOnBorrow=true
+ , Username=${db_user}
+ , Password=${db_pass}" />
<property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema" />
<property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO" />
<property name="openjpa.DataCache" value="true" />
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml
index 956773e..d8ff368 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml
@@ -63,9 +63,10 @@
<property name="openjpa.ConnectionProperties"
value="DriverClassName=org.postgresql.Driver
, Url=jdbc:postgresql://localhost:5432/openmeetings
- , MaxActive=100
- , MaxIdle=100
- , MaxWait=10000
+ , maxTotal=100
+ , maxIdle=100
+ , minIdle=0
+ , maxWaitMillis=10000
, TestOnBorrow=true
, poolPreparedStatements=true
, Username=${db_user}