removed some unused database connection properties Signed-off-by: Laszlo Hornyak <[email protected]> Signed-off-by: Prasanna Santhanam <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/988ccfc4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/988ccfc4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/988ccfc4 Branch: refs/heads/ui-plugins Commit: 988ccfc45d8a4f7b689a75adc76c06f0ec1a06db Parents: 8ced7da Author: Laszlo Hornyak <[email protected]> Authored: Sun Nov 11 22:06:08 2012 +0100 Committer: Prasanna Santhanam <[email protected]> Committed: Thu Dec 13 22:46:29 2012 -0800 ---------------------------------------------------------------------- client/tomcatconf/db-enc.properties.in | 3 --- client/tomcatconf/db.properties.in | 3 --- utils/conf/db.properties | 3 --- utils/src/com/cloud/utils/db/Transaction.java | 3 --- 4 files changed, 0 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/988ccfc4/client/tomcatconf/db-enc.properties.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/db-enc.properties.in b/client/tomcatconf/db-enc.properties.in index 6136f37..a9404fa 100644 --- 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 http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/988ccfc4/client/tomcatconf/db.properties.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/db.properties.in b/client/tomcatconf/db.properties.in index f39d8fe..e383667 100644 --- 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 http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/988ccfc4/utils/conf/db.properties ---------------------------------------------------------------------- diff --git a/utils/conf/db.properties b/utils/conf/db.properties index 3f0cc8e..8c8833f 100644 --- 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 http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/988ccfc4/utils/src/com/cloud/utils/db/Transaction.java ---------------------------------------------------------------------- diff --git a/utils/src/com/cloud/utils/db/Transaction.java b/utils/src/com/cloud/utils/db/Transaction.java index 0fa3e0a..eaa31f6 100755 --- a/utils/src/com/cloud/utils/db/Transaction.java +++ b/utils/src/com/cloud/utils/db/Transaction.java @@ -1039,9 +1039,6 @@ public class Transaction { 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"));
