diff --git a/akka-core/src/main/scala/remote/Cluster.scala b/akka-core/src/main/scala/remote/Cluster.scala index 66f7b59baa..32380bec7d 100644 --- a/akka-core/src/main/scala/remote/Cluster.scala +++ b/akka-core/src/main/scala/remote/Cluster.scala @@ -261,11 +261,11 @@ object Cluster extends Cluster with Logging { sup <- createSupervisor(actorRef) } { val serializer = Class.forName(config.getString( - "akka.remote.cluster.serializer", DEFAULT_SERIALIZER_CLASS_NAME)) - .newInstance.asInstanceOf[Serializer] + "akka.remote.cluster.serializer", DEFAULT_SERIALIZER_CLASS_NAME)) + .newInstance.asInstanceOf[Serializer] - classLoader = serializerClassLoader orElse classLoader - serializer.classLoader = classLoader + classLoader = serializerClassLoader orElse classLoader + serializer.classLoader = classLoader actorRef.start sup.start actorRef ! InitClusterActor(serializer) diff --git a/akka-core/src/test/scala/ActorPatternsTest.scala b/akka-core/src/test/scala/ActorPatternsTest.scala index fac59a163c..028ea80ea3 100644 --- a/akka-core/src/test/scala/ActorPatternsTest.scala +++ b/akka-core/src/test/scala/ActorPatternsTest.scala @@ -21,14 +21,14 @@ class ActorPatternsTest extends junit.framework.TestCase with Suite with MustMat val (testMsg1,testMsg2,testMsg3,testMsg4) = ("test1","test2","test3","test4") val targetOk = new AtomicInteger(0) val t1 = actorOf( new Actor() { - def receive = { + def receive = { case `testMsg1` => self.reply(3) case `testMsg2` => self.reply(7) } } ).start val t2 = actorOf( new Actor() { - def receive = { + def receive = { case `testMsg3` => self.reply(11) } }).start @@ -45,7 +45,7 @@ class ActorPatternsTest extends junit.framework.TestCase with Suite with MustMat } yield a + b + c result.get must be(21) - for(a <- List(t1,t2,d)) a.stop + for(a <- List(t1,t2,d)) a.stop } @Test def testLogger = { diff --git a/akka-fun-test-java/pom.xml b/akka-fun-test-java/pom.xml index c8ddef3320..c7ce656cf3 100644 --- a/akka-fun-test-java/pom.xml +++ b/akka-fun-test-java/pom.xml @@ -10,7 +10,7 @@ jar - 2.8.0.RC2 + 2.8.0.RC3 0.5.2 1.1.5 1.9.18-i @@ -35,18 +35,18 @@ se.scalablesolutions.akka - akka-kernel_2.8.0.RC2 + akka-kernel_2.8.0.RC3 0.9 se.scalablesolutions.akka - akka-persistence-cassandra_2.8.0.RC2 + akka-persistence-cassandra_2.8.0.RC3 0.9 com.google.protobuf protobuf-java - 2.2.0 + 2.3.0 org.codehaus.jackson diff --git a/akka-kernel/src/main/scala/EmbeddedAppServer.scala b/akka-kernel/src/main/scala/EmbeddedAppServer.scala index 41e6dd44ae..5d3001edbd 100644 --- a/akka-kernel/src/main/scala/EmbeddedAppServer.scala +++ b/akka-kernel/src/main/scala/EmbeddedAppServer.scala @@ -65,7 +65,7 @@ trait EmbeddedAppServer extends Bootable with Logging { config.getList("akka.rest.resource_packages").mkString(";") ) adapter.addInitParameter("com.sun.jersey.spi.container.ResourceFilters", - config.getList("akka.rest.filters").mkString(",") + config.getList("akka.rest.filters").mkString(",") ) if (HOME.isDefined) adapter.addRootFolder(HOME.get + "/deploy/root") diff --git a/akka-samples/akka-sample-rest-scala/src/main/scala/SimpleService.scala b/akka-samples/akka-sample-rest-scala/src/main/scala/SimpleService.scala index e8f3576e9f..18b8bda6e6 100644 --- a/akka-samples/akka-sample-rest-scala/src/main/scala/SimpleService.scala +++ b/akka-samples/akka-sample-rest-scala/src/main/scala/SimpleService.scala @@ -51,12 +51,12 @@ class SimpleService { @GET @Produces(Array("text/html")) def count = { - //Fetch the first actor of type SimpleServiceActor - //Send it the "Tick" message and expect a NdeSeq back - val result = for{a <- actorsFor(classOf[SimpleServiceActor]).headOption - r <- a.!![NodeSeq]("Tick")} yield r - //Return either the resulting NodeSeq or a default one - result getOrElse Error in counter + //Fetch the first actor of type SimpleServiceActor + //Send it the "Tick" message and expect a NdeSeq back + val result = for{a <- actorsFor(classOf[SimpleServiceActor]).headOption + r <- a.!![NodeSeq]("Tick")} yield r + //Return either the resulting NodeSeq or a default one + result getOrElse Error in counter } } class SimpleServiceActor extends Transactor { @@ -105,12 +105,12 @@ class PersistentSimpleService { @GET @Produces(Array("text/html")) def count = { - //Fetch the first actor of type PersistentSimpleServiceActor - //Send it the "Tick" message and expect a NdeSeq back - val result = for{a <- actorsFor(classOf[PersistentSimpleServiceActor]).headOption - r <- a.!![NodeSeq]("Tick")} yield r - //Return either the resulting NodeSeq or a default one - result getOrElse Error in counter + //Fetch the first actor of type PersistentSimpleServiceActor + //Send it the "Tick" message and expect a NdeSeq back + val result = for{a <- actorsFor(classOf[PersistentSimpleServiceActor]).headOption + r <- a.!![NodeSeq]("Tick")} yield r + //Return either the resulting NodeSeq or a default one + result getOrElse Error in counter } } @@ -147,18 +147,18 @@ class Chat { @Consumes(Array("application/x-www-form-urlencoded")) @Produces(Array("text/html")) def publishMessage(form: MultivaluedMap[String, String]) = { - val msg = ChatMsg(form.getFirst("name"),form.getFirst("action"),form.getFirst("message")) + val msg = ChatMsg(form.getFirst("name"),form.getFirst("action"),form.getFirst("message")) //Fetch the first actor of type ChatActor - //Send it the "Tick" message and expect a NdeSeq back - val result = for{a <- actorsFor(classOf[ChatActor]).headOption - r <- a.!![String](msg)} yield r - //Return either the resulting String or a default one - result getOrElse "System__error" + //Send it the "Tick" message and expect a NdeSeq back + val result = for{a <- actorsFor(classOf[ChatActor]).headOption + r <- a.!![String](msg)} yield r + //Return either the resulting String or a default one + result getOrElse "System__error" } } object ChatActor { - case class ChatMsg(val who: String, val what: String, val msg: String) + case class ChatMsg(val who: String, val what: String, val msg: String) } class ChatActor extends Actor with Logging { diff --git a/akka-samples/akka-sample-security/src/main/scala/SimpleService.scala b/akka-samples/akka-sample-security/src/main/scala/SimpleService.scala index 4fd5a8a63d..800fdca7ff 100644 --- a/akka-samples/akka-sample-security/src/main/scala/SimpleService.scala +++ b/akka-samples/akka-sample-security/src/main/scala/SimpleService.scala @@ -120,12 +120,12 @@ class SecureTickService { def paranoiaTick = tick def tick = { - //Fetch the first actor of type PersistentSimpleServiceActor - //Send it the "Tick" message and expect a NdeSeq back - val result = for{a <- actorsFor(classOf[SecureTickActor]).headOption - r <- a.!![Integer]("Tick")} yield r - //Return either the resulting NodeSeq or a default one - result match { + //Fetch the first actor of type PersistentSimpleServiceActor + //Send it the "Tick" message and expect a NdeSeq back + val result = for{a <- actorsFor(classOf[SecureTickActor]).headOption + r <- a.!![Integer]("Tick")} yield r + //Return either the resulting NodeSeq or a default one + result match { case (Some(counter)) => (Tick: {counter}) case _ => (Error in counter) } diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala index 21f2332fcb..173d310a12 100644 --- a/project/build/AkkaProject.scala +++ b/project/build/AkkaProject.scala @@ -156,7 +156,7 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) { import Process._ lazy val publishLocalMvn = runMvnInstall def runMvnInstall = task { - for(absPath <- akkaArtifacts.getPaths) { + for (absPath <- akkaArtifacts.getPaths) { val artifactRE = """(.*)/dist/(.*)-(.*).jar""".r val artifactRE(path, artifactId, artifactVersion) = absPath val command = "mvn install:install-file" + @@ -390,12 +390,9 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) { ) } - def akkaArtifacts = { - descendents(info.projectPath / "dist", "*" + buildScalaVersion + "-" + version + ".jar") - } + def akkaArtifacts = descendents(info.projectPath / "dist", "*" + buildScalaVersion + "-" + version + ".jar") + // ------------------------------------------------------------ - - class AkkaDefaultProject(info: ProjectInfo, val deployPath: Path) extends DefaultProject(info) with DeployProject trait DeployProject extends DefaultProject {