Skip to content

Commit c873256

Browse files
author
Jonas Bonér
committed
Converted tabs to spaces
1 parent 87c336b commit c873256

File tree

7 files changed

+40
-43
lines changed

7 files changed

+40
-43
lines changed

‎akka-core/src/main/scala/remote/Cluster.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -261,11 +261,11 @@ object Cluster extends Cluster with Logging {
261261
sup <- createSupervisor(actorRef)
262262
} {
263263
val serializer = Class.forName(config.getString(
264-
"akka.remote.cluster.serializer", DEFAULT_SERIALIZER_CLASS_NAME))
265-
.newInstance.asInstanceOf[Serializer]
264+
"akka.remote.cluster.serializer", DEFAULT_SERIALIZER_CLASS_NAME))
265+
.newInstance.asInstanceOf[Serializer]
266266

267-
classLoader = serializerClassLoader orElse classLoader
268-
serializer.classLoader = classLoader
267+
classLoader = serializerClassLoader orElse classLoader
268+
serializer.classLoader = classLoader
269269
actorRef.start
270270
sup.start
271271
actorRef ! InitClusterActor(serializer)

‎akka-core/src/test/scala/ActorPatternsTest.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ class ActorPatternsTest extends junit.framework.TestCase with Suite with MustMat
2121
val (testMsg1,testMsg2,testMsg3,testMsg4) = ("test1","test2","test3","test4")
2222
val targetOk = new AtomicInteger(0)
2323
val t1 = actorOf( new Actor() {
24-
def receive = {
24+
def receive = {
2525
case `testMsg1` => self.reply(3)
2626
case `testMsg2` => self.reply(7)
2727
}
2828
} ).start
2929

3030
val t2 = actorOf( new Actor() {
31-
def receive = {
31+
def receive = {
3232
case `testMsg3` => self.reply(11)
3333
}
3434
}).start
@@ -45,7 +45,7 @@ class ActorPatternsTest extends junit.framework.TestCase with Suite with MustMat
4545
} yield a + b + c
4646

4747
result.get must be(21)
48-
for(a <- List(t1,t2,d)) a.stop
48+
for(a <- List(t1,t2,d)) a.stop
4949
}
5050

