raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Fixing the zeromq module, currently requires a non-published version of the zeromq bindings, revisit later.

Browse source
This commit is contained in:
Viktor Klang 2012-06-26 12:06:23 +02:00
parent 4c2ac278a7
commit d120d4cdb2
4 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
akka-zeromq/src/main/scala/akka/zeromq/ZeroMQExtension.scala
View file

@ -32,9 +32,6 @@ object ZeroMQExtension extends ExtensionId[ZeroMQExtension] with ExtensionIdProv
private val minVersionString = "2.1.0"
private val minVersion = JZMQ.makeVersion(2, 1, 0)
private[zeromq] def check[TOption <: SocketOption: Manifest](parameters: Seq[SocketOption]) =
parameters exists { p ⇒ ClassTag.singleType(p) <:< manifest[TOption] }
}
/**
@ -61,7 +58,10 @@ class ZeroMQExtension(system: ActorSystem) extends Extension {
*/
def newSocketProps(socketParameters: SocketOption*): Props = {
verifyZeroMQVersion
require(ZeroMQExtension.check[SocketType.ZMQSocketType](socketParameters), "A socket type is required")
require(socketParameters exists {
case s: SocketType.ZMQSocketType ⇒ true
case _ ⇒ false
}, "A socket type is required")
Props(new ConcurrentSocketActor(socketParameters)).withDispatcher("akka.zeromq.socket-dispatcher")
}

2
akka-zeromq/src/main/scala/akka/zeromq/package.scala
View file

@ -3,6 +3,8 @@
*/
package akka
import language.implicitConversions
import actor.ActorSystem
/**

2
akka-zeromq/src/test/scala/akka/zeromq/ConcurrentSocketActorSpec.scala
View file

@ -3,6 +3,8 @@
*/
package akka.zeromq
import language.postfixOps
import org.scalatest.matchers.MustMatchers
import akka.testkit.{ TestProbe, DefaultTimeout, AkkaSpec }
import akka.util.duration._

2
project/AkkaBuild.scala
View file

@ -482,7 +482,7 @@ object Dependency {
val protobuf = "com.google.protobuf" % "protobuf-java" % "2.4.1" // New BSD
val scalaStm = "org.scala-tools" %% "scala-stm" % "0.5" // Modified BSD (Scala)
val slf4jApi = "org.slf4j" % "slf4j-api" % "1.6.4" // MIT
val zeroMQ = "org.zeromq" %% "zeromq-scala-binding" % "0.0.6" // ApacheV2
val zeroMQ = "org.zeromq" %% "zeromq-scala-binding" % "0.0.6.1-B1" // ApacheV2 //FIXME SWITCH TO OFFICIAL VERSION
val uncommonsMath = "org.uncommons.maths" % "uncommons-maths" % "1.2.2a" // ApacheV2