Merge pull request #851 from swagger-api/develop_2.0

merge from develop 2.0 for release

.gitignore

@@ -22,9 +22,22 @@ samples/server-generator/scalatra/output
 samples/server-generator/node/output/node_modules
 samples/server-generator/scalatra/target
 samples/server-generator/scalatra/output/.history
-
+samples/client/petstore/qt5cpp/PetStore/moc_*
+samples/client/petstore/qt5cpp/PetStore/*.o
+samples/client/petstore/objc/PetstoreClient.xcworkspace/xcuserdata
+samples/client/petstore/qt5cpp/build-*
+samples/client/petstore/qt5cpp/PetStore/PetStore
+samples/client/petstore/qt5cpp/PetStore/Makefile
+samples/client/petstore/java/hello.txt
+samples/client/petstore/android-java/hello.txt
+samples/client/petstore/objc/Build
+samples/client/petstore/objc/Pods
+samples/server/petstore/nodejs/node_modules
 target
 .idea
 .lib
 atlassian-ide-plugin.xml
 .DS_Store
+
+samples/client/petstore/php/SwaggerClient-php/composer.lock
+samples/client/petstore/php/SwaggerClient-php/vendor/

.travis.yml

@@ -1,3 +1,5 @@
-language: scala
-scala:
-   - 2.10.2
+sudo: false
+language: java
+script: mvn verify
+jdk:
+  - oraclejdk7

LICENSE

@@ -0,0 +1,11 @@
+Copyright 2015 SmartBear Software
+
+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 [apache.org/licenses/LICENSE-2.0](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.

README.md

@@ -1,230 +1,352 @@
 # Swagger Code Generator
 
-[![Build Status](https://travis-ci.org/wordnik/swagger-codegen.png)](https://travis-ci.org/wordnik/swagger-codegen)
+[![Build Status](https://travis-ci.org/swagger-api/swagger-codegen.png)](https://travis-ci.org/swagger-api/swagger-codegen)
 
 ## Overview
-This is the swagger codegen project, which allows generation of client libraries automatically from a 
-Swagger-compliant server.  You can find out more about both the spec and the framework at 
-http://swagger.wordnik.com.  For more information about Wordnik's APIs, please visit http://developer.wordnik.com.  
+This is the swagger codegen project, which allows generation of client libraries automatically from a Swagger-compliant server.  
+
+Check out [Swagger-Spec](https://github.com/swagger-api/swagger-spec) for additional information about the Swagger project, including additional libraries with support for other languages and more. 
+
+
+## Compatibility
+The Swagger Specification has undergone 3 revisions since initial creation in 2010.  The swagger-codegen project has the following compatibilies with the swagger specification:
+
+Swagger Codegen Version | Release Date | Swagger Spec compatibility | Notes
+----------------------- | ------------ | -------------------------- | -----
+2.1.0                   | 2015-06-09   | 1.0, 1.1, 1.2, 2.0   | [master](https://github.com/swagger-api/swagger-codegen)
+2.0.17                  | 2014-08-22   | 1.1, 1.2      | [tag v2.0.17](https://github.com/swagger-api/swagger-codegen/tree/v2.0.17)
+1.0.4                   | 2012-04-12   | 1.0, 1.1      | [tag v1.0.4](https://github.com/swagger-api/swagger-codegen/tree/swagger-codegen_2.9.1-1.1)
+
 
 ### Prerequisites
 You need the following installed and available in your $PATH:
 
-* [Java 1.7](http://java.oracle.com)
-
-Note!  Some folks have had issues with OOM errors with java version "1.6.0_51".  It's strongly suggested that you upgrade to 1.7!
+* [Java 7](http://java.oracle.com)
 
 * [Apache maven 3.0.3 or greater](http://maven.apache.org/)
+ 
+#### OS X Users
+Don't forget to install Java 7. You probably have 1.6 or 1.8.
 
-* [Scala 2.9.1](http://www.scala-lang.org)
-
-* [sbt (only download if you're building on Windows)](http://www.scala-sbt.org/)
-
-You also need to add the scala binary to your PATH.
-
-After cloning the project, you need to build it from source with this command:
-
+Export JAVA_HOME in order to user proper Java version:
 ```
-./sbt assembly
+export JAVA_HOME=`/usr/libexec/java_home -v 1.7`
+export PATH=${JAVA_HOME}/bin:$PATH
 ```
 
-or for Windows...
+#### Building
+
+After cloning the project, you can build it from source with this command:
 
 ```
-sbt assembly
+mvn package
 ```
 
-
 ### To generate a sample client library
-You can build a client against Wordnik's [petstore](http://petstore.swagger.wordnik.com) API as follows:
+You can build a client against the swagger sample [petstore](http://petstore.swagger.io) API as follows:
 
 ```
-./bin/scala-petstore.sh
+./bin/java-petstore.sh
 ```
 
-This will run the script in [samples/client/petstore/ScalaPetstoreCodegen.scala](https://github.com/wordnik/swagger-codegen/blob/master/samples/client/petstore/scala/ScalaPetstoreCodegen.scala) and create the client.  You can then
-compile and run the client, as well as unit tests against it:
+This will run the generator with this command:
 
 ```
-cd samples/client/petstore/scala
+java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
+  -i http://petstore.swagger.io/v2/swagger.json \
+  -l java \
+  -o samples/client/petstore/java
+```
+
+With a number of options.  You can get the options with the `help generate` command:
+
+```
+NAME
+        swagger generate - Generate code with chosen lang
+
+SYNOPSIS
+        swagger generate [(-a <authorization> | --auth <authorization>)]
+                [(-c <configuration file> | --config <configuration file>)]
+                [-D <system properties>]
+                (-i <spec file> | --input-spec <spec file>)
+                (-l <language> | --lang <language>)
+                [(-o <output directory> | --output <output directory>)]
+                [(-t <template directory> | --template-dir <template directory>)]
+                [(-v | --verbose)]
+
+OPTIONS
+        -a <authorization>, --auth <authorization>
+            adds authorization headers when fetching the swagger definitions
+            remotely. Pass in a URL-encoded string of name:header with a comma
+            separating multiple values
+
+        -c <configuration file>, --config <configuration file>
+            Path to json configuration file. File content should be in a json
+            format {"optionKey":"optionValue", "optionKey1":"optionValue1"...}
+            Supported options can be different for each language. Run
+            config-help -l {lang} command for language specific config options.
+
+        -D <system properties>
+            sets specified system properties in the format of
+            name=value,name=value
+
+        -i <spec file>, --input-spec <spec file>
+            location of the swagger spec, as URL or file (required)
+
+        -l <language>, --lang <language>
+            client language to generate (maybe class name in classpath,
+            required)
+
+        -o <output directory>, --output <output directory>
+            where to write the generated files (current dir by default)
+
+        -t <template directory>, --template-dir <template directory>
+            folder containing the template files
+
+        -v, --verbose
+            verbose mode
+ ```
+
+You can then compile and run the client, as well as unit tests against it:
+
+```
+cd samples/client/petstore/java
 mvn package
 ```
 
 Other languages have petstore samples, too:
 ```
-./bin/flash-petstore.sh
+./bin/android-petstore.sh
 ./bin/java-petstore.sh
 ./bin/objc-petstore.sh
-./bin/php-petstore.sh
-./bin/python-petstore.sh
-./bin/python3-petstore.sh
-./bin/ruby-petstore.sh
 ```
 
 ### Generating libraries from your server
-It's just as easy--you can either run the default generators:
-
-```
-./bin/runscala.sh com.wordnik.swagger.codegen.BasicScalaGenerator http://petstore.swagger.wordnik.com/api/api-docs special-key
-```
-
-Replace `Scala` with `Flash`, `Java`, `Objc`, `PHP`, `Python`, `Python3`, `Ruby`.
-
-You will probably want to override some of the defaults--like packages, etc.  For doing this, just create a scala
-script with the overrides you want.  Follow [ScalaPetstoreCodegen](https://github.com/wordnik/swagger-codegen/blob/master/samples/client/petstore/scala/ScalaPetstoreCodegen.scala) as an example:
-
-For example, create `src/main/scala/MyCodegen.scala` with these contents:
-
-```scala
-import com.wordnik.swagger.codegen.BasicScalaGenerator
-
-object MyCodegen extends BasicScalaGenerator {
-  def main(args: Array[String]) = generateClient(args)
-
-  // location of templates
-  override def templateDir = "scala"
-
-  // where to write generated code
-  override def destinationDir = "client/scala/src/main/scala"
-
-  // api invoker package
-  override def invokerPackage = "com.myapi.client"
-
-  // package for models
-  override def modelPackage = Some("com.myapi.client.model")
-
-  // package for api classes
-  override def apiPackage = Some("com.myapi.client.api")
-
-  // supporting classes
-  override def supportingFiles = List(
-    ("apiInvoker.mustache", destinationDir + java.io.File.separator + packageName.replaceAll("\\.", java.io.File.separator), "ApiInvoker.scala"),
-    ("pom.mustache", destinationDir, "pom.xml")
-  )
-}
-```
-
-Now you can generate your client like this:
-
-```
-./bin/runscala.sh src/main/scala/MyCodegen.scala http://my.api.com/resources.json super-secret-key
-```
-
-w00t!  Thanks to the scala interpretor, you didn't even need to recompile.
+It's just as easy--just use the `-i` flag to point to either a server or file.
 
 ### Modifying the client library format
-Don't like the default swagger client syntax?  Want a different language supported?  No problem!  Swagger codegen
-processes mustache templates with the [scalate](http://scalate.fusesource.org/) engine.  You can modify our templates or
-make your own.
+Don't like the default swagger client syntax?  Want a different language supported?  No problem!  Swagger codegen processes mustache templates with the [jmustache](https://github.com/samskivert/jmustache) engine.  You can modify our templates or make your own.
 
-You can look at `src/main/resources/${your-language}` for examples.  To make your own templates, create your own files
-and override the `templateDir` in your script to point to the right place.  It actually is that easy.
+You can look at `modules/swagger-codegen/src/main/resources/${your-language}` for examples.  To make your own templates, create your own files and use the `-t` flag to specify your template folder.  It actually is that easy.
+
+### Making your own codegen modules
+If you're starting a project with a new language and don't see what you need, swagger-codegen can help you create a project to generate your own libraries:
+
+```
+java -jar modules/swagger-codegen-distribution/target/swagger-codegen-cli.jar meta \
+  -o output/myLibrary -n myClientCodegen -p com.my.company.codegen
+```
+
+This will write, in the folder `output/myLibrary`, all the files you need to get started, including a README.md. Once modified and compiled, you can load your library with the codegen and generate clients with your own, custom-rolled logic.
 
 ### Where is Javascript???
-See our [javascript library](http://github.com/wordnik/swagger.js)--it's completely dynamic and doesn't require
+See our [javascript library](http://github.com/swagger-api/swagger-js)--it's completely dynamic and doesn't require
 static code generation.
+There is a third-party component called [swagger-js-codegen](https://github.com/wcandillon/swagger-js-codegen) that can generate angularjs or nodejs source code from a swagger specification.
+
 
 #### Generating a client from flat files (i.e. no remote server calls)
 If you don't want to call your server, you can save the swagger spec files into a directory and pass an argument
 to the code generator like this:
 
 ```
--DfileMap=/path/to/files
+-i ./modules/swagger-codegen/src/test/resources/2_0/petstore.json
 ```
 
-Or for example:
+Great for creating libraries on your ci server, from the [Swagger Editor](http://editor.swagger.io)... or while coding on an airplane.
+
+### Customizing the generator
+
+There are different aspects of customizing the code generator beyond just creating or modifying templates.  Each language has a supporting configuration file to handle different type mappings, etc:
+
 ```
-./bin/java-petstore-filemap.sh
+$ ls -1 modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/
+AkkaScalaClientCodegen.java
+AndroidClientCodegen.java
+AsyncScalaClientCodegen.java
+CSharpClientCodegen.java
+JavaClientCodegen.java
+JaxRSServerCodegen.java
+NodeJSServerCodegen.java
+ObjcClientCodegen.java
+PerlClientCodegen.java
+PhpClientCodegen.java
+Python3ClientCodegen.java
+PythonClientCodegen.java
+Qt5CPPGenerator.java
+RetrofitClientCodegen.java
+RubyClientCodegen.java
+ScalaClientCodegen.java
+ScalatraServerCodegen.java
+SpringMVCServerCodegen.java
+StaticDocCodegen.java
+StaticHtmlGenerator.java
+SwaggerGenerator.java
+SwaggerYamlGenerator.java
+SwiftGenerator.java
+TizenClientCodegen.java
 ```
 
-Which simple passes `-DfileMap=src/test/resources/petstore` as an argument.  Great for creating libraries on your
-ci server... or while coding on an airplane.
+Each of these files creates reasonable defaults so you can get running quickly.  But if you want to configure package names, prefixes, model folders, etc. you can use a json config file to pass the values.
+
+```
+java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
+  -i http://petstore.swagger.io/v2/swagger.json \
+  -l java \
+  -o samples/client/petstore/java \
+  -c path/to/config.json
+```
+Supported config options can be different per language. Running `config-help -l {lang}` will show available options.
+
+```
+java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jarr config-help -l java
+```
+
+Output
+
+```
+CONFIG OPTIONS
+	modelPackage
+	    package for generated models
+
+	apiPackage
+	    package for generated api classes
+
+	invokerPackage
+	    root package for generated code
+
+	groupId
+	    groupId in generated pom.xml
+
+	artifactId
+	    artifactId in generated pom.xml
+
+	artifactVersion
+	    artifact version in generated pom.xml
+
+	sourceFolder
+	    source folder for generated code
+```
+
+Your config file for java can look like
+
+```
+{
+  "groupId":"com.my.company",
+  "artifactId":"MyClent",
+  "artifactVersion":"1.2.0"
+}
+```
+
+For all the unspecified options default values will be used.
+
+Another way to override default options is to extend config class for specific language.
+To change, for example, the prefix for the Objective-C generated files, simply subclass the ObjcClientCodegen.java:
+
+```
+package com.mycompany.swagger.codegen;
+
+import io.swagger.codegen.languages.*;
+
+public class MyObjcCodegen extends ObjcClientCodegen {
+  static {
+    PREFIX = "HELO";
+  }
+}
+```
+
+and specify the `classname` when running the generator:
+
+```
+-l com.mycompany.swagger.codegen.MyObjcCodegen
+```
+
+Your subclass will now be loaded and overrides the `PREFIX` value in the superclass.
 
 ### Validating your swagger spec
-You can use the validation tool to see that your server is creating a proper spec file.  If you want to learn
-more about the spec file and format, please see [swagger-core](https://github.com/wordnik/swagger-core/wiki).  This
-tool will read the server and generate a report of any violations of the spec.  If there are violations, the
-client codegen and ui may not work correctly.
 
-To validate an api and write output to ./swagger-errors.html:
+You have options.  The easiest is to use our [online validator](https://github.com/swagger-api/validator-badge) which not only will let you validate your spec, but with the debug flag, you can see what's wrong with your spec.  For example:
+
+http://online.swagger.io/validator/debug?url=http://petstore.swagger.io/v2/swagger.json
+
+### Generating dynamic html api documentation
+
+To do so, just use the `-l dynamic-html` flag when reading a spec file.  This creates HTML documentation that is available as a single-page application with AJAX.  To view the documentation:
 
 ```
-./bin/validate.sh http://petstore.swagger.wordnik.com/api/api-docs "specia-key" ./swagger-errors.html
+cd samples/dynamic-html/
+npm install
+node .
 ```
 
-### Generating static api documentation
-If you need to make static pages or don't want the sandbox of the swagger-ui, you can use the codegen to build them.  Remember, the engine is just using mustache templates--the output format is your call.
+Which launches a node.js server so the AJAX calls have a place to go.
+
+
+### Generating static html api documentation
+
+To do so, just use the `-l html` flag when reading a spec file.  This creates a single, simple HTML file with embedded css so you can ship it as an email attachment, or load it from your filesystem:
 
 ```
-./bin/static-docs.sh
+cd samples/html/
+open index.html
 ```
 
-Will produce the output here:
-
-```
-https://github.com/wordnik/swagger-codegen/tree/master/samples/docs/swagger-static-docs
-```
-
-which is based on these templates:
-
-```
-https://github.com/wordnik/swagger-codegen/tree/master/src/main/resources/swagger-static
-```
-
-and looks like this
-
-![Image](https://raw.github.com/wordnik/swagger-codegen/master/samples/docs/swagger-static-docs/static-docs.png)
 
 ### To build a server stub
 
 You can also use the codegen to generate a server for a couple different frameworks.  Take a look here:
 
-* [javascript node.js Server generator](https://github.com/wordnik/swagger-codegen/tree/master/samples/server-generator/node)
-
-* [ruby sinatra generator](https://github.com/wordnik/swagger-codegen/tree/master/samples/server-generator/sinatra)
-
-* [scala scalatra generator](https://github.com/wordnik/swagger-codegen/tree/master/samples/server-generator/scalatra)
-
-* [java jax-rs generator](https://github.com/wordnik/swagger-codegen/tree/master/samples/server-generator/java-jaxrs)
-
-
-### Migrating from Swagger 1.1 to 1.2 format
-
-If you've spent time hand-crafting your swagger spec files, you can use the [SpecConverter](https://github.com/wordnik/swagger-codegen/blob/master/src/main/scala/com/wordnik/swagger/codegen/SpecConverter.scala) to do the dirty work.  For example:
-
-```bash
-$ ./bin/update-spec.sh http://developer.wordnik.com/v4/resources.json wordnik-developer
-writing file wordnik-developer/api-docs
-calling: http://developer.wordnik.com/v4/account.json
-calling: http://developer.wordnik.com/v4/word.json
-calling: http://developer.wordnik.com/v4/words.json
-calling: http://developer.wordnik.com/v4/wordList.json
-calling: http://developer.wordnik.com/v4/wordLists.json
-writing file wordnik-developer/account
-writing file wordnik-developer/word
-writing file wordnik-developer/words
-writing file wordnik-developer/wordList
-writing file wordnik-developer/wordLists
+### node.js
+```
+java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
+  -i http://petstore.swagger.io/v2/swagger.json \
+  -l nodejs \
+  -o samples/server/petstore/nodejs
 ```
 
-Will read the 1.1 spec from wordnik developer and write it into the folder called `wordnik-developer`.
+### rails-grape
+#### Not yet migrated to this branch
 
 
+### scala scalatra
+```
+java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
+  -i http://petstore.swagger.io/v2/swagger.json \
+  -l scalatra \
+  -o samples/server/petstore/scalatra
+```
+
+### java jax-rs
+
+```
+java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
+  -i http://petstore.swagger.io/v2/swagger.json \
+  -l jaxrs \
+  -o samples/server/petstore/jaxrs
+```
+
+### java spring-mvc
+
+```
+java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
+  -i http://petstore.swagger.io/v2/swagger.json \
+  -l spring-mvc \
+  -o samples/server/petstore/spring-mvc
+```
 ### To build the codegen library
 
 This will create the swagger-codegen library from source.  
 
 ```
-./sbt assembly
+mvn package
 ```
 
-Note!  The templates are included in the library generated.  If you want to modify the templates, you'll need to
-either repackage the library OR modify your codegen script to use a file path!
+Note!  The templates are included in the library generated.  If you want to modify the templates, you'll need to either repackage the library OR specify a path to your scripts
 
 License
 -------
 
-Copyright 2013 Wordnik, Inc.
+Copyright 2015 SmartBear Software
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

bin/Version.scala

@@ -1,7 +0,0 @@
-val version = scala.util.Properties.scalaPropOrElse("version.number", "unknown").toString match {
-  case "2.10.0" => "2.10"
-  case "2.10.2" => "2.10"
-  case "2.10.3" => "2.10"
-  case e: String => e
-}
-println(version)

bin/akka-scala-petstore.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 SCRIPT="$0"
-SCALA_RUNNER_VERSION=$(scala ./bin/Version.scala)
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,15 +17,15 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-cd $APP_DIR
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
 
 # if you've executed sbt assembly previously it will use that instead.
-export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -DfileMap=samples/client/wordnik-api/spec-files"
-ags="$@ SwaggerDocGenerator http://developer.wordnik.com/v4/resources.json"
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/akka-scala -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l akka-scala -o samples/client/petstore/akka-scala"
 
-if [ -f $APP_DIR/target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar ]; then
-  scala -cp target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar $ags
-else
-  echo "Please set scalaVersion := \"$SCALA_RUNNER_VERSION\" in build.sbt and run ./sbt assembly"
-fi
+java $JAVA_OPTS -jar $executable $ags

bin/all-petstore.sh

@@ -18,20 +18,19 @@ if [ ! -d "${APP_DIR}" ]; then
 fi
 
 cd $APP_DIR
-./bin/java-wordnik-api.sh
-./bin/php-wordnik-api.sh
-./bin/python3-wordnik-api.sh
-./bin/objc-wordnik-api.sh
-./bin/python-wordnik-api.sh
-./bin/scala-wordnik-api.sh
-
 ./bin/android-java-petstore.sh
 ./bin/csharp-petstore.sh
-./bin/flash-petstore.sh
+./bin/dynamic-html.sh
+./bin/html-petstore.sh
+./bin/jaxrs-petstore-server.sh
 ./bin/java-petstore.sh
-./bin/objc-petstore.sh
+./bin/qt5-petstore.sh
+./bin/perl-petstore.sh
 ./bin/php-petstore.sh
 ./bin/python-petstore.sh
-./bin/python3-petstore.sh
+./bin/retrofit-petstore.sh
 ./bin/ruby-petstore.sh
+./bin/objc-petstore.sh
 ./bin/scala-petstore.sh
+./bin/spring-mvc-petstore-server.sh
+./bin/tizen-petstore.sh

bin/all-wordnik.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+
+SCRIPT="$0"
+
+while [ -h "$SCRIPT" ] ; do
+  ls=`ls -ld "$SCRIPT"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=`dirname "$SCRIPT"`/"$link"
+  fi
+done
+
+if [ ! -d "${APP_DIR}" ]; then
+  APP_DIR=`dirname "$SCRIPT"`/..
+  APP_DIR=`cd "${APP_DIR}"; pwd`
+fi
+
+cd $APP_DIR
+./bin/android-java-wordnik-api.sh
+./bin/java-wordnik-api.sh
+./bin/objc-wordnik-api.sh
+./bin/scala-wordnik-api.sh

bin/android-java-petstore.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 SCRIPT="$0"
-SCALA_RUNNER_VERSION=$(scala ./bin/Version.scala)
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,15 +17,15 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-cd $APP_DIR
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ samples/client/petstore/android-java/AndroidJavaPetstoreCodegen.scala http://petstore.swagger.wordnik.com/api/api-docs special-key"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/android-java -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l android -o samples/client/petstore/android-java"
 
-if [ -f $APP_DIR/target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar ]; then
-  scala -cp target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar $ags
-else
-  echo "Please set scalaVersion := \"$SCALA_RUNNER_VERSION\" in build.sbt and run ./sbt assembly"
-fi
+java $JAVA_OPTS -jar $executable $ags

bin/android-java-wordnik-api.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 SCRIPT="$0"
-SCALA_RUNNER_VERSION=$(scala ./bin/Version.scala)
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,15 +17,15 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-cd $APP_DIR
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ samples/client/petstore/android-java/AndroidJavaPetstoreCodegen.scala http://petstore.swagger.wordnik.com/api/api-docs special-key"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/wordnik.json -l android -o samples/client/wordnik/android-java"
 
-if [ -f $APP_DIR/target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar ]; then
-  scala -cp target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar $ags
-else
-  echo "Please set scalaVersion := \"$SCALA_RUNNER_VERSION\" in build.sbt and run ./sbt assembly"
-fi
+java $JAVA_OPTS -jar $executable $ags

bin/csharp-petstore.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 SCRIPT="$0"
-SCALA_RUNNER_VERSION=$(scala ./bin/Version.scala)
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,15 +17,15 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-cd $APP_DIR
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ samples/client/petstore/csharp/CsharpPetstoreCodegen.scala http://petstore.swagger.wordnik.com/api/api-docs special-key"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l csharp -o samples/client/petstore/csharp"
 
-if [ -f $APP_DIR/target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar ]; then
-  scala -cp target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar $ags
-else
-  echo "Please set scalaVersion := \"$SCALA_RUNNER_VERSION\" in build.sbt and run ./sbt assembly"
-fi
+java $JAVA_OPTS -jar $executable $ags

bin/dynamic-html.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 SCRIPT="$0"
-SCALA_RUNNER_VERSION=$(scala ./bin/Version.scala)
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,15 +17,15 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-cd $APP_DIR
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l dynamic-html  -o samples/dynamic-html"
 
-if [ -f $APP_DIR/target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar ]; then
-  scala -cp target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar $ags
-else
-  echo "Please set scalaVersion := \"$SCALA_RUNNER_VERSION\" in build.sbt and run ./sbt assembly"
-fi
+java $JAVA_OPTS -jar $executable $ags

bin/flash-petstore.sh

@@ -1,32 +0,0 @@
-#!/bin/sh
-
-SCRIPT="$0"
-SCALA_RUNNER_VERSION=$(scala ./bin/Version.scala)
-
-while [ -h "$SCRIPT" ] ; do
-  ls=`ls -ld "$SCRIPT"`
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-  if expr "$link" : '/.*' > /dev/null; then
-    SCRIPT="$link"
-  else
-    SCRIPT=`dirname "$SCRIPT"`/"$link"
-  fi
-done
-
-if [ ! -d "${APP_DIR}" ]; then
-  APP_DIR=`dirname "$SCRIPT"`/..
-  APP_DIR=`cd "${APP_DIR}"; pwd`
-fi
-
-cd $APP_DIR
-
-
-# if you've executed sbt assembly previously it will use that instead.
-export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties "
-ags="$@ samples/client/petstore/flash/FlashPetstoreCodegen.scala http://petstore.swagger.wordnik.com/api/api-docs special-key"
-
-if [ -f $APP_DIR/target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar ]; then
-  scala -cp target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar $ags
-else
-  echo "Please set scalaVersion := \"$SCALA_RUNNER_VERSION\" in build.sbt and run ./sbt assembly"
-fi

bin/html-petstore.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 SCRIPT="$0"
-SCALA_RUNNER_VERSION=$(scala ./bin/Version.scala)
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,14 +17,15 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-cd $APP_DIR
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
 
 # if you've executed sbt assembly previously it will use that instead.
-ags="com.wordnik.swagger.codegen.SpecConverter $@"
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l html  -o samples/html"
 
-if [ -f $APP_DIR/target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar ]; then
-  scala -cp target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar $ags
-else
-  echo "Please set scalaVersion := \"$SCALA_RUNNER_VERSION\" in build.sbt and run ./sbt assembly"
-fi
+java $JAVA_OPTS -jar $executable $ags

bin/java-petstore-filemap.sh

@@ -1,32 +0,0 @@
-#!/bin/sh
-
-SCRIPT="$0"
-SCALA_RUNNER_VERSION=$(scala ./bin/Version.scala)
-
-while [ -h "$SCRIPT" ] ; do
-  ls=`ls -ld "$SCRIPT"`
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-  if expr "$link" : '/.*' > /dev/null; then
-    SCRIPT="$link"
-  else
-    SCRIPT=`dirname "$SCRIPT"`/"$link"
-  fi
-done
-
-if [ ! -d "${APP_DIR}" ]; then
-  APP_DIR=`dirname "$SCRIPT"`/..
-  APP_DIR=`cd "${APP_DIR}"; pwd`
-fi
-
-cd $APP_DIR
-
-
-# if you've executed sbt assembly previously it will use that instead.
-export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DfileMap=src/test/resources/petstore-1.1/resources.json -DloggerPath=conf/log4j.properties"
-ags="$@ samples/client/petstore/java/JavaPetstoreCodegen.scala http://petstore.swagger.wordnik.com/api/api-docs special-key"
-
-if [ -f $APP_DIR/target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar ]; then
-  scala -cp target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar $ags
-else
-  echo "Please set scalaVersion := \"$SCALA_RUNNER_VERSION\" in build.sbt and run ./sbt assembly"
-fi

bin/java-petstore.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 SCRIPT="$0"
-SCALA_RUNNER_VERSION=$(scala ./bin/Version.scala)
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,15 +17,15 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-cd $APP_DIR
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ samples/client/petstore/java/JavaPetstoreCodegen.scala http://petstore.swagger.wordnik.com/api/api-docs special-key"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l java -o samples/client/petstore/java"
 
-if [ -f $APP_DIR/target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar ]; then
-  scala -cp target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar $ags
-else
-  echo "Please set scalaVersion := \"$SCALA_RUNNER_VERSION\" in build.sbt and run ./sbt assembly"
-fi
+java $JAVA_OPTS -jar $executable $ags

bin/java-wordnik-api.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 SCRIPT="$0"
-SCALA_RUNNER_VERSION=$(scala ./bin/Version.scala)
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,15 +17,15 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-cd $APP_DIR
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
 
 # if you've executed sbt assembly previously it will use that instead.
-export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -DfileMap=samples/client/wordnik-api/spec-files/resources.json"
-ags="$@ samples/client/wordnik-api/java/JavaWordnikApiCodegen.scala http://api.wordnik.com/v4/resources.json"
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/wordnik.json -l java -o samples/client/wordnik/java"
 
-if [ -f $APP_DIR/target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar ]; then
-  scala -cp target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar $ags
-else
-  echo "Please set scalaVersion := \"$SCALA_RUNNER_VERSION\" in build.sbt and run ./sbt assembly"
-fi
+java $JAVA_OPTS -jar $executable $ags

bin/jaxrs-petstore-server.sh

@@ -0,0 +1,31 @@
+#!/bin/sh
+
+SCRIPT="$0"
+
+while [ -h "$SCRIPT" ] ; do
+  ls=`ls -ld "$SCRIPT"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=`dirname "$SCRIPT"`/"$link"
+  fi
+done
+
+if [ ! -d "${APP_DIR}" ]; then
+  APP_DIR=`dirname "$SCRIPT"`/..
+  APP_DIR=`cd "${APP_DIR}"; pwd`
+fi
+
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
+
+# if you've executed sbt assembly previously it will use that instead.
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaJaxRS -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l jaxrs -o samples/server/petstore/jaxrs -Dswagger.codegen.jaxrs.impl.source=src/main/java"
+
+java $JAVA_OPTS -jar $executable $ags

bin/nodejs-petstore-server.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 SCRIPT="$0"
-SCALA_RUNNER_VERSION=$(scala ./bin/Version.scala)
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,14 +17,15 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-cd $APP_DIR
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
 
 # if you've executed sbt assembly previously it will use that instead.
-ags="com.wordnik.swagger.codegen.spec.Validator $@"
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l nodejs -o samples/server/petstore/nodejs"
 
-if [ -f $APP_DIR/target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar ]; then
-  scala -cp target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar $ags
-else
-  echo "Please set scalaVersion := \"$SCALA_RUNNER_VERSION\" in build.sbt and run ./sbt assembly"
-fi
+java $JAVA_OPTS -Dservice -jar $executable $ags

bin/objc-petstore.sh

@@ -1,9 +1,6 @@
 #!/bin/sh
 
 SCRIPT="$0"
-SCALA_RUNNER_VERSION=$(scala ./bin/Version.scala)
-
-version="$(scala ./bin/Version.scala)"
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -20,15 +17,15 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-cd $APP_DIR
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ samples/client/petstore/objc/ObjcPetstoreCodegen.scala http://petstore.swagger.wordnik.com/api/api-docs special-key"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/objc -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l objc -o samples/client/petstore/objc"
 
-if [ -f $APP_DIR/target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar ]; then
-  scala -cp target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar $ags
-else
-  echo "Please set scalaVersion := \"$SCALA_RUNNER_VERSION\" in build.sbt and run ./sbt assembly"
-fi
+java -DappName=PetstoreClient $JAVA_OPTS -jar $executable $ags

bin/objc-wordnik-api.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 SCRIPT="$0"
-SCALA_RUNNER_VERSION=$(scala ./bin/Version.scala)
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,15 +17,15 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-cd $APP_DIR
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
 
 # if you've executed sbt assembly previously it will use that instead.
-export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -DfileMap=samples/client/wordnik-api/spec-files"
-ags="$@ samples/client/wordnik-api/objc/ObjcWordnikApiCodegen.scala http://api.wordnik.com/v4/resources.json"
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/wordnik.json -l objc -o samples/client/wordnik/objc"
 
-if [ -f $APP_DIR/target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar ]; then
-  scala -cp target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar $ags
-else
-  echo "Please set scalaVersion := \"$SCALA_RUNNER_VERSION\" in build.sbt and run ./sbt assembly"
-fi
+java $JAVA_OPTS -jar $executable $ags

bin/perl-petstore.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 SCRIPT="$0"
-SCALA_RUNNER_VERSION=$(scala ./bin/Version.scala)
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,14 +17,15 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-cd $APP_DIR
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
 
 # if you've executed sbt assembly previously it will use that instead.
-ags="com.wordnik.swagger.codegen.ScalaAsyncClientGenerator $@"
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l perl -o samples/client/petstore/perl"
 
-if [ -f $APP_DIR/target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar ]; then
-  scala -cp target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar $ags
-else
-  echo "Please set scalaVersion := \"$SCALA_RUNNER_VERSION\" in build.sbt and run ./sbt assembly"
-fi
+java $JAVA_OPTS -jar $executable $ags

bin/php-petstore.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 SCRIPT="$0"
-SCALA_RUNNER_VERSION=$(scala ./bin/Version.scala)
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,15 +17,15 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-cd $APP_DIR
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ samples/client/petstore/php/PHPPetstoreCodegen.scala http://petstore.swagger.wordnik.com/api/api-docs special-key"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/php -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l php -o samples/client/petstore/php"
 
-if [ -f $APP_DIR/target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar ]; then
-  scala -cp target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar $ags
-else
-  echo "Please set scalaVersion := \"$SCALA_RUNNER_VERSION\" in build.sbt and run ./sbt assembly"
-fi
+java $JAVA_OPTS -jar $executable $ags

bin/php-wordnik-api.sh

@@ -1,32 +0,0 @@
-#!/bin/sh
-
-SCRIPT="$0"
-SCALA_RUNNER_VERSION=$(scala ./bin/Version.scala)
-
-while [ -h "$SCRIPT" ] ; do
-  ls=`ls -ld "$SCRIPT"`
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-  if expr "$link" : '/.*' > /dev/null; then
-    SCRIPT="$link"
-  else
-    SCRIPT=`dirname "$SCRIPT"`/"$link"
-  fi
-done
-
-if [ ! -d "${APP_DIR}" ]; then
-  APP_DIR=`dirname "$SCRIPT"`/..
-  APP_DIR=`cd "${APP_DIR}"; pwd`
-fi
-
-cd $APP_DIR
-
-
-# if you've executed sbt assembly previously it will use that instead.
-export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -DfileMap=samples/client/wordnik-api/spec-files/resources.json"
-ags="$@ samples/client/wordnik-api/php/PHPWordnikApiCodegen.scala http://api.wordnik.com/v4/resources.json"
-
-if [ -f $APP_DIR/target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar ]; then
-  scala -cp target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar $ags
-else
-  echo "Please set scalaVersion := \"$SCALA_RUNNER_VERSION\" in build.sbt and run ./sbt assembly"
-fi

bin/python-petstore.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 SCRIPT="$0"
-SCALA_RUNNER_VERSION=$(scala ./bin/Version.scala)
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,15 +17,15 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-cd $APP_DIR
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ samples/client/petstore/python/PythonPetstoreCodegen.scala http://petstore.swagger.wordnik.com/api/api-docs special-key"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/python -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l python -o samples/client/petstore/python"
 
-if [ -f $APP_DIR/target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar ]; then
-  scala -cp target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar $ags
-else
-  echo "Please set scalaVersion := \"$SCALA_RUNNER_VERSION\" in build.sbt and run ./sbt assembly"
-fi
+java $JAVA_OPTS -jar $executable $ags

bin/python-wordnik-api.sh

@@ -1,32 +0,0 @@
-#!/bin/sh
-
-SCRIPT="$0"
-SCALA_RUNNER_VERSION=$(scala ./bin/Version.scala)
-
-while [ -h "$SCRIPT" ] ; do
-  ls=`ls -ld "$SCRIPT"`
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-  if expr "$link" : '/.*' > /dev/null; then
-    SCRIPT="$link"
-  else
-    SCRIPT=`dirname "$SCRIPT"`/"$link"
-  fi
-done
-
-if [ ! -d "${APP_DIR}" ]; then
-  APP_DIR=`dirname "$SCRIPT"`/..
-  APP_DIR=`cd "${APP_DIR}"; pwd`
-fi
-
-cd $APP_DIR
-
-
-# if you've executed sbt assembly previously it will use that instead.
-export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -DfileMap=samples/client/wordnik-api/spec-files/resources.json"
-ags="$@ samples/client/wordnik-api/python/PythonWordnikApiCodegen.scala http://api.wordnik.com/v4/resources.json"
-
-if [ -f $APP_DIR/target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar ]; then
-  scala -cp target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar $ags
-else
-  echo "Please set scalaVersion := \"$SCALA_RUNNER_VERSION\" in build.sbt and run ./sbt assembly"
-fi

bin/python3-petstore.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 SCRIPT="$0"
-SCALA_RUNNER_VERSION=$(scala ./bin/Version.scala)
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,15 +17,15 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-cd $APP_DIR
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ samples/client/petstore/python3/Python3PetstoreCodegen.scala http://petstore.swagger.wordnik.com/api/api-docs special-key"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/python3 -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l python3 -o samples/client/petstore/python3"
 
-if [ -f $APP_DIR/target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar ]; then
-  scala -cp target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar $ags
-else
-  echo "Please set scalaVersion := \"$SCALA_RUNNER_VERSION\" in build.sbt and run ./sbt assembly"
-fi
+java $JAVA_OPTS -jar $executable $ags

bin/python3-wordnik-api.sh

@@ -1,32 +0,0 @@
-#!/bin/sh
-
-SCRIPT="$0"
-SCALA_RUNNER_VERSION=$(scala ./bin/Version.scala)
-
-while [ -h "$SCRIPT" ] ; do
-  ls=`ls -ld "$SCRIPT"`
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-  if expr "$link" : '/.*' > /dev/null; then
-    SCRIPT="$link"
-  else
-    SCRIPT=`dirname "$SCRIPT"`/"$link"
-  fi
-done
-
-if [ ! -d "${APP_DIR}" ]; then
-  APP_DIR=`dirname "$SCRIPT"`/..
-  APP_DIR=`cd "${APP_DIR}"; pwd`
-fi
-
-cd $APP_DIR
-
-
-# if you've executed sbt assembly previously it will use that instead.
-export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -DfileMap=samples/client/wordnik-api/spec-files/resources.json"
-ags="$@ samples/client/wordnik-api/python3/Python3WordnikApiCodegen.scala http://api.wordnik.com/v4/resources.json"
-
-if [ -f $APP_DIR/target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar ]; then
-  scala -cp target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar $ags
-else
-  echo "Please set scalaVersion := \"$SCALA_RUNNER_VERSION\" in build.sbt and run ./sbt assembly"
-fi

bin/qt5-petstore.sh

@@ -0,0 +1,31 @@
+#!/bin/sh
+
+SCRIPT="$0"
+
+while [ -h "$SCRIPT" ] ; do
+  ls=`ls -ld "$SCRIPT"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=`dirname "$SCRIPT"`/"$link"
+  fi
+done
+
+if [ ! -d "${APP_DIR}" ]; then
+  APP_DIR=`dirname "$SCRIPT"`/..
+  APP_DIR=`cd "${APP_DIR}"; pwd`
+fi
+
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
+
+# if you've executed sbt assembly previously it will use that instead.
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/qt5cpp -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l qt5cpp -o samples/client/petstore/qt5cpp"
+
+java $JAVA_OPTS -jar $executable $ags

bin/retrofit-petstore.sh

@@ -0,0 +1,31 @@
+#!/bin/sh
+
+SCRIPT="$0"
+
+while [ -h "$SCRIPT" ] ; do
+  ls=`ls -ld "$SCRIPT"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=`dirname "$SCRIPT"`/"$link"
+  fi
+done
+
+if [ ! -d "${APP_DIR}" ]; then
+  APP_DIR=`dirname "$SCRIPT"`/..
+  APP_DIR=`cd "${APP_DIR}"; pwd`
+fi
+
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
+
+# if you've executed sbt assembly previously it will use that instead.
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/retrofit -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l retrofit -o samples/client/petstore/retrofit"
+
+java $JAVA_OPTS -jar $executable $ags

bin/ruby-petstore.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 SCRIPT="$0"
-SCALA_RUNNER_VERSION=$(scala ./bin/Version.scala)
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,15 +17,15 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-cd $APP_DIR
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ samples/client/petstore/ruby/RubyPetstoreCodegen.scala http://petstore.swagger.wordnik.com/api/api-docs special-key"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/ruby -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l ruby -o samples/client/petstore/ruby"
 
-if [ -f $APP_DIR/target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar ]; then
-  scala -cp target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar $ags
-else
-  echo "Please set scalaVersion := \"$SCALA_RUNNER_VERSION\" in build.sbt and run ./sbt assembly"
-fi
+java $JAVA_OPTS -jar $executable $ags

bin/scala-async-petstore.sh

@@ -0,0 +1,31 @@
+#!/bin/sh
+
+SCRIPT="$0"
+
+while [ -h "$SCRIPT" ] ; do
+  ls=`ls -ld "$SCRIPT"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=`dirname "$SCRIPT"`/"$link"
+  fi
+done
+
+if [ ! -d "${APP_DIR}" ]; then
+  APP_DIR=`dirname "$SCRIPT"`/..
+  APP_DIR=`cd "${APP_DIR}"; pwd`
+fi
+
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
+
+# if you've executed sbt assembly previously it will use that instead.
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/asyncscala -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l async-scala -o samples/client/petstore/async-scala"
+
+java $JAVA_OPTS -jar $executable $ags

bin/scala-petstore.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 SCRIPT="$0"
-SCALA_RUNNER_VERSION=$(scala ./bin/Version.scala)
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,15 +17,15 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-cd $APP_DIR
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ samples/client/petstore/scala/ScalaPetstoreCodegen.scala http://petstore.swagger.wordnik.com/api/api-docs special-key"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/scala -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l scala -o samples/client/petstore/scala"
 
-if [ -f $APP_DIR/target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar ]; then
-  scala -cp target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar $ags
-else
-  echo "Please set scalaVersion := \"$SCALA_RUNNER_VERSION\" in build.sbt and run ./sbt assembly"
-fi
+java $JAVA_OPTS -jar $executable $ags

bin/scala-wordnik-api.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
 SCRIPT="$0"
-SCALA_RUNNER_VERSION=$(scala ./bin/Version.scala)
 
 while [ -h "$SCRIPT" ] ; do
   ls=`ls -ld "$SCRIPT"`
@@ -18,15 +17,15 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-cd $APP_DIR
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
 
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
 
 # if you've executed sbt assembly previously it will use that instead.
-export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties -DfileMap=samples/client/wordnik-api/spec-files/resources.json"
-ags="$@ samples/client/wordnik-api/scala/ScalaWordnikApiCodegen.scala http://api.wordnik.com/v4/resources.json"
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/wordnik.json -l scala -o samples/client/wordnik/scala"
 
-if [ -f $APP_DIR/target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar ]; then
-  scala -cp target/scala-$SCALA_RUNNER_VERSION/swagger-codegen.jar $ags
-else
-  echo "Please set scalaVersion := \"$SCALA_RUNNER_VERSION\" in build.sbt and run ./sbt assembly"
-fi
+java $JAVA_OPTS -jar $executable $ags

bin/scalatra-petstore-server.sh

@@ -0,0 +1,31 @@
+#!/bin/sh
+
+SCRIPT="$0"
+
+while [ -h "$SCRIPT" ] ; do
+  ls=`ls -ld "$SCRIPT"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=`dirname "$SCRIPT"`/"$link"
+  fi
+done
+
+if [ ! -d "${APP_DIR}" ]; then
+  APP_DIR=`dirname "$SCRIPT"`/..
+  APP_DIR=`cd "${APP_DIR}"; pwd`
+fi
+
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
+
+# if you've executed sbt assembly previously it will use that instead.
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/scalatra -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l scalatra -o samples/server/petstore/scalatra"
+
+java $JAVA_OPTS -jar $executable $ags

bin/spring-mvc-petstore-server.sh

@@ -0,0 +1,31 @@
+#!/bin/sh
+
+SCRIPT="$0"
+
+while [ -h "$SCRIPT" ] ; do
+  ls=`ls -ld "$SCRIPT"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=`dirname "$SCRIPT"`/"$link"
+  fi
+done
+
+if [ ! -d "${APP_DIR}" ]; then
+  APP_DIR=`dirname "$SCRIPT"`/..
+  APP_DIR=`cd "${APP_DIR}"; pwd`
+fi
+
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
+
+# if you've executed sbt assembly previously it will use that instead.
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/JavaSpringMVC -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l spring-mvc -o samples/server/petstore/spring-mvc"
+
+java $JAVA_OPTS -jar $executable $ags

bin/swift-petstore.sh

@@ -0,0 +1,31 @@
+#!/bin/sh
+
+SCRIPT="$0"
+
+while [ -h "$SCRIPT" ] ; do
+  ls=`ls -ld "$SCRIPT"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=`dirname "$SCRIPT"`/"$link"
+  fi
+done
+
+if [ ! -d "${APP_DIR}" ]; then
+  APP_DIR=`dirname "$SCRIPT"`/..
+  APP_DIR=`cd "${APP_DIR}"; pwd`
+fi
+
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
+
+# if you've executed sbt assembly previously it will use that instead.
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/swift -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l swift -o samples/client/petstore/swift"
+
+java -DappName=PetstoreClient $JAVA_OPTS -jar $executable $ags

bin/tizen-petstore.sh

@@ -0,0 +1,31 @@
+#!/bin/sh
+
+SCRIPT="$0"
+
+while [ -h "$SCRIPT" ] ; do
+  ls=`ls -ld "$SCRIPT"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=`dirname "$SCRIPT"`/"$link"
+  fi
+done
+
+if [ ! -d "${APP_DIR}" ]; then
+  APP_DIR=`dirname "$SCRIPT"`/..
+  APP_DIR=`cd "${APP_DIR}"; pwd`
+fi
+
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn clean package
+fi
+
+# if you've executed sbt assembly previously it will use that instead.
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/tizen -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l tizen -o samples/client/petstore/tizen"
+
+java $JAVA_OPTS -jar $executable $ags

bin/yml2swagger.js

@@ -1,56 +0,0 @@
-fs = require('fs')
-yaml = require('js-yaml')
-
-var args = process.argv.splice(2);
-
-if(args.length == 0) {
-  process.exit(1);
-}
-
-var arg0 = args[0];
-var outputdir = ".";
-
-if(args.length > 1) {
-  outputdir = args[1];
-}
-
-var file = fs.lstatSync(arg0);
-
-if(file.isFile()) {
-  convert(arg0, outputdir);
-}
-else if (file.isDirectory()) {
-  var files = fs.readdirSync(arg0);
-  files.map(function(item) {
-    var filename = arg0 + "/" + item;
-    var file = fs.lstatSync(filename);
-    if(file.isFile()) {
-      convert(filename, outputdir);
-    }
-  });
-}
-
-function convert(filename, outputdir) {
-  console.log("converting " + filename);
-  fs.readFile(filename, "utf8", function (err, data) {
-    if(err) {
-      console.log(err);
-    }
-    else {
-      try {
-        var js = yaml.load(data);
-        var prettyJs = JSON.stringify(js, undefined, 2);
-        var outputFilename = outputdir + "/" + filename.split("/").pop().replace(".yml", "") + ".json";
-        console.log("writing to " + outputFilename);
-        fs.writeFile(outputFilename, prettyJs, function(err) {
-          if(err) {
-              console.log(err);
-          }
-        });
-      }
-      catch (err) {
-        console.log(err);
-      }
-    }
-  });
-}

build.sbt

@@ -1,133 +0,0 @@
-import xml.Group
-import AssemblyKeys._
-
-organization := "com.wordnik"
-
-name := "swagger-codegen"
-
-version := "2.0.13"
-
-scalaVersion := "2.10.1"
-
-crossVersion := CrossVersion.full
-
-javacOptions ++= Seq("-target", "1.6", "-source", "1.6", "-Xlint:unchecked", "-Xlint:deprecation")
-
-scalacOptions ++= Seq("-optimize", "-unchecked", "-deprecation", "-Xcheckinit", "-encoding", "utf8")
-
-crossScalaVersions := Seq("2.9.0", "2.9.0-1", "2.9.1", "2.9.1-1", "2.9.2", "2.9.3", "2.10.0", "2.10.1", "2.10.2")
-
-libraryDependencies ++= Seq(
-  "org.json4s"                  %% "json4s-jackson"     % "3.2.5",
-  "io.backchat.inflector"       %% "scala-inflector"    % "1.3.5",
-  "commons-io"                   % "commons-io"         % "2.3",
-  "ch.qos.logback"               % "logback-classic"    % "1.0.13" % "provided",
-  "org.rogach"                  %% "scallop"            % "0.8.1",
-  "junit"                        % "junit"              % "4.11" % "test",
-  "org.scalatest"               %% "scalatest"          % "1.9.1" % "test"
-)
-
-libraryDependencies <+= scalaVersion {
-  case v if v.startsWith("2.9") => 
-    "org.fusesource.scalate" % "scalate-core_2.9" % "1.6.1"
-  case v if v.startsWith("2.10") => { 
-    "org.fusesource.scalate" %% "scalate-core" % "1.6.1"
-  }
-}
-
-libraryDependencies ++= {
-  scalaVersion.toString match {
-    case v if v.startsWith("2.10") => Seq("org.scala-lang" % "scala-reflect" % v)
-    case _ => Seq()
-  }
-}
-
-packageOptions <+= (name, version, organization) map {
-  (title, version, vendor) =>
-    Package.ManifestAttributes(
-      "Created-By" -> "Simple Build Tool",
-      "Built-By" -> System.getProperty("user.name"),
-      "Build-Jdk" -> System.getProperty("java.version"),
-      "Specification-Title" -> title,
-      "Specification-Version" -> version,
-      "Specification-Vendor" -> vendor,
-      "Implementation-Title" -> title,
-      "Implementation-Version" -> version,
-      "Implementation-Vendor-Id" -> vendor,
-      "Implementation-Vendor" -> vendor
-    )
-}
-
-publishTo <<= (version) { version: String =>
-  if (version.trim.endsWith("SNAPSHOT"))
-    Some("Sonatype Nexus Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots")
-  else
-    Some("Sonatype Nexus Releases" at "https://oss.sonatype.org/service/local/staging/deploy/maven2")
-}
-
-//publishTo := Some(Resolver.file("file",  new File(Path.userHome.absolutePath+"/.m2/repository")))
-
-artifact in (Compile, assembly) ~= { art =>
-  art.copy(`classifier` = Some("assembly"))
-}
-
-addArtifact(artifact in (Compile, assembly), assembly)
-
-publishMavenStyle := true
-
-publishArtifact in Test := false
-
-pomIncludeRepository := { x => false }
-
-credentials += Credentials(Path.userHome / ".ivy2" / ".credentials")
-
-homepage := Some(new URL("https://github.com/wordnik/swagger-codegen"))
-
-parallelExecution in Test := false
-
-startYear := Some(2009)
-
-licenses := Seq(("Apache License 2.0", new URL("http://www.apache.org/licenses/LICENSE-2.0.html")))
-
-pomExtra <<= (pomExtra, name, description) {(pom, name, desc) => pom ++ Group(
-  <scm>
-    <connection>scm:git:git@github.com:wordnik/swagger-codegen.git</connection>
-    <developerConnection>scm:git:git@github.com:wordnik/swagger-codegen.git</developerConnection>
-    <url>https://github.com/wordnik/swagger-codegen</url>
-  </scm>
-  <issueManagement>
-    <system>github</system>
-    <url>https://github.com/wordnik/swagger-codegen/issues</url>
-  </issueManagement>
-  <developers>
-    <developer>
-      <id>rpidikiti</id>
-      <name>Ramesh Pidikiti</name>
-      <email>ramesh@wordnik.com</email>
-    </developer>
-    <developer>
-      <id>ayush</id>
-      <name>Ayush Gupta</name>
-      <email>ayush@glugbot.com</email>
-    </developer>
-    <developer>
-      <id>fehguy</id>
-      <name>Tony Tam</name>
-      <email>fehguy@gmail.com</email>
-    </developer>
-    <developer>
-      <id>casualjim</id>
-      <name>Ivan Porto Carrero</name>
-      <url>http://flanders.co.nz/</url>
-    </developer>
-    <developer>
-      <id>radius314</id>
-      <name>Danny Gershman</name>
-      <email>danny.gershman@gmail.com</email>
-    </developer>
-  </developers>
-)}
-
-assemblySettings
-
-jarName in assembly := "swagger-codegen.jar"

distro/pom.xml.disabled

@@ -1,124 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.sonatype.oss</groupId>
-    <artifactId>oss-parent</artifactId>
-    <version>5</version>
-  </parent>
-  <groupId>com.wordnik</groupId>
-  <artifactId>swagger-codegen-distribution</artifactId>
-  <packaging>jar</packaging>
-  <version>2.0.2-SNAPSHOT</version>
-  <name>swagger-codegen-distribution</name>
-  <url>https://github.com/wordnik/swagger-codegen</url>
-  <scm>
-    <connection>scm:git:git@github.com:wordnik/swagger-codegen.git</connection>
-    <developerConnection>scm:git:git@github.com:wordnik/swagger-codegen.git</developerConnection>
-    <url>https://github.com/wordnik/swagger-codegen</url>
-  </scm>
-  <prerequisites>
-    <maven>2.2.0</maven>
-  </prerequisites>
-  <developers>
-    <developer>
-      <id>fehguy</id>
-      <name>Tony Tam</name>
-      <email>fehguy@gmail.com</email>
-    </developer>
-  </developers>
-  <issueManagement>
-    <system>github</system>
-    <url>https://github.com/wordnik/swagger-codegen/issues</url>
-  </issueManagement>
-  <mailingLists>
-    <mailingList>
-      <name>wordnik-api</name>
-      <archive>https://groups.google.com/forum/#!forum/wordnik-api</archive>
-    </mailingList>
-  </mailingLists>
-  <licenses>
-    <license>
-      <name>Apache License 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}/lib</outputDirectory>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.6</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>integration-test</goal>
-              <goal>verify</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <executions>
-          <execution>
-            <id>distro-assembly</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.3</version>
-        <configuration>
-          <descriptors>
-            <descriptor>src/main/assembly/distribution.xml</descriptor>
-          </descriptors>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.4</version>
-        <executions>
-          <execution>
-            <id>src-dependencies</id>
-            <phase>package</phase>
-            <goals>
-              <goal>unpack-dependencies</goal>
-            </goals>
-            <configuration>
-              <includeGroupIds>com.wordnik</includeGroupIds>
-              <includeArtifactIds>text-data</includeArtifactIds>
-              <outputDirectory>${project.build.directory}</outputDirectory>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>com.wordnik</groupId>
-      <artifactId>swagger-codegen_2.9.1</artifactId>
-      <version>${swagger.codegen.version}</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-  <properties>
-    <swagger.codegen.version>2.0.2-SNAPSHOT</swagger.codegen.version>
-  </properties>
-</project>

distro/src/main/assembly/distribution.xml

@@ -1,29 +0,0 @@
-<assembly
-  xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-  <id>distribution</id>
-  <baseDirectory>swagger-codegen</baseDirectory>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <dependencySets>
-    <dependencySet>
-      <scope>compile</scope>
-      <outputDirectory>target/lib</outputDirectory>
-      <includes>
-        <include>*:jar:*</include>
-      </includes>
-    </dependencySet>
-  </dependencySets>
-  <fileSets>
-    <fileSet>
-      <directory>../bin</directory>
-      <includes>
-        <include>*.*</include>
-      </includes>
-      <outputDirectory>bin</outputDirectory>
-    </fileSet>
-  </fileSets>
-</assembly>

modules/swagger-codegen-cli/pom.xml

@@ -0,0 +1,104 @@
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>io.swagger</groupId>
+        <artifactId>swagger-codegen-project</artifactId>
+        <version>2.1.2</version>
+        <relativePath>../..</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>swagger-codegen-cli</artifactId>
+    <packaging>jar</packaging>
+
+    <name>swagger-codegen (executable)</name>
+
+    <build>
+        <finalName>swagger-codegen-cli</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <excludes>
+                    <exclude>logback.xml</exclude>
+                </excludes>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>io.swagger.codegen.SwaggerCodegen</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>2.3</version>
+                <executions>
+                    <execution>
+                        <id>reduced-pom</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <minimizeJar>false</minimizeJar>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                            <dependencyReducedPomLocation>
+                                ${java.io.tmpdir}/dependency-reduced-pom.xml
+                            </dependencyReducedPomLocation>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>process-resources</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <transformers>
+                                <transformer
+                                        implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                            </transformers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-codegen</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <!--https://github.com/airlift/airline-->
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>airline</artifactId>
+            <version>0.7</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.googlecode.lambdaj</groupId>
+            <artifactId>lambdaj</artifactId>
+            <version>2.3.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>${slf4j-version}</version>
+        </dependency>
+
+    </dependencies>
+
+</project>

modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/SwaggerCodegen.java

@@ -0,0 +1,37 @@
+package io.swagger.codegen;
+
+import io.airlift.airline.Cli;
+import io.airlift.airline.Help;
+import io.swagger.codegen.cmd.ConfigHelp;
+import io.swagger.codegen.cmd.Generate;
+import io.swagger.codegen.cmd.Langs;
+import io.swagger.codegen.cmd.Meta;
+
+/**
+ * User: lanwen
+ * Date: 24.03.15
+ * Time: 17:56
+ * <p>
+ * Command line interface for swagger codegen
+ * use `swagger-codegen-cli.jar help` for more info
+ *
+ * @since 2.1.3-M1
+ */
+public class SwaggerCodegen {
+
+
+    public static void main(String[] args) {
+        Cli.CliBuilder<Runnable> builder = Cli.<Runnable>builder("swagger")
+                .withDescription("Swagger code generator CLI. More info on swagger.io")
+                .withDefaultCommand(Langs.class)
+                .withCommands(
+                        Generate.class,
+                        Meta.class,
+                        Langs.class,
+                        Help.class,
+                        ConfigHelp.class
+                );
+
+        builder.build().parse(args).run();
+    }
+}

modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/ConfigHelp.java

@@ -0,0 +1,52 @@
+package io.swagger.codegen.cmd;
+
+import io.airlift.airline.Command;
+import io.airlift.airline.Option;
+import io.swagger.codegen.CliOption;
+import io.swagger.codegen.CodegenConfig;
+
+import java.util.ServiceLoader;
+
+import static java.util.ServiceLoader.load;
+
+@Command(name = "config-help", description = "Config help for chosen lang")
+public class ConfigHelp implements Runnable {
+
+    @Option(name = {"-l", "--lang"}, title = "language", required = true,
+            description = "language to get config help for")
+    private String lang;
+
+    /**
+     * Tries to load config class with SPI first, then with class name directly from classpath
+     *
+     * @param name name of config, or full qualified class name in classpath
+     * @return config class
+     */
+    private static CodegenConfig forName(String name) {
+        ServiceLoader<CodegenConfig> loader = load(CodegenConfig.class);
+        for (CodegenConfig config : loader) {
+            if (config.getName().equals(name)) {
+                return config;
+            }
+        }
+
+        // else try to load directly
+        try {
+            return (CodegenConfig) Class.forName(name).newInstance();
+        } catch (Exception e) {
+            throw new RuntimeException("Can't load config class with name ".concat(name), e);
+        }
+    }
+
+    @Override
+    public void run() {
+        System.out.println();
+        CodegenConfig config = forName(lang);
+        System.out.println("CONFIG OPTIONS");
+        for (CliOption langCliOption : config.cliOptions()) {
+            System.out.println("\t" + langCliOption.getOpt());
+            System.out.println("\t    " + langCliOption.getDescription());
+            System.out.println();
+        }
+    }
+}

modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Generate.java

@@ -0,0 +1,158 @@
+package io.swagger.codegen.cmd;
+
+import config.Config;
+import config.ConfigParser;
+import io.airlift.airline.Command;
+import io.airlift.airline.Option;
+import io.swagger.codegen.CliOption;
+import io.swagger.codegen.ClientOptInput;
+import io.swagger.codegen.ClientOpts;
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.DefaultGenerator;
+import io.swagger.models.Swagger;
+import io.swagger.parser.SwaggerParser;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.util.ServiceLoader;
+
+import static java.util.ServiceLoader.load;
+import static org.apache.commons.lang3.StringUtils.isNotEmpty;
+
+/**
+ * User: lanwen
+ * Date: 24.03.15
+ * Time: 20:22
+ */
+
+@Command(name = "generate", description = "Generate code with chosen lang")
+public class Generate implements Runnable {
+
+    public static final Logger LOG = LoggerFactory.getLogger(Generate.class);
+
+    public static final String TEMPLATE_DIR_PARAM = "templateDir";
+
+    @Option(name = {"-v", "--verbose"}, description = "verbose mode")
+    private boolean verbose;
+
+    @Option(name = {"-l", "--lang"}, title = "language", required = true,
+            description = "client language to generate (maybe class name in classpath, required)")
+    private String lang;
+
+    @Option(name = {"-o", "--output"}, title = "output directory",
+            description = "where to write the generated files (current dir by default)")
+    private String output = "";
+
+    @Option(name = {"-i", "--input-spec"}, title = "spec file", required = true,
+            description = "location of the swagger spec, as URL or file (required)")
+    private String spec;
+
+    @Option(name = {"-t", "--template-dir"}, title = "template directory",
+            description = "folder containing the template files")
+    private String templateDir;
+
+    @Option(name = {"-a", "--auth"}, title = "authorization",
+            description = "adds authorization headers when fetching the swagger definitions remotely. " +
+                    "Pass in a URL-encoded string of name:header with a comma separating multiple values")
+    private String auth;
+
+    @Option(name = {"-D"}, title = "system properties", description = "sets specified system properties in " +
+            "the format of name=value,name=value")
+    private String systemProperties;
+
+    @Option(name = {"-c", "--config"}, title = "configuration file", description = "Path to json configuration file. " +
+            "File content should be in a json format {\"optionKey\":\"optionValue\", \"optionKey1\":\"optionValue1\"...} " +
+            "Supported options can be different for each language. Run config-help -l {lang} command for language specific config options.")
+    private String configFile;
+
+    /**
+     * Tries to load config class with SPI first, then with class name directly from classpath
+     *
+     * @param name name of config, or full qualified class name in classpath
+     * @return config class
+     */
+    private static CodegenConfig forName(String name) {
+        ServiceLoader<CodegenConfig> loader = load(CodegenConfig.class);
+        for (CodegenConfig config : loader) {
+            if (config.getName().equals(name)) {
+                return config;
+            }
+        }
+
+        // else try to load directly
+        try {
+            return (CodegenConfig) Class.forName(name).newInstance();
+        } catch (Exception e) {
+            throw new RuntimeException("Can't load config class with name ".concat(name), e);
+        }
+    }
+
+    @Override
+    public void run() {
+        verbosed(verbose);
+
+        setSystemProperties();
+
+        ClientOptInput input = new ClientOptInput();
+
+        if (isNotEmpty(auth)) {
+            input.setAuth(auth);
+        }
+
+        CodegenConfig config = forName(lang);
+        config.setOutputDir(new File(output).getAbsolutePath());
+
+        if (null != templateDir) {
+            config.additionalProperties().put(TEMPLATE_DIR_PARAM, new File(templateDir).getAbsolutePath());
+        }
+
+        if (null != configFile) {
+            Config genConfig = ConfigParser.read(configFile);
+            if (null != genConfig) {
+                for (CliOption langCliOption : config.cliOptions()) {
+                    if (genConfig.hasOption(langCliOption.getOpt())) {
+                        config.additionalProperties().put(langCliOption.getOpt(), genConfig.getOption(langCliOption.getOpt()));
+                    }
+                }
+            }
+        }
+
+        input.setConfig(config);
+
+        Swagger swagger = new SwaggerParser().read(spec, input.getAuthorizationValues(), true);
+        new DefaultGenerator().opts(input.opts(new ClientOpts()).swagger(swagger)).generate();
+    }
+
+    private void setSystemProperties() {
+        if (systemProperties != null && systemProperties.length() > 0) {
+            for (String property : systemProperties.split(",")) {
+                int ix = property.indexOf('=');
+                if (ix > 0 && ix < property.length() - 1) {
+                    System.setProperty(property.substring(0, ix), property.substring(ix + 1));
+                }
+            }
+        }
+    }
+
+    /**
+     * If true parameter, adds system properties which enables debug mode in generator
+     *
+     * @param verbose - if true, enables debug mode
+     */
+    private void verbosed(boolean verbose) {
+        if (!verbose) {
+            return;
+        }
+        LOG.info("\nVERBOSE MODE: ON. Additional debug options are injected" +
+                "\n - [debugSwagger] prints the swagger specification as interpreted by the codegen" +
+                "\n - [debugModels] prints models passed to the template engine" +
+                "\n - [debugOperations] prints operations passed to the template engine" +
+                "\n - [debugSupportingFiles] prints additional data passed to the template engine");
+
+        System.setProperty("debugSwagger", "");
+        System.setProperty("debugModels", "");
+        System.setProperty("debugOperations", "");
+        System.setProperty("debugSupportingFiles", "");
+    }
+}

modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Langs.java

@@ -0,0 +1,23 @@
+package io.swagger.codegen.cmd;
+
+import ch.lambdaj.collection.LambdaIterable;
+import io.airlift.airline.Command;
+import io.swagger.codegen.CodegenConfig;
+
+import static ch.lambdaj.Lambda.on;
+import static ch.lambdaj.collection.LambdaCollections.with;
+import static java.util.ServiceLoader.load;
+
+/**
+ * User: lanwen
+ * Date: 24.03.15
+ * Time: 20:25
+ */
+@Command(name = "langs", description = "Shows available langs")
+public class Langs implements Runnable {
+    @Override
+    public void run() {
+        LambdaIterable<String> langs = with(load(CodegenConfig.class)).extract(on(CodegenConfig.class).getName());
+        System.out.printf("Available languages: %s%n", langs);
+    }
+}

modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/Meta.java

@@ -0,0 +1,147 @@
+package io.swagger.codegen.cmd;
+
+import ch.lambdaj.function.convert.Converter;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.samskivert.mustache.Mustache;
+import io.airlift.airline.Command;
+import io.airlift.airline.Option;
+import io.swagger.codegen.DefaultGenerator;
+import io.swagger.codegen.SupportingFile;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.Reader;
+import java.util.List;
+import java.util.Map;
+
+import static ch.lambdaj.collection.LambdaCollections.with;
+import static com.google.common.base.Joiner.on;
+
+/**
+ * User: lanwen
+ * Date: 24.03.15
+ * Time: 20:22
+ */
+
+@Command(name = "meta", description = "MetaGenerator. Generator for creating a new template set " +
+        "and configuration for Codegen.  The output will be based on the language you " +
+        "specify, and includes default templates to include.")
+public class Meta implements Runnable {
+
+    private static final Logger LOG = LoggerFactory.getLogger(Meta.class);
+
+    private static final String TEMPLATE_DIR_CLASSPATH = "codegen";
+    private static final String MUSTACHE_EXTENSION = ".mustache";
+
+    @Option(name = {"-o", "--output"}, title = "output directory",
+            description = "where to write the generated files (current dir by default)")
+    private String outputFolder = "";
+
+    @Option(name = {"-n", "--name"}, title = "name",
+            description = "the human-readable name of the generator")
+    private String name = "default";
+
+    @Option(name = {"-p", "--package"}, title = "package",
+            description = "the package to put the main class into (defaults to io.swagger.codegen)")
+    private String targetPackage = "io.swagger.codegen";
+
+    @Override
+    public void run() {
+        final File targetDir = new File(outputFolder);
+        LOG.info("writing to folder [{}]", targetDir.getAbsolutePath());
+
+        String mainClass = StringUtils.capitalize(name) + "Generator";
+
+        List<SupportingFile> supportingFiles = ImmutableList.of(
+                new SupportingFile("pom.mustache", "", "pom.xml"),
+                new SupportingFile("generatorClass.mustache",
+                        on(File.separator).join("src/main/java", asPath(targetPackage)), mainClass.concat(".java")),
+                new SupportingFile("README.mustache", "", "README.md"),
+                new SupportingFile("api.template", "src/main/resources" + File.separator + name, "api.mustache"),
+                new SupportingFile("model.template", "src/main/resources" + File.separator + name, "model.mustache"),
+                new SupportingFile("services.mustache",
+                        "src/main/resources/META-INF/services", "io.swagger.codegen.CodegenConfig")
+        );
+
+        Map<String, Object> data = new ImmutableMap.Builder<String, Object>()
+                .put("generatorPackage", targetPackage)
+                .put("generatorClass", mainClass)
+                .put("name", name)
+                .put("fullyQualifiedGeneratorClass", targetPackage + "." + mainClass).build();
+
+
+        with(supportingFiles).convert(processFiles(targetDir, data));
+    }
+
+    /**
+     * Converter method to process supporting files: execute with mustache,
+     * or simply copy to destination directory
+     *
+     * @param targetDir - destination directory
+     * @param data      - map with additional params needed to process templates
+     * @return converter object to pass to lambdaj
+     */
+    private Converter<SupportingFile, File> processFiles(final File targetDir, final Map<String, Object> data) {
+        return new Converter<SupportingFile, File>() {
+            private DefaultGenerator generator = new DefaultGenerator();
+
+            @Override
+            public File convert(SupportingFile support) {
+                try {
+                    File destinationFolder = new File(new File(targetDir.getAbsolutePath()), support.folder);
+                    File outputFile = new File(destinationFolder, support.destinationFilename);
+
+                    String template = generator
+                            .readTemplate(new File(TEMPLATE_DIR_CLASSPATH, support.templateFile).getPath());
+                    String formatted = template;
+
+                    if (support.templateFile.endsWith(MUSTACHE_EXTENSION)) {
+                        LOG.info("writing file to {}", outputFile.getAbsolutePath());
+                        formatted = Mustache.compiler().withLoader(loader(generator))
+                                .defaultValue("")
+                                .compile(template)
+                                .execute(data);
+                    } else {
+                        LOG.info("copying file to {}", outputFile.getAbsolutePath());
+                    }
+
+                    FileUtils.writeStringToFile(outputFile, formatted);
+                    return outputFile;
+
+                } catch (IOException e) {
+                    throw new RuntimeException("Can't generate project", e);
+                }
+            }
+        };
+    }
+
+    /**
+     * Creates mustache loader for template using classpath loader
+     *
+     * @param generator - class with reader getter
+     * @return loader for template
+     */
+    private Mustache.TemplateLoader loader(final DefaultGenerator generator) {
+        return new Mustache.TemplateLoader() {
+            public Reader getTemplate(String name) {
+                return generator.getTemplateReader(TEMPLATE_DIR_CLASSPATH
+                        + File.separator + name.concat(MUSTACHE_EXTENSION));
+            }
+        };
+    }
+
+    /**
+     * Converts package name to path on file system
+     *
+     * @param packageName - package name to convert
+     * @return relative path
+     */
+    private String asPath(String packageName) {
+        return packageName.replace(".", File.separator);
+    }
+}

modules/swagger-codegen-cli/src/main/resources/logback.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Pattern>
+        </layout>
+    </appender>
+    <logger name="io.swagger" level="debug"/>
+    <root level="error">
+        <appender-ref ref="STDOUT"/>
+    </root>
+</configuration>

modules/swagger-codegen/pom.xml