5151
@Test def testLogger = {

‎akka-fun-test-java/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<packaging>jar</packaging>
1111

1212
<properties>
13-
<scala.version>2.8.0.RC2</scala.version>
13+
<scala.version>2.8.0.RC3</scala.version>
1414
<atmosphere.version>0.5.2</atmosphere.version>
1515
<jersey.version>1.1.5</jersey.version>
1616
<grizzly.version>1.9.18-i</grizzly.version>
@@ -35,18 +35,18 @@
3535
<dependencies>
3636
<dependency>
3737
<groupId>se.scalablesolutions.akka</groupId>
38-
<artifactId>akka-kernel_2.8.0.RC2</artifactId>
38+
<artifactId>akka-kernel_2.8.0.RC3</artifactId>
3939
<version>0.9</version>
4040
</dependency>
4141
<dependency>
4242
<groupId>se.scalablesolutions.akka</groupId>
43-
<artifactId>akka-persistence-cassandra_2.8.0.RC2</artifactId>
43+
<artifactId>akka-persistence-cassandra_2.8.0.RC3</artifactId>
4444
<version>0.9</version>
4545
</dependency>
4646
<dependency>
4747
<groupId>com.google.protobuf</groupId>
4848
<artifactId>protobuf-java</artifactId>
49-
<version>2.2.0</version>
49+
<version>2.3.0</version>
5050
</dependency>
5151
<dependency>
5252
<groupId>org.codehaus.jackson</groupId>

‎akka-kernel/src/main/scala/EmbeddedAppServer.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ trait EmbeddedAppServer extends Bootable with Logging {
6565
config.getList("akka.rest.resource_packages").mkString(";")
6666
)
6767
adapter.addInitParameter("com.sun.jersey.spi.container.ResourceFilters",
68-
config.getList("akka.rest.filters").mkString(",")
68+
config.getList("akka.rest.filters").mkString(",")
6969
)
7070

7171
if (HOME.isDefined) adapter.addRootFolder(HOME.get + "/deploy/root")

‎akka-samples/akka-sample-rest-scala/src/main/scala/SimpleService.scala

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ class SimpleService {
5151
@GET
5252
@Produces(Array("text/html"))
5353
def count = {
54-
//Fetch the first actor of type SimpleServiceActor
55-
//Send it the "Tick" message and expect a NdeSeq back
56-
val result = for{a <- actorsFor(classOf[SimpleServiceActor]).headOption
57-
r <- a.!![NodeSeq]("Tick")} yield r
58-
//Return either the resulting NodeSeq or a default one
59-
result getOrElse <error>Error in counter</error>
54+
//Fetch the first actor of type SimpleServiceActor
55+
//Send it the "Tick" message and expect a NdeSeq back
56+
val result = for{a <- actorsFor(classOf[SimpleServiceActor]).headOption
57+
r <- a.!![NodeSeq]("Tick")} yield r
58+
//Return either the resulting NodeSeq or a default one
59+
result getOrElse <error>Error in counter</error>
6060
}
6161
}
6262
class SimpleServiceActor extends Transactor {
@@ -105,12 +105,12 @@ class PersistentSimpleService {
105105
@GET
106106
@Produces(Array("text/html"))
107107
def count = {
108-
//Fetch the first actor of type PersistentSimpleServiceActor
109-
//Send it the "Tick" message and expect a NdeSeq back
110-
val result = for{a <- actorsFor(classOf[PersistentSimpleServiceActor]).headOption
111-
r <- a.!![NodeSeq]("Tick")} yield r
112-
//Return either the resulting NodeSeq or a default one
113-
result getOrElse <error>Error in counter</error>
108+
//Fetch the first actor of type PersistentSimpleServiceActor
109+
//Send it the "Tick" message and expect a NdeSeq back
110+
val result = for{a <- actorsFor(classOf[PersistentSimpleServiceActor]).headOption
111+
r <- a.!![NodeSeq]("Tick")} yield r
112+
//Return either the resulting NodeSeq or a default one
113+
result getOrElse <error>Error in counter</error>
114114
}
115115
}
116116

@@ -147,18 +147,18 @@ class Chat {
147147
@Consumes(Array("application/x-www-form-urlencoded"))
148148
@Produces(Array("text/html"))
149149
def publishMessage(form: MultivaluedMap[String, String]) = {
150-
val msg = ChatMsg(form.getFirst("name"),form.getFirst("action"),form.getFirst("message"))
150+
val msg = ChatMsg(form.getFirst("name"),form.getFirst("action"),form.getFirst("message"))
151151
//Fetch the first actor of type ChatActor
152-
//Send it the "Tick" message and expect a NdeSeq back
153-
val result = for{a <- actorsFor(classOf[ChatActor]).headOption
154-
r <- a.!![String](msg)} yield r
155-
//Return either the resulting String or a default one
156-
result getOrElse "System__error"
152+
//Send it the "Tick" message and expect a NdeSeq back
153+
val result = for{a <- actorsFor(classOf[ChatActor]).headOption
154+
r <- a.!![String](msg)} yield r
155+
//Return either the resulting String or a default one
156+
result getOrElse "System__error"
157157
}
158158
}
159159

160160
object ChatActor {
161-
case class ChatMsg(val who: String, val what: String, val msg: String)
161+
case class ChatMsg(val who: String, val what: String, val msg: String)
162162
}
163163

164164
class ChatActor extends Actor with Logging {

‎akka-samples/akka-sample-security/src/main/scala/SimpleService.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,12 @@ class SecureTickService {
120120
def paranoiaTick = tick
121121

122122
def tick = {
123-
//Fetch the first actor of type PersistentSimpleServiceActor
124-
//Send it the "Tick" message and expect a NdeSeq back
125-
val result = for{a <- actorsFor(classOf[SecureTickActor]).headOption
126-
r <- a.!![Integer]("Tick")} yield r
127-
//Return either the resulting NodeSeq or a default one
128-
result match {
123+
//Fetch the first actor of type PersistentSimpleServiceActor
124+
//Send it the "Tick" message and expect a NdeSeq back
125+
val result = for{a <- actorsFor(classOf[SecureTickActor]).headOption
126+
r <- a.!![Integer]("Tick")} yield r
127+
//Return either the resulting NodeSeq or a default one
128+
result match {
129129
case (Some(counter)) => (<success>Tick: {counter}</success>)
130130
case _ => (<error>Error in counter</error>)
131131
}

‎project/build/AkkaProject.scala

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) {
156156
import Process._
157157
lazy val publishLocalMvn = runMvnInstall
158158
def runMvnInstall = task {
159-
for(absPath <- akkaArtifacts.getPaths) {
159+
for (absPath <- akkaArtifacts.getPaths) {
160160
val artifactRE = """(.*)/dist/(.*)-(.*).jar""".r
161161
val artifactRE(path, artifactId, artifactVersion) = absPath
162162
val command = "mvn install:install-file" +
@@ -390,12 +390,9 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) {
390390
)
391391
}
392392

393-
def akkaArtifacts = {
394-
descendents(info.projectPath / "dist", "*" + buildScalaVersion + "-" + version + ".jar")
395-
}
393+
def akkaArtifacts = descendents(info.projectPath / "dist", "*" + buildScalaVersion + "-" + version + ".jar")
394+
396395
// ------------------------------------------------------------
397-
398-
399396
class AkkaDefaultProject(info: ProjectInfo, val deployPath: Path) extends DefaultProject(info) with DeployProject
400397

401398
trait DeployProject extends DefaultProject {

0 commit comments

Comments
 (0)