Add an environment setting from either system property or init parame…

…ter.

core/src/main/scala/org/scalatra/ScalatraKernel.scala

@@ -14,6 +14,8 @@ object ScalatraKernel
   type Action = () => Any
 
   val httpMethods = List("GET", "POST", "PUT", "DELETE")
+
+  val EnvironmentKey = "org.scalatra.environment"
 }
 import ScalatraKernel._
 
@@ -199,4 +201,7 @@ trait ScalatraKernel extends Handler with Initializable
     case config: FilterConfig => Option(config.getInitParameter(name))
     case _ => None
   }
+
+  def environment: String = System.getProperty(EnvironmentKey, initParameter(EnvironmentKey).getOrElse("development"))
+  def isDevelopmentMode = environment.toLowerCase.startsWith("dev")
 }

core/src/test/scala/org/scalatra/EnvironmentTest.scala

@@ -0,0 +1,45 @@
+package org.scalatra
+
+import org.scalatest.matchers.ShouldMatchers
+import test.scalatest.ScalatraSuite
+
+class EnvironmentFilter extends ScalatraFilter {
+  get("/*/environment") {
+    environment
+  }
+
+  get("/*/is-development-mode") {
+    isDevelopmentMode
+  }
+}
+
+class EnvironmentFilterTest extends ScalatraSuite with ShouldMatchers {
+  val devFilterHolder = addFilter(classOf[EnvironmentFilter], "/dev/*")
+
+  val prodFilterHolder = addFilter(classOf[EnvironmentFilter], "/prod/*")
+  prodFilterHolder.setInitParameter("org.scalatra.environment", "production")
+
+  test("default environment is 'development'") {
+    get("/dev/environment") {
+      body should equal ("development")
+    }
+  }
+
+  test("is development mode if environment is 'development'") {
+    get("/dev/is-development-mode") {
+      body should equal ("true")
+    }
+  }
+
+  test("environment comes from org.scalatra.environment init parameter") {
+    get("/prod/environment") {
+      body should equal ("production")
+    }
+  }
+
+  test("is not development mode if environment is 'production'") {
+    get("/prod/is-development-mode") {
+      body should equal ("false")
+    }
+  }
+}