commit 116b1fe95901298217bc6849bf312dc898e1d55f
author Jonathan Hart <jono@onlab.us> Fri Mar 14 18:53:47 2014 -0700
committer Jonathan Hart <jono@onlab.us> Tue Mar 18 16:48:40 2014 -0700
tree f725eafe5a18a1cea88752d45a30c9afcca2910a
parent 5261772b598441fad147eb50a74f2421c34587ec

Ported ZookeeperRegistry to new Curator version using their notifications

Change-Id: Ie2319d0f11a1ebd2c34ceb7c9e0fb9c5aa085708

Implemented asynchronous leadership change notification.
This is needed to prevent deadlock in original switch registry code
(this used to be provided by my Curator modifications, but the official
Curator leader latch implementation gives notifications on the calling thread).

Change-Id: Ic3db816c98e4fc2b7a85d0007740b28afc4566a6

Remove local (modified) curator libraries and clean up the pom.xml
Amended to fix tests that broke due to an API change.

Change-Id: I09de15de2dd448b06712e93724c1b75160768db3

pom.xml

diff --git a/pom.xml b/pom.xml
index 2bd6030..18ea3db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,11 +12,11 @@
   <url>http://onlab.us/</url>
   <repositories>
     <!-- In Project repository -->
-    <repository>
+    <!--<repository>
       <id>in-project</id>
       <name>In Project Repo</name>
       <url>file://${project.basedir}/repo</url>
-    </repository>
+    </repository>-->
     <repository>
       <id>central</id>
       <name>Maven Central repository</name>
@@ -550,6 +550,26 @@
       <version>2.1</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.curator</groupId>
+      <artifactId>curator-framework</artifactId>
+      <version>2.4.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.curator</groupId>
+      <artifactId>curator-client</artifactId>
+      <version>2.4.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.curator</groupId>
+      <artifactId>curator-recipes</artifactId>
+      <version>2.4.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.curator</groupId>
+      <artifactId>curator-x-discovery</artifactId>
+      <version>2.4.1</version>
+    </dependency>
     <!--
     <dependency>
       <groupId>org.objenesis</groupId>
@@ -563,27 +583,7 @@
       <version>2.2.2</version>
     </dependency>
     -->
-    <!-- dependency to locally modified version -->
-    <dependency>
-      <groupId>com.netflix.curator</groupId>
-      <artifactId>curator-framework</artifactId>
-      <version>1.3.5-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>com.netflix.curator</groupId>
-      <artifactId>curator-client</artifactId>
-      <version>1.3.5-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>com.netflix.curator</groupId>
-      <artifactId>curator-recipes</artifactId>
-      <version>1.3.5-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>com.netflix.curator</groupId>
-      <artifactId>curator-x-discovery</artifactId>
-      <version>1.3.5-SNAPSHOT</version>
-    </dependency>
+
     <!--
     <dependency>
       <groupId>net.floodlightcontroller</groupId>