Removing actors-migration from main repository so it can live on elsewhere.

* Removes actors-migration hooks from partest
* Removes actors-migration code
* removes actors-migration tests
* removes actors-migration distribution packaging.

16 files changed, 3 insertions, 501 deletions

diff --git a/src/actors-migration/scala/actors/migration/ActorDSL.scala b/src/actors-migration/scala/actors/migration/ActorDSL.scala
deleted file mode 100644
index b8cb8ec998..0000000000
--- a/src/actors-migration/scala/actors/migration/ActorDSL.scala
+++ /dev/null
@@ -1,56 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2005-2011, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |    http://scala-lang.org/               **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-package scala.actors
-package migration
-
-import scala.actors.{ Actor, ActorRef, InternalActorRef }
-import scala.collection.immutable
-import scala.reflect.ClassTag
-
-object ActorDSL {
-
-  private[migration] val contextStack = new ThreadLocal[immutable.Stack[Boolean]] {
-    override def initialValue() = immutable.Stack[Boolean]()
-  }
-
-  private[this] def withCleanContext(block: => ActorRef): ActorRef = {
-    // push clean marker
-    val old = contextStack.get
-    contextStack.set(old.push(true))
-    try {
-      val instance = block
-
-      if (instance eq null)
-        throw new Exception("ActorRef can't be 'null'")
-
-      instance
-    } finally {
-      val stackAfter = contextStack.get
-      if (stackAfter.nonEmpty)
-        contextStack.set(if (!stackAfter.head) stackAfter.pop.pop else stackAfter.pop)
-    }
-  }
-  
-  /**
-   * Create an actor from the given thunk which must produce an [[scala.actors.Actor]].
-   *
-   * @param ctor is a by-name argument which captures an [[scala.actors.Actor]]
-   *        factory; <b>do not make the generated object accessible to code
-   *        outside and do not return the same object upon subsequent invocations.</b>
-   */
-  def actor[T <: InternalActor: ClassTag](ctor: ⇒ T): ActorRef = {
-    withCleanContext {
-      val newActor = ctor
-      val newRef = new InternalActorRef(newActor)
-      newActor.start()
-      newRef
-    }
-  }
-
-}
diff --git a/src/actors-migration/scala/actors/migration/Pattern.scala b/src/actors-migration/scala/actors/migration/Pattern.scala
deleted file mode 100644
index 25ba191ce7..0000000000
--- a/src/actors-migration/scala/actors/migration/Pattern.scala
+++ /dev/null
@@ -1,27 +0,0 @@
-package scala.actors.migration
-
-import scala.actors._
-import scala.concurrent.duration.Duration
-import language.implicitConversions
-
-object pattern {
-
-  implicit def ask(ar: ActorRef): AskableActorRef =
-    new AskableActorRef(ar)
-}
-
-/**
- * ActorRef with support for ask(?) operation.
- */
-class AskableActorRef(val ar: ActorRef) extends ActorRef {
-
-  def !(message: Any)(implicit sender: ActorRef = null): Unit = ar.!(message)(sender)
-
-  def ?(message: Any)(implicit timeout: Timeout): scala.concurrent.Future[Any] = ar.?(message, timeout.duration)
-
-  private[actors] def ?(message: Any, timeout: Duration): scala.concurrent.Future[Any] = ar.?(message, timeout)
-
-  def forward(message: Any) = ar.forward(message)
-
-  private[actors] def localActor: AbstractActor = ar.localActor
-}
diff --git a/src/actors-migration/scala/actors/migration/Props.scala b/src/actors-migration/scala/actors/migration/Props.scala
deleted file mode 100644
index 00bc9d93f8..0000000000
--- a/src/actors-migration/scala/actors/migration/Props.scala
+++ /dev/null
@@ -1,14 +0,0 @@
-package scala.actors.migration
-
-import scala.actors._
-
-/**
- * ActorRef configuration object. It represents the minimal subset of Akka Props class.
- */
-case class Props(creator: () ⇒ InternalActor, dispatcher: String) {
-
-  /**
-   * Returns a new Props with the specified creator set
-   */
-  final def withCreator(c: ⇒ InternalActor) = copy(creator = () ⇒ c)
-}
diff --git a/src/actors-migration/scala/actors/migration/StashingActor.scala b/src/actors-migration/scala/actors/migration/StashingActor.scala
deleted file mode 100644
index 12bad2ed1c..0000000000
--- a/src/actors-migration/scala/actors/migration/StashingActor.scala
+++ /dev/null
@@ -1,257 +0,0 @@
-package scala.actors.migration
-
-import scala.actors._
-import scala.actors.Actor._
-import scala.collection._
-import scala.concurrent.duration.Duration
-import java.util.concurrent.TimeUnit
-import scala.language.implicitConversions
-
-object StashingActor extends Combinators {
-  implicit def mkBody[A](body: => A) = new InternalActor.Body[A] {
-    def andThen[B](other: => B): Unit = Actor.rawSelf.seq(body, other)
-  }
-}
-
-@deprecated("Scala Actors are being removed from the standard library. Please refer to the migration guide.", "2.10.0")
-trait StashingActor extends InternalActor {
-  type Receive = PartialFunction[Any, Unit]
-
-  // checks if StashingActor is created within the actorOf block
-  creationCheck()
-
-  private[actors] val ref = new InternalActorRef(this)
-
-  val self: ActorRef = ref
-
-  protected[this] val context: ActorContext = new ActorContext(this)
-
-  @volatile
-  private var myTimeout: Option[Long] = None
-
-  private val stash = new MQueue[Any]("Stash")
-
-  /**
-   * Migration notes:
-   *   this method replaces receiveWithin, receive and react methods from Scala Actors.
-   */
-  def receive: Receive
-
-  /**
-   * User overridable callback.
-   * <p/>
-   * Is called when an Actor is started by invoking 'actor'.
-   */
-  def preStart() {}
-
-  /**
-   * User overridable callback.
-   * <p/>
-   * Is called when 'actor.stop()' is invoked.
-   */
-  def postStop() {}
-
-  /**
-   * User overridable callback.
-   * <p/>
-   * Is called on a crashed Actor right BEFORE it is restarted to allow clean
-   * up of resources before Actor is terminated.
-   * By default it calls postStop()
-   */
-  def preRestart(reason: Throwable, message: Option[Any]) { postStop() }
-
-  /**
-   * Changes the Actor's behavior to become the new 'Receive' (PartialFunction[Any, Unit]) handler.
-   * Puts the behavior on top of the hotswap stack.
-   * If "discardOld" is true, an unbecome will be issued prior to pushing the new behavior to the stack
-   */
-  private def become(behavior: Receive, discardOld: Boolean = true) {
-    if (discardOld) unbecome()
-    behaviorStack = behaviorStack.push(wrapWithSystemMessageHandling(behavior))
-  }
-
-  /**
-   * Reverts the Actor behavior to the previous one in the hotswap stack.
-   */
-  private def unbecome() {
-    // never unbecome the initial behavior
-    if (behaviorStack.size > 1)
-      behaviorStack = behaviorStack.pop
-  }
-
-  /**
-   * User overridable callback.
-   * <p/>
-   * Is called when a message isn't handled by the current behavior of the actor
-   * by default it does: EventHandler.warning(self, message)
-   */
-  def unhandled(message: Any) {
-    message match {
-      case Terminated(dead) ⇒ throw new DeathPactException(dead)
-      case _                ⇒ System.err.println("Unhandeled message " + message)
-    }
-  }
-
-  protected def sender: ActorRef = new OutputChannelRef(internalSender)
-
-  override def act(): Unit = internalAct()
-
-  override def start(): StashingActor = {
-    super.start()
-    this
-  }
-
-  override def receive[R](f: PartialFunction[Any, R]): R
-
-  /*
-   * Internal implementation.
-   */
-
-  private[actors] var behaviorStack = immutable.Stack[PartialFunction[Any, Unit]]()
-
-  /*
-   * Checks that StashingActor instances can only be created using the ActorDSL.
-   */
-  private[this] def creationCheck(): Unit = {
-    // creation check (see ActorRef)
-    val context = ActorDSL.contextStack.get
-    if (context.isEmpty)
-      throw new RuntimeException("In order to create a StashingActor one must use the ActorDSL object")
-    else {
-      if (!context.head)
-        throw new RuntimeException("Cannot create more than one actor")
-      else
-        ActorDSL.contextStack.set(context.push(false))
-    }
-
-  }
-
-  private[actors] override def preAct() {
-    preStart()
-  }
-
-  /**
-   * Adds message to a stash, to be processed later. Stashed messages can be fed back into the $actor's
-   *  mailbox using <code>unstashAll()</code>.
-   *
-   *  Temporarily stashing away messages that the $actor does not (yet) handle simplifies implementing
-   *  certain messaging protocols.
-   */
-  final def stash(msg: Any): Unit = {
-    stash.append(msg, null)
-  }
-
-  final def unstashAll(): Unit = {
-    mailbox.prepend(stash)
-    stash.clear()
-  }
-
-  /**
-   * Wraps any partial function with Exit message handling.
-   */
-  private[actors] def wrapWithSystemMessageHandling(pf: PartialFunction[Any, Unit]): PartialFunction[Any, Unit] = {
-
-    def swapExitHandler(pf: PartialFunction[Any, Unit]) = new PartialFunction[Any, Unit] {
-      def swapExit(v: Any) = v match {
-        case Exit(from, reason) =>
-          Terminated(new InternalActorRef(from.asInstanceOf[InternalActor]))
-        case v => v
-      }
-
-      def isDefinedAt(v: Any) = pf.isDefinedAt(swapExit(v))
-      def apply(v: Any) = pf(swapExit(v))
-    }
-
-    swapExitHandler(pf orElse {
-      case m => unhandled(m)
-    })
-  }
-
-  /**
-   * Method that models the behavior of Akka actors.
-   */
-  private[actors] def internalAct() {
-    trapExit = true
-    behaviorStack = behaviorStack.push(wrapWithSystemMessageHandling(receive))
-    loop {
-      if (myTimeout.isDefined)
-        reactWithin(myTimeout.get)(behaviorStack.top)
-      else
-        react(behaviorStack.top)
-    }
-  }
-
-  private[actors] override def internalPostStop() = postStop()
-
-  // Used for pattern matching statement similar to Akka
-  lazy val ReceiveTimeout = TIMEOUT
-
-  /**
-   * Used to simulate Akka context behavior. Should be used only for migration purposes.
-   */
-  protected[actors] class ActorContext(val actr: StashingActor) {
-
-    /**
-     * Changes the Actor's behavior to become the new 'Receive' (PartialFunction[Any, Unit]) handler.
-     * Puts the behavior on top of the hotswap stack.
-     * If "discardOld" is true, an unbecome will be issued prior to pushing the new behavior to the stack
-     */
-    def become(behavior: Receive, discardOld: Boolean = true) = actr.become(behavior, discardOld)
-
-    /**
-     * Reverts the Actor behavior to the previous one in the hotswap stack.
-     */
-    def unbecome() = actr.unbecome()
-
-    /**
-     * Shuts down the actor its dispatcher and message queue.
-     */
-    def stop(subject: ActorRef): Nothing = if (subject != ref)
-      throw new RuntimeException("Only stoping of self is allowed during migration.")
-    else
-      actr.exit()
-
-    /**
-     * Registers this actor as a Monitor for the provided ActorRef.
-     * @return the provided ActorRef
-     */
-    def watch(subject: ActorRef): ActorRef = {
-      actr.watch(subject)
-      subject
-    }
-
-    /**
-     * Unregisters this actor as Monitor for the provided ActorRef.
-     * @return the provided ActorRef
-     */
-    def unwatch(subject: ActorRef): ActorRef = {
-      actr unwatch subject
-      subject
-    }
-
-    /**
-     * Defines the receiver timeout value.
-     */
-    final def setReceiveTimeout(timeout: Duration): Unit =
-      actr.myTimeout = Some(timeout.toMillis)
-
-    /**
-     * Gets the current receiveTimeout
-     */
-    final def receiveTimeout: Option[Duration] =
-      actr.myTimeout.map(Duration(_, TimeUnit.MILLISECONDS))
-
-  }
-}
-
-/**
- * This message is thrown by default when an Actor does not handle termination.
- */
-class DeathPactException(ref: ActorRef = null) extends Exception {
-  override def fillInStackTrace() = this //Don't waste cycles generating stack trace
-}
-
-/**
- * Message that is sent to a watching actor when the watched actor terminates.
- */
-case class Terminated(actor: ActorRef)
diff --git a/src/actors-migration/scala/actors/migration/Timeout.scala b/src/actors-migration/scala/actors/migration/Timeout.scala
deleted file mode 100644
index 32ea5f20fc..0000000000
--- a/src/actors-migration/scala/actors/migration/Timeout.scala
+++ /dev/null
@@ -1,40 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2005-2011, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |    http://scala-lang.org/               **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-package scala.actors.migration
-
-import scala.concurrent.duration.Duration
-import java.util.concurrent.TimeUnit
-import scala.language.implicitConversions
-
-case class Timeout(duration: Duration) {
-  def this(timeout: Long) = this(Duration(timeout, TimeUnit.MILLISECONDS))
-  def this(length: Long, unit: TimeUnit) = this(Duration(length, unit))
-}
-
-object Timeout {
-
-  /**
-   * A timeout with zero duration, will cause most requests to always timeout.
-   */
-  val zero = new Timeout(Duration.Zero)
-
-  /**
-   * A Timeout with infinite duration. Will never timeout. Use extreme caution with this
-   * as it may cause memory leaks, blocked threads, or may not even be supported by
-   * the receiver, which would result in an exception.
-   */
-  val never = new Timeout(Duration.Inf)
-
-  def apply(timeout: Long) = new Timeout(timeout)
-  def apply(length: Long, unit: TimeUnit) = new Timeout(length, unit)
-
-  implicit def durationToTimeout(duration: Duration) = new Timeout(duration)
-  implicit def intToTimeout(timeout: Int) = new Timeout(timeout)
-  implicit def longToTimeout(timeout: Long) = new Timeout(timeout)
-}
diff --git a/src/build/bnd/scala-actors-migration.bnd b/src/build/bnd/scala-actors-migration.bnd
deleted file mode 100644
index 2cddfb620a..0000000000
--- a/src/build/bnd/scala-actors-migration.bnd
+++ /dev/null
@@ -1,5 +0,0 @@
-Bundle-Name: Scala Actors Migration
-Bundle-SymbolicName: org.scala-lang.scala-actors-migration
-ver: @VERSION@
-Bundle-Version: ${ver}
-Export-Package: *;version=${ver}
diff --git a/src/build/maven/maven-deploy.xml b/src/build/maven/maven-deploy.xml
index 131358f0f3..bd946bf0f3 100644
--- a/src/build/maven/maven-deploy.xml
+++ b/src/build/maven/maven-deploy.xml
@@ -113,7 +113,6 @@
         <deploy-local-plugin name="continuations" version="@{version}" repository="@{repository}"/>
         <deploy-local name="scala-reflect" version="@{version}" repository="@{repository}" />
         <deploy-local name="scala-actors" version="@{version}" repository="@{repository}" />
