synced with jboner/master; decoupled AkkaWrapperProject; bumped bnd4sbt to 1.0.0.RC2

project/build/AkkaProject.scala

@@ -12,7 +12,7 @@ import java.io.File
 
 import com.weiglewilczek.bnd4sbt._
 
-class AkkaParent(info: ProjectInfo) extends DefaultProject(info) with AkkaWrappersProject {
+class AkkaParent(info: ProjectInfo) extends DefaultProject(info) {
 
   // ------------------------------------------------------------
   // project versions
@@ -22,6 +22,7 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) with AkkaWrappe
   val LIFT_VERSION = "2.0-scala280-SNAPSHOT"
   val SCALATEST_VERSION = "1.2-for-scala-2.8.0.RC3-SNAPSHOT"
   val MULTIVERSE_VERSION = "0.5.2"
+  val COMMONS_CODEC_VERSION = "1.4"
 
   // ------------------------------------------------------------
   lazy val deployPath = info.projectPath / "deploy"
@@ -243,7 +244,7 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) with AkkaWrappe
 
   class AkkaRedisProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) {
     val redis = "com.redis" % "redisclient" % "2.8.0.RC3-1.4-SNAPSHOT" % "compile"
-    val commons_codec = "commons-codec" % "commons-codec" % "1.4" % "compile"
+    val commons_codec = "commons-codec" % "commons-codec" % COMMONS_CODEC_VERSION % "compile"
     override def testOptions = TestFilter((name: String) => name.endsWith("Test")) :: Nil
   }
 
@@ -339,7 +340,7 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) with AkkaWrappe
   class AkkaSampleSecurityProject(info: ProjectInfo) extends AkkaDefaultProject(info, deployPath) {
     val jsr311 = "javax.ws.rs" % "jsr311-api" % "1.1.1" % "compile"
     val jsr250 = "javax.annotation" % "jsr250-api" % "1.0" % "compile"
-    val commons_codec = "commons-codec" % "commons-codec" % "1.3" % "compile"
+    val commons_codec = "commons-codec" % "commons-codec" % COMMONS_CODEC_VERSION % "compile"
   }
 
   class AkkaSamplesParentProject(info: ProjectInfo) extends ParentProject(info) {
@@ -416,7 +417,7 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) with AkkaWrappe
 
   trait OSGiProject extends DefaultProject with BNDPlugin {
     override def artifactID = moduleID + "_osgi"
-    override def bndExportPackage = Set("*")    
+    override def bndExportPackage = Seq("se.scalablesolutions.akka.*;version=0.9")    
 
   }
 

project/build/AkkaWrappersProject.scala

@@ -46,7 +46,7 @@ trait AkkaWrappersProject extends DefaultProject {
   // ================= OSGi Wrappers ==================
   class JgroupsWrapperProject(info: ProjectInfo) extends OSGiWrapperProject(info) {
     override def wrappedVersion = "2.9.0.GA"
-    override def bndImportPackage = Set("org.testng.*;resolution:=optional",
+    override def bndImportPackage = Seq("org.testng.*;resolution:=optional",
       "org.bouncycastle.jce.provider;resolution:=optional",
       "bsh;resolution:=optional",
       "*")
@@ -60,11 +60,19 @@ trait AkkaWrappersProject extends DefaultProject {
     val dispatch_json = "net.databinder" % "dispatch-json_2.8.0.RC3" % wrappedVersion % "compile"
   }
 
+  class MultiverseWrapperProject(info: ProjectInfo) extends OSGiWrapperProject(info) {
+    override def wrappedVersion = "0.5.2"
+
+    val multiverse = "org.multiverse" % "multiverse-alpha" % wrappedVersion % "compile"
+  }
+
   class AkkaWrappersParentProject(info: ProjectInfo) extends ParentProject(info) {
     lazy val jgroups_wrapper = project("jgroups-wrapper", "jgroups-wrapper",
       new JgroupsWrapperProject(_))
     lazy val dispath_json = project("dispatch-json", "dispatch-json",
       new DispatchJsonWrapperProject(_))
+    lazy val multiverse_wrapper = project("multiverse-wrapper", "multiverse-wrapper",
+      new MultiverseWrapperProject(_))
   }
 
   def wrappedArtifacts = descendents(info.projectPath / "akka-wrap", "*" + buildScalaVersion  + "_osgi-" + "*.jar")
@@ -73,8 +81,7 @@ trait AkkaWrappersProject extends DefaultProject {
     def wrappedVersion:String 
     override def version = OpaqueVersion(wrappedVersion)
     override def artifactID = moduleID + "_osgi"
-    override def bndEmbedDependencies = true
+    override def bndExportPackage = Seq("*")
-    override def bndExportPackage = Set("*")
   }
 
 

project/plugins/Plugins.scala

@@ -5,5 +5,5 @@ class Plugins(info: ProjectInfo) extends PluginDefinition(info) {
   val spdeSbt = "us.technically.spde" % "spde-sbt-plugin" % "0.4.1"
 //  val repo = "GH-pages repo" at "http://mpeltonen.github.com/maven/"
 //  val idea = "com.github.mpeltonen" % "sbt-idea-plugin" % "0.1-SNAPSHOT"
-  val bnd4sbt = "com.weiglewilczek" % "bnd4sbt" % "0.4"  
+  val bnd4sbt = "com.weiglewilczek.bnd4sbt" % "bnd4sbt" % "1.0.0.RC2"  
 }