diff --git a/akka-comet/pom.xml b/akka-comet/pom.xml index 25bd627288..88cdc0cf57 100644 --- a/akka-comet/pom.xml +++ b/akka-comet/pom.xml @@ -34,7 +34,7 @@ javax.servlet servlet-api 2.5 - + org.atmosphere atmosphere-annotations diff --git a/akka-comet/src/main/scala/AkkaBroadcaster.scala b/akka-comet/src/main/scala/AkkaBroadcaster.scala index 4b8c48001c..320ec44c3b 100644 --- a/akka-comet/src/main/scala/AkkaBroadcaster.scala +++ b/akka-comet/src/main/scala/AkkaBroadcaster.scala @@ -11,9 +11,9 @@ class AkkaBroadcaster extends org.atmosphere.jersey.JerseyBroadcaster { name = classOf[AkkaBroadcaster].getName val caster = new Actor { - def receive = { case f : Function0[_] => f() } - - start + def receive = { case f : Function0[_] => f() } + + start } override def destroy { diff --git a/akka-comet/src/main/scala/BootableCometActorService.scala b/akka-comet/src/main/scala/BootableCometActorService.scala index 2ded71ed3c..64c22ba299 100644 --- a/akka-comet/src/main/scala/BootableCometActorService.scala +++ b/akka-comet/src/main/scala/BootableCometActorService.scala @@ -54,17 +54,17 @@ trait BootableCometActorService extends Bootable with Logging { t.setAdapter(adapter) t.setEnableAsyncExecution(true) t.setAsyncHandler(ah) - t.listen - t } + t.listen + t } log.info("REST service started successfully. Listening to port [%s]", REST_PORT) } } abstract override def onUnload = { - super.onUnload - - if (jerseySelectorThread.isDefined) { + super.onUnload + + if (jerseySelectorThread.isDefined) { log.info("Shutting down REST service (Jersey)") jerseySelectorThread.get.stopEndpoint } diff --git a/akka-core/src/main/resources/META-INF/aop.xml b/akka-core/src/main/resources/META-INF/aop.xml old mode 100755 new mode 100644 diff --git a/akka-core/src/main/scala/remote/BootableRemoteActorService.scala b/akka-core/src/main/scala/remote/BootableRemoteActorService.scala index 38202860fe..429fdb61ec 100644 --- a/akka-core/src/main/scala/remote/BootableRemoteActorService.scala +++ b/akka-core/src/main/scala/remote/BootableRemoteActorService.scala @@ -37,8 +37,8 @@ trait BootableRemoteActorService extends Bootable with Logging { } abstract override def onUnload = { - super.onUnload - if (remoteServerThread.isAlive) { + super.onUnload + if (remoteServerThread.isAlive) { log.info("Shutting down Remote Actors Service") RemoteNode.shutdown remoteServerThread.join(1000) diff --git a/akka-core/src/main/scala/stm/HashTrie.scala b/akka-core/src/main/scala/stm/HashTrie.scala index c41ad85006..02b7ad2145 100644 --- a/akka-core/src/main/scala/stm/HashTrie.scala +++ b/akka-core/src/main/scala/stm/HashTrie.scala @@ -323,12 +323,12 @@ private[collection] class FullNode[K, +V](shift: Int)(table: Array[Node[K, V]]) val node = (table(i)(shift + 5, key, hash) = value) if (node == table(i)) this else { - val newTable = new Array[Node[K, A]](32) - Array.copy(table, 0, newTable, 0, 32) - - newTable(i) = node - - new FullNode(shift)(newTable) + val newTable = new Array[Node[K, A]](32) + Array.copy(table, 0, newTable, 0, 32) + + newTable(i) = node + + new FullNode(shift)(newTable) } } diff --git a/akka-core/src/main/scala/stm/ResultOrFailure.scala b/akka-core/src/main/scala/stm/ResultOrFailure.scala index 99d88c0c5a..51ce6ddf68 100644 --- a/akka-core/src/main/scala/stm/ResultOrFailure.scala +++ b/akka-core/src/main/scala/stm/ResultOrFailure.scala @@ -32,10 +32,10 @@ import stm.Transaction * * scala> res0() * java.lang.RuntimeException: Lets see what happens here... - * at ResultOrFailure.apply(RefExcept.scala:11) - * at .(:6) - * at .() - * at Re... + * at ResultOrFailure.apply(RefExcept.scala:11) + * at .(:6) + * at .() + * at Re... * * * @author Jonas Bonér diff --git a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentNestedStateTest.java b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentNestedStateTest.java index 70aa10b9b1..7fd3a65dfb 100644 --- a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentNestedStateTest.java +++ b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentNestedStateTest.java @@ -8,7 +8,7 @@ import se.scalablesolutions.akka.config.*; import se.scalablesolutions.akka.config.ActiveObjectConfigurator; import static se.scalablesolutions.akka.config.JavaConfig.*; import se.scalablesolutions.akka.actor.*; - import se.scalablesolutions.akka.Kernel; + import se.scalablesolutions.akka.Kernel; import junit.framework.TestCase; diff --git a/akka-fun-test-java/testng.xml b/akka-fun-test-java/testng.xml old mode 100755 new mode 100644 diff --git a/akka-kernel/pom.xml b/akka-kernel/pom.xml old mode 100755 new mode 100644 diff --git a/akka-patterns/src/main/scala/Patterns.scala b/akka-patterns/src/main/scala/Patterns.scala index 09cb1d4917..cc2825145a 100644 --- a/akka-patterns/src/main/scala/Patterns.scala +++ b/akka-patterns/src/main/scala/Patterns.scala @@ -34,12 +34,12 @@ object Patterns { ) */ def dispatcherActor(routing : PF[Any,Actor], msgTransformer : (Any) => Any) : Actor = new Actor with Dispatcher { - override def transform(msg : Any) = msgTransformer(msg) + override def transform(msg : Any) = msgTransformer(msg) def routes = routing } def dispatcherActor(routing : PF[Any,Actor]) : Actor = new Actor with Dispatcher { - def routes = routing + def routes = routing } def loggerActor(actorToLog : Actor, logger : (Any) => Unit) : Actor = dispatcherActor ( diff --git a/akka-rest/pom.xml b/akka-rest/pom.xml index 4b02e9ff8e..4e875cb310 100644 --- a/akka-rest/pom.xml +++ b/akka-rest/pom.xml @@ -27,7 +27,7 @@ javax.servlet servlet-api 2.5 - + com.sun.jersey jersey-core diff --git a/akka-samples/akka-sample-lift/src/main/webapp/WEB-INF/web.xml b/akka-samples/akka-sample-lift/src/main/webapp/WEB-INF/web.xml old mode 100755 new mode 100644 diff --git a/akka-util-java/pom.xml b/akka-util-java/pom.xml old mode 100755 new mode 100644 diff --git a/pom.xml b/pom.xml old mode 100755 new mode 100644 index a3f8b0d865..3cfc2839a8 --- a/pom.xml +++ b/pom.xml @@ -93,7 +93,7 @@ +1 viktor.klang [REMOVE] AT gmail DOT com - Apostle + Apostle