~ first stage of migration to SBT 0.10.1
authorAlexandre Bertails <bertails@gmail.com>
Sun, 17 Jul 2011 16:47:30 -0400
changeset 378 a9b267ffe012
parent 377 b2781f6e50c0
child 379 111563c940f1
~ first stage of migration to SBT 0.10.1
project/BSBMPlugin.scala.egp
project/FeDeRateBuild.scala
project/build.properties
project/build/BSBMPlugin.scala
project/build/RDB2RDF.scala
project/plugins.egp/Plugins.scala
project/plugins/Plugins.scala
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/project/BSBMPlugin.scala.egp	Sun Jul 17 16:47:30 2011 -0400
@@ -0,0 +1,89 @@
+import sbt._
+import java.io.File
+import java.net.URL
+import Process._
+
+/**
+ * BSBMPlugin introduces two tasks in sbt
+ * - bsbm -> downloads, unpackages the Berlin SPARQL Benchmark and generates
+ *           a default set of sql file
+ * - bsbm-load -> execute one, several or all the generated sql scripts
+ *                this taks enables autocompletion for its valid arguments
+ * Requirements: src/main/resources/database.properties must be filled
+ *               with correct values to access the database
+ */
+trait BSBMPlugin extends Project { self =>
+
+  val unzipTo = path("target")
+  val bsbmtools = unzipTo / "bsbmtools"
+  val dataset = bsbmtools / "dataset"
+
+  /**
+   * download and unpackage bsbmtool
+   */
+  def downloadbsbm() = {
+    val zip = path("target") / "bsbmtools.zip" asFile
+
+    if (! zip.exists) {
+      val bsbmUrl = "http://downloads.sourceforge.net/project/bsbmtools/bsbmtools/bsbmtools-0.1/bsbmtools.zip"
+      new URL(bsbmUrl) #> zip ! log
+      FileUtilities.unzip(zip, unzipTo, log)
+    }
+  }
+
+  /**
+   * defines a task that downloads the BSBM tools and then
+   * creates the sql scripts with some default arguments
+   */
+  lazy val bsbm = task {
+
+    downloadbsbm()
+
+    FileUtilities.clean(dataset, log)
+    FileUtilities.clean(bsbmtools / "td_data", log)
+    ( (new java.lang.ProcessBuilder("java", "-cp", "bin:lib/ssj.jar", "benchmark.generator.Generator", "-fc", "-pc", "1000", "-s", "sql")) directory (bsbmtools asFile) ) ! log
+
+    None
+  }
+  
+  /**
+   * list all the generated sql scripts
+   */
+  def sqlFiles:List[String] = {
+    val sqlfiles = dataset * "*.sql" +++ "src" / "main" / "resources" * "*.sql"
+    sqlfiles.getFiles.map{ _.getAbsolutePath }.toList.sort{ _ < _ }
+  }
+
+  /* see http://code.google.com/p/simple-build-tool/wiki/Properties
+   * this is where we add a dependency to another property file
+   */
+  lazy val extra = new BasicEnvironment {
+    def log = self.log
+    def envBackingPath = "src" / "main" / "resources" / "database.properties"
+    lazy val host = property[String]
+    lazy val user = property[String]
+    lazy val password = property[String]
+  }
+
+  /**
+   * execute a mysql client command against a filename, which actually
+   * is a sql script
+   */
+  def load(filename:String) = {
+    log.info("loading "+filename)
+    val host = extra.host.value
+    val user = extra.user.value
+    val password = extra.password.value
+    ( (new java.lang.ProcessBuilder("mysql", "--host="+host, "--user="+user, "--password="+password, "-e", "source "+filename)) directory (dataset asFile) ) ! log
+  }
+
+  /**
+   * defines a task bsbm-load
+   */
+  lazy val bsbmLoad = task { args =>
+    val files:List[String] = if (args.length == 0) sqlFiles else args.toList
+    files foreach { file => load(file)}
+    task { None }
+  } completeWith sqlFiles
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/project/FeDeRateBuild.scala	Sun Jul 17 16:47:30 2011 -0400
@@ -0,0 +1,302 @@
+import sbt._
+import Keys._
+
+
+object Resolvers {
+  val scalaToolsRepo = "Scala Tools Release Repository" at "http://scala-tools.org/repo-releases"
+  val scalaToolsSnapRepo = "Scala Tools Snapshot Repository" at "http://scala-tools.org/repo-snapshots"
+  val scalatestRepo = "org.scalatest" % "scalatest" % "1.2-for-scala-2.8.0.final-SNAPSHOT" % "test"
+}
+
+object Dependencies {
+  val scalatest = "org.scalatest" % "scalatest_2.9.0" % "1.6.1"
+  val jena = "com.hp.hpl.jena" % "jena" % "2.6.4"
+  val jena_iri = "com.hp.hpl.jena" % "iri" % "0.8" from "http://openjena.org/repo/com/hp/hpl/jena/iri/0.8/iri-0.8.jar"
+  val arq = "com.hp.hpl.jena" % "arq" % "2.8.7"
+  val liftweb = "net.liftweb" %% "lift-webkit" % "2.3" % "compile"
+  val jetty = "org.eclipse.jetty" % "jetty-webapp" % "7.3.0.v20110203" % "jetty"
+  val logback = "ch.qos.logback" % "logback-classic" % "0.9.26"
+}
+
+
+//  override def compileOptions = super.compileOptions ++ Seq(Unchecked, Deprecation, ExplainTypes)
+//  override def defaultExcludes = super.defaultExcludes || "*~"
+
+object BuildSettings {
+
+  val buildOrganization = "org.w3"
+  val buildVersion      = "0.1-SNAPSHOT"
+  val buildScalaVersion = "2.9.0-1"
+
+  val buildSettings = Defaults.defaultSettings ++ Seq (
+    organization := buildOrganization,
+    version      := buildVersion,
+    scalaVersion := buildScalaVersion,
+//    shellPrompt  := ShellPrompt.buildShellPrompt,
+    parallelExecution in Test := true,
+//    testFrameworks += TestFrameworks.Specs2,
+    scalacOptions ++= Seq("-deprecation", "-unchecked") // ExplainTypes
+  )
+}
+
+object FeDeRateBuild extends Build {
+
+  import Resolvers._
+  import Dependencies._
+  import BuildSettings._
+
+  val testSuiteSettings = Seq(
+    libraryDependencies += scalatest
+  )
+
+  val testSettings = Seq(
+    libraryDependencies += scalatest % "test"
+  )
+
+  val jenaSettings = Seq(
+    libraryDependencies += Dependencies.jena,
+    libraryDependencies += jena_iri
+  )
+
+
+  lazy val federate = Project(
+    id = "federate",
+    base = file("."),
+    settings = buildSettings,
+    aggregate = Seq(isomorphic, rdb, sql, rdf, rdfdsl, turtle , rdfmodel_test, turtle, turtle_test, rdfxml, rdfxml_test, jena)
+//    aggregate = Seq(directmapping, isomorphic, project, rdf2rdf, rdfxml, sharedtestdata, sparql2sparql2sql, sql, turtle, directmapping-test, jena, rdb, rdfdsl, rdfxml-test, sparql, sparql2sql, sql2sql, turtle-test, directmapping-webapp, jena-test, rdf, rdfmodel-test, sparql2sparql, sparql2sqlendpoint)
+  )
+
+  lazy val isomorphic = Project(
+    id = "isomorphic",
+    base = file("isomorphic"),
+    settings = buildSettings
+  )
+
+  lazy val rdb = Project(
+    id = "rdb",
+    base = file("rdb"),
+    settings = buildSettings
+  )
+
+  lazy val sql = Project(
+    id = "sql",
+    base = file("sql"),
+    settings = buildSettings ++ testSettings
+  ) dependsOn (rdb)
+
+  lazy val rdf = Project(
+    id = "rdf",
+    base = file("rdf"),
+    settings = buildSettings
+  ) dependsOn (isomorphic)
+
+  lazy val rdfmodel_test = Project(
+    id = "rdfmodel-test",
+    base = file("rdfmodel-test"),
+    settings = buildSettings ++ testSuiteSettings
+  ) dependsOn (rdf)
+
+  lazy val rdfdsl = Project(
+    id = "rdfdsl",
+    base = file("rdfdsl"),
+    settings = buildSettings
+  ) dependsOn (rdf)
+
+  lazy val turtle = Project(
+    id = "turtle",
+    base = file("turtle"),
+    settings = buildSettings
+  ) dependsOn (rdf)
+
+  lazy val turtle_test = Project(
+    id = "turtle-test",
+    base = file("turtle-test"),
+    settings = buildSettings ++ testSuiteSettings
+  ) dependsOn (turtle)
+
+  lazy val rdfxml = Project(
+    id = "rdfxml",
+    base = file("rdfxml"),
+    settings = buildSettings ++ jenaSettings
+  ) dependsOn (rdf)
+
+  lazy val rdfxml_test = Project(
+    id = "rdfxml-test",
+    base = file("rdfxml-test"),
+    settings = buildSettings ++ jenaSettings ++ testSuiteSettings
+  ) dependsOn (rdfxml)
+
+  lazy val jena = Project(
+    id = "jena",
+    base = file("jena"),
+    settings = buildSettings ++ jenaSettings
+  ) dependsOn (rdf)
+
+//  lazy val jenaTest = project("jena-test", "jena-test", new JenaTest(_), jena, rdfmodelTest, directmappingTest, turtleTest, rdfxmlTest)
+//  lazy val jena_test = Project(
+//    id = "jena-test",
+//    base = file("jena-test"),
+//    settings = buildSettings ++ jenaSettings ++ testSettings
+//  ) dependsOn (jena)
+
+
+
+
+
+//  lazy val salatUtil = {
+//    val id = "salat-util"
+//    val base = file("salat-util")
+//    val settings = buildSettings ++ Seq(
+//      libraryDependencies ++= utilDeps,
+//      libraryDependencies += slf4jSimple,
+//      libraryDependencies <+= scalaVersion("org.scala-lang" % "scalap" % _)
+//    )
+//    Project(id = id, base = base, settings = settings)
+//  }
+//
+//  lazy val salatCore = Project(
+//    id = "salat-core",
+//    base = file("salat-core"),
+//    settings = buildSettings ++ Seq(libraryDependencies += casbah_core)
+//  ) dependsOn (salatUtil)
+//
+
+
+}
+
+
+//class FeDeRate(info: ProjectInfo) extends ParentProject(info) {
+//  self =>
+//
+//  val feDeRatePath = Path.fromFile(".")
+//
+//  lazy val turtleTest = project("turtle-test", "turtle-test", new TurtleTest(_), turtle)
+//  lazy val rdfxml = project("rdfxml", "rdfxml", new RDFXML(_), rdf)
+//  lazy val rdfxmlTest = project("rdfxml-test", "rdfxml-test", new RDFXMLTest(_), rdfxml)
+//  lazy val jena = project("jena", "jena", new Jena(_), rdf)
+//  lazy val jenaTest = project("jena-test", "jena-test", new JenaTest(_), jena, rdfmodelTest, directmappingTest, turtleTest, rdfxmlTest)
+//  lazy val rdf2rdf = project("rdf2rdf", "rdf2rdf", new RDF2RDF(_), jena, directmapping)
+//  lazy val sharedtestdata = project("sharedtestdata", "sharedtestdata", new SharedTestData(_), rdb, rdf, sql, turtle)
+//  lazy val directmapping = project("directmapping", "directmapping", new DirectMapping(_), rdb, rdf, sql, sharedtestdata)
+//  lazy val directmappingWebapp = project("directmapping-webapp", "directmapping-webapp", new DirectMappingWebapp(_), directmapping, jena, rdf2rdf)
+//  lazy val directmappingTest = project("directmapping-test", "directmapping-test", new DirectMappingTest(_), directmapping, jena)
+//  lazy val sparql = project("sparql", "sparql", new SPARQL(_), rdf)
+//  lazy val sparql2sql = project("sparql2sql", "sparql2sql", new SPARQL2SQL(_), sparql, sql)
+//  lazy val sparql2sparql = project("sparql2sparql", "sparql2sparql", new SPARQL2SPARQL(_), sparql)
+//  lazy val sparql2sparql2sql = project("sparql2sparql2sql", "sparql2sparql2sql", new SPARQL2SPARQL2SQL(_), sparql2sparql, sparql2sql)
+//  lazy val sparql2sqlendpoint = project("sparql2sqlendpoint", "sparql2sqlendpoint", new SPARQL2SQLEndPoint(_), sparql2sql)
+//  lazy val sparql2sqlendpointJar = project("sparql2sqlendpointjar", "sparql2sqlendpointjar", new SPARQL2SQLEndPointJar(_), sparql2sqlendpoint)
+//
+//  class Isomorphic(info: ProjectInfo) extends DefaultProject(info) with Common
+//
+//  class RDB(info: ProjectInfo) extends DefaultProject(info) with Common
+//
+//  class SQL(info: ProjectInfo) extends DefaultProject(info) with Common
+//
+//  class RDF(info: ProjectInfo) extends DefaultProject(info) with Common
+//
+//  class RDFDSL(info: ProjectInfo) extends DefaultProject(info) with Common
+//
+//  class RDFModelTest(info: ProjectInfo) extends DefaultProject(info) with TestSuite
+//
+//  class Turtle(info: ProjectInfo) extends DefaultProject(info) with Common
+//
+//  class TurtleTest(info: ProjectInfo) extends DefaultProject(info) with TestSuite
+//
+//  class RDFXML(info: ProjectInfo) extends DefaultProject(info) with Common {
+//    val jena = "com.hp.hpl.jena" % "jena" % "2.6.4"
+//    val jenaIri = "com.hp.hpl.jena" % "iri" % "0.8" from "http://openjena.org/repo/com/hp/hpl/jena/iri/0.8/iri-0.8.jar"
+//  }
+//
+//  class RDFXMLTest(info: ProjectInfo) extends DefaultProject(info) with TestSuite
+//
+//  class Jena(info: ProjectInfo) extends DefaultProject(info) with Common {
+//    val jena = "com.hp.hpl.jena" % "jena" % "2.6.4"
+//    val jenaIri = "com.hp.hpl.jena" % "iri" % "0.8" from "http://openjena.org/repo/com/hp/hpl/jena/iri/0.8/iri-0.8.jar"
+//  }
+//
+//  class JenaTest(info: ProjectInfo) extends DefaultProject(info) with Common
+//
+//  class RDF2RDF(info: ProjectInfo) extends DefaultProject(info) with Common {
+////    val jena = "com.hp.hpl.jena" % "jena" % "2.6.4"
+////    val jenaIri = "com.hp.hpl.jena" % "iri" % "0.8" from "http://openjena.org/repo/com/hp/hpl/jena/iri/0.8/iri-0.8.jar"
+//    val arq = "com.hp.hpl.jena" % "arq" % "2.8.7"
+//  }
+//
+//
+//  class SharedTestData(info: ProjectInfo) extends DefaultProject(info) with Common
+//
+//  class DirectMapping(info: ProjectInfo) extends DefaultProject(info) with Common
+//
+//  class DirectMappingWebapp(info: ProjectInfo) extends DefaultWebProject(info) with Common {
+//    val liftVersion = "2.3-RC5"
+//    override def libraryDependencies = Set(
+//      "net.liftweb" %% "lift-widgets" % liftVersion % "compile",
+////     "net.liftweb" %% "lift-webkit" % liftVersion % "compile",
+////     "net.liftweb" %% "lift-mapper" % liftVersion % "compile",
+////     "com.h2database" % "h2" % "1.2.138",
+//// 
+//      "net.liftweb" %% "lift-webkit" % liftVersion % "compile->default",
+//      // "org.mortbay.jetty" % "jetty" % "6.1.22" % "test->default",
+//      "org.mortbay.jetty" % "jetty" % "6.1.22" % "compile,jetty",
+//      // "org.eclipse.jetty" % "jetty-webapp" % "7.0.2.v20100331" % "compile,jetty",
+//      // "org.eclipse.jetty" % "jetty-webapp" % "7.3.1.v20110307" % "compile,jetty",
+//      "junit" % "junit" % "4.5" % "test->default",
+//      "ch.qos.logback" % "logback-classic" % "0.9.26",
+//      "org.scala-tools.testing" %% "specs" % "1.6.6" % "test->default"
+//    ) ++ super.libraryDependencies
+//
+//    val jettyConf = config("jetty")
+//    // val jettyDep = "org.eclipse.jetty" % "jetty-webapp" % "7.0.2.v20100331" % "compile,jetty"
+//    override def jettyClasspath = managedClasspath(jettyConf)
+//  }
+//
+//  class DirectMappingTest(info: ProjectInfo) extends DefaultProject(info) with TestSuite
+//
+//  class SPARQL(info: ProjectInfo) extends DefaultProject(info) with Common
+//
+//  class SPARQL2SQL(info: ProjectInfo) extends DefaultProject(info) with Common
+//
+//  class SPARQL2SPARQL(info: ProjectInfo) extends DefaultProject(info) with Common
+//
+//  class SPARQL2SQLEndPoint(info: ProjectInfo) extends DefaultWebProject(info) with Common with BSBMPlugin {
+////    val jettyConf = config("jetty")
+////    /* http://repo1.maven.org/maven2 */
+////    val jettyDep = "org.eclipse.jetty" % "jetty-webapp" % "7.0.2.v20100331" % "compile,jetty"
+////    override def jettyClasspath = managedClasspath(jettyConf)
+////    val mysql = "mysql" % "mysql-connector-java" % "5.1.13"
+////    val postgresql = "postgresql" % "postgresql" % "9.0-801.jdbc4"
+////    val codaRepo = "Coda Hale's Repository" at "http://repo.codahale.com/"
+////    val fig = "com.codahale" %% "fig" % "1.0.7" withSources()
+////    override def webappUnmanaged = super.webappUnmanaged +++ ("src" / "main" / "resources" / "database.properties")
+//  }
+//
+//  class SPARQL2SPARQL2SQL(info: ProjectInfo) extends DefaultProject(info) with Common
+//
+//  class SPARQL2SQLEndPointJar(info: ProjectInfo) extends DefaultProject(info) with ProguardProject {
+//
+//    // defines the default main class
+//    override def mainClass: Option[String] = Some("org.w3.sparql2sqlendpoint.SPARQL2SQLEndpoint")
+//
+//    // tells Proguard to take some more JAR/WAR/.class
+//    override def proguardInJars =
+//      super.proguardInJars +++
+//      // we need the Scala library
+//      scalaLibraryPath +++
+//      // the Proguard plugin does not considerer the .war files so we include the generated bytecode
+//      (self.feDeRatePath / "sparql2sqlendpoint" / "target" / "scala_2.8.0" / "classes") +++
+//      // ships the default configuration
+//      (self.feDeRatePath / "sparql2sqlendpoint" / "src" / "main" / "resources")
+//
+//    override def proguardOptions = List(
+//      proguardKeepAllScala,
+//      // automatically generates the MANIFEST.MF
+//      proguardKeepMain(mainClass.get),
+//      // keeps all the SQL drivers we can find
+//      "-keep public class * implements java.sql.Driver"
+//    )
+//
+//  }
+//
+//}
--- a/project/build.properties	Thu May 26 02:12:50 2011 +0200
+++ b/project/build.properties	Sun Jul 17 16:47:30 2011 -0400
@@ -1,8 +1,1 @@
-#Project Properties
-#Fri Feb 12 14:44:29 EST 2010
-project.organization=w3c
-project.name=FeDeRate
-project.version=1.0
-sbt.version=0.7.4
-build.scala.versions=2.8.1
-project.initialize=false
+sbt.version=0.10.1
--- a/project/build/BSBMPlugin.scala	Thu May 26 02:12:50 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-import sbt._
-import java.io.File
-import java.net.URL
-import Process._
-
-/**
- * BSBMPlugin introduces two tasks in sbt
- * - bsbm -> downloads, unpackages the Berlin SPARQL Benchmark and generates
- *           a default set of sql file
- * - bsbm-load -> execute one, several or all the generated sql scripts
- *                this taks enables autocompletion for its valid arguments
- * Requirements: src/main/resources/database.properties must be filled
- *               with correct values to access the database
- */
-trait BSBMPlugin extends Project { self =>
-
-  val unzipTo = path("target")
-  val bsbmtools = unzipTo / "bsbmtools"
-  val dataset = bsbmtools / "dataset"
-
-  /**
-   * download and unpackage bsbmtool
-   */
-  def downloadbsbm() = {
-    val zip = path("target") / "bsbmtools.zip" asFile
-
-    if (! zip.exists) {
-      val bsbmUrl = "http://downloads.sourceforge.net/project/bsbmtools/bsbmtools/bsbmtools-0.1/bsbmtools.zip"
-      new URL(bsbmUrl) #> zip ! log
-      FileUtilities.unzip(zip, unzipTo, log)
-    }
-  }
-
-  /**
-   * defines a task that downloads the BSBM tools and then
-   * creates the sql scripts with some default arguments
-   */
-  lazy val bsbm = task {
-
-    downloadbsbm()
-
-    FileUtilities.clean(dataset, log)
-    FileUtilities.clean(bsbmtools / "td_data", log)
-    ( (new java.lang.ProcessBuilder("java", "-cp", "bin:lib/ssj.jar", "benchmark.generator.Generator", "-fc", "-pc", "1000", "-s", "sql")) directory (bsbmtools asFile) ) ! log
-
-    None
-  }
-  
-  /**
-   * list all the generated sql scripts
-   */
-  def sqlFiles:List[String] = {
-    val sqlfiles = dataset * "*.sql" +++ "src" / "main" / "resources" * "*.sql"
-    sqlfiles.getFiles.map{ _.getAbsolutePath }.toList.sort{ _ < _ }
-  }
-
-  /* see http://code.google.com/p/simple-build-tool/wiki/Properties
-   * this is where we add a dependency to another property file
-   */
-  lazy val extra = new BasicEnvironment {
-    def log = self.log
-    def envBackingPath = "src" / "main" / "resources" / "database.properties"
-    lazy val host = property[String]
-    lazy val user = property[String]
-    lazy val password = property[String]
-  }
-
-  /**
-   * execute a mysql client command against a filename, which actually
-   * is a sql script
-   */
-  def load(filename:String) = {
-    log.info("loading "+filename)
-    val host = extra.host.value
-    val user = extra.user.value
-    val password = extra.password.value
-    ( (new java.lang.ProcessBuilder("mysql", "--host="+host, "--user="+user, "--password="+password, "-e", "source "+filename)) directory (dataset asFile) ) ! log
-  }
-
-  /**
-   * defines a task bsbm-load
-   */
-  lazy val bsbmLoad = task { args =>
-    val files:List[String] = if (args.length == 0) sqlFiles else args.toList
-    files foreach { file => load(file)}
-    task { None }
-  } completeWith sqlFiles
-
-}
--- a/project/build/RDB2RDF.scala	Thu May 26 02:12:50 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,157 +0,0 @@
-import sbt._
-
-trait Common extends BasicScalaProject {
-  val scalatools = "scala-tools" at "http://scala-tools.org/repo-snapshots"
-  val scalatest = "org.scalatest" % "scalatest" % "1.2-for-scala-2.8.0.final-SNAPSHOT" % "test"
-  override def compileOptions = super.compileOptions ++ Seq(Unchecked, Deprecation, ExplainTypes)
-  override def defaultExcludes = super.defaultExcludes || "*~"
-}
-
-trait TestSuite extends BasicScalaProject {
-  val scalatools = "scala-tools" at "http://scala-tools.org/repo-snapshots"
-  val scalatest = "org.scalatest" % "scalatest" % "1.2-for-scala-2.8.0.final-SNAPSHOT" % "compile"
-  override def compileOptions = super.compileOptions ++ Seq(Unchecked, Deprecation, ExplainTypes)
-  override def defaultExcludes = super.defaultExcludes || "*~"
-}
-
-class FeDeRate(info: ProjectInfo) extends ParentProject(info) {
-  self =>
-
-  val feDeRatePath = Path.fromFile(".")
-
-  lazy val isomorphic = project("isomorphic", "isomorphic", new Isomorphic(_))
-  lazy val rdb = project("rdb", "rdb", new RDB(_))
-  lazy val sql = project("sql", "sql", new SQL(_), rdb)
-  lazy val rdf = project("rdf", "rdf", new RDF(_), isomorphic)
-  lazy val rdfmodelTest = project("rdfmodel-test", "rdfmodel-test", new RDFModelTest(_), rdf)
-  lazy val rdfdsl = project("rdfdsl", "rdfdsl", new RDFDSL(_), rdf)
-  lazy val turtle = project("turtle", "turtle", new Turtle(_), rdf)
-  lazy val turtleTest = project("turtle-test", "turtle-test", new TurtleTest(_), turtle)
-  lazy val rdfxml = project("rdfxml", "rdfxml", new RDFXML(_), rdf)
-  lazy val rdfxmlTest = project("rdfxml-test", "rdfxml-test", new RDFXMLTest(_), rdfxml)
-  lazy val jena = project("jena", "jena", new Jena(_), rdf)
-  lazy val jenaTest = project("jena-test", "jena-test", new JenaTest(_), jena, rdfmodelTest, directmappingTest, turtleTest, rdfxmlTest)
-  lazy val rdf2rdf = project("rdf2rdf", "rdf2rdf", new RDF2RDF(_), jena, directmapping)
-  lazy val sharedtestdata = project("sharedtestdata", "sharedtestdata", new SharedTestData(_), rdb, rdf, sql, turtle)
-  lazy val directmapping = project("directmapping", "directmapping", new DirectMapping(_), rdb, rdf, sql, sharedtestdata)
-  lazy val directmappingWebapp = project("directmapping-webapp", "directmapping-webapp", new DirectMappingWebapp(_), directmapping, jena, rdf2rdf)
-  lazy val directmappingTest = project("directmapping-test", "directmapping-test", new DirectMappingTest(_), directmapping, jena)
-  lazy val sparql = project("sparql", "sparql", new SPARQL(_), rdf)
-  lazy val sparql2sql = project("sparql2sql", "sparql2sql", new SPARQL2SQL(_), sparql, sql)
-  lazy val sparql2sparql = project("sparql2sparql", "sparql2sparql", new SPARQL2SPARQL(_), sparql)
-  lazy val sparql2sparql2sql = project("sparql2sparql2sql", "sparql2sparql2sql", new SPARQL2SPARQL2SQL(_), sparql2sparql, sparql2sql)
-  lazy val sparql2sqlendpoint = project("sparql2sqlendpoint", "sparql2sqlendpoint", new SPARQL2SQLEndPoint(_), sparql2sql)
-  lazy val sparql2sqlendpointJar = project("sparql2sqlendpointjar", "sparql2sqlendpointjar", new SPARQL2SQLEndPointJar(_), sparql2sqlendpoint)
-
-  class Isomorphic(info: ProjectInfo) extends DefaultProject(info) with Common
-
-  class RDB(info: ProjectInfo) extends DefaultProject(info) with Common
-
-  class SQL(info: ProjectInfo) extends DefaultProject(info) with Common
-
-  class RDF(info: ProjectInfo) extends DefaultProject(info) with Common
-
-  class RDFDSL(info: ProjectInfo) extends DefaultProject(info) with Common
-
-  class RDFModelTest(info: ProjectInfo) extends DefaultProject(info) with TestSuite
-
-  class Turtle(info: ProjectInfo) extends DefaultProject(info) with Common
-
-  class TurtleTest(info: ProjectInfo) extends DefaultProject(info) with TestSuite
-
-  class RDFXML(info: ProjectInfo) extends DefaultProject(info) with Common {
-    val jena = "com.hp.hpl.jena" % "jena" % "2.6.4"
-    val jenaIri = "com.hp.hpl.jena" % "iri" % "0.8" from "http://openjena.org/repo/com/hp/hpl/jena/iri/0.8/iri-0.8.jar"
-  }
-
-  class RDFXMLTest(info: ProjectInfo) extends DefaultProject(info) with TestSuite
-
-  class Jena(info: ProjectInfo) extends DefaultProject(info) with Common {
-    val jena = "com.hp.hpl.jena" % "jena" % "2.6.4"
-    val jenaIri = "com.hp.hpl.jena" % "iri" % "0.8" from "http://openjena.org/repo/com/hp/hpl/jena/iri/0.8/iri-0.8.jar"
-  }
-
-  class JenaTest(info: ProjectInfo) extends DefaultProject(info) with Common
-
-  class RDF2RDF(info: ProjectInfo) extends DefaultProject(info) with Common {
-//    val jena = "com.hp.hpl.jena" % "jena" % "2.6.4"
-//    val jenaIri = "com.hp.hpl.jena" % "iri" % "0.8" from "http://openjena.org/repo/com/hp/hpl/jena/iri/0.8/iri-0.8.jar"
-    val arq = "com.hp.hpl.jena" % "arq" % "2.8.7"
-  }
-
-
-  class SharedTestData(info: ProjectInfo) extends DefaultProject(info) with Common
-
-  class DirectMapping(info: ProjectInfo) extends DefaultProject(info) with Common
-
-  class DirectMappingWebapp(info: ProjectInfo) extends DefaultWebProject(info) with Common {
-    val liftVersion = "2.3-RC5"
-    override def libraryDependencies = Set(
-      "net.liftweb" %% "lift-widgets" % liftVersion % "compile",
-//     "net.liftweb" %% "lift-webkit" % liftVersion % "compile",
-//     "net.liftweb" %% "lift-mapper" % liftVersion % "compile",
-//     "com.h2database" % "h2" % "1.2.138",
-// 
-      "net.liftweb" %% "lift-webkit" % liftVersion % "compile->default",
-      // "org.mortbay.jetty" % "jetty" % "6.1.22" % "test->default",
-      "org.mortbay.jetty" % "jetty" % "6.1.22" % "compile,jetty",
-      // "org.eclipse.jetty" % "jetty-webapp" % "7.0.2.v20100331" % "compile,jetty",
-      // "org.eclipse.jetty" % "jetty-webapp" % "7.3.1.v20110307" % "compile,jetty",
-      "junit" % "junit" % "4.5" % "test->default",
-      "ch.qos.logback" % "logback-classic" % "0.9.26",
-      "org.scala-tools.testing" %% "specs" % "1.6.6" % "test->default"
-    ) ++ super.libraryDependencies
-
-    val jettyConf = config("jetty")
-    // val jettyDep = "org.eclipse.jetty" % "jetty-webapp" % "7.0.2.v20100331" % "compile,jetty"
-    override def jettyClasspath = managedClasspath(jettyConf)
-  }
-
-  class DirectMappingTest(info: ProjectInfo) extends DefaultProject(info) with TestSuite
-
-  class SPARQL(info: ProjectInfo) extends DefaultProject(info) with Common
-
-  class SPARQL2SQL(info: ProjectInfo) extends DefaultProject(info) with Common
-
-  class SPARQL2SPARQL(info: ProjectInfo) extends DefaultProject(info) with Common
-
-  class SPARQL2SQLEndPoint(info: ProjectInfo) extends DefaultWebProject(info) with Common with BSBMPlugin {
-//    val jettyConf = config("jetty")
-//    /* http://repo1.maven.org/maven2 */
-//    val jettyDep = "org.eclipse.jetty" % "jetty-webapp" % "7.0.2.v20100331" % "compile,jetty"
-//    override def jettyClasspath = managedClasspath(jettyConf)
-//    val mysql = "mysql" % "mysql-connector-java" % "5.1.13"
-//    val postgresql = "postgresql" % "postgresql" % "9.0-801.jdbc4"
-//    val codaRepo = "Coda Hale's Repository" at "http://repo.codahale.com/"
-//    val fig = "com.codahale" %% "fig" % "1.0.7" withSources()
-//    override def webappUnmanaged = super.webappUnmanaged +++ ("src" / "main" / "resources" / "database.properties")
-  }
-
-  class SPARQL2SPARQL2SQL(info: ProjectInfo) extends DefaultProject(info) with Common
-
-  class SPARQL2SQLEndPointJar(info: ProjectInfo) extends DefaultProject(info) with ProguardProject {
-
-    // defines the default main class
-    override def mainClass: Option[String] = Some("org.w3.sparql2sqlendpoint.SPARQL2SQLEndpoint")
-
-    // tells Proguard to take some more JAR/WAR/.class
-    override def proguardInJars =
-      super.proguardInJars +++
-      // we need the Scala library
-      scalaLibraryPath +++
-      // the Proguard plugin does not considerer the .war files so we include the generated bytecode
-      (self.feDeRatePath / "sparql2sqlendpoint" / "target" / "scala_2.8.0" / "classes") +++
-      // ships the default configuration
-      (self.feDeRatePath / "sparql2sqlendpoint" / "src" / "main" / "resources")
-
-    override def proguardOptions = List(
-      proguardKeepAllScala,
-      // automatically generates the MANIFEST.MF
-      proguardKeepMain(mainClass.get),
-      // keeps all the SQL drivers we can find
-      "-keep public class * implements java.sql.Driver"
-    )
-
-  }
-
-}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/project/plugins.egp/Plugins.scala	Sun Jul 17 16:47:30 2011 -0400
@@ -0,0 +1,5 @@
+import sbt._
+
+class Plugins(info: ProjectInfo) extends PluginDefinition(info) {
+  val proguard = "org.scala-tools.sbt" % "sbt-proguard-plugin" % "0.0.5"
+}
--- a/project/plugins/Plugins.scala	Thu May 26 02:12:50 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-import sbt._
-
-class Plugins(info: ProjectInfo) extends PluginDefinition(info) {
-  val proguard = "org.scala-tools.sbt" % "sbt-proguard-plugin" % "0.0.5"
-}