| commit | ba9af0b2cda0c6f3e470ee2597e60f6facb2708d | [log] [tgz] |
|---|---|---|
| author | Chris Custine <ccustine@apache.org> | Thu Jun 18 00:10:12 2009 +0000 |
| committer | Chris Custine <ccustine@apache.org> | Thu Jun 18 00:10:12 2009 +0000 |
| tree | d8fce71d4ba80bfae86e4308596081b8b9ef4ec4 | |
| parent | ed3dab38f5c616e2c2d78dab459ef99d1116d9bc [diff] |
FELIX-1172 - Rebrand Karaf locking mechanism. git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@785862 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/karaf/main/src/main/java/org/apache/felix/karaf/main/DefaultJDBCLock.java b/karaf/main/src/main/java/org/apache/felix/karaf/main/DefaultJDBCLock.java index 3b29729..305659d 100644 --- a/karaf/main/src/main/java/org/apache/felix/karaf/main/DefaultJDBCLock.java +++ b/karaf/main/src/main/java/org/apache/felix/karaf/main/DefaultJDBCLock.java
@@ -60,8 +60,8 @@ this.clusterName = props.getProperty(PROPERTY_LOCK_JDBC_CLUSTERNAME); String time = props.getProperty(PROPERTY_LOCK_JDBC_TIMEOUT); this.lockConnection = null; - if (table == null) { table = "SERVICEMIX_LOCK"; } - if ( clusterName == null) { clusterName = "smx4"; } + if (table == null) { table = "KARAF_LOCK"; } + if ( clusterName == null) { clusterName = "karaf"; } this.statements = new Statements(table, clusterName); if (time != null) { this.timeout = Integer.parseInt(time) * 1000;
diff --git a/karaf/main/src/main/java/org/apache/felix/karaf/main/Statements.java b/karaf/main/src/main/java/org/apache/felix/karaf/main/Statements.java index e382876..d612f9a 100644 --- a/karaf/main/src/main/java/org/apache/felix/karaf/main/Statements.java +++ b/karaf/main/src/main/java/org/apache/felix/karaf/main/Statements.java
@@ -25,8 +25,8 @@ public class Statements { - private String lockTableName = "SERVICEMIX_LOCK"; - private String clusterName = "smx4"; + private String lockTableName = "KARAF_LOCK"; + private String clusterName = "karaf"; private String lockCreateStatement; private String lockPopulateStatement; private String lockUpdateStatement;