You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cc...@apache.org on 2009/06/18 02:10:12 UTC

svn commit: r785862 - in /felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main: DefaultJDBCLock.java Statements.java

Author: ccustine
Date: Thu Jun 18 00:10:12 2009
New Revision: 785862

URL: http://svn.apache.org/viewvc?rev=785862&view=rev
Log:
FELIX-1172 - Rebrand Karaf locking mechanism.

Modified:
    felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/DefaultJDBCLock.java
    felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Statements.java

Modified: felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/DefaultJDBCLock.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/DefaultJDBCLock.java?rev=785862&r1=785861&r2=785862&view=diff
==============================================================================
--- felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/DefaultJDBCLock.java (original)
+++ felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/DefaultJDBCLock.java Thu Jun 18 00:10:12 2009
@@ -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; 

Modified: felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Statements.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Statements.java?rev=785862&r1=785861&r2=785862&view=diff
==============================================================================
--- felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Statements.java (original)
+++ felix/trunk/karaf/main/src/main/java/org/apache/felix/karaf/main/Statements.java Thu Jun 18 00:10:12 2009
@@ -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;