SI-6315 fixed.

Author: Vojin Jovanovic

src/actors-migration/scala/actors/MigrationSystem.scala

@@ -1,10 +1,11 @@
-package scala.actors
+package scala.actors.migration
 
+import scala.actors._
 import scala.collection._
 
 object MigrationSystem {
 
-  private[actors] val contextStack = new ThreadLocal[immutable.Stack[Boolean]] {
+  private[migration] val contextStack = new ThreadLocal[immutable.Stack[Boolean]] {
     override def initialValue() = immutable.Stack[Boolean]()
   }
 

src/actors-migration/scala/actors/Pattern.scala

@@ -1,5 +1,6 @@
-package scala.actors
+package scala.actors.migration
 
+import scala.actors._
 import scala.concurrent.util.Duration
 import language.implicitConversions
 

src/actors-migration/scala/actors/Props.scala

@@ -1,4 +1,6 @@
-package scala.actors
+package scala.actors.migration
+
+import scala.actors._
 
 /**
  * ActorRef configuration object. It represents the minimal subset of Akka Props class.

src/actors-migration/scala/actors/StashingActor.scala

@@ -1,5 +1,7 @@
-package scala.actors
+package scala.actors.migration
 
+import scala.actors._
+import scala.actors.Actor._
 import scala.collection._
 import scala.concurrent.util.Duration
 import java.util.concurrent.TimeUnit

src/actors-migration/scala/actors/Timeout.scala

@@ -6,7 +6,7 @@
 **                          |/                                          **
 \*                                                                      */
 
-package scala.actors
+package scala.actors.migration
 
 import scala.concurrent.util.Duration
 import java.util.concurrent.TimeUnit

test/files/jvm/actmig-PinS_1.scala

@@ -1,4 +1,5 @@
 import scala.actors._
+import scala.actors.migration._
 import scala.concurrent.util.duration._
 import scala.concurrent.{ Promise, Await }
 

test/files/jvm/actmig-PinS_2.scala

@@ -1,4 +1,5 @@
-import scala.actors.{ MigrationSystem, StashingActor, ActorRef, Props, Exit }
+import scala.actors._
+import scala.actors.migration._
 import scala.concurrent.util.duration._
 import scala.concurrent.{ Promise, Await }
 

test/files/jvm/actmig-PinS_3.scala

@@ -1,4 +1,5 @@
-import scala.actors.{ MigrationSystem, StashingActor, ActorRef, Terminated, Props }
+import scala.actors._
+import scala.actors.migration._
 import scala.concurrent.util.duration._
 import scala.concurrent.{ Promise, Await }
 

test/files/jvm/actmig-loop-react.scala

@@ -1,6 +1,7 @@
-import scala.actors.MigrationSystem._
+import scala.actors.migration.MigrationSystem._
 import scala.actors.Actor._
-import scala.actors.{ Actor, StashingActor, ActorRef, Props, MigrationSystem, PoisonPill }
+import scala.actors._
+import scala.actors.migration._
 import java.util.concurrent.{ TimeUnit, CountDownLatch }
 import scala.collection.mutable.ArrayBuffer
 import scala.concurrent.util.duration._

test/files/jvm/actmig-public-methods_1.scala

@@ -1,10 +1,11 @@
 import scala.collection.mutable.ArrayBuffer
 import scala.actors.Actor._
 import scala.actors._
+import scala.actors.migration._
 import scala.util._
 import java.util.concurrent.{ TimeUnit, CountDownLatch }
 import scala.concurrent.util.Duration
-import scala.actors.pattern._
+import scala.actors.migration.pattern._
 
 object Test {
   val NUMBER_OF_TESTS = 6

test/files/jvm/actmig-react-receive.scala

@@ -1,6 +1,7 @@
-import scala.actors.MigrationSystem._
+import scala.actors.migration.MigrationSystem._
 import scala.actors.Actor._
-import scala.actors.{ Actor, StashingActor, ActorRef, Props, MigrationSystem, PoisonPill }
+import scala.actors._
+import scala.actors.migration._
 import java.util.concurrent.{ TimeUnit, CountDownLatch }
 import scala.collection.mutable.ArrayBuffer
 import scala.concurrent.util.duration._

test/files/jvm/actmig-react-within.scala

@@ -1,6 +1,7 @@
-import scala.actors.MigrationSystem._
+import scala.actors.migration.MigrationSystem._
 import scala.actors.Actor._
-import scala.actors.{ Actor, StashingActor, ActorRef, Props, MigrationSystem, PoisonPill }
+import scala.actors._
+import scala.actors.migration._
 import java.util.concurrent.{ TimeUnit, CountDownLatch }
 import scala.collection.mutable.ArrayBuffer
 import scala.concurrent.util.duration._

test/files/jvm/actmig-receive.scala

@@ -1,6 +1,7 @@
-import scala.actors.MigrationSystem._
+import scala.actors.migration.MigrationSystem._
 import scala.actors.Actor._
-import scala.actors.{ Actor, StashingActor, ActorRef, Props, MigrationSystem, PoisonPill }
+import scala.actors._
+import scala.actors.migration._
 import java.util.concurrent.{ TimeUnit, CountDownLatch }
 import scala.collection.mutable.ArrayBuffer
 import scala.concurrent.util.duration._