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, 104 deletions

diff --git a/test/files/jvm/actmig-public-methods_1.scala b/test/files/jvm/actmig-public-methods_1.scala
deleted file mode 100644
index db21ab983c..0000000000
--- a/test/files/jvm/actmig-public-methods_1.scala
+++ /dev/null
@@ -1,104 +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.collection.mutable.ArrayBuffer
-import scala.actors.Actor._
-import scala.actors._
-import scala.actors.migration._
-import scala.util._
-import scala.concurrent._
-import scala.concurrent.duration._
-import java.util.concurrent.{ TimeUnit, CountDownLatch }
-import scala.concurrent.duration._
-import scala.actors.migration.pattern._
-import scala.concurrent.ExecutionContext.Implicits.global
-
-object Test {
-  val NUMBER_OF_TESTS = 6
-
-  // used for sorting non-deterministic output
-  val buff = ArrayBuffer[String]()
-  val latch = new CountDownLatch(NUMBER_OF_TESTS)
-  val toStop = ArrayBuffer[ActorRef]()
-
-  def append(v: String) = synchronized {
-    buff += v
-  }
-
-  def main(args: Array[String]) = {
-
-    val respActor = ActorDSL.actor(actor {
-      loop {
-        react {
-          case (x: String, time: Long) =>
-            Thread.sleep(time)
-            reply(x + " after " + time)
-          case str: String =>
-            append(str)
-            latch.countDown()
-          case x =>
-            exit()
-        }
-      }
-    })
-
-    toStop += respActor
-
-    respActor ! "bang"
-
-    {
-      val msg = ("bang qmark", 0L)
-      val res = respActor.?(msg)(Timeout(Duration.Inf))
-      append(Await.result(res, Duration.Inf).toString)
-      latch.countDown()
-    }
-
-    {
-      val msg = ("bang qmark", 1L)
-      val res = respActor.?(msg)(Timeout(5 seconds))
-
-      val promise = Promise[Option[Any]]()
-      res.onComplete(v => promise.success(v.toOption))
-      append(Await.result(promise.future, Duration.Inf).toString)
-
-      latch.countDown()
-    }
-
-    {
-      val msg = ("bang qmark", 5000L)
-      val res = respActor.?(msg)(Timeout(1 millisecond))
-      val promise = Promise[Option[Any]]()
-      res.onComplete(v => promise.success(v.toOption))
-      append(Await.result(promise.future, Duration.Inf).toString)
-      latch.countDown()
-    }
-
-    {
-      val msg = ("bang bang in the future", 0L)
-      val fut = respActor.?(msg)(Timeout(Duration.Inf))
-      append(Await.result(fut, Duration.Inf).toString)
-      latch.countDown()
-    }
-
-    {
-      val handler: PartialFunction[Any, String] = {
-        case x: String => x
-      }
-
-      val msg = ("typed bang bang in the future", 0L)
-      val fut = (respActor.?(msg)(Timeout(Duration.Inf)))
-      append((Await.result(fut.map(handler), Duration.Inf)).toString)
-      latch.countDown()
-    }
-
-    // output
-    latch.await(10, TimeUnit.SECONDS)
-    if (latch.getCount() > 0) {
-      println("Error: Tasks have not finished!!!")
-    }
-
-    buff.sorted.foreach(println)
-    toStop.foreach(_ ! PoisonPill)
-  }
-}