rollback scalatra template

modules/swagger-codegen/src/main/resources/scalatra/JettyMain.scala

@@ -1,7 +1,17 @@
-
+import org.eclipse.jetty.server._
+import org.eclipse.jetty.webapp.WebAppContext
+import org.scalatra.servlet.ScalatraListener
 
 object JettyMain {
 
+  object conf {
+    val port = sys.env.get("PORT") map (_.toInt) getOrElse (8080)
+    val stopTimeout = sys.env.get("STOP_TIMEOUT") map (_.toInt) getOrElse (5000)
+    val connectorIdleTimeout = sys.env.get("CONNECTOR_IDLE_TIMEOUT") map (_.toInt) getOrElse (90000)
+    val webapp = sys.env.get("PUBLIC") getOrElse "webapp"
+    val contextPath = sys.env.get("CONTEXT_PATH") getOrElse "/"
+  }
+
   def main(args: Array[String]) = {
     val server: Server = new Server
     println("starting jetty")
@@ -30,12 +40,4 @@ object JettyMain {
 
     server.start()
   }
-
-  object conf {
-    val port = sys.env.get("PORT") map (_.toInt) getOrElse (8080)
-    val stopTimeout = sys.env.get("STOP_TIMEOUT") map (_.toInt) getOrElse (5000)
-    val connectorIdleTimeout = sys.env.get("CONNECTOR_IDLE_TIMEOUT") map (_.toInt) getOrElse (90000)
-    val webapp = sys.env.get("PUBLIC") getOrElse "webapp"
-    val contextPath = sys.env.get("CONTEXT_PATH") getOrElse "/"
-  }
 }

modules/swagger-codegen/src/main/resources/scalatra/JsonUtil.scala

@@ -1,5 +1,7 @@
 package json
 
+import com.fasterxml.jackson.module.scala.DefaultScalaModule
+import com.fasterxml.jackson.core.JsonGenerator.Feature
 import com.fasterxml.jackson.databind._
 
 object JsonUtil {

modules/swagger-codegen/src/main/resources/scalatra/build.sbt

@@ -1,6 +1,4 @@
-
+import AssemblyKeys._ // put this at the top of the file
-
-// put this at the top of the file
 
 import NativePackagerKeys._
 

modules/swagger-codegen/src/main/resources/scalatra/web.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" 
-         xmlns="http://java.sun.com/xml/ns/javaee"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
   version="3.0">
   <listener>