You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2009/09/21 10:48:54 UTC
svn commit: r817194 - in /ofbiz/trunk/framework/entity:
config/entityengine.xml dtd/entity-config.xsd
src/org/ofbiz/entity/connection/DBCPConnectionFactory.java
Author: jleroux
Date: Mon Sep 21 08:48:49 2009
New Revision: 817194
URL: http://svn.apache.org/viewvc?rev=817194&view=rev
Log:
Changed DBCP parameter name at Jacopo's request (consistent with OFBiz style)
Modified:
ofbiz/trunk/framework/entity/config/entityengine.xml
ofbiz/trunk/framework/entity/dtd/entity-config.xsd
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/connection/DBCPConnectionFactory.java
Modified: ofbiz/trunk/framework/entity/config/entityengine.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/config/entityengine.xml?rev=817194&r1=817193&r2=817194&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/config/entityengine.xml (original)
+++ ofbiz/trunk/framework/entity/config/entityengine.xml Mon Sep 21 08:48:49 2009
@@ -144,7 +144,7 @@
isolation-level="ReadUncommitted"
pool-minsize="2"
pool-maxsize="250"
- timeBetweenEvictionRunsMillis="600000"/>
+ time-between-eviction-runs-millis="600000"/>
<!-- <jndi-jdbc jndi-server-name="localjndi" jndi-name="java:/HsqlDataSource" isolation-level="ReadUncommitted"/> -->
<!-- <jndi-jdbc jndi-server-name="default" jndi-name="comp/env/jdbc/xa/localhsql" isolation-level="ReadUncommitted"/> --> <!-- Orion Style JNDI name -->
<!-- <jndi-jdbc jndi-server-name="localjndi" jndi-name="localhsqlDataSource"/> --> <!-- Weblogic Style JNDI name -->
@@ -171,7 +171,7 @@
isolation-level="ReadCommitted"
pool-minsize="2"
pool-maxsize="250"
- timeBetweenEvictionRunsMillis="600000"/>
+ time-between-eviction-runs-millis="600000"/>
<!-- <jndi-jdbc jndi-server-name="localjndi" jndi-name="java:/DerbyDataSource" isolation-level="ReadCommitted"/> -->
</datasource>
<datasource name="localderbyodbc"
@@ -191,7 +191,7 @@
isolation-level="ReadCommitted"
pool-minsize="2"
pool-maxsize="250"
- timeBetweenEvictionRunsMillis="600000"/>
+ time-between-eviction-runs-millis="600000"/>
<!-- <jndi-jdbc jndi-server-name="localjndi" jndi-name="java:/DerbyDataSource" isolation-level="ReadCommitted"/> -->
</datasource>
<datasource name="localderbyolap"
@@ -215,7 +215,7 @@
isolation-level="ReadCommitted"
pool-minsize="2"
pool-maxsize="250"
- timeBetweenEvictionRunsMillis="600000"/>
+ time-between-eviction-runs-millis="600000"/>
<!-- <jndi-jdbc jndi-server-name="localjndi" jndi-name="java:/DerbyDataSource" isolation-level="ReadCommitted"/> -->
</datasource>
@@ -236,7 +236,7 @@
isolation-level="ReadCommitted"
pool-minsize="2"
pool-maxsize="250"
- timeBetweenEvictionRunsMillis="600000"/>
+ time-between-eviction-runs-millis="600000"/>
<!-- <jndi-jdbc jndi-server-name="localjndi" jndi-name="java:/CloudscapeDataSource" isolation-level="Serializable"/> -->
</datasource>
@@ -259,7 +259,7 @@
isolation-level="ReadCommitted"
pool-minsize="2"
pool-maxsize="250"
- timeBetweenEvictionRunsMillis="600000"/>
+ time-between-eviction-runs-millis="600000"/>
<!-- <jndi-jdbc jndi-server-name="localjndi" jndi-name="java:/DaffodilDataSource" isolation-level="ReadCommitted"/> -->
</datasource>
@@ -281,7 +281,7 @@
isolation-level="ReadCommitted"
pool-minsize="2"
pool-maxsize="250"
- timeBetweenEvictionRunsMillis="600000"/>
+ time-between-eviction-runs-millis="600000"/>
</datasource>
<datasource name="localmysql"
@@ -309,7 +309,7 @@
isolation-level="ReadCommitted"
pool-minsize="2"
pool-maxsize="250"
- timeBetweenEvictionRunsMillis="600000"/><!-- Please note that at least one person has experienced a problem with this value with MySQL
+ time-between-eviction-runs-millis="600000"/><!-- Please note that at least one person has experienced a problem with this value with MySQL
and had to set it to -1 in order to avoid this issue.
For more look at http://markmail.org/thread/5sivpykv7xkl66px and http://commons.apache.org/dbcp/configuration.html-->
<!-- <jndi-jdbc jndi-server-name="localjndi" jndi-name="java:/MySqlDataSource" isolation-level="Serializable"/> -->
@@ -336,7 +336,7 @@
isolation-level="ReadCommitted"
pool-minsize="2"
pool-maxsize="250"
- timeBetweenEvictionRunsMillis="600000"/>
+ time-between-eviction-runs-millis="600000"/>
<!-- <jndi-jdbc jndi-server-name="localjndi" jndi-name="java:/MySqlDataSource" isolation-level="Serializable"/> -->
</datasource>
@@ -365,7 +365,7 @@
isolation-level="ReadCommitted"
pool-minsize="2"
pool-maxsize="250"
- timeBetweenEvictionRunsMillis="600000"/><!-- Be warned that at this date (2009-09-20) the max_connections parameters in postgresql.conf
+ time-between-eviction-runs-millis="600000"/><!-- Be warned that at this date (2009-09-20) the max_connections parameters in postgresql.conf
is set by default to 100 by the initdb process see http://www.postgresql.org/docs/8.4/static/runtime-config-connection.html#GUC-MAX-CONNECTIONS-->
<!-- <jndi-jdbc jndi-server-name="default" jndi-name="java:comp/env/jdbc/localpostgres" isolation-level="ReadCommitted"/>-->
@@ -401,7 +401,7 @@
isolation-level="ReadCommitted"
pool-minsize="2"
pool-maxsize="250"
- timeBetweenEvictionRunsMillis="600000"/>
+ time-between-eviction-runs-millis="600000"/>
</datasource>
<datasource name="localoracle"
@@ -423,7 +423,7 @@
jdbc-password="ofbiz"
pool-minsize="2"
pool-maxsize="250"
- timeBetweenEvictionRunsMillis="600000"/>
+ time-between-eviction-runs-millis="600000"/>
</datasource>
<datasource name="localoracledd"
helper-class="org.ofbiz.entity.datasource.GenericHelperDAO"
@@ -440,7 +440,7 @@
jdbc-password="ofbiz"
pool-minsize="2"
pool-maxsize="250"
- timeBetweenEvictionRunsMillis="600000"/>
+ time-between-eviction-runs-millis="600000"/>
</datasource>
<datasource name="localsybase"
@@ -463,7 +463,7 @@
isolation-level="ReadCommitted"
pool-minsize="2"
pool-maxsize="250"
- timeBetweenEvictionRunsMillis="600000"/>
+ time-between-eviction-runs-millis="600000"/>
</datasource>
<datasource name="localsapdb"
@@ -486,7 +486,7 @@
isolation-level="ReadCommitted"
pool-minsize="2"
pool-maxsize="250"
- timeBetweenEvictionRunsMillis="600000"/>
+ time-between-eviction-runs-millis="600000"/>
<!-- <jndi-jdbc jndi-server-name="default" jndi-name="comp/env/jdbc/xa/localsapdb" isolation-level="ReadCommitted"/> --> <!-- Orion Style JNDI name -->
<!-- <jndi-jdbc jndi-server-name="localweblogic" jndi-name="SapDBDataSource"/> --> <!-- Weblogic Style JNDI name -->
<!-- <jndi-jdbc jndi-server-name="default" jndi-name="jdbc/localsapdb" isolation-level="ReadCommitted"/> --> <!-- JRun4 Style JNDI name -->
@@ -513,7 +513,7 @@
isolation-level="ReadCommitted"
pool-minsize="2"
pool-maxsize="250"
- timeBetweenEvictionRunsMillis="600000"/>
+ time-between-eviction-runs-millis="600000"/>
<!-- Sample remote URI: jdbc-uri="jdbc:firebirdsql://localhost:3050//opt/interbase/data/ofbiz.gdb" -->
<!-- <jndi-jdbc jndi-server-name="default" jndi-name="comp/env/jdbc/xa/localfirebird" isolation-level="ReadCommitted"/> --> <!-- Orion Style JNDI name -->
<!-- <tyrex-dataSource dataSource-name="firebird" isolation-level="ReadCommitted"/> Ã -->
@@ -555,7 +555,7 @@
isolation-level="ReadCommitted"
pool-minsize="2"
pool-maxsize="250"
- timeBetweenEvictionRunsMillis="600000"/>
+ time-between-eviction-runs-millis="600000"/>
<!-- <jndi-jdbc jndi-server-name="default" jndi-name="comp/env/jdbc/xa/localmssql" isolation-level="ReadCommitted"/> --> <!-- Orion Style JNDI name -->
</datasource>
@@ -578,7 +578,7 @@
isolation-level="ReadCommitted"
pool-minsize="2"
pool-maxsize="250"
- timeBetweenEvictionRunsMillis="600000"/>
+ time-between-eviction-runs-millis="600000"/>
<!-- <jndi-jdbc jndi-server-name="localjndi" jndi-name="java:/OracleDataSource" isolation-level="Serializable"/> -->
</datasource>
@@ -605,6 +605,6 @@
isolation-level="ReadCommitted"
pool-minsize="2"
pool-maxsize="250"
- timeBetweenEvictionRunsMillis="600000"/>
+ time-between-eviction-runs-millis="600000"/>
</datasource>
</entity-config>
Modified: ofbiz/trunk/framework/entity/dtd/entity-config.xsd
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/dtd/entity-config.xsd?rev=817194&r1=817193&r2=817194&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/dtd/entity-config.xsd (original)
+++ ofbiz/trunk/framework/entity/dtd/entity-config.xsd Mon Sep 21 08:48:49 2009
@@ -425,7 +425,7 @@
</xs:attribute>
<xs:attribute type="xs:nonNegativeInteger" name="pool-maxsize" default="50"/>
<xs:attribute type="xs:nonNegativeInteger" name="pool-minsize" default="2"/>
- <xs:attribute type="xs:nonNegativeInteger" name="timeBetweenEvictionRunsMillis" default="600000"/>
+ <xs:attribute type="xs:nonNegativeInteger" name="time-between-eviction-runs-millis" default="600000"/>
<xs:attribute type="xs:nonNegativeInteger" name="pool-sleeptime" default="300000"/>
<xs:attribute type="xs:nonNegativeInteger" name="pool-lifetime" default="600000"/>
<xs:attribute type="xs:nonNegativeInteger" name="pool-deadlock-maxwait" default="300000"/>
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/connection/DBCPConnectionFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/connection/DBCPConnectionFactory.java?rev=817194&r1=817193&r2=817194&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/connection/DBCPConnectionFactory.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/connection/DBCPConnectionFactory.java Mon Sep 21 08:48:49 2009
@@ -90,12 +90,12 @@
maxIdle = maxIdle > minSize ? maxIdle : minSize;
try {
- timeBetweenEvictionRunsMillis = Integer.parseInt(jotmJdbcElement.getAttribute("timeBetweenEvictionRunsMillis"));
+ timeBetweenEvictionRunsMillis = Integer.parseInt(jotmJdbcElement.getAttribute("time-between-eviction-runs-millis"));
} catch (NumberFormatException nfe) {
- Debug.logError("Problems with pool settings [timeBetweenEvictionRunsMillis=" + jotmJdbcElement.getAttribute("timeBetweenEvictionRunsMillis") + "]; the values MUST be numbers, using default of 600000.", module);
+ Debug.logError("Problems with pool settings [time-between-eviction-runs-millis=" + jotmJdbcElement.getAttribute("time-between-eviction-runs-millis") + "]; the values MUST be numbers, using default of 600000.", module);
timeBetweenEvictionRunsMillis = 600000;
} catch (Exception e) {
- Debug.logError("Problems with pool settings [timeBetweenEvictionRunsMillis], using default of 600000.", module);
+ Debug.logError("Problems with pool settings [time-between-eviction-runs-millis], using default of 600000.", module);
timeBetweenEvictionRunsMillis = 600000;
}