svn commit: r1134116 - in /esme/trunk/server: build.sbt project/build.properties project/build/ project/plugins/Plugins.scala project/plugins/build.sbt src/main/scala/org/apache/esme/actor/ScalaInterpreter.scala

[le...@apache.org]

Author: lester
Date: Thu Jun  9 22:24:52 2011
New Revision: 1134116

URL: http://svn.apache.org/viewvc?rev=1134116&view=rev
Log:
Completed ESME-349: Migrate to SBT 0.10.0

Added:
    esme/trunk/server/build.sbt
    esme/trunk/server/project/plugins/build.sbt
Removed:
    esme/trunk/server/project/build/
    esme/trunk/server/project/plugins/Plugins.scala
Modified:
    esme/trunk/server/project/build.properties
    esme/trunk/server/src/main/scala/org/apache/esme/actor/ScalaInterpreter.scala

Added: esme/trunk/server/build.sbt
URL: http://svn.apache.org/viewvc/esme/trunk/server/build.sbt?rev=1134116&view=auto
==============================================================================
--- esme/trunk/server/build.sbt (added)
+++ esme/trunk/server/build.sbt Thu Jun  9 22:24:52 2011
@@ -0,0 +1,67 @@
+name := "Apache Enterprise Social Messaging Environment (ESME)"
+
+version := "1.3"
+
+organization := "Apache Software Foundation"
+
+scalaVersion := "2.8.1"
+
+seq(WebPlugin.webSettings: _*)
+
+ivyXML :=
+    <dependencies>
+      <dependency org="net.lag" name="configgy" rev="2.0.1">
+        <exclude org="org.scala-tools" module="vscaladoc"/>
+      </dependency>
+      <dependency org="com.twitter" name="ostrich" rev="2.3.2">
+        <exclude org="org.scala-tools" module="vscaladoc"/>
+      </dependency>
+    </dependencies>
+
+libraryDependencies ++= {
+  val liftVersion = "2.3"
+  val compassVersion = "2.1.1"
+  val luceneVersion = "2.4.0"
+  Seq(
+    "net.liftweb" %% "lift-util" % liftVersion % "compile->default",
+    "net.liftweb" %% "lift-webkit" % liftVersion % "compile->default",
+    "net.liftweb" %% "lift-widgets" % liftVersion % "compile->default",
+    "net.liftweb" %% "lift-mapper" % liftVersion % "compile->default",
+    "net.liftweb" %% "lift-testkit" % liftVersion % "compile->default",
+    "net.liftweb" %% "lift-openid" % liftVersion % "compile->default",
+    "net.liftweb" %% "lift-actor" % liftVersion % "compile->default",
+    "net.liftweb" %% "lift-json" % liftVersion % "compile->default",
+    "net.liftweb" %% "lift-common" % liftVersion % "compile->default",
+    "net.liftweb" %% "lift-ldap" % liftVersion % "compile->default",
+    "net.liftweb" %% "lift-textile" % liftVersion % "compile->default",
+    "javax.servlet" % "servlet-api" % "2.5" % "provided->default",
+    "org.compass-project" % "compass" % compassVersion % "compile->default",
+    "org.apache.lucene" % "lucene-core" % luceneVersion % "compile->default",
+    "org.apache.lucene" % "lucene-snowball" % luceneVersion % "compile->default",
+    "commons-httpclient" % "commons-httpclient" % "3.1" % "compile->default",
+    "org.apache.derby" % "derby" % "10.5.3.0_1" % "compile->default",
+    "org.mortbay.jetty" % "jetty" % "[6.1.6,)" % "jetty->default",
+    "junit" % "junit" % "3.8.1" % "test->default",
+    "junit" % "junit" % "4.4" % "test->default",
+    "log4j" % "log4j" % "1.2.16" % "compile->default",
+    "org.slf4j" % "slf4j-api" % "1.6.1" % "compile->default",
+    "org.slf4j" % "slf4j-log4j12" % "1.6.1" % "compile->default",
+    "org.scala-tools.testing" %% "specs" % "1.6.6" % "test->default",
+    "org.scala-lang" % "scala-compiler" % "2.8.1" % "test->default",
+    "org.mortbay.jetty" % "jetty" % "[6.1.6,)" % "test->default"
+  )
+}
+
+resolvers += "Local Maven Repository" at "file://"+Path.userHome.absolutePath+"/.m2/repository"
+
+resolvers += ScalaToolsSnapshots
+
+resolvers += "Compass Repository" at "http://repo.compass-project.org"
+
+resolvers += "Twitter Repository" at "http://maven.twttr.com"
+
+// Execute tests in the current project serially.
+// Tests from other projects may still run concurrently.
+//parallelExecution in Test := false
+
+//scalacOptions += "-Xprint:typer"
\ No newline at end of file

Modified: esme/trunk/server/project/build.properties
URL: http://svn.apache.org/viewvc/esme/trunk/server/project/build.properties?rev=1134116&r1=1134115&r2=1134116&view=diff
==============================================================================
--- esme/trunk/server/project/build.properties (original)
+++ esme/trunk/server/project/build.properties Thu Jun  9 22:24:52 2011
@@ -1,8 +1 @@
-#Project properties
-project.organization=Apache Software Foundation
-project.name=Apache Enterprise Social Messaging Environment (ESME)
-sbt.version=0.7.5
-project.version=1.2
-def.scala.version=2.8.1
-build.scala.versions=2.8.1
-project.initialize=false
+sbt.version=0.10.0
\ No newline at end of file

Added: esme/trunk/server/project/plugins/build.sbt
URL: http://svn.apache.org/viewvc/esme/trunk/server/project/plugins/build.sbt?rev=1134116&view=auto
==============================================================================
--- esme/trunk/server/project/plugins/build.sbt (added)
+++ esme/trunk/server/project/plugins/build.sbt Thu Jun  9 22:24:52 2011
@@ -0,0 +1,4 @@
+resolvers += "Web plugin repo" at "http://siasia.github.com/maven2"
+
+//Following means libraryDependencies += "com.github.siasia" %% "xsbt-web-plugin" % <sbt version>
+libraryDependencies <+= sbtVersion("com.github.siasia" %% "xsbt-web-plugin" % _)
\ No newline at end of file

Modified: esme/trunk/server/src/main/scala/org/apache/esme/actor/ScalaInterpreter.scala
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/scala/org/apache/esme/actor/ScalaInterpreter.scala?rev=1134116&r1=1134115&r2=1134116&view=diff
==============================================================================
--- esme/trunk/server/src/main/scala/org/apache/esme/actor/ScalaInterpreter.scala (original)
+++ esme/trunk/server/src/main/scala/org/apache/esme/actor/ScalaInterpreter.scala Thu Jun  9 22:24:52 2011
@@ -19,6 +19,8 @@
 
 package org.apache.esme.actor
 
+/**
+ * dpp commented out for security reasons
 import java.io.PrintWriter
 import scala.tools.nsc.Interpreter
 import scala.tools.nsc.Settings
@@ -28,8 +30,6 @@ import net.liftweb.util._
 import net.liftweb.common._
 import net.liftweb.actor._
 
-/**
- * dpp commented out for security reasons
 object ScalaInterpreter extends LiftActor {
 
   private val settings = new Settings()