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

Merged with new Redis 1.2 code from master, does not compile since the redis-client is build with 2.7.7, need to get correct JAR

Browse source
This commit is contained in:
Jonas Bonér 2010-03-30 21:35:24 +02:00
commit eaaa9b1456
4 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-core/src/main/scala/actor/Actor.scala
View file

@ -42,7 +42,7 @@ trait Transactor extends Actor {
*
* @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
*/
abstract class RemoteActor(hostname: String, port: Int) extends Actor {
bstract class RemoteActor(hostname: String, port: Int) extends Actor {
makeRemote(hostname, port)
}

6
akka-persistence/akka-persistence-redis/src/main/scala/RedisStorageBackend.scala
View file

@ -261,7 +261,7 @@ private [akka] object RedisStorageBackend extends
}
override def incrementByAtomically(name: String, by: Int): Option[Int] = withErrorHandling {
db.incrBy(new String(encode(name.getBytes)), by) match {
db.incrby(new String(encode(name.getBytes)), by) match {
case Some(i) => Some(i)
case None =>
throw new IllegalArgumentException(name + " exception in incrby")
@ -277,7 +277,7 @@ private [akka] object RedisStorageBackend extends
}
override def decrementByAtomically(name: String, by: Int): Option[Int] = withErrorHandling {
db.decrBy(new String(encode(name.getBytes)), by) match {
db.decrby(new String(encode(name.getBytes)), by) match {
case Some(i) => Some(i)
case None =>
throw new IllegalArgumentException(name + " exception in decrby")
@ -390,7 +390,7 @@ private [akka] object RedisStorageBackend extends
}
}
def flushDB = withErrorHandling(db.flushDb)
def flushDB = withErrorHandling(db.flushdb)
private def withErrorHandling[T](body: => T): T = {
try {

BIN
embedded-repo/com/redis/redisclient/1.2/redisclient-1.2.jar Normal file
View file

Binary file not shown.

5
project/build/AkkaProject.scala
View file

@ -154,7 +154,7 @@ abstract class AkkaDefaults(info: ProjectInfo) extends DefaultProject(info) with
val moduleName = projectPath.substring(
projectPath.lastIndexOf(System.getProperty("file.separator")) + 1, projectPath.length)
// FIXME need to find out a way to grab these paths from the sbt system
// FIXME need to find out a way to grab these paths from the sbt system
// binary
val JAR_FILE_NAME = moduleName + "_%s-%s.jar".format(buildScalaVersion, version)
@ -328,7 +328,8 @@ class AkkaParent(info: ProjectInfo) extends AkkaDefaults(info) {
}
class AkkaRedisProject(info: ProjectInfo) extends AkkaDefaults(info) {
val redis = "com.redis" % "redisclient" % "2.8.0.Beta1-1.2-SNAPSHOT" % "compile"
// val redis = "com.redis" % "redisclient" % "2.8.0.Beta1-1.2-SNAPSHOT" % "compile"
val redis = "com.redis" % "redisclient" % "1.2" % "compile"
override def testOptions = TestFilter((name: String) => name.endsWith("Test")) :: Nil
lazy val dist = deployTask(info, distPath) dependsOn(`package`, packageDocs, packageSrc) describedAs("Deploying")
}