Merge branch 'master' of github.com:akka/akka

akka-docs/modules/http.rst

@@ -12,11 +12,19 @@ service applications that integrates with Akka. It provides a REST API on top of
 Getting started
 ---------------
 
-First you must make your application aware of play-mini.
-In SBT you just have to add the following to your ``libraryDependencies``::
+Easiest way to get started with `Play2 Mini <https://github.com/typesafehub/play2-mini>`_  is to use the
+G8 project templates, as described in the `Play2 Mini Documentation <https://github.com/typesafehub/play2-mini>`_.
+
+If you already have an Akka project and want to add Play2 Mini, you must first add the following to 
+your ``libraryDependencies``::
 
   libraryDependencies += "com.typesafe" %% "play-mini" % "<version-number>"
 
+In case you need to start Play2 Mini programatically you can use::
+
+  play.core.server.NettyServer.main(Array())
+
+
 Akka Mist
 =========
 

akka-osgi-aries/src/test/scala/akka/osgi/aries/blueprint/NamespaceHandlerTest.scala

@@ -63,7 +63,6 @@ class ConfigNamespaceHandlerTest extends WordSpec with MustMatchers with PojoSRT
     "set up ActorSystem when bundle starts" in {
       val system = serviceForType[ActorSystem]
       system must not be (null)
-
       system.settings.config.getString("some.config.key") must be("value")
     }
 

akka-osgi/src/test/scala/akka/osgi/PojoSRTestSupport.scala

@@ -11,8 +11,8 @@ import java.net.URL
 
 import java.util.jar.JarInputStream
 import java.io.{ FileInputStream, FileOutputStream, File }
-import java.util.{ Date, ServiceLoader, HashMap }
 import org.scalatest.{ BeforeAndAfterAll, Suite }
+import java.util.{ UUID, Date, ServiceLoader, HashMap }
 
 /**
  * Trait that provides support for building akka-osgi tests using PojoSR
@@ -26,11 +26,11 @@ trait PojoSRTestSupport extends Suite with BeforeAndAfterAll {
    * All bundles being found on the test classpath are automatically installed and started in the PojoSR runtime.
    * Implement this to define the extra bundles that should be available for testing.
    */
-  val testBundles: Seq[BundleDescriptor]
+  def testBundles: Seq[BundleDescriptor]
 
   lazy val context: BundleContext = {
     val config = new HashMap[String, AnyRef]()
-    System.setProperty("org.osgi.framework.storage", "target/akka-osgi/" + System.currentTimeMillis)
+    System.setProperty("org.osgi.framework.storage", "target/akka-osgi/" + UUID.randomUUID().toString)
 
     val bundles = new ClasspathScanner().scanForBundles()
     bundles.addAll(testBundles)

project/AkkaBuild.scala

@@ -222,7 +222,8 @@ object AkkaBuild extends Build {
     base = file("akka-osgi"),
     dependencies = Seq(actor),
     settings = defaultSettings ++ OSGi.osgi ++ Seq(
-      libraryDependencies ++= Dependencies.osgi
+      libraryDependencies ++= Dependencies.osgi,
+      parallelExecution in Test := false
     )
   )
 
@@ -231,7 +232,8 @@ object AkkaBuild extends Build {
     base = file("akka-osgi-aries"),
     dependencies = Seq(osgi % "compile;test->test"),
     settings = defaultSettings ++ OSGi.osgiAries ++ Seq(
-      libraryDependencies ++= Dependencies.osgiAries
+      libraryDependencies ++= Dependencies.osgiAries,
+      parallelExecution in Test := false
     )
   )