@@ -0,0 +1,357 @@
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>io.swagger</groupId>
+        <artifactId>swagger-codegen-project</artifactId>
+        <version>2.1.2</version>
+        <relativePath>../..</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>swagger-codegen</artifactId>
+    <packaging>jar</packaging>
+    <name>swagger-codegen (core library)</name>
+    <build>
+        <sourceDirectory>src/main/java</sourceDirectory>
+        <defaultGoal>install</defaultGoal>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <excludes>
+                    <exclude>logback.xml</exclude>
+                </excludes>
+            </resource>
+        </resources>
+        <extensions>
+            <extension>
+                <groupId>org.jvnet.wagon-svn</groupId>
+                <artifactId>wagon-svn</artifactId>
+                <version>1.8</version>
+            </extension>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh-external</artifactId>
+                <version>1.0-alpha-6</version>
+            </extension>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-webdav</artifactId>
+                <version>1.0-beta-1</version>
+            </extension>
+        </extensions>
+        <directory>target</directory>
+        <finalName>${project.artifactId}-${project.version}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.3.2</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>java</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <mainClass>io.swagger.codegen.Codegen</mainClass>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>net.alchim31.maven</groupId>
+                <artifactId>scala-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>add-source</goal>
+                            <goal>compile</goal>
+                            <goal>testCompile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <configuration>
+                        <recompileMode>incremental</recompileMode>
+                    </configuration>
+                    <jvmArgs>
+                        <jvmArg>-Xmx384m</jvmArg>
+                    </jvmArgs>
+                    <args>
+                        <arg>-target:jvm-1.6</arg>
+                        <arg>-deprecation</arg>
+                    </args>
+                    <launchers>
+                        <launcher>
+                            <id>run-scalatest</id>
+                            <mainClass>org.scalatest.tools.Runner</mainClass>
+                            <args>
+                                <arg>-p</arg>
+                                <arg>${project.build.testOutputDirectory}</arg>
+                            </args>
+                            <jvmArgs>
+                                <jvmArg>-Xmx512m</jvmArg>
+                            </jvmArgs>
+                        </launcher>
+                    </launchers>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.0</version>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.4</version>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <mode>development</mode>
+                            <url>${project.url}</url>
+                            <implementation-version>${project.version}</implementation-version>
+                            <package>io.swagger</package>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+                <version>2.1</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-release-plugin</artifactId>
+                <version>2.1</version>
+            </plugin>
+        </plugins>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>net.alchim31.maven</groupId>
+                    <artifactId>scala-maven-plugin</artifactId>
+                    <version>${scala-maven-plugin-version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-gpg-plugin</artifactId>
+                    <configuration>
+                        <releaseProfiles>release</releaseProfiles>
+                        <goals>sign</goals>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+    <profiles>
+        <profile>
+            <id>release-profile</id>
+            <properties>
+                <skipTests>true</skipTests>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>net.alchim31.maven</groupId>
+                        <artifactId>scala-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>compile</goal>
+                                    <goal>testCompile</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <scala-version>${scala-version}</scala-version>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>add-source</id>
+                                <phase>prepare-package</phase>
+                                <goals>
+                                    <goal>add-source</goal>
+                                </goals>
+                                <configuration>
+                                    <sources>
+                                        <source>src/main/scala</source>
+                                    </sources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>release-sign-artifacts</id>
+            <activation>
+                <property>
+                    <name>performRelease</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+    <reporting>
+        <outputDirectory>target/site</outputDirectory>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.9</version>
+                <configuration>
+                    <aggregate>true</aggregate>
+                    <debug>true</debug>
+                    <links>
+                        <link>http://java.sun.com/javaee/5/docs/api</link>
+                        <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
+                    </links>
+                    <excludePackageNames/>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>net.alchim31.maven</groupId>
+                <artifactId>scala-maven-plugin</artifactId>
+                <version>${scala-maven-plugin-version}</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jxr-plugin</artifactId>
+                <version>2.3</version>
+                <configuration>
+                    <aggregate>true</aggregate>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <version>2.6</version>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>project-team</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+        </plugins>
+    </reporting>
+    <dependencies>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-parser</artifactId>
+            <version>${swagger-parser-version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-compat-spec-parser</artifactId>
+            <version>${swagger-parser-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>swagger-core</artifactId>
+            <version>${swagger-core-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.samskivert</groupId>
+            <artifactId>jmustache</artifactId>
+            <version>${jmustache-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>${commons-io-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-plugin-tools-api</artifactId>
+            <version>2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>maven-bundle-plugin</artifactId>
+            <version>${felix-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-ext</artifactId>
+            <version>${slf4j-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${slf4j-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>${commons-lang-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
+            <version>${commons-cli-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.scalatest</groupId>
+            <artifactId>scalatest_2.11</artifactId>
+            <version>${scala-test-version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.scala-lang</groupId>
+            <artifactId>scala-library</artifactId>
+            <version>${scala-version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <repositories>
+        <repository>
+            <id>sonatype-snapshots</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+</project>

modules/swagger-codegen/src/main/java/config/Config.java

@@ -0,0 +1,34 @@
+package config;
+
+import com.google.common.collect.ImmutableMap;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Config {
+    private Map<String, String> options;
+
+    public Config() {
+        this.options = new HashMap<String, String>();
+    }
+
+    public Config(Map<String, String> properties) {
+        this.options = properties;
+    }
+
+    public Map<String, String> getOptions() {
+        return ImmutableMap.copyOf(options);
+    }
+
+    public boolean hasOption(String opt) {
+        return options.containsKey(opt);
+    }
+
+    public String getOption(String opt) {
+        return options.get(opt);
+    }
+
+    public void setOption(String opt, String value) {
+        options.put(opt, value);
+    }
+}

modules/swagger-codegen/src/main/java/config/ConfigParser.java

@@ -0,0 +1,40 @@
+package config;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.io.File;
+import java.util.Iterator;
+import java.util.Map;
+
+public class ConfigParser {
+
+    public static Config read(String location) {
+
+        System.out.println("reading config from " + location);
+
+        ObjectMapper mapper = new ObjectMapper();
+
+        Config config = new Config();
+
+        try {
+            JsonNode rootNode = mapper.readTree(new File(location));
+            Iterator<Map.Entry<String, JsonNode>> optionNodes = rootNode.fields();
+
+            while (optionNodes.hasNext()) {
+                Map.Entry<String, JsonNode> optionNode = (Map.Entry<String, JsonNode>) optionNodes.next();
+
+                if (optionNode.getValue().isValueNode()) {
+                    config.setOption(optionNode.getKey(), optionNode.getValue().asText());
+                } else {
+                    System.out.println("omitting non-value node " + optionNode.getKey());
+                }
+            }
+        } catch (Exception e) {
+            System.out.println(e.getMessage());
+            return null;
+        }
+
+        return config;
+    }
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/AbstractGenerator.java

@@ -0,0 +1,69 @@
+package io.swagger.codegen;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.Reader;
+import java.io.Writer;
+import java.util.regex.Pattern;
+
+public abstract class AbstractGenerator {
+
+    public File writeToFile(String filename, String contents) throws IOException {
+        System.out.println("writing file " + filename);
+        File output = new File(filename);
+
+        if (output.getParent() != null && !new File(output.getParent()).exists()) {
+            File parent = new File(output.getParent());
+            parent.mkdirs();
+        }
+        Writer out = new BufferedWriter(new OutputStreamWriter(
+                new FileOutputStream(output), "UTF-8"));
+
+        out.write(contents);
+        out.close();
+        return output;
+    }
+
+    public String readTemplate(String name) {
+        try {
+            Reader reader = getTemplateReader(name);
+            if (reader == null) {
+                throw new RuntimeException("no file found");
+            }
+            java.util.Scanner s = new java.util.Scanner(reader).useDelimiter("\\A");
+            return s.hasNext() ? s.next() : "";
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        throw new RuntimeException("can't load template " + name);
+    }
+
+    public Reader getTemplateReader(String name) {
+        try {
+            InputStream is = this.getClass().getClassLoader().getResourceAsStream(getCPResourcePath(name));
+            if (is == null) {
+                is = new FileInputStream(new File(name));
+            }
+            if (is == null) {
+                throw new RuntimeException("no file found");
+            }
+            return new InputStreamReader(is);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        throw new RuntimeException("can't load template " + name);
+    }
+
+    private String getCPResourcePath(String name) {
+        if (!"/".equals(File.separator)) {
+            return name.replaceAll(Pattern.quote(File.separator), "/");
+        }
+        return name;
+    }
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/CliOption.java

@@ -0,0 +1,23 @@
+package io.swagger.codegen;
+
+public class CliOption {
+    private final String opt;
+    private String description;
+
+    public CliOption(String opt, String description) {
+        this.opt = opt;
+        this.description = description;
+    }
+
+    public String getOpt() {
+        return opt;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/ClientOptInput.java

@@ -0,0 +1,92 @@
+package io.swagger.codegen;
+
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.Swagger;
+import io.swagger.models.auth.AuthorizationValue;
+
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.List;
+
+public class ClientOptInput {
+    protected CodegenConfig config;
+    private ClientOpts opts;
+    private Swagger swagger;
+    private List<AuthorizationValue> auths;
+
+    public ClientOptInput swagger(Swagger swagger) {
+        this.setSwagger(swagger);
+        return this;
+    }
+
+    public ClientOptInput opts(ClientOpts opts) {
+        this.setOpts(opts);
+        return this;
+    }
+
+    public String getAuth() {
+        if (auths != null) {
+            StringBuilder b = new StringBuilder();
+            for (AuthorizationValue v : auths) {
+                try {
+                    if (b.toString().length() > 0) {
+                        b.append(",");
+                    }
+                    b.append(URLEncoder.encode(v.getKeyName(), "UTF-8"))
+                            .append(":")
+                            .append(URLEncoder.encode(v.getValue(), "UTF-8"));
+                } catch (Exception e) {
+                    // continue
+                    e.printStackTrace();
+                }
+            }
+            return b.toString();
+        } else {
+            return null;
+        }
+    }
+
+    public void setAuth(String urlEncodedAuthString) {
+        List<AuthorizationValue> auths = new ArrayList<AuthorizationValue>();
+        if (urlEncodedAuthString != null && !"".equals(urlEncodedAuthString)) {
+            String[] parts = urlEncodedAuthString.split(",");
+            for (String part : parts) {
+                String[] kvPair = part.split(":");
+                if (kvPair.length == 2) {
+                    auths.add(new AuthorizationValue(URLDecoder.decode(kvPair[0]), URLDecoder.decode(kvPair[1]), "header"));
+                }
+            }
+        }
+        this.auths = auths;
+    }
+
+    public List<AuthorizationValue> getAuthorizationValues() {
+        return auths;
+    }
+
+    public CodegenConfig getConfig() {
+        return config;
+    }
+
+    public void setConfig(CodegenConfig config) {
+        this.config = config;
+    }
+
+    public ClientOpts getOpts() {
+        return opts;
+    }
+
+    public void setOpts(ClientOpts opts) {
+        this.opts = opts;
+    }
+
+    @ApiModelProperty(dataType = "Object")
+    public Swagger getSwagger() {
+        return swagger;
+    }
+
+    public void setSwagger(Swagger swagger) {
+        this.swagger = swagger;
+    }
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/ClientOpts.java

@@ -0,0 +1,57 @@
+package io.swagger.codegen;
+
+import io.swagger.codegen.auth.AuthMethod;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ClientOpts {
+    protected String uri;
+    protected String target;
+    protected AuthMethod auth;
+    protected Map<String, String> properties = new HashMap<String, String>();
+    protected String outputDirectory;
+
+    public String getUri() {
+        return uri;
+    }
+
+    public void setUri(String uri) {
+        this.uri = uri;
+    }
+
+    public String getTarget() {
+        return target;
+    }
+
+    public void setTarget(String target) {
+        this.target = target;
+    }
+
+    public Map<String, String> getProperties() {
+        return properties;
+    }
+
+    public void setProperties(Map<String, String> properties) {
+        this.properties = properties;
+    }
+
+    public String getOutputDirectory() {
+        return outputDirectory;
+    }
+
+    public void setOutputDirectory(String outputDirectory) {
+        this.outputDirectory = outputDirectory;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("ClientOpts: {\n");
+        sb.append("  uri: ").append(uri).append(",");
+        sb.append("  auth: ").append(auth).append(",");
+        sb.append(properties);
+        sb.append("}");
+        return sb.toString();
+    }
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/Codegen.java

@@ -0,0 +1,148 @@
+package io.swagger.codegen;
+
+import io.swagger.models.Swagger;
+import io.swagger.parser.SwaggerParser;
+import org.apache.commons.cli.BasicParser;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Options;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.ServiceLoader;
+
+/**
+ * @deprecated use instead {@link io.swagger.codegen.DefaultGenerator}
+ * or cli interface from https://github.com/swagger-api/swagger-codegen/pull/547
+ */
+@Deprecated
+public class Codegen extends DefaultGenerator {
+    static Map<String, CodegenConfig> configs = new HashMap<String, CodegenConfig>();
+    static String configString;
+    static String debugInfoOptions = "\nThe following additional debug options are available for all codegen targets:" +
+            "\n -DdebugSwagger prints the swagger specification as interpreted by the codegen" +
+            "\n -DdebugModels prints models passed to the template engine" +
+            "\n -DdebugOperations prints operations passed to the template engine" +
+            "\n -DdebugSupportingFiles prints additional data passed to the template engine";
+
+    public static void main(String[] args) {
+
+        StringBuilder sb = new StringBuilder();
+
+        Options options = new Options();
+        options.addOption("h", "help", false, "shows this message");
+        options.addOption("l", "lang", true, "client language to generate.\nAvailable languages include:\n\t[" + configString + "]");
+        options.addOption("o", "output", true, "where to write the generated files");
+        options.addOption("i", "input-spec", true, "location of the swagger spec, as URL or file");
+        options.addOption("t", "template-dir", true, "folder containing the template files");
+        options.addOption("d", "debug-info", false, "prints additional info for debugging");
+        options.addOption("a", "auth", true, "adds authorization headers when fetching the swagger definitions remotely. Pass in a URL-encoded string of name:header with a comma separating multiple values");
+
+        ClientOptInput clientOptInput = new ClientOptInput();
+        ClientOpts clientOpts = new ClientOpts();
+        Swagger swagger = null;
+
+        CommandLine cmd = null;
+        try {
+            CommandLineParser parser = new BasicParser();
+            CodegenConfig config = null;
+
+            cmd = parser.parse(options, args);
+            if (cmd.hasOption("d")) {
+                usage(options);
+                System.out.println(debugInfoOptions);
+                return;
+            }
+            if (cmd.hasOption("a")) {
+                clientOptInput.setAuth(cmd.getOptionValue("a"));
+            }
+            if (cmd.hasOption("l")) {
+                clientOptInput.setConfig(getConfig(cmd.getOptionValue("l")));
+            } else {
+                usage(options);
+                return;
+            }
+            if (cmd.hasOption("o")) {
+                clientOptInput.getConfig().setOutputDir(cmd.getOptionValue("o"));
+            }
+            if (cmd.hasOption("h")) {
+                if (cmd.hasOption("l")) {
+                    config = getConfig(String.valueOf(cmd.getOptionValue("l")));
+                    if (config != null) {
+                        options.addOption("h", "help", true, config.getHelp());
+                        usage(options);
+                        return;
+                    }
+                }
+                usage(options);
+                return;
+            }
+            if (cmd.hasOption("i")) {
+                swagger = new SwaggerParser().read(cmd.getOptionValue("i"), clientOptInput.getAuthorizationValues(), true);
+            }
+            if (cmd.hasOption("t")) {
+                clientOpts.getProperties().put("templateDir", String.valueOf(cmd.getOptionValue("t")));
+            }
+        } catch (Exception e) {
+            usage(options);
+            return;
+        }
+        try {
+            clientOptInput
+                    .opts(clientOpts)
+                    .swagger(swagger);
+            new Codegen().opts(clientOptInput).generate();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static List<CodegenConfig> getExtensions() {
+        ServiceLoader<CodegenConfig> loader = ServiceLoader.load(CodegenConfig.class);
+        List<CodegenConfig> output = new ArrayList<CodegenConfig>();
+        Iterator<CodegenConfig> itr = loader.iterator();
+        while (itr.hasNext()) {
+            output.add(itr.next());
+        }
+        return output;
+    }
+
+    static void usage(Options options) {
+        HelpFormatter formatter = new HelpFormatter();
+        formatter.printHelp("Codegen", options);
+    }
+
+    public static CodegenConfig getConfig(String name) {
+        if (configs.containsKey(name)) {
+            return configs.get(name);
+        } else {
+            // see if it's a class
+            try {
+                System.out.println("loading class " + name);
+                Class customClass = Class.forName(name);
+                System.out.println("loaded");
+                return (CodegenConfig) customClass.newInstance();
+            } catch (Exception e) {
+                throw new RuntimeException("can't load class " + name);
+            }
+        }
+    }
+
+    static {
+        List<CodegenConfig> extensions = getExtensions();
+        StringBuilder sb = new StringBuilder();
+
+        for (CodegenConfig config : extensions) {
+            if (sb.toString().length() != 0) {
+                sb.append(", ");
+            }
+            sb.append(config.getName());
+            configs.put(config.getName(), config);
+            configString = sb.toString();
+        }
+    }
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConfig.java

@@ -0,0 +1,105 @@
+package io.swagger.codegen;
+
+import io.swagger.models.Model;
+import io.swagger.models.Operation;
+import io.swagger.models.Swagger;
+import io.swagger.models.auth.SecuritySchemeDefinition;
+import io.swagger.models.properties.Property;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public interface CodegenConfig {
+    CodegenType getTag();
+
+    String getName();
+
+    String getHelp();
+
+    Map<String, Object> additionalProperties();
+
+    String apiPackage();
+
+    String apiFileFolder();
+
+    String fileSuffix();
+
+    String outputFolder();
+
+    String templateDir();
+
+    String modelFileFolder();
+
+    String modelPackage();
+
+    String toApiName(String name);
+
+    String toApiVarName(String name);
+
+    String toModelName(String name);
+
+    String toParamName(String name);
+
+    String escapeText(String text);
+
+    String escapeReservedWord(String name);
+
+    String getTypeDeclaration(Property p);
+
+    String getTypeDeclaration(String name);
+
+    void processOpts();
+
+    List<CliOption> cliOptions();
+
+    String generateExamplePath(String path, Operation operation);
+
+    Set<String> reservedWords();
+
+    List<SupportingFile> supportingFiles();
+
+    String getOutputDir();
+
+    void setOutputDir(String dir);
+
+    CodegenModel fromModel(String name, Model model);
+
+    CodegenOperation fromOperation(String resourcePath, String httpMethod, Operation operation, Map<String, Model> definitions);
+
+    List<CodegenSecurity> fromSecurity(Map<String, SecuritySchemeDefinition> schemes);
+
+    Set<String> defaultIncludes();
+
+    Map<String, String> typeMapping();
+
+    Map<String, String> instantiationTypes();
+
+    Map<String, String> importMapping();
+
+    Map<String, String> apiTemplateFiles();
+
+    Map<String, String> modelTemplateFiles();
+
+    void processSwagger(Swagger swagger);
+
+    String toApiFilename(String name);
+
+    String toModelFilename(String name);
+
+    String toModelImport(String name);
+
+    String toApiImport(String name);
+
+    void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co, Map<String, List<CodegenOperation>> operations);
+
+    Map<String, Object> postProcessModels(Map<String, Object> objs);
+
+    Map<String, Object> postProcessOperations(Map<String, Object> objs);
+
+    Map<String, Object> postProcessSupportingFileData(Map<String, Object> objs);
+
+    String apiFilename(String templateName, String tag);
+
+    boolean shouldOverwrite(String filename);
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenModel.java

@@ -0,0 +1,18 @@
+package io.swagger.codegen;
+
+import io.swagger.models.ExternalDocs;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+public class CodegenModel {
+    public String parent;
+    public String name, classname, description, classVarName, modelJson;
+    public String defaultValue;
+    public List<CodegenProperty> vars = new ArrayList<CodegenProperty>();
+    public Set<String> imports = new HashSet<String>();
+    public Boolean hasVars, emptyVars, hasMoreModels, hasEnums;
+    public ExternalDocs externalDocs;
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenModelFactory.java

@@ -0,0 +1,39 @@
+package io.swagger.codegen;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public final class CodegenModelFactory {
+
+    private static final Map<CodegenModelType, Class<?>> typeMapping = new HashMap<CodegenModelType, Class<?>>();
+
+    /**
+     * Configure a different implementation class.
+     *
+     * @param type           the type that shall be replaced
+     * @param implementation the implementation class must extend the default class and must provide a public no-arg constructor
+     */
+    public static void setTypeMapping(CodegenModelType type, Class<?> implementation) {
+        if (!type.getDefaultImplementation().isAssignableFrom(implementation)) {
+            throw new IllegalArgumentException(implementation.getSimpleName() + " doesn't extend " + type.getDefaultImplementation().getSimpleName());
+        }
+        try {
+            implementation.newInstance();
+        } catch (Exception e) {
+            throw new IllegalArgumentException(e);
+        }
+        typeMapping.put(type, implementation);
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T> T newInstance(CodegenModelType type) {
+        Class<?> classType = typeMapping.get(type);
+        try {
+            return (T) (classType != null ? classType : type.getDefaultImplementation()).newInstance();
+        } catch (InstantiationException e) {
+            throw new RuntimeException(e);
+        } catch (IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenModelType.java

@@ -0,0 +1,21 @@
+package io.swagger.codegen;
+
+public enum CodegenModelType {
+
+    MODEL(CodegenModel.class),
+    OPERATION(CodegenOperation.class),
+    PARAMETER(CodegenParameter.class),
+    PROPERTY(CodegenProperty.class),
+    RESPONSE(CodegenResponse.class),
+    SECURITY(CodegenSecurity.class);
+
+    private final Class<?> defaultImplementation;
+
+    private CodegenModelType(Class<?> defaultImplementation) {
+        this.defaultImplementation = defaultImplementation;
+    }
+
+    public Class<?> getDefaultImplementation() {
+        return defaultImplementation;
+    }
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenOperation.java

@@ -0,0 +1,35 @@
+package io.swagger.codegen;
+
+import io.swagger.models.ExternalDocs;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public class CodegenOperation {
+    public final List<CodegenProperty> responseHeaders = new ArrayList<CodegenProperty>();
+    public Boolean hasConsumes, hasProduces, hasParams, returnTypeIsPrimitive,
+            returnSimpleType, subresourceOperation, isMapContainer, isListContainer,
+            hasMore = Boolean.TRUE, isMultipart;
+    public String path, operationId, returnType, httpMethod, returnBaseType,
+            returnContainer, summary, notes, baseName, defaultResponse;
+    public List<Map<String, String>> consumes, produces;
+    public CodegenParameter bodyParam;
+    public List<CodegenParameter> allParams = new ArrayList<CodegenParameter>();
+    public List<CodegenParameter> bodyParams = new ArrayList<CodegenParameter>();
+    public List<CodegenParameter> pathParams = new ArrayList<CodegenParameter>();
+    public List<CodegenParameter> queryParams = new ArrayList<CodegenParameter>();
+    public List<CodegenParameter> headerParams = new ArrayList<CodegenParameter>();
+    public List<CodegenParameter> formParams = new ArrayList<CodegenParameter>();
+    public List<CodegenSecurity> authMethods;
+    public List<String> tags;
+    public List<CodegenResponse> responses = new ArrayList<CodegenResponse>();
+    public Set<String> imports = new HashSet<String>();
+    public List<Map<String, String>> examples;
+    public ExternalDocs externalDocs;
+
+    // legacy support
+    public String nickname;
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenParameter.java

@@ -0,0 +1,41 @@
+package io.swagger.codegen;
+
+public class CodegenParameter {
+    public Boolean isFormParam, isQueryParam, isPathParam, isHeaderParam,
+            isCookieParam, isBodyParam, isFile, notFile, hasMore, isContainer, secondaryParam;
+    public String baseName, paramName, dataType, collectionFormat, description, baseType, defaultValue;
+    public String jsonSchema;
+
+    /**
+     * Determines whether this parameter is mandatory. If the parameter is in "path",
+     * this property is required and its value MUST be true. Otherwise, the property
+     * MAY be included and its default value is false.
+     */
+    public Boolean required;
+
+    public CodegenParameter copy() {
+        CodegenParameter output = new CodegenParameter();
+        output.isFile = this.isFile;
+        output.notFile = this.notFile;
+        output.hasMore = this.hasMore;
+        output.isContainer = this.isContainer;
+        output.secondaryParam = this.secondaryParam;
+        output.baseName = this.baseName;
+        output.paramName = this.paramName;
+        output.dataType = this.dataType;
+        output.collectionFormat = this.collectionFormat;
+        output.description = this.description;
+        output.baseType = this.baseType;
+        output.isFormParam = this.isFormParam;
+        output.isQueryParam = this.isQueryParam;
+        output.isPathParam = this.isPathParam;
+        output.isHeaderParam = this.isHeaderParam;
+        output.isCookieParam = this.isCookieParam;
+        output.isBodyParam = this.isBodyParam;
+        output.required = this.required;
+        output.jsonSchema = this.jsonSchema;
+        output.defaultValue = this.defaultValue;
+
+        return output;
+    }
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenProperty.java

@@ -0,0 +1,37 @@
+package io.swagger.codegen;
+
+import java.util.List;
+import java.util.Map;
+
+public class CodegenProperty {
+    public String baseName, complexType, getter, setter, description, datatype, datatypeWithEnum,
+            name, min, max, defaultValue, baseType, containerType;
+
+    /**
+     * maxLength validation for strings, see http://json-schema.org/latest/json-schema-validation.html#rfc.section.5.2.1
+     */
+    public Integer maxLength;
+    /**
+     * minLength validation for strings, see http://json-schema.org/latest/json-schema-validation.html#rfc.section.5.2.2
+     */
+    public Integer minLength;
+    /**
+     * pattern validation for strings, see http://json-schema.org/latest/json-schema-validation.html#rfc.section.5.2.3
+     */
+    public String pattern;
+    /**
+     * A free-form property to include an example of an instance for this schema.
+     */
+    public String example;
+
+    public String jsonSchema;
+    public Double minimum;
+    public Double maximum;
+    public Boolean exclusiveMinimum;
+    public Boolean exclusiveMaximum;
+    public Boolean hasMore = null, required = null, secondaryParam = null;
+    public Boolean isPrimitiveType, isContainer, isNotContainer;
+    public boolean isEnum;
+    public List<String> _enum;
+    public Map<String, Object> allowableValues;
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenResponse.java

@@ -0,0 +1,24 @@
+package io.swagger.codegen;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class CodegenResponse {
+    public final List<CodegenProperty> headers = new ArrayList<CodegenProperty>();
+    public String code, message;
+    public Boolean hasMore;
+    public List<Map<String, Object>> examples;
+    public String dataType, baseType, containerType;
+    public Boolean isDefault;
+    public Boolean simpleType;
+    public Boolean primitiveType;
+    public Boolean isMapContainer;
+    public Boolean isListContainer;
+    public Object schema;
+    public String jsonSchema;
+
+    public boolean isWildcard() {
+        return "0".equals(code) || "default".equals(code);
+    }
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenSecurity.java

@@ -0,0 +1,10 @@
+package io.swagger.codegen;
+
+public class CodegenSecurity {
+    public String name;
+    public String type;
+    public Boolean hasMore, isBasic, isOAuth, isApiKey;
+    // ApiKey specific
+    public String keyParamName;
+    public Boolean isKeyInQuery, isKeyInHeader;
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenType.java

@@ -0,0 +1,36 @@
+package io.swagger.codegen;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum CodegenType {
+    CLIENT, SERVER, DOCUMENTATION, OTHER;
+
+    private static Map<String, CodegenType> names = new HashMap<String, CodegenType>();
+
+    @JsonCreator
+    public static CodegenType forValue(String value) {
+        return names.get(value.toLowerCase());
+    }
+
+    @JsonValue
+    public String toValue() {
+        for (Map.Entry<String, CodegenType> entry : names.entrySet()) {
+            if (entry.getValue() == this) {
+                return entry.getKey();
+            }
+        }
+
+        return null; // or fail
+    }
+
+    static {
+        names.put("client", CLIENT);
+        names.put("server", SERVER);
+        names.put("documentation", DOCUMENTATION);
+        names.put("other", OTHER);
+    }
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java

@@ -0,0 +1,484 @@
+package io.swagger.codegen;
+
+import com.samskivert.mustache.Mustache;
+import com.samskivert.mustache.Template;
+import io.swagger.models.Contact;
+import io.swagger.models.Info;
+import io.swagger.models.License;
+import io.swagger.models.Model;
+import io.swagger.models.Operation;
+import io.swagger.models.Path;
+import io.swagger.models.Swagger;
+import io.swagger.models.auth.SecuritySchemeDefinition;
+import io.swagger.util.Json;
+import org.apache.commons.io.IOUtils;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static org.apache.commons.lang3.StringUtils.capitalize;
+import static org.apache.commons.lang3.StringUtils.isNotEmpty;
+
+public class DefaultGenerator extends AbstractGenerator implements Generator {
+    protected CodegenConfig config;
+    protected ClientOptInput opts = null;
+    protected Swagger swagger = null;
+
+    public Generator opts(ClientOptInput opts) {
+        this.opts = opts;
+
+        this.swagger = opts.getSwagger();
+        this.config = opts.getConfig();
+        this.config.additionalProperties().putAll(opts.getOpts().getProperties());
+
+        return this;
+    }
+
+    public List<File> generate() {
+        if (swagger == null || config == null) {
+            throw new RuntimeException("missing swagger input or config!");
+        }
+        if (System.getProperty("debugSwagger") != null) {
+            Json.prettyPrint(swagger);
+        }
+        List<File> files = new ArrayList<File>();
+        try {
+            config.processOpts();
+            if (swagger.getInfo() != null) {
+                Info info = swagger.getInfo();
+                if (info.getTitle() != null) {
+                    config.additionalProperties().put("appName", info.getTitle());
+                }
+                if (info.getVersion() != null) {
+                    config.additionalProperties().put("appVersion", info.getVersion());
+                }
+                if (info.getDescription() != null) {
+                    config.additionalProperties().put("appDescription",
+                            config.escapeText(info.getDescription()));
+                }
+                if (info.getContact() != null) {
+                    Contact contact = info.getContact();
+                    config.additionalProperties().put("infoUrl", contact.getUrl());
+                    if (contact.getEmail() != null) {
+                        config.additionalProperties().put("infoEmail", contact.getEmail());
+                    }
+                }
+                if (info.getLicense() != null) {
+                    License license = info.getLicense();
+                    if (license.getName() != null) {
+                        config.additionalProperties().put("licenseInfo", license.getName());
+                    }
+                    if (license.getUrl() != null) {
+                        config.additionalProperties().put("licenseUrl", license.getUrl());
+                    }
+                }
+                if (info.getVersion() != null) {
+                    config.additionalProperties().put("version", info.getVersion());
+                }
+            }
+
+            StringBuilder hostBuilder = new StringBuilder();
+            String scheme;
+            if (swagger.getSchemes() != null && swagger.getSchemes().size() > 0) {
+                scheme = swagger.getSchemes().get(0).toValue();
+            } else {
+                scheme = "https";
+            }
+            hostBuilder.append(scheme);
+            hostBuilder.append("://");
+            if (swagger.getHost() != null) {
+                hostBuilder.append(swagger.getHost());
+            } else {
+                hostBuilder.append("localhost");
+            }
+            if (swagger.getBasePath() != null) {
+                hostBuilder.append(swagger.getBasePath());
+            } else {
+                hostBuilder.append("/");
+            }
+            String contextPath = swagger.getBasePath() == null ? "/" : swagger.getBasePath();
+            String basePath = hostBuilder.toString();
+
+
+            List<Object> allOperations = new ArrayList<Object>();
+            List<Object> allModels = new ArrayList<Object>();
+
+            // models
+            Map<String, Model> definitions = swagger.getDefinitions();
+            if (definitions != null) {
+                for (String name : definitions.keySet()) {
+                    Model model = definitions.get(name);
+                    Map<String, Model> modelMap = new HashMap<String, Model>();
+                    modelMap.put(name, model);
+                    Map<String, Object> models = processModels(config, modelMap);
+                    models.putAll(config.additionalProperties());
+
+                    allModels.add(((List<Object>) models.get("models")).get(0));
+
+                    for (String templateName : config.modelTemplateFiles().keySet()) {
+                        String suffix = config.modelTemplateFiles().get(templateName);
+                        String filename = config.modelFileFolder() + File.separator + config.toModelFilename(name) + suffix;
+                        String template = readTemplate(config.templateDir() + File.separator + templateName);
+                        Template tmpl = Mustache.compiler()
+                                .withLoader(new Mustache.TemplateLoader() {
+                                    public Reader getTemplate(String name) {
+                                        return getTemplateReader(config.templateDir() + File.separator + name + ".mustache");
+                                    }
+                                })
+                                .defaultValue("")
+                                .compile(template);
+                        writeToFile(filename, tmpl.execute(models));
+                        files.add(new File(filename));
+                    }
+                }
+            }
+            if (System.getProperty("debugModels") != null) {
+                System.out.println("############ Model info ############");
+                Json.prettyPrint(allModels);
+            }
+
+            // apis
+            Map<String, List<CodegenOperation>> paths = processPaths(swagger.getPaths());
+            for (String tag : paths.keySet()) {
+                List<CodegenOperation> ops = paths.get(tag);
+                Map<String, Object> operation = processOperations(config, tag, ops);
+
+                operation.put("basePath", basePath);
+                operation.put("contextPath", contextPath);
+                operation.put("baseName", tag);
+                operation.put("modelPackage", config.modelPackage());
+                operation.putAll(config.additionalProperties());
+                operation.put("classname", config.toApiName(tag));
+                operation.put("classVarName", config.toApiVarName(tag));
+                operation.put("importPath", config.toApiImport(tag));
+
+                processMimeTypes(swagger.getConsumes(), operation, "consumes");
+                processMimeTypes(swagger.getProduces(), operation, "produces");
+
+                allOperations.add(new HashMap<String, Object>(operation));
+                for (int i = 0; i < allOperations.size(); i++) {
+                    Map<String, Object> oo = (Map<String, Object>) allOperations.get(i);
+                    if (i < (allOperations.size() - 1)) {
+                        oo.put("hasMore", "true");
+                    }
+                }
+
+                for (String templateName : config.apiTemplateFiles().keySet()) {
+
+                    String filename = config.apiFilename(templateName, tag);
+                    if (new File(filename).exists() && !config.shouldOverwrite(filename)) {
+                        continue;
+                    }
+
+                    String template = readTemplate(config.templateDir() + File.separator + templateName);
+                    Template tmpl = Mustache.compiler()
+                            .withLoader(new Mustache.TemplateLoader() {
+                                public Reader getTemplate(String name) {
+                                    return getTemplateReader(config.templateDir() + File.separator + name + ".mustache");
+                                }
+                            })
+                            .defaultValue("")
+                            .compile(template);
+
+                    writeToFile(filename, tmpl.execute(operation));
+                    files.add(new File(filename));
+                }
+            }
+            if (System.getProperty("debugOperations") != null) {
+                System.out.println("############ Operation info ############");
+                Json.prettyPrint(allOperations);
+            }
+
+            // supporting files
+            Map<String, Object> bundle = new HashMap<String, Object>();
+            bundle.putAll(config.additionalProperties());
+            bundle.put("apiPackage", config.apiPackage());
+
+            Map<String, Object> apis = new HashMap<String, Object>();
+            apis.put("apis", allOperations);
+            if (swagger.getHost() != null) {
+                bundle.put("host", swagger.getHost());
+            }
+            bundle.put("basePath", basePath);
+            bundle.put("scheme", scheme);
+            bundle.put("contextPath", contextPath);
+            bundle.put("apiInfo", apis);
+            bundle.put("models", allModels);
+            bundle.put("apiFolder", config.apiPackage().replace('.', File.separatorChar));
+            bundle.put("modelPackage", config.modelPackage());
+            bundle.put("authMethods", config.fromSecurity(swagger.getSecurityDefinitions()));
+            if (swagger.getExternalDocs() != null) {
+                bundle.put("externalDocs", swagger.getExternalDocs());
+            }
+            for (int i = 0; i < allModels.size() - 1; i++) {
+                HashMap<String, CodegenModel> cm = (HashMap<String, CodegenModel>) allModels.get(i);
+                CodegenModel m = cm.get("model");
+                m.hasMoreModels = true;
+            }
+
+            config.postProcessSupportingFileData(bundle);
+
+            if (System.getProperty("debugSupportingFiles") != null) {
+                System.out.println("############ Supporting file info ############");
+                Json.prettyPrint(bundle);
+            }
+
+            for (SupportingFile support : config.supportingFiles()) {
+                String outputFolder = config.outputFolder();
+                if (isNotEmpty(support.folder)) {
+                    outputFolder += File.separator + support.folder;
+                }
+                File of = new File(outputFolder);
+                if (!of.isDirectory()) {
+                    of.mkdirs();
+                }
+                String outputFilename = outputFolder + File.separator + support.destinationFilename;
+
+                if (support.templateFile.endsWith("mustache")) {
+                    String template = readTemplate(config.templateDir() + File.separator + support.templateFile);
+                    Template tmpl = Mustache.compiler()
+                            .withLoader(new Mustache.TemplateLoader() {
+                                public Reader getTemplate(String name) {
+                                    return getTemplateReader(config.templateDir() + File.separator + name + ".mustache");
+                                }
+                            })
+                            .defaultValue("")
+                            .compile(template);
+
+                    writeToFile(outputFilename, tmpl.execute(bundle));
+                    files.add(new File(outputFilename));
+                } else {
+                    InputStream in = null;
+
+                    try {
+                        in = new FileInputStream(config.templateDir() + File.separator + support.templateFile);
+                    } catch (Exception e) {
+                        // continue
+                    }
+                    if (in == null) {
+                        in = this.getClass().getClassLoader().getResourceAsStream(config.templateDir() + File.separator + support.templateFile);
+                    }
+                    File outputFile = new File(outputFilename);
+                    OutputStream out = new FileOutputStream(outputFile, false);
+                    if (in != null && out != null) {
+                        IOUtils.copy(in, out);
+                    } else {
+                        if (in == null) {
+                            System.out.println("can't open " + config.templateDir() + File.separator + support.templateFile + " for input");
+                        }
+                        if (out == null) {
+                            System.out.println("can't open " + outputFile + " for output");
+                        }
+                    }
+
+                    files.add(outputFile);
+                }
+            }
+
+            config.processSwagger(swagger);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return files;
+    }
+
+    private void processMimeTypes(List<String> mimeTypeList, Map<String, Object> operation, String source) {
+        if (mimeTypeList != null && mimeTypeList.size() > 0) {
+            List<Map<String, String>> c = new ArrayList<Map<String, String>>();
+            int count = 0;
+            for (String key : mimeTypeList) {
+                Map<String, String> mediaType = new HashMap<String, String>();
+                mediaType.put("mediaType", key);
+                count += 1;
+                if (count < mimeTypeList.size()) {
+                    mediaType.put("hasMore", "true");
+                } else {
+                    mediaType.put("hasMore", null);
+                }
+                c.add(mediaType);
+            }
+            operation.put(source, c);
+            String flagFieldName = "has" + source.substring(0, 1).toUpperCase() + source.substring(1);
+            operation.put(flagFieldName, true);
+        }
+    }
+
+    public Map<String, List<CodegenOperation>> processPaths(Map<String, Path> paths) {
+        Map<String, List<CodegenOperation>> ops = new HashMap<String, List<CodegenOperation>>();
+
+        for (String resourcePath : paths.keySet()) {
+            Path path = paths.get(resourcePath);
+            processOperation(resourcePath, "get", path.getGet(), ops);
+            processOperation(resourcePath, "put", path.getPut(), ops);
+            processOperation(resourcePath, "post", path.getPost(), ops);
+            processOperation(resourcePath, "delete", path.getDelete(), ops);
+            processOperation(resourcePath, "patch", path.getPatch(), ops);
+            processOperation(resourcePath, "options", path.getOptions(), ops);
+        }
+        return ops;
+    }
+
+    public SecuritySchemeDefinition fromSecurity(String name) {
+        Map<String, SecuritySchemeDefinition> map = swagger.getSecurityDefinitions();
+        if (map == null) {
+            return null;
+        }
+        return map.get(name);
+    }
+
+
+    public void processOperation(String resourcePath, String httpMethod, Operation operation, Map<String, List<CodegenOperation>> operations) {
+        if (operation != null) {
+            List<String> tags = operation.getTags();
+            if (tags == null) {
+                tags = new ArrayList<String>();
+                tags.add("default");
+            }
+
+            for (String tag : tags) {
+                CodegenOperation co = config.fromOperation(resourcePath, httpMethod, operation, swagger.getDefinitions());
+                co.tags = new ArrayList<String>();
+                co.tags.add(sanitizeTag(tag));
+                config.addOperationToGroup(sanitizeTag(tag), resourcePath, operation, co, operations);
+
+                List<Map<String, List<String>>> securities = operation.getSecurity();
+                if (securities == null) {
+                    continue;
+                }
+                Map<String, SecuritySchemeDefinition> authMethods = new HashMap<String, SecuritySchemeDefinition>();
+                for (Map<String, List<String>> security : securities) {
+                    if (security.size() != 1) {
+                        //Not sure what to do
+                        continue;
+                    }
+                    String securityName = security.keySet().iterator().next();
+                    SecuritySchemeDefinition securityDefinition = fromSecurity(securityName);
+                    if (securityDefinition != null) {
+                        authMethods.put(securityName, securityDefinition);
+                    }
+                }
+                if (!authMethods.isEmpty()) {
+                    co.authMethods = config.fromSecurity(authMethods);
+                }
+            }
+        }
+    }
+
+    protected String sanitizeTag(String tag) {
+        // remove spaces and make strong case
+        String[] parts = tag.split(" ");
+        StringBuilder buf = new StringBuilder();
+        for (String part : parts) {
+            if (isNotEmpty(part)) {
+                buf.append(capitalize(part));
+            }
+        }
+        return buf.toString().replaceAll("[^a-zA-Z ]", "");
+    }
+
+    public Map<String, Object> processOperations(CodegenConfig config, String tag, List<CodegenOperation> ops) {
+        Map<String, Object> operations = new HashMap<String, Object>();
+        Map<String, Object> objs = new HashMap<String, Object>();
+        objs.put("classname", config.toApiName(tag));
+
+        // check for operationId uniqueness
+        Set<String> opIds = new HashSet<String>();
+        int counter = 0;
+        for (CodegenOperation op : ops) {
+            String opId = op.nickname;
+            if (opIds.contains(opId)) {
+                counter++;
+                op.nickname += "_" + counter;
+            }
+            opIds.add(opId);
+        }
+        objs.put("operation", ops);
+
+        operations.put("operations", objs);
+        operations.put("package", config.apiPackage());
+
+
+        Set<String> allImports = new LinkedHashSet<String>();
+        for (CodegenOperation op : ops) {
+            allImports.addAll(op.imports);
+        }
+
+        List<Map<String, String>> imports = new ArrayList<Map<String, String>>();
+        for (String nextImport : allImports) {
+            Map<String, String> im = new LinkedHashMap<String, String>();
+            String mapping = config.importMapping().get(nextImport);
+            if (mapping == null) {
+                mapping = config.toModelImport(nextImport);
+            }
+            if (mapping != null) {
+                im.put("import", mapping);
+                imports.add(im);
+            }
+        }
+
+        operations.put("imports", imports);
+        config.postProcessOperations(operations);
+        if (objs.size() > 0) {
+            List<CodegenOperation> os = (List<CodegenOperation>) objs.get("operation");
+
+            if (os != null && os.size() > 0) {
+                CodegenOperation op = os.get(os.size() - 1);
+                op.hasMore = null;
+            }
+        }
+        return operations;
+    }
+
+    public Map<String, Object> processModels(CodegenConfig config, Map<String, Model> definitions) {
+        Map<String, Object> objs = new HashMap<String, Object>();
+        objs.put("package", config.modelPackage());
+        List<Object> models = new ArrayList<Object>();
+        Set<String> allImports = new LinkedHashSet<String>();
+        for (String key : definitions.keySet()) {
+            Model mm = definitions.get(key);
+            CodegenModel cm = config.fromModel(key, mm);
+            Map<String, Object> mo = new HashMap<String, Object>();
+            mo.put("model", cm);
+            mo.put("importPath", config.toModelImport(key));
+            models.add(mo);
+            allImports.addAll(cm.imports);
+        }
+        objs.put("models", models);
+
+        List<Map<String, String>> imports = new ArrayList<Map<String, String>>();
+        for (String nextImport : allImports) {
+            Map<String, String> im = new LinkedHashMap<String, String>();
+            String mapping = config.importMapping().get(nextImport);
+            if (mapping == null) {
+                mapping = config.toModelImport(nextImport);
+            }
+            if (mapping != null && !config.defaultIncludes().contains(mapping)) {
+                im.put("import", mapping);
+                imports.add(im);
+            }
+            // add instantiation types
+            mapping = config.instantiationTypes().get(nextImport);
+            if (mapping != null && !config.defaultIncludes().contains(mapping)) {
+                im.put("import", mapping);
+                imports.add(im);
+            }
+        }
+
+        objs.put("imports", imports);
+        config.postProcessModels(objs);
+
+        return objs;
+    }
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/Generator.java

@@ -0,0 +1,10 @@
+package io.swagger.codegen;
+
+import java.io.File;
+import java.util.List;
+
+public interface Generator {
+    Generator opts(ClientOptInput opts);
+
+    List<File> generate();
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/MetaGenerator.java

@@ -0,0 +1,196 @@
+package io.swagger.codegen;
+
+import com.samskivert.mustache.Mustache;
+import com.samskivert.mustache.Template;
+import io.swagger.models.Swagger;
+import org.apache.commons.cli.BasicParser;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Options;
+import org.apache.commons.io.FileUtils;
+
+import java.io.File;
+import java.io.Reader;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.ServiceLoader;
+
+/**
+ * @deprecated use instead {@link io.swagger.codegen.DefaultGenerator}
+ * or cli interface from https://github.com/swagger-api/swagger-codegen/pull/547
+ */
+@Deprecated
+public class MetaGenerator extends AbstractGenerator {
+    static Map<String, CodegenConfig> configs = new HashMap<String, CodegenConfig>();
+    static String configString;
+
+    public static void main(String[] args) {
+        new MetaGenerator().generate(args);
+    }
+
+    public static List<CodegenConfig> getExtensions() {
+        ServiceLoader<CodegenConfig> loader = ServiceLoader.load(CodegenConfig.class);
+        List<CodegenConfig> output = new ArrayList<CodegenConfig>();
+        Iterator<CodegenConfig> itr = loader.iterator();
+        while (itr.hasNext()) {
+            output.add(itr.next());
+        }
+        return output;
+    }
+
+    static void usage(Options options) {
+        HelpFormatter formatter = new HelpFormatter();
+        formatter.printHelp("MetaGenerator. Generator for creating a new template set " +
+                "and configuration for Codegen.  The output will be based on the language you " +
+                "specify, and includes default templates to include.", options);
+    }
+
+    public static CodegenConfig getConfig(String name) {
+        if (configs.containsKey(name)) {
+            return configs.get(name);
+        }
+        return null;
+    }
+
+    protected void generate(String[] args) {
+        StringBuilder sb = new StringBuilder();
+        String targetLanguage = null;
+        String outputFolder = null;
+        String name = null;
+        String targetPackage = "io.swagger.codegen";
+        final String templateDir = "codegen";
+
+        Options options = new Options();
+        options.addOption("h", "help", false, "shows this message");
+        options.addOption("l", "lang", false, "client language to generate.\nAvailable languages include:\n\t[" + configString + "]");
+        options.addOption("o", "output", true, "where to write the generated files");
+        options.addOption("n", "name", true, "the human-readable name of the generator");
+        options.addOption("p", "package", true, "the package to put the main class into (defaults to io.swagger.codegen");
+
+        ClientOptInput clientOptInput = new ClientOptInput();
+        Swagger swagger = null;
+        CommandLine cmd = null;
+        try {
+            CommandLineParser parser = new BasicParser();
+
+            cmd = parser.parse(options, args);
+            if (cmd.hasOption("h")) {
+                usage(options);
+                return;
+            }
+            if (cmd.hasOption("n")) {
+                name = cmd.getOptionValue("n");
+            } else {
+                System.out.println("name is required");
+                usage(options);
+                return;
+            }
+            if (cmd.hasOption("l")) {
+                targetLanguage = cmd.getOptionValue("l");
+            }
+            if (cmd.hasOption("p")) {
+                targetPackage = cmd.getOptionValue("p");
+            }
+            if (cmd.hasOption("o")) {
+                outputFolder = cmd.getOptionValue("o");
+            } else {
+                System.out.println("output folder is required");
+                usage(options);
+                return;
+            }
+        } catch (Exception e) {
+            usage(options);
+            return;
+        }
+        System.out.println("writing to folder " + outputFolder);
+        File outputFolderLocation = new File(outputFolder);
+        if (!outputFolderLocation.exists()) {
+            outputFolderLocation.mkdirs();
+        }
+        File sourceFolder = new File(outputFolder + File.separator + "src/main/java/" + targetPackage.replace('.', File.separatorChar));
+        if (!sourceFolder.exists()) {
+            sourceFolder.mkdirs();
+        }
+        File resourcesFolder = new File(outputFolder + File.separator + "src/main/resources/META-INF/services");
+        if (!resourcesFolder.exists()) {
+            resourcesFolder.mkdirs();
+        }
+
+        String mainClass = Character.toUpperCase(name.charAt(0)) + name.substring(1) + "Generator";
+
+        List<SupportingFile> supportingFiles = new ArrayList<SupportingFile>();
+        supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
+        supportingFiles.add(new SupportingFile("generatorClass.mustache",
+                "src/main/java/" + File.separator + targetPackage.replace('.', File.separatorChar),
+                mainClass + ".java"));
+        supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
+        supportingFiles.add(new SupportingFile("api.template", "src/main/resources" + File.separator + name, "api.mustache"));
+        supportingFiles.add(new SupportingFile("model.template", "src/main/resources" + File.separator + name, "model.mustache"));
+
+        supportingFiles.add(new SupportingFile("services.mustache", "src/main/resources/META-INF/services", "io.swagger.codegen.CodegenConfig"));
+
+        List<File> files = new ArrayList<File>();
+
+        Map<String, Object> data = new HashMap<String, Object>();
+        data.put("generatorPackage", targetPackage);
+        data.put("generatorClass", mainClass);
+        data.put("name", name);
+        data.put("fullyQualifiedGeneratorClass", targetPackage + "." + mainClass);
+
+        for (SupportingFile support : supportingFiles) {
+            try {
+                String destinationFolder = outputFolder;
+                if (support.folder != null && !"".equals(support.folder)) {
+                    destinationFolder += File.separator + support.folder;
+                }
+                File of = new File(destinationFolder);
+                if (!of.isDirectory()) {
+                    of.mkdirs();
+                }
+                String outputFilename = destinationFolder + File.separator + support.destinationFilename;
+
+                if (support.templateFile.endsWith("mustache")) {
+                    String template = readTemplate(templateDir + File.separator + support.templateFile);
+                    Template tmpl = Mustache.compiler()
+                            .withLoader(new Mustache.TemplateLoader() {
+                                public Reader getTemplate(String name) {
+                                    return getTemplateReader(templateDir + File.separator + name + ".mustache");
+                                }
+
+                                ;
+                            })
+                            .defaultValue("")
+                            .compile(template);
+
+                    writeToFile(outputFilename, tmpl.execute(data));
+                    files.add(new File(outputFilename));
+                } else {
+                    String template = readTemplate(templateDir + File.separator + support.templateFile);
+                    FileUtils.writeStringToFile(new File(outputFilename), template);
+                    System.out.println("copying file to " + outputFilename);
+                    files.add(new File(outputFilename));
+                }
+            } catch (java.io.IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    static {
+        List<CodegenConfig> extensions = getExtensions();
+        StringBuilder sb = new StringBuilder();
+
+        for (CodegenConfig config : extensions) {
+            if (sb.toString().length() != 0) {
+                sb.append(", ");
+            }
+            sb.append(config.getName());
+            configs.put(config.getName(), config);
+            configString = sb.toString();
+        }
+    }
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/SupportingFile.java

@@ -0,0 +1,13 @@
+package io.swagger.codegen;
+
+public class SupportingFile {
+    public String templateFile;
+    public String folder;
+    public String destinationFilename;
+
+    public SupportingFile(String templateFile, String folder, String destinationFilename) {
+        this.templateFile = templateFile;
+        this.folder = folder;
+        this.destinationFilename = destinationFilename;
+    }
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/auth/AuthMethod.java

@@ -0,0 +1,7 @@
+package io.swagger.codegen.auth;
+
+public interface AuthMethod {
+    String getType();
+
+    void setType(String type);
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/examples/ExampleGenerator.java

@@ -0,0 +1,158 @@
+package io.swagger.codegen.examples;
+
+import io.swagger.models.Model;
+import io.swagger.models.ModelImpl;
+import io.swagger.models.properties.ArrayProperty;
+import io.swagger.models.properties.BooleanProperty;
+import io.swagger.models.properties.DateProperty;
+import io.swagger.models.properties.DateTimeProperty;
+import io.swagger.models.properties.DecimalProperty;
+import io.swagger.models.properties.DoubleProperty;
+import io.swagger.models.properties.FileProperty;
+import io.swagger.models.properties.FloatProperty;
+import io.swagger.models.properties.IntegerProperty;
+import io.swagger.models.properties.LongProperty;
+import io.swagger.models.properties.MapProperty;
+import io.swagger.models.properties.ObjectProperty;
+import io.swagger.models.properties.Property;
+import io.swagger.models.properties.RefProperty;
+import io.swagger.models.properties.StringProperty;
+import io.swagger.models.properties.UUIDProperty;
+import io.swagger.util.Json;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public class ExampleGenerator {
+    protected Map<String, Model> examples;
+
+    public ExampleGenerator(Map<String, Model> examples) {
+        this.examples = examples;
+    }
+
+    public List<Map<String, String>> generate(Map<String, Object> examples, List<String> mediaTypes, Property property) {
+        List<Map<String, String>> output = new ArrayList<Map<String, String>>();
+        Set<String> processedModels = new HashSet<String>();
+        if (examples == null) {
+            if (mediaTypes == null) {
+                // assume application/json for this
+                mediaTypes = Arrays.asList("application/json");
+            }
+            for (String mediaType : mediaTypes) {
+                Map<String, String> kv = new HashMap<String, String>();
+                kv.put("contentType", mediaType);
+                if (property != null && mediaType.startsWith("application/json")) {
+                    String example = Json.pretty(resolvePropertyToExample(mediaType, property, processedModels));
+
+                    if (example != null) {
+                        kv.put("example", example);
+                        output.add(kv);
+                    }
+                } else if (property != null && mediaType.startsWith("application/xml")) {
+                    String example = new XmlExampleGenerator(this.examples).toXml(property);
+                    if (example != null) {
+                        kv.put("example", example);
+                        output.add(kv);
+                    }
+                }
+            }
+        } else {
+            for (Map.Entry<String, Object> entry : examples.entrySet()) {
+                final Map<String, String> kv = new HashMap<String, String>();
+                kv.put("contentType", entry.getKey());
+                kv.put("example", Json.pretty(entry.getValue()));
+                output.add(kv);
+            }
+        }
+        if (output.size() == 0) {
+            Map<String, String> kv = new HashMap<String, String>();
+            kv.put("output", "none");
+            output.add(kv);
+        }
+        return output;
+    }
+
+    protected Object resolvePropertyToExample(String mediaType, Property property, Set<String> processedModels) {
+        if (property.getExample() != null) {
+            return property.getExample();
+        } else if (property instanceof StringProperty) {
+            return "aeiou";
+        } else if (property instanceof BooleanProperty) {
+            return Boolean.TRUE;
+        } else if (property instanceof ArrayProperty) {
+            Property innerType = ((ArrayProperty) property).getItems();
+            if (innerType != null) {
+                Object[] output = new Object[]{
+                        resolvePropertyToExample(mediaType, innerType, processedModels)
+                };
+                return output;
+            }
+        } else if (property instanceof DateProperty) {
+            return new java.util.Date(System.currentTimeMillis());
+        } else if (property instanceof DateTimeProperty) {
+            return new java.util.Date(System.currentTimeMillis());
+        } else if (property instanceof DecimalProperty) {
+            return new BigDecimal(1.3579);
+        } else if (property instanceof DoubleProperty) {
+            return new Double(3.149);
+        } else if (property instanceof FileProperty) {
+            return "";  // TODO
+        } else if (property instanceof FloatProperty) {
+            return new Float(1.23);
+        } else if (property instanceof IntegerProperty) {
+            return new Integer(123);
+        } else if (property instanceof LongProperty) {
+            return new Long(123456789);
+        } else if (property instanceof MapProperty) {
+            Map<String, Object> mp = new HashMap<String, Object>();
+            if (property.getName() != null) {
+                mp.put(property.getName(),
+                        resolvePropertyToExample(mediaType, ((MapProperty) property).getAdditionalProperties(), processedModels));
+            } else {
+                mp.put("key",
+                        resolvePropertyToExample(mediaType, ((MapProperty) property).getAdditionalProperties(), processedModels));
+            }
+            return mp;
+        } else if (property instanceof ObjectProperty) {
+            return "{}";
+        } else if (property instanceof RefProperty) {
+            String simpleName = ((RefProperty) property).getSimpleRef();
+            Model model = examples.get(simpleName);
+            if (model != null) {
+                return resolveModelToExample(simpleName, mediaType, model, processedModels);
+            }
+        } else if (property instanceof UUIDProperty) {
+            return "046b6c7f-0b8a-43b9-b35d-6489e6daee91";
+        }
+
+        return "";
+    }
+
+    public Object resolveModelToExample(String name, String mediaType, Model model, Set<String> processedModels) {
+        if (processedModels.contains(name)) {
+            return "";
+        }
+        if (model instanceof ModelImpl) {
+            processedModels.add(name);
+            ModelImpl impl = (ModelImpl) model;
+            Map<String, Object> values = new HashMap<String, Object>();
+
+            if (impl != null && impl.getProperties() != null) {
+                for (String propertyName : impl.getProperties().keySet()) {
+                    Property property = impl.getProperties().get(propertyName);
+                    values.put(propertyName, resolvePropertyToExample(mediaType, property, processedModels));
+                }
+            }
+
+            return values;
+        }
+
+        return "";
+    }
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/examples/XmlExampleGenerator.java

@@ -0,0 +1,226 @@
+package io.swagger.codegen.examples;
+
+
+import io.swagger.models.Model;
+import io.swagger.models.ModelImpl;
+import io.swagger.models.RefModel;
+import io.swagger.models.Xml;
+import io.swagger.models.properties.ArrayProperty;
+import io.swagger.models.properties.BooleanProperty;
+import io.swagger.models.properties.DateProperty;
+import io.swagger.models.properties.DateTimeProperty;
+import io.swagger.models.properties.IntegerProperty;
+import io.swagger.models.properties.LongProperty;
+import io.swagger.models.properties.Property;
+import io.swagger.models.properties.RefProperty;
+import io.swagger.models.properties.StringProperty;
+import org.codehaus.plexus.util.StringUtils;
+
+import java.text.SimpleDateFormat;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+
+public class XmlExampleGenerator {
+    public static String NEWLINE = "\n";
+    public static String TAG_START = "<";
+    public static String CLOSE_TAG = ">";
+    public static String TAG_END = "</";
+    private static String EMPTY = "";
+    protected Map<String, Model> examples;
+    protected SimpleDateFormat dtFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+    protected SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+
+    public XmlExampleGenerator(Map<String, Model> examples) {
+        this.examples = examples;
+        if (examples == null) {
+            examples = new HashMap<String, Model>();
+        }
+    }
+
+    public String toXml(Property property) {
+        return toXml(null, property, 0, Collections.<String>emptySet());
+    }
+
+    protected String toXml(Model model, int indent, Collection<String> path) {
+        if (model instanceof RefModel) {
+            RefModel ref = (RefModel) model;
+            Model actualModel = examples.get(ref.getSimpleRef());
+            if (actualModel instanceof ModelImpl) {
+                return modelImplToXml((ModelImpl) actualModel, indent, path);
+            }
+        } else if (model instanceof ModelImpl) {
+            return modelImplToXml((ModelImpl) model, indent, path);
+        }
+        return null;
+    }
+
+    protected String modelImplToXml(ModelImpl model, int indent, Collection<String> path) {
+        final String modelName = model.getName();
+        if (path.contains(modelName)) {
+            return EMPTY;
+        }
+        final Set<String> selfPath = new HashSet<String>(path);
+        selfPath.add(modelName);
+
+        StringBuilder sb = new StringBuilder();
+        // attributes
+        Map<String, Property> attributes = new LinkedHashMap<String, Property>();
+        Map<String, Property> elements = new LinkedHashMap<String, Property>();
+
+        String name = modelName;
+        String namespace;
+        String prefix;
+        Boolean wrapped;
+
+        Xml xml = model.getXml();
+        if (xml != null) {
+            if (xml.getName() != null) {
+                name = xml.getName();
+            }
+        }
+        for (String pName : model.getProperties().keySet()) {
+            Property p = model.getProperties().get(pName);
+            if (p != null && p.getXml() != null && p.getXml().getAttribute() != null && p.getXml().getAttribute()) {
+                attributes.put(pName, p);
+            } else {
+                elements.put(pName, p);
+            }
+        }
+        sb.append(indent(indent)).append(TAG_START);
+        sb.append(name);
+        for (String pName : attributes.keySet()) {
+            Property p = attributes.get(pName);
+            sb.append(" ").append(pName).append("=").append(quote(toXml(null, p, 0, selfPath)));
+        }
+        sb.append(CLOSE_TAG);
+        sb.append(NEWLINE);
+        for (String pName : elements.keySet()) {
+            Property p = elements.get(pName);
+            final String asXml = toXml(pName, p, indent + 1, selfPath);
+            if (StringUtils.isEmpty(asXml)) {
+                continue;
+            }
+            sb.append(asXml);
+            sb.append(NEWLINE);
+        }
+        sb.append(indent(indent)).append(TAG_END).append(name).append(CLOSE_TAG);
+
+        return sb.toString();
+    }
+
+    protected String quote(String string) {
+        return "\"" + string + "\"";
+    }
+
+    protected String toXml(String name, Property property, int indent, Collection<String> path) {
+        if (property == null) {
+            return "";
+        }
+        StringBuilder sb = new StringBuilder();
+
+        if (property instanceof ArrayProperty) {
+            ArrayProperty p = (ArrayProperty) property;
+            Property inner = p.getItems();
+            boolean wrapped = false;
+            if (property.getXml() != null && property.getXml().getWrapped()) {
+                wrapped = true;
+            }
+            if (wrapped) {
+                String prefix = EMPTY;
+                if (name != null) {
+                    sb.append(indent(indent));
+                    sb.append(openTag(name));
+                    prefix = NEWLINE;
+                }
+                final String asXml = toXml(name, inner, indent + 1, path);
+                if (StringUtils.isNotEmpty(asXml)) {
+                    sb.append(prefix).append(asXml);
+                }
+                if (name != null) {
+                    sb.append(NEWLINE);
+                    sb.append(indent(indent));
+                    sb.append(closeTag(name));
+                }
+            } else {
+                sb.append(toXml(name, inner, indent, path));
+            }
+        } else if (property instanceof RefProperty) {
+            RefProperty ref = (RefProperty) property;
+            Model actualModel = examples.get(ref.getSimpleRef());
+            sb.append(toXml(actualModel, indent, path));
+        } else {
+            if (name != null) {
+                sb.append(indent(indent));
+                sb.append(openTag(name));
+            }
+            sb.append(getExample(property));
+            if (name != null) {
+                sb.append(closeTag(name));
+            }
+        }
+        return sb.toString();
+    }
+
+    protected String getExample(Property property) {
+        if (property instanceof DateTimeProperty) {
+            if (property.getExample() != null) {
+                return property.getExample();
+            } else {
+                return dtFormat.format(new Date());
+            }
+        } else if (property instanceof StringProperty) {
+            if (property.getExample() != null) {
+                return property.getExample();
+            } else {
+                return "string";
+            }
+        } else if (property instanceof DateProperty) {
+            if (property.getExample() != null) {
+                return property.getExample();
+            } else {
+                return dateFormat.format(new Date());
+            }
+        } else if (property instanceof IntegerProperty) {
+            if (property.getExample() != null) {
+                return property.getExample();
+            } else {
+                return "0";
+            }
+        } else if (property instanceof BooleanProperty) {
+            if (property.getExample() != null) {
+                return property.getExample();
+            } else {
+                return "true";
+            }
+        } else if (property instanceof LongProperty) {
+            if (property.getExample() != null) {
+                return property.getExample();
+            } else {
+                return "123456";
+            }
+        }
+        return "not implemented " + property;
+    }
+
+    protected String openTag(String name) {
+        return "<" + name + ">";
+    }
+
+    protected String closeTag(String name) {
+        return "</" + name + ">";
+    }
+
+    protected String indent(int indent) {
+        StringBuffer sb = new StringBuffer();
+        for (int i = 0; i < indent; i++) {
+            sb.append("  ");
+        }
+        return sb.toString();
+    }
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AkkaScalaClientCodegen.java

@@ -0,0 +1,399 @@
+package io.swagger.codegen.languages;
+
+import com.google.common.base.CaseFormat;
+import com.samskivert.mustache.Mustache;
+import com.samskivert.mustache.Template;
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenOperation;
+import io.swagger.codegen.CodegenProperty;
+import io.swagger.codegen.CodegenResponse;
+import io.swagger.codegen.CodegenSecurity;
+import io.swagger.codegen.CodegenType;
+import io.swagger.codegen.DefaultCodegen;
+import io.swagger.codegen.SupportingFile;
+import io.swagger.models.auth.SecuritySchemeDefinition;
+import io.swagger.models.properties.ArrayProperty;
+import io.swagger.models.properties.BooleanProperty;
+import io.swagger.models.properties.DateProperty;
+import io.swagger.models.properties.DateTimeProperty;
+import io.swagger.models.properties.DoubleProperty;
+import io.swagger.models.properties.FloatProperty;
+import io.swagger.models.properties.IntegerProperty;
+import io.swagger.models.properties.LongProperty;
+import io.swagger.models.properties.MapProperty;
+import io.swagger.models.properties.Property;
+import io.swagger.models.properties.StringProperty;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+public class AkkaScalaClientCodegen extends DefaultCodegen implements CodegenConfig {
+    protected String mainPackage = "io.swagger.client";
+    protected String invokerPackage = mainPackage + ".core";
+    protected String groupId = "io.swagger";
+    protected String artifactId = "swagger-client";
+    protected String artifactVersion = "1.0.0";
+    protected String sourceFolder = "src/main/scala";
+    protected String resourcesFolder = "src/main/resources";
+    protected String configKey = "apiRequest";
+    protected int defaultTimeoutInMs = 5000;
+    protected String configKeyPath = mainPackage;
+    protected boolean registerNonStandardStatusCodes = true;
+    protected boolean renderJavadoc = true;
+    protected boolean removeOAuthSecurities = true;
+    /**
+     * If set to true, only the default response (the one with le lowest 2XX code) will be considered as a success, and all
+     * others as ApiErrors.
+     * If set to false, all responses defined in the model will be considered as a success upon reception. Only http errors,
+     * unmarshalling problems and any other RuntimeException will be considered as ApiErrors.
+     */
+    protected boolean onlyOneSuccess = true;
+    Logger LOGGER = LoggerFactory.getLogger(AkkaScalaClientCodegen.class);
+
+    public AkkaScalaClientCodegen() {
+        super();
+        outputFolder = "generated-code/scala";
+        modelTemplateFiles.put("model.mustache", ".scala");
+        apiTemplateFiles.put("api.mustache", ".scala");
+        templateDir = "akka-scala";
+        apiPackage = mainPackage + ".api";
+        modelPackage = mainPackage + ".model";
+
+        reservedWords = new HashSet<String>(
+                Arrays.asList(
+                        "abstract", "case", "catch", "class", "def", "do", "else", "extends",
+                        "false", "final", "finally", "for", "forSome", "if", "implicit",
+                        "import", "lazy", "match", "new", "null", "object", "override", "package",
+                        "private", "protected", "return", "sealed", "super", "this", "throw",
+                        "trait", "try", "true", "type", "val", "var", "while", "with", "yield")
+        );
+
+        additionalProperties.put("invokerPackage", invokerPackage);
+        additionalProperties.put("groupId", groupId);
+        additionalProperties.put("artifactId", artifactId);
+        additionalProperties.put("artifactVersion", artifactVersion);
+        additionalProperties.put("configKey", configKey);
+        additionalProperties.put("configKeyPath", configKeyPath);
+        additionalProperties.put("defaultTimeout", defaultTimeoutInMs);
+        if (renderJavadoc) {
+            additionalProperties.put("javadocRenderer", new JavadocLambda());
+        }
+        additionalProperties.put("fnCapitalize", new CapitalizeLambda());
+        additionalProperties.put("fnCamelize", new CamelizeLambda(false));
+        additionalProperties.put("fnEnumEntry", new EnumEntryLambda());
+        additionalProperties.put("onlyOneSuccess", onlyOneSuccess);
+
+        supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
+        supportingFiles.add(new SupportingFile("reference.mustache", resourcesFolder, "reference.conf"));
+        final String invokerFolder = (sourceFolder + File.separator + invokerPackage).replace(".", File.separator);
+        supportingFiles.add(new SupportingFile("apiRequest.mustache", invokerFolder, "ApiRequest.scala"));
+        supportingFiles.add(new SupportingFile("apiInvoker.mustache", invokerFolder, "ApiInvoker.scala"));
+        supportingFiles.add(new SupportingFile("requests.mustache", invokerFolder, "requests.scala"));
+        supportingFiles.add(new SupportingFile("apiSettings.mustache", invokerFolder, "ApiSettings.scala"));
+        final String apiFolder = (sourceFolder + File.separator + apiPackage).replace(".", File.separator);
+        supportingFiles.add(new SupportingFile("enumsSerializers.mustache", apiFolder, "EnumsSerializers.scala"));
+
+        importMapping.remove("Seq");
+        importMapping.remove("List");
+        importMapping.remove("Set");
+        importMapping.remove("Map");
+
+        importMapping.put("DateTime", "org.joda.time.DateTime");
+
+        typeMapping = new HashMap<String, String>();
+        typeMapping.put("array", "Seq");
+        typeMapping.put("set", "Set");
+        typeMapping.put("boolean", "Boolean");
+        typeMapping.put("string", "String");
+        typeMapping.put("int", "Int");
+        typeMapping.put("integer", "Int");
+        typeMapping.put("long", "Long");
+        typeMapping.put("float", "Float");
+        typeMapping.put("byte", "Byte");
+        typeMapping.put("short", "Short");
+        typeMapping.put("char", "Char");
+        typeMapping.put("long", "Long");
+        typeMapping.put("double", "Double");
+        typeMapping.put("object", "Any");
+        typeMapping.put("file", "File");
+        typeMapping.put("number", "Double");
+
+        languageSpecificPrimitives = new HashSet<String>(
+                Arrays.asList(
+                        "String",
+                        "boolean",
+                        "Boolean",
+                        "Double",
+                        "Int",
+                        "Long",
+                        "Float",
+                        "Object",
+                        "List",
+                        "Seq",
+                        "Map")
+        );
+        instantiationTypes.put("array", "ListBuffer");
+        instantiationTypes.put("map", "Map");
+    }
+
+    public CodegenType getTag() {
+        return CodegenType.CLIENT;
+    }
+
+    public String getName() {
+        return "akka-scala";
+    }
+
+    public String getHelp() {
+        return "Generates a Scala client library base on Akka/Spray.";
+    }
+
+    @Override
+    public String escapeReservedWord(String name) {
+        return "`" + name + "`";
+    }
+
+    @Override
+    public String apiFileFolder() {
+        return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
+    }
+
+    public String modelFileFolder() {
+        return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
+    }
+
+    @Override
+    public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
+        if (registerNonStandardStatusCodes) {
+            try {
+                @SuppressWarnings("unchecked")
+                Map<String, ArrayList<CodegenOperation>> opsMap = (Map<String, ArrayList<CodegenOperation>>) objs.get("operations");
+                HashSet<Integer> unknownCodes = new HashSet<Integer>();
+                for (CodegenOperation operation : opsMap.get("operation")) {
+                    for (CodegenResponse response : operation.responses) {
+                        if ("default".equals(response.code)) {
+                            continue;
+                        }
+                        try {
+                            int code = Integer.parseInt(response.code);
+                            if (code >= 600) {
+                                unknownCodes.add(code);
+                            }
+                        } catch (NumberFormatException e) {
+                            LOGGER.error("Status code is not an integer : response.code", e);
+                        }
+                    }
+                }
+                if (!unknownCodes.isEmpty()) {
+                    additionalProperties.put("unknownStatusCodes", unknownCodes);
+                }
+            } catch (Exception e) {
+                LOGGER.error("Unable to find operations List", e);
+            }
+        }
+        return super.postProcessOperations(objs);
+    }
+
+    @Override
+    public String getTypeDeclaration(Property p) {
+        if (p instanceof ArrayProperty) {
+            ArrayProperty ap = (ArrayProperty) p;
+            Property inner = ap.getItems();
+            return getSwaggerType(p) + "[" + getTypeDeclaration(inner) + "]";
+        } else if (p instanceof MapProperty) {
+            MapProperty mp = (MapProperty) p;
+            Property inner = mp.getAdditionalProperties();
+
+            return getSwaggerType(p) + "[String, " + getTypeDeclaration(inner) + "]";
+        }
+        return super.getTypeDeclaration(p);
+    }
+
+    @Override
+    public List<CodegenSecurity> fromSecurity(Map<String, SecuritySchemeDefinition> schemes) {
+        final List<CodegenSecurity> codegenSecurities = super.fromSecurity(schemes);
+        if (!removeOAuthSecurities) {
+            return codegenSecurities;
+        }
+
+        // Remove OAuth securities
+        Iterator<CodegenSecurity> it = codegenSecurities.iterator();
+        while (it.hasNext()) {
+            final CodegenSecurity security = it.next();
+            if (security.isOAuth) {
+                it.remove();
+            }
+        }
+        // Adapt 'hasMore'
+        it = codegenSecurities.iterator();
+        while (it.hasNext()) {
+            final CodegenSecurity security = it.next();
+            security.hasMore = it.hasNext();
+        }
+
+        if (codegenSecurities.isEmpty()) {
+            return null;
+        }
+        return codegenSecurities;
+    }
+
+    @Override
+    public String toOperationId(String operationId) {
+        return super.toOperationId(CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL, operationId));
+    }
+
+    private String formatIdentifier(String name, boolean capitalized) {
+        String identifier = camelize(name, true);
+        if (capitalized) {
+            identifier = StringUtils.capitalize(identifier);
+        }
+        if (identifier.matches("[a-zA-Z_$][\\w_$]+") && !reservedWords.contains(identifier)) {
+            return identifier;
+        }
+        return escapeReservedWord(identifier);
+    }
+
+    @Override
+    public String toParamName(String name) {
+        return formatIdentifier(name, false);
+    }
+
+    @Override
+    public String toVarName(String name) {
+        return formatIdentifier(name, false);
+    }
+
+    @Override
+    public String toEnumName(CodegenProperty property) {
+        return formatIdentifier(property.baseName, true);
+    }
+
+    @Override
+    public String getSwaggerType(Property p) {
+        String swaggerType = super.getSwaggerType(p);
+        String type;
+        if (typeMapping.containsKey(swaggerType)) {
+            type = typeMapping.get(swaggerType);
+            if (languageSpecificPrimitives.contains(type)) {
+                return toModelName(type);
+            }
+        } else {
+            type = swaggerType;
+        }
+        return toModelName(type);
+    }
+
+    @Override
+    public String toInstantiationType(Property p) {
+        if (p instanceof MapProperty) {
+            MapProperty ap = (MapProperty) p;
+            String inner = getSwaggerType(ap.getAdditionalProperties());
+            return instantiationTypes.get("map") + "[String, " + inner + "]";
+        } else if (p instanceof ArrayProperty) {
+            ArrayProperty ap = (ArrayProperty) p;
+            String inner = getSwaggerType(ap.getItems());
+            return instantiationTypes.get("array") + "[" + inner + "]";
+        } else {
+            return null;
+        }
+    }
+
+    public String toDefaultValue(Property p) {
+        if (!p.getRequired()) {
+            return "None";
+        }
+        if (p instanceof StringProperty) {
+            return "null";
+        } else if (p instanceof BooleanProperty) {
+            return "null";
+        } else if (p instanceof DateProperty) {
+            return "null";
+        } else if (p instanceof DateTimeProperty) {
+            return "null";
+        } else if (p instanceof DoubleProperty) {
+            return "null";
+        } else if (p instanceof FloatProperty) {
+            return "null";
+        } else if (p instanceof IntegerProperty) {
+            return "null";
+        } else if (p instanceof LongProperty) {
+            return "null";
+        } else if (p instanceof MapProperty) {
+            MapProperty ap = (MapProperty) p;
+            String inner = getSwaggerType(ap.getAdditionalProperties());
+            return "Map[String, " + inner + "].empty ";
+        } else if (p instanceof ArrayProperty) {
+            ArrayProperty ap = (ArrayProperty) p;
+            String inner = getSwaggerType(ap.getItems());
+            return "Seq[" + inner + "].empty ";
+        } else {
+            return "null";
+        }
+    }
+
+    private static abstract class CustomLambda implements Mustache.Lambda {
+        @Override
+        public void execute(Template.Fragment frag, Writer out) throws IOException {
+            final StringWriter tempWriter = new StringWriter();
+            frag.execute(tempWriter);
+            out.write(formatFragment(tempWriter.toString()));
+        }
+
+        public abstract String formatFragment(String fragment);
+    }
+
+
+    private static class JavadocLambda extends CustomLambda {
+        @Override
+        public String formatFragment(String fragment) {
+            final String[] lines = fragment.split("\\r?\\n");
+            final StringBuilder sb = new StringBuilder();
+            sb.append("  /**\n");
+            for (String line : lines) {
+                sb.append("   * ").append(line).append("\n");
+            }
+            sb.append("   */\n");
+            return sb.toString();
+        }
+    }
+
+    private static class CapitalizeLambda extends CustomLambda {
+        @Override
+        public String formatFragment(String fragment) {
+            return StringUtils.capitalize(fragment);
+        }
+    }
+
+    private static class CamelizeLambda extends CustomLambda {
+        private final boolean capitalizeFirst;
+
+        public CamelizeLambda(boolean capitalizeFirst) {
+            this.capitalizeFirst = capitalizeFirst;
+        }
+
+        @Override
+        public String formatFragment(String fragment) {
+            return camelize(fragment, !capitalizeFirst);
+        }
+    }
+
+    private class EnumEntryLambda extends CustomLambda {
+        @Override
+        public String formatFragment(String fragment) {
+            return formatIdentifier(fragment, true);
+        }
+    }
+
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AndroidClientCodegen.java

@@ -0,0 +1,265 @@
+package io.swagger.codegen.languages;
+
+import io.swagger.codegen.CliOption;
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenType;
+import io.swagger.codegen.DefaultCodegen;
+import io.swagger.codegen.SupportingFile;
+import io.swagger.models.properties.ArrayProperty;
+import io.swagger.models.properties.MapProperty;
+import io.swagger.models.properties.Property;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.HashSet;
+
+public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfig {
+    protected String invokerPackage = "io.swagger.client";
+    protected String groupId = "io.swagger";
+    protected String artifactId = "swagger-android-client";
+    protected String artifactVersion = "1.0.0";
+    protected String projectFolder = "src/main";
+    protected String sourceFolder = projectFolder + "/java";
+    protected Boolean useAndroidMavenGradlePlugin = true;
+
+    public AndroidClientCodegen() {
+        super();
+        outputFolder = "generated-code/android";
+        modelTemplateFiles.put("model.mustache", ".java");
+        apiTemplateFiles.put("api.mustache", ".java");
+        templateDir = "android-java";
+        apiPackage = "io.swagger.client.api";
+        modelPackage = "io.swagger.client.model";
+
+        reservedWords = new HashSet<String>(
+                Arrays.asList(
+                        "abstract", "continue", "for", "new", "switch", "assert",
+                        "default", "if", "package", "synchronized", "boolean", "do", "goto", "private",
+                        "this", "break", "double", "implements", "protected", "throw", "byte", "else",
+                        "import", "public", "throws", "case", "enum", "instanceof", "return", "transient",
+                        "catch", "extends", "int", "short", "try", "char", "final", "interface", "static",
+                        "void", "class", "finally", "long", "strictfp", "volatile", "const", "float",
+                        "native", "super", "while")
+        );
+
+        languageSpecificPrimitives = new HashSet<String>(
+                Arrays.asList(
+                        "String",
+                        "boolean",
+                        "Boolean",
+                        "Double",
+                        "Integer",
+                        "Long",
+                        "Float",
+                        "Object")
+        );
+        instantiationTypes.put("array", "ArrayList");
+        instantiationTypes.put("map", "HashMap");
+
+        cliOptions.add(new CliOption("invokerPackage", "root package to use for the generated code"));
+        cliOptions.add(new CliOption("groupId", "groupId for use in the generated build.gradle and pom.xml"));
+        cliOptions.add(new CliOption("artifactId", "artifactId for use in the generated build.gradle and pom.xml"));
+        cliOptions.add(new CliOption("artifactVersion", "artifact version for use in the generated build.gradle and pom.xml"));
+        cliOptions.add(new CliOption("sourceFolder", "source folder for generated code"));
+        cliOptions.add(new CliOption("useAndroidMavenGradlePlugin", "A flag to toggle android-maven gradle plugin. Default is true."));
+    }
+
+    public CodegenType getTag() {
+        return CodegenType.CLIENT;
+    }
+
+    public String getName() {
+        return "android";
+    }
+
+    public String getHelp() {
+        return "Generates an Android client library.";
+    }
+
+    @Override
+    public String escapeReservedWord(String name) {
+        return "_" + name;
+    }
+
+    @Override
+    public String apiFileFolder() {
+        return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
+    }
+
+    public String modelFileFolder() {
+        return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
+    }
+
+    @Override
+    public String getTypeDeclaration(Property p) {
+        if (p instanceof ArrayProperty) {
+            ArrayProperty ap = (ArrayProperty) p;
+            Property inner = ap.getItems();
+            return getSwaggerType(p) + "<" + getTypeDeclaration(inner) + ">";
+        } else if (p instanceof MapProperty) {
+            MapProperty mp = (MapProperty) p;
+            Property inner = mp.getAdditionalProperties();
+
+            return getSwaggerType(p) + "<String, " + getTypeDeclaration(inner) + ">";
+        }
+        return super.getTypeDeclaration(p);
+    }
+
+    @Override
+    public String getSwaggerType(Property p) {
+        String swaggerType = super.getSwaggerType(p);
+        String type = null;
+        if (typeMapping.containsKey(swaggerType)) {
+            type = typeMapping.get(swaggerType);
+            if (languageSpecificPrimitives.contains(type)) {
+                return toModelName(type);
+            }
+        } else {
+            type = swaggerType;
+        }
+        return toModelName(type);
+    }
+
+    @Override
+    public String toVarName(String name) {
+        // replace - with _ e.g. created-at => created_at
+        name = name.replaceAll("-", "_");
+
+        // if it's all uppper case, do nothing
+        if (name.matches("^[A-Z_]*$")) {
+            return name;
+        }
+
+        // camelize (lower first character) the variable name
+        // pet_id => petId
+        name = camelize(name, true);
+
+        // for reserved word or word starting with number, append _
+        if (reservedWords.contains(name) || name.matches("^\\d.*")) {
+            name = escapeReservedWord(name);
+        }
+
+        return name;
+    }
+
+    @Override
+    public String toParamName(String name) {
+        // should be the same as variable name
+        return toVarName(name);
+    }
+
+    @Override
+    public String toModelName(String name) {
+        // model name cannot use reserved keyword, e.g. return
+        if (reservedWords.contains(name)) {
+            throw new RuntimeException(name + " (reserved word) cannot be used as a model name");
+        }
+
+        // camelize the model name
+        // phone_number => PhoneNumber
+        return camelize(name);
+    }
+
+    @Override
+    public String toModelFilename(String name) {
+        // should be the same as the model name
+        return toModelName(name);
+    }
+
+    @Override
+    public String toOperationId(String operationId) {
+        // method name cannot use reserved keyword, e.g. return
+        if (reservedWords.contains(operationId)) {
+            throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
+        }
+
+        return camelize(operationId, true);
+    }
+
+    @Override
+    public void processOpts() {
+        super.processOpts();
+
+        if (additionalProperties.containsKey("invokerPackage")) {
+            this.setInvokerPackage((String) additionalProperties.get("invokerPackage"));
+        } else {
+            //not set, use default to be passed to template
+            additionalProperties.put("invokerPackage", invokerPackage);
+        }
+
+        if (additionalProperties.containsKey("groupId")) {
+            this.setGroupId((String) additionalProperties.get("groupId"));
+        } else {
+            //not set, use to be passed to template
+            additionalProperties.put("groupId", groupId);
+        }
+
+        if (additionalProperties.containsKey("artifactId")) {
+            this.setArtifactId((String) additionalProperties.get("artifactId"));
+        } else {
+            //not set, use to be passed to template
+            additionalProperties.put("artifactId", artifactId);
+        }
+
+        if (additionalProperties.containsKey("artifactVersion")) {
+            this.setArtifactVersion((String) additionalProperties.get("artifactVersion"));
+        } else {
+            //not set, use to be passed to template
+            additionalProperties.put("artifactVersion", artifactVersion);
+        }
+
+        if (additionalProperties.containsKey("sourceFolder")) {
+            this.setSourceFolder((String) additionalProperties.get("sourceFolder"));
+        }
+
+        if (additionalProperties.containsKey("useAndroidMavenGradlePlugin")) {
+            this.setUseAndroidMavenGradlePlugin((Boolean) additionalProperties.get("useAndroidMavenGradlePlugin"));
+        } else {
+            additionalProperties.put("useAndroidMavenGradlePlugin", useAndroidMavenGradlePlugin);
+        }
+
+        supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
+        additionalProperties.put("useAndroidMavenGradlePlugin", useAndroidMavenGradlePlugin);
+
+        supportingFiles.add(new SupportingFile("settings.gradle.mustache", "", "settings.gradle"));
+        supportingFiles.add(new SupportingFile("build.mustache", "", "build.gradle"));
+        supportingFiles.add(new SupportingFile("manifest.mustache", projectFolder, "AndroidManifest.xml"));
+        supportingFiles.add(new SupportingFile("apiInvoker.mustache",
+                (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiInvoker.java"));
+        supportingFiles.add(new SupportingFile("httpPatch.mustache",
+                (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "HttpPatch.java"));
+        supportingFiles.add(new SupportingFile("jsonUtil.mustache",
+                (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "JsonUtil.java"));
+        supportingFiles.add(new SupportingFile("apiException.mustache",
+                (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiException.java"));
+    }
+
+    public Boolean getUseAndroidMavenGradlePlugin() {
+        return useAndroidMavenGradlePlugin;
+    }
+
+    public void setUseAndroidMavenGradlePlugin(Boolean useAndroidMavenGradlePlugin) {
+        this.useAndroidMavenGradlePlugin = useAndroidMavenGradlePlugin;
+    }
+
+    public void setInvokerPackage(String invokerPackage) {
+        this.invokerPackage = invokerPackage;
+    }
+
+    public void setGroupId(String groupId) {
+        this.groupId = groupId;
+    }
+
+    public void setArtifactId(String artifactId) {
+        this.artifactId = artifactId;
+    }
+
+    public void setArtifactVersion(String artifactVersion) {
+        this.artifactVersion = artifactVersion;
+    }
+
+    public void setSourceFolder(String sourceFolder) {
+        this.sourceFolder = sourceFolder;
+    }
+
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AsyncScalaClientCodegen.java

@@ -0,0 +1,207 @@
+package io.swagger.codegen.languages;
+
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenType;
+import io.swagger.codegen.DefaultCodegen;
+import io.swagger.codegen.SupportingFile;
+import io.swagger.models.properties.ArrayProperty;
+import io.swagger.models.properties.BooleanProperty;
+import io.swagger.models.properties.DateProperty;
+import io.swagger.models.properties.DateTimeProperty;
+import io.swagger.models.properties.DoubleProperty;
+import io.swagger.models.properties.FloatProperty;
+import io.swagger.models.properties.IntegerProperty;
+import io.swagger.models.properties.LongProperty;
+import io.swagger.models.properties.MapProperty;
+import io.swagger.models.properties.Property;
+import io.swagger.models.properties.StringProperty;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+
+public class AsyncScalaClientCodegen extends DefaultCodegen implements CodegenConfig {
+    protected String invokerPackage = "io.swagger.client";
+    protected String groupId = "io.swagger";
+    protected String artifactId = "swagger-async-scala-client";
+    protected String artifactVersion = "1.0.0";
+    protected String sourceFolder = "src/main/scala";
+    protected String clientName = "SwaggerClient";
+    protected String authScheme = "";
+    protected boolean authPreemptive = false;
+    protected boolean asyncHttpClient = !authScheme.isEmpty();
+
+    public AsyncScalaClientCodegen() {
+        super();
+        outputFolder = "generated-code/async-scala";
+        modelTemplateFiles.put("model.mustache", ".scala");
+        apiTemplateFiles.put("api.mustache", ".scala");
+        templateDir = "asyncscala";
+        apiPackage = "io.swagger.client.api";
+        modelPackage = "io.swagger.client.model";
+
+        reservedWords = new HashSet<String>(
+                Arrays.asList(
+                        "abstract", "case", "catch", "class", "def", "do", "else", "extends",
+                        "false", "final", "finally", "for", "forSome", "if", "implicit",
+                        "import", "lazy", "match", "new", "null", "object", "override", "package",
+                        "private", "protected", "return", "sealed", "super", "this", "throw",
+                        "trait", "try", "true", "type", "val", "var", "while", "with", "yield")
+        );
+
+        additionalProperties.put("invokerPackage", invokerPackage);
+        additionalProperties.put("groupId", groupId);
+        additionalProperties.put("artifactId", artifactId);
+        additionalProperties.put("artifactVersion", artifactVersion);
+        additionalProperties.put("asyncHttpClient", asyncHttpClient);
+        additionalProperties.put("authScheme", authScheme);
+        additionalProperties.put("authPreemptive", authPreemptive);
+        additionalProperties.put("clientName", clientName);
+
+        supportingFiles.add(new SupportingFile("sbt.mustache", "", "build.sbt"));
+        supportingFiles.add(new SupportingFile("client.mustache",
+                (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), clientName + ".scala"));
+
+        importMapping.remove("List");
+        importMapping.remove("Set");
+        importMapping.remove("Map");
+
+        importMapping.put("DateTime", "org.joda.time.DateTime");
+        importMapping.put("ListBuffer", "scala.collections.mutable.ListBuffer");
+
+        typeMapping = new HashMap<String, String>();
+        typeMapping.put("enum", "NSString");
+        typeMapping.put("array", "List");
+        typeMapping.put("set", "Set");
+        typeMapping.put("boolean", "Boolean");
+        typeMapping.put("string", "String");
+        typeMapping.put("int", "Int");
+        typeMapping.put("long", "Long");
+        typeMapping.put("float", "Float");
+        typeMapping.put("byte", "Byte");
+        typeMapping.put("short", "Short");
+        typeMapping.put("char", "Char");
+        typeMapping.put("long", "Long");
+        typeMapping.put("double", "Double");
+        typeMapping.put("object", "Any");
+        typeMapping.put("file", "File");
+
+        languageSpecificPrimitives = new HashSet<String>(
+                Arrays.asList(
+                        "String",
+                        "boolean",
+                        "Boolean",
+                        "Double",
+                        "Int",
+                        "Long",
+                        "Float",
+                        "Object",
+                        "List",
+                        "Map")
+        );
+        instantiationTypes.put("array", "ListBuffer");
+        instantiationTypes.put("map", "HashMap");
+    }
+
+    public CodegenType getTag() {
+        return CodegenType.CLIENT;
+    }
+
+    public String getName() {
+        return "async-scala";
+    }
+
+    public String getHelp() {
+        return "Generates an Asynchronous Scala client library.";
+    }
+
+    @Override
+    public String escapeReservedWord(String name) {
+        return "_" + name;
+    }
+
+    @Override
+    public String apiFileFolder() {
+        return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
+    }
+
+    public String modelFileFolder() {
+        return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
+    }
+
+    @Override
+    public String getTypeDeclaration(Property p) {
+        if (p instanceof ArrayProperty) {
+            ArrayProperty ap = (ArrayProperty) p;
+            Property inner = ap.getItems();
+            return getSwaggerType(p) + "[" + getTypeDeclaration(inner) + "]";
+        } else if (p instanceof MapProperty) {
+            MapProperty mp = (MapProperty) p;
+            Property inner = mp.getAdditionalProperties();
+
+            return getSwaggerType(p) + "[String, " + getTypeDeclaration(inner) + "]";
+        }
+        return super.getTypeDeclaration(p);
+    }
+
+    @Override
+    public String getSwaggerType(Property p) {
+        String swaggerType = super.getSwaggerType(p);
+        String type = null;
+        if (typeMapping.containsKey(swaggerType)) {
+            type = typeMapping.get(swaggerType);
+            if (languageSpecificPrimitives.contains(type)) {
+                return toModelName(type);
+            }
+        } else {
+            type = swaggerType;
+        }
+        return toModelName(type);
+    }
+
+    @Override
+    public String toInstantiationType(Property p) {
+        if (p instanceof MapProperty) {
+            MapProperty ap = (MapProperty) p;
+            String inner = getSwaggerType(ap.getAdditionalProperties());
+            return instantiationTypes.get("map") + "[String, " + inner + "]";
+        } else if (p instanceof ArrayProperty) {
+            ArrayProperty ap = (ArrayProperty) p;
+            String inner = getSwaggerType(ap.getItems());
+            return instantiationTypes.get("array") + "[" + inner + "]";
+        } else {
+            return null;
+        }
+    }
+
+    public String toDefaultValue(Property p) {
+        if (p instanceof StringProperty) {
+            return "null";
+        } else if (p instanceof BooleanProperty) {
+            return "null";
+        } else if (p instanceof DateProperty) {
+            return "null";
+        } else if (p instanceof DateTimeProperty) {
+            return "null";
+        } else if (p instanceof DoubleProperty) {
+            return "null";
+        } else if (p instanceof FloatProperty) {
+            return "null";
+        } else if (p instanceof IntegerProperty) {
+            return "null";
+        } else if (p instanceof LongProperty) {
+            return "null";
+        } else if (p instanceof MapProperty) {
+            MapProperty ap = (MapProperty) p;
+            String inner = getSwaggerType(ap.getAdditionalProperties());
+            return "new HashMap[String, " + inner + "]() ";
+        } else if (p instanceof ArrayProperty) {
+            ArrayProperty ap = (ArrayProperty) p;
+            String inner = getSwaggerType(ap.getItems());
+            return "new ListBuffer[" + inner + "]() ";
+        } else {
+            return "null";
+        }
+    }
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/CSharpClientCodegen.java

@@ -0,0 +1,203 @@
+package io.swagger.codegen.languages;
+
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenType;
+import io.swagger.codegen.DefaultCodegen;
+import io.swagger.codegen.SupportingFile;
+import io.swagger.models.properties.ArrayProperty;
+import io.swagger.models.properties.MapProperty;
+import io.swagger.models.properties.Property;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+
+public class CSharpClientCodegen extends DefaultCodegen implements CodegenConfig {
+    protected String invokerPackage = "IO.Swagger.Client";
+    protected String groupId = "io.swagger";
+    protected String artifactId = "swagger-csharp-client";
+    protected String artifactVersion = "1.0.0";
+    protected String sourceFolder = "src/main/csharp";
+
+    public CSharpClientCodegen() {
+        super();
+        outputFolder = "generated-code/csharp";
+        modelTemplateFiles.put("model.mustache", ".cs");
+        apiTemplateFiles.put("api.mustache", ".cs");
+        templateDir = "csharp";
+        apiPackage = "IO.Swagger.Api";
+        modelPackage = "IO.Swagger.Model";
+
+        reservedWords = new HashSet<String>(
+                Arrays.asList(
+                        "abstract", "as", "base", "bool", "break", "byte", "case", "catch", "char", "checked", "class", "const", "continue", "decimal", "default", "delegate", "do", "double", "else", "enum", "event", "explicit", "extern", "false", "finally", "fixed", "float", "for", "foreach", "goto", "if", "implicit", "in", "int", "interface", "internal", "is", "lock", "long", "namespace", "new", "null", "object", "operator", "out", "override", "params", "private", "protected", "public", "readonly", "ref", "return", "sbyte", "sealed", "short", "sizeof", "stackalloc", "static", "string", "struct", "switch", "this", "throw", "true", "try", "typeof", "uint", "ulong", "unchecked", "unsafe", "ushort", "using", "virtual", "void", "volatile", "while")
+        );
+
+        additionalProperties.put("invokerPackage", invokerPackage);
+
+        supportingFiles.add(new SupportingFile("Configuration.mustache",
+                (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "Configuration.cs"));
+        supportingFiles.add(new SupportingFile("ApiClient.mustache",
+                (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiClient.cs"));
+        supportingFiles.add(new SupportingFile("ApiException.mustache",
+                (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiException.cs"));
+        supportingFiles.add(new SupportingFile("Newtonsoft.Json.dll", "bin", "Newtonsoft.Json.dll"));
+        supportingFiles.add(new SupportingFile("RestSharp.dll", "bin", "RestSharp.dll"));
+        supportingFiles.add(new SupportingFile("compile.mustache", "", "compile.bat"));
+
+        languageSpecificPrimitives = new HashSet<String>(
+                Arrays.asList(
+                        "string",
+                        "bool?",
+                        "double?",
+                        "int?",
+                        "long?",
+                        "float?",
+                        "byte[]",
+                        "List",
+                        "Dictionary",
+                        "DateTime?",
+                        "String",
+                        "Boolean",
+                        "Double",
+                        "Integer",
+                        "Long",
+                        "Float",
+                        "Object")
+        );
+        instantiationTypes.put("array", "List");
+        instantiationTypes.put("map", "Dictionary");
+
+        typeMapping = new HashMap<String, String>();
+        typeMapping.put("string", "string");
+        typeMapping.put("boolean", "bool?");
+        typeMapping.put("integer", "int?");
+        typeMapping.put("float", "float?");
+        typeMapping.put("long", "long?");
+        typeMapping.put("double", "double?");
+        typeMapping.put("number", "double?");
+        typeMapping.put("datetime", "DateTime?");
+        typeMapping.put("date", "DateTime?");
+        typeMapping.put("file", "string"); // path to file
+        typeMapping.put("array", "List");
+        typeMapping.put("list", "List");
+        typeMapping.put("map", "Dictionary");
+        typeMapping.put("object", "Object");
+
+    }
+
+    public CodegenType getTag() {
+        return CodegenType.CLIENT;
+    }
+
+    public String getName() {
+        return "csharp";
+    }
+
+    public String getHelp() {
+        return "Generates a CSharp client library.";
+    }
+
+    @Override
+    public String escapeReservedWord(String name) {
+        return "_" + name;
+    }
+
+    @Override
+    public String apiFileFolder() {
+        return (outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', '/')).replace('.', File.separatorChar);
+    }
+
+    public String modelFileFolder() {
+        return (outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', '/')).replace('.', File.separatorChar);
+    }
+
+    @Override
+    public String toVarName(String name) {
+        // replace - with _ e.g. created-at => created_at
+        name = name.replaceAll("-", "_");
+
+        // if it's all uppper case, do nothing
+        if (name.matches("^[A-Z_]*$")) {
+            return name;
+        }
+
+        // camelize the variable name
+        // pet_id => PetId
+        name = camelize(name);
+
+        // for reserved word or word starting with number, append _
+        if (reservedWords.contains(name) || name.matches("^\\d.*")) {
+            name = escapeReservedWord(name);
+        }
+
+        return name;
+    }
+
+    @Override
+    public String toParamName(String name) {
+        // should be the same as variable name
+        return toVarName(name);
+    }
+
+    @Override
+    public String toModelName(String name) {
+        // model name cannot use reserved keyword, e.g. return
+        if (reservedWords.contains(name)) {
+            throw new RuntimeException(name + " (reserved word) cannot be used as a model name");
+        }
+
+        // camelize the model name
+        // phone_number => PhoneNumber
+        return camelize(name);
+    }
+
+    @Override
+    public String toModelFilename(String name) {
+        // should be the same as the model name
+        return toModelName(name);
+    }
+
+
+    @Override
+    public String getTypeDeclaration(Property p) {
+        if (p instanceof ArrayProperty) {
+            ArrayProperty ap = (ArrayProperty) p;
+            Property inner = ap.getItems();
+            return getSwaggerType(p) + "<" + getTypeDeclaration(inner) + ">";
+        } else if (p instanceof MapProperty) {
+            MapProperty mp = (MapProperty) p;
+            Property inner = mp.getAdditionalProperties();
+
+            return getSwaggerType(p) + "<String, " + getTypeDeclaration(inner) + ">";
+        }
+        return super.getTypeDeclaration(p);
+    }
+
+    @Override
+    public String getSwaggerType(Property p) {
+        String swaggerType = super.getSwaggerType(p);
+        String type = null;
+        if (typeMapping.containsKey(swaggerType.toLowerCase())) {
+            type = typeMapping.get(swaggerType.toLowerCase());
+            if (languageSpecificPrimitives.contains(type)) {
+                return type;
+            }
+        } else {
+            type = swaggerType;
+        }
+        return toModelName(type);
+    }
+
+    @Override
+    public String toOperationId(String operationId) {
+        // method name cannot use reserved keyword, e.g. return
+        if (reservedWords.contains(operationId)) {
+            throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
+        }
+
+        return camelize(operationId);
+    }
+
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java

@@ -0,0 +1,247 @@
+package io.swagger.codegen.languages;
+
+import io.swagger.codegen.CliOption;
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenType;
+import io.swagger.codegen.DefaultCodegen;
+import io.swagger.codegen.SupportingFile;
+import io.swagger.models.properties.ArrayProperty;
+import io.swagger.models.properties.MapProperty;
+import io.swagger.models.properties.Property;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.HashSet;
+
+public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
+    protected String invokerPackage = "io.swagger.client";
+    protected String groupId = "io.swagger";
+    protected String artifactId = "swagger-java-client";
+    protected String artifactVersion = "1.0.0";
+    protected String sourceFolder = "src/main/java";
+
+    public JavaClientCodegen() {
+        super();
+        outputFolder = "generated-code/java";
+        modelTemplateFiles.put("model.mustache", ".java");
+        apiTemplateFiles.put("api.mustache", ".java");
+        templateDir = "Java";
+        apiPackage = "io.swagger.client.api";
+        modelPackage = "io.swagger.client.model";
+
+        reservedWords = new HashSet<String>(
+                Arrays.asList(
+                        "abstract", "continue", "for", "new", "switch", "assert",
+                        "default", "if", "package", "synchronized", "boolean", "do", "goto", "private",
+                        "this", "break", "double", "implements", "protected", "throw", "byte", "else",
+                        "import", "public", "throws", "case", "enum", "instanceof", "return", "transient",
+                        "catch", "extends", "int", "short", "try", "char", "final", "interface", "static",
+                        "void", "class", "finally", "long", "strictfp", "volatile", "const", "float",
+                        "native", "super", "while")
+        );
+
+        languageSpecificPrimitives = new HashSet<String>(
+                Arrays.asList(
+                        "String",
+                        "boolean",
+                        "Boolean",
+                        "Double",
+                        "Integer",
+                        "Long",
+                        "Float",
+                        "Object")
+        );
+        instantiationTypes.put("array", "ArrayList");
+        instantiationTypes.put("map", "HashMap");
+
+        cliOptions.add(new CliOption("invokerPackage", "root package for generated code"));
+        cliOptions.add(new CliOption("groupId", "groupId in generated pom.xml"));
+        cliOptions.add(new CliOption("artifactId", "artifactId in generated pom.xml"));
+        cliOptions.add(new CliOption("artifactVersion", "artifact version in generated pom.xml"));
+        cliOptions.add(new CliOption("sourceFolder", "source folder for generated code"));
+    }
+
+    public CodegenType getTag() {
+        return CodegenType.CLIENT;
+    }
+
+    public String getName() {
+        return "java";
+    }
+
+    public String getHelp() {
+        return "Generates a Java client library.";
+    }
+
+    @Override
+    public void processOpts() {
+        super.processOpts();
+
+        if (additionalProperties.containsKey("invokerPackage")) {
+            this.setInvokerPackage((String) additionalProperties.get("invokerPackage"));
+        } else {
+            //not set, use default to be passed to template
+            additionalProperties.put("invokerPackage", invokerPackage);
+        }
+
+        if (additionalProperties.containsKey("groupId")) {
+            this.setGroupId((String) additionalProperties.get("groupId"));
+        } else {
+            //not set, use to be passed to template
+            additionalProperties.put("groupId", groupId);
+        }
+
+        if (additionalProperties.containsKey("artifactId")) {
+            this.setArtifactId((String) additionalProperties.get("artifactId"));
+        } else {
+            //not set, use to be passed to template
+            additionalProperties.put("artifactId", artifactId);
+        }
+
+        if (additionalProperties.containsKey("artifactVersion")) {
+            this.setArtifactVersion((String) additionalProperties.get("artifactVersion"));
+        } else {
+            //not set, use to be passed to template
+            additionalProperties.put("artifactVersion", artifactVersion);
+        }
+
+        if (additionalProperties.containsKey("sourceFolder")) {
+            this.setSourceFolder((String) additionalProperties.get("sourceFolder"));
+        }
+
+        final String invokerFolder = (sourceFolder + File.separator + invokerPackage).replace(".", File.separator);
+        supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
+        supportingFiles.add(new SupportingFile("ApiClient.mustache", invokerFolder, "ApiClient.java"));
+        supportingFiles.add(new SupportingFile("apiException.mustache", invokerFolder, "ApiException.java"));
+        supportingFiles.add(new SupportingFile("Configuration.mustache", invokerFolder, "Configuration.java"));
+        supportingFiles.add(new SupportingFile("JsonUtil.mustache", invokerFolder, "JsonUtil.java"));
+        supportingFiles.add(new SupportingFile("StringUtil.mustache", invokerFolder, "StringUtil.java"));
+
+        final String authFolder = (sourceFolder + File.separator + invokerPackage + ".auth").replace(".", File.separator);
+        supportingFiles.add(new SupportingFile("auth/Authentication.mustache", authFolder, "Authentication.java"));
+        supportingFiles.add(new SupportingFile("auth/HttpBasicAuth.mustache", authFolder, "HttpBasicAuth.java"));
+        supportingFiles.add(new SupportingFile("auth/ApiKeyAuth.mustache", authFolder, "ApiKeyAuth.java"));
+        supportingFiles.add(new SupportingFile("auth/OAuth.mustache", authFolder, "OAuth.java"));
+    }
+
+
+    @Override
+    public String escapeReservedWord(String name) {
+        return "_" + name;
+    }
+
+    @Override
+    public String apiFileFolder() {
+        return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
+    }
+
+    public String modelFileFolder() {
+        return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
+    }
+
+    @Override
+    public String toVarName(String name) {
+        // replace - with _ e.g. created-at => created_at
+        name = name.replaceAll("-", "_");
+
+        // if it's all uppper case, do nothing
+        if (name.matches("^[A-Z_]*$")) {
+            return name;
+        }
+
+        // camelize (lower first character) the variable name
+        // pet_id => petId
+        name = camelize(name, true);
+
+        // for reserved word or word starting with number, append _
+        if (reservedWords.contains(name) || name.matches("^\\d.*")) {
+            name = escapeReservedWord(name);
+        }
+
+        return name;
+    }
+
+    @Override
+    public String toParamName(String name) {
+        // should be the same as variable name
+        return toVarName(name);
+    }
+
+    @Override
+    public String toModelName(String name) {
+        // model name cannot use reserved keyword, e.g. return
+        if (reservedWords.contains(name)) {
+            throw new RuntimeException(name + " (reserved word) cannot be used as a model name");
+        }
+
+        // camelize the model name
+        // phone_number => PhoneNumber
+        return camelize(name);
+    }
+
+    @Override
+    public String toModelFilename(String name) {
+        // should be the same as the model name
+        return toModelName(name);
+    }
+
+    @Override
+    public String getTypeDeclaration(Property p) {
+        if (p instanceof ArrayProperty) {
+            ArrayProperty ap = (ArrayProperty) p;
+            Property inner = ap.getItems();
+            return getSwaggerType(p) + "<" + getTypeDeclaration(inner) + ">";
+        } else if (p instanceof MapProperty) {
+            MapProperty mp = (MapProperty) p;
+            Property inner = mp.getAdditionalProperties();
+
+            return getSwaggerType(p) + "<String, " + getTypeDeclaration(inner) + ">";
+        }
+        return super.getTypeDeclaration(p);
+    }
+
+    @Override
+    public String getSwaggerType(Property p) {
+        String swaggerType = super.getSwaggerType(p);
+        String type = null;
+        if (typeMapping.containsKey(swaggerType)) {
+            type = typeMapping.get(swaggerType);
+            if (languageSpecificPrimitives.contains(type)) {
+                return toModelName(type);
+            }
+        } else {
+            type = swaggerType;
+        }
+        return toModelName(type);
+    }
+
+    @Override
+    public String toOperationId(String operationId) {
+        // method name cannot use reserved keyword, e.g. return
+        if (reservedWords.contains(operationId)) {
+            throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
+        }
+
+        return camelize(operationId, true);
+    }
+
+    public void setInvokerPackage(String invokerPackage) {
+        this.invokerPackage = invokerPackage;
+    }
+
+    public void setGroupId(String groupId) {
+        this.groupId = groupId;
+    }
+
+    public void setArtifactId(String artifactId) {
+        this.artifactId = artifactId;
+    }
+
+    public void setArtifactVersion(String artifactVersion) {
+        this.artifactVersion = artifactVersion;
+    }
+
+    public void setSourceFolder(String sourceFolder) {
+        this.sourceFolder = sourceFolder;
+    }
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JaxRSServerCodegen.java

@@ -0,0 +1,206 @@
+package io.swagger.codegen.languages;
+
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenOperation;
+import io.swagger.codegen.CodegenType;
+import io.swagger.codegen.SupportingFile;
+import io.swagger.models.Operation;
+import io.swagger.models.properties.ArrayProperty;
+import io.swagger.models.properties.MapProperty;
+import io.swagger.models.properties.Property;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+
+public class JaxRSServerCodegen extends JavaClientCodegen implements CodegenConfig {
+    protected String invokerPackage = "io.swagger.api";
+    protected String groupId = "io.swagger";
+    protected String artifactId = "swagger-jaxrs-server";
+    protected String artifactVersion = "1.0.0";
+    protected String title = "Swagger Server";
+
+    public JaxRSServerCodegen() {
+        super.processOpts();
+
+        sourceFolder = "src/gen/java";
+
+        outputFolder = System.getProperty("swagger.codegen.jaxrs.genfolder", "generated-code/javaJaxRS");
+        modelTemplateFiles.put("model.mustache", ".java");
+        apiTemplateFiles.put("api.mustache", ".java");
+        apiTemplateFiles.put("apiService.mustache", ".java");
+        apiTemplateFiles.put("apiServiceImpl.mustache", ".java");
+        apiTemplateFiles.put("apiServiceFactory.mustache", ".java");
+        templateDir = "JavaJaxRS";
+        apiPackage = System.getProperty("swagger.codegen.jaxrs.apipackage", "io.swagger.api");
+        modelPackage = System.getProperty("swagger.codegen.jaxrs.modelpackage", "io.swagger.model");
+
+        additionalProperties.put("invokerPackage", invokerPackage);
+        additionalProperties.put("groupId", groupId);
+        additionalProperties.put("artifactId", artifactId);
+        additionalProperties.put("artifactVersion", artifactVersion);
+        additionalProperties.put("title", title);
+
+
+        languageSpecificPrimitives = new HashSet<String>(
+                Arrays.asList(
+                        "String",
+                        "boolean",
+                        "Boolean",
+                        "Double",
+                        "Integer",
+                        "Long",
+                        "Float")
+        );
+    }
+
+    public CodegenType getTag() {
+        return CodegenType.SERVER;
+    }
+
+    public String getName() {
+        return "jaxrs";
+    }
+
+    public String getHelp() {
+        return "Generates a Java JAXRS Server application.";
+    }
+
+    @Override
+    public void processOpts() {
+        super.processOpts();
+
+        supportingFiles.clear();
+        supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
+        supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
+        supportingFiles.add(new SupportingFile("ApiException.mustache",
+                (sourceFolder + File.separator + apiPackage).replace(".", java.io.File.separator), "ApiException.java"));
+        supportingFiles.add(new SupportingFile("ApiOriginFilter.mustache",
+                (sourceFolder + File.separator + apiPackage).replace(".", java.io.File.separator), "ApiOriginFilter.java"));
+        supportingFiles.add(new SupportingFile("ApiResponseMessage.mustache",
+                (sourceFolder + File.separator + apiPackage).replace(".", java.io.File.separator), "ApiResponseMessage.java"));
+        supportingFiles.add(new SupportingFile("NotFoundException.mustache",
+                (sourceFolder + File.separator + apiPackage).replace(".", java.io.File.separator), "NotFoundException.java"));
+        supportingFiles.add(new SupportingFile("web.mustache",
+                ("src/main/webapp/WEB-INF"), "web.xml"));
+
+    }
+
+    @Override
+    public String getTypeDeclaration(Property p) {
+        if (p instanceof ArrayProperty) {
+            ArrayProperty ap = (ArrayProperty) p;
+            Property inner = ap.getItems();
+            return getSwaggerType(p) + "<" + getTypeDeclaration(inner) + ">";
+        } else if (p instanceof MapProperty) {
+            MapProperty mp = (MapProperty) p;
+            Property inner = mp.getAdditionalProperties();
+
+            return getTypeDeclaration(inner);
+        }
+        return super.getTypeDeclaration(p);
+    }
+
+    @Override
+    public void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co, Map<String, List<CodegenOperation>> operations) {
+        String basePath = resourcePath;
+        if (basePath.startsWith("/")) {
+            basePath = basePath.substring(1);
+        }
+        int pos = basePath.indexOf("/");
+        if (pos > 0) {
+            basePath = basePath.substring(0, pos);
+        }
+
+        if (basePath == "") {
+            basePath = "default";
+        } else {
+            if (co.path.startsWith("/" + basePath)) {
+                co.path = co.path.substring(("/" + basePath).length());
+            }
+            co.subresourceOperation = !co.path.isEmpty();
+        }
+        List<CodegenOperation> opList = operations.get(basePath);
+        if (opList == null) {
+            opList = new ArrayList<CodegenOperation>();
+            operations.put(basePath, opList);
+        }
+        opList.add(co);
+        co.baseName = basePath;
+    }
+
+    public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
+        Map<String, Object> operations = (Map<String, Object>) objs.get("operations");
+        if (operations != null) {
+            List<CodegenOperation> ops = (List<CodegenOperation>) operations.get("operation");
+            for (CodegenOperation operation : ops) {
+                if (operation.returnType == null) {
+                    operation.returnType = "Void";
+                } else if (operation.returnType.startsWith("List")) {
+                    String rt = operation.returnType;
+                    int end = rt.lastIndexOf(">");
+                    if (end > 0) {
+                        operation.returnType = rt.substring("List<".length(), end);
+                        operation.returnContainer = "List";
+                    }
+                } else if (operation.returnType.startsWith("Map")) {
+                    String rt = operation.returnType;
+                    int end = rt.lastIndexOf(">");
+                    if (end > 0) {
+                        operation.returnType = rt.substring("Map<".length(), end);
+                        operation.returnContainer = "Map";
+                    }
+                } else if (operation.returnType.startsWith("Set")) {
+                    String rt = operation.returnType;
+                    int end = rt.lastIndexOf(">");
+                    if (end > 0) {
+                        operation.returnType = rt.substring("Set<".length(), end);
+                        operation.returnContainer = "Set";
+                    }
+                }
+            }
+        }
+        return objs;
+    }
+
+    @Override
+    public String apiFilename(String templateName, String tag) {
+
+        String result = super.apiFilename(templateName, tag);
+
+        if (templateName.endsWith("Impl.mustache")) {
+            int ix = result.lastIndexOf('/');
+            result = result.substring(0, ix) + "/impl" + result.substring(ix, result.length() - 5) + "ServiceImpl.java";
+
+            String output = System.getProperty("swagger.codegen.jaxrs.impl.source");
+            if (output != null) {
+                result = result.replace(apiFileFolder(), implFileFolder(output));
+            }
+        } else if (templateName.endsWith("Factory.mustache")) {
+            int ix = result.lastIndexOf('/');
+            result = result.substring(0, ix) + "/factories" + result.substring(ix, result.length() - 5) + "ServiceFactory.java";
+
+            String output = System.getProperty("swagger.codegen.jaxrs.impl.source");
+            if (output != null) {
+                result = result.replace(apiFileFolder(), implFileFolder(output));
+            }
+        } else if (templateName.endsWith("Service.mustache")) {
+            int ix = result.lastIndexOf('.');
+            result = result.substring(0, ix) + "Service.java";
+        }
+
+        return result;
+    }
+
+    private String implFileFolder(String output) {
+        return outputFolder + "/" + output + "/" + apiPackage().replace('.', File.separatorChar);
+    }
+
+    public boolean shouldOverwrite(String filename) {
+
+        return !filename.endsWith("ServiceImpl.java") && !filename.endsWith("ServiceFactory.java");
+    }
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/NodeJSServerCodegen.java

@@ -0,0 +1,200 @@
+package io.swagger.codegen.languages;
+
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenOperation;
+import io.swagger.codegen.CodegenParameter;
+import io.swagger.codegen.CodegenResponse;
+import io.swagger.codegen.CodegenType;
+import io.swagger.codegen.DefaultCodegen;
+import io.swagger.codegen.SupportingFile;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+public class NodeJSServerCodegen extends DefaultCodegen implements CodegenConfig {
+    protected String apiVersion = "1.0.0";
+    protected int serverPort = 8080;
+    protected String projectName = "swagger-server";
+
+    public NodeJSServerCodegen() {
+        super();
+
+        // set the output folder here
+        outputFolder = "generated-code/nodejs";
+
+        /**
+         * Models.  You can write model files using the modelTemplateFiles map.
+         * if you want to create one template for file, you can do so here.
+         * for multiple files for model, just put another entry in the `modelTemplateFiles` with
+         * a different extension
+         */
+        modelTemplateFiles.clear();
+
+        /**
+         * Api classes.  You can write classes for each Api file with the apiTemplateFiles map.
+         * as with models, add multiple entries with different extensions for multiple files per
+         * class
+         */
+        apiTemplateFiles.put(
+                "controller.mustache",   // the template to use
+                ".js");       // the extension for each file to write
+
+        /**
+         * Template Location.  This is the location which templates will be read from.  The generator
+         * will use the resource stream to attempt to read the templates.
+         */
+        templateDir = "nodejs";
+
+        /**
+         * Reserved words.  Override this with reserved words specific to your language
+         */
+        reservedWords = new HashSet<String>(
+                Arrays.asList(
+                        "break", "case", "class", "catch", "const", "continue", "debugger",
+                        "default", "delete", "do", "else", "export", "extends", "finally",
+                        "for", "function", "if", "import", "in", "instanceof", "let", "new",
+                        "return", "super", "switch", "this", "throw", "try", "typeof", "var",
+                        "void", "while", "with", "yield")
+        );
+
+        /**
+         * Additional Properties.  These values can be passed to the templates and
+         * are available in models, apis, and supporting files
+         */
+        additionalProperties.put("apiVersion", apiVersion);
+        additionalProperties.put("serverPort", serverPort);
+
+        /**
+         * Supporting Files.  You can write single files for the generator with the
+         * entire object tree available.  If the input file has a suffix of `.mustache
+         * it will be processed by the template engine.  Otherwise, it will be copied
+         */
+        // supportingFiles.add(new SupportingFile("controller.mustache",
+        //   "controllers",
+        //   "controller.js")
+        // );
+        supportingFiles.add(new SupportingFile("swagger.mustache",
+                        "api",
+                        "swagger.json")
+        );
+        supportingFiles.add(new SupportingFile("index.mustache",
+                        "",
+                        "index.js")
+        );
+        supportingFiles.add(new SupportingFile("package.mustache",
+                        "",
+                        "package.json")
+        );
+        if (System.getProperty("noservice") == null) {
+            apiTemplateFiles.put(
+                    "service.mustache",   // the template to use
+                    "Service.js");       // the extension for each file to write
+        }
+    }
+
+    public String apiPackage() {
+        return "controllers";
+    }
+
+    /**
+     * Configures the type of generator.
+     *
+     * @return the CodegenType for this generator
+     * @see io.swagger.codegen.CodegenType
+     */
+    public CodegenType getTag() {
+        return CodegenType.SERVER;
+    }
+
+    /**
+     * Configures a friendly name for the generator.  This will be used by the generator
+     * to select the library with the -l flag.
+     *
+     * @return the friendly name for the generator
+     */
+    public String getName() {
+        return "nodejs";
+    }
+
+    /**
+     * Returns human-friendly help for the generator.  Provide the consumer with help
+     * tips, parameters here
+     *
+     * @return A string value for the help message
+     */
+    public String getHelp() {
+        return "Generates a nodejs server library using the swagger-tools project.  By default, " +
+                "it will also generate service classes--which you can disable with the `-Dnoservice` environment variable.";
+    }
+
+    @Override
+    public String toApiName(String name) {
+        if (name.length() == 0) {
+            return "DefaultController";
+        }
+        return initialCaps(name);
+    }
+
+    @Override
+    public String toApiFilename(String name) {
+        return toApiName(name);
+    }
+
+    /**
+     * Escapes a reserved word as defined in the `reservedWords` array. Handle escaping
+     * those terms here.  This logic is only called if a variable matches the reseved words
+     *
+     * @return the escaped term
+     */
+    @Override
+    public String escapeReservedWord(String name) {
+        return "_" + name;  // add an underscore to the name
+    }
+
+    /**
+     * Location to write api files.  You can use the apiPackage() as defined when the class is
+     * instantiated
+     */
+    @Override
+    public String apiFileFolder() {
+        return outputFolder + File.separator + apiPackage().replace('.', File.separatorChar);
+    }
+
+    @Override
+    public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
+        @SuppressWarnings("unchecked")
+        Map<String, Object> objectMap = (Map<String, Object>) objs.get("operations");
+        @SuppressWarnings("unchecked")
+        List<CodegenOperation> operations = (List<CodegenOperation>) objectMap.get("operation");
+        for (CodegenOperation operation : operations) {
+            operation.httpMethod = operation.httpMethod.toLowerCase();
+            List<CodegenParameter> params = operation.allParams;
+            if (params != null && params.size() == 0) {
+                operation.allParams = null;
+            }
+            List<CodegenResponse> responses = operation.responses;
+            if (responses != null) {
+                for (CodegenResponse resp : responses) {
+                    if ("0".equals(resp.code)) {
+                        resp.code = "default";
+                    }
+                }
+            }
+            if (operation.examples != null && !operation.examples.isEmpty()) {
+                // Leave application/json* items only
+                for (Iterator<Map<String, String>> it = operation.examples.iterator(); it.hasNext(); ) {
+                    final Map<String, String> example = it.next();
+                    final String contentType = example.get("contentType");
+                    if (contentType == null || !contentType.startsWith("application/json")) {
+                        it.remove();
+                    }
+                }
+            }
+        }
+        return objs;
+    }
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java

@@ -0,0 +1,361 @@
+package io.swagger.codegen.languages;
+
+import io.swagger.codegen.CliOption;
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenProperty;
+import io.swagger.codegen.CodegenType;
+import io.swagger.codegen.DefaultCodegen;
+import io.swagger.codegen.SupportingFile;
+import io.swagger.models.properties.ArrayProperty;
+import io.swagger.models.properties.MapProperty;
+import io.swagger.models.properties.Property;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
+
+public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
+    protected Set<String> foundationClasses = new HashSet<String>();
+    protected String sourceFolder = "client";
+    protected String classPrefix = "SWG";
+    protected String projectName = "swaggerClient";
+
+    public ObjcClientCodegen() {
+        super();
+        outputFolder = "generated-code" + File.separator + "objc";
+        modelTemplateFiles.put("model-header.mustache", ".h");
+        modelTemplateFiles.put("model-body.mustache", ".m");
+        apiTemplateFiles.put("api-header.mustache", ".h");
+        apiTemplateFiles.put("api-body.mustache", ".m");
+        templateDir = "objc";
+        modelPackage = "";
+
+        defaultIncludes = new HashSet<String>(
+                Arrays.asList(
+                        "bool",
+                        "BOOL",
+                        "int",
+                        "NSString",
+                        "NSObject",
+                        "NSArray",
+                        "NSNumber",
+                        "NSDate",
+                        "NSDictionary",
+                        "NSMutableArray",
+                        "NSMutableDictionary")
+        );
+        languageSpecificPrimitives = new HashSet<String>(
+                Arrays.asList(
+                        "NSNumber",
+                        "NSString",
+                        "NSObject",
+                        "NSDate",
+                        "bool",
+                        "BOOL")
+        );
+
+        // ref: http://www.tutorialspoint.com/objective_c/objective_c_basic_syntax.htm
+        reservedWords = new HashSet<String>(
+                Arrays.asList(
+                        "auto", "else", "long", "switch",
+                        "break", "enum", "register", "typedef",
+                        "case", "extern", "return", "union",
+                        "char", "float", "short", "unsigned",
+                        "const", "for", "signed", "void",
+                        "continue", "goto", "sizeof", "volatile",
+                        "default", "if", "id", "static", "while",
+                        "do", "int", "struct", "_Packed",
+                        "double", "protocol", "interface", "implementation",
+                        "NSObject", "NSInteger", "NSNumber", "CGFloat",
+                        "property", "nonatomic", "retain", "strong",
+                        "weak", "unsafe_unretained", "readwrite", "readonly"
+                ));
+
+        typeMapping = new HashMap<String, String>();
+        typeMapping.put("enum", "NSString");
+        typeMapping.put("Date", "NSDate");
+        typeMapping.put("DateTime", "NSDate");
+        typeMapping.put("boolean", "BOOL");
+        typeMapping.put("string", "NSString");
+        typeMapping.put("integer", "NSNumber");
+        typeMapping.put("int", "NSNumber");
+        typeMapping.put("float", "NSNumber");
+        typeMapping.put("long", "NSNumber");
+        typeMapping.put("double", "NSNumber");
+        typeMapping.put("array", "NSArray");
+        typeMapping.put("map", "NSDictionary");
+        typeMapping.put("number", "NSNumber");
+        typeMapping.put("List", "NSArray");
+        typeMapping.put("object", "NSObject");
+
+        importMapping = new HashMap<String, String>();
+
+        foundationClasses = new HashSet<String>(
+                Arrays.asList(
+                        "NSNumber",
+                        "NSObject",
+                        "NSString",
+                        "NSDate",
+                        "NSDictionary")
+        );
+
+        instantiationTypes.put("array", "NSMutableArray");
+        instantiationTypes.put("map", "NSMutableDictionary");
+
+        cliOptions.add(new CliOption("classPrefix", "prefix for generated classes"));
+        cliOptions.add(new CliOption("sourceFolder", "source folder for generated code"));
+        cliOptions.add(new CliOption("projectName", "name of the Xcode project in generated Podfile"));
+    }
+
+    public CodegenType getTag() {
+        return CodegenType.CLIENT;
+    }
+
+    public String getName() {
+        return "objc";
+    }
+
+    public String getHelp() {
+        return "Generates an Objective-C client library.";
+    }
+
+    @Override
+    public void processOpts() {
+        super.processOpts();
+
+        if (additionalProperties.containsKey("sourceFolder")) {
+            this.setSourceFolder((String) additionalProperties.get("sourceFolder"));
+        }
+
+        if (additionalProperties.containsKey("classPrefix")) {
+            this.setClassPrefix((String) additionalProperties.get("classPrefix"));
+        }
+
+        if (additionalProperties.containsKey("projectName")) {
+            this.setProjectName((String) additionalProperties.get("projectName"));
+        } else {
+            additionalProperties.put("projectName", projectName);
+        }
+
+        supportingFiles.add(new SupportingFile("SWGObject.h", sourceFolder, "SWGObject.h"));
+        supportingFiles.add(new SupportingFile("SWGObject.m", sourceFolder, "SWGObject.m"));
+        supportingFiles.add(new SupportingFile("SWGQueryParamCollection.h", sourceFolder, "SWGQueryParamCollection.h"));
+        supportingFiles.add(new SupportingFile("SWGQueryParamCollection.m", sourceFolder, "SWGQueryParamCollection.m"));
+        supportingFiles.add(new SupportingFile("SWGApiClient.h", sourceFolder, "SWGApiClient.h"));
+        supportingFiles.add(new SupportingFile("SWGApiClient.m", sourceFolder, "SWGApiClient.m"));
+        supportingFiles.add(new SupportingFile("SWGFile.h", sourceFolder, "SWGFile.h"));
+        supportingFiles.add(new SupportingFile("SWGFile.m", sourceFolder, "SWGFile.m"));
+        supportingFiles.add(new SupportingFile("JSONValueTransformer+ISO8601.m", sourceFolder, "JSONValueTransformer+ISO8601.m"));
+        supportingFiles.add(new SupportingFile("JSONValueTransformer+ISO8601.h", sourceFolder, "JSONValueTransformer+ISO8601.h"));
+        supportingFiles.add(new SupportingFile("SWGConfiguration-body.mustache", sourceFolder, "SWGConfiguration.m"));
+        supportingFiles.add(new SupportingFile("SWGConfiguration-header.mustache", sourceFolder, "SWGConfiguration.h"));
+        supportingFiles.add(new SupportingFile("Podfile.mustache", "", "Podfile"));
+    }
+
+    @Override
+    public String toInstantiationType(Property p) {
+        if (p instanceof MapProperty) {
+            MapProperty ap = (MapProperty) p;
+            String inner = getSwaggerType(ap.getAdditionalProperties());
+            return instantiationTypes.get("map");
+        } else if (p instanceof ArrayProperty) {
+            ArrayProperty ap = (ArrayProperty) p;
+            String inner = getSwaggerType(ap.getItems());
+            return instantiationTypes.get("array");
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public String getTypeDeclaration(String name) {
+        if (languageSpecificPrimitives.contains(name) && !foundationClasses.contains(name)) {
+            return name;
+        } else {
+            return name + "*";
+        }
+    }
+
+    @Override
+    public String getSwaggerType(Property p) {
+        String swaggerType = super.getSwaggerType(p);
+        String type = null;
+        if (typeMapping.containsKey(swaggerType)) {
+            type = typeMapping.get(swaggerType);
+            if (languageSpecificPrimitives.contains(type) && !foundationClasses.contains(type)) {
+                return toModelName(type);
+            }
+        } else {
+            type = swaggerType;
+        }
+        return toModelName(type);
+    }
+
+    @Override
+    public String getTypeDeclaration(Property p) {
+        if (p instanceof ArrayProperty) {
+            ArrayProperty ap = (ArrayProperty) p;
+            Property inner = ap.getItems();
+            String innerType = getSwaggerType(inner);
+
+            // In this codition, type of property p is array of primitive,
+            // return container type with pointer, e.g. `NSArray*'
+            if (languageSpecificPrimitives.contains(innerType)) {
+                return getSwaggerType(p) + "*";
+            }
+
+            // In this codition, type of property p is array of model,
+            // return container type combine inner type with pointer, e.g. `NSArray<SWGTag>*'
+            String innerTypeDeclaration = getTypeDeclaration(inner);
+
+            if (innerTypeDeclaration.endsWith("*")) {
+                innerTypeDeclaration = innerTypeDeclaration.substring(0, innerTypeDeclaration.length() - 1);
+            }
+
+            return getSwaggerType(p) + "<" + innerTypeDeclaration + ">*";
+        } else {
+            String swaggerType = getSwaggerType(p);
+
+            // In this codition, type of p is objective-c primitive type, e.g. `NSSNumber',
+            // return type of p with pointer, e.g. `NSNumber*'
+            if (languageSpecificPrimitives.contains(swaggerType) &&
+                    foundationClasses.contains(swaggerType)) {
+                return swaggerType + "*";
+            }
+            // In this codition, type of p is c primitive type, e.g. `bool',
+            // return type of p, e.g. `bool'
+            else if (languageSpecificPrimitives.contains(swaggerType)) {
+                return swaggerType;
+            }
+            // In this codition, type of p is objective-c object type, e.g. `SWGPet',
+            // return type of p with pointer, e.g. `SWGPet*'
+            else {
+                return swaggerType + "*";
+            }
+        }
+    }
+
+    @Override
+    public String toModelName(String type) {
+        type = type.replaceAll("[^0-9a-zA-Z_]", "_");
+
+        // language build-in classes
+        if (typeMapping.keySet().contains(type) ||
+                foundationClasses.contains(type) ||
+                importMapping.values().contains(type) ||
+                defaultIncludes.contains(type) ||
+                languageSpecificPrimitives.contains(type)) {
+            return camelize(type);
+        }
+        // custom classes
+        else {
+            return classPrefix + camelize(type);
+        }
+    }
+
+    @Override
+    public String toModelFilename(String name) {
+        // should be the same as the model name
+        return toModelName(name);
+    }
+
+    @Override
+    protected void setNonArrayMapProperty(CodegenProperty property, String type) {
+        super.setNonArrayMapProperty(property, type);
+        if ("NSDictionary".equals(type)) {
+            property.setter = "initWithDictionary";
+        } else {
+            property.setter = "initWithValues";
+        }
+    }
+
+    @Override
+    public String toModelImport(String name) {
+        if ("".equals(modelPackage())) {
+            return name;
+        } else {
+            return modelPackage() + "." + name;
+        }
+    }
+
+    @Override
+    public String toDefaultValue(Property p) {
+        return null;
+    }
+
+    @Override
+    public String apiFileFolder() {
+        return outputFolder + File.separator + sourceFolder;
+    }
+
+    @Override
+    public String modelFileFolder() {
+        return outputFolder + File.separator + sourceFolder;
+    }
+
+    @Override
+    public String toApiName(String name) {
+        return classPrefix + camelize(name) + "Api";
+    }
+
+    public String toApiFilename(String name) {
+        return classPrefix + camelize(name) + "Api";
+    }
+
+    @Override
+    public String toVarName(String name) {
+        // replace non-word characters to `_`
+        // e.g. `created-at` to `created_at`
+        name = name.replaceAll("[^a-zA-Z0-9_]", "_");
+
+        // if it's all upper case, do noting
+        if (name.matches("^[A-Z_]$")) {
+            return name;
+        }
+
+        // camelize (lower first character) the variable name
+        // e.g. `pet_id` to `petId`
+        name = camelize(name, true);
+
+        // for reserved word or word starting with number, prepend `_`
+        if (reservedWords.contains(name) || name.matches("^\\d.*")) {
+            name = escapeReservedWord(name);
+        }
+
+        return name;
+    }
+
+    @Override
+    public String toParamName(String name) {
+        // should be the same as variable name
+        return toVarName(name);
+    }
+
+    public String escapeReservedWord(String name) {
+        return "_" + name;
+    }
+
+    @Override
+    public String toOperationId(String operationId) {
+        // method name cannot use reserved keyword, e.g. return
+        if (reservedWords.contains(operationId)) {
+            throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
+        }
+
+        return camelize(operationId, true);
+    }
+
+    public void setSourceFolder(String sourceFolder) {
+        this.sourceFolder = sourceFolder;
+    }
+
+    public void setClassPrefix(String classPrefix) {
+        this.classPrefix = classPrefix;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PerlClientCodegen.java

@@ -0,0 +1,208 @@
+package io.swagger.codegen.languages;
+
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenType;
+import io.swagger.codegen.DefaultCodegen;
+import io.swagger.codegen.SupportingFile;
+import io.swagger.models.properties.ArrayProperty;
+import io.swagger.models.properties.MapProperty;
+import io.swagger.models.properties.Property;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.HashSet;
+
+public class PerlClientCodegen extends DefaultCodegen implements CodegenConfig {
+    protected String invokerPackage = "SwaggerClient";
+    protected String groupId = "io.swagger";
+    protected String artifactId = "swagger-client";
+    protected String artifactVersion = "1.0.0";
+
+    public PerlClientCodegen() {
+        super();
+        modelPackage = File.separatorChar + "Object";
+        outputFolder = "generated-code" + File.separatorChar + "perl";
+        modelTemplateFiles.put("object.mustache", ".pm");
+        apiTemplateFiles.put("api.mustache", ".pm");
+        templateDir = "perl";
+
+        typeMapping.clear();
+        languageSpecificPrimitives.clear();
+
+        reservedWords = new HashSet<String>(
+                Arrays.asList(
+                        "else", "lock", "qw",
+                        "__END__", "elsif", "lt", "qx",
+                        "__FILE__", "eq", "m", "s",
+                        "__LINE__", "exp", "ne", "sub",
+                        "__PACKAGE__", "for", "no", "tr",
+                        "and", "foreach", "or", "unless",
+                        "cmp", "ge", "package", "until",
+                        "continue", "gt", "q", "while",
+                        "CORE", "if", "qq", "xor",
+                        "do", "le", "qr", "y"
+                )
+        );
+
+        additionalProperties.put("invokerPackage", invokerPackage);
+        additionalProperties.put("groupId", groupId);
+        additionalProperties.put("artifactId", artifactId);
+        additionalProperties.put("artifactVersion", artifactVersion);
+
+        languageSpecificPrimitives.add("int");
+        languageSpecificPrimitives.add("double");
+        languageSpecificPrimitives.add("string");
+        languageSpecificPrimitives.add("boolean");
+        languageSpecificPrimitives.add("DateTime");
+        languageSpecificPrimitives.add("ARRAY");
+        languageSpecificPrimitives.add("HASH");
+        languageSpecificPrimitives.add("object");
+
+        typeMapping.put("integer", "int");
+        typeMapping.put("long", "int");
+        typeMapping.put("float", "double");
+        typeMapping.put("double", "double");
+        typeMapping.put("boolean", "boolean");
+        typeMapping.put("string", "string");
+        typeMapping.put("date", "DateTime");
+        typeMapping.put("dateTime", "DateTime");
+        typeMapping.put("password", "string");
+        typeMapping.put("array", "ARRAY");
+        typeMapping.put("map", "HASH");
+        typeMapping.put("object", "object");
+
+        supportingFiles.add(new SupportingFile("ApiClient.mustache", ("lib/WWW/" + invokerPackage).replace('/', File.separatorChar), "ApiClient.pm"));
+        supportingFiles.add(new SupportingFile("Configuration.mustache", ("lib/WWW/" + invokerPackage).replace('/', File.separatorChar), "Configuration.pm"));
+        supportingFiles.add(new SupportingFile("BaseObject.mustache", ("lib/WWW/" + invokerPackage).replace('/', File.separatorChar), "Object/BaseObject.pm"));
+    }
+
+    public CodegenType getTag() {
+        return CodegenType.CLIENT;
+    }
+
+    public String getName() {
+        return "perl";
+    }
+
+    public String getHelp() {
+        return "Generates a Perl client library.";
+    }
+
+    @Override
+    public String escapeReservedWord(String name) {
+        return "_" + name;
+    }
+
+    @Override
+    public String apiFileFolder() {
+        return (outputFolder + "/lib/WWW/" + invokerPackage + apiPackage()).replace('/', File.separatorChar);
+    }
+
+    public String modelFileFolder() {
+        return (outputFolder + "/lib/WWW/" + invokerPackage + modelPackage()).replace('/', File.separatorChar);
+    }
+
+    @Override
+    public String getTypeDeclaration(Property p) {
+        if (p instanceof ArrayProperty) {
+            ArrayProperty ap = (ArrayProperty) p;
+            Property inner = ap.getItems();
+            return getSwaggerType(p) + "[" + getTypeDeclaration(inner) + "]";
+        } else if (p instanceof MapProperty) {
+            MapProperty mp = (MapProperty) p;
+            Property inner = mp.getAdditionalProperties();
+            return getSwaggerType(p) + "[string," + getTypeDeclaration(inner) + "]";
+        }
+        return super.getTypeDeclaration(p);
+    }
+
+    @Override
+    public String getSwaggerType(Property p) {
+        String swaggerType = super.getSwaggerType(p);
+        String type = null;
+        if (typeMapping.containsKey(swaggerType)) {
+            type = typeMapping.get(swaggerType);
+            if (languageSpecificPrimitives.contains(type)) {
+                return type;
+            }
+        } else {
+            type = swaggerType;
+        }
+        if (type == null) {
+            return null;
+        }
+        return type;
+    }
+
+    public String toDefaultValue(Property p) {
+        return "null";
+    }
+
+
+    @Override
+    public String toVarName(String name) {
+        // parameter name starting with number won't compile
+        // need to escape it by appending _ at the beginning
+        if (name.matches("^[0-9]")) {
+            name = "_" + name;
+        }
+
+        // return the name in underscore style
+        // PhoneNumber => phone_number
+        return underscore(name);
+    }
+
+    @Override
+    public String toParamName(String name) {
+        // should be the same as variable name
+        return toVarName(name);
+    }
+
+    @Override
+    public String toModelName(String name) {
+        // model name cannot use reserved keyword
+        if (reservedWords.contains(name)) {
+            escapeReservedWord(name); // e.g. return => _return
+        }
+
+        // camelize the model name
+        // phone_number => PhoneNumber
+        return camelize(name);
+    }
+
+    @Override
+    public String toModelFilename(String name) {
+        // should be the same as the model name
+        return toModelName(name);
+    }
+
+    @Override
+    public String toApiFilename(String name) {
+        // replace - with _ e.g. created-at => created_at
+        name = name.replaceAll("-", "_");
+
+        // e.g. phone_number_api.rb => PhoneNumberApi.rb
+        return camelize(name) + "Api";
+    }
+
+    @Override
+    public String toApiName(String name) {
+        if (name.length() == 0) {
+            return "DefaultApi";
+        }
+        // e.g. phone_number_api => PhoneNumberApi
+        return camelize(name) + "Api";
+    }
+
+    @Override
+    public String toOperationId(String operationId) {
+        // method name cannot use reserved keyword, e.g. return
+        if (reservedWords.contains(operationId)) {
+            throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
+        }
+
+        return underscore(operationId);
+    }
+
+
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java

@@ -0,0 +1,190 @@
+package io.swagger.codegen.languages;
+
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenType;
+import io.swagger.codegen.DefaultCodegen;
+import io.swagger.codegen.SupportingFile;
+import io.swagger.models.properties.ArrayProperty;
+import io.swagger.models.properties.MapProperty;
+import io.swagger.models.properties.Property;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+
+public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
+    protected String invokerPackage = "io.swagger.client";
+    protected String groupId = "io.swagger";
+    protected String artifactId = "swagger-client";
+    protected String artifactVersion = "1.0.0";
+
+    public PhpClientCodegen() {
+        super();
+
+        invokerPackage = camelize("SwaggerClient");
+
+        String packagePath = invokerPackage + "-php";
+
+        modelPackage = packagePath + "/lib/models";
+        apiPackage = packagePath + "/lib";
+        outputFolder = "generated-code/php";
+        modelTemplateFiles.put("model.mustache", ".php");
+        apiTemplateFiles.put("api.mustache", ".php");
+        templateDir = "php";
+
+        reservedWords = new HashSet<String>(
+                Arrays.asList(
+                        "__halt_compiler", "abstract", "and", "array", "as", "break", "callable", "case", "catch", "class", "clone", "const", "continue", "declare", "default", "die", "do", "echo", "else", "elseif", "empty", "enddeclare", "endfor", "endforeach", "endif", "endswitch", "endwhile", "eval", "exit", "extends", "final", "for", "foreach", "function", "global", "goto", "if", "implements", "include", "include_once", "instanceof", "insteadof", "interface", "isset", "list", "namespace", "new", "or", "print", "private", "protected", "public", "require", "require_once", "return", "static", "switch", "throw", "trait", "try", "unset", "use", "var", "while", "xor")
+        );
+
+        additionalProperties.put("invokerPackage", invokerPackage);
+        additionalProperties.put("groupId", groupId);
+        additionalProperties.put("artifactId", artifactId);
+        additionalProperties.put("artifactVersion", artifactVersion);
+
+        // ref: http://php.net/manual/en/language.types.intro.php
+        languageSpecificPrimitives = new HashSet<String>(
+                Arrays.asList(
+                        "boolean",
+                        "int",
+                        "integer",
+                        "double",
+                        "float",
+                        "string",
+                        "object",
+                        "DateTime",
+                        "mixed",
+                        "number")
+        );
+
+        instantiationTypes.put("array", "array");
+        instantiationTypes.put("map", "map");
+
+        // ref: https://github.com/swagger-api/swagger-spec/blob/master/versions/2.0.md#data-types
+        typeMapping = new HashMap<String, String>();
+        typeMapping.put("integer", "int");
+        typeMapping.put("long", "int");
+        typeMapping.put("float", "float");
+        typeMapping.put("double", "double");
+        typeMapping.put("string", "string");
+        typeMapping.put("byte", "int");
+        typeMapping.put("boolean", "boolean");
+        typeMapping.put("date", "DateTime");
+        typeMapping.put("datetime", "DateTime");
+        typeMapping.put("file", "string");
+        typeMapping.put("map", "map");
+        typeMapping.put("array", "array");
+        typeMapping.put("list", "array");
+        typeMapping.put("object", "object");
+
+        supportingFiles.add(new SupportingFile("composer.mustache", packagePath.replace('/', File.separatorChar), "composer.json"));
+        supportingFiles.add(new SupportingFile("configuration.mustache", (packagePath + "/lib").replace('/', File.separatorChar), "Configuration.php"));
+        supportingFiles.add(new SupportingFile("ApiClient.mustache", (packagePath + "/lib").replace('/', File.separatorChar), "ApiClient.php"));
+        supportingFiles.add(new SupportingFile("ApiException.mustache", (packagePath + "/lib").replace('/', File.separatorChar), "ApiException.php"));
+        supportingFiles.add(new SupportingFile("require.mustache", packagePath.replace('/', File.separatorChar), invokerPackage + ".php"));
+    }
+
+    public CodegenType getTag() {
+        return CodegenType.CLIENT;
+    }
+
+    public String getName() {
+        return "php";
+    }
+
+    public String getHelp() {
+        return "Generates a PHP client library.";
+    }
+
+    @Override
+    public String escapeReservedWord(String name) {
+        return "_" + name;
+    }
+
+    @Override
+    public String apiFileFolder() {
+        return (outputFolder + "/" + apiPackage()).replace('/', File.separatorChar);
+    }
+
+    public String modelFileFolder() {
+        return (outputFolder + "/" + modelPackage()).replace('/', File.separatorChar);
+    }
+
+    @Override
+    public String getTypeDeclaration(Property p) {
+        if (p instanceof ArrayProperty) {
+            ArrayProperty ap = (ArrayProperty) p;
+            Property inner = ap.getItems();
+            return getSwaggerType(p) + "[" + getTypeDeclaration(inner) + "]";
+        } else if (p instanceof MapProperty) {
+            MapProperty mp = (MapProperty) p;
+            Property inner = mp.getAdditionalProperties();
+            return getSwaggerType(p) + "[string," + getTypeDeclaration(inner) + "]";
+        }
+        return super.getTypeDeclaration(p);
+    }
+
+    @Override
+    public String getSwaggerType(Property p) {
+        String swaggerType = super.getSwaggerType(p);
+        String type = null;
+        if (typeMapping.containsKey(swaggerType)) {
+            type = typeMapping.get(swaggerType);
+            if (languageSpecificPrimitives.contains(type)) {
+                return type;
+            } else if (instantiationTypes.containsKey(type)) {
+                return type;
+            }
+        } else {
+            type = swaggerType;
+        }
+        if (type == null) {
+            return null;
+        }
+        return toModelName(type);
+    }
+
+    public String toDefaultValue(Property p) {
+        return "null";
+    }
+
+
+    @Override
+    public String toVarName(String name) {
+        // parameter name starting with number won't compile
+        // need to escape it by appending _ at the beginning
+        if (name.matches("^[0-9]")) {
+            name = "_" + name;
+        }
+
+        // return the name in underscore style
+        // PhoneNumber => phone_number
+        return underscore(name);
+    }
+
+    @Override
+    public String toParamName(String name) {
+        // should be the same as variable name
+        return toVarName(name);
+    }
+
+    @Override
+    public String toModelName(String name) {
+        // model name cannot use reserved keyword
+        if (reservedWords.contains(name)) {
+            escapeReservedWord(name); // e.g. return => _return
+        }
+
+        // camelize the model name
+        // phone_number => PhoneNumber
+        return camelize(name);
+    }
+
+    @Override
+    public String toModelFilename(String name) {
+        // should be the same as the model name
+        return toModelName(name);
+    }
+
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Python3ClientCodegen.java

@@ -0,0 +1,210 @@
+package io.swagger.codegen.languages;
+
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenType;
+import io.swagger.codegen.DefaultCodegen;
+import io.swagger.codegen.SupportingFile;
+import io.swagger.models.properties.ArrayProperty;
+import io.swagger.models.properties.MapProperty;
+import io.swagger.models.properties.Property;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.HashSet;
+
+public class Python3ClientCodegen extends DefaultCodegen implements CodegenConfig {
+    String module = "client";
+
+    public Python3ClientCodegen() {
+        super();
+        outputFolder = "generated-code/python3";
+        modelTemplateFiles.put("model.mustache", ".py");
+        apiTemplateFiles.put("api.mustache", ".py");
+        templateDir = "python3";
+
+        apiPackage = module;
+        modelPackage = module + ".models";
+
+        languageSpecificPrimitives.clear();
+        languageSpecificPrimitives.add("int");
+        languageSpecificPrimitives.add("float");
+        //languageSpecificPrimitives.add("long");
+        languageSpecificPrimitives.add("list");
+        languageSpecificPrimitives.add("bool");
+        languageSpecificPrimitives.add("str");
+        languageSpecificPrimitives.add("datetime");
+
+        typeMapping.clear();
+        typeMapping.put("integer", "int");
+        typeMapping.put("float", "float");
+        typeMapping.put("long", "int");
+        typeMapping.put("double", "float");
+        typeMapping.put("array", "list");
+        typeMapping.put("map", "map");
+        typeMapping.put("boolean", "bool");
+        typeMapping.put("string", "str");
+        typeMapping.put("date", "datetime");
+
+        // from https://docs.python.org/release/2.5.4/ref/keywords.html
+        reservedWords = new HashSet<String>(
+                Arrays.asList(
+                        "and", "del", "from", "not", "while", "as", "elif", "global", "or", "with",
+                        "assert", "else", "if", "pass", "yield", "break", "except", "import",
+                        "print", "class", "exec", "in", "raise", "continue", "finally", "is",
+                        "return", "def", "for", "lambda", "try"));
+
+        //supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
+        supportingFiles.add(new SupportingFile("swagger.mustache", module, "swagger.py"));
+        supportingFiles.add(new SupportingFile("__init__.mustache", module, "__init__.py"));
+    }
+
+    public CodegenType getTag() {
+        return CodegenType.CLIENT;
+    }
+
+    public String getName() {
+        return "python3";
+    }
+
+    public String getHelp() {
+        return "Generates a Python3 client library.";
+    }
+
+    @Override
+    public String escapeReservedWord(String name) {
+        return "_" + name;
+    }
+
+    @Override
+    public String apiFileFolder() {
+        return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
+    }
+
+    public String modelFileFolder() {
+        return outputFolder + "/" + modelPackage().replace('.', File.separatorChar);
+    }
+
+    @Override
+    public String getTypeDeclaration(Property p) {
+        if (p instanceof ArrayProperty) {
+            ArrayProperty ap = (ArrayProperty) p;
+            Property inner = ap.getItems();
+            return getSwaggerType(p) + "[" + getTypeDeclaration(inner) + "]";
+        } else if (p instanceof MapProperty) {
+            MapProperty mp = (MapProperty) p;
+            Property inner = mp.getAdditionalProperties();
+
+            return getSwaggerType(p) + "(String, " + getTypeDeclaration(inner) + ")";
+        }
+        return super.getTypeDeclaration(p);
+    }
+
+    @Override
+    public String getSwaggerType(Property p) {
+        String swaggerType = super.getSwaggerType(p);
+        String type = null;
+        if (typeMapping.containsKey(swaggerType)) {
+            type = typeMapping.get(swaggerType);
+            if (languageSpecificPrimitives.contains(type)) {
+                return type;
+            }
+        } else {
+            type = swaggerType;
+        }
+        return type;
+    }
+
+    public String toDefaultValue(Property p) {
+        // TODO: Support Python def value
+        return "null";
+    }
+
+    @Override
+    public String toVarName(String name) {
+        // replace - with _ e.g. created-at => created_at
+        name = name.replaceAll("-", "_");
+
+        // if it's all uppper case, convert to lower case
+        if (name.matches("^[A-Z_]*$")) {
+            name = name.toLowerCase();
+        }
+
+        // camelize (lower first character) the variable name
+        // petId => pet_id
+        name = underscore(name);
+
+        // for reserved word or word starting with number, append _
+        if (reservedWords.contains(name) || name.matches("^\\d.*")) {
+            name = escapeReservedWord(name);
+        }
+
+        return name;
+    }
+
+    @Override
+    public String toParamName(String name) {
+        // should be the same as variable name
+        return toVarName(name);
+    }
+
+    @Override
+    public String toModelName(String name) {
+        // model name cannot use reserved keyword, e.g. return
+        if (reservedWords.contains(name)) {
+            throw new RuntimeException(name + " (reserved word) cannot be used as a model name");
+        }
+
+        // camelize the model name
+        // phone_number => PhoneNumber
+        return camelize(name);
+    }
+
+    @Override
+    public String toModelFilename(String name) {
+        // model name cannot use reserved keyword, e.g. return
+        if (reservedWords.contains(name)) {
+            throw new RuntimeException(name + " (reserved word) cannot be used as a model name");
+        }
+
+        // underscore the model file name
+        // PhoneNumber.rb => phone_number.rb
+        return underscore(name);
+    }
+
+    @Override
+    public String toApiFilename(String name) {
+        // replace - with _ e.g. created-at => created_at
+        name = name.replaceAll("-", "_");
+
+        // e.g. PhoneNumberApi.rb => phone_number_api.rb
+        return underscore(name) + "_api";
+    }
+
+    @Override
+    public String toApiName(String name) {
+        if (name.length() == 0) {
+            return "DefaultApi";
+        }
+        // e.g. phone_number_api => PhoneNumberApi
+        return camelize(name) + "Api";
+    }
+
+    @Override
+    public String toApiVarName(String name) {
+        if (name.length() == 0) {
+            return "default_api";
+        }
+        return underscore(name) + "_api";
+    }
+
+    @Override
+    public String toOperationId(String operationId) {
+        // method name cannot use reserved keyword, e.g. return
+        if (reservedWords.contains(operationId)) {
+            throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
+        }
+
+        return underscore(operationId);
+    }
+
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java

@@ -0,0 +1,227 @@
+package io.swagger.codegen.languages;
+
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenType;
+import io.swagger.codegen.DefaultCodegen;
+import io.swagger.codegen.SupportingFile;
+import io.swagger.models.properties.ArrayProperty;
+import io.swagger.models.properties.MapProperty;
+import io.swagger.models.properties.Property;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.HashSet;
+
+public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig {
+    protected String module = "SwaggerPetstore";
+    protected String invokerPackage;
+    protected String eggPackage;
+
+    public PythonClientCodegen() {
+        super();
+
+        eggPackage = module + "-python";
+
+        invokerPackage = eggPackage + File.separatorChar + module;
+
+        outputFolder = "generated-code" + File.separatorChar + "python";
+        modelTemplateFiles.put("model.mustache", ".py");
+        apiTemplateFiles.put("api.mustache", ".py");
+        templateDir = "python";
+
+        apiPackage = invokerPackage + File.separatorChar + "apis";
+        modelPackage = invokerPackage + File.separatorChar + "models";
+
+        languageSpecificPrimitives.clear();
+        languageSpecificPrimitives.add("int");
+        languageSpecificPrimitives.add("float");
+        languageSpecificPrimitives.add("list");
+        languageSpecificPrimitives.add("bool");
+        languageSpecificPrimitives.add("str");
+        languageSpecificPrimitives.add("datetime");
+
+        typeMapping.clear();
+        typeMapping.put("integer", "int");
+        typeMapping.put("float", "float");
+        typeMapping.put("long", "int");
+        typeMapping.put("double", "float");
+        typeMapping.put("array", "list");
+        typeMapping.put("map", "map");
+        typeMapping.put("boolean", "bool");
+        typeMapping.put("string", "str");
+        typeMapping.put("date", "datetime");
+
+        // from https://docs.python.org/release/2.5.4/ref/keywords.html
+        reservedWords = new HashSet<String>(
+                Arrays.asList(
+                        "and", "del", "from", "not", "while", "as", "elif", "global", "or", "with",
+                        "assert", "else", "if", "pass", "yield", "break", "except", "import",
+                        "print", "class", "exec", "in", "raise", "continue", "finally", "is",
+                        "return", "def", "for", "lambda", "try"));
+
+        additionalProperties.put("module", module);
+
+        supportingFiles.add(new SupportingFile("README.mustache", eggPackage, "README.md"));
+        supportingFiles.add(new SupportingFile("setup.mustache", eggPackage, "setup.py"));
+        supportingFiles.add(new SupportingFile("api_client.mustache", invokerPackage, "api_client.py"));
+        supportingFiles.add(new SupportingFile("rest.mustache", invokerPackage, "rest.py"));
+        supportingFiles.add(new SupportingFile("configuration.mustache", invokerPackage, "configuration.py"));
+        supportingFiles.add(new SupportingFile("__init__package.mustache", invokerPackage, "__init__.py"));
+        supportingFiles.add(new SupportingFile("__init__model.mustache", modelPackage, "__init__.py"));
+        supportingFiles.add(new SupportingFile("__init__api.mustache", apiPackage, "__init__.py"));
+    }
+
+    private static String dropDots(String str) {
+        return str.replaceAll("\\.", "_");
+    }
+
+    public CodegenType getTag() {
+        return CodegenType.CLIENT;
+    }
+
+    public String getName() {
+        return "python";
+    }
+
+    public String getHelp() {
+        return "Generates a Python client library.";
+    }
+
+    @Override
+    public String escapeReservedWord(String name) {
+        return "_" + name;
+    }
+
+    @Override
+    public String apiFileFolder() {
+        return outputFolder + File.separatorChar + apiPackage().replace('.', File.separatorChar);
+    }
+
+    public String modelFileFolder() {
+        return outputFolder + File.separatorChar + modelPackage().replace('.', File.separatorChar);
+    }
+
+    @Override
+    public String getTypeDeclaration(Property p) {
+        if (p instanceof ArrayProperty) {
+            ArrayProperty ap = (ArrayProperty) p;
+            Property inner = ap.getItems();
+            return getSwaggerType(p) + "[" + getTypeDeclaration(inner) + "]";
+        } else if (p instanceof MapProperty) {
+            MapProperty mp = (MapProperty) p;
+            Property inner = mp.getAdditionalProperties();
+
+            return getSwaggerType(p) + "(String, " + getTypeDeclaration(inner) + ")";
+        }
+        return super.getTypeDeclaration(p);
+    }
+
+    @Override
+    public String getSwaggerType(Property p) {
+        String swaggerType = super.getSwaggerType(p);
+        String type = null;
+        if (typeMapping.containsKey(swaggerType)) {
+            type = typeMapping.get(swaggerType);
+            if (languageSpecificPrimitives.contains(type)) {
+                return type;
+            }
+        } else {
+            type = toModelName(swaggerType);
+        }
+        return type;
+    }
+
+    public String toDefaultValue(Property p) {
+        // TODO: Support Python def value
+        return "null";
+    }
+
+    @Override
+    public String toVarName(String name) {
+        // replace - with _ e.g. created-at => created_at
+        name = name.replaceAll("-", "_");
+
+        // if it's all uppper case, convert to lower case
+        if (name.matches("^[A-Z_]*$")) {
+            name = name.toLowerCase();
+        }
+
+        // underscore the variable name
+        // petId => pet_id
+        name = underscore(dropDots(name));
+
+        // for reserved word or word starting with number, append _
+        if (reservedWords.contains(name) || name.matches("^\\d.*")) {
+            name = escapeReservedWord(name);
+        }
+
+        return name;
+    }
+
+    @Override
+    public String toParamName(String name) {
+        // should be the same as variable name
+        return toVarName(name);
+    }
+
+    @Override
+    public String toModelName(String name) {
+        // model name cannot use reserved keyword, e.g. return
+        if (reservedWords.contains(name)) {
+            throw new RuntimeException(name + " (reserved word) cannot be used as a model name");
+        }
+
+        // camelize the model name
+        // phone_number => PhoneNumber
+        return camelize(name);
+    }
+
+    @Override
+    public String toModelFilename(String name) {
+        // model name cannot use reserved keyword, e.g. return
+        if (reservedWords.contains(name)) {
+            throw new RuntimeException(name + " (reserved word) cannot be used as a model name");
+        }
+
+        // underscore the model file name
+        // PhoneNumber => phone_number
+        return underscore(dropDots(name));
+    }
+
+    @Override
+    public String toApiFilename(String name) {
+        // replace - with _ e.g. created-at => created_at
+        name = name.replaceAll("-", "_");
+
+        // e.g. PhoneNumberApi.rb => phone_number_api.rb
+        return underscore(name) + "_api";
+    }
+
+    @Override
+    public String toApiName(String name) {
+        if (name.length() == 0) {
+            return "DefaultApi";
+        }
+        // e.g. phone_number_api => PhoneNumberApi
+        return camelize(name) + "Api";
+    }
+
+    @Override
+    public String toApiVarName(String name) {
+        if (name.length() == 0) {
+            return "default_api";
+        }
+        return underscore(name) + "_api";
+    }
+
+    @Override
+    public String toOperationId(String operationId) {
+        // method name cannot use reserved keyword, e.g. return
+        if (reservedWords.contains(operationId)) {
+            throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
+        }
+
+        return underscore(operationId);
+    }
+
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/Qt5CPPGenerator.java

@@ -0,0 +1,324 @@
+package io.swagger.codegen.languages;
+
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenType;
+import io.swagger.codegen.DefaultCodegen;
+import io.swagger.codegen.SupportingFile;
+import io.swagger.models.properties.ArrayProperty;
+import io.swagger.models.properties.BooleanProperty;
+import io.swagger.models.properties.DateProperty;
+import io.swagger.models.properties.DateTimeProperty;
+import io.swagger.models.properties.DecimalProperty;
+import io.swagger.models.properties.DoubleProperty;
+import io.swagger.models.properties.FloatProperty;
+import io.swagger.models.properties.IntegerProperty;
+import io.swagger.models.properties.LongProperty;
+import io.swagger.models.properties.MapProperty;
+import io.swagger.models.properties.Property;
+import io.swagger.models.properties.RefProperty;
+import io.swagger.models.properties.StringProperty;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+public class Qt5CPPGenerator extends DefaultCodegen implements CodegenConfig {
+    protected final String PREFIX = "SWG";
+    protected Set<String> foundationClasses = new HashSet<String>();
+    // source folder where to write the files
+    protected String sourceFolder = "client";
+    protected String apiVersion = "1.0.0";
+    protected Map<String, String> namespaces = new HashMap<String, String>();
+    protected Set<String> systemIncludes = new HashSet<String>();
+
+    public Qt5CPPGenerator() {
+        super();
+
+        // set the output folder here
+        outputFolder = "generated-code/qt5cpp";
+
+        /**
+         * Models.  You can write model files using the modelTemplateFiles map.
+         * if you want to create one template for file, you can do so here.
+         * for multiple files for model, just put another entry in the `modelTemplateFiles` with
+         * a different extension
+         */
+        modelTemplateFiles.put(
+                "model-header.mustache",
+                ".h");
+
+        modelTemplateFiles.put(
+                "model-body.mustache",
+                ".cpp");
+
+        /**
+         * Api classes.  You can write classes for each Api file with the apiTemplateFiles map.
+         * as with models, add multiple entries with different extensions for multiple files per
+         * class
+         */
+        apiTemplateFiles.put(
+                "api-header.mustache",   // the template to use
+                ".h");       // the extension for each file to write
+
+        apiTemplateFiles.put(
+                "api-body.mustache",   // the template to use
+                ".cpp");       // the extension for each file to write
+
+        /**
+         * Template Location.  This is the location which templates will be read from.  The generator
+         * will use the resource stream to attempt to read the templates.
+         */
+        templateDir = "qt5cpp";
+
+        /**
+         * Reserved words.  Override this with reserved words specific to your language
+         */
+        reservedWords = new HashSet<String>(
+                Arrays.asList(
+                        "sample1",  // replace with static values
+                        "sample2")
+        );
+
+        /**
+         * Additional Properties.  These values can be passed to the templates and
+         * are available in models, apis, and supporting files
+         */
+        additionalProperties.put("apiVersion", apiVersion);
+        additionalProperties().put("prefix", PREFIX);
+
+        /**
+         * Language Specific Primitives.  These types will not trigger imports by
+         * the client generator
+         */
+        languageSpecificPrimitives = new HashSet<String>(
+                Arrays.asList(
+                        "bool",
+                        "qint32",
+                        "qint64")
+        );
+
+        supportingFiles.add(new SupportingFile("helpers-header.mustache", sourceFolder, PREFIX + "Helpers.h"));
+        supportingFiles.add(new SupportingFile("helpers-body.mustache", sourceFolder, PREFIX + "Helpers.cpp"));
+        supportingFiles.add(new SupportingFile("HttpRequest.h", sourceFolder, PREFIX + "HttpRequest.h"));
+        supportingFiles.add(new SupportingFile("HttpRequest.cpp", sourceFolder, PREFIX + "HttpRequest.cpp"));
+        supportingFiles.add(new SupportingFile("modelFactory.mustache", sourceFolder, PREFIX + "ModelFactory.h"));
+        supportingFiles.add(new SupportingFile("object.mustache", sourceFolder, PREFIX + "Object.h"));
+
+        super.typeMapping = new HashMap<String, String>();
+
+        typeMapping.put("Date", "QDate");
+        typeMapping.put("DateTime", "QDateTime");
+        typeMapping.put("string", "QString");
+        typeMapping.put("integer", "qint32");
+        typeMapping.put("long", "qint64");
+        typeMapping.put("boolean", "bool");
+        typeMapping.put("array", "QList");
+        typeMapping.put("map", "QMap");
+        typeMapping.put("file", "SWGHttpRequestInputFileElement");
+        typeMapping.put("object", PREFIX + "Object");
+
+        importMapping = new HashMap<String, String>();
+
+        importMapping.put("SWGHttpRequestInputFileElement", "#include \"" + PREFIX + "HttpRequest.h\"");
+
+        namespaces = new HashMap<String, String>();
+
+        foundationClasses.add("QString");
+
+        systemIncludes.add("QString");
+        systemIncludes.add("QList");
+    }
+
+    /**
+     * Configures the type of generator.
+     *
+     * @return the CodegenType for this generator
+     * @see io.swagger.codegen.CodegenType
+     */
+    public CodegenType getTag() {
+        return CodegenType.CLIENT;
+    }
+
+    /**
+     * Configures a friendly name for the generator.  This will be used by the generator
+     * to select the library with the -l flag.
+     *
+     * @return the friendly name for the generator
+     */
+    public String getName() {
+        return "qt5cpp";
+    }
+
+    /**
+     * Returns human-friendly help for the generator.  Provide the consumer with help
+     * tips, parameters here
+     *
+     * @return A string value for the help message
+     */
+    public String getHelp() {
+        return "Generates a qt5 C++ client library.";
+    }
+
+    @Override
+    public String toModelImport(String name) {
+        if (namespaces.containsKey(name)) {
+            return "using " + namespaces.get(name) + ";";
+        } else if (systemIncludes.contains(name)) {
+            return "#include <" + name + ">";
+        }
+        return "#include \"" + name + ".h\"";
+    }
+
+    /**
+     * Escapes a reserved word as defined in the `reservedWords` array. Handle escaping
+     * those terms here.  This logic is only called if a variable matches the reseved words
+     *
+     * @return the escaped term
+     */
+    @Override
+    public String escapeReservedWord(String name) {
+        return "_" + name;  // add an underscore to the name
+    }
+
+    /**
+     * Location to write model files.  You can use the modelPackage() as defined when the class is
+     * instantiated
+     */
+    public String modelFileFolder() {
+        return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
+    }
+
+    /**
+     * Location to write api files.  You can use the apiPackage() as defined when the class is
+     * instantiated
+     */
+    @Override
+    public String apiFileFolder() {
+        return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
+    }
+
+    @Override
+    public String toModelFilename(String name) {
+        return PREFIX + initialCaps(name);
+    }
+
+    @Override
+    public String toApiFilename(String name) {
+        return PREFIX + initialCaps(name) + "Api";
+    }
+
+    /**
+     * Optional - type declaration.  This is a String which is used by the templates to instantiate your
+     * types.  There is typically special handling for different property types
+     *
+     * @return a string value used as the `dataType` field for model templates, `returnType` for api templates
+     */
+    @Override
+    public String getTypeDeclaration(Property p) {
+        String swaggerType = getSwaggerType(p);
+
+        if (p instanceof ArrayProperty) {
+            ArrayProperty ap = (ArrayProperty) p;
+            Property inner = ap.getItems();
+            return getSwaggerType(p) + "<" + getTypeDeclaration(inner) + ">*";
+        } else if (p instanceof MapProperty) {
+            MapProperty mp = (MapProperty) p;
+            Property inner = mp.getAdditionalProperties();
+            return getSwaggerType(p) + "<QString, " + getTypeDeclaration(inner) + ">*";
+        }
+        if (foundationClasses.contains(swaggerType)) {
+            return swaggerType + "*";
+        } else if (languageSpecificPrimitives.contains(swaggerType)) {
+            return toModelName(swaggerType);
+        } else {
+            return swaggerType + "*";
+        }
+    }
+
+    @Override
+    public String toDefaultValue(Property p) {
+        if (p instanceof StringProperty) {
+            return "new QString(\"\")";
+        } else if (p instanceof BooleanProperty) {
+            return "false";
+        } else if (p instanceof DateProperty) {
+            return "NULL";
+        } else if (p instanceof DateTimeProperty) {
+            return "NULL";
+        } else if (p instanceof DoubleProperty) {
+            return "0.0";
+        } else if (p instanceof FloatProperty) {
+            return "0.0f";
+        } else if (p instanceof IntegerProperty) {
+            return "0";
+        } else if (p instanceof LongProperty) {
+            return "0L";
+        } else if (p instanceof DecimalProperty) {
+            return "0.0";
+        } else if (p instanceof MapProperty) {
+            MapProperty ap = (MapProperty) p;
+            String inner = getSwaggerType(ap.getAdditionalProperties());
+            return "new QMap<QString, " + inner + ">()";
+        } else if (p instanceof ArrayProperty) {
+            ArrayProperty ap = (ArrayProperty) p;
+            String inner = getSwaggerType(ap.getItems());
+            if (!languageSpecificPrimitives.contains(inner)) {
+                inner += "*";
+            }
+            return "new QList<" + inner + ">()";
+        }
+        // else
+        if (p instanceof RefProperty) {
+            RefProperty rp = (RefProperty) p;
+            return "new " + toModelName(rp.getSimpleRef()) + "()";
+        }
+        return "NULL";
+    }
+
+
+    /**
+     * Optional - swagger type conversion.  This is used to map swagger types in a `Property` into
+     * either language specific types via `typeMapping` or into complex models if there is not a mapping.
+     *
+     * @return a string value of the type or complex model for this property
+     * @see io.swagger.models.properties.Property
+     */
+    @Override
+    public String getSwaggerType(Property p) {
+        String swaggerType = super.getSwaggerType(p);
+        String type = null;
+        if (typeMapping.containsKey(swaggerType)) {
+            type = typeMapping.get(swaggerType);
+            if (languageSpecificPrimitives.contains(type)) {
+                return toModelName(type);
+            }
+            if (foundationClasses.contains(type)) {
+                return type;
+            }
+        } else {
+            type = swaggerType;
+        }
+        return toModelName(type);
+    }
+
+    @Override
+    public String toModelName(String type) {
+        if (typeMapping.keySet().contains(type) ||
+                typeMapping.values().contains(type) ||
+                importMapping.values().contains(type) ||
+                defaultIncludes.contains(type) ||
+                languageSpecificPrimitives.contains(type)) {
+            return type;
+        } else {
+            return PREFIX + Character.toUpperCase(type.charAt(0)) + type.substring(1);
+        }
+    }
+
+    @Override
+    public String toApiName(String type) {
+        return PREFIX + Character.toUpperCase(type.charAt(0)) + type.substring(1) + "Api";
+    }
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RetrofitClientCodegen.java

@@ -0,0 +1,202 @@
+package io.swagger.codegen.languages;
+
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenOperation;
+import io.swagger.codegen.CodegenType;
+import io.swagger.codegen.DefaultCodegen;
+import io.swagger.codegen.SupportingFile;
+import io.swagger.models.properties.ArrayProperty;
+import io.swagger.models.properties.MapProperty;
+import io.swagger.models.properties.Property;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+
+public class RetrofitClientCodegen extends DefaultCodegen implements CodegenConfig {
+    protected String invokerPackage = "io.swagger.client";
+    protected String groupId = "io.swagger";
+    protected String artifactId = "swagger-java-client";
+    protected String artifactVersion = "1.0.0";
+    protected String sourceFolder = "src/main/java";
+
+    public RetrofitClientCodegen() {
+        super();
+        outputFolder = "generated-code/java";
+        modelTemplateFiles.put("model.mustache", ".java");
+        apiTemplateFiles.put("api.mustache", ".java");
+        templateDir = "retrofit";
+        apiPackage = "io.swagger.client.api";
+        modelPackage = "io.swagger.client.model";
+
+        reservedWords = new HashSet<String>(
+                Arrays.asList(
+                        "abstract", "continue", "for", "new", "switch", "assert",
+                        "default", "if", "package", "synchronized", "boolean", "do", "goto", "private",
+                        "this", "break", "double", "implements", "protected", "throw", "byte", "else",
+                        "import", "public", "throws", "case", "enum", "instanceof", "return", "transient",
+                        "catch", "extends", "int", "short", "try", "char", "final", "interface", "static",
+                        "void", "class", "finally", "long", "strictfp", "volatile", "const", "float",
+                        "native", "super", "while")
+        );
+
+        additionalProperties.put("invokerPackage", invokerPackage);
+        additionalProperties.put("groupId", groupId);
+        additionalProperties.put("artifactId", artifactId);
+        additionalProperties.put("artifactVersion", artifactVersion);
+
+        supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
+        supportingFiles.add(new SupportingFile("service.mustache",
+                (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ServiceGenerator.java"));
+
+        languageSpecificPrimitives = new HashSet<String>(
+                Arrays.asList(
+                        "String",
+                        "boolean",
+                        "Boolean",
+                        "Double",
+                        "Integer",
+                        "Long",
+                        "Float",
+                        "Object")
+        );
+        instantiationTypes.put("array", "ArrayList");
+        instantiationTypes.put("map", "HashMap");
+    }
+
+    public CodegenType getTag() {
+        return CodegenType.CLIENT;
+    }
+
+    public String getName() {
+        return "retrofit";
+    }
+
+    public String getHelp() {
+        return "Generates a Retrofit client library.";
+    }
+
+    @Override
+    public String escapeReservedWord(String name) {
+        return "_" + name;
+    }
+
+    @Override
+    public String apiFileFolder() {
+        return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
+    }
+
+    public String modelFileFolder() {
+        return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
+    }
+
+    @Override
+    public String toVarName(String name) {
+        // replace - with _ e.g. created-at => created_at
+        name = name.replaceAll("-", "_");
+
+        // if it's all uppper case, do nothing
+        if (name.matches("^[A-Z_]*$")) {
+            return name;
+        }
+
+        // camelize (lower first character) the variable name
+        // pet_id => petId
+        name = camelize(name, true);
+
+        // for reserved word or word starting with number, append _
+        if (reservedWords.contains(name) || name.matches("^\\d.*")) {
+            name = escapeReservedWord(name);
+        }
+
+        return name;
+    }
+
+    @Override
+    public String toParamName(String name) {
+        // should be the same as variable name
+        return toVarName(name);
+    }
+
+    @Override
+    public String toModelName(String name) {
+        // model name cannot use reserved keyword, e.g. return
+        if (reservedWords.contains(name)) {
+            throw new RuntimeException(name + " (reserved word) cannot be used as a model name");
+        }
+
+        // camelize the model name
+        // phone_number => PhoneNumber
+        return camelize(name);
+    }
+
+    @Override
+    public String toModelFilename(String name) {
+        // should be the same as the model name
+        return toModelName(name);
+    }
+
+
+    @Override
+    public String getTypeDeclaration(Property p) {
+        if (p instanceof ArrayProperty) {
+            ArrayProperty ap = (ArrayProperty) p;
+            Property inner = ap.getItems();
+            return getSwaggerType(p) + "<" + getTypeDeclaration(inner) + ">";
+        } else if (p instanceof MapProperty) {
+            MapProperty mp = (MapProperty) p;
+            Property inner = mp.getAdditionalProperties();
+
+            return getSwaggerType(p) + "<String, " + getTypeDeclaration(inner) + ">";
+        }
+        return super.getTypeDeclaration(p);
+    }
+
+    @Override
+    public String getSwaggerType(Property p) {
+        String swaggerType = super.getSwaggerType(p);
+        String type = null;
+        if (typeMapping.containsKey(swaggerType)) {
+            type = typeMapping.get(swaggerType);
+            if (languageSpecificPrimitives.contains(type)) {
+                return toModelName(type);
+            }
+        } else {
+            type = swaggerType;
+        }
+        return toModelName(type);
+    }
+
+    @Override
+    public String toOperationId(String operationId) {
+        // method name cannot use reserved keyword, e.g. return
+        if (reservedWords.contains(operationId)) {
+            throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
+        }
+
+        return camelize(operationId, true);
+    }
+
+    public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
+        Map<String, Object> operations = (Map<String, Object>) objs.get("operations");
+        if (operations != null) {
+            List<CodegenOperation> ops = (List<CodegenOperation>) operations.get("operation");
+            for (CodegenOperation operation : ops) {
+                if (operation.hasConsumes == Boolean.TRUE) {
+                    Map<String, String> firstType = operation.consumes.get(0);
+                    if (firstType != null) {
+                        if ("multipart/form-data".equals(firstType.get("mediaType"))) {
+                            operation.isMultipart = Boolean.TRUE;
+                        }
+                    }
+                }
+                if (operation.returnType == null) {
+                    operation.returnType = "Void";
+                }
+            }
+        }
+        return objs;
+    }
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RubyClientCodegen.java

@@ -0,0 +1,231 @@
+package io.swagger.codegen.languages;
+
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenType;
+import io.swagger.codegen.DefaultCodegen;
+import io.swagger.codegen.SupportingFile;
+import io.swagger.models.properties.ArrayProperty;
+import io.swagger.models.properties.MapProperty;
+import io.swagger.models.properties.Property;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.HashSet;
+
+public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig {
+    protected String gemName = "swagger_client";
+    protected String moduleName = null;
+    protected String libFolder = "lib";
+
+    public RubyClientCodegen() {
+        super();
+        moduleName = generateModuleName();
+        modelPackage = gemName + "/models";
+        apiPackage = gemName + "/api";
+        outputFolder = "generated-code" + File.separatorChar + "ruby";
+        modelTemplateFiles.put("model.mustache", ".rb");
+        apiTemplateFiles.put("api.mustache", ".rb");
+        templateDir = "ruby";
+
+        typeMapping.clear();
+        languageSpecificPrimitives.clear();
+
+        reservedWords = new HashSet<String>(
+                Arrays.asList(
+                        "__FILE__", "and", "def", "end", "in", "or", "self", "unless", "__LINE__",
+                        "begin", "defined?", "ensure", "module", "redo", "super", "until", "BEGIN",
+                        "break", "do", "false", "next", "rescue", "then", "when", "END", "case",
+                        "else", "for", "nil", "retry", "true", "while", "alias", "class", "elsif",
+                        "if", "not", "return", "undef", "yield")
+        );
+
+        additionalProperties.put("gemName", gemName);
+        additionalProperties.put("moduleName", moduleName);
+
+        languageSpecificPrimitives.add("int");
+        languageSpecificPrimitives.add("array");
+        languageSpecificPrimitives.add("map");
+        languageSpecificPrimitives.add("string");
+        languageSpecificPrimitives.add("DateTime");
+
+        typeMapping.put("long", "int");
+        typeMapping.put("integer", "int");
+        typeMapping.put("Array", "array");
+        typeMapping.put("String", "string");
+        typeMapping.put("List", "array");
+        typeMapping.put("map", "map");
+
+        String baseFolder = "lib" + File.separatorChar + gemName;
+        String swaggerFolder = baseFolder + File.separatorChar + "swagger";
+        String modelFolder = baseFolder + File.separatorChar + "models";
+        supportingFiles.add(new SupportingFile("swagger_client.gemspec.mustache", "", gemName + ".gemspec"));
+        supportingFiles.add(new SupportingFile("swagger_client.mustache", "lib", gemName + ".rb"));
+        supportingFiles.add(new SupportingFile("monkey.mustache", baseFolder, "monkey.rb"));
+        supportingFiles.add(new SupportingFile("swagger.mustache", baseFolder, "swagger.rb"));
+        supportingFiles.add(new SupportingFile("swagger" + File.separatorChar + "request.mustache", swaggerFolder, "request.rb"));
+        supportingFiles.add(new SupportingFile("swagger" + File.separatorChar + "response.mustache", swaggerFolder, "response.rb"));
+        supportingFiles.add(new SupportingFile("swagger" + File.separatorChar + "version.mustache", swaggerFolder, "version.rb"));
+        supportingFiles.add(new SupportingFile("swagger" + File.separatorChar + "configuration.mustache", swaggerFolder, "configuration.rb"));
+        supportingFiles.add(new SupportingFile("base_object.mustache", modelFolder, "base_object.rb"));
+    }
+
+    public CodegenType getTag() {
+        return CodegenType.CLIENT;
+    }
+
+    public String getName() {
+        return "ruby";
+    }
+
+    public String getHelp() {
+        return "Generates a Ruby client library.";
+    }
+
+    /**
+     * Generate Ruby module name from the gem name, e.g. use "SwaggerClient" for "swagger_client".
+     */
+    public String generateModuleName() {
+        return camelize(gemName.replaceAll("[^\\w]+", "_"));
+    }
+
+    @Override
+    public String escapeReservedWord(String name) {
+        return "_" + name;
+    }
+
+    @Override
+    public String apiFileFolder() {
+        return outputFolder + File.separatorChar + "lib" + File.separatorChar + gemName + File.separatorChar + "api";
+    }
+
+    public String modelFileFolder() {
+        return outputFolder + File.separatorChar + "lib" + File.separatorChar + gemName + File.separatorChar + "models";
+    }
+
+    @Override
+    public String getTypeDeclaration(Property p) {
+        if (p instanceof ArrayProperty) {
+            ArrayProperty ap = (ArrayProperty) p;
+            Property inner = ap.getItems();
+            return getSwaggerType(p) + "[" + getTypeDeclaration(inner) + "]";
+        } else if (p instanceof MapProperty) {
+            MapProperty mp = (MapProperty) p;
+            Property inner = mp.getAdditionalProperties();
+            return getSwaggerType(p) + "[string," + getTypeDeclaration(inner) + "]";
+        }
+        return super.getTypeDeclaration(p);
+    }
+
+    @Override
+    public String getSwaggerType(Property p) {
+        String swaggerType = super.getSwaggerType(p);
+        String type = null;
+        if (typeMapping.containsKey(swaggerType)) {
+            type = typeMapping.get(swaggerType);
+            if (languageSpecificPrimitives.contains(type)) {
+                return type;
+            }
+        } else {
+            type = swaggerType;
+        }
+        if (type == null) {
+            return null;
+        }
+        return type;
+    }
+
+    public String toDefaultValue(Property p) {
+        return "null";
+    }
+
+    @Override
+    public String toVarName(String name) {
+        // replace - with _ e.g. created-at => created_at
+        name = name.replaceAll("-", "_");
+
+        // if it's all uppper case, convert to lower case
+        if (name.matches("^[A-Z_]*$")) {
+            name = name.toLowerCase();
+        }
+
+        // camelize (lower first character) the variable name
+        // petId => pet_id
+        name = underscore(name);
+
+        // for reserved word or word starting with number, append _
+        if (reservedWords.contains(name) || name.matches("^\\d.*")) {
+            name = escapeReservedWord(name);
+        }
+
+        return name;
+    }
+
+    @Override
+    public String toParamName(String name) {
+        // should be the same as variable name
+        return toVarName(name);
+    }
+
+    @Override
+    public String toModelName(String name) {
+        // model name cannot use reserved keyword, e.g. return
+        if (reservedWords.contains(name)) {
+            throw new RuntimeException(name + " (reserved word) cannot be used as a model name");
+        }
+
+        // camelize the model name
+        // phone_number => PhoneNumber
+        return camelize(name);
+    }
+
+    @Override
+    public String toModelFilename(String name) {
+        // model name cannot use reserved keyword, e.g. return
+        if (reservedWords.contains(name)) {
+            throw new RuntimeException(name + " (reserved word) cannot be used as a model name");
+        }
+
+        // underscore the model file name
+        // PhoneNumber.rb => phone_number.rb
+        return underscore(name);
+    }
+
+    @Override
+    public String toApiFilename(String name) {
+        // replace - with _ e.g. created-at => created_at
+        name = name.replaceAll("-", "_");
+
+        // e.g. PhoneNumberApi.rb => phone_number_api.rb
+        return underscore(name) + "_api";
+    }
+
+    @Override
+    public String toApiName(String name) {
+        if (name.length() == 0) {
+            return "DefaultApi";
+        }
+        // e.g. phone_number_api => PhoneNumberApi
+        return camelize(name) + "Api";
+    }
+
+    @Override
+    public String toOperationId(String operationId) {
+        // method name cannot use reserved keyword, e.g. return
+        if (reservedWords.contains(operationId)) {
+            throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
+        }
+
+        return underscore(operationId);
+    }
+
+    @Override
+    public String toModelImport(String name) {
+        return modelPackage() + "/" + toModelFilename(name);
+    }
+
+    @Override
+    public String toApiImport(String name) {
+        return apiPackage() + "/" + toApiFilename(name);
+    }
+
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalaClientCodegen.java

@@ -0,0 +1,217 @@
+package io.swagger.codegen.languages;
+
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenType;
+import io.swagger.codegen.DefaultCodegen;
+import io.swagger.codegen.SupportingFile;
+import io.swagger.models.properties.ArrayProperty;
+import io.swagger.models.properties.BooleanProperty;
+import io.swagger.models.properties.DateProperty;
+import io.swagger.models.properties.DateTimeProperty;
+import io.swagger.models.properties.DoubleProperty;
+import io.swagger.models.properties.FloatProperty;
+import io.swagger.models.properties.IntegerProperty;
+import io.swagger.models.properties.LongProperty;
+import io.swagger.models.properties.MapProperty;
+import io.swagger.models.properties.Property;
+import io.swagger.models.properties.StringProperty;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+
+public class ScalaClientCodegen extends DefaultCodegen implements CodegenConfig {
+    protected String invokerPackage = "io.swagger.client";
+    protected String groupId = "io.swagger";
+    protected String artifactId = "swagger-scala-client";
+    protected String artifactVersion = "1.0.0";
+    protected String sourceFolder = "src/main/scala";
+    protected String authScheme = "";
+    protected boolean authPreemptive = false;
+    protected boolean asyncHttpClient = !authScheme.isEmpty();
+
+    public ScalaClientCodegen() {
+        super();
+        outputFolder = "generated-code/scala";
+        modelTemplateFiles.put("model.mustache", ".scala");
+        apiTemplateFiles.put("api.mustache", ".scala");
+        templateDir = "scala";
+        apiPackage = "io.swagger.client.api";
+        modelPackage = "io.swagger.client.model";
+
+        reservedWords = new HashSet<String>(
+                Arrays.asList(
+                        "abstract", "case", "catch", "class", "def", "do", "else", "extends",
+                        "false", "final", "finally", "for", "forSome", "if", "implicit",
+                        "import", "lazy", "match", "new", "null", "object", "override", "package",
+                        "private", "protected", "return", "sealed", "super", "this", "throw",
+                        "trait", "try", "true", "type", "val", "var", "while", "with", "yield")
+        );
+
+        additionalProperties.put("invokerPackage", invokerPackage);
+        additionalProperties.put("groupId", groupId);
+        additionalProperties.put("artifactId", artifactId);
+        additionalProperties.put("artifactVersion", artifactVersion);
+        additionalProperties.put("asyncHttpClient", asyncHttpClient);
+        additionalProperties.put("authScheme", authScheme);
+        additionalProperties.put("authPreemptive", authPreemptive);
+
+        supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
+        supportingFiles.add(new SupportingFile("apiInvoker.mustache",
+                (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiInvoker.scala"));
+
+        importMapping.remove("List");
+        importMapping.remove("Set");
+        importMapping.remove("Map");
+
+        importMapping.put("DateTime", "org.joda.time.DateTime");
+        importMapping.put("ListBuffer", "scala.collections.mutable.ListBuffer");
+
+        typeMapping = new HashMap<String, String>();
+        typeMapping.put("enum", "NSString");
+        typeMapping.put("array", "List");
+        typeMapping.put("set", "Set");
+        typeMapping.put("boolean", "Boolean");
+        typeMapping.put("string", "String");
+        typeMapping.put("int", "Int");
+        typeMapping.put("long", "Long");
+        typeMapping.put("float", "Float");
+        typeMapping.put("byte", "Byte");
+        typeMapping.put("short", "Short");
+        typeMapping.put("char", "Char");
+        typeMapping.put("long", "Long");
+        typeMapping.put("double", "Double");
+        typeMapping.put("object", "Any");
+        typeMapping.put("file", "File");
+
+        languageSpecificPrimitives = new HashSet<String>(
+                Arrays.asList(
+                        "String",
+                        "boolean",
+                        "Boolean",
+                        "Double",
+                        "Int",
+                        "Long",
+                        "Float",
+                        "Object",
+                        "List",
+                        "Map")
+        );
+        instantiationTypes.put("array", "ListBuffer");
+        instantiationTypes.put("map", "HashMap");
+    }
+
+    public CodegenType getTag() {
+        return CodegenType.CLIENT;
+    }
+
+    public String getName() {
+        return "scala";
+    }
+
+    public String getHelp() {
+        return "Generates a Scala client library.";
+    }
+
+    @Override
+    public String escapeReservedWord(String name) {
+        return "_" + name;
+    }
+
+    @Override
+    public String apiFileFolder() {
+        return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
+    }
+
+    public String modelFileFolder() {
+        return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
+    }
+
+    @Override
+    public String getTypeDeclaration(Property p) {
+        if (p instanceof ArrayProperty) {
+            ArrayProperty ap = (ArrayProperty) p;
+            Property inner = ap.getItems();
+            return getSwaggerType(p) + "[" + getTypeDeclaration(inner) + "]";
+        } else if (p instanceof MapProperty) {
+            MapProperty mp = (MapProperty) p;
+            Property inner = mp.getAdditionalProperties();
+
+            return getSwaggerType(p) + "[String, " + getTypeDeclaration(inner) + "]";
+        }
+        return super.getTypeDeclaration(p);
+    }
+
+    @Override
+    public String getSwaggerType(Property p) {
+        String swaggerType = super.getSwaggerType(p);
+        String type = null;
+        if (typeMapping.containsKey(swaggerType)) {
+            type = typeMapping.get(swaggerType);
+            if (languageSpecificPrimitives.contains(type)) {
+                return toModelName(type);
+            }
+        } else {
+            type = swaggerType;
+        }
+        return toModelName(type);
+    }
+
+    @Override
+    public String toInstantiationType(Property p) {
+        if (p instanceof MapProperty) {
+            MapProperty ap = (MapProperty) p;
+            String inner = getSwaggerType(ap.getAdditionalProperties());
+            return instantiationTypes.get("map") + "[String, " + inner + "]";
+        } else if (p instanceof ArrayProperty) {
+            ArrayProperty ap = (ArrayProperty) p;
+            String inner = getSwaggerType(ap.getItems());
+            return instantiationTypes.get("array") + "[" + inner + "]";
+        } else {
+            return null;
+        }
+    }
+
+    public String toDefaultValue(Property p) {
+        if (p instanceof StringProperty) {
+            return "null";
+        } else if (p instanceof BooleanProperty) {
+            return "null";
+        } else if (p instanceof DateProperty) {
+            return "null";
+        } else if (p instanceof DateTimeProperty) {
+            return "null";
+        } else if (p instanceof DoubleProperty) {
+            return "null";
+        } else if (p instanceof FloatProperty) {
+            return "null";
+        } else if (p instanceof IntegerProperty) {
+            return "null";
+        } else if (p instanceof LongProperty) {
+            return "null";
+        } else if (p instanceof MapProperty) {
+            MapProperty ap = (MapProperty) p;
+            String inner = getSwaggerType(ap.getAdditionalProperties());
+            return "new HashMap[String, " + inner + "]() ";
+        } else if (p instanceof ArrayProperty) {
+            ArrayProperty ap = (ArrayProperty) p;
+            String inner = getSwaggerType(ap.getItems());
+            return "new ListBuffer[" + inner + "]() ";
+        } else {
+            return "null";
+        }
+    }
+
+
+    @Override
+    public String toOperationId(String operationId) {
+        // method name cannot use reserved keyword, e.g. return
+        if (reservedWords.contains(operationId)) {
+            throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
+        }
+
+        return camelize(operationId, true);
+    }
+
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalatraServerCodegen.java

@@ -0,0 +1,187 @@
+package io.swagger.codegen.languages;
+
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenOperation;
+import io.swagger.codegen.CodegenType;
+import io.swagger.codegen.DefaultCodegen;
+import io.swagger.codegen.SupportingFile;
+import io.swagger.models.properties.ArrayProperty;
+import io.swagger.models.properties.MapProperty;
+import io.swagger.models.properties.Property;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+
+public class ScalatraServerCodegen extends DefaultCodegen implements CodegenConfig {
+    protected String invokerPackage = "io.swagger.client";
+    protected String groupId = "io.swagger";
+    protected String artifactId = "swagger-client";
+    protected String artifactVersion = "1.0.0";
+    protected String sourceFolder = "src/main/scala";
+
+    public ScalatraServerCodegen() {
+        super();
+        outputFolder = "generated-code/scalatra";
+        modelTemplateFiles.put("model.mustache", ".scala");
+        apiTemplateFiles.put("api.mustache", ".scala");
+        templateDir = "scalatra";
+        apiPackage = "com.wordnik.client.api";
+        modelPackage = "com.wordnik.client.model";
+
+        reservedWords = new HashSet<String>(
+                Arrays.asList(
+                        "abstract", "continue", "for", "new", "switch", "assert",
+                        "default", "if", "package", "synchronized", "boolean", "do", "goto", "private",
+                        "this", "break", "double", "implements", "protected", "throw", "byte", "else",
+                        "import", "public", "throws", "case", "enum", "instanceof", "return", "transient",
+                        "catch", "extends", "int", "short", "try", "char", "final", "interface", "static",
+                        "void", "class", "finally", "long", "strictfp", "volatile", "const", "float",
+                        "native", "super", "while")
+        );
+
+        defaultIncludes = new HashSet<String>(
+                Arrays.asList("double",
+                        "Int",
+                        "Long",
+                        "Float",
+                        "Double",
+                        "char",
+                        "float",
+                        "String",
+                        "boolean",
+                        "Boolean",
+                        "Double",
+                        "Integer",
+                        "Long",
+                        "Float",
+                        "List",
+                        "Set",
+                        "Map")
+        );
+
+        typeMapping.put("integer", "Int");
+        typeMapping.put("long", "Long");
+
+        additionalProperties.put("appName", "Swagger Sample");
+        additionalProperties.put("appName", "Swagger Sample");
+        additionalProperties.put("appDescription", "A sample swagger server");
+        additionalProperties.put("infoUrl", "http://swagger.io");
+        additionalProperties.put("infoEmail", "apiteam@swagger.io");
+        additionalProperties.put("licenseInfo", "All rights reserved");
+        additionalProperties.put("licenseUrl", "http://apache.org/licenses/LICENSE-2.0.html");
+        additionalProperties.put("invokerPackage", invokerPackage);
+        additionalProperties.put("groupId", groupId);
+        additionalProperties.put("artifactId", artifactId);
+        additionalProperties.put("artifactVersion", artifactVersion);
+
+        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("Bootstrap.mustache", sourceFolder, "ScalatraBootstrap.scala"));
+        supportingFiles.add(new SupportingFile("ServletApp.mustache", sourceFolder, "ServletApp.scala"));
+        supportingFiles.add(new SupportingFile("project/build.properties", "project", "build.properties"));
+        supportingFiles.add(new SupportingFile("project/plugins.sbt", "project", "plugins.sbt"));
+        supportingFiles.add(new SupportingFile("sbt", "", "sbt"));
+
+        languageSpecificPrimitives = new HashSet<String>(
+                Arrays.asList(
+                        "String",
+                        "boolean",
+                        "Boolean",
+                        "Double",
+                        "Integer",
+                        "Long",
+                        "Float",
+                        "Object")
+        );
+        instantiationTypes.put("array", "ArrayList");
+        instantiationTypes.put("map", "HashMap");
+
+        importMapping = new HashMap<String, String>();
+        importMapping.put("BigDecimal", "java.math.BigDecimal");
+        importMapping.put("UUID", "java.util.UUID");
+        importMapping.put("File", "java.io.File");
+        importMapping.put("Date", "java.util.Date");
+        importMapping.put("Timestamp", "java.sql.Timestamp");
+        importMapping.put("Map", "java.util.Map");
+        importMapping.put("HashMap", "java.util.HashMap");
+        importMapping.put("Array", "java.util.List");
+        importMapping.put("ArrayList", "java.util.ArrayList");
+        importMapping.put("DateTime", "org.joda.time.DateTime");
+        importMapping.put("LocalDateTime", "org.joda.time.LocalDateTime");
+        importMapping.put("LocalDate", "org.joda.time.LocalDate");
+        importMapping.put("LocalTime", "org.joda.time.LocalTime");
+    }
+
+    public CodegenType getTag() {
+        return CodegenType.SERVER;
+    }
+
+    public String getName() {
+        return "scalatra";
+    }
+
+    public String getHelp() {
+        return "Generates a Scala server application with Scalatra.";
+    }
+
+    @Override
+    public String escapeReservedWord(String name) {
+        return "_" + name;
+    }
+
+    @Override
+    public String apiFileFolder() {
+        return outputFolder + "/" + sourceFolder + "/" + apiPackage().replace('.', File.separatorChar);
+    }
+
+    public String modelFileFolder() {
+        return outputFolder + "/" + sourceFolder + "/" + modelPackage().replace('.', File.separatorChar);
+    }
+
+    @Override
+    public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
+        Map<String, Object> operations = (Map<String, Object>) objs.get("operations");
+        List<CodegenOperation> operationList = (List<CodegenOperation>) operations.get("operation");
+        for (CodegenOperation op : operationList) {
+            op.httpMethod = op.httpMethod.toLowerCase();
+        }
+        return objs;
+    }
+
+
+    @Override
+    public String getTypeDeclaration(Property p) {
+        if (p instanceof ArrayProperty) {
+            ArrayProperty ap = (ArrayProperty) p;
+            Property inner = ap.getItems();
+            return getSwaggerType(p) + "[" + getTypeDeclaration(inner) + "]";
+        } else if (p instanceof MapProperty) {
+            MapProperty mp = (MapProperty) p;
+            Property inner = mp.getAdditionalProperties();
+
+            return getSwaggerType(p) + "[String, " + getTypeDeclaration(inner) + "]";
+        }
+        return super.getTypeDeclaration(p);
+    }
+
+    @Override
+    public String getSwaggerType(Property p) {
+        String swaggerType = super.getSwaggerType(p);
+        String type = null;
+        if (typeMapping.containsKey(swaggerType)) {
+            type = typeMapping.get(swaggerType);
+            if (languageSpecificPrimitives.contains(type)) {
+                return toModelName(type);
+            }
+        } else {
+            type = swaggerType;
+        }
+        return toModelName(type);
+    }
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringMVCServerCodegen.java

@@ -0,0 +1,178 @@
+package io.swagger.codegen.languages;
+
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenOperation;
+import io.swagger.codegen.CodegenType;
+import io.swagger.codegen.SupportingFile;
+import io.swagger.models.Operation;
+import io.swagger.models.properties.ArrayProperty;
+import io.swagger.models.properties.MapProperty;
+import io.swagger.models.properties.Property;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+
+public class SpringMVCServerCodegen extends JavaClientCodegen implements CodegenConfig {
+    protected String invokerPackage = "io.swagger.api";
+    protected String groupId = "io.swagger";
+    protected String artifactId = "swagger-spring-mvc-server";
+    protected String artifactVersion = "1.0.0";
+    protected String sourceFolder = "src/main/java";
+    protected String title = "Petstore Server";
+
+    protected String configPackage = "";
+
+    public SpringMVCServerCodegen() {
+        super.processOpts();
+        outputFolder = "generated-code/javaSpringMVC";
+        modelTemplateFiles.put("model.mustache", ".java");
+        apiTemplateFiles.put("api.mustache", ".java");
+        templateDir = "JavaSpringMVC";
+        apiPackage = "io.swagger.api";
+        modelPackage = "io.swagger.model";
+        configPackage = "io.swagger.configuration";
+
+
+        additionalProperties.put("invokerPackage", invokerPackage);
+        additionalProperties.put("groupId", groupId);
+        additionalProperties.put("artifactId", artifactId);
+        additionalProperties.put("artifactVersion", artifactVersion);
+        additionalProperties.put("title", title);
+        additionalProperties.put("apiPackage", apiPackage);
+        additionalProperties.put("configPackage", configPackage);
+
+        languageSpecificPrimitives = new HashSet<String>(
+                Arrays.asList(
+                        "String",
+                        "boolean",
+                        "Boolean",
+                        "Double",
+                        "Integer",
+                        "Long",
+                        "Float")
+        );
+    }
+
+    public CodegenType getTag() {
+        return CodegenType.SERVER;
+    }
+
+    public String getName() {
+        return "spring-mvc";
+    }
+
+    public String getHelp() {
+        return "Generates a Java Spring-MVC Server application using the SpringFox integration.";
+    }
+
+    @Override
+    public void processOpts() {
+        super.processOpts();
+
+        supportingFiles.clear();
+        supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml"));
+        supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
+        supportingFiles.add(new SupportingFile("apiException.mustache",
+                (sourceFolder + File.separator + apiPackage).replace(".", java.io.File.separator), "ApiException.java"));
+        supportingFiles.add(new SupportingFile("apiOriginFilter.mustache",
+                (sourceFolder + File.separator + apiPackage).replace(".", java.io.File.separator), "ApiOriginFilter.java"));
+        supportingFiles.add(new SupportingFile("apiResponseMessage.mustache",
+                (sourceFolder + File.separator + apiPackage).replace(".", java.io.File.separator), "ApiResponseMessage.java"));
+        supportingFiles.add(new SupportingFile("notFoundException.mustache",
+                (sourceFolder + File.separator + apiPackage).replace(".", java.io.File.separator), "NotFoundException.java"));
+
+        supportingFiles.add(new SupportingFile("swaggerConfig.mustache",
+                (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator), "SwaggerConfig.java"));
+        supportingFiles.add(new SupportingFile("webApplication.mustache",
+                (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator), "WebApplication.java"));
+        supportingFiles.add(new SupportingFile("webMvcConfiguration.mustache",
+                (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator), "WebMvcConfiguration.java"));
+        supportingFiles.add(new SupportingFile("swaggerUiConfiguration.mustache",
+                (sourceFolder + File.separator + configPackage).replace(".", java.io.File.separator), "SwaggerUiConfiguration.java"));
+        supportingFiles.add(new SupportingFile("swagger.properties",
+                ("src.main.resources").replace(".", java.io.File.separator), "swagger.properties"));
+
+    }
+
+    @Override
+    public String getTypeDeclaration(Property p) {
+        if (p instanceof ArrayProperty) {
+            ArrayProperty ap = (ArrayProperty) p;
+            Property inner = ap.getItems();
+            return getSwaggerType(p) + "<" + getTypeDeclaration(inner) + ">";
+        } else if (p instanceof MapProperty) {
+            MapProperty mp = (MapProperty) p;
+            Property inner = mp.getAdditionalProperties();
+
+            return getTypeDeclaration(inner);
+        }
+        return super.getTypeDeclaration(p);
+    }
+
+    @Override
+    public void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co, Map<String, List<CodegenOperation>> operations) {
+        String basePath = resourcePath;
+        if (basePath.startsWith("/")) {
+            basePath = basePath.substring(1);
+        }
+        int pos = basePath.indexOf("/");
+        if (pos > 0) {
+            basePath = basePath.substring(0, pos);
+        }
+
+        if (basePath == "") {
+            basePath = "default";
+        } else {
+            if (co.path.startsWith("/" + basePath)) {
+                co.path = co.path.substring(("/" + basePath).length());
+            }
+            co.subresourceOperation = !co.path.isEmpty();
+        }
+        List<CodegenOperation> opList = operations.get(basePath);
+        if (opList == null) {
+            opList = new ArrayList<CodegenOperation>();
+            operations.put(basePath, opList);
+        }
+        opList.add(co);
+        co.baseName = basePath;
+    }
+
+    public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
+        Map<String, Object> operations = (Map<String, Object>) objs.get("operations");
+        if (operations != null) {
+            List<CodegenOperation> ops = (List<CodegenOperation>) operations.get("operation");
+            for (CodegenOperation operation : ops) {
+                if (operation.returnType == null) {
+                    operation.returnType = "Void";
+                } else if (operation.returnType.startsWith("List")) {
+                    String rt = operation.returnType;
+                    int end = rt.lastIndexOf(">");
+                    if (end > 0) {
+                        operation.returnType = rt.substring("List<".length(), end);
+                        operation.returnContainer = "List";
+                    }
+                } else if (operation.returnType.startsWith("Map")) {
+                    String rt = operation.returnType;
+                    int end = rt.lastIndexOf(">");
+                    if (end > 0) {
+                        operation.returnType = rt.substring("Map<".length(), end);
+                        operation.returnContainer = "Map";
+                    }
+                } else if (operation.returnType.startsWith("Set")) {
+                    String rt = operation.returnType;
+                    int end = rt.lastIndexOf(">");
+                    if (end > 0) {
+                        operation.returnType = rt.substring("Set<".length(), end);
+                        operation.returnContainer = "Set";
+                    }
+                }
+            }
+        }
+        return objs;
+    }
+}
+

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticDocCodegen.java

@@ -0,0 +1,77 @@
+package io.swagger.codegen.languages;
+
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenType;
+import io.swagger.codegen.DefaultCodegen;
+import io.swagger.codegen.SupportingFile;
+
+import java.io.File;
+
+public class StaticDocCodegen extends DefaultCodegen implements CodegenConfig {
+    protected String invokerPackage = "io.swagger.client";
+    protected String groupId = "io.swagger";
+    protected String artifactId = "swagger-client";
+    protected String artifactVersion = "1.0.0";
+    protected String sourceFolder = "docs";
+
+    public StaticDocCodegen() {
+        super();
+        outputFolder = "docs";
+        modelTemplateFiles.put("model.mustache", ".html");
+        apiTemplateFiles.put("operation.mustache", ".html");
+        templateDir = "swagger-static";
+
+        additionalProperties.put("invokerPackage", invokerPackage);
+        additionalProperties.put("groupId", groupId);
+        additionalProperties.put("artifactId", artifactId);
+        additionalProperties.put("artifactVersion", artifactVersion);
+
+        supportingFiles.add(new SupportingFile("package.mustache", "", "package.json"));
+        supportingFiles.add(new SupportingFile("main.mustache", "", "main.js"));
+        supportingFiles.add(new SupportingFile("assets/css/bootstrap-responsive.css",
+                outputFolder + "/assets/css", "bootstrap-responsive.css"));
+        supportingFiles.add(new SupportingFile("assets/css/bootstrap.css",
+                outputFolder + "/assets/css", "bootstrap.css"));
+        supportingFiles.add(new SupportingFile("assets/css/style.css",
+                outputFolder + "/assets/css", "style.css"));
+        supportingFiles.add(new SupportingFile("assets/images/logo.png",
+                outputFolder + "/assets/images", "logo.png"));
+        supportingFiles.add(new SupportingFile("assets/js/bootstrap.js",
+                outputFolder + "/assets/js", "bootstrap.js"));
+        supportingFiles.add(new SupportingFile("assets/js/jquery-1.8.3.min.js",
+                outputFolder + "/assets/js", "jquery-1.8.3.min.js"));
+        supportingFiles.add(new SupportingFile("assets/js/main.js",
+                outputFolder + "/assets/js", "main.js"));
+        supportingFiles.add(new SupportingFile("index.mustache",
+                outputFolder, "index.html"));
+
+        instantiationTypes.put("array", "ArrayList");
+        instantiationTypes.put("map", "HashMap");
+    }
+
+    public CodegenType getTag() {
+        return CodegenType.DOCUMENTATION;
+    }
+
+    public String getName() {
+        return "dynamic-html";
+    }
+
+    public String getHelp() {
+        return "Generates a dynamic HTML site.";
+    }
+
+    @Override
+    public String escapeReservedWord(String name) {
+        return "_" + name;
+    }
+
+    @Override
+    public String apiFileFolder() {
+        return outputFolder + File.separator + sourceFolder + File.separator + "operations";
+    }
+
+    public String modelFileFolder() {
+        return outputFolder + File.separator + sourceFolder + File.separator + "models";
+    }
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticHtmlGenerator.java

@@ -0,0 +1,104 @@
+package io.swagger.codegen.languages;
+
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenOperation;
+import io.swagger.codegen.CodegenType;
+import io.swagger.codegen.DefaultCodegen;
+import io.swagger.codegen.SupportingFile;
+import io.swagger.models.Operation;
+import io.swagger.models.properties.ArrayProperty;
+import io.swagger.models.properties.MapProperty;
+import io.swagger.models.properties.Property;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+
+public class StaticHtmlGenerator extends DefaultCodegen implements CodegenConfig {
+    private static final String ALL_OPERATIONS = "";
+    protected String invokerPackage = "io.swagger.client";
+    protected String groupId = "io.swagger";
+    protected String artifactId = "swagger-client";
+    protected String artifactVersion = "1.0.0";
+    protected String sourceFolder = "src/main/scala";
+
+    public StaticHtmlGenerator() {
+        super();
+        outputFolder = "docs";
+        templateDir = "htmlDocs";
+
+        defaultIncludes = new HashSet<String>();
+
+        additionalProperties.put("appName", "Swagger Sample");
+        additionalProperties.put("appDescription", "A sample swagger server");
+        additionalProperties.put("infoUrl", "https://helloreverb.com");
+        additionalProperties.put("infoEmail", "hello@helloreverb.com");
+        additionalProperties.put("licenseInfo", "All rights reserved");
+        additionalProperties.put("licenseUrl", "http://apache.org/licenses/LICENSE-2.0.html");
+        additionalProperties.put("invokerPackage", invokerPackage);
+        additionalProperties.put("groupId", groupId);
+        additionalProperties.put("artifactId", artifactId);
+        additionalProperties.put("artifactVersion", artifactVersion);
+
+        supportingFiles.add(new SupportingFile("index.mustache", "", "index.html"));
+        reservedWords = new HashSet<String>();
+
+        languageSpecificPrimitives = new HashSet<String>();
+        importMapping = new HashMap<String, String>();
+    }
+
+    public CodegenType getTag() {
+        return CodegenType.DOCUMENTATION;
+    }
+
+    public String getName() {
+        return "html";
+    }
+
+    public String getHelp() {
+        return "Generates a static HTML file.";
+    }
+
+    @Override
+    public String getTypeDeclaration(Property p) {
+        if (p instanceof ArrayProperty) {
+            ArrayProperty ap = (ArrayProperty) p;
+            Property inner = ap.getItems();
+            return getSwaggerType(p) + "[" + getTypeDeclaration(inner) + "]";
+        } else if (p instanceof MapProperty) {
+            MapProperty mp = (MapProperty) p;
+            Property inner = mp.getAdditionalProperties();
+
+            return getSwaggerType(p) + "[String, " + getTypeDeclaration(inner) + "]";
+        }
+        return super.getTypeDeclaration(p);
+    }
+
+    @Override
+    public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
+        Map<String, Object> operations = (Map<String, Object>) objs.get("operations");
+        List<CodegenOperation> operationList = (List<CodegenOperation>) operations.get("operation");
+        for (CodegenOperation op : operationList) {
+            op.httpMethod = op.httpMethod.toLowerCase();
+        }
+        return objs;
+    }
+
+    @Override
+    public void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co, Map<String, List<CodegenOperation>> operations) {
+        List<CodegenOperation> opList = operations.get(ALL_OPERATIONS);
+        if (opList == null) {
+            opList = new ArrayList<CodegenOperation>();
+            operations.put(ALL_OPERATIONS, opList);
+        }
+        for (CodegenOperation addedOperation : opList) {
+            if (addedOperation.operationId.equals(co.operationId) && addedOperation.path.equals(co.path) && addedOperation.httpMethod.equals(co.httpMethod)) {
+                addedOperation.tags.addAll(co.tags);
+                return;
+            }
+        }
+        opList.add(co);
+    }
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerGenerator.java

@@ -0,0 +1,46 @@
+package io.swagger.codegen.languages;
+
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenType;
+import io.swagger.codegen.DefaultCodegen;
+import io.swagger.codegen.SupportingFile;
+import io.swagger.models.Swagger;
+import io.swagger.util.Json;
+import org.apache.commons.io.FileUtils;
+
+import java.io.File;
+
+public class SwaggerGenerator extends DefaultCodegen implements CodegenConfig {
+    public SwaggerGenerator() {
+        super();
+        templateDir = "swagger";
+        outputFolder = "generated-code/swagger";
+
+        supportingFiles.add(new SupportingFile("README.md", "", "README.md"));
+    }
+
+    public CodegenType getTag() {
+        return CodegenType.DOCUMENTATION;
+    }
+
+    public String getName() {
+        return "swagger";
+    }
+
+    public String getHelp() {
+        return "Creates a static swagger.json file.";
+    }
+
+    @Override
+    public void processSwagger(Swagger swagger) {
+        String swaggerString = Json.pretty(swagger);
+
+        try {
+            String outputFile = outputFolder + File.separator + "swagger.json";
+            FileUtils.writeStringToFile(new File(outputFile), swaggerString);
+            System.out.println("wrote file to " + outputFile);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerYamlGenerator.java

@@ -0,0 +1,45 @@
+package io.swagger.codegen.languages;
+
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenType;
+import io.swagger.codegen.DefaultCodegen;
+import io.swagger.codegen.SupportingFile;
+import io.swagger.models.Swagger;
+import io.swagger.util.Yaml;
+import org.apache.commons.io.FileUtils;
+
+import java.io.File;
+
+public class SwaggerYamlGenerator extends DefaultCodegen implements CodegenConfig {
+    public SwaggerYamlGenerator() {
+        super();
+        templateDir = "swagger";
+        outputFolder = "generated-code/swagger";
+
+        supportingFiles.add(new SupportingFile("README.md", "", "README.md"));
+    }
+
+    public CodegenType getTag() {
+        return CodegenType.DOCUMENTATION;
+    }
+
+    public String getName() {
+        return "swagger-yaml";
+    }
+
+    public String getHelp() {
+        return "Creates a static swagger.yaml file.";
+    }
+
+    @Override
+    public void processSwagger(Swagger swagger) {
+        try {
+            String swaggerString = Yaml.mapper().writeValueAsString(swagger);
+            String outputFile = outputFolder + File.separator + "swagger.yaml";
+            FileUtils.writeStringToFile(new File(outputFile), swaggerString);
+            System.out.println("wrote file to " + outputFile);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwiftGenerator.java

@@ -0,0 +1,265 @@
+package io.swagger.codegen.languages;
+
+import com.google.common.base.Predicate;
+import com.google.common.collect.Iterators;
+import com.google.common.collect.Lists;
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenOperation;
+import io.swagger.codegen.CodegenProperty;
+import io.swagger.codegen.CodegenType;
+import io.swagger.codegen.DefaultCodegen;
+import io.swagger.codegen.SupportingFile;
+import io.swagger.models.Model;
+import io.swagger.models.Operation;
+import io.swagger.models.parameters.HeaderParameter;
+import io.swagger.models.parameters.Parameter;
+import io.swagger.models.properties.ArrayProperty;
+import io.swagger.models.properties.MapProperty;
+import io.swagger.models.properties.Property;
+import org.apache.commons.lang.StringUtils;
+
+import javax.annotation.Nullable;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class SwiftGenerator extends DefaultCodegen implements CodegenConfig {
+    private static final Pattern PATH_PARAM_PATTERN = Pattern.compile("\\{[a-zA-Z_]+\\}");
+    protected String sourceFolder = "Classes/Swaggers";
+
+    public SwiftGenerator() {
+        super();
+        outputFolder = "generated-code/swift";
+        modelTemplateFiles.put("model.mustache", ".swift");
+        apiTemplateFiles.put("api.mustache", ".swift");
+        templateDir = "swift";
+        apiPackage = "/APIs";
+        modelPackage = "/Models";
+
+        // Inject application name
+        String appName = System.getProperty("appName");
+        if (appName == null) {
+            appName = "SwaggerClient";
+        }
+        additionalProperties.put("projectName", appName);
+
+        // Inject base url override
+        String basePathOverride = System.getProperty("basePathOverride");
+        if (basePathOverride != null) {
+            additionalProperties.put("basePathOverride", basePathOverride);
+        }
+
+        sourceFolder = appName + "/" + sourceFolder;
+
+        supportingFiles.add(new SupportingFile("Cartfile.mustache", "", "Cartfile"));
+        supportingFiles.add(new SupportingFile("APIHelper.mustache", sourceFolder, "APIHelper.swift"));
+        supportingFiles.add(new SupportingFile("AlamofireImplementations.mustache", sourceFolder, "AlamofireImplementations.swift"));
+        supportingFiles.add(new SupportingFile("Extensions.mustache", sourceFolder, "Extensions.swift"));
+        supportingFiles.add(new SupportingFile("Models.mustache", sourceFolder, "Models.swift"));
+        supportingFiles.add(new SupportingFile("APIs.mustache", sourceFolder, "APIs.swift"));
+
+        languageSpecificPrimitives = new HashSet<String>(
+                Arrays.asList(
+                        "Int",
+                        "Float",
+                        "Double",
+                        "Bool",
+                        "Void",
+                        "String",
+                        "Character")
+        );
+        defaultIncludes = new HashSet<String>(
+                Arrays.asList(
+                        "NSDate",
+                        "Array",
+                        "Dictionary",
+                        "Set",
+                        "Any",
+                        "Empty",
+                        "AnyObject")
+        );
+        reservedWords = new HashSet<String>(
+                Arrays.asList(
+                        "class", "break", "as", "associativity", "deinit", "case", "dynamicType", "convenience", "enum", "continue",
+                        "false", "dynamic", "extension", "default", "is", "didSet", "func", "do", "nil", "final", "import", "else",
+                        "self", "get", "init", "fallthrough", "Self", "infix", "internal", "for", "super", "inout", "let", "if",
+                        "true", "lazy", "operator", "in", "COLUMN", "left", "private", "return", "FILE", "mutating", "protocol",
+                        "switch", "FUNCTION", "none", "public", "where", "LINE", "nonmutating", "static", "while", "optional",
+                        "struct", "override", "subscript", "postfix", "typealias", "precedence", "var", "prefix", "Protocol",
+                        "required", "right", "set", "Type", "unowned", "weak")
+        );
+
+        typeMapping = new HashMap<String, String>();
+        typeMapping.put("array", "Array");
+        typeMapping.put("List", "Array");
+        typeMapping.put("map", "Dictionary");
+        typeMapping.put("date", "NSDate");
+        typeMapping.put("Date", "NSDate");
+        typeMapping.put("DateTime", "NSDate");
+        typeMapping.put("boolean", "Bool");
+        typeMapping.put("string", "String");
+        typeMapping.put("char", "Character");
+        typeMapping.put("short", "Int");
+        typeMapping.put("int", "Int");
+        typeMapping.put("long", "Int");
+        typeMapping.put("integer", "Int");
+        typeMapping.put("Integer", "Int");
+        typeMapping.put("float", "Float");
+        typeMapping.put("number", "Double");
+        typeMapping.put("double", "Double");
+        typeMapping.put("object", "AnyObject");
+        typeMapping.put("file", "NSData");
+
+        importMapping = new HashMap<String, String>();
+    }
+
+    private static String normalizePath(String path) {
+        StringBuilder builder = new StringBuilder();
+
+        int cursor = 0;
+        Matcher matcher = PATH_PARAM_PATTERN.matcher(path);
+        boolean found = matcher.find();
+        while (found) {
+            String stringBeforeMatch = path.substring(cursor, matcher.start());
+            builder.append(stringBeforeMatch);
+
+            String group = matcher.group().substring(1, matcher.group().length() - 1);
+            group = camelize(group, true);
+            builder
+                    .append("{")
+                    .append(group)
+                    .append("}");
+
+            cursor = matcher.end();
+            found = matcher.find();
+        }
+
+        String stringAfterMatch = path.substring(cursor);
+        builder.append(stringAfterMatch);
+
+        return builder.toString();
+    }
+
+    public CodegenType getTag() {
+        return CodegenType.CLIENT;
+    }
+
+    public String getName() {
+        return "swift";
+    }
+
+    public String getHelp() {
+        return "Generates a swift client library.";
+    }
+
+    @Override
+    public String escapeReservedWord(String name) {
+        return "_" + name;  // add an underscore to the name
+    }
+
+    @Override
+    public String modelFileFolder() {
+        return outputFolder + "/" + sourceFolder + modelPackage().replace('.', File.separatorChar);
+    }
+
+    @Override
+    public String apiFileFolder() {
+        return outputFolder + "/" + sourceFolder + apiPackage().replace('.', File.separatorChar);
+    }
+
+    @Override
+    public String getTypeDeclaration(Property p) {
+        if (p instanceof ArrayProperty) {
+            ArrayProperty ap = (ArrayProperty) p;
+            Property inner = ap.getItems();
+            return "[" + getTypeDeclaration(inner) + "]";
+        } else if (p instanceof MapProperty) {
+            MapProperty mp = (MapProperty) p;
+            Property inner = mp.getAdditionalProperties();
+            return "[String:" + getTypeDeclaration(inner) + "]";
+        }
+        return super.getTypeDeclaration(p);
+    }
+
+    @Override
+    public String getSwaggerType(Property p) {
+        String swaggerType = super.getSwaggerType(p);
+        String type = null;
+        if (typeMapping.containsKey(swaggerType)) {
+            type = typeMapping.get(swaggerType);
+            if (languageSpecificPrimitives.contains(type)) {
+                return toModelName(type);
+            }
+        } else {
+            type = swaggerType;
+        }
+        return toModelName(type);
+    }
+
+    @Override
+    public String toDefaultValue(Property p) {
+        // nil
+        return null;
+    }
+
+    @Override
+    public String toInstantiationType(Property p) {
+        if (p instanceof MapProperty) {
+            MapProperty ap = (MapProperty) p;
+            String inner = getSwaggerType(ap.getAdditionalProperties());
+            return "[String:" + inner + "]";
+        } else if (p instanceof ArrayProperty) {
+            ArrayProperty ap = (ArrayProperty) p;
+            String inner = getSwaggerType(ap.getItems());
+            return "[" + inner + "]";
+        }
+        return null;
+    }
+
+    @Override
+    public CodegenProperty fromProperty(String name, Property p) {
+        CodegenProperty codegenProperty = super.fromProperty(name, p);
+        if (codegenProperty.isEnum) {
+            List<Map<String, String>> swiftEnums = new ArrayList<Map<String, String>>();
+            List<String> values = (List<String>) codegenProperty.allowableValues.get("values");
+            for (String value : values) {
+                Map<String, String> map = new HashMap<String, String>();
+                map.put("enum", StringUtils.capitalize(value));
+                map.put("raw", value);
+                swiftEnums.add(map);
+            }
+            codegenProperty.allowableValues.put("values", swiftEnums);
+            codegenProperty.datatypeWithEnum =
+                    StringUtils.left(codegenProperty.datatypeWithEnum, codegenProperty.datatypeWithEnum.length() - "Enum".length());
+        }
+        return codegenProperty;
+    }
+
+    @Override
+    public String toApiName(String name) {
+        if (name.length() == 0) {
+            return "DefaultAPI";
+        }
+        return initialCaps(name) + "API";
+    }
+
+    @Override
+    public CodegenOperation fromOperation(String path, String httpMethod, Operation operation, Map<String, Model> definitions) {
+        path = normalizePath(path);
+        List<Parameter> parameters = operation.getParameters();
+        parameters = Lists.newArrayList(Iterators.filter(parameters.iterator(), new Predicate<Parameter>() {
+            @Override
+            public boolean apply(@Nullable Parameter parameter) {
+                return !(parameter instanceof HeaderParameter);
+            }
+        }));
+        operation.setParameters(parameters);
+        return super.fromOperation(path, httpMethod, operation, definitions);
+    }
+}

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TizenClientCodegen.java

@@ -0,0 +1,277 @@
+package io.swagger.codegen.languages;
+
+import io.swagger.codegen.CodegenConfig;
+import io.swagger.codegen.CodegenType;
+import io.swagger.codegen.DefaultCodegen;
+import io.swagger.codegen.SupportingFile;
+import io.swagger.models.properties.ArrayProperty;
+import io.swagger.models.properties.BooleanProperty;
+import io.swagger.models.properties.DateProperty;
+import io.swagger.models.properties.DateTimeProperty;
+import io.swagger.models.properties.DecimalProperty;
+import io.swagger.models.properties.DoubleProperty;
+import io.swagger.models.properties.FloatProperty;
+import io.swagger.models.properties.IntegerProperty;
+import io.swagger.models.properties.LongProperty;
+import io.swagger.models.properties.MapProperty;
+import io.swagger.models.properties.Property;
+import io.swagger.models.properties.RefProperty;
+import io.swagger.models.properties.StringProperty;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+public class TizenClientCodegen extends DefaultCodegen implements CodegenConfig {
+    protected static String PREFIX = "Sami";
+    protected Set<String> foundationClasses = new HashSet<String>();
+    protected String sourceFolder = "client";
+    protected Map<String, String> namespaces = new HashMap<String, String>();
+
+    public TizenClientCodegen() {
+        super();
+        outputFolder = "generated-code/tizen";
+        modelTemplateFiles.put("model-header.mustache", ".h");
+        modelTemplateFiles.put("model-body.mustache", ".cpp");
+        apiTemplateFiles.put("api-header.mustache", ".h");
+        apiTemplateFiles.put("api-body.mustache", ".cpp");
+        templateDir = "tizen";
+        modelPackage = "";
+
+        defaultIncludes = new HashSet<String>(
+                Arrays.asList(
+                        "bool",
+                        "int",
+                        "long")
+        );
+        languageSpecificPrimitives = new HashSet<String>();
+
+        additionalProperties().put("prefix", PREFIX);
+
+        reservedWords = new HashSet<String>(
+                // VERIFY
+                Arrays.asList(
+                        "void", "char", "short", "int", "void", "char", "short", "int",
+                        "long", "float", "double", "signed", "unsigned", "id", "const",
+                        "volatile", "in", "out", "inout", "bycopy", "byref", "oneway",
+                        "self", "super"
+                ));
+
+        super.typeMapping = new HashMap<String, String>();
+
+        typeMapping.put("Date", "DateTime");
+        typeMapping.put("DateTime", "DateTime");
+        typeMapping.put("string", "String");
+        typeMapping.put("integer", "Integer");
+        typeMapping.put("float", "Float");
+        typeMapping.put("long", "Long");
+        typeMapping.put("boolean", "Boolean");
+        typeMapping.put("double", "Double");
+        typeMapping.put("array", "IList");
+        typeMapping.put("map", "HashMap");
+        typeMapping.put("number", "Long");
+        typeMapping.put("object", PREFIX + "Object");
+
+        importMapping = new HashMap<String, String>();
+
+        namespaces = new HashMap<String, String>();
+        namespaces.put("DateTime", "Tizen::Base::DateTime");
+        namespaces.put("Integer", "Tizen::Base::Integer");
+        namespaces.put("Long", "Tizen::Base::Long");
+        namespaces.put("Boolean", "Tizen::Base::Boolean");
+        namespaces.put("Float", "Tizen::Base::Float");
+        namespaces.put("String", "Tizen::Base::String");
+        namespaces.put("Double", "Tizen::Base::Double");
+        namespaces.put("IList", "Tizen::Base::Collection::IList");
+        namespaces.put("HashMap", "Tizen::Base::Collection::HashMap");
+        namespaces.put("ArrayList", "Tizen::Base::Collection::ArrayList");
+        namespaces.put("JsonNumber", "Tizen::Web::Json");
+        namespaces.put("JsonString", "Tizen::Web::Json");
+
+        foundationClasses = new HashSet<String>(
+                Arrays.asList(
+                        "String",
+                        "Integer",
+                        "Float")
+        );
+        supportingFiles.clear();
+        supportingFiles.add(new SupportingFile("modelFactory.mustache", sourceFolder, PREFIX + "ModelFactory.h"));
+        supportingFiles.add(new SupportingFile("helpers-header.mustache", sourceFolder, PREFIX + "Helpers.h"));
+        supportingFiles.add(new SupportingFile("helpers-body.mustache", sourceFolder, PREFIX + "Helpers.cpp"));
+        supportingFiles.add(new SupportingFile("apiclient-header.mustache", sourceFolder, PREFIX + "ApiClient.h"));
+        supportingFiles.add(new SupportingFile("apiclient-body.mustache", sourceFolder, PREFIX + "ApiClient.cpp"));
+        supportingFiles.add(new SupportingFile("object.mustache", sourceFolder, PREFIX + "Object.h"));
+        supportingFiles.add(new SupportingFile("error-header.mustache", sourceFolder, PREFIX + "Error.h"));
+        supportingFiles.add(new SupportingFile("error-body.mustache", sourceFolder, PREFIX + "Error.cpp"));
+    }
+
+    public CodegenType getTag() {
+        return CodegenType.CLIENT;
+    }
+
+    public String getName() {
+        return "tizen";
+    }
+
+    public String getHelp() {
+        return "Generates a Samsung Tizen C++ client library.";
+    }
+
+    @Override
+    public String toInstantiationType(Property p) {
+        if (p instanceof MapProperty) {
+            MapProperty ap = (MapProperty) p;
+            String inner = getSwaggerType(ap.getAdditionalProperties());
+            return instantiationTypes.get("map");
+        } else if (p instanceof ArrayProperty) {
+            ArrayProperty ap = (ArrayProperty) p;
+            String inner = getSwaggerType(ap.getItems());
+            return instantiationTypes.get("array");
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public String getTypeDeclaration(String name) {
+        if (languageSpecificPrimitives.contains(name) && !foundationClasses.contains(name)) {
+            return name;
+        } else {
+            return name + "*";
+        }
+    }
+
+    @Override
+    public String getSwaggerType(Property p) {
+        String swaggerType = super.getSwaggerType(p);
+        String type = null;
+        if (typeMapping.containsKey(swaggerType)) {
+            type = typeMapping.get(swaggerType);
+            if (languageSpecificPrimitives.contains(type) && !foundationClasses.contains(type)) {
+                return toModelName(type);
+            }
+        } else {
+            type = swaggerType;
+        }
+        return toModelName(type);
+    }
+
+    @Override
+    public String getTypeDeclaration(Property p) {
+        String swaggerType = getSwaggerType(p);
+        if (languageSpecificPrimitives.contains(swaggerType) && !foundationClasses.contains(swaggerType)) {
+            return toModelName(swaggerType);
+        } else {
+            return swaggerType + "*";
+        }
+    }
+
+    @Override
+    public String toModelName(String type) {
+        if (typeMapping.keySet().contains(type) ||
+                typeMapping.values().contains(type) ||
+                foundationClasses.contains(type) ||
+                importMapping.values().contains(type) ||
+                defaultIncludes.contains(type) ||
+                languageSpecificPrimitives.contains(type)) {
+            return type;
+        } else {
+            return PREFIX + Character.toUpperCase(type.charAt(0)) + type.substring(1);
+        }
+    }
+
+    @Override
+    public String toModelImport(String name) {
+        if (namespaces.containsKey(name)) {
+            return "using " + namespaces.get(name) + ";";
+        }
+        return "#include \"" + name + ".h\"";
+    }
+
+    @Override
+    public String toDefaultValue(Property p) {
+        if (p instanceof StringProperty) {
+            return "new String()";
+        } else if (p instanceof BooleanProperty) {
+            return "new Boolean(false)";
+        } else if (p instanceof DateProperty) {
+            return "new DateTime()";
+        } else if (p instanceof DateTimeProperty) {
+            return "new DateTime()";
+        } else if (p instanceof DoubleProperty) {
+            return "new Double()";
+        } else if (p instanceof FloatProperty) {
+            return "new Float()";
+        } else if (p instanceof IntegerProperty) {
+            return "new Integer()";
+        } else if (p instanceof LongProperty) {
+            return "new Long()";
+        } else if (p instanceof DecimalProperty) {
+            return "new Long()";
+        } else if (p instanceof MapProperty) {
+            MapProperty ap = (MapProperty) p;
+            String inner = getSwaggerType(ap.getAdditionalProperties());
+            return "new HashMap()";
+        } else if (p instanceof ArrayProperty) {
+            ArrayProperty ap = (ArrayProperty) p;
+            String inner = getSwaggerType(ap.getItems());
+            return "new ArrayList()";
+        }
+        // else
+        if (p instanceof RefProperty) {
+            RefProperty rp = (RefProperty) p;
+            return "new " + toModelName(rp.getSimpleRef()) + "()";
+        }
+        return "null";
+    }
+
+    @Override
+    public String apiFileFolder() {
+        return outputFolder + File.separator + sourceFolder;
+    }
+
+    @Override
+    public String modelFileFolder() {
+        return outputFolder + File.separator + sourceFolder;
+    }
+
+    @Override
+    public String toModelFilename(String name) {
+        return PREFIX + initialCaps(name);
+    }
+
+    @Override
+    public String toApiName(String name) {
+        return PREFIX + initialCaps(name) + "Api";
+    }
+
+    public String toApiFilename(String name) {
+        return PREFIX + initialCaps(name) + "Api";
+    }
+
+    @Override
+    public String toVarName(String name) {
+        String paramName = name.replaceAll("[^a-zA-Z0-9_]", "");
+        paramName = Character.toUpperCase(paramName.charAt(0)) + paramName.substring(1);
+        return "p" + paramName;
+    }
+
+    public String escapeReservedWord(String name) {
+        return "_" + name;
+    }
+
+    @Override
+    public String toOperationId(String operationId) {
+        // method name cannot use reserved keyword, e.g. return$
+        if (reservedWords.contains(operationId)) {
+            throw new RuntimeException(operationId + " (reserved word) cannot be used as method name");
+        }
+
+        // add_pet_by_id => addPetById
+        return camelize(operationId, true);
+    }
+
+}