Merge remote-tracking branch 'origin/master' into wip-1644-programmatic-deploy-∂π

akka-remote/src/main/scala/akka/remote/RemoteActorRefProvider.scala

@@ -4,6 +4,7 @@
 
 package akka.remote
 
+import akka.AkkaException
 import akka.actor._
 import akka.dispatch._
 import akka.event.{ DeathWatch, Logging, LoggingAdapter }
@@ -15,6 +16,10 @@ import akka.util.ReflectiveAccess
 import akka.serialization.Serialization
 import akka.serialization.SerializationExtension
 
+class RemoteException(msg: String) extends AkkaException(msg)
+class RemoteCommunicationException(msg: String) extends RemoteException(msg)
+class RemoteConnectionException(msg: String) extends RemoteException(msg)
+
 /**
  * Remote ActorRefProvider. Starts up actor on remote node and creates a RemoteActorRef representing it.
  */
@@ -41,8 +46,6 @@ class RemoteActorRefProvider(
 
   val deathWatch = new RemoteDeathWatch(local.deathWatch, this)
 
-  val failureDetector = new AccrualFailureDetector(remoteSettings.FailureDetectorThreshold, remoteSettings.FailureDetectorMaxSampleSize)
-
   // these are only available after init()
   def rootGuardian = local.rootGuardian
   def guardian = local.guardian
@@ -66,10 +69,6 @@ class RemoteActorRefProvider(
   private var _remoteDaemon: InternalActorRef = _
   def remoteDaemon = _remoteDaemon
 
-  @volatile
-  private var _networkEventStream: NetworkEventStream = _
-  def networkEventStream = _networkEventStream
-
   def init(system: ActorSystemImpl) {
     local.init(system)
 
@@ -78,9 +77,6 @@ class RemoteActorRefProvider(
 
     _serialization = SerializationExtension(system)
 
-    _networkEventStream = new NetworkEventStream(system)
-    system.eventStream.subscribe(networkEventStream.sender, classOf[RemoteLifeCycleEvent])
-
     _transport = {
       val fqn = remoteSettings.RemoteTransport
       val args = Seq(