diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalatraServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalatraServerCodegen.java
index d3fb0bf1881..46a3af76324 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalatraServerCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalatraServerCodegen.java
@@ -86,7 +86,7 @@ public class ScalatraServerCodegen extends DefaultCodegen implements CodegenConf
         supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
         supportingFiles.add(new SupportingFile("build.sbt", "", "build.sbt"));
         supportingFiles.add(new SupportingFile("web.xml", "/src/main/webapp/WEB-INF", "web.xml"));
-        supportingFiles.add(new SupportingFile("JettyMain.scala", sourceFolder, "JettyMain.scala"));
+        supportingFiles.add(new SupportingFile("JettyMain.mustache", sourceFolder, "JettyMain.scala"));
         supportingFiles.add(new SupportingFile("Bootstrap.mustache", sourceFolder, "ScalatraBootstrap.scala"));
         supportingFiles.add(new SupportingFile("ServletApp.mustache", sourceFolder, "ServletApp.scala"));
         supportingFiles.add(new SupportingFile("project/build.properties", "project", "build.properties"));
diff --git a/modules/swagger-codegen/src/main/resources/scalatra/Bootstrap.mustache b/modules/swagger-codegen/src/main/resources/scalatra/Bootstrap.mustache
index 5121079424f..afb0dd162d1 100644
--- a/modules/swagger-codegen/src/main/resources/scalatra/Bootstrap.mustache
+++ b/modules/swagger-codegen/src/main/resources/scalatra/Bootstrap.mustache
@@ -1,3 +1,5 @@
+{{>licenseInfo}}
+
 import {{apiPackage}}._
 import akka.actor.ActorSystem
 import io.swagger.app.{ResourcesApp, SwaggerApp}
diff --git a/modules/swagger-codegen/src/main/resources/scalatra/JettyMain.scala b/modules/swagger-codegen/src/main/resources/scalatra/JettyMain.mustache
similarity index 98%
rename from modules/swagger-codegen/src/main/resources/scalatra/JettyMain.scala
rename to modules/swagger-codegen/src/main/resources/scalatra/JettyMain.mustache
index e25f16ba392..1eedae148b3 100644
--- a/modules/swagger-codegen/src/main/resources/scalatra/JettyMain.scala
+++ b/modules/swagger-codegen/src/main/resources/scalatra/JettyMain.mustache
@@ -1,3 +1,5 @@
+{{>licenseInfo}}
+
 import org.eclipse.jetty.server._
 import org.eclipse.jetty.webapp.WebAppContext
 import org.scalatra.servlet.ScalatraListener
diff --git a/modules/swagger-codegen/src/main/resources/scalatra/ServletApp.mustache b/modules/swagger-codegen/src/main/resources/scalatra/ServletApp.mustache
index 423b8644712..faeeb5fcb7a 100644
--- a/modules/swagger-codegen/src/main/resources/scalatra/ServletApp.mustache
+++ b/modules/swagger-codegen/src/main/resources/scalatra/ServletApp.mustache
@@ -1,3 +1,5 @@
+{{>licenseInfo}}
+
 package io.swagger.app
 
 import _root_.akka.actor.ActorSystem
