Skip to content

Commit

Permalink
!osg, pro Updated OSGi dependencies and using a BundleDelegatingClass…
Browse files Browse the repository at this point in the history
…Loader

* Numerous version upgrades to dependencies
* Publish integration test maven dependencies automatically
* Use slf4j logging, with standard OPS4j Pax Logging
* Maven and sbt use different target directories
* Add a custom serializer to the integration test
* Add akka-persistence to the integration test
* Removing reference copying and using a BundleDelegatingClassLoader
* Make akka-actor a proper bundle, and remove duplicate classes and
  reference.conf files from akka-osgi
* Remove akka-osgi-aries

This is a hackathon team effort by:
* Björn Antonsson
* Endre Sándor Varga
* Roland Kuhn
* Patrik Nordwall
  • Loading branch information
bantonsson authored and patriknw committed Feb 2, 2014
1 parent ef261e8 commit e98dd13
Show file tree
Hide file tree
Showing 42 changed files with 497 additions and 854 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ src_managed
storage
tags
target
target-sbt
tm*.lck
tm*.log
tm.out
Expand Down
24 changes: 5 additions & 19 deletions akka-docs/rst/additional/osgi.rst
Original file line number Diff line number Diff line change
@@ -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
------------------------------

Expand All @@ -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>

Expand Down
5 changes: 5 additions & 0 deletions akka-docs/rst/project/migration-guide-2.2.x-2.3.x.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit e98dd13

Please sign in to comment.