Merge commit 'refs/pull/1574/head' into merge-210

* commit 'refs/pull/1574/head': (24 commits)
  Fixing issue where OSGi bundles weren't getting used for distribution.
  Fixes example in Type.asSeenFrom
  Fix for SI-6600, regression with ScalaNumber.
  SI-6562 Fix crash with class nested in @inline method
  Brings copyrights in Scaladoc footer and manpage up-to-date, from 2011/12 to 2013
  Brings all copyrights (in comments) up-to-date, from 2011/12 to 2013
  SI-6606 Drops new icons in, replaces abstract types placeholder icons
  SI-6132 Revisited, cleaned-up, links fixed, spelling errors fixed, rewordings
  Labeling scala.reflect and scala.reflect.macros experimental in the API docs
  Typo-fix in scala.concurrent.Future, thanks to @pavelpavlov
  Remove implementation details from Position (they are still under reflection.internal). It probably needs more cleanup of the api wrt to ranges etc but let's leave it for later
  SI-6399 Adds API docs for Any and AnyVal
  Removing actors-migration from main repository so it can live on elsewhere.
  Fix for SI-6597, implicit case class crasher.
  SI-6578 Harden against synthetics being added more than once.
  SI-6556 no assert for surprising ctor result type
  Removing actors-migration from main repository so it can live on elsewhere.
  Fixes SI-6500 by making erasure more regular.
  Modification to SI-6534 patch.
  Fixes SI-6559 - StringContext not using passed in escape function.
  ...

Conflicts:
	src/actors-migration/scala/actors/migration/StashingActor.scala
	src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala
	src/compiler/scala/tools/nsc/settings/AestheticSettings.scala
	src/compiler/scala/tools/nsc/transform/Erasure.scala
	src/library/scala/Application.scala
	src/library/scala/collection/immutable/GenIterable.scala.disabled
	src/library/scala/collection/immutable/GenMap.scala.disabled
	src/library/scala/collection/immutable/GenSeq.scala.disabled
	src/library/scala/collection/immutable/GenSet.scala.disabled
	src/library/scala/collection/immutable/GenTraversable.scala.disabled
	src/library/scala/collection/mutable/GenIterable.scala.disabled
	src/library/scala/collection/mutable/GenMap.scala.disabled
	src/library/scala/collection/mutable/GenSeq.scala.disabled
	src/library/scala/collection/mutable/GenSet.scala.disabled
	src/library/scala/collection/mutable/GenTraversable.scala.disabled
	src/library/scala/collection/parallel/immutable/ParNumericRange.scala.disabled

1 files changed, 0 insertions, 195 deletions

