[pool] Update name of prefix properties for the new pool
authorInigo Sanchez <inigo.sanchez@openbravo.com>
Mon, 29 Jun 2015 13:31:31 +0200
changeset 27289 8d14058145d2
parent 27288 18048854c910
child 27290 61353b3a2eb2
[pool] Update name of prefix properties for the new pool
config/Openbravo.properties.template
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelInitializer.java
src-core/src/org/openbravo/database/ConnectionProviderImpl.java
src/org/openbravo/dal/core/SessionHandler.java
--- a/config/Openbravo.properties.template	Mon Jun 29 11:48:35 2015 +0200
+++ b/config/Openbravo.properties.template	Mon Jun 29 13:31:31 2015 +0200
@@ -85,23 +85,23 @@
 # DB connection pool #
 ######################
 
-db.externalPoolClassName=org.openbravo.apachejdbcconnectionpool.JdbcExternalConnectionPool
+db.pool.externalPoolClassName=org.openbravo.apachejdbcconnectionpool.JdbcExternalConnectionPool
 
 # Documentation at http://www.tomcatexpert.com/blog/2010/04/01/configuring-jdbc-pool-high-concurrency
-initialSize=10
-maxActive=100
-maxIdle=30
-minIdle=10
-maxWait=30000
-timeBetweenEvictionRunsMillis=30000
-minEvictableIdleTimeMillis=60000
-removeAbandoned=false
-jmxEnabled=true
-testWhileIdle=false
-testOnBorrow=true
-validationQuery=SELECT 1 FROM DUAL
-validationInterval=30000
-testOnReturn=false
+db.pool.initialSize=10
+db.pool.maxActive=100
+db.pool.maxIdle=30
+db.pool.minIdle=10
+db.pool.maxWait=30000
+db.pool.timeBetweenEvictionRunsMillis=30000
+db.pool.minEvictableIdleTimeMillis=60000
+db.pool.removeAbandoned=false
+db.pool.jmxEnabled=true
+db.pool.testWhileIdle=false
+db.pool.testOnBorrow=true
+db.pool.validationQuery=SELECT 1 FROM DUAL
+db.pool.validationInterval=30000
+db.pool.testOnReturn=false
 
 ##################
 # Tomcat manager #
--- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelInitializer.java	Mon Jun 29 11:48:35 2015 +0200
+++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelInitializer.java	Mon Jun 29 13:31:31 2015 +0200
@@ -67,7 +67,7 @@
 
     // If an external connection pool is used, its injected interceptors are added to the pool
     String poolClassName = OBPropertiesProvider.getInstance().getOpenbravoProperties()
-        .getProperty("db.externalPoolClassName");
+        .getProperty("db.pool.externalPoolClassName");
     if (poolClassName != null && !"".equals(poolClassName)) {
       try {
         ExternalConnectionPool pool = ExternalConnectionPool.getInstance(poolClassName);
--- a/src-core/src/org/openbravo/database/ConnectionProviderImpl.java	Mon Jun 29 11:48:35 2015 +0200
+++ b/src-core/src/org/openbravo/database/ConnectionProviderImpl.java	Mon Jun 29 13:31:31 2015 +0200
@@ -90,7 +90,7 @@
     String rdbms = null;
 
     poolName = properties.getProperty("bbdd.poolName", "myPool");
-    externalPoolClassName = properties.getProperty("db.externalPoolClassName");
+    externalPoolClassName = properties.getProperty("db.pool.externalPoolClassName");
     dbDriver = properties.getProperty("bbdd.driver");
     dbServer = properties.getProperty("bbdd.url");
     dbLogin = properties.getProperty("bbdd.user");
--- a/src/org/openbravo/dal/core/SessionHandler.java	Mon Jun 29 11:48:35 2015 +0200
+++ b/src/org/openbravo/dal/core/SessionHandler.java	Mon Jun 29 13:31:31 2015 +0200
@@ -55,7 +55,7 @@
 
   {
     String poolClassName = OBPropertiesProvider.getInstance().getOpenbravoProperties()
-        .getProperty("db.externalPoolClassName");
+        .getProperty("db.pool.externalPoolClassName");
     if (poolClassName != null && !"".equals(poolClassName)) {
       try {
         externalConnectionPool = ExternalConnectionPool.getInstance(poolClassName);