diff --git a/akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala index 50527ef4b5..fb8e997eb4 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/ActorRefSpec.scala @@ -284,7 +284,8 @@ class ActorRefSpec extends AkkaSpec { val baos = new ByteArrayOutputStream(8192 * 32) val out = new ObjectOutputStream(baos) - val serialized = SerializedActorRef(system.root.remoteAddress.hostname, system.root.remoteAddress.port, "/this/path/does/not/exist") + val addr = system.rootPath.remoteAddress + val serialized = SerializedActorRef(addr.hostname, addr.port, "/this/path/does/not/exist") out.writeObject(serialized) diff --git a/akka-actor/src/main/scala/akka/actor/ActorPath.scala b/akka-actor/src/main/scala/akka/actor/ActorPath.scala index 446e8f43c5..2dfa8b122a 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorPath.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorPath.scala @@ -21,7 +21,7 @@ object ActorPath { * Create an actor path from an iterable. */ def apply(app: ActorSystem, path: Iterable[String]): ActorPath = - path.foldLeft(app.root)(_ / _) + path.foldLeft(app.rootPath)(_ / _) /** * Split a string path into an iterable. diff --git a/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala b/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala index d78ffcab0c..09aef9b570 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorRefProvider.scala @@ -127,7 +127,7 @@ class ActorRefProviderException(message: String) extends AkkaException(message) */ class LocalActorRefProvider( val AkkaConfig: ActorSystem.AkkaConfig, - val root: ActorPath, + val rootPath: ActorPath, val eventStream: EventStream, val dispatcher: MessageDispatcher, val scheduler: Scheduler) extends ActorRefProvider { @@ -151,7 +151,7 @@ class LocalActorRefProvider( val l = tempNumber.getAndIncrement() "$_" + Helpers.base64(l) } - private val tempNode = root / "tmp" + private val tempNode = rootPath / "tmp" def tempPath = tempNode / tempName // FIXME (actor path): this could become a cache for the new tree traversal actorFor @@ -169,7 +169,7 @@ class LocalActorRefProvider( val name = "bubble-walker" // FIXME (actor path): move the root path to the new root guardian - val path = root / name + val path = rootPath / name val address = path.toString @@ -232,7 +232,7 @@ class LocalActorRefProvider( val deathWatch = createDeathWatch() def init(app: ActorSystemImpl) { - rootGuardian = actorOf(app, guardianProps, theOneWhoWalksTheBubblesOfSpaceTime, root, true) + rootGuardian = actorOf(app, guardianProps, theOneWhoWalksTheBubblesOfSpaceTime, rootPath, true) guardian = actorOf(app, guardianProps, rootGuardian, "app", true) systemGuardian = actorOf(app, guardianProps.withCreator(new SystemGuardian), rootGuardian, "sys", true) // chain death watchers so that killing guardian stops the application @@ -344,7 +344,7 @@ class LocalActorRefProvider( } private[akka] def deserialize(actor: SerializedActorRef): Option[ActorRef] = actorFor(ActorPath.split(actor.path)) - private[akka] def serialize(actor: ActorRef): SerializedActorRef = new SerializedActorRef(root.remoteAddress, actor.path.toString) + private[akka] def serialize(actor: ActorRef): SerializedActorRef = new SerializedActorRef(rootPath.remoteAddress, actor.path.toString) private[akka] def createDeathWatch(): DeathWatch = new LocalDeathWatch diff --git a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala index d0a344564f..70664c9f46 100644 --- a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala +++ b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala @@ -140,7 +140,7 @@ abstract class ActorSystem extends ActorRefFactory with TypedActorFactory { * Construct a path below the application guardian. */ def /(name: String): ActorPath - def root: ActorPath + def rootPath: ActorPath val startTime = System.currentTimeMillis def uptime = (System.currentTimeMillis - startTime) / 1000 @@ -193,9 +193,9 @@ class ActorSystemImpl(val name: String, config: Configuration) extends ActorSyst /** * The root actor path for this application. */ - val root: ActorPath = new RootActorPath(address) + val rootPath: ActorPath = new RootActorPath(address) - val deadLetters = new DeadLetterActorRef(eventStream, root / "nul") + val deadLetters = new DeadLetterActorRef(eventStream, rootPath / "nul") val deadLetterMailbox = new Mailbox(null) { becomeClosed() override def dispatcher = null //MessageDispatcher.this @@ -223,7 +223,7 @@ class ActorSystemImpl(val name: String, config: Configuration) extends ActorSyst } val arguments = List( classOf[AkkaConfig] -> AkkaConfig, - classOf[ActorPath] -> root, + classOf[ActorPath] -> rootPath, classOf[EventStream] -> eventStream, classOf[MessageDispatcher] -> dispatcher, classOf[Scheduler] -> scheduler) diff --git a/akka-remote/src/main/scala/akka/remote/Gossiper.scala b/akka-remote/src/main/scala/akka/remote/Gossiper.scala index 9873d7960e..415056893c 100644 --- a/akka-remote/src/main/scala/akka/remote/Gossiper.scala +++ b/akka-remote/src/main/scala/akka/remote/Gossiper.scala @@ -107,7 +107,7 @@ class Gossiper(remote: Remote) { private val connectionManager = new RemoteConnectionManager(app, remote, Map.empty[RemoteAddress, ActorRef]) private val seeds = Set(address) // FIXME read in list of seeds from config - private val address = app.root.remoteAddress + private val address = app.rootPath.remoteAddress private val nodeFingerprint = address.## private val random = SecureRandom.getInstance("SHA1PRNG") diff --git a/akka-remote/src/main/scala/akka/remote/Remote.scala b/akka-remote/src/main/scala/akka/remote/Remote.scala index dd005a2e15..6d1461b43d 100644 --- a/akka-remote/src/main/scala/akka/remote/Remote.scala +++ b/akka-remote/src/main/scala/akka/remote/Remote.scala @@ -81,7 +81,7 @@ class Remote(val app: ActorSystemImpl, val nodename: String) { } def start(): Unit = { - val serverAddress = server.app.root.remoteAddress //Force init of server + val serverAddress = server.app.rootPath.remoteAddress //Force init of server val daemonAddress = remoteDaemon.address //Force init of daemon log.info("Starting remote server on [{}] and starting remoteDaemon with address [{}]", serverAddress, daemonAddress) } diff --git a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala index f2d334cf3a..cdb12d883c 100644 --- a/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala +++ b/akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala @@ -30,7 +30,7 @@ import akka.event.EventStream */ class RemoteActorRefProvider( val AkkaConfig: ActorSystem.AkkaConfig, - val root: ActorPath, + val rootPath: ActorPath, val eventStream: EventStream, val dispatcher: MessageDispatcher, val scheduler: Scheduler) extends ActorRefProvider { @@ -40,7 +40,7 @@ class RemoteActorRefProvider( import java.util.concurrent.ConcurrentHashMap import akka.dispatch.Promise - val local = new LocalActorRefProvider(AkkaConfig, root, eventStream, dispatcher, scheduler) + val local = new LocalActorRefProvider(AkkaConfig, rootPath, eventStream, dispatcher, scheduler) def deathWatch = local.deathWatch def guardian = local.guardian def systemGuardian = local.systemGuardian @@ -194,11 +194,11 @@ class RemoteActorRefProvider( private[akka] def deserialize(actor: SerializedActorRef): Option[ActorRef] = { val remoteAddress = RemoteAddress(actor.hostname, actor.port) - if (optimizeLocalScoped_? && remoteAddress == root.remoteAddress) { + if (optimizeLocalScoped_? && remoteAddress == rootPath.remoteAddress) { local.actorFor(ActorPath.split(actor.path)) } else { - log.debug("{}: Creating RemoteActorRef with address [{}] connected to [{}]", root.remoteAddress, actor.path, remoteAddress) - Some(RemoteActorRef(remote.app.provider, remote.server, remoteAddress, root / ActorPath.split(actor.path), None)) //Should it be None here + log.debug("{}: Creating RemoteActorRef with address [{}] connected to [{}]", rootPath.remoteAddress, actor.path, remoteAddress) + Some(RemoteActorRef(remote.app.provider, remote.server, remoteAddress, rootPath / ActorPath.split(actor.path), None)) //Should it be None here } } @@ -206,7 +206,7 @@ class RemoteActorRefProvider( * Using (checking out) actor on a specific node. */ def useActorOnNode(app: ActorSystem, remoteAddress: RemoteAddress, actorPath: String, actorFactory: () ⇒ Actor) { - log.debug("[{}] Instantiating Actor [{}] on node [{}]", root, actorPath, remoteAddress) + log.debug("[{}] Instantiating Actor [{}] on node [{}]", rootPath, actorPath, remoteAddress) val actorFactoryBytes = app.serialization.serialize(actorFactory) match { diff --git a/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala b/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala index 51e2a33b8c..996e38b44d 100644 --- a/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala +++ b/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala @@ -147,7 +147,7 @@ class ActiveRemoteClient private[akka] ( def sendSecureCookie(connection: ChannelFuture) { val handshake = RemoteControlProtocol.newBuilder.setCommandType(CommandType.CONNECT) if (SECURE_COOKIE.nonEmpty) handshake.setCookie(SECURE_COOKIE.get) - val addr = remoteSupport.app.root.remoteAddress + val addr = remoteSupport.app.rootPath.remoteAddress handshake.setOrigin(RemoteProtocol.AddressProtocol.newBuilder.setHostname(addr.hostname).setPort(addr.port).build) connection.getChannel.write(remoteSupport.createControlEnvelope(handshake.build)) } @@ -429,7 +429,7 @@ class NettyRemoteSupport(_app: ActorSystem) extends RemoteSupport(_app) with Rem def name = currentServer.get match { case Some(server) ⇒ server.name - case None ⇒ "Non-running NettyRemoteServer@" + app.root.remoteAddress + case None ⇒ "Non-running NettyRemoteServer@" + app.rootPath.remoteAddress } private val _isRunning = new Switch(false) @@ -461,7 +461,7 @@ class NettyRemoteServer(val remoteSupport: NettyRemoteSupport, val loader: Optio val log = Logging(remoteSupport.app, this) import remoteSupport.serverSettings._ - val address = remoteSupport.app.root.remoteAddress + val address = remoteSupport.app.rootPath.remoteAddress val name = "NettyRemoteServer@" + address