You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2014/02/26 21:01:37 UTC
svn commit: r1572223 - in /servicemix/smx5/trunk: ./ akka/
assemblies/src/main/filtered-resources/ examples/akka/akka-camel/
examples/akka/akka-camel/src/main/resources/OSGI-INF/
examples/akka/akka-camel/src/main/scala/org/apache/servicemix/examples/ak...
Author: gertv
Date: Wed Feb 26 20:01:37 2014
New Revision: 1572223
URL: http://svn.apache.org/r1572223
Log:
SM-2253: Upgrade to Akka 2.2.3
SM-2254: Remove akka-osgi-aries and switch to Akka's own OSGi support
Removed:
servicemix/smx5/trunk/akka/
servicemix/smx5/trunk/examples/akka/akka-camel/src/main/resources/OSGI-INF/
Modified:
servicemix/smx5/trunk/assemblies/src/main/filtered-resources/features.xml
servicemix/smx5/trunk/examples/akka/akka-camel/README.txt
servicemix/smx5/trunk/examples/akka/akka-camel/pom.xml
servicemix/smx5/trunk/examples/akka/akka-camel/src/main/scala/org/apache/servicemix/examples/akka/Application.scala
servicemix/smx5/trunk/parent/pom.xml
servicemix/smx5/trunk/pom.xml
Modified: servicemix/smx5/trunk/assemblies/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assemblies/src/main/filtered-resources/features.xml?rev=1572223&r1=1572222&r2=1572223&view=diff
==============================================================================
--- servicemix/smx5/trunk/assemblies/src/main/filtered-resources/features.xml (original)
+++ servicemix/smx5/trunk/assemblies/src/main/filtered-resources/features.xml Wed Feb 26 20:01:37 2014
@@ -191,14 +191,8 @@
<feature name="akka" version="${akka.version}" resolver="(obr)">
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.scala-library/${scala.bundle.version}</bundle>
<bundle dependency="true">mvn:com.typesafe/config/${typesafe-config.version}</bundle>
- <bundle>mvn:com.typesafe.akka/akka-actor_2.10/${akka.version}</bundle>
- <bundle>mvn:com.typesafe.akka/akka-camel_2.10/${akka.version}</bundle>
<bundle>mvn:com.typesafe.akka/akka-osgi_2.10/${akka.version}</bundle>
- <!--
- Replace Akka's akka-osgi-aries with our own version to be compatible with Aries Blueprint 1.0.x
- <bundle>mvn:com.typesafe.akka/akka-osgi-aries_2.10/${akka.version}</bundle>
- -->
- <bundle>mvn:org.apache.servicemix.akka/org.apache.servicemix.akka.akka-osgi-aries/${project.version}</bundle>
+ <bundle>mvn:com.typesafe.akka/akka-camel_2.10/${akka.version}</bundle>
</feature>
<!-- workaround before SM-2179 get addressed on CXF side-->
Modified: servicemix/smx5/trunk/examples/akka/akka-camel/README.txt
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/examples/akka/akka-camel/README.txt?rev=1572223&r1=1572222&r2=1572223&view=diff
==============================================================================
--- servicemix/smx5/trunk/examples/akka/akka-camel/README.txt (original)
+++ servicemix/smx5/trunk/examples/akka/akka-camel/README.txt Wed Feb 26 20:01:37 2014
@@ -31,11 +31,10 @@ generated with the statistical summary p
Explanation
-----------
-In the Blueprint XML file (akka-camel.xml), we are:
-1. setting up the Akka actor system, using the <akka:actor-system/> element
-2. creating our Camel route builder bean
-3. bootstrapping our application, using the actor system and route builder we
- defined in 1. and 2.
+The Akka project provides the ActorSystemActivator abstract class for running
+Akka in an OSGi Container. We implement this activator in the Application class
+and configure that class as the bundle activator in the POM. We also use the
+Application class to set up our actual actors as well as the Camel route we're using.
The Camel route builder defines two distinct routes:
1. The first route will process files in var/akka-camel/input directory and
Modified: servicemix/smx5/trunk/examples/akka/akka-camel/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/examples/akka/akka-camel/pom.xml?rev=1572223&r1=1572222&r2=1572223&view=diff
==============================================================================
--- servicemix/smx5/trunk/examples/akka/akka-camel/pom.xml (original)
+++ servicemix/smx5/trunk/examples/akka/akka-camel/pom.xml Wed Feb 26 20:01:37 2014
@@ -62,20 +62,6 @@
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>akka.releases</id>
- <url>http://repo.akka.io/releases</url>
- <name>Akka Release Repository</name>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-
<build>
<sourceDirectory>src/main/scala</sourceDirectory>
<testSourceDirectory>src/test/scala</testSourceDirectory>
@@ -106,6 +92,8 @@
<Import-Package>org.osgi.framework,akka.event,*</Import-Package>
<Export-Package>org.apache.servicemix.examples.akka</Export-Package>
<Require-Bundle>com.typesafe.akka.camel</Require-Bundle>
+ <!-- The Akka framework and our application are being started by a bundle activator -->
+ <Bundle-Activator>org.apache.servicemix.examples.akka.Application</Bundle-Activator>
</instructions>
</configuration>
</plugin>
Modified: servicemix/smx5/trunk/examples/akka/akka-camel/src/main/scala/org/apache/servicemix/examples/akka/Application.scala
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/examples/akka/akka-camel/src/main/scala/org/apache/servicemix/examples/akka/Application.scala?rev=1572223&r1=1572222&r2=1572223&view=diff
==============================================================================
--- servicemix/smx5/trunk/examples/akka/akka-camel/src/main/scala/org/apache/servicemix/examples/akka/Application.scala (original)
+++ servicemix/smx5/trunk/examples/akka/akka-camel/src/main/scala/org/apache/servicemix/examples/akka/Application.scala Wed Feb 26 20:01:37 2014
@@ -16,16 +16,28 @@
*/
package org.apache.servicemix.examples.akka
-import akka.actor.ActorSystem
+import akka.actor.{ActorRef, ActorSystem}
import org.apache.camel.scala.dsl.builder.{RouteBuilder, RouteBuilderSupport}
+import akka.osgi.ActorSystemActivator
+import org.osgi.framework.BundleContext
+
+/**
+ * The Akka project provides the ActorSystemActivator for running Akka in an OSGi container.
+ * We extend this Activator and use the configure() method to set up our own application.
+ */
+class Application extends ActorSystemActivator {
+
+ def configure(context: BundleContext, system: ActorSystem) = Application(system)
+
+}
/**
* Application bootstrap class. This class will start the necessary actors on
- * the actor system to
+ * the actor system for our application to work.
*/
object Application extends RouteBuilderSupport {
- def apply(system: ActorSystem, builder: RouteBuilder) = {
+ def apply(system: ActorSystem, builder: RouteBuilder) : ActorRef = {
val stats = Stats(system)
val camel = CamelBridge(system, stats)
@@ -33,4 +45,6 @@ object Application extends RouteBuilderS
stats
}
+ def apply(system: ActorSystem) : ActorRef = apply(system, new RouteBuilderImpl())
+
}
Modified: servicemix/smx5/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/parent/pom.xml?rev=1572223&r1=1572222&r2=1572223&view=diff
==============================================================================
--- servicemix/smx5/trunk/parent/pom.xml (original)
+++ servicemix/smx5/trunk/parent/pom.xml Wed Feb 26 20:01:37 2014
@@ -51,11 +51,11 @@
<aries.transaction.version>1.0.1</aries.transaction.version>
<pax.logging.version>1.7.2</pax.logging.version>
- <akka.version>2.1.2</akka.version>
- <scala.version>2.10.0</scala.version>
+ <akka.version>2.2.3</akka.version>
+ <scala.version>2.10.2</scala.version>
<google.guava.version>14.0.1</google.guava.version>
<fasterxml.jackson.version>2.2.1</fasterxml.jackson.version>
- <typesafe-config.version>1.0.0</typesafe-config.version>
+ <typesafe-config.version>1.0.2</typesafe-config.version>
<servicemix.specs.version>2.4.0</servicemix.specs.version>
</properties>
Modified: servicemix/smx5/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/pom.xml?rev=1572223&r1=1572222&r2=1572223&view=diff
==============================================================================
--- servicemix/smx5/trunk/pom.xml (original)
+++ servicemix/smx5/trunk/pom.xml Wed Feb 26 20:01:37 2014
@@ -38,7 +38,6 @@
<modules>
<module>parent</module>
<module>activiti</module>
- <module>akka</module>
<module>branding</module>
<module>logging</module>
<module>examples</module>
@@ -188,7 +187,7 @@
<rhino.bundle.version>1.7R1_3</rhino.bundle.version>
<saaj-impl.bundle.version>1.3.9_2</saaj-impl.bundle.version>
<saxon.bundle.version>9.5.1.2_1</saxon.bundle.version>
- <scala.bundle.version>2.10.0_1</scala.bundle.version>
+ <scala.bundle.version>2.10.2_1</scala.bundle.version>
<snmp4j.bundle.version>1.8.1_4</snmp4j.bundle.version>
<velocity.bundle.version>1.7_5</velocity.bundle.version>
<wsdl4j.bundle.version>1.6.2_3</wsdl4j.bundle.version>