Move Aries Blueprint namespace handler into a separate akka-osgi-aries module

akka-osgi-aries/src/main/resources/OSGI-INF/blueprint/akka-namespacehandler.xml

@@ -9,7 +9,7 @@
                 </array>
             </entry>
         </service-properties>
-        <bean class="akka.osgi.blueprint.aries.NamespaceHandler"/>
+        <bean class="akka.osgi.aries.blueprint.NamespaceHandler"/>
     </service>
 
 </blueprint>

akka-osgi-aries/src/main/scala/akka/osgi/aries/blueprint/BlueprintActorSystemFactory.scala

@@ -1,9 +1,7 @@
-package akka.osgi.blueprint
+package akka.osgi.aries.blueprint
 
 import org.osgi.framework.BundleContext
 import akka.osgi.OsgiActorSystemFactory
-import collection.mutable.Buffer
-import akka.actor.{ Actor, Props, ActorSystem }
 import com.typesafe.config.ConfigFactory
 
 /**

akka-osgi-aries/src/main/scala/akka/osgi/aries/blueprint/NamespaceHandler.scala

@@ -1,4 +1,4 @@
-package akka.osgi.blueprint.aries
+package akka.osgi.aries.blueprint
 
 import org.apache.aries.blueprint.ParserContext
 import org.osgi.service.blueprint.container.ComponentDefinitionException
@@ -7,10 +7,9 @@ import org.apache.aries.blueprint.mutable.MutableBeanMetadata
 import collection.JavaConversions.setAsJavaSet
 import org.osgi.framework.BundleContext
 import org.apache.aries.blueprint.reflect.{ ValueMetadataImpl, RefMetadataImpl, BeanArgumentImpl }
-import org.w3c.dom.{ NodeList, Element, Node }
+import org.w3c.dom.{ Element, Node }
 import org.osgi.service.blueprint.reflect.{ BeanMetadata, ComponentMetadata }
-import akka.actor.{ ActorSystem }
-import akka.osgi.blueprint.{ BlueprintActorSystemFactory }
+import akka.actor.ActorSystem
 import java.util.concurrent.atomic.AtomicInteger
 
 import ParserHelper.childElements

akka-osgi-aries/src/main/scala/akka/osgi/aries/blueprint/ParserHelper.scala

@@ -1,4 +1,4 @@
-package akka.osgi.blueprint.aries
+package akka.osgi.aries.blueprint
 
 import org.w3c.dom.{ Node, Element }
 

akka-osgi-aries/src/test/resources/akka/osgi/aries/blueprint/injection.xml

@@ -2,8 +2,8 @@
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
            xmlns:akka="http://akka.io/xmlns/blueprint/v1.0.0">
 
-    <service interface="akka.osgi.test.ActorSystemAwareBean">
-        <bean class="akka.osgi.test.ActorSystemAwareBean">
+    <service interface="akka.osgi.aries.blueprint.ActorSystemAwareBean">
+        <bean class="akka.osgi.aries.blueprint.ActorSystemAwareBean">
             <argument>
                 <akka:actor-system name="simple" />
             </argument>

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

@@ -1,4 +1,4 @@
-package akka.osgi.test
+package akka.osgi.aries.blueprint
 
 import akka.actor.ActorSystem
 

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

@@ -1,11 +1,10 @@
-package akka.osgi.blueprint.aries
+package akka.osgi.aries.blueprint
 
 import org.scalatest.FlatSpec
 import akka.actor.ActorSystem
 import de.kalpatec.pojosr.framework.launch.BundleDescriptor
 import akka.osgi.PojoSRTestSupport
 import akka.osgi.PojoSRTestSupport.bundle
-import akka.osgi.test.ActorSystemAwareBean
 
 /**
  * Test cases for {@link ActorSystemActivator}

akka-osgi/src/main/scala/akka/osgi/ActorSystemActivator.scala

@@ -1,6 +1,5 @@
 package akka.osgi
 
-import com.typesafe.config.{ Config, ConfigFactory }
 import akka.actor.ActorSystem
 import java.util.{ Dictionary, Properties }
 import org.osgi.framework.{ ServiceRegistration, BundleContext, BundleActivator }

project/AkkaBuild.scala

@@ -226,6 +226,15 @@ object AkkaBuild extends Build {
     )
   )
 
+  lazy val osgiAries = Project(
+    id = "akka-osgi-aries",
+    base = file("akka-osgi-aries"),
+    dependencies = Seq(osgi % "compile;test->test"),
+    settings = defaultSettings ++ OSGi.osgiAries ++ Seq(
+      libraryDependencies ++= Dependencies.osgiAries
+    )
+  )
+
   lazy val akkaSbtPlugin = Project(
     id = "akka-sbt-plugin",
     base = file("akka-sbt-plugin"),
@@ -480,7 +489,9 @@ object Dependencies {
 
   val camel = Seq(camelCore, Test.scalatest, Test.junit, Test.mockito)
 
-  val osgi = Seq(osgiCore, ariesBlueprint, Test.logback, Test.ariesProxy, Test.commonsIo, Test.pojosr, Test.tinybundles, Test.scalatest, Test.junit)
+  val osgi = Seq(osgiCore,Test.logback, Test.commonsIo, Test.pojosr, Test.tinybundles, Test.scalatest, Test.junit)
+
+  val osgiAries = Seq(osgiCore, ariesBlueprint, Test.ariesProxy)
 
   val tutorials = Seq(Test.scalatest, Test.junit)
 
@@ -551,9 +562,12 @@ object OSGi {
 
   val mailboxesCommon = exports(Seq("akka.actor.mailbox.*"))
 
-  val osgi = exports(Seq("akka.osgi.*")) ++ Seq(
-    OsgiKeys.importPackage := Seq("org.apache.aries.blueprint.*;resolution:=optional",
-                                  "org.osgi.service.blueprint.*;resolution:=optional") ++ defaultImports
+  val osgi = exports(Seq("akka.osgi")) ++ Seq(
+    OsgiKeys.privatePackage := Seq("akka.osgi.impl")
+  )
+
+  val osgiAries = exports() ++ Seq(
+    OsgiKeys.privatePackage := Seq("akka.osgi.aries.*")
   )
 
   val remote = exports(Seq("akka.remote.*", "akka.routing.*", "akka.serialization.*"))
@@ -564,7 +578,7 @@ object OSGi {
 
   val zeroMQ = exports(Seq("akka.zeromq.*"))
 
-  def exports(packages: Seq[String]) = osgiSettings ++ Seq(
+  def exports(packages: Seq[String] = Seq()) = osgiSettings ++ Seq(
     OsgiKeys.importPackage := defaultImports,
     OsgiKeys.exportPackage := packages
   )