Merge pull request #7 from cloudant/remove-high-scale-lib

remove high-scale-libs for jctools

Author: rnewson

pom.xml

@@ -30,7 +30,7 @@
         <dependency>
             <groupId>com.boundary</groupId>
             <artifactId>overlock-scala_${scala.version}</artifactId>
-            <version>0.8.4</version>
+            <version>0.8.7-cloudant1</version>
         </dependency>
         <dependency>
             <groupId>org.jetlang</groupId>

src/main/scala/scalang/Node.scala

@@ -20,7 +20,7 @@ import org.jboss.{netty => netty}
 import netty.channel._
 import java.util.concurrent._
 import scalang.node._
-import org.cliffc.high_scale_lib._
+import org.jctools.maps._
 import overlock.atomicmap._
 import org.jetlang._
 import core._

src/main/scala/scalang/ReplyRegistry.scala

@@ -16,7 +16,7 @@
 package scalang
 
 import java.util.concurrent.BlockingQueue
-import org.cliffc.high_scale_lib.NonBlockingHashMap
+import org.jctools.maps.NonBlockingHashMap
 
 trait ReplyRegistry {
   val replyWaiters = new NonBlockingHashMap[(Pid,Reference),BlockingQueue[Any]]

src/main/scala/scalang/node/ProcessAdapter.scala

@@ -21,8 +21,8 @@ import org.jetlang.fibers._
 import org.jetlang.channels._
 import org.jetlang.core._
 import java.util.concurrent.TimeUnit
-import org.cliffc.high_scale_lib.NonBlockingHashSet
-import org.cliffc.high_scale_lib.NonBlockingHashMap
+import org.jctools.maps.NonBlockingHashSet
+import org.jctools.maps.NonBlockingHashMap
 import scala.collection.JavaConversions._
 import com.boundary.logula.Logging
 

src/main/scala/scalang/node/ProcessLauncher.scala

@@ -16,9 +16,6 @@
 package scalang.node
 
 import scalang._
-import org.cliffc.high_scale_lib.NonBlockingHashSet
-import org.cliffc.high_scale_lib.NonBlockingHashMap
-import scala.collection.JavaConversions._
 
 class ProcessLauncher[T <: Process](clazz : Class[T], ctx : ProcessContext) extends ProcessHolder(ctx) {
   val referenceCounter = ctx.referenceCounter

src/main/scala/scalang/node/ServiceLauncher.scala

@@ -16,9 +16,6 @@
 package scalang.node
 
 import scalang._
-import org.cliffc.high_scale_lib.NonBlockingHashSet
-import org.cliffc.high_scale_lib.NonBlockingHashMap
-import scala.collection.JavaConversions._
 
 class ServiceLauncher[A <: Product, T <: Process](clazz : Class[T], ctx : ServiceContext[A]) extends ProcessHolder(ctx) {
   val referenceCounter = ctx.referenceCounter