removed some unused database connection properties

Laszlo Hornyak · Prasanna Santhanam · commit 988ccfc45d8a · 2012-12-13T22:46:29.000-08:00
Signed-off-by: Laszlo Hornyak &lt;lhornyak@redhat.com&gt;
Signed-off-by: Prasanna Santhanam &lt;tsp@apache.org&gt;
diff --git a/client/tomcatconf/db-enc.properties.in b/client/tomcatconf/db-enc.properties.in
@@ -37,9 +37,6 @@ db.cloud.testOnBorrow=true
 db.cloud.testWhileIdle=true
 db.cloud.timeBetweenEvictionRunsMillis=40000
 db.cloud.minEvictableIdleTimeMillis=240000
-db.cloud.removeAbandoned=false
-db.cloud.removeAbandonedTimeout=300
-db.cloud.logAbandoned=true
 db.cloud.poolPreparedStatements=false
 db.cloud.url.params=prepStmtCacheSize=517&cachePrepStmts=true
 
diff --git a/client/tomcatconf/db.properties.in b/client/tomcatconf/db.properties.in
@@ -37,9 +37,6 @@ db.cloud.testOnBorrow=true
 db.cloud.testWhileIdle=true
 db.cloud.timeBetweenEvictionRunsMillis=40000
 db.cloud.minEvictableIdleTimeMillis=240000
-db.cloud.removeAbandoned=false
-db.cloud.removeAbandonedTimeout=300
-db.cloud.logAbandoned=true
 db.cloud.poolPreparedStatements=false
 db.cloud.url.params=prepStmtCacheSize=517&cachePrepStmts=true
 
diff --git a/utils/conf/db.properties b/utils/conf/db.properties
@@ -39,9 +39,6 @@ db.cloud.testOnBorrow=true
 db.cloud.testWhileIdle=true
 db.cloud.timeBetweenEvictionRunsMillis=40000
 db.cloud.minEvictableIdleTimeMillis=240000
-db.cloud.removeAbandoned=false
-db.cloud.removeAbandonedTimeout=300
-db.cloud.logAbandoned=true
 db.cloud.poolPreparedStatements=false
 db.cloud.url.params=prepStmtCacheSize=517&cachePrepStmts=true&prepStmtCacheSqlLimit=4096
 
diff --git a/utils/src/com/cloud/utils/db/Transaction.java b/utils/src/com/cloud/utils/db/Transaction.java
@@ -1039,9 +1039,6 @@ public String toString() {
             final boolean cloudTestWhileIdle = Boolean.parseBoolean(dbProps.getProperty("db.cloud.testWhileIdle"));
             final long cloudTimeBtwEvictionRunsMillis = Long.parseLong(dbProps.getProperty("db.cloud.timeBetweenEvictionRunsMillis"));
             final long cloudMinEvcitableIdleTimeMillis = Long.parseLong(dbProps.getProperty("db.cloud.minEvictableIdleTimeMillis"));
-            final boolean cloudRemoveAbandoned = Boolean.parseBoolean(dbProps.getProperty("db.cloud.removeAbandoned"));
-            final int cloudRemoveAbandonedTimeout = Integer.parseInt(dbProps.getProperty("db.cloud.removeAbandonedTimeout"));
-            final boolean cloudLogAbandoned = Boolean.parseBoolean(dbProps.getProperty("db.cloud.logAbandoned"));
             final boolean cloudPoolPreparedStatements = Boolean.parseBoolean(dbProps.getProperty("db.cloud.poolPreparedStatements"));
             final String url = dbProps.getProperty("db.cloud.url.params");
             final boolean useSSL = Boolean.parseBoolean(dbProps.getProperty("db.cloud.useSSL"));