-        <deploy-local name="scala-actors-migration" version="@{version}" repository="@{repository}" />
         <deploy-local name="scala-swing" version="@{version}" repository="@{repository}"/>
         <deploy-local name="scalap" version="@{version}" repository="@{repository}"/>
         <deploy-local name="scala-partest" version="@{version}" repository="@{repository}"/>
@@ -175,7 +174,6 @@
         <deploy-remote name="scala-compiler" version="@{version}" repository="@{repository}" />
         <deploy-remote name="scala-swing" version="@{version}" repository="@{repository}"/>
         <deploy-remote name="scala-actors" version="@{version}" repository="@{repository}"/>
-        <deploy-remote name="scala-actors-migration" version="@{version}" repository="@{repository}"/>
         <deploy-remote name="scalap" version="@{version}" repository="@{repository}"/>
         <deploy-remote name="scala-partest" version="@{version}" repository="@{repository}"/>
         <deploy-remote-plugin name="continuations" version="@{version}" repository="@{repository}"/> 
@@ -244,7 +242,6 @@
         <deploy-remote-signed name="scala-compiler" version="@{version}" repository="@{repository}" />
         <deploy-remote-signed name="scala-swing" version="@{version}" repository="@{repository}"/>
         <deploy-remote-signed name="scala-actors" version="@{version}" repository="@{repository}"/>