diff --git a/modules/swagger-codegen/src/main/resources/scalatra/api.mustache b/modules/swagger-codegen/src/main/resources/scalatra/api.mustache
index b6749641e54..bd3b40b8fac 100644
--- a/modules/swagger-codegen/src/main/resources/scalatra/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/scalatra/api.mustache
@@ -1,3 +1,5 @@
+{{>licenseInfo}}
+
 package {{package}}
 
 {{#imports}}import {{import}}
diff --git a/modules/swagger-codegen/src/main/resources/scalatra/licenseInfo.mustache b/modules/swagger-codegen/src/main/resources/scalatra/licenseInfo.mustache
new file mode 100644
index 00000000000..2ed71d3a875
--- /dev/null
+++ b/modules/swagger-codegen/src/main/resources/scalatra/licenseInfo.mustache
@@ -0,0 +1,23 @@
+/**
+ * {{{appName}}}
+ * {{{appDescription}}}
+ *
+ * {{#version}}OpenAPI spec version: {{{version}}}{{/version}}
+ * {{#infoEmail}}Contact: {{{infoEmail}}}{{/infoEmail}}
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
\ No newline at end of file
diff --git a/modules/swagger-codegen/src/main/resources/scalatra/model.mustache b/modules/swagger-codegen/src/main/resources/scalatra/model.mustache
index e9dac65dd79..c1a2f2585de 100644
--- a/modules/swagger-codegen/src/main/resources/scalatra/model.mustache
+++ b/modules/swagger-codegen/src/main/resources/scalatra/model.mustache
@@ -1,3 +1,5 @@
+{{>licenseInfo}}
+
 package {{package}}
 
 {{#imports}}import {{import}}
diff --git a/samples/server/petstore/scalatra/.swagger-codegen-ignore b/samples/server/petstore/scalatra/.swagger-codegen-ignore
new file mode 100644
index 00000000000..19d3377182e
--- /dev/null
+++ b/samples/server/petstore/scalatra/.swagger-codegen-ignore
@@ -0,0 +1,23 @@
+# Swagger Codegen Ignore
+# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# Thsi matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/samples/server/petstore/scalatra/LICENSE b/samples/server/petstore/scalatra/LICENSE
new file mode 100644
index 00000000000..8dada3edaf5
--- /dev/null
+++ b/samples/server/petstore/scalatra/LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/samples/server/petstore/scalatra/src/main/scala/JettyMain.scala b/samples/server/petstore/scalatra/src/main/scala/JettyMain.scala
index e25f16ba392..ca0885fbdfb 100644
--- a/samples/server/petstore/scalatra/src/main/scala/JettyMain.scala
+++ b/samples/server/petstore/scalatra/src/main/scala/JettyMain.scala
@@ -1,3 +1,27 @@
+/**
+ * Swagger Petstore
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import org.eclipse.jetty.server._
 import org.eclipse.jetty.webapp.WebAppContext
 import org.scalatra.servlet.ScalatraListener
diff --git a/samples/server/petstore/scalatra/src/main/scala/ScalatraBootstrap.scala b/samples/server/petstore/scalatra/src/main/scala/ScalatraBootstrap.scala
index 9dceb9fc302..c78a1132148 100644
--- a/samples/server/petstore/scalatra/src/main/scala/ScalatraBootstrap.scala
+++ b/samples/server/petstore/scalatra/src/main/scala/ScalatraBootstrap.scala
@@ -1,6 +1,30 @@
+/**
+ * Swagger Petstore
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import com.wordnik.client.api._
 import akka.actor.ActorSystem
-import io.swagger.app.{ ResourcesApp, SwaggerApp }
+import io.swagger.app.{ResourcesApp, SwaggerApp}
 import javax.servlet.ServletContext
 import org.scalatra.LifeCycle
 
@@ -13,7 +37,7 @@ class ScalatraBootstrap extends LifeCycle {
       context mount (new PetApi, "/Pet/*")
       context mount (new StoreApi, "/Store/*")
       context mount (new UserApi, "/User/*")
-
+      
       context mount (new ResourcesApp, "/api-docs/*")
     } catch {
       case e: Throwable => e.printStackTrace()
diff --git a/samples/server/petstore/scalatra/src/main/scala/ServletApp.scala b/samples/server/petstore/scalatra/src/main/scala/ServletApp.scala
index e5063473ebe..35c8a3a84d0 100644
--- a/samples/server/petstore/scalatra/src/main/scala/ServletApp.scala
+++ b/samples/server/petstore/scalatra/src/main/scala/ServletApp.scala
@@ -1,28 +1,52 @@
+/**
+ * Swagger Petstore
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.swagger.app
 
 import _root_.akka.actor.ActorSystem
 
 import org.scalatra.swagger.{ ApiInfo, SwaggerWithAuth, Swagger }
-import org.scalatra.swagger.{ JacksonSwaggerBase, Swagger }
+import org.scalatra.swagger.{JacksonSwaggerBase, Swagger}
 import org.scalatra.ScalatraServlet
-import org.json4s.{ DefaultFormats, Formats }
+import org.json4s.{DefaultFormats, Formats}
 
 class ResourcesApp(implicit protected val system: ActorSystem, val swagger: SwaggerApp)
-    extends ScalatraServlet with JacksonSwaggerBase {
+  extends ScalatraServlet with JacksonSwaggerBase {
   before() {
     response.headers += ("Access-Control-Allow-Origin" -> "*")
   }
 
   protected def buildFullUrl(path: String) = if (path.startsWith("http")) path else {
-    val port = request.getServerPort
-    val h = request.getServerName
-    val prot = if (port == 443) "https" else "http"
-    val (proto, host) = if (port != 80 && port != 443) ("http", h + ":" + port.toString) else (prot, h)
-    "%s://%s%s%s".format(
-      proto,
-      host,
-      request.getContextPath,
-      path)
+   val port = request.getServerPort
+   val h = request.getServerName
+   val prot = if (port == 443) "https" else "http"
+   val (proto, host) = if (port != 80 && port != 443) ("http", h+":"+port.toString) else (prot, h)
+   "%s://%s%s%s".format(
+     proto,
+     host,
+     request.getContextPath,
+     path)
   }
 }
 
diff --git a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/PetApi.scala b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/PetApi.scala
index 58984f1783c..56288e3518f 100644
--- a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/PetApi.scala
+++ b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/PetApi.scala
@@ -1,8 +1,32 @@
+/**
+ * Swagger Petstore
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.wordnik.client.api
 
 import com.wordnik.client.model.Pet
-import com.wordnik.client.model.ApiResponse
 import java.io.File
+import com.wordnik.client.model.ApiResponse
 
 import java.io.File
 
diff --git a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/StoreApi.scala b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/StoreApi.scala
index 934eb329fca..b2a8df92b39 100644
--- a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/StoreApi.scala
+++ b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/StoreApi.scala
@@ -1,3 +1,27 @@
+/**
+ * Swagger Petstore
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.wordnik.client.api
 
 import com.wordnik.client.model.Order
@@ -9,11 +33,11 @@ import org.scalatra.swagger._
 import org.json4s._
 import org.json4s.JsonDSL._
 import org.scalatra.json.{ JValueResult, JacksonJsonSupport }
-import org.scalatra.servlet.{ FileUploadSupport, MultipartConfig, SizeConstraintExceededException }
+import org.scalatra.servlet.{FileUploadSupport, MultipartConfig, SizeConstraintExceededException}
 
 import scala.collection.JavaConverters._
 
-class StoreApi(implicit val swagger: Swagger) extends ScalatraServlet
+class StoreApi (implicit val swagger: Swagger) extends ScalatraServlet 
     with FileUploadSupport
     with JacksonJsonSupport
     with SwaggerSupport {
@@ -26,46 +50,56 @@ class StoreApi(implicit val swagger: Swagger) extends ScalatraServlet
     contentType = formats("json")
     response.headers += ("Access-Control-Allow-Origin" -> "*")
   }
+  
 
   val deleteOrderOperation = (apiOperation[Unit]("deleteOrder")
-    summary "Delete purchase order by ID"
-    parameters (pathParam[String]("orderId").description(""))
+      summary "Delete purchase order by ID"
+      parameters(pathParam[String]("orderId").description(""))
   )
 
-  delete("/store/order/{orderId}", operation(deleteOrderOperation)) {
-
-    val orderId = params.getOrElse("orderId", halt(400))
-
+  delete("/store/order/{orderId}",operation(deleteOrderOperation)) {
+    
+    
+      val orderId = params.getOrElse("orderId", halt(400))
+    
     println("orderId: " + orderId)
   }
 
+  
+
   val getInventoryOperation = (apiOperation[Map[String, Int]]("getInventory")
-    summary "Returns pet inventories by status"
-    parameters ()
+      summary "Returns pet inventories by status"
+      parameters()
   )
 
-  get("/store/inventory", operation(getInventoryOperation)) {
+  get("/store/inventory",operation(getInventoryOperation)) {
   }
 
+  
+
   val getOrderByIdOperation = (apiOperation[Order]("getOrderById")
-    summary "Find purchase order by ID"
-    parameters (pathParam[Long]("orderId").description(""))
+      summary "Find purchase order by ID"
+      parameters(pathParam[Long]("orderId").description(""))
   )
 
-  get("/store/order/{orderId}", operation(getOrderByIdOperation)) {
-
-    val orderId = params.getOrElse("orderId", halt(400))
-
+  get("/store/order/{orderId}",operation(getOrderByIdOperation)) {
+    
+    
+      val orderId = params.getOrElse("orderId", halt(400))
+    
     println("orderId: " + orderId)
   }
 
+  
+
   val placeOrderOperation = (apiOperation[Order]("placeOrder")
-    summary "Place an order for a pet"
-    parameters (bodyParam[Order]("body").description(""))
+      summary "Place an order for a pet"
+      parameters(bodyParam[Order]("body").description(""))
   )
 
-  post("/store/order", operation(placeOrderOperation)) {
-
+  post("/store/order",operation(placeOrderOperation)) {
+    
+    
     bodyParam[Order]("body").description("")
     println("body: " + body)
   }
diff --git a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/UserApi.scala b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/UserApi.scala
index 0d5bc6c276b..7103ade331e 100644
--- a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/UserApi.scala
+++ b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/api/UserApi.scala
@@ -1,3 +1,27 @@
+/**
+ * Swagger Petstore
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.wordnik.client.api
 
 import com.wordnik.client.model.User
@@ -9,11 +33,11 @@ import org.scalatra.swagger._
 import org.json4s._
 import org.json4s.JsonDSL._
 import org.scalatra.json.{ JValueResult, JacksonJsonSupport }
-import org.scalatra.servlet.{ FileUploadSupport, MultipartConfig, SizeConstraintExceededException }
+import org.scalatra.servlet.{FileUploadSupport, MultipartConfig, SizeConstraintExceededException}
 
 import scala.collection.JavaConverters._
 
-class UserApi(implicit val swagger: Swagger) extends ScalatraServlet
+class UserApi (implicit val swagger: Swagger) extends ScalatraServlet 
     with FileUploadSupport
     with JacksonJsonSupport
     with SwaggerSupport {
@@ -26,101 +50,125 @@ class UserApi(implicit val swagger: Swagger) extends ScalatraServlet
     contentType = formats("json")
     response.headers += ("Access-Control-Allow-Origin" -> "*")
   }
+  
 
   val createUserOperation = (apiOperation[Unit]("createUser")
-    summary "Create user"
-    parameters (bodyParam[User]("body").description(""))
+      summary "Create user"
+      parameters(bodyParam[User]("body").description(""))
   )
 
-  post("/user", operation(createUserOperation)) {
-
+  post("/user",operation(createUserOperation)) {
+    
+    
     bodyParam[User]("body").description("")
     println("body: " + body)
   }
 
+  
+
   val createUsersWithArrayInputOperation = (apiOperation[Unit]("createUsersWithArrayInput")
-    summary "Creates list of users with given input array"
-    parameters (bodyParam[List[User]]("body").description(""))
+      summary "Creates list of users with given input array"
+      parameters(bodyParam[List[User]]("body").description(""))
   )
 
-  post("/user/createWithArray", operation(createUsersWithArrayInputOperation)) {
-
+  post("/user/createWithArray",operation(createUsersWithArrayInputOperation)) {
+    
+    
     bodyParam[List[User]]("body").description("")
     println("body: " + body)
   }
 
+  
+
   val createUsersWithListInputOperation = (apiOperation[Unit]("createUsersWithListInput")
-    summary "Creates list of users with given input array"
-    parameters (bodyParam[List[User]]("body").description(""))
+      summary "Creates list of users with given input array"
+      parameters(bodyParam[List[User]]("body").description(""))
   )
 
-  post("/user/createWithList", operation(createUsersWithListInputOperation)) {
-
+  post("/user/createWithList",operation(createUsersWithListInputOperation)) {
+    
+    
     bodyParam[List[User]]("body").description("")
     println("body: " + body)
   }
 
+  
+
   val deleteUserOperation = (apiOperation[Unit]("deleteUser")
-    summary "Delete user"
-    parameters (pathParam[String]("username").description(""))
+      summary "Delete user"
+      parameters(pathParam[String]("username").description(""))
   )
 
-  delete("/user/{username}", operation(deleteUserOperation)) {
-
-    val username = params.getOrElse("username", halt(400))
-
+  delete("/user/{username}",operation(deleteUserOperation)) {
+    
+    
+      val username = params.getOrElse("username", halt(400))
+    
     println("username: " + username)
   }
 
+  
+
   val getUserByNameOperation = (apiOperation[User]("getUserByName")
-    summary "Get user by user name"
-    parameters (pathParam[String]("username").description(""))
+      summary "Get user by user name"
+      parameters(pathParam[String]("username").description(""))
   )
 
-  get("/user/{username}", operation(getUserByNameOperation)) {
-
-    val username = params.getOrElse("username", halt(400))
-
+  get("/user/{username}",operation(getUserByNameOperation)) {
+    
+    
+      val username = params.getOrElse("username", halt(400))
+    
     println("username: " + username)
   }
 
+  
+
   val loginUserOperation = (apiOperation[String]("loginUser")
-    summary "Logs user into the system"
-    parameters (queryParam[String]("username").description(""),
-      queryParam[String]("password").description(""))
+      summary "Logs user into the system"
+      parameters(queryParam[String]("username").description(""),
+        queryParam[String]("password").description(""))
   )
 
-  get("/user/login", operation(loginUserOperation)) {
-
-    val username = params.getAs[String]("username")
+  get("/user/login",operation(loginUserOperation)) {
+    
+    
+                val username = params.getAs[String]("username")
 
     println("username: " + username)
-
-    val password = params.getAs[String]("password")
+    
+    
+                val password = params.getAs[String]("password")
 
     println("password: " + password)
   }
 
+  
+
   val logoutUserOperation = (apiOperation[Unit]("logoutUser")
-    summary "Logs out current logged in user session"
-    parameters ()
+      summary "Logs out current logged in user session"
+      parameters()
   )
 
-  get("/user/logout", operation(logoutUserOperation)) {
+  get("/user/logout",operation(logoutUserOperation)) {
   }
 
+  
+
   val updateUserOperation = (apiOperation[Unit]("updateUser")
-    summary "Updated user"
-    parameters (pathParam[String]("username").description(""),
-      bodyParam[User]("body").description(""))
+      summary "Updated user"
+      parameters(pathParam[String]("username").description(""),
+        bodyParam[User]("body").description(""))
   )
 
-  put("/user/{username}", operation(updateUserOperation)) {
-
-    val username = params.getOrElse("username", halt(400))
-
+  put("/user/{username}",operation(updateUserOperation)) {
+    
+    
+      val username = params.getOrElse("username", halt(400))
+    
     println("username: " + username)
-
+    
+    
     bodyParam[User]("body").description("")
     println("body: " + body)
   }
diff --git a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/ApiResponse.scala b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/ApiResponse.scala
index 9020d9e3d50..90396f5de75 100644
--- a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/ApiResponse.scala
+++ b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/ApiResponse.scala
@@ -1,3 +1,27 @@
+/**
+ * Swagger Petstore
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.wordnik.client.model
 
 
diff --git a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Category.scala b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Category.scala
index bb77cbc1771..4bdadfbbe5c 100644
--- a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Category.scala
+++ b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Category.scala
@@ -1,5 +1,32 @@
+/**
+ * Swagger Petstore
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.wordnik.client.model
 
-case class Category(
+
+
+case class Category (
   id: Option[Long],
-  name: Option[String])
+name: Option[String]
+)
diff --git a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Order.scala b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Order.scala
index 763803bc4b9..6f399b0d1c3 100644
--- a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Order.scala
+++ b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Order.scala
@@ -1,11 +1,37 @@
+/**
+ * Swagger Petstore
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.wordnik.client.model
 
 import java.util.Date
 
-case class Order(
+
+case class Order (
   id: Option[Long],
-  petId: Option[Long],
-  quantity: Option[Int],
-  shipDate: Option[Date],
-  status: Option[String], // Order Status
-  complete: Option[Boolean])
+petId: Option[Long],
+quantity: Option[Int],
+shipDate: Option[Date],
+status: Option[String],  // Order Status
+complete: Option[Boolean]
+)
diff --git a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Pet.scala b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Pet.scala
index 0f8fdddfed2..01aa08e73ce 100644
--- a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Pet.scala
+++ b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Pet.scala
@@ -1,13 +1,38 @@
+/**
+ * Swagger Petstore
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.wordnik.client.model
 
 import com.wordnik.client.model.Category
 import com.wordnik.client.model.Tag
 
-case class Pet(
+
+case class Pet (
   id: Option[Long],
-  category: Option[Category],
-  name: String,
-  photoUrls: List[String],
-  tags: Option[List[Tag]],
-  status: Option[String] // pet status in the store
-  )
+category: Option[Category],
+name: String,
+photoUrls: List[String],
+tags: Option[List[Tag]],
+status: Option[String]  // pet status in the store
+)
diff --git a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Tag.scala b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Tag.scala
index 0e803adca38..a3d34e8d557 100644
--- a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Tag.scala
+++ b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/Tag.scala
@@ -1,5 +1,32 @@
+/**
+ * Swagger Petstore
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.wordnik.client.model
 
-case class Tag(
+
+
+case class Tag (
   id: Option[Long],
-  name: Option[String])
+name: Option[String]
+)
diff --git a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/User.scala b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/User.scala
index 77b7ec5d70c..ff792d91371 100644
--- a/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/User.scala
+++ b/samples/server/petstore/scalatra/src/main/scala/com/wordnik/client/model/User.scala
@@ -1,12 +1,38 @@
+/**
+ * Swagger Petstore
+ * This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: apiteam@swagger.io
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.wordnik.client.model
 
-case class User(
+
+
+case class User (
   id: Option[Long],
-  username: Option[String],
-  firstName: Option[String],
-  lastName: Option[String],
-  email: Option[String],
-  password: Option[String],
-  phone: Option[String],
-  userStatus: Option[Int] // User Status
-  )
+username: Option[String],
+firstName: Option[String],
+lastName: Option[String],
+email: Option[String],
+password: Option[String],
+phone: Option[String],
+userStatus: Option[Int]  // User Status
+)