Add OSGi support for modules

liftmodules · May 15, 2011 · 10c37e5 · 10c37e5
1 parent 4017d8b
commit 10c37e5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/project/build/LiftModulesProject.scala b/project/build/LiftModulesProject.scala
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import com.weiglewilczek.bnd4sbt.BNDPlugin
 import net.liftweb.sbt._
 import sbt._
 
@@ -69,10 +70,17 @@ class LiftModulesProject(info: ProjectInfo) extends ParentProject(info) with Lif
 
   // Default base
   // ------------
-  class ModulesProject(info: ProjectInfo, libs: ModuleID*) extends DefaultProject(info) with LiftDefaultProject {
+  class ModulesProject(info: ProjectInfo, libs: ModuleID*) extends DefaultProject(info) with BNDPlugin with LiftDefaultProject {
 
     override def libraryDependencies = super.libraryDependencies ++ libs
 
+    // OSGi Attributes
+    override def bndExportPackage = Seq("net.liftweb.*;version=\"%s\"".format(projectVersion.value))
+    override def bndImportPackage = "net.liftweb.*;version=\"%s\"".format(projectVersion.value) :: super.bndImportPackage.toList
+
+    // BNDPlugin should include mainResourcesOutputPath too, to include the generated resources
+    override def bndIncludeResource = super.bndIncludeResource ++ Seq(mainResourcesOutputPath.absolutePath)
+
     // System properties necessary during test
     override def testAction =
       super.testAction dependsOn

diff --git a/project/plugins/Plugins.scala b/project/plugins/Plugins.scala
@@ -5,5 +5,6 @@ class Plugins(info: ProjectInfo) extends PluginDefinition(info) {
   lazy val snapshots = ScalaToolsSnapshots
 
   // Add plugin
-  lazy val a = "net.liftweb" % "lift-sbt" % "2.4-SNAPSHOT"
+  lazy val liftsbt = "net.liftweb" % "lift-sbt" % "2.4-SNAPSHOT"
+  lazy val bnd4sbt = "com.weiglewilczek.bnd4sbt" % "bnd4sbt" % "1.0.2"
 }