-        <deploy-remote-signed name="scala-actors-migration" version="@{version}" repository="@{repository}"/>
         <deploy-remote-signed name="scalap" version="@{version}" repository="@{repository}"/>
         <deploy-remote-signed name="scala-partest" version="@{version}" repository="@{repository}"/>
       </sequential>
diff --git a/src/build/maven/scala-actors-migration-pom.xml b/src/build/maven/scala-actors-migration-pom.xml
deleted file mode 100644
index 93fc34ece9..0000000000
--- a/src/build/maven/scala-actors-migration-pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<project
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-        <modelVersion>4.0.0</modelVersion>
-        <groupId>org.scala-lang</groupId>
-        <artifactId>scala-actors-migration</artifactId>
-        <packaging>jar</packaging>
-        <version>@VERSION@</version>
-  <name>Scala Migration Kit</name>
-  <description>Migration kit that enables easy transition from the Scala Actors to Akka.</description>
-  <url>http://www.scala-lang.org/</url>
-  <inceptionYear>2012</inceptionYear>
-  <organization>
-      <name>LAMP/EPFL</name>
-      <url>http://lamp.epfl.ch/</url>
-   </organization>
-   <licenses>
-      <license>
-         <name>BSD-like</name>
-         <url>http://www.scala-lang.org/downloads/license.html
-         </url>
-         <distribution>repo</distribution>
-      </license>
-   </licenses>
-   <scm>
-      <connection>scm:git:git://github.com/scala/scala.git</connection>
-      <url>https://github.com/scala/scala.git</url>
-   </scm>
-   <issueManagement>
-      <system>JIRA</system>
-      <url>https://issues.scala-lang.org/</url>
-   </issueManagement>
-        <dependencies>
-                <dependency>
-                        <groupId>org.scala-lang</groupId>
-                        <artifactId>scala-library</artifactId>
-                        <version>@VERSION@</version>
-                </dependency>
-                <dependency>
-                        <groupId>org.scala-lang</groupId>
-                        <artifactId>scala-actors</artifactId>
-                        <version>@VERSION@</version>
-                </dependency>
-        </dependencies>
-        <distributionManagement>
-                <repository>
-                        <id>scala-tools.org</id>
-                        <url>@RELEASE_REPOSITORY@</url>
-                </repository>
-                <snapshotRepository>
-                        <id>scala-tools.org</id>
-                        <url>@SNAPSHOT_REPOSITORY@</url>
-                        <uniqueVersion>false</uniqueVersion>
-                </snapshotRepository>
-        </distributionManagement>
-  <developers>
-    <developer>
-      <id>lamp</id>
-      <name>EPFL LAMP</name>
-    </developer>
-    <developer>
-      <id>Typesafe</id>
-      <name>Typesafe, Inc.</name>
-    </developer>
-  </developers>
-</project>
diff --git a/src/build/pack.xml b/src/build/pack.xml
index 1735b93f3f..79611b55a2 100644
--- a/src/build/pack.xml
+++ b/src/build/pack.xml
@@ -155,7 +155,6 @@ MAIN DISTRIBUTION PACKAGING
     <mvn-copy-lib mvn.artifact.name="scala-compiler"/>
     <mvn-copy-lib mvn.artifact.name="scala-swing"/>
     <mvn-copy-lib mvn.artifact.name="scala-actors"/>
