Permalink
Browse files

Merge pull request #2 from softprops/master

happy new year
  • Loading branch information...
2 parents bd8b5f0 + 4e4e0a5 commit 34ae9338c4f10b7a060ff43494a04e0711210b07 @softprops softprops committed Jan 15, 2012
View
@@ -1,8 +1,9 @@
A [giter8][g8] template for [Unfiltered][unfiltered] applications with
[avsl][avsl] logging targeting [sbt][sbt] 0.10.0 and up.
-Use the `jetty-run` action in sbt to start a server. See
-[siasia/xsbt-web-plugin][web] for more information on building and
+Use the `container:start` task in sbt to start a server and `container:stop` to shut it down.
+
+See [siasia/xsbt-web-plugin][web] for more information on building and
packaging WARs.
[g8]: http://github.com/n8han/giter8#readme
View
@@ -0,0 +1 @@
+seq(giter8Settings :_*)
View
@@ -1,8 +0,0 @@
-#Project properties
-#Sun Aug 15 20:59:05 EDT 2010
-project.organization=net.databinder
-project.name=Unfiltered Template
-sbt.version=0.7.4
-project.version=0.1.0
-build.scala.versions=2.7.7
-project.initialize=false
@@ -1,3 +0,0 @@
-import sbt._
-
-class UnfilteredTemplate(info: ProjectInfo) extends DefaultProject(info) with giter8.Template
View
@@ -0,0 +1 @@
+addSbtPlugin("net.databinder" % "giter8-plugin" % "0.3.2")
@@ -1,5 +0,0 @@
-import sbt._
-
-class Plugins(info: ProjectInfo) extends PluginDefinition(info) {
- val giter8 = "net.databinder" % "giter8-plugin" % "0.2.0"
-}
View
@@ -7,7 +7,7 @@ version := "$version$"
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.eclipse.jetty" % "jetty-webapp" % "7.4.5.v20110725" % "container",
"org.clapper" %% "avsl" % "0.3.6"
)
@@ -1,4 +1,4 @@
-name=My Web Project
-version=0.1.0-SNAPSHOT
-unfiltered_version=0.5.0
-description=This template generates an Unfiltered project. By default it depends on "unfiltered-filter".
+description = This template generates an Unfiltered project. By default it depends on "unfiltered-filter".
+name = My Web Project
+version = 0.1.0-SNAPSHOT
+unfiltered_version = ls(unfiltered, unfiltered)
@@ -0,0 +1,3 @@
+resolvers += "Web plugin repo" at "http://siasia.github.com/maven2"
+
+libraryDependencies <+= sbtVersion(v => "com.github.siasia" %% "xsbt-web-plugin" % (v+"-0.2.10"))
@@ -1,3 +0,0 @@
-resolvers += "Web plugin repo" at "http://siasia.github.com/maven2"
-
-addSbtPlugin("com.github.siasia" %% "xsbt-web-plugin" % "0.1.2")

0 comments on commit 34ae933

Please sign in to comment.