fix issue with container resolved css, updated deps

unfiltered · Oct 1, 2011 · c3af38b · c3af38b
1 parent 32779ca
commit c3af38b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt
@@ -8,7 +8,7 @@ libraryDependencies ++= Seq(
    "net.databinder" %% "unfiltered-filter" % "$unfiltered_version$",
    "javax.servlet" % "servlet-api" % "2.3" % "provided",
    "org.eclipse.jetty" % "jetty-webapp" % "7.4.5.v20110725" % "jetty",
-   "org.clapper" %% "avsl" % "0.3.1"
+   "org.clapper" %% "avsl" % "0.3.6"
 )
 
-seq(webSettings :_*)
+seq(webSettings :_*)
diff --git a/src/main/g8/default.properties b/src/main/g8/default.properties
@@ -1,4 +1,4 @@
 name=My Web Project
 version=0.1.0-SNAPSHOT
-unfiltered_version=0.4.1
+unfiltered_version=0.5.0
 description=This template generates an Unfiltered project. By default it depends on "unfiltered-filter".
diff --git a/src/main/g8/project/plugins/build.sbt b/src/main/g8/project/plugins/build.sbt
@@ -1,4 +1,6 @@
 resolvers += "Web plugin repo" at "http://siasia.github.com/maven2"
 
-libraryDependencies <+= sbtVersion(v => 
-  "com.github.siasia" %% "xsbt-web-plugin" % ("0.1.1-"+v))
+addSbtPlugin("com.github.siasia" %% "xsbt-web-plugin" % "0.1.2")
+
+//libraryDependencies <+= sbtVersion(v => 
+//  "com.github.siasia" %% "xsbt-web-plugin" % ("0.1.1-"+v))
diff --git a/src/main/g8/src/main/scala/Example.scala b/src/main/g8/src/main/scala/Example.scala
@@ -12,11 +12,11 @@ class App extends unfiltered.filter.Plan {
   val logger = Logger(classOf[App])
 
   def intent = {
-    case GET(Path(p)) =>
-      logger.debug("GET %s" format p)
+    case GET(Path("/")) =>
+      logger.debug("GET /")
       Ok ~> view(Map.empty)(<p> What say you? </p>)
-    case POST(Path(p) & Params(params)) =>
-      logger.debug("POST %s" format p)
+    case POST(Path("/") & Params(params)) =>
+      logger.debug("POST /")
       val vw = view(params)_
       val expected = for {
         int <- lookup("int") is
@@ -39,7 +39,7 @@ class App extends unfiltered.filter.Plan {
      <html>
       <head>
         <title>uf example</title>
-        <link rel="stylesheet" type="text/css" href="/assets/css/app.css"/>
+        <link rel="stylesheet" type="text/css" href="/css/app.css"/>
       </head>
       <body>
        <div id="container">

diff --git a/...ain/g8/src/main/resources/www/css/app.css → src/main/g8/src/main/webapp/css/app.css b/...ain/g8/src/main/resources/www/css/app.css → src/main/g8/src/main/webapp/css/app.css