-    <mvn-copy-lib mvn.artifact.name="scala-actors-migration"/>
     <mvn-copy-lib mvn.artifact.name="scala-partest"/>
     <mvn-copy-lib mvn.artifact.name="scalap"/>
   </target>
@@ -218,10 +217,6 @@ MAIN DISTRIBUTION PACKAGING
          basedir="${build-docs.dir}/continuations-plugin">
       <include name="**/*"/>
     </jar>
-    <jar destfile="${dists.dir}/maven/${version.number}/scala-actors-migration/scala-actors-migration-docs.jar"
-           basedir="${build-docs.dir}/actors-migration">
-        <include name="**/*"/>
-    </jar>
 
     <!-- TODO - Scala swing and actors should maybe have thier own jar, but creating it is SLOW. -->
     <copy tofile="${dists.dir}/maven/${version.number}/scala-swing/scala-swing-docs.jar"
diff --git a/src/partest/scala/tools/partest/PartestTask.scala b/src/partest/scala/tools/partest/PartestTask.scala
index 959d682872..99ffbb5905 100644
--- a/src/partest/scala/tools/partest/PartestTask.scala
+++ b/src/partest/scala/tools/partest/PartestTask.scala
@@ -325,16 +325,6 @@ class PartestTask extends Task with CompilationPathProperty {
       }
     } getOrElse sys.error("Provided classpath does not contain a Scala actors.")
 
