Author: bpapez
Date: Mon Jul 2 11:55:06 2007
New Revision: 17851
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17851&repname=
=3Djahia
Log:
use database prepared statments pool configuration only from dbpool.propert=
ies (remove from jahia.properties)
Modified:
branches/JAHIA-4-1-BRANCH/etc/config/dbpool.properties
branches/JAHIA-4-1-BRANCH/etc/config/jahia.skeleton
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/database/Connecti=
onDispenser.java
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/settings/SettingsBean.java
Modified: branches/JAHIA-4-1-BRANCH/etc/config/dbpool.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/etc/config/dbpool.properties&rev=3D17851&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-4-1-BRANCH/etc/config/dbpool.properties (original)
+++ branches/JAHIA-4-1-BRANCH/etc/config/dbpool.properties Mon Jul 2 11:55=
:06 2007
@@ -15,13 +15,13 @@
#int.loginTimeout=3D
int.maxActive=3D100
int.maxIdle=3D10
-#int.maxOpenPreparedStatements=3D
+int.maxOpenPreparedStatements=3D0
long.maxWait=3D10000
#long.minEvictableIdleTimeMillis=3D
#int.minIdle=3D123
#int.numTestsPerEvictionRun=3D
#String.password=3D
-#boolean.poolPreparedStatements=3D
+boolean.poolPreparedStatements=3Dtrue
#boolean.testOnBorrow=3D
#boolean.testOnReturn=3D
#boolean.testWhileIdle=3D
Modified: branches/JAHIA-4-1-BRANCH/etc/config/jahia.skeleton
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/etc/config/jahia.skeleton&rev=3D17851&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-4-1-BRANCH/etc/config/jahia.skeleton (original)
+++ branches/JAHIA-4-1-BRANCH/etc/config/jahia.skeleton Mon Jul 2 11:55:06=
2007
@@ -66,8 +66,6 @@
db_username =3D sa
db_password =3D
db_transactions =3D false
-db_poolPreparedStatements =3D true
-db_maxOpenPreparedStatements =3D 0
=
# The settings below are no longer used, please use the dbpool.properties
# file to configure the connection pool.
Modified: branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/database/Co=
nnectionDispenser.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/org/jahia/services/database/ConnectionDispenser.java&rev=3D17=
851&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/database/Connecti=
onDispenser.java (original)
+++ branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/database/Connecti=
onDispenser.java Mon Jul 2 11:55:06 2007
@@ -184,8 +184,6 @@
basicDataSource.setUsername(jSettings.getDb_username());
basicDataSource.setPassword(jSettings.getDb_password());
basicDataSource.setUrl(jSettings.getDb_url());
- basicDataSource.setPoolPreparedStatements(jSettings.isDb_poolPrepa=
redStatements());
- basicDataSource.setMaxOpenPreparedStatements(jSettings.getDb_maxOp=
enPreparedStatements()); =
=
loadDBPoolConfiguration(jSettings);
=
Modified: branches/JAHIA-4-1-BRANCH/src/java/org/jahia/settings/SettingsBea=
n.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/org/jahia/settings/SettingsBean.java&rev=3D17851&repname=3Dja=
hia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-4-1-BRANCH/src/java/org/jahia/settings/SettingsBean.java=
(original)
+++ branches/JAHIA-4-1-BRANCH/src/java/org/jahia/settings/SettingsBean.java=
Mon Jul 2 11:55:06 2007
@@ -123,8 +123,6 @@
private boolean db_waitIfBusy;
private boolean db_verbose;
private boolean db_veryVerbose;
- private int db_maxOpenPreparedStatements;
- private boolean db_poolPreparedStatements;
=
// Characters encoding
private boolean utf8Encoding;
@@ -356,8 +354,6 @@
db_username =3D getString ("db_username");
db_password =3D getString ("db_password");
db_transactions =3D getBoolean("db_transactions", false);
- db_poolPreparedStatements =3D getBoolean("db_poolPreparedState=
ments", true);
- db_maxOpenPreparedStatements =3D getInt("db_maxOpenPreparedSta=
tements", 0);
db_min_connections =3D getInt("db_min_connections");
db_max_connections =3D getInt("db_max_connections");
db_waitIfBusy =3D getBoolean ("db_waitIfBusy");
@@ -1131,18 +1127,12 @@
public int getDb_min_connections() {
return db_min_connections;
}
- public int getDb_maxOpenPreparedStatements() {
- return db_maxOpenPreparedStatements;
- }
public String getDb_password() {
return db_password;
}
public boolean isDb_transactions() {
return db_transactions;
}
- public boolean isDb_poolPreparedStatements() {
- return db_poolPreparedStatements;
- }
public String getDb_url() {
return db_url;
}
@@ -1158,7 +1148,6 @@
public boolean isDb_waitIfBusy() {
return db_waitIfBusy;
}
-
public String getClassDiskPath() {
return classDiskPath;
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
