diff --git a/akka-actors/src/main/scala/actor/Actor.scala b/akka-actors/src/main/scala/actor/Actor.scala index 4f3d218804..6b201a6d33 100644 --- a/akka-actors/src/main/scala/actor/Actor.scala +++ b/akka-actors/src/main/scala/actor/Actor.scala @@ -641,32 +641,26 @@ trait Actor extends Logging with TransactionManagement { } } - private[this] def restartLinkedActors(reason: AnyRef) = + private[this] def restartLinkedActors(reason: AnyRef) = { + + // FIXME remove all Temporary actors from _linkedActors, move restart code from restart(..) to this method + _linkedActors.toArray.toList.asInstanceOf[List[Actor]].foreach(_.restart(reason)) + } private[Actor] def restart(reason: AnyRef) = synchronized { lifeCycle match { case None => throw new IllegalStateException("Actor [" + id + "] does not have a life-cycle defined.") // FIXME implement support for shutdown time - case Some(LifeCycle(scope, shutdownTime, _)) => { + case Some(LifeCycle(scope, _)) => { scope match { - case Permanent => { + case Permanent => preRestart(reason, _config) log.info("Restarting actor [%s] configured as PERMANENT.", id) postRestart(reason, _config) - } - case Temporary => - // FIXME handle temporary actors correctly - restart if exited normally -// if (reason == 'normal) { -// log.debug("Restarting actor [%s] configured as TEMPORARY (since exited naturally).", id) -// scheduleRestart -// } else - log.info("Actor [%s] configured as TEMPORARY will not be restarted (received unnatural exit message).", id) - - case Transient => - log.info("Actor [%s] configured as TRANSIENT will not be restarted.", id) + log.info("Actor [%s] configured as TEMPORARY will not be restarted.", id) } } } diff --git a/akka-actors/src/main/scala/actor/Scheduler.scala b/akka-actors/src/main/scala/actor/Scheduler.scala index e2a4c9dfdf..64fbe47bf2 100644 --- a/akka-actors/src/main/scala/actor/Scheduler.scala +++ b/akka-actors/src/main/scala/actor/Scheduler.scala @@ -14,9 +14,9 @@ package se.scalablesolutions.akka.actor import java.util.concurrent._ -import config.ScalaConfig._ -import _root_.se.scalablesolutions.akka.util.{Logging} +import se.scalablesolutions.akka.config.ScalaConfig._ +import se.scalablesolutions.akka.util.{Logging} import org.scala_tools.javautils.Imports._ @@ -28,7 +28,7 @@ case class SchedulerException(msg: String, e: Throwable) extends RuntimeExceptio * which is licensed under the Apache 2 License. */ class ScheduleActor(val receiver: Actor, val future: ScheduledFuture[AnyRef]) extends Actor with Logging { - lifeCycle = Some(LifeCycle(Permanent, 100)) + lifeCycle = Some(LifeCycle(Permanent)) def receive: PartialFunction[Any, Unit] = { case UnSchedule => diff --git a/akka-actors/src/main/scala/actor/Supervisor.scala b/akka-actors/src/main/scala/actor/Supervisor.scala index 4c8afda820..43df23ee66 100644 --- a/akka-actors/src/main/scala/actor/Supervisor.scala +++ b/akka-actors/src/main/scala/actor/Supervisor.scala @@ -41,11 +41,11 @@ case class OneForOneStrategy(maxNrOfRetries: Int, withinTimeRange: Int) extends * RestartStrategy(OneForOne, 3, 10), * Supervise( * myFirstActor, - * LifeCycle(Permanent, 1000)) + * LifeCycle(Permanent)) * :: * Supervise( * mySecondActor, - * LifeCycle(Permanent, 1000)) + * LifeCycle(Permanent)) * :: Nil) * } * } diff --git a/akka-actors/src/main/scala/config/Config.scala b/akka-actors/src/main/scala/config/Config.scala index bb548efef9..39899b73d5 100644 --- a/akka-actors/src/main/scala/config/Config.scala +++ b/akka-actors/src/main/scala/config/Config.scala @@ -4,10 +4,8 @@ package se.scalablesolutions.akka.config -import reflect.BeanProperty - -import actor.Actor -import dispatch.MessageDispatcher +import se.scalablesolutions.akka.actor.Actor +import se.scalablesolutions.akka.dispatch.MessageDispatcher /** * Configuration classes - not to be used as messages. @@ -29,20 +27,15 @@ object ScalaConfig { case object AllForOne extends FailOverScheme case object OneForOne extends FailOverScheme - case class LifeCycle(scope: Scope, - shutdownTime: Int, - callbacks: Option[RestartCallbacks] // optional - ) extends ConfigElement + case class LifeCycle(scope: Scope, callbacks: Option[RestartCallbacks]) extends ConfigElement object LifeCycle { - def apply(scope: Scope, shutdownTime: Int) = new LifeCycle(scope, shutdownTime, None) - def apply(scope: Scope) = new LifeCycle(scope, 0, None) + def apply(scope: Scope) = new LifeCycle(scope, None) } case class RestartCallbacks(preRestart: String, postRestart: String) { if (preRestart == null || postRestart == null) throw new IllegalArgumentException("Restart callback methods can't be null") } case object Permanent extends Scope - case object Transient extends Scope case object Temporary extends Scope case class RemoteAddress(hostname: String, port: Int) @@ -89,6 +82,8 @@ object ScalaConfig { * @author Jonas Bonér */ object JavaConfig { + import scala.reflect.BeanProperty + sealed abstract class ConfigElement class RestartStrategy( @@ -99,11 +94,11 @@ object JavaConfig { scheme.transform, maxNrOfRetries, withinTimeRange) } - class LifeCycle(@BeanProperty val scope: Scope, @BeanProperty val shutdownTime: Int, @BeanProperty val callbacks: RestartCallbacks) extends ConfigElement { - def this(scope: Scope, shutdownTime: Int) = this(scope, shutdownTime, null) + class LifeCycle(@BeanProperty val scope: Scope, @BeanProperty val callbacks: RestartCallbacks) extends ConfigElement { + def this(scope: Scope) = this(scope, null) def transform = { val callbackOption = if (callbacks == null) None else Some(callbacks.transform) - se.scalablesolutions.akka.config.ScalaConfig.LifeCycle(scope.transform, shutdownTime, callbackOption) + se.scalablesolutions.akka.config.ScalaConfig.LifeCycle(scope.transform, callbackOption) } } @@ -117,9 +112,6 @@ object JavaConfig { class Permanent extends Scope { override def transform = se.scalablesolutions.akka.config.ScalaConfig.Permanent } - class Transient extends Scope { - override def transform = se.scalablesolutions.akka.config.ScalaConfig.Transient - } class Temporary extends Scope { override def transform = se.scalablesolutions.akka.config.ScalaConfig.Temporary } diff --git a/akka-actors/src/test/scala/RemoteSupervisorTest.scala b/akka-actors/src/test/scala/RemoteSupervisorTest.scala index adbce545a1..5aefa0d0a1 100644 --- a/akka-actors/src/test/scala/RemoteSupervisorTest.scala +++ b/akka-actors/src/test/scala/RemoteSupervisorTest.scala @@ -4,9 +4,9 @@ package se.scalablesolutions.akka.actor -import akka.serialization.BinaryString -import nio.{RemoteClient, RemoteServer} -import config.ScalaConfig._ +import se.scalablesolutions.akka.serialization.BinaryString +import se.scalablesolutions.akka.nio.{RemoteClient, RemoteServer} +import se.scalablesolutions.akka.config.ScalaConfig._ import org.scalatest.junit.JUnitSuite import org.junit.Test @@ -473,7 +473,7 @@ class RemoteSupervisorTest extends JUnitSuite { RestartStrategy(AllForOne, 3, 100), Supervise( pingpong1, - LifeCycle(Permanent, 100)) + LifeCycle(Permanent)) :: Nil) } } @@ -490,7 +490,7 @@ class RemoteSupervisorTest extends JUnitSuite { RestartStrategy(OneForOne, 3, 100), Supervise( pingpong1, - LifeCycle(Permanent, 100)) + LifeCycle(Permanent)) :: Nil) } } @@ -511,15 +511,15 @@ class RemoteSupervisorTest extends JUnitSuite { RestartStrategy(AllForOne, 3, 100), Supervise( pingpong1, - LifeCycle(Permanent, 100)) + LifeCycle(Permanent)) :: Supervise( pingpong2, - LifeCycle(Permanent, 100)) + LifeCycle(Permanent)) :: Supervise( pingpong3, - LifeCycle(Permanent, 100)) + LifeCycle(Permanent)) :: Nil) } } @@ -540,15 +540,15 @@ class RemoteSupervisorTest extends JUnitSuite { RestartStrategy(OneForOne, 3, 100), Supervise( pingpong1, - LifeCycle(Permanent, 100)) + LifeCycle(Permanent)) :: Supervise( pingpong2, - LifeCycle(Permanent, 100)) + LifeCycle(Permanent)) :: Supervise( pingpong3, - LifeCycle(Permanent, 100)) + LifeCycle(Permanent)) :: Nil) } } @@ -569,17 +569,17 @@ class RemoteSupervisorTest extends JUnitSuite { RestartStrategy(AllForOne, 3, 100), Supervise( pingpong1, - LifeCycle(Permanent, 100)) + LifeCycle(Permanent)) :: SupervisorConfig( RestartStrategy(AllForOne, 3, 100), Supervise( pingpong2, - LifeCycle(Permanent, 100)) + LifeCycle(Permanent)) :: Supervise( pingpong3, - LifeCycle(Permanent, 100)) + LifeCycle(Permanent)) :: Nil) :: Nil) } diff --git a/akka-actors/src/test/scala/SupervisorTest.scala b/akka-actors/src/test/scala/SupervisorTest.scala index d62b68989b..7bba332e69 100644 --- a/akka-actors/src/test/scala/SupervisorTest.scala +++ b/akka-actors/src/test/scala/SupervisorTest.scala @@ -459,7 +459,7 @@ class SupervisorTest extends JUnitSuite { RestartStrategy(AllForOne, 3, 100), Supervise( pingpong1, - LifeCycle(Permanent, 100)) + LifeCycle(Permanent)) :: Nil) } } @@ -475,7 +475,7 @@ class SupervisorTest extends JUnitSuite { RestartStrategy(OneForOne, 3, 100), Supervise( pingpong1, - LifeCycle(Permanent, 100)) + LifeCycle(Permanent)) :: Nil) } } @@ -493,15 +493,15 @@ class SupervisorTest extends JUnitSuite { RestartStrategy(AllForOne, 3, 100), Supervise( pingpong1, - LifeCycle(Permanent, 100)) + LifeCycle(Permanent)) :: Supervise( pingpong2, - LifeCycle(Permanent, 100)) + LifeCycle(Permanent)) :: Supervise( pingpong3, - LifeCycle(Permanent, 100)) + LifeCycle(Permanent)) :: Nil) } } @@ -519,15 +519,15 @@ class SupervisorTest extends JUnitSuite { RestartStrategy(OneForOne, 3, 100), Supervise( pingpong1, - LifeCycle(Permanent, 100)) + LifeCycle(Permanent)) :: Supervise( pingpong2, - LifeCycle(Permanent, 100)) + LifeCycle(Permanent)) :: Supervise( pingpong3, - LifeCycle(Permanent, 100)) + LifeCycle(Permanent)) :: Nil) } } @@ -545,17 +545,17 @@ class SupervisorTest extends JUnitSuite { RestartStrategy(AllForOne, 3, 100), Supervise( pingpong1, - LifeCycle(Permanent, 100)) + LifeCycle(Permanent)) :: SupervisorConfig( RestartStrategy(AllForOne, 3, 100), Supervise( pingpong2, - LifeCycle(Permanent, 100)) + LifeCycle(Permanent)) :: Supervise( pingpong3, - LifeCycle(Permanent, 100)) + LifeCycle(Permanent)) :: Nil) :: Nil) } diff --git a/akka-amqp/src/main/scala/AMQP.scala b/akka-amqp/src/main/scala/AMQP.scala index f5bf5df96f..413475126f 100644 --- a/akka-amqp/src/main/scala/AMQP.scala +++ b/akka-amqp/src/main/scala/AMQP.scala @@ -422,7 +422,7 @@ object AMQP extends Actor { } trait FaultTolerantConnectionActor extends Actor { - lifeCycle = Some(LifeCycle(Permanent, 100)) + lifeCycle = Some(LifeCycle(Permanent)) val reconnectionTimer = new Timer diff --git a/akka-camel/src/test/scala/CamelSpec.scala b/akka-camel/src/test/scala/CamelSpec.scala index 7f9a546613..7934f69445 100644 --- a/akka-camel/src/test/scala/CamelSpec.scala +++ b/akka-camel/src/test/scala/CamelSpec.scala @@ -48,7 +48,7 @@ class CamelSpec extends Spec with ShouldMatchers { "camelfoo", classOf[CamelFoo], classOf[CamelFooImpl], - LifeCycle(Permanent, 1000), + LifeCycle(Permanent), 1000) :: Nil ).addRoutes(new RouteBuilder() { diff --git a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/ActiveObjectGuiceConfiguratorTest.java b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/ActiveObjectGuiceConfiguratorTest.java index 738fd765ba..82347669c1 100644 --- a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/ActiveObjectGuiceConfiguratorTest.java +++ b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/ActiveObjectGuiceConfiguratorTest.java @@ -40,14 +40,14 @@ public class ActiveObjectGuiceConfiguratorTest extends TestCase { new RestartStrategy(new AllForOne(), 3, 5000), new Component[]{ new Component( Foo.class, - new LifeCycle(new Permanent(), 1000), + new LifeCycle(new Permanent()), 1000, dispatcher), //new RemoteAddress("localhost", 9999)), new Component( Bar.class, BarImpl.class, - new LifeCycle(new Permanent(), 1000), + new LifeCycle(new Permanent()), 1000, dispatcher) }).inject().supervise(); diff --git a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemNestedStateTest.java b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemNestedStateTest.java index 48fff17cce..1d70324a1a 100644 --- a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemNestedStateTest.java +++ b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemNestedStateTest.java @@ -22,10 +22,10 @@ public class InMemNestedStateTest extends TestCase { new RestartStrategy(new AllForOne(), 3, 5000), new Component[]{ // FIXME: remove string-name, add ctor to only accept target class - new Component(InMemStateful.class, new LifeCycle(new Permanent(), 1000), 10000000), - new Component(InMemStatefulNested.class, new LifeCycle(new Permanent(), 1000), 10000000), - new Component(InMemFailer.class, new LifeCycle(new Permanent(), 1000), 1000) - //new Component("inmem-clasher", InMemClasher.class, InMemClasherImpl.class, new LifeCycle(new Permanent(), 1000), 100000) + new Component(InMemStateful.class, new LifeCycle(new Permanent()), 10000000), + new Component(InMemStatefulNested.class, new LifeCycle(new Permanent()), 10000000), + new Component(InMemFailer.class, new LifeCycle(new Permanent()), 1000) + //new Component("inmem-clasher", InMemClasher.class, InMemClasherImpl.class, new LifeCycle(new Permanent()), 100000) }).inject().supervise(); Config.config(); InMemStateful stateful = conf.getInstance(InMemStateful.class); diff --git a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemoryStateTest.java b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemoryStateTest.java index 430048908f..3dbe92ca75 100644 --- a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemoryStateTest.java +++ b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/InMemoryStateTest.java @@ -24,11 +24,11 @@ public class InMemoryStateTest extends TestCase { new RestartStrategy(new AllForOne(), 3, 5000), new Component[]{ new Component(InMemStateful.class, - new LifeCycle(new Permanent(), 1000), + new LifeCycle(new Permanent()), //new RestartCallbacks("preRestart", "postRestart")), 10000), new Component(InMemFailer.class, - new LifeCycle(new Permanent(), 1000), + new LifeCycle(new Permanent()), 10000) }).inject().supervise(); InMemStateful stateful = conf.getInstance(InMemStateful.class); 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 89b6ceab06..0dcb4ec992 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 @@ -23,10 +23,10 @@ public class PersistentNestedStateTest extends TestCase { new RestartStrategy(new AllForOne(), 3, 5000), new Component[]{ // FIXME: remove string-name, add ctor to only accept target class - new Component(PersistentStateful.class, new LifeCycle(new Permanent(), 1000), 10000000), - new Component(PersistentStatefulNested.class, new LifeCycle(new Permanent(), 1000), 10000000), - new Component(PersistentFailer.class, new LifeCycle(new Permanent(), 1000), 1000) - //new Component("inmem-clasher", InMemClasher.class, InMemClasherImpl.class, new LifeCycle(new Permanent(), 1000), 100000) + new Component(PersistentStateful.class, new LifeCycle(new Permanent()), 10000000), + new Component(PersistentStatefulNested.class, new LifeCycle(new Permanent()), 10000000), + new Component(PersistentFailer.class, new LifeCycle(new Permanent()), 1000) + //new Component("inmem-clasher", InMemClasher.class, InMemClasherImpl.class, new LifeCycle(new Permanent()), 100000) }).inject().supervise(); } diff --git a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateTest.java b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateTest.java index b7641868d0..23f8eb1070 100644 --- a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateTest.java +++ b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateTest.java @@ -19,9 +19,9 @@ public class PersistentStateTest extends TestCase { conf.configure( new RestartStrategy(new AllForOne(), 3, 5000), new Component[] { - new Component(PersistentStateful.class, new LifeCycle(new Permanent(), 1000), 10000000), - new Component(PersistentFailer.class, new LifeCycle(new Permanent(), 1000), 1000) - //new Component(PersistentClasher.class, new LifeCycle(new Permanent(), 1000), 100000) + new Component(PersistentStateful.class, new LifeCycle(new Permanent()), 10000000), + new Component(PersistentFailer.class, new LifeCycle(new Permanent()), 1000) + //new Component(PersistentClasher.class, new LifeCycle(new Permanent()), 100000) }).supervise(); } diff --git a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/RemotePersistentStateTest.java b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/RemotePersistentStateTest.java index e81f28f562..9568d6a6f1 100644 --- a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/RemotePersistentStateTest.java +++ b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/RemotePersistentStateTest.java @@ -19,8 +19,8 @@ public class RemotePersistentStateTest extends TestCase { conf.configure( new RestartStrategy(new AllForOne(), 3, 5000), new Component[] { - new Component(PersistentStateful.class, new LifeCycle(new Permanent(), 1000), 1000000, new RemoteAddress("localhost", 9999)), - new Component(PersistentFailer.class, new LifeCycle(new Permanent(), 1000), 1000000, new RemoteAddress("localhost", 9999)) + new Component(PersistentStateful.class, new LifeCycle(new Permanent()), 1000000, new RemoteAddress("localhost", 9999)), + new Component(PersistentFailer.class, new LifeCycle(new Permanent()), 1000000, new RemoteAddress("localhost", 9999)) }).supervise(); } diff --git a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/RestTest.java b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/RestTest.java index c92735dba0..b6d6ef06dc 100644 --- a/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/RestTest.java +++ b/akka-fun-test-java/src/test/java/se/scalablesolutions/akka/api/RestTest.java @@ -36,7 +36,7 @@ public class RestTest extends TestCase { new Component[] { new Component( JerseyFoo.class, - new LifeCycle(new Permanent(), 1000), + new LifeCycle(new Permanent()), 10000000) }).inject().supervise(); selector = startJersey(); diff --git a/akka-samples-java/src/main/java/sample/java/Boot.java b/akka-samples-java/src/main/java/sample/java/Boot.java index f610316d16..55a3de1c1f 100644 --- a/akka-samples-java/src/main/java/sample/java/Boot.java +++ b/akka-samples-java/src/main/java/sample/java/Boot.java @@ -12,11 +12,11 @@ public class Boot { new Component[] { new Component( sample.java.SimpleService.class, - new LifeCycle(new Permanent(), 1000), + new LifeCycle(new Permanent()), 1000), new Component( sample.java.PersistentSimpleService.class, - new LifeCycle(new Permanent(), 1000), + new LifeCycle(new Permanent()), 1000) }).supervise(); } diff --git a/akka-samples-lift/src/main/scala/bootstrap/liftweb/Boot.scala b/akka-samples-lift/src/main/scala/bootstrap/liftweb/Boot.scala index b6928ebbcf..ae32e277b6 100644 --- a/akka-samples-lift/src/main/scala/bootstrap/liftweb/Boot.scala +++ b/akka-samples-lift/src/main/scala/bootstrap/liftweb/Boot.scala @@ -43,10 +43,10 @@ class Boot { RestartStrategy(OneForOne, 3, 100), Supervise( new SimpleService, - LifeCycle(Permanent, 100)) :: + LifeCycle(Permanent)) :: Supervise( new PersistentSimpleService, - LifeCycle(Permanent, 100)) :: + LifeCycle(Permanent)) :: Nil) } } diff --git a/akka-samples-scala/src/main/scala/SimpleService.scala b/akka-samples-scala/src/main/scala/SimpleService.scala index 9ca6ac03ec..6cb6ed0b8f 100644 --- a/akka-samples-scala/src/main/scala/SimpleService.scala +++ b/akka-samples-scala/src/main/scala/SimpleService.scala @@ -24,13 +24,13 @@ class Boot { RestartStrategy(OneForOne, 3, 100), Supervise( new SimpleService, - LifeCycle(Permanent, 100)) :: + LifeCycle(Permanent)) :: Supervise( new Chat, - LifeCycle(Permanent, 100)) :: + LifeCycle(Permanent)) :: Supervise( new PersistentSimpleService, - LifeCycle(Permanent, 100)) + LifeCycle(Permanent)) :: Nil) } } diff --git a/akka-samples-security/src/main/scala/SimpleService.scala b/akka-samples-security/src/main/scala/SimpleService.scala index 827f3ad8c1..05bbd75f7b 100644 --- a/akka-samples-security/src/main/scala/SimpleService.scala +++ b/akka-samples-security/src/main/scala/SimpleService.scala @@ -21,18 +21,18 @@ class Boot { // see akka.conf to enable one of these for the AkkaSecurityFilterFactory Supervise( new BasicAuthenticationService, - LifeCycle(Permanent, 100)) :: + LifeCycle(Permanent)) :: /** Supervise( new DigestAuthenticationService, - LifeCycle(Permanent, 100)) :: + LifeCycle(Permanent)) :: Supervise( new SpnegoAuthenticationService, - LifeCycle(Permanent, 100)) :: + LifeCycle(Permanent)) :: **/ Supervise( new SecureTickActor, - LifeCycle(Permanent, 100)):: Nil) + LifeCycle(Permanent)):: Nil) } } diff --git a/akka.ipr b/akka.ipr index b1f20c7e6b..f307e71344 100644 --- a/akka.ipr +++ b/akka.ipr @@ -989,17 +989,6 @@ - - - - - - - - - - - @@ -1165,17 +1154,6 @@ - - - - - - - - - - - @@ -1264,17 +1242,6 @@ - - - - - - - - - - - @@ -1339,6 +1306,13 @@ + + + + + + + @@ -1348,6 +1322,13 @@ + + + + + + + @@ -1357,6 +1338,13 @@ + + + + + + + @@ -1381,17 +1369,6 @@ - - - - - - - - - - - @@ -1447,6 +1424,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/akka.iws b/akka.iws index 9dbd34f457..4b9d942599 100644 --- a/akka.iws +++ b/akka.iws @@ -6,12 +6,33 @@ + + + + + + + + + + + + + + - - + + + + + + + + + - +