You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@esme.apache.org by es...@apache.org on 2011/10/20 17:08:17 UTC
svn commit: r1186844 - in /esme/trunk/server: build.sbt
src/main/scala/org/apache/esme/model/UserAuth.scala
Author: esjewett
Date: Thu Oct 20 15:08:17 2011
New Revision: 1186844
URL: http://svn.apache.org/viewvc?rev=1186844&view=rev
Log:
Fix the build by getting scalaz imports back under control :-)
Modified:
esme/trunk/server/build.sbt
esme/trunk/server/src/main/scala/org/apache/esme/model/UserAuth.scala
Modified: esme/trunk/server/build.sbt
URL: http://svn.apache.org/viewvc/esme/trunk/server/build.sbt?rev=1186844&r1=1186843&r2=1186844&view=diff
==============================================================================
--- esme/trunk/server/build.sbt (original)
+++ esme/trunk/server/build.sbt Thu Oct 20 15:08:17 2011
@@ -8,9 +8,7 @@ version := "1.4"
organization := "Apache Software Foundation"
-scalaVersion := "2.9.1"
-
-scalazVersion := "6.0.3"
+scalaVersion := "2.9.1"
seq(webSettings :_*)
@@ -26,7 +24,11 @@ libraryDependencies ++= {
val liftVersion = "2.4-M4"
val compassVersion = "2.1.1"
val luceneVersion = "2.4.0"
- val scalazVersion = "6.0.3"
+ val scalazVersion = "6.0.3"
+ val eclipsejettyVersion = "7.3.1.v20110307"
+ val mortbayjettyVersion = "[6.1.6,)"
+ val slf4jVersion = "1.6.1"
+ val scalatestVersion = "1.6.9"
Seq(
"net.liftweb" %% "lift-util" % liftVersion % "compile->default",
"net.liftweb" %% "lift-webkit" % liftVersion % "compile->default",
@@ -46,17 +48,17 @@ libraryDependencies ++= {
"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,)" % "container",
- "org.eclipse.jetty" % "jetty-server" % "7.3.1.v20110307" % "compile->default",
- "org.eclipse.jetty" % "jetty-servlet" % "7.3.1.v20110307" % "compile->default",
+ "org.mortbay.jetty" % "jetty" % mortbayjettyVersion % "container",
+ "org.eclipse.jetty" % "jetty-server" % eclipsejettyVersion % "compile->default",
+ "org.eclipse.jetty" % "jetty-servlet" % eclipsejettyVersion % "compile->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.9" % "test->default",
+ "org.slf4j" % "slf4j-api" % slf4jVersion % "compile->default",
+ "org.slf4j" % "slf4j-log4j12" % slf4jVersion % "compile->default",
+ "org.scala-tools.testing" %% "specs" % scalatestVersion % "test->default",
"org.scala-lang" % "scala-compiler" % scalaVersion % "test->default",
- "org.mortbay.jetty" % "jetty" % "[6.1.6,)" % "test->default"
+ "org.mortbay.jetty" % "jetty" % mortbayjettyVersion % "test->default"
)
}
Modified: esme/trunk/server/src/main/scala/org/apache/esme/model/UserAuth.scala
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/scala/org/apache/esme/model/UserAuth.scala?rev=1186844&r1=1186843&r2=1186844&view=diff
==============================================================================
--- esme/trunk/server/src/main/scala/org/apache/esme/model/UserAuth.scala (original)
+++ esme/trunk/server/src/main/scala/org/apache/esme/model/UserAuth.scala Thu Oct 20 15:08:17 2011
@@ -49,7 +49,7 @@ import provider.servlet.HTTPRequestServl
import scala.xml._
-import scalaz._
+import scalaz.{OptionW, Scalaz}
import Scalaz._
import org.apache.esme.actor._