Merge pull request akka#1928 from akka/wip-OSGi-cleaned-ban

!osg, pro Updated OSGi dependencies and fixed integration test

.gitignore

@@ -67,6 +67,7 @@ src_managed
 storage
 tags
 target
+target-sbt
 tm*.lck
 tm*.log
 tm.out

akka-docs/rst/additional/osgi.rst

@@ -1,14 +1,6 @@
 Akka in OSGi
 ============
 
-In an OSGi environment the ``akka-osgi`` bundle replaces ``akka-actor`` artifact. It includes all classes from ``akka-actor`` and merged ``reference.conf`` files from all akka modules. The dependency is::
-
-  <dependency>
-    <groupId>com.typesafe.akka</groupId>
-    <artifactId>akka-osgi_@binVersion@</artifactId>
-    <version>@version@</version>
-  </dependency>
-
 Configuring the OSGi Framework
 ------------------------------
 
@@ -19,26 +11,20 @@ instead of resolving it through the normal OSGi class space.
 Activator
 ---------
 
-To bootstrap Akka inside an OSGi environment, you can use the ``akka.osgi.AkkaSystemActivator`` class
+To bootstrap Akka inside an OSGi environment, you can use the ``akka.osgi.ActorSystemActivator`` class
 to conveniently set up the ActorSystem.
 
 .. includecode:: code/osgi/Activator.scala#Activator
 
-The ``AkkaSystemActivator`` class is included in the ``akka-osgi`` artifact.
-
-Blueprint
----------
 
-For the Apache Aries Blueprint implementation, there's also a namespace handler available.  The namespace URI
-is http://akka.io/xmlns/blueprint/v1.0.0 and it can be used to set up an ActorSystem.
+The ``ActorSystemActivator`` creates the actor system with a class loader that finds resources
+(``reference.conf`` files) and classes from the application bundle and all transitive dependencies.
 
-.. includecode:: code/osgi/blueprint.xml
-
-The blueprint is included in the ``akka-osgi-aries`` artifact::
+The ``ActorSystemActivator`` class is included in the ``akka-osgi`` artifact.
 
   <dependency>
     <groupId>com.typesafe.akka</groupId>
-    <artifactId>akka-osgi-aries_@binVersion@</artifactId>
+    <artifactId>akka-osgi_@binVersion@</artifactId>
     <version>@version@</version>
   </dependency>
 

akka-docs/rst/project/migration-guide-2.2.x-2.3.x.rst

@@ -245,4 +245,9 @@ ReliableProxy Constructor Changed
 
 The constructor of ``ReliableProxy`` in ``akka-contrib`` has been changed to take an ``ActorPath`` instead of
 an ``ActorRef``.  Also it takes new parameters to support reconnection.  Use the new props factory methods, ``ReliableProxy.props``.
+
+Akka OSGi Aries Blueprint is Removed
+====================================
+
+``akka-osgi-aries`` has been removed. Similar can be implemented outside of Akka if needed.