diff --git a/test/files/jvm/actmig-loop-react.scala b/test/files/jvm/actmig-loop-react.scala
deleted file mode 100644
index c9a3664526..0000000000
--- a/test/files/jvm/actmig-loop-react.scala
+++ /dev/null
@@ -1,195 +0,0 @@
-/**
- * NOTE: Code snippets from this test are included in the Actor Migration Guide. In case you change
- * code in these tests prior to the 2.10.0 release please send the notification to @vjovanov.
- */
-import scala.actors.Actor._
-import scala.actors._
-import scala.actors.migration._
-import java.util.concurrent.{ TimeUnit, CountDownLatch }
-import scala.collection.mutable.ArrayBuffer
-import scala.concurrent.duration._
-import scala.concurrent.{ Promise, Await }
-
-object Test {
-  val finishedLWCR, finishedTNR, finishedEH = Promise[Boolean]
-  val finishedLWCR1, finishedTNR1, finishedEH1 = Promise[Boolean]
-
-  def testLoopWithConditionReact() = {
-    // Snippet showing composition of receives
-    // Loop with Condition Snippet - before
-    val myActor = actor {
-      var c = true
-      loopWhile(c) {
-        react {
-          case x: Int =>
-            // do task
-            println("do task")
-            if (x == 42) {
-              c = false
-              finishedLWCR1.success(true)
-            }
-        }
-      }
-    }
-
-    myActor.start()
-    myActor ! 1
-    myActor ! 42
-
-    Await.ready(finishedLWCR1.future, 5 seconds)
-
-    // Loop with Condition Snippet - migrated
-    val myAkkaActor = ActorDSL.actor(new StashingActor {
-
-      def receive = {
-        case x: Int =>
-          // do task
-          println("do task")
-          if (x == 42) {
-            finishedLWCR.success(true)
-            context.stop(self)
-          }
-      }
-    })
-    myAkkaActor ! 1
-    myAkkaActor ! 42
-  }
-
-  def testNestedReact() = {
-    // Snippet showing composition of receives
-    // Loop with Condition Snippet - before
-    val myActor = actor {
-      var c = true
-      loopWhile(c) {
-        react {
-          case x: Int =>
-            // do task
-            println("do task " + x)
-            if (x == 42) {
-              c = false
-            } else {
-              react {
-                case y: String =>
-                  println("do string " + y)
-              }
-            }
-            println("after react")
-            finishedTNR1.success(true)
-        }
-      }
-    }
-    myActor.start()
-
-    myActor ! 1
-    myActor ! "I am a String"
-    myActor ! 42
-
-    Await.ready(finishedTNR1.future, 5 seconds)
-
-    // Loop with Condition Snippet - migrated
-    val myAkkaActor = ActorDSL.actor(new StashingActor {
-
-      def receive = {
-        case x: Int =>
-          // do task
-          println("do task " + x)
-          if (x == 42) {
-            println("after react")
-            finishedTNR.success(true)
-            context.stop(self)
-          } else
-            context.become(({
-              case y: String =>
-                println("do string " + y)
-            }: Receive).andThen(x => {
-              unstashAll()
-              context.unbecome()
-            }).orElse { case x => stash() })
-      }
-    })
-
-    myAkkaActor ! 1
-    myAkkaActor ! "I am a String"
-    myAkkaActor ! 42
-
-  }
-
-  def exceptionHandling() = {
-    // Stashing actor with act and exception handler
-    val myActor = ActorDSL.actor(new StashingActor {
-
-      def receive = { case _ => println("Dummy method.") }
-      override def act() = {
-        loop {
-          react {
-            case "fail" =>
-              throw new Exception("failed")
-            case "work" =>
-              println("working")
-            case "die" =>
-              finishedEH1.success(true)
-              exit()
-          }
-        }
-      }
-
-      override def exceptionHandler = {
-        case x: Exception => println("scala got exception")
-      }
-
-    })
-
-    myActor ! "work"
-    myActor ! "fail"
-    myActor ! "die"
-
-    Await.ready(finishedEH1.future, 5 seconds)
-    // Stashing actor in Akka style
-    val myAkkaActor = ActorDSL.actor(new StashingActor {
-      def receive = PFCatch({
-        case "fail" =>
-          throw new Exception("failed")
-        case "work" =>
-          println("working")
-        case "die" =>
-          finishedEH.success(true)
-          context.stop(self)
-      }, { case x: Exception => println("akka got exception") })
-    })
-
-    myAkkaActor ! "work"
-    myAkkaActor ! "fail"
-    myAkkaActor ! "die"
-  }
-
-  def main(args: Array[String]): Unit = {
-    testLoopWithConditionReact()
-    Await.ready(finishedLWCR.future, 5 seconds)
-    exceptionHandling()
-    Await.ready(finishedEH.future, 5 seconds)
-    testNestedReact()
-    Await.ready(finishedTNR.future, 5 seconds)
-  }
-
-}
-
-// As per Jim Mcbeath's blog (http://jim-mcbeath.blogspot.com/2008/07/actor-exceptions.html)
-class PFCatch(f: PartialFunction[Any, Unit],
-  handler: PartialFunction[Exception, Unit])
-  extends PartialFunction[Any, Unit] {
-
-  def apply(x: Any) = {
-    try {
-      f(x)
-    } catch {
-      case e: Exception if handler.isDefinedAt(e) => handler(e)
-    }
-  }
-
-  def isDefinedAt(x: Any) = f.isDefinedAt(x)
-}
-
-object PFCatch {
-  def apply(f: PartialFunction[Any, Unit],
-    handler: PartialFunction[Exception, Unit]) = new PFCatch(f, handler)
-}