-    val scalaActorsMigration = {
-      (classpath.list map { fs => new File(fs) }) find { f =>
-        f.getName match {
-          case "scala-actors-migration.jar" => true
-          case "actors-migration" if (f.getParentFile.getName == "classes") => true
-          case _ => false
-        }
-      }
-    } getOrElse sys.error("Provided classpath does not contain a Scala actors.")
-
     def scalacArgsFlat: Option[Seq[String]] = scalacArgs map (_ flatMap { a =>
       val parts = a.getParts
       if(parts eq null) Seq[String]() else parts.toSeq
@@ -362,7 +352,6 @@ class PartestTask extends Task with CompilationPathProperty {
     antFileManager.LATEST_COMP = scalaCompiler.getAbsolutePath
     antFileManager.LATEST_PARTEST = scalaPartest.getAbsolutePath
     antFileManager.LATEST_ACTORS = scalaActors.getAbsolutePath
-    antFileManager.LATEST_ACTORS_MIGRATION = scalaActorsMigration.getAbsolutePath
 
     javacmd foreach (x => antFileManager.JAVACMD = x.getAbsolutePath)
     javaccmd foreach (x => antFileManager.JAVAC_CMD = x.getAbsolutePath)
diff --git a/src/partest/scala/tools/partest/nest/AntRunner.scala b/src/partest/scala/tools/partest/nest/AntRunner.scala
index ee644c5315..8c2d7029ba 100644
--- a/src/partest/scala/tools/partest/nest/AntRunner.scala
+++ b/src/partest/scala/tools/partest/nest/AntRunner.scala
@@ -24,7 +24,6 @@ class AntRunner extends DirectRunner {
     var LATEST_COMP: String = _
     var LATEST_PARTEST: String = _
     var LATEST_ACTORS: String = _
-    var LATEST_ACTORS_MIGRATION: String = _
     val testRootPath: String = "test"
     val testRootDir: Directory = Directory(testRootPath)
   }
diff --git a/src/partest/scala/tools/partest/nest/ConsoleFileManager.scala b/src/partest/scala/tools/partest/nest/ConsoleFileManager.scala
index 32f14872ec..442c0e8427 100644
--- a/src/partest/scala/tools/partest/nest/ConsoleFileManager.scala
+++ b/src/partest/scala/tools/partest/nest/ConsoleFileManager.scala
@@ -84,7 +84,6 @@ class ConsoleFileManager extends FileManager {
       latestFile        = testClassesDir.parent / "bin"
       latestLibFile     = testClassesDir / "library"
       latestActorsFile  = testClassesDir / "library" / "actors"
-      latestActMigFile  = testClassesDir / "actors-migration"
       latestReflectFile = testClassesDir / "reflect"
       latestCompFile    = testClassesDir / "compiler"
       latestPartestFile = testClassesDir / "partest"
@@ -96,7 +95,6 @@ class ConsoleFileManager extends FileManager {
       latestFile        = dir / "bin"
       latestLibFile     = dir / "lib/scala-library.jar"
       latestActorsFile  = dir / "lib/scala-actors.jar"
-      latestActMigFile  = dir / "lib/scala-actors-migration.jar"
       latestReflectFile = dir / "lib/scala-reflect.jar"
       latestCompFile    = dir / "lib/scala-compiler.jar"
       latestPartestFile = dir / "lib/scala-partest.jar"
@@ -108,7 +106,6 @@ class ConsoleFileManager extends FileManager {
         latestFile        = prefixFile("build/quick/bin")
         latestLibFile     = prefixFile("build/quick/classes/library")
         latestActorsFile  = prefixFile("build/quick/classes/library/actors")
-        latestActMigFile  = prefixFile("build/quick/classes/actors-migration")
         latestReflectFile = prefixFile("build/quick/classes/reflect")
         latestCompFile    = prefixFile("build/quick/classes/compiler")
         latestPartestFile = prefixFile("build/quick/classes/partest")
@@ -120,7 +117,6 @@ class ConsoleFileManager extends FileManager {
         latestFile        = prefixFileWith(p, "bin")
         latestLibFile     = prefixFileWith(p, "lib/scala-library.jar")
         latestActorsFile  = prefixFileWith(p, "lib/scala-actors.jar")
-        latestActMigFile  = prefixFileWith(p, "lib/scala-actors-migration.jar")
         latestReflectFile = prefixFileWith(p, "lib/scala-reflect.jar")
         latestCompFile    = prefixFileWith(p, "lib/scala-compiler.jar")
         latestPartestFile = prefixFileWith(p, "lib/scala-partest.jar")
@@ -131,7 +127,6 @@ class ConsoleFileManager extends FileManager {
         latestFile        = prefixFile("dists/latest/bin")
         latestLibFile     = prefixFile("dists/latest/lib/scala-library.jar")
         latestActorsFile  = prefixFile("dists/latest/lib/scala-actors.jar")
-        latestActMigFile  = prefixFile("dists/latest/lib/scala-actors-migration.jar")
         latestReflectFile = prefixFile("dists/latest/lib/scala-reflect.jar")
         latestCompFile    = prefixFile("dists/latest/lib/scala-compiler.jar")
         latestPartestFile = prefixFile("dists/latest/lib/scala-partest.jar")
@@ -142,7 +137,6 @@ class ConsoleFileManager extends FileManager {
         latestFile        = prefixFile("build/pack/bin")
         latestLibFile     = prefixFile("build/pack/lib/scala-library.jar")
         latestActorsFile  = prefixFile("build/pack/lib/scala-actors.jar")
-        latestActMigFile  = prefixFile("build/pack/lib/scala-actors-migration.jar")
         latestReflectFile = prefixFile("build/pack/lib/scala-reflect.jar")
         latestCompFile    = prefixFile("build/pack/lib/scala-compiler.jar")
         latestPartestFile = prefixFile("build/pack/lib/scala-partest.jar")
@@ -180,7 +174,6 @@ class ConsoleFileManager extends FileManager {
     LATEST_COMP = latestCompFile.getAbsolutePath
     LATEST_PARTEST = latestPartestFile.getAbsolutePath
     LATEST_ACTORS = latestActorsFile.getAbsolutePath
-    LATEST_ACTORS_MIGRATION = latestActMigFile.getAbsolutePath
   }
 
   var LATEST_LIB: String = ""
@@ -188,12 +181,10 @@ class ConsoleFileManager extends FileManager {
   var LATEST_COMP: String = ""
   var LATEST_PARTEST: String = ""
   var LATEST_ACTORS: String = ""
-  var LATEST_ACTORS_MIGRATION: String = ""
 
   var latestFile: File = _
   var latestLibFile: File = _
   var latestActorsFile: File = _
-  var latestActMigFile: File = _
   var latestReflectFile: File = _
   var latestCompFile: File = _
   var latestPartestFile: File = _
diff --git a/src/partest/scala/tools/partest/nest/DirectRunner.scala b/src/partest/scala/tools/partest/nest/DirectRunner.scala
index a890a57f14..0f926ee69e 100644
--- a/src/partest/scala/tools/partest/nest/DirectRunner.scala
+++ b/src/partest/scala/tools/partest/nest/DirectRunner.scala
@@ -49,10 +49,9 @@ trait DirectRunner {
     val latestLibFile     = new File(fileManager.LATEST_LIB)
     val latestPartestFile = new File(fileManager.LATEST_PARTEST)
     val latestActorsFile  = new File(fileManager.LATEST_ACTORS)
-    val latestActMigFile  = new File(fileManager.LATEST_ACTORS_MIGRATION)
     val scalacheckURL     = PathSettings.scalaCheck.toURL
     val scalaCheckParentClassLoader = ScalaClassLoader.fromURLs(
-      scalacheckURL :: (List(latestCompFile, latestReflectFile, latestLibFile, latestActorsFile, latestActMigFile, latestPartestFile).map(_.toURI.toURL))
+      scalacheckURL :: (List(latestCompFile, latestReflectFile, latestLibFile, latestActorsFile, latestPartestFile).map(_.toURI.toURL))
     )
 
     val kindFiles = onlyValidTestPaths(_kindFiles)
diff --git a/src/partest/scala/tools/partest/nest/FileManager.scala b/src/partest/scala/tools/partest/nest/FileManager.scala
index 512c718040..b6d89177ca 100644
--- a/src/partest/scala/tools/partest/nest/FileManager.scala
+++ b/src/partest/scala/tools/partest/nest/FileManager.scala
@@ -64,7 +64,6 @@ trait FileManager extends FileUtil {
   var LATEST_COMP: String
   var LATEST_PARTEST: String
   var LATEST_ACTORS: String
-  var LATEST_ACTORS_MIGRATION: String
 
   var showDiff = false
   var updateCheck = false
diff --git a/src/partest/scala/tools/partest/nest/ReflectiveRunner.scala b/src/partest/scala/tools/partest/nest/ReflectiveRunner.scala
index 838bf56d73..99043d8f95 100644
--- a/src/partest/scala/tools/partest/nest/ReflectiveRunner.scala
+++ b/src/partest/scala/tools/partest/nest/ReflectiveRunner.scala
@@ -48,9 +48,9 @@ class ReflectiveRunner {
         new ConsoleFileManager
 
     import fileManager.
-      { latestCompFile, latestReflectFile, latestLibFile, latestPartestFile, latestFjbgFile, latestScalapFile, latestActorsFile, latestActMigFile }
+      { latestCompFile, latestReflectFile, latestLibFile, latestPartestFile, latestFjbgFile, latestScalapFile, latestActorsFile }
     val files =
-      Array(latestCompFile, latestReflectFile, latestLibFile, latestPartestFile, latestFjbgFile, latestScalapFile, latestActorsFile, latestActMigFile) map (x => io.File(x))
+      Array(latestCompFile, latestReflectFile, latestLibFile, latestPartestFile, latestFjbgFile, latestScalapFile, latestActorsFile) map (x => io.File(x))
 
     val sepUrls   = files map (_.toURL)
     var sepLoader = new URLClassLoader(sepUrls, null)
diff --git a/src/partest/scala/tools/partest/nest/SBTRunner.scala b/src/partest/scala/tools/partest/nest/SBTRunner.scala
index 206ee19c76..b0ce6579ac 100644
--- a/src/partest/scala/tools/partest/nest/SBTRunner.scala
+++ b/src/partest/scala/tools/partest/nest/SBTRunner.scala
@@ -17,7 +17,6 @@ object SBTRunner extends DirectRunner {
     var LATEST_COMP: String     = _
     var LATEST_PARTEST: String     = _
     var LATEST_ACTORS: String     = _
-    var LATEST_ACTORS_MIGRATION: String     = _
     val testRootPath: String   = "test"
     val testRootDir: Directory = Directory(testRootPath)
   }
@@ -61,7 +60,6 @@ object SBTRunner extends DirectRunner {
     fileManager.LATEST_COMP = findClasspath("scala-compiler", "scala-compiler") getOrElse sys.error("No scala-compiler found! Classpath = " + fileManager.CLASSPATH)
     fileManager.LATEST_PARTEST = findClasspath("scala-partest", "partest") getOrElse sys.error("No scala-partest found! Classpath = " + fileManager.CLASSPATH)
     fileManager.LATEST_ACTORS = findClasspath("scala-actors", "actors") getOrElse sys.error("No scala-actors found! Classpath = " + fileManager.CLASSPATH)
-    fileManager.LATEST_ACTORS_MIGRATION = findClasspath("scala-actors-migration", "actors-migration") getOrElse sys.error("No scala-actors-migration found! Classpath = " + fileManager.CLASSPATH)
 
     // TODO - Do something useful here!!!
     fileManager.JAVAC_CMD = "javac"