Skip to content

Commit

Permalink
added Script
Browse files Browse the repository at this point in the history
  • Loading branch information
geelen committed Apr 20, 2009
1 parent b995925 commit df7030d
Show file tree
Hide file tree
Showing 7 changed files with 360 additions and 193 deletions.
6 changes: 5 additions & 1 deletion mohole.ipr
Expand Up @@ -78,7 +78,11 @@
<autodetection-disabled> <autodetection-disabled>
<facet-type id="web"> <facet-type id="web">
<modules> <modules>
<module name="Slinky2-demo" /> <module name="Mohole">
<files>
<file url="file://$PROJECT_DIR$/build/war/WEB-INF/web.xml" />
</files>
</module>
</modules> </modules>
</facet-type> </facet-type>
</autodetection-disabled> </autodetection-disabled>
Expand Down
476 changes: 341 additions & 135 deletions mohole.iws

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion resources/WEB-INF/logging.properties
@@ -1,2 +1,3 @@
.level = WARNING .level = WARNING
slinky.level = INFO mohole.level = INFO
scails.level = INFO
2 changes: 1 addition & 1 deletion src/Mohole.iml
Expand Up @@ -4,7 +4,7 @@
<facet type="Scala" name="Scala"> <facet type="Scala" name="Scala">
<configuration /> <configuration />
</facet> </facet>
<facet type="web" name="Web"> <facet type="web" name="Web2">
<configuration> <configuration>
<descriptors> <descriptors>
<deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/../resources/WEB-INF/web.xml" optional="false" version="2.5" /> <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/../resources/WEB-INF/web.xml" optional="false" version="2.5" />
Expand Down
15 changes: 11 additions & 4 deletions src/main/mohole/App.scala
@@ -1,13 +1,14 @@
package mohole package mohole


import _root_.scails.Resources
import Function.curried import Function.curried
import java.util.Date import java.util.Date
import java.util.logging.Logger import java.util.logging.Logger
import resources.script.Script
import scalaz.OptionW._ import scalaz.OptionW._
import scalaz.EitherW._ import scalaz.EitherW._
import scalaz.StringW._ import scalaz.StringW._
import scalaz.control.MonadW.{EitherMonad, OptionMonad, EitherLeftMonad, ListMonad} import scalaz.control.MonadW.{EitherMonad, OptionMonad, EitherLeftMonad, ListMonad}
import slinky.demo.{RequestObj, Edge}


import slinky.http.servlet.{HttpServlet, HttpServletRequest, ServletApplication, StreamStreamServletApplication} import slinky.http.servlet.{HttpServlet, HttpServletRequest, ServletApplication, StreamStreamServletApplication}
import slinky.http.servlet.HttpServlet._ import slinky.http.servlet.HttpServlet._
Expand All @@ -19,6 +20,7 @@ import slinky.http.request.{Request, GET}
import slinky.http.response.{OK, NotFound, BadRequest} import slinky.http.response.{OK, NotFound, BadRequest}
import slinky.http.response.xhtml.Doctype.{transitional, strict} import slinky.http.response.xhtml.Doctype.{transitional, strict}
import slinky.http.response.StreamResponse.{response, statusLine} import slinky.http.response.StreamResponse.{response, statusLine}
import mohole.resources.script.Script


final class App extends StreamStreamServletApplication { final class App extends StreamStreamServletApplication {
import App._ import App._
Expand All @@ -42,11 +44,16 @@ import slinky.http.servlet.HttpServletRequest.c
object App { object App {
implicit val charSet = ISO8859 implicit val charSet = ISO8859
val logger: Logger = Logger.getLogger(classOf[App].getName) val logger: Logger = Logger.getLogger(classOf[App].getName)
val resources = new Resources(List(Script.get))


def app(implicit request: Request[Stream], servletRequest: HttpServletRequest) = def app(implicit request: Request[Stream], servletRequest: HttpServletRequest) = {
c[Stream](request) match { val lol = c[Stream](request)
case _ => None logger.info("lol = " + lol);
lol match {
case MethodPath(GET, "/") => Some(redirect("/scripts/list"))
case _ => resources.get
} }
}


def say[A](a: A) = doc("Mohole!", a) def say[A](a: A) = doc("Mohole!", a)


Expand Down
44 changes: 0 additions & 44 deletions src/main/slinky/demo/RequestObj.java

This file was deleted.

7 changes: 0 additions & 7 deletions src/main/slinky/demo/X.java

This file was deleted.

0 comments on commit df7030d

Please sign in to comment.