--- a/project/build.scala Sat Oct 22 19:14:30 2011 +0200
+++ b/project/build.scala Sat Oct 22 20:36:17 2011 +0200
@@ -6,12 +6,13 @@
object Dependencies {
val specs = "org.scala-tools.testing" %% "specs" % "1.6.9" % "test"
val dispatch_http = "net.databinder" %% "dispatch-http" % "0.8.5"
- val unfiltered_filter = "net.databinder" %% "unfiltered-filter" % "0.5.0"
- val unfiltered_jetty = "net.databinder" %% "unfiltered-jetty" % "0.5.0"
+ val unfiltered_version = "0.5.1"
+ val unfiltered_filter = "net.databinder" %% "unfiltered-filter" % unfiltered_version
+ val unfiltered_jetty = "net.databinder" %% "unfiltered-jetty" % unfiltered_version
// val unfiltered_spec = "net.databinder" %% "unfiltered-spec" % "0.4.1" % "test"
val ivyUnfilteredSpec =
<dependencies>
- <dependency org="net.databinder" name="unfiltered-spec_2.9.1" rev="0.5.0">
+ <dependency org="net.databinder" name="unfiltered-spec_2.9.1" rev={unfiltered_version}>
<exclude org="net.databinder" module="dispatch-mime_2.9.0-1"/>
</dependency>
</dependencies>
--- a/src/main/scala/ReadWriteWebMain.scala Sat Oct 22 19:14:30 2011 +0200
+++ b/src/main/scala/ReadWriteWebMain.scala Sat Oct 22 20:36:17 2011 +0200
@@ -66,7 +66,7 @@
}
}
- implicit val webCache = new WebCache()
+ val webCache = new WebCache()
val baseURL = parser.parameter[String]("baseURL", "base URL", false)
@@ -75,8 +75,7 @@
object ReadWriteWebMain extends ReadWriteWebArgs {
- implicit def planify(intent: Plan.Intent): unfiltered.filter.Plan =
- unfiltered.filter.Planify(intent)
+ import unfiltered.filter.Planify
// regular Java main
def main(args: Array[String]) {
@@ -107,11 +106,16 @@
ctx.resources(ClasspathUtils.fromClasspath("public/").toURI.toURL)
}.
filter(app.plan).
-// filter(new X509view().intent[HttpServletRequest,HttpServletResponse]).
+ filter(Planify(x509v.intent)).
filter(new EchoPlan().plan).run()
}
+ object x509v extends X509view[HttpServletRequest,HttpServletResponse] {
+ def wc = webCache
+ def manif = manifest[HttpServletRequest]
+ }
+
}
--- a/src/main/scala/auth/X509view.scala Sat Oct 22 19:14:30 2011 +0200
+++ b/src/main/scala/auth/X509view.scala Sat Oct 22 20:36:17 2011 +0200
@@ -38,7 +38,7 @@
trait X509view[A,B] {
implicit def wc: WebCache
- implicit def man: Manifest[A]
+ implicit def manif: Manifest[A]
def intent: Cycle.Intent[A, B] = {
case req @ Path(path) if path startsWith "/test/auth/x509" =>
--- a/src/main/scala/netty/ReadWriteWebNetty.scala Sat Oct 22 19:14:30 2011 +0200
+++ b/src/main/scala/netty/ReadWriteWebNetty.scala Sat Oct 22 20:36:17 2011 +0200
@@ -69,7 +69,7 @@
object x509v extends cycle.Plan with cycle.ThreadPool with ServerErrorResponse with X509view[ReceivedMessage,HttpResponse] {
def wc = webCache
- def man = manifest[ReceivedMessage]
+ def manif = manifest[ReceivedMessage]
}
}