Permalink
Browse files

Merge branch '968-hseeberger'

  • Loading branch information...
2 parents 18ddfdd + 3100c6e commit d7daee7081f8048c7a1bf541aeb328adb903ae42 Heiko Seeberger committed Apr 19, 2011
Showing with 7 additions and 1 deletion.
  1. +6 −1 project/build/LiftFrameworkProject.scala
  2. +1 −0 project/plugins/Plugins.scala
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import com.weiglewilczek.bnd4sbt.BNDPlugin
import java.util.Calendar
import java.util.jar.Attributes.Name
import sbt._
@@ -90,7 +91,7 @@ class LiftFrameworkProject(info: ProjectInfo) extends ParentProject(info) with L
// Default base
// ------------
- class FrameworkProject(info: ProjectInfo, libs: ModuleID*) extends DefaultProject(info) with LiftDefaultProject {
+ class FrameworkProject(info: ProjectInfo, libs: ModuleID*) extends DefaultProject(info) with BNDPlugin with LiftDefaultProject {
override def libraryDependencies = super.libraryDependencies ++ libs
@@ -100,6 +101,10 @@ class LiftFrameworkProject(info: ProjectInfo) extends ParentProject(info) with L
// FIXME: Build fails with -Xcheckinit -Xwarninit
override def compileOptions = super.compileOptions.toList -- compileOptions("-Xcheckinit", "-Xwarninit").toList
+ // OSGi stuff
+ override def bndExportPackage = Seq("net.liftweb.*;version=\"%s\"".format(projectVersion.value))
+ override def bndImportPackage = "net.liftweb.*;version=\"%s\"".format(projectVersion.value) :: super.bndImportPackage.toList
+
// System properties necessary during test TODO: Figure out how to make this a subdir of persistence/ldap/
System.setProperty("apacheds.working.dir", (outputPath / "apacheds").absolutePath)
}
@@ -6,4 +6,5 @@ class Plugins(info: ProjectInfo) extends PluginDefinition(info) {
// Add plugin
lazy val a = "net.liftweb" % "lift-sbt" % "2.4-SNAPSHOT"
+ lazy val bnd4sbt = "com.weiglewilczek.bnd4sbt" % "bnd4sbt" % "1.0.2"
}

0 comments on commit d7daee7

Please sign in to comment.