You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@esme.apache.org by le...@apache.org on 2011/10/19 21:08:19 UTC
svn commit: r1186411 - in /esme/trunk/server: build.sbt pom.xml
src/main/scala/org/apache/esme/model/UserAuth.scala
Author: lester
Date: Wed Oct 19 19:08:19 2011
New Revision: 1186411
URL: http://svn.apache.org/viewvc?rev=1186411&view=rev
Log:
Introduced Scalaz library
Modified:
esme/trunk/server/build.sbt
esme/trunk/server/pom.xml
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=1186411&r1=1186410&r2=1186411&view=diff
==============================================================================
--- esme/trunk/server/build.sbt (original)
+++ esme/trunk/server/build.sbt Wed Oct 19 19:08:19 2011
@@ -10,6 +10,8 @@ organization := "Apache Software Foundat
scalaVersion := "2.9.1"
+scalazVersion := "6.0.3"
+
seq(webSettings :_*)
ivyXML :=
@@ -36,6 +38,7 @@ libraryDependencies ++= {
"net.liftweb" %% "lift-common" % liftVersion % "compile->default",
"net.liftweb" %% "lift-ldap" % liftVersion % "compile->default",
"net.liftweb" %% "lift-textile" % liftVersion % "compile->default",
+ "org.scalaz" %% "scalaz-core" % "6.0.3" % "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",
Modified: esme/trunk/server/pom.xml
URL: http://svn.apache.org/viewvc/esme/trunk/server/pom.xml?rev=1186411&r1=1186410&r2=1186411&view=diff
==============================================================================
--- esme/trunk/server/pom.xml (original)
+++ esme/trunk/server/pom.xml Wed Oct 19 19:08:19 2011
@@ -75,6 +75,7 @@
<properties>
<lift.version>2.4-M4</lift.version>
<scala.version>2.9.1</scala.version>
+ <scalaz.version>6.0.3</scalaz.version>
<compass.version>2.1.1</compass.version>
<lucene.version>2.4.0</lucene.version>
<netbeans.hint.deploy.server>gfv3</netbeans.hint.deploy.server>
@@ -208,6 +209,11 @@
<version>${lift.version}</version>
</dependency>
<dependency>
+ <groupId>org.scalaz</groupId>
+ <artifactId>scalaz-core_${scala.version}</artifactId>
+ <version>${scalaz.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.compass-project</groupId>
<artifactId>compass</artifactId>
<version>${compass.version}</version>
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=1186411&r1=1186410&r2=1186411&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 Wed Oct 19 19:08:19 2011
@@ -49,6 +49,9 @@ import provider.servlet.HTTPRequestServl
import scala.xml._
+import scalaz._
+import Scalaz._
+
import org.apache.esme.actor._
import org.openid4java.discovery.Identifier
@@ -375,10 +378,7 @@ object ContainerManagedAuthModule extend
def moduleName: String = "cm"
- val cmaPath = Props.get("cma.path") match {
- case Full(s) => s.split('/').toList
- case _ => List("cm", "login")
- }
+ val cmaPath = Props.get("cma.path").toOption.cata(_.split('/').toList, List("cm", "login"))
def performInit(): Unit = {