updated readme

Merge branch 'develop_2.0'
updated README for release
2015-08-24 00:44:03 -07:00 · 2015-08-24 00:39:03 -07:00 · 2015-08-24 00:37:23 -07:00 · 2015-08-24 00:33:26 -07:00 · 2015-08-24 00:32:58 -07:00 · 2015-08-24 00:03:31 -07:00
1366 changed files with 106986 additions and 39623 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -0,0 +1,47 @@
+*.iml
+out/
+*.ipr
+*.iws
+classpath.txt
+version.properties
+.project
+.classpath
+lib/*
+build/*
+generated-files/*
+generated-sources/*
+generated-code/*
+*.swp
+*.swo
+
+/target
+/generated-files
+/nbactions.xml
+*.pyc
+__pycache__
+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/
+
+samples/client/petstore/silex/SwaggerServer/composer.lock
+samples/client/petstore/silex/SwaggerServer/venodr/
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ version.properties
 lib/*
 build/*
 generated-files/*
+generated-sources/*
 generated-code/*
 *.swp
 *.swo
@@ -22,9 +23,30 @@ 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/SwaggerClientTests/Build
+samples/client/petstore/objc/SwaggerClientTests/Pods
+samples/client/petstore/objc/SwaggerClientTests/SwaggerClient.xcworkspace
+samples/client/petstore/objc/SwaggerClientTests/Podfile.lock
+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/
+
+samples/client/petstore/silex/SwaggerServer/composer.lock
+samples/client/petstore/silex/SwaggerServer/venodr/
+
+samples/client/petstore/python/.projectile
+samples/client/petstore/python/.venv/
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 sudo: false
 language: java
-script: mvn verify
+script: mvn verify -Psamples
 jdk:
  - oraclejdk7
--- a/13
+++ b/13
@@ -0,0 +1,13 @@
+FROM maven:3.3-jdk-7
+
+WORKDIR /src
+VOLUME  /src
+VOLUME  /root/.m2/repository
+
+ADD . /opt/swagger-codegen
+
+RUN cd /opt/swagger-codegen && mvn package
+
+ENTRYPOINT ["java", "-jar", "/opt/swagger-codegen/modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"]
+
+CMD ["help"]
--- a/11
+++ b/11
@@ -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.
--- a/README.md
+++ b/README.md
@@ -5,22 +5,36 @@
 ## Overview
 This is the swagger codegen project, which allows generation of client libraries automatically from a Swagger-compliant server.  

-## What's Swagger?
-
-The goal of Swagger™ is to define a standard, language-agnostic interface to REST APIs which allows both humans and computers to discover and understand the capabilities of the service without access to source code, documentation, or through network traffic inspection. When properly defined via Swagger, a consumer can understand and interact with the remote service with a minimal amount of implementation logic. Similar to what interfaces have done for lower-level programming, Swagger removes the guesswork in calling the service.
-
-
 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. 

+## Build and run using docker

-## Compatability
+```
+git clone https://github.com/swagger-api/swagger-codegen
+
+cd swagger-codegen
+
+./run-in-docker.sh mvn package
+ ```
+
+Build a nodejs server stub:
+
+ ```
+./run-in-docker.sh generate \
+  -i http://petstore.swagger.io/v2/swagger.json \
+  -l nodejs \
+  -o samples/server/petstore/nodejs
+ ```
+
+## 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-M2                | 2015-04-06   | 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)
+Swagger Codegen Version    | Release Date | Swagger Spec compatibility | Notes
+-------------------------- | ------------ | -------------------------- | -----
+2.1.3                      |              | 1.0, 1.1, 1.2, 2.0   | [master](https://github.com/swagger-api/swagger-codegen)
+2.1.3 (**current stable**) | 2015-08-24   | 1.0, 1.1, 1.2, 2.0   | [master](https://github.com/swagger-api/swagger-codegen/tree/v2.1.3)
+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
@@ -30,6 +44,17 @@ You need the following installed and available in your $PATH:

 * [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.
+
+Export JAVA_HOME in order to user proper Java version:
+```
+export JAVA_HOME=`/usr/libexec/java_home -v 1.7`
+export PATH=${JAVA_HOME}/bin:$PATH
+```
+
+#### Building
+
 After cloning the project, you can build it from source with this command:

 ```
@@ -60,11 +85,14 @@ NAME

 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)]
+                [(-s | --skip-overwrite)]

 OPTIONS
        -a <authorization>, --auth <authorization>
@@ -72,6 +100,16 @@ OPTIONS
            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)

@@ -87,7 +125,11 @@ OPTIONS

        -v, --verbose
            verbose mode
- ```
+            
+        -s , --skip-overwrite
+            specifies if the existing files should be overwritten during 
+            the generation 
+```

 You can then compile and run the client, as well as unit tests against it:

@@ -142,35 +184,107 @@ Great for creating libraries on your ci server, from the [Swagger Editor](http:/
 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:

 ```
-$ ls -1 modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/
+$ ls -1 modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/
+AbstractTypeScriptClientCodegen.java
+AkkaScalaClientCodegen.java
 AndroidClientCodegen.java
 AsyncScalaClientCodegen.java
 CSharpClientCodegen.java
+CodeGenStatus.java
+CsharpDotNet2ClientCodegen.java
+FlashClientCodegen.java
 JavaClientCodegen.java
+JavaInflectorServerCodegen.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
+SilexServerCodegen.java
+SinatraServerCodegen.java
 SpringMVCServerCodegen.java
 StaticDocCodegen.java
 StaticHtmlGenerator.java
 SwaggerGenerator.java
 SwaggerYamlGenerator.java
+SwiftCodegen.java
 TizenClientCodegen.java
+TypeScriptAngularClientCodegen.java
+TypeScriptNodeClientCodegen.java
 ```

-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 may want to extend these.
+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.jar 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
+
+	library
+	    library template (sub-template) to use:
+	    <default> - HTTP client: Jersey client 1.18. JSON processing: Jackson 2.4.2
+	    jersey2 - HTTP client: Jersey client 2.6
+```
+
+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 com.wordnik.swagger.codegen.languages.*;
+import io.swagger.codegen.languages.*;

 public class MyObjcCodegen extends ObjcClientCodegen {
  static {
@@ -270,7 +384,7 @@ Note!  The templates are included in the library generated.  If you want to modi
 License
 -------

-Copyright 2015 Reverb Technologies, 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.
--- a/bin/akka-scala-petstore.sh
+++ b/bin/akka-scala-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/akka-scala -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l akka-scala -o samples/client/petstore/akka-scala"
+
+java $JAVA_OPTS -jar $executable $ags
--- a/bin/all-petstore.sh
+++ b/bin/all-petstore.sh
@@ -18,16 +18,29 @@ if [ ! -d "${APP_DIR}" ]; then
 fi

 cd $APP_DIR
+./bin/akka-scala-petstore.sh
 ./bin/android-java-petstore.sh
 ./bin/csharp-petstore.sh
 ./bin/dynamic-html.sh
 ./bin/html-petstore.sh
-./bin/jaxrs-petstore-server.sh
 ./bin/java-petstore.sh
+./bin/java-petstore-jersey2.sh
+./bin/jaxrs-petstore-server.sh
+./bin/nodejs-petstore-server.sh
+./bin/objc-petstore.sh
+./bin/perl-petstore.sh
 ./bin/php-petstore.sh
 ./bin/python-petstore.sh
+./bin/python3-petstore.sh
+./bin/qt5-petstore.sh
+./bin/retrofit-petstore.sh
 ./bin/ruby-petstore.sh
-./bin/objc-petstore.sh
+./bin/scala-async-petstore.sh
 ./bin/scala-petstore.sh
+./bin/scalatra-petstore-server.sh
+./bin/silex-petstore-server.sh
 ./bin/spring-mvc-petstore-server.sh
+./bin/swift-petstore.sh
 ./bin/tizen-petstore.sh
+./bin/typescript-angular-petstore.sh
+./bin/typescript-node-petstore.sh
--- a/bin/csharp-dotnet2-petstore.sh
+++ b/bin/csharp-dotnet2-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 -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l CsharpDotNet2 -o samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient"
+
+java $JAVA_OPTS -jar $executable $ags
--- a/bin/csharp-petstore.sh
+++ b/bin/csharp-petstore.sh
@@ -26,6 +26,6 @@ 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 -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l csharp -o samples/client/petstore/csharp"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l csharp -o samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient"

 java $JAVA_OPTS -jar $executable $ags
--- a/bin/flash-petstore.sh
+++ b/bin/flash-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/flash -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l flash -o samples/client/petstore/flash"
+
+java $JAVA_OPTS -jar $executable $ags
--- a/bin/java-inflector-petstore-server.sh
+++ b/bin/java-inflector-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/JavaInflector -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l inflector -o samples/server/petstore/java-inflector"
+
+java $JAVA_OPTS -jar $executable $ags
--- a/bin/java-petstore-jersey2.json
+++ b/bin/java-petstore-jersey2.json
@@ -0,0 +1,4 @@
+{
+    "library": "jersey2",
+    "artifactId": "swagger-petstore-jersey2"
+}
--- a/bin/java-petstore-jersey2.sh
+++ b/bin/java-petstore-jersey2.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 -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l java -c bin/java-petstore-jersey2.json -o samples/client/petstore/java/jersey2"
+
+java $JAVA_OPTS -jar $executable $ags
--- a/bin/java-petstore.sh
+++ b/bin/java-petstore.sh
@@ -26,6 +26,6 @@ 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 -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l java -o samples/client/petstore/java"
+ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l java -o samples/client/petstore/java/default"

 java $JAVA_OPTS -jar $executable $ags
--- a/bin/jaxrs-petstore-server.sh
+++ b/bin/jaxrs-petstore-server.sh
@@ -26,6 +26,6 @@ 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"
+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
--- a/bin/perl-petstore.sh
+++ b/bin/perl-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 -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l perl -o samples/client/petstore/perl"
+
+java $JAVA_OPTS -jar $executable $ags
--- a/bin/python3-petstore.sh
+++ b/bin/python3-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/python3 -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l python3 -o samples/client/petstore/python3"
+
+java $JAVA_OPTS -jar $executable $ags
--- a/bin/qt5-petstore.sh
+++ b/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
--- a/bin/retrofit-petstore.sh
+++ b/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
--- a/bin/ruby-petstore.json
+++ b/bin/ruby-petstore.json
@@ -0,0 +1,5 @@
+{
+  "gemName": "petstore",
+  "moduleName": "Petstore",
+  "gemVersion": "1.0.0"
+}
--- a/bin/ruby-petstore.sh
+++ b/bin/ruby-petstore.sh
@@ -26,6 +26,6 @@ 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/ruby -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l ruby -o samples/client/petstore/ruby"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/ruby -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l ruby -c bin/ruby-petstore.json -o samples/client/petstore/ruby"

 java $JAVA_OPTS -jar $executable $ags
--- a/bin/silex-petstore-server.sh
+++ b/bin/silex-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/silex -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l silex -o samples/server/petstore/silex"
+
+java $JAVA_OPTS -jar $executable $ags
--- a/bin/sinatra-petstore-server.sh
+++ b/bin/sinatra-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/sinatra -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l sinatra -o samples/server/petstore/sinatra"
+
+java $JAVA_OPTS -jar $executable $ags
--- a/bin/swift-petstore.json
+++ b/bin/swift-petstore.json
@@ -0,0 +1,4 @@
+{
+  "projectName": "PetstoreClient",
+  "responseAs": "PromiseKit"
+}
--- a/bin/swift-petstore.sh
+++ b/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 -c ./bin/swift-petstore.json -o samples/client/petstore/swift"
+
+java $JAVA_OPTS -jar $executable $ags
--- a/bin/typescript-angular-petstore.sh
+++ b/bin/typescript-angular-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 -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l typescript-angular -o samples/client/petstore/typescript-angular"
+
+java $JAVA_OPTS -jar $executable $ags
--- a/bin/typescript-node-petstore.sh
+++ b/bin/typescript-node-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 -i modules/swagger-codegen/src/test/resources/2_0/petstore.json -l typescript-node -o samples/client/petstore/typescript-node"
+
+java $JAVA_OPTS -jar $executable $ags
--- a/modules/swagger-codegen-cli/pom.xml
+++ b/modules/swagger-codegen-cli/pom.xml
@@ -1,9 +1,9 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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>com.wordnik</groupId>
+        <groupId>io.swagger</groupId>
        <artifactId>swagger-codegen-project</artifactId>
-        <version>2.1.0-M2</version>
+        <version>2.1.3</version>
        <relativePath>../..</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -15,6 +15,14 @@

    <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>
@@ -22,7 +30,7 @@
                <configuration>
                    <archive>
                        <manifest>
-                            <mainClass>com.wordnik.swagger.codegen.SwaggerCodegen</mainClass>
+                            <mainClass>io.swagger.codegen.SwaggerCodegen</mainClass>
                        </manifest>
                    </archive>
                </configuration>
@@ -33,7 +41,7 @@
                <version>2.3</version>
                <executions>
                    <execution>
-                        <id>reduced-pom</id>
+                        <id>process-resources</id>
                        <phase>package</phase>
                        <goals>
                            <goal>shade</goal>
@@ -44,17 +52,9 @@
                            <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"/>
+                                <transformer
+                                        implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
                            </transformers>
                        </configuration>
                    </execution>
@@ -66,7 +66,7 @@
    <dependencies>

        <dependency>
-            <groupId>com.wordnik</groupId>
+            <groupId>io.swagger</groupId>
            <artifactId>swagger-codegen</artifactId>
            <version>${project.version}</version>
        </dependency>
@@ -90,6 +90,13 @@
            <version>${slf4j-version}</version>
        </dependency>

+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit-version}</version>
+            <scope>test</scope>
+        </dependency>
+
    </dependencies>

 </project>
--- a/modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/SwaggerCodegen.java
+++ b/modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/SwaggerCodegen.java
@@ -1,16 +1,17 @@
-package com.wordnik.swagger.codegen;
+package io.swagger.codegen;

-import com.wordnik.swagger.codegen.cmd.Generate;
-import com.wordnik.swagger.codegen.cmd.Langs;
-import com.wordnik.swagger.codegen.cmd.Meta;
 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
 *
@@ -27,7 +28,8 @@ public class SwaggerCodegen {
                        Generate.class,
                        Meta.class,
                        Langs.class,
-                        Help.class
+                        Help.class,
+                        ConfigHelp.class
                );

        builder.build().parse(args).run();
--- a/modules/swagger-codegen-cli/src/main/java/io/swagger/codegen/cmd/ConfigHelp.java
+++ b/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().replaceAll("\n", "\n\t    "));
+            System.out.println();
+        }
+    }
+}
--- a/modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/cmd/Generate.java
+++ b/modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/cmd/Generate.java
@@ -1,12 +1,15 @@
-package com.wordnik.swagger.codegen.cmd;
+package io.swagger.codegen.cmd;

-import com.wordnik.swagger.codegen.ClientOptInput;
-import com.wordnik.swagger.codegen.ClientOpts;
-import com.wordnik.swagger.codegen.CodegenConfig;
-import com.wordnik.swagger.codegen.DefaultGenerator;
-import com.wordnik.swagger.models.Swagger;
+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;
@@ -54,51 +57,22 @@ public class Generate implements Runnable {
                    "Pass in a URL-encoded string of name:header with a comma separating multiple values")
    private String auth;

-    @Override
-    public void run() {
-        verbosed(verbose);
+    @Option(name = {"-D"}, title = "system properties", description = "sets specified system properties in " +
+            "the format of name=value,name=value")
+    private String systemProperties;

-        ClientOptInput input = new ClientOptInput();
+    @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;

-        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());
-        }
-
-        input.setConfig(config);
-
-        Swagger swagger = new SwaggerParser().read(spec, input.getAuthorizationValues(), true);
-        new DefaultGenerator().opts(input.opts(new ClientOpts()).swagger(swagger)).generate();
-    }
-
-    /**
-     * 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", "");
-    }
+    @Option(name = {"-s", "--skip-overwrite"}, title = "skip overwrite", description = "specifies if the existing files should be " +
+            "overwritten during the generation.")
+    private boolean skipOverwrite;

    /**
     * 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
     */
@@ -117,4 +91,78 @@ public class Generate implements Runnable {
            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()) {
+                    String opt = langCliOption.getOpt();
+                    if (genConfig.hasOption(opt)) {
+                        config.additionalProperties().put(opt, genConfig.getOption(opt));
+                        // the "library" config option is for library template (sub-template)
+                        if ("library".equals(opt)) {
+                            config.setLibrary(genConfig.getOption(opt));
+                        }
+                    }
+                }
+            }
+        }
+
+        config.setSkipOverwrite(skipOverwrite);
+        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", "");
+    }
 }
--- a/modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/cmd/Langs.java
+++ b/modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/cmd/Langs.java
@@ -1,8 +1,8 @@
-package com.wordnik.swagger.codegen.cmd;
+package io.swagger.codegen.cmd;

 import ch.lambdaj.collection.LambdaIterable;
-import com.wordnik.swagger.codegen.CodegenConfig;
 import io.airlift.airline.Command;
+import io.swagger.codegen.CodegenConfig;

 import static ch.lambdaj.Lambda.on;
 import static ch.lambdaj.collection.LambdaCollections.with;
--- a/modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/cmd/Meta.java
+++ b/modules/swagger-codegen-cli/src/main/java/com/wordnik/swagger/codegen/cmd/Meta.java
@@ -1,13 +1,13 @@
-package com.wordnik.swagger.codegen.cmd;
+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 com.wordnik.swagger.codegen.DefaultGenerator;
-import com.wordnik.swagger.codegen.SupportingFile;
 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;
@@ -47,8 +47,8 @@ public class Meta implements Runnable {
    private String name = "default";

    @Option(name = {"-p", "--package"}, title = "package",
-            description = "the package to put the main class into (defaults to com.wordnik.swagger.codegen)")
-    private String targetPackage = "com.wordnik.swagger.codegen";
+            description = "the package to put the main class into (defaults to io.swagger.codegen)")
+    private String targetPackage = "io.swagger.codegen";

    @Override
    public void run() {
@@ -65,7 +65,7 @@ public class Meta implements Runnable {
                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", "com.wordnik.swagger.codegen.CodegenConfig")
+                        "src/main/resources/META-INF/services", "io.swagger.codegen.CodegenConfig")
        );

        Map<String, Object> data = new ImmutableMap.Builder<String, Object>()
@@ -81,8 +81,9 @@ public class Meta implements Runnable {
    /**
     * 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
+     * @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) {
@@ -121,6 +122,7 @@ public class Meta implements Runnable {

    /**
     * Creates mustache loader for template using classpath loader
+     *
     * @param generator - class with reader getter
     * @return loader for template
     */
@@ -135,6 +137,7 @@ public class Meta implements Runnable {

    /**
     * Converts package name to path on file system
+     *
     * @param packageName - package name to convert
     * @return relative path
     */
--- a/modules/swagger-codegen-cli/src/main/resources/logback.xml
+++ b/modules/swagger-codegen-cli/src/main/resources/logback.xml
@@ -1,12 +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="com.wordnik" level="debug"/>
-  <root level="error">
-    <appender-ref ref="STDOUT" />
-  </root>
+    <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>
--- a/modules/swagger-codegen-cli/src/test/java/io/swagger/codegen/GenerateTest.java
+++ b/modules/swagger-codegen-cli/src/test/java/io/swagger/codegen/GenerateTest.java
@@ -0,0 +1,73 @@
+package io.swagger.codegen;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.apache.commons.io.FileUtils;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.junit.Assert.fail;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+
+public class GenerateTest {
+
+    private static final String TEST_SKIP_OVERWRITE = "testSkipOverwrite";
+    private static final String POM_FILE = "pom.xml";
+    private static final String MODEL_ORDER_FILE = "/src/main/java/io/swagger/client/model/Order.java";
+
+    @Rule
+    public TemporaryFolder folder = new TemporaryFolder();
+
+    @Test
+    public void testSkipOverwrite() throws IOException {
+        final File output = folder.getRoot();
+
+        String[] args = {"generate", "-i", "src/test/resources/petstore.json", "-l", "java", "-o", output.getAbsolutePath()};
+        String[] argsWithSparam = Arrays.copyOf(args, args.length + 1);
+        argsWithSparam[args.length] = "-s";
+
+        //generate content first time without -s flag, so all generated files should be recorded
+        SwaggerCodegen.main(args);
+        final File order = new File(output, MODEL_ORDER_FILE);
+        assertTrue(order.exists());
+
+        //change content of one file
+        changeContent(order);
+
+        //generate content second time without -s flag, so changed file should be rewritten
+        SwaggerCodegen.main(args);
+        //order = new File(output, MODEL_ORDER_FILE);
+        assertTrue(!TEST_SKIP_OVERWRITE.equals(FileUtils.readFileToString(order, StandardCharsets.UTF_8)));
+
+        //change content again
+        changeContent(order);
+        //delete file
+        final File pom = new File(output, POM_FILE);
+        if (!pom.delete()) {
+            fail();
+        }
+
+        //generate content third time with -s flag, so changed file should not be rewritten
+        //and deleted file should be recorded
+        SwaggerCodegen.main(argsWithSparam);
+        assertEquals(FileUtils.readFileToString(order, StandardCharsets.UTF_8), TEST_SKIP_OVERWRITE);
+        assertTrue(pom.exists());
+    }
+
+    private void changeContent(File file) throws IOException {
+        Writer out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), UTF_8));
+        out.write(TEST_SKIP_OVERWRITE);
+        out.close();
+    }
+}
--- a/modules/swagger-codegen-cli/src/test/resources/petstore.json
+++ b/modules/swagger-codegen-cli/src/test/resources/petstore.json
@@ -0,0 +1,977 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "description": "This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters",
+    "version": "1.0.0",
+    "title": "Swagger Petstore",
+    "termsOfService": "http://swagger.io/terms/",
+    "contact": {
+      "email": "apiteam@swagger.io"
+    },
+    "license": {
+      "name": "Apache 2.0",
+      "url": "http://www.apache.org/licenses/LICENSE-2.0.html"
+    }
+  },
+  "host": "petstore.swagger.io",
+  "basePath": "/v2",
+  "schemes": [
+    "http"
+  ],
+  "paths": {
+    "/pet": {
+      "post": {
+        "tags": [
+          "pet"
+        ],
+        "summary": "Add a new pet to the store",
+        "description": "",
+        "operationId": "addPet",
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "in": "body",
+            "name": "body",
+            "description": "Pet object that needs to be added to the store",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/Pet"
+            }
+          }
+        ],
+        "responses": {
+          "405": {
+            "description": "Invalid input"
+          }
+        },
+        "security": [
+          {
+            "petstore_auth": [
+              "write:pets",
+              "read:pets"
+            ]
+          }
+        ]
+      },
+      "put": {
+        "tags": [
+          "pet"
+        ],
+        "summary": "Update an existing pet",
+        "description": "",
+        "operationId": "updatePet",
+        "consumes": [
+          "application/json",
+          "application/xml"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "in": "body",
+            "name": "body",
+            "description": "Pet object that needs to be added to the store",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/Pet"
+            }
+          }
+        ],
+        "responses": {
+          "405": {
+            "description": "Validation exception"
+          },
+          "404": {
+            "description": "Pet not found"
+          },
+          "400": {
+            "description": "Invalid ID supplied"
+          }
+        },
+        "security": [
+          {
+            "petstore_auth": [
+              "write:pets",
+              "read:pets"
+            ]
+          }
+        ]
+      }
+    },
+    "/pet/findByStatus": {
+      "get": {
+        "tags": [
+          "pet"
+        ],
+        "summary": "Finds Pets by status",
+        "description": "Multiple status values can be provided with comma seperated strings",
+        "operationId": "findPetsByStatus",
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "name": "status",
+            "in": "query",
+            "description": "Status values that need to be considered for filter",
+            "required": false,
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "collectionFormat": "multi",
+            "default": "available"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "successful operation",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/Pet"
+              }
+            }
+          },
+          "400": {
+            "description": "Invalid status value"
+          }
+        },
+        "security": [
+          {
+            "petstore_auth": [
+              "write:pets",
+              "read:pets"
+            ]
+          }
+        ]
+      }
+    },
+    "/pet/findByTags": {
+      "get": {
+        "tags": [
+          "pet"
+        ],
+        "summary": "Finds Pets by tags",
+        "description": "Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.",
+        "operationId": "findPetsByTags",
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "name": "tags",
+            "in": "query",
+            "description": "Tags to filter by",
+            "required": false,
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "collectionFormat": "multi"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "successful operation",
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/Pet"
+              }
+            }
+          },
+          "400": {
+            "description": "Invalid tag value"
+          }
+        },
+        "security": [
+          {
+            "petstore_auth": [
+              "write:pets",
+              "read:pets"
+            ]
+          }
+        ]
+      }
+    },
+    "/pet/{petId}": {
+      "get": {
+        "tags": [
+          "pet"
+        ],
+        "summary": "Find pet by ID",
+        "description": "Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions",
+        "operationId": "getPetById",
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "name": "petId",
+            "in": "path",
+            "description": "ID of pet that needs to be fetched",
+            "required": true,
+            "type": "integer",
+            "format": "int64"
+          }
+        ],
+        "responses": {
+          "404": {
+            "description": "Pet not found"
+          },
+          "200": {
+            "description": "successful operation",
+            "schema": {
+              "$ref": "#/definitions/Pet"
+            }
+          },
+          "400": {
+            "description": "Invalid ID supplied"
+          }
+        },
+        "security": [
+          {
+            "api_key": []
+          },
+          {
+            "petstore_auth": [
+              "write:pets",
+              "read:pets"
+            ]
+          }
+        ]
+      },
+      "post": {
+        "tags": [
+          "pet"
+        ],
+        "summary": "Updates a pet in the store with form data",
+        "description": "",
+        "operationId": "updatePetWithForm",
+        "consumes": [
+          "application/x-www-form-urlencoded"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "name": "petId",
+            "in": "path",
+            "description": "ID of pet that needs to be updated",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "name": "name",
+            "in": "formData",
+            "description": "Updated name of the pet",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "status",
+            "in": "formData",
+            "description": "Updated status of the pet",
+            "required": false,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "405": {
+            "description": "Invalid input"
+          }
+        },
+        "security": [
+          {
+            "petstore_auth": [
+              "write:pets",
+              "read:pets"
+            ]
+          }
+        ]
+      },
+      "delete": {
+        "tags": [
+          "pet"
+        ],
+        "summary": "Deletes a pet",
+        "description": "",
+        "operationId": "deletePet",
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "name": "api_key",
+            "in": "header",
+            "description": "",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "petId",
+            "in": "path",
+            "description": "Pet id to delete",
+            "required": true,
+            "type": "integer",
+            "format": "int64"
+          }
+        ],
+        "responses": {
+          "400": {
+            "description": "Invalid pet value"
+          }
+        },
+        "security": [
+          {
+            "petstore_auth": [
+              "write:pets",
+              "read:pets"
+            ]
+          }
+        ]
+      }
+    },
+    "/pet/{petId}/uploadImage": {
+      "post": {
+        "tags": [
+          "pet"
+        ],
+        "summary": "uploads an image",
+        "description": "",
+        "operationId": "uploadFile",
+        "consumes": [
+          "multipart/form-data"
+        ],
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "name": "petId",
+            "in": "path",
+            "description": "ID of pet to update",
+            "required": true,
+            "type": "integer",
+            "format": "int64"
+          },
+          {
+            "name": "additionalMetadata",
+            "in": "formData",
+            "description": "Additional data to pass to server",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "file",
+            "in": "formData",
+            "description": "file to upload",
+            "required": false,
+            "type": "file"
+          }
+        ],
+        "responses": {
+          "default": {
+            "description": "successful operation"
+          }
+        },
+        "security": [
+          {
+            "petstore_auth": [
+              "write:pets",
+              "read:pets"
+            ]
+          }
+        ]
+      }
+    },
+    "/store/inventory": {
+      "get": {
+        "tags": [
+          "store"
+        ],
+        "summary": "Returns pet inventories by status",
+        "description": "Returns a map of status codes to quantities",
+        "operationId": "getInventory",
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "responses": {
+          "200": {
+            "description": "successful operation",
+            "schema": {
+              "type": "object",
+              "additionalProperties": {
+                "type": "integer",
+                "format": "int32"
+              }
+            }
+          }
+        },
+        "security": [
+          {
+            "api_key": []
+          }
+        ]
+      }
+    },
+    "/store/order": {
+      "post": {
+        "tags": [
+          "store"
+        ],
+        "summary": "Place an order for a pet",
+        "description": "",
+        "operationId": "placeOrder",
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "in": "body",
+            "name": "body",
+            "description": "order placed for purchasing the pet",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/Order"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "successful operation",
+            "schema": {
+              "$ref": "#/definitions/Order"
+            }
+          },
+          "400": {
+            "description": "Invalid Order"
+          }
+        }
+      }
+    },
+    "/store/order/{orderId}": {
+      "get": {
+        "tags": [
+          "store"
+        ],
+        "summary": "Find purchase order by ID",
+        "description": "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions",
+        "operationId": "getOrderById",
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "name": "orderId",
+            "in": "path",
+            "description": "ID of pet that needs to be fetched",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "404": {
+            "description": "Order not found"
+          },
+          "200": {
+            "description": "successful operation",
+            "schema": {
+              "$ref": "#/definitions/Order"
+            }
+          },
+          "400": {
+            "description": "Invalid ID supplied"
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "store"
+        ],
+        "summary": "Delete purchase order by ID",
+        "description": "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors",
+        "operationId": "deleteOrder",
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "name": "orderId",
+            "in": "path",
+            "description": "ID of the order that needs to be deleted",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "404": {
+            "description": "Order not found"
+          },
+          "400": {
+            "description": "Invalid ID supplied"
+          }
+        }
+      }
+    },
+    "/user": {
+      "post": {
+        "tags": [
+          "user"
+        ],
+        "summary": "Create user",
+        "description": "This can only be done by the logged in user.",
+        "operationId": "createUser",
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "in": "body",
+            "name": "body",
+            "description": "Created user object",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/User"
+            }
+          }
+        ],
+        "responses": {
+          "default": {
+            "description": "successful operation"
+          }
+        }
+      }
+    },
+    "/user/createWithArray": {
+      "post": {
+        "tags": [
+          "user"
+        ],
+        "summary": "Creates list of users with given input array",
+        "description": "",
+        "operationId": "createUsersWithArrayInput",
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "in": "body",
+            "name": "body",
+            "description": "List of user object",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/User"
+              }
+            }
+          }
+        ],
+        "responses": {
+          "default": {
+            "description": "successful operation"
+          }
+        }
+      }
+    },
+    "/user/createWithList": {
+      "post": {
+        "tags": [
+          "user"
+        ],
+        "summary": "Creates list of users with given input array",
+        "description": "",
+        "operationId": "createUsersWithListInput",
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "in": "body",
+            "name": "body",
+            "description": "List of user object",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/User"
+              }
+            }
+          }
+        ],
+        "responses": {
+          "default": {
+            "description": "successful operation"
+          }
+        }
+      }
+    },
+    "/user/login": {
+      "get": {
+        "tags": [
+          "user"
+        ],
+        "summary": "Logs user into the system",
+        "description": "",
+        "operationId": "loginUser",
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "name": "username",
+            "in": "query",
+            "description": "The user name for login",
+            "required": false,
+            "type": "string"
+          },
+          {
+            "name": "password",
+            "in": "query",
+            "description": "The password for login in clear text",
+            "required": false,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "successful operation",
+            "schema": {
+              "type": "string"
+            }
+          },
+          "400": {
+            "description": "Invalid username/password supplied"
+          }
+        }
+      }
+    },
+    "/user/logout": {
+      "get": {
+        "tags": [
+          "user"
+        ],
+        "summary": "Logs out current logged in user session",
+        "description": "",
+        "operationId": "logoutUser",
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "responses": {
+          "default": {
+            "description": "successful operation"
+          }
+        }
+      }
+    },
+    "/user/{username}": {
+      "get": {
+        "tags": [
+          "user"
+        ],
+        "summary": "Get user by user name",
+        "description": "",
+        "operationId": "getUserByName",
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "name": "username",
+            "in": "path",
+            "description": "The name that needs to be fetched. Use user1 for testing. ",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "404": {
+            "description": "User not found"
+          },
+          "200": {
+            "description": "successful operation",
+            "schema": {
+              "$ref": "#/definitions/User"
+            },
+            "examples": {
+              "application/json": {
+                "id": 1,
+                "username": "johnp",
+                "firstName": "John",
+                "lastName": "Public",
+                "email": "johnp@swagger.io",
+                "password": "-secret-",
+                "phone": "0123456789",
+                "userStatus": 0
+              }
+            }
+          },
+          "400": {
+            "description": "Invalid username supplied"
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "user"
+        ],
+        "summary": "Updated user",
+        "description": "This can only be done by the logged in user.",
+        "operationId": "updateUser",
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "name": "username",
+            "in": "path",
+            "description": "name that need to be deleted",
+            "required": true,
+            "type": "string"
+          },
+          {
+            "in": "body",
+            "name": "body",
+            "description": "Updated user object",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/User"
+            }
+          }
+        ],
+        "responses": {
+          "404": {
+            "description": "User not found"
+          },
+          "400": {
+            "description": "Invalid user supplied"
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "user"
+        ],
+        "summary": "Delete user",
+        "description": "This can only be done by the logged in user.",
+        "operationId": "deleteUser",
+        "produces": [
+          "application/json",
+          "application/xml"
+        ],
+        "parameters": [
+          {
+            "name": "username",
+            "in": "path",
+            "description": "The name that needs to be deleted",
+            "required": true,
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "404": {
+            "description": "User not found"
+          },
+          "400": {
+            "description": "Invalid username supplied"
+          }
+        }
+      }
+    }
+  },
+  "securityDefinitions": {
+    "api_key": {
+      "type": "apiKey",
+      "name": "api_key",
+      "in": "header"
+    },
+    "petstore_auth": {
+      "type": "oauth2",
+      "authorizationUrl": "http://petstore.swagger.io/api/oauth/dialog",
+      "flow": "implicit",
+      "scopes": {
+        "write:pets": "modify pets in your account",
+        "read:pets": "read your pets"
+      }
+    }
+  },
+  "definitions": {
+    "User": {
+      "properties": {
+        "id": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "username": {
+          "type": "string"
+        },
+        "firstName": {
+          "type": "string"
+        },
+        "lastName": {
+          "type": "string"
+        },
+        "email": {
+          "type": "string"
+        },
+        "password": {
+          "type": "string"
+        },
+        "phone": {
+          "type": "string"
+        },
+        "userStatus": {
+          "type": "integer",
+          "format": "int32",
+          "description": "User Status"
+        }
+      },
+      "xml": {
+        "name": "User"
+      }
+    },
+    "Category": {
+      "properties": {
+        "id": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "name": {
+          "type": "string"
+        }
+      },
+      "xml": {
+        "name": "Category"
+      }
+    },
+    "Pet": {
+      "required": [
+        "name",
+        "photoUrls"
+      ],
+      "properties": {
+        "id": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "category": {
+          "$ref": "#/definitions/Category"
+        },
+        "name": {
+          "type": "string",
+          "example": "doggie"
+        },
+        "photoUrls": {
+          "type": "array",
+          "xml": {
+            "name": "photoUrl",
+            "wrapped": true
+          },
+          "items": {
+            "type": "string"
+          }
+        },
+        "tags": {
+          "type": "array",
+          "xml": {
+            "name": "tag",
+            "wrapped": true
+          },
+          "items": {
+            "$ref": "#/definitions/Tag"
+          }
+        },
+        "status": {
+          "type": "string",
+          "description": "pet status in the store",
+          "enum": [
+            "available",
+            "pending",
+            "sold"
+          ]
+        }
+      },
+      "xml": {
+        "name": "Pet"
+      }
+    },
+    "Tag": {
+      "properties": {
+        "id": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "name": {
+          "type": "string"
+        }
+      },
+      "xml": {
+        "name": "Tag"
+      }
+    },
+    "Order": {
+      "properties": {
+        "id": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "petId": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "quantity": {
+          "type": "integer",
+          "format": "int32"
+        },
+        "shipDate": {
+          "type": "string",
+          "format": "date-time"
+        },
+        "status": {
+          "type": "string",
+          "description": "Order Status",
+          "enum": [
+            "placed",
+            "approved",
+            "delivered"
+          ]
+        },
+        "complete": {
+          "type": "boolean"
+        }
+      },
+      "xml": {
+        "name": "Order"
+      }
+    }
+  }
+}
--- a/modules/swagger-codegen-maven-plugin/README.md
+++ b/modules/swagger-codegen-maven-plugin/README.md
@@ -0,0 +1,55 @@
+swagger-codegen-maven-plugin
+============================
+
+A Maven plugin to support the [swagger](http://swagger.io) code generation project
+
+Usage
+============================
+
+Add to your `build->plugins` section (default phase is `generate-sources` phase)
+```xml
+<plugin>
+    <groupId>io.swagger</groupId>
+    <artifactId>swagger-codegen-maven-plugin</artifactId>
+    <version>${project.version}</version>
+    <executions>
+        <execution>
+            <goals>
+                <goal>generate</goal>
+            </goals>
+            <configuration>
+                <inputSpec>src/main/resources/api.yaml</inputSpec>
+                <language>java</language>
+                <configOptions>
+                   <sourceFolder>src/gen/java/main</sourceFolder>
+                </configOptions>
+            </configuration>
+        </execution>
+    </executions>
+</plugin>
+```
+
+Followed by:
+
+```
+mvn clean compile
+```
+
+### General Configuration parameters
+
+- `inputSpec` - swagger spec file path
+- `language` - target generation language
+- `output` - target output path (default is `${project.build.directory}/generated-sources/swagger`)
+- `templateDirectory` - directory with mustache templates
+- `addCompileSourceRoot` - add the output directory to the project as a source root (`true` by default)
+- `modelPackage` - the package to use for generated model objects/classes
+- `apiPackage` - the package to use for generated api objects/classes
+- `invokerPackage` - the package to use for the generated invoker objects
+- `configOptions` - a map of language-specific parameters (see below)
+
+### Java-specific parameters (under configOptions)
+
+- `sourceFolder` - the folder to use for generated sources under the output folder
+- `groupId` - groupId in generated pom.xml
+- `artifactId` - artifactId in generated pom.xml
+- `artifactVersion` - artifact version in generated pom.xml
--- a/modules/swagger-codegen-maven-plugin/pom.xml
+++ b/modules/swagger-codegen-maven-plugin/pom.xml
@@ -0,0 +1,87 @@
+<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>io.swagger</groupId>
+        <artifactId>swagger-codegen-project</artifactId>
+        <version>2.1.3</version>
+        <relativePath>../..</relativePath>
+    </parent>
+    <artifactId>swagger-codegen-maven-plugin</artifactId>
+    <name>swagger-codegen (maven-plugin)</name>
+    <packaging>maven-plugin</packaging>
+    <description>maven plugin to build modules from swagger codegen</description>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-core</artifactId>
+            <version>3.2.5</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-artifact</artifactId>
+            <version>3.2.5</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-compat</artifactId>
+            <version>3.2.5</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-plugin-api</artifactId>
+            <version>3.2.5</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven.plugin-tools</groupId>
+            <artifactId>maven-plugin-annotations</artifactId>
+            <version>3.4</version>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-codegen</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-plugin-plugin</artifactId>
+                    <version>3.4</version>
+                    <configuration>
+                        <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <id>mojo-descriptor</id>
+                            <phase>process-classes</phase>
+                            <goals>
+                                <goal>descriptor</goal>
+                            </goals>
+                        </execution>
+                        <execution>
+                            <id>help-goal</id>
+                            <goals>
+                                <goal>helpmojo</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+</project>
--- a/modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/AdditionalParams.java
+++ b/modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/AdditionalParams.java
@@ -0,0 +1,16 @@
+package io.swagger.codegen.plugin;
+
+/**
+ * User: lanwen
+ * Date: 24.03.15
+ * Time: 14:47
+ */
+public final class AdditionalParams {
+    public static final String TEMPLATE_DIR_PARAM = "templateDir";
+    public static final String MODEL_PACKAGE_PARAM = "modelPackage";
+    public static final String API_PACKAGE_PARAM = "apiPackage";
+    public static final String INVOKER_PACKAGE_PARAM = "invokerPackage";
+
+    private AdditionalParams() {
+    }
+}
--- a/modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java
+++ b/modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java
@@ -0,0 +1,186 @@
+package io.swagger.codegen.plugin;
+
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import 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.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.project.MavenProject;
+
+import config.Config;
+import config.ConfigParser;
+
+import java.io.File;
+import java.util.Map;
+import java.util.ServiceLoader;
+
+import static io.swagger.codegen.plugin.AdditionalParams.API_PACKAGE_PARAM;
+import static io.swagger.codegen.plugin.AdditionalParams.INVOKER_PACKAGE_PARAM;
+import static io.swagger.codegen.plugin.AdditionalParams.MODEL_PACKAGE_PARAM;
+import static io.swagger.codegen.plugin.AdditionalParams.TEMPLATE_DIR_PARAM;
+
+/**
+ * Goal which generates client/server code from a swagger json/yaml definition.
+ */
+@Mojo(name = "generate", defaultPhase = LifecyclePhase.GENERATE_SOURCES)
+public class CodeGenMojo extends AbstractMojo {
+    /**
+     * Location of the output directory.
+     */
+    @Parameter(name = "output",
+            property = "swagger.codegen.maven.plugin.output",
+            defaultValue = "${project.build.directory}/generated-sources/swagger")
+    private File output;
+
+    /**
+     * Location of the swagger spec, as URL or file.
+     */
+    @Parameter(name = "inputSpec", required = true)
+    private String inputSpec;
+
+    /**
+     * Folder containing the template files.
+     */
+    @Parameter(name = "templateDirectory")
+    private File templateDirectory;
+
+    /**
+     * The package to use for generated model objects/classes
+     */
+    @Parameter(name = "modelPackage")
+    private String modelPackage;
+
+    /**
+     * The package to use for generated api objects/classes
+     */
+    @Parameter(name = "apiPackage")
+    private String apiPackage;
+
+    /**
+     * The package to use for the generated invoker objects
+     */
+    @Parameter(name = "invokerPackage")
+    private String invokerPackage;
+
+    /**
+     * Client language to generate.
+     */
+    @Parameter(name = "language", required = true)
+    private String language;
+
+    /**
+     * Path to separate json configuration file.
+     */
+    @Parameter(name = "configurationFile", required = false)
+    private String configurationFile;
+
+    /**
+     * A map of language-specific parameters as passed with the -c option to the command line
+     */
+    @Parameter(name = "configOptions")
+    private Map configOptions;
+
+    /**
+     * Add the output directory to the project as a source root, so that the
+     * generated java types are compiled and included in the project artifact.
+     */
+    @Parameter(defaultValue = "true")
+    private boolean addCompileSourceRoot = true;
+
+    /**
+     * The project being built.
+     */
+    @Parameter(readonly = true, required = true, defaultValue = "${project}")
+    private MavenProject project;
+
+    @Override
+    public void execute() throws MojoExecutionException {
+        Swagger swagger = new SwaggerParser().read(inputSpec);
+
+        CodegenConfig config = forName(language);
+        config.setOutputDir(output.getAbsolutePath());
+
+        if (null != templateDirectory) {
+            config.additionalProperties().put(TEMPLATE_DIR_PARAM, templateDirectory.getAbsolutePath());
+        }
+        if (null != modelPackage) {
+            config.additionalProperties().put(MODEL_PACKAGE_PARAM, modelPackage);
+        }
+        if (null != apiPackage) {
+            config.additionalProperties().put(API_PACKAGE_PARAM, apiPackage);
+        }
+        if (null != invokerPackage) {
+            config.additionalProperties().put(INVOKER_PACKAGE_PARAM, invokerPackage);
+        }
+
+        if (configOptions != null) {
+            for (CliOption langCliOption : config.cliOptions()) {
+                if (configOptions.containsKey(langCliOption.getOpt())) {
+                    config.additionalProperties().put(langCliOption.getOpt(),
+                            configOptions.get(langCliOption.getOpt()));
+                }
+            }
+        }
+
+        if (null != configurationFile) {
+            Config genConfig = ConfigParser.read(configurationFile);
+            if (null != genConfig) {
+                for (CliOption langCliOption : config.cliOptions()) {
+                    if (genConfig.hasOption(langCliOption.getOpt())) {
+                        config.additionalProperties().put(langCliOption.getOpt(), genConfig.getOption(langCliOption.getOpt()));
+                    }
+                }
+            } else {
+            	throw new RuntimeException("Unable to read configuration file");
+            }
+        }
+        
+        ClientOptInput input = new ClientOptInput().opts(new ClientOpts()).swagger(swagger);
+        input.setConfig(config);
+        new DefaultGenerator().opts(input).generate();
+
+        if (addCompileSourceRoot) {
+            project.addCompileSourceRoot(output.toString());
+        }
+    }
+
+    private CodegenConfig forName(String name) {
+        ServiceLoader<CodegenConfig> loader = ServiceLoader.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);
+        }
+    }
+}
--- a/modules/swagger-codegen/pom.xml
+++ b/modules/swagger-codegen/pom.xml
@@ -1,341 +1,347 @@
-<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">
-  <parent>
-    <groupId>com.wordnik</groupId>
-    <artifactId>swagger-codegen-project</artifactId>
-    <version>2.1.0-M2</version>
-    <relativePath>../..</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.wordnik</groupId>
-  <artifactId>swagger-codegen</artifactId>
-  <packaging>jar</packaging>
-  <name>swagger-codegen (core library)</name>
-  <version>2.1.0-M2</version>
-  <build>
-    <sourceDirectory>src/main/java</sourceDirectory>
-    <defaultGoal>install</defaultGoal>
-    <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>com.wordnik.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>com.wordnik</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>
+<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.3</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>net.alchim31.maven</groupId>
-            <artifactId>scala-maven-plugin</artifactId>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>compile</goal>
-                  <goal>testCompile</goal>
-                </goals>
-              </execution>
-            </executions>
-            <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>
+            <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>
-                  <sources>
-                    <source>src/main/scala</source>
-                  </sources>
+                    <mainClass>io.swagger.codegen.Codegen</mainClass>
                </configuration>
-              </execution>
-            </executions>
-          </plugin>
+            </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>
+                    <recompileMode>incremental</recompileMode>
+                    <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>
-      </build>
-    </profile>
-    <profile>
-      <id>release-sign-artifacts</id>
-      <activation>
-        <property>
-          <name>performRelease</name>
-          <value>true</value>
-        </property>
-      </activation>
-      <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>net.alchim31.maven</groupId>
+                    <artifactId>scala-maven-plugin</artifactId>
+                    <version>${scala-maven-plugin-version}</version>
+                </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>
+                            <scalaVersion>${scala-version}</scalaVersion>
+                        </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-gpg-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>sign-artifacts</id>
-                <phase>verify</phase>
-                <goals>
-                  <goal>sign</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
+            <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>
-      </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>
-    </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>
-  </dependencies>
-  <repositories>
-    <repository>
-      <id>sonatype-snapshots</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
+    </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>
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/AbstractGenerator.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/AbstractGenerator.java
@@ -1,60 +0,0 @@
-package com.wordnik.swagger.codegen;
-
-import com.samskivert.mustache.*;
-
-import java.util.regex.Pattern;
-import java.io.*;
-
-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;
-  }
-}
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/ClientOptInput.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/ClientOptInput.java
@@ -1,104 +0,0 @@
-/**
- *  Copyright 2015 Reverb, Inc.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-package com.wordnik.swagger.codegen;
-
-import com.wordnik.swagger.codegen.ClientOpts;
-import com.wordnik.swagger.annotations.*;
-import com.wordnik.swagger.models.Swagger;
-import com.wordnik.swagger.models.auth.AuthorizationValue;
-
-import java.util.*;
-import java.net.URLEncoder;
-import java.net.URLDecoder;
-
-public class ClientOptInput {
-  private ClientOpts opts;
-  private Swagger swagger;
-  private List<AuthorizationValue> auths;
-  protected CodegenConfig config;
-
-  public ClientOptInput swagger(Swagger swagger) {
-    this.setSwagger(swagger);
-    return this;
-  }
-  public ClientOptInput opts(ClientOpts opts) {
-    this.setOpts(opts);
-    return this;
-  }
-
-  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 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 List<AuthorizationValue> getAuthorizationValues() {
-    return auths;
-  }
-
-  public CodegenConfig getConfig() {
-    return config;
-  }
-  public void setConfig(CodegenConfig config) {
-    this.config = config;
-  }
-
-  public void setOpts(ClientOpts opts) {
-    this.opts = opts;
-  }
-
-  public ClientOpts getOpts() {
-    return opts;
-  }
-
-  public void setSwagger(Swagger swagger) {
-    this.swagger = swagger;
-  }
-
-  @ApiModelProperty(dataType="Object")
-  public Swagger getSwagger() {
-    return swagger;
-  }
-}
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/ClientOpts.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/ClientOpts.java
@@ -1,52 +0,0 @@
-package com.wordnik.swagger.codegen;
-
-import com.wordnik.swagger.codegen.auth.*;
-
-import java.util.*;
-
-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();
-  }
-}
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/Codegen.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/Codegen.java
@@ -1,143 +0,0 @@
-package com.wordnik.swagger.codegen;
-
-import com.wordnik.swagger.codegen.languages.*;
-import com.wordnik.swagger.models.Swagger;
-import com.wordnik.swagger.models.auth.AuthorizationValue;
-import com.wordnik.swagger.util.*;
-
-import io.swagger.parser.SwaggerParser;
-
-import org.apache.commons.cli.*;
-
-import java.io.File;
-import java.util.*;
-
-/**
- * @deprecated use instead {@link com.wordnik.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 {
-    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();
-    }
-  }
-
-  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);
-      }
-    }
-  }
-}
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenConfig.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenConfig.java
@@ -1,59 +0,0 @@
-package com.wordnik.swagger.codegen;
-
-import com.wordnik.swagger.models.*;
-import com.wordnik.swagger.models.auth.SecuritySchemeDefinition;
-import com.wordnik.swagger.models.properties.*;
-
-import java.util.*;
-
-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();
-  String generateExamplePath(String path, Operation operation);
-
-  Set<String> reservedWords();
-
-  List<SupportingFile> supportingFiles();
-
-  void setOutputDir(String dir);
-  String getOutputDir();
-
-  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);
-}
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenModel.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenModel.java
@@ -1,16 +0,0 @@
-package com.wordnik.swagger.codegen;
-
-import com.wordnik.swagger.models.*;
-import com.wordnik.swagger.models.properties.*;
-
-import java.util.*;
-
-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;
-  public ExternalDocs externalDocs;
-}
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenModelFactory.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenModelFactory.java
@@ -1,38 +0,0 @@
-package com.wordnik.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);
-    }
-  }
-}
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenModelType.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenModelType.java
@@ -1,21 +0,0 @@
-package com.wordnik.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;
-  }
-}
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenOperation.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenOperation.java
@@ -1,32 +0,0 @@
-package com.wordnik.swagger.codegen;
-
-import com.wordnik.swagger.models.*;
-
-import java.util.*;
-
-public class CodegenOperation {
-  public Boolean hasConsumes, hasProduces, hasParams, returnTypeIsPrimitive,
-    returnSimpleType, subresourceOperation, isMapContainer, isListContainer,
-    hasMore = Boolean.TRUE;
-  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 final List<CodegenProperty> responseHeaders = new ArrayList<CodegenProperty>();
-  public Set<String> imports = new HashSet<String>();
-  public List<Map<String, String>> examples;
-  public ExternalDocs externalDocs;
-
-  // legacy support
-  public String nickname;
-}
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenParameter.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenParameter.java
@@ -1,40 +0,0 @@
-package com.wordnik.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;
-  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;
-
-    return output;
-  }
-}
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenProperty.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenProperty.java
@@ -1,25 +0,0 @@
-package com.wordnik.swagger.codegen;
-
-import java.util.*;
-
-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, maximum, exclusiveMinimum, 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;
-}
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenResponse.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenResponse.java
@@ -1,17 +0,0 @@
-package com.wordnik.swagger.codegen;
-
-import java.util.*;
-
-public class CodegenResponse {
-  public String code, message;
-  public Boolean hasMore;
-  public List<Map<String, String>> examples;
-  public final List<CodegenProperty> headers = new ArrayList<CodegenProperty>();
-  public String dataType, baseType, containerType;
-  public Boolean simpleType;
-  public Boolean primitiveType;
-  public Boolean isMapContainer;
-  public Boolean isListContainer;
-  public Object schema;
-  public String jsonSchema;
-}
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenSecurity.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenSecurity.java
@@ -1,11 +0,0 @@
-package com.wordnik.swagger.codegen;
-
-public class CodegenSecurity {
-  String name;
-  String type;
-  Boolean hasMore, isBasic, isOAuth, isApiKey;
-  // ApiKey specific
-  String keyParamName;
-  Boolean isKeyInQuery, isKeyInHeader;
-
-}
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenType.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/CodegenType.java
@@ -1,34 +0,0 @@
-package com.wordnik.swagger.codegen;
-
-import com.fasterxml.jackson.annotation.*;
-
-import java.util.Map;
-import java.util.HashMap;
-
-public enum CodegenType {
-  CLIENT, SERVER, DOCUMENTATION, OTHER;
-
-  private static Map<String, CodegenType> names = new HashMap<String, CodegenType>();
-
-  static {
-    names.put("client", CLIENT);
-    names.put("server", SERVER);
-    names.put("documentation", DOCUMENTATION);
-    names.put("other", OTHER);
-  }
-
-  @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
-  }
-}
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultGenerator.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultGenerator.java
@@ -1,440 +0,0 @@
-package com.wordnik.swagger.codegen;
-
-import com.samskivert.mustache.Mustache;
-import com.samskivert.mustache.Template;
-import com.wordnik.swagger.models.Contact;
-import com.wordnik.swagger.models.Info;
-import com.wordnik.swagger.models.License;
-import com.wordnik.swagger.models.Model;
-import com.wordnik.swagger.models.Operation;
-import com.wordnik.swagger.models.Path;
-import com.wordnik.swagger.models.Swagger;
-import com.wordnik.swagger.models.auth.SecuritySchemeDefinition;
-import com.wordnik.swagger.util.Json;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
-
-import java.io.File;
-import java.io.Reader;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-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();
-      if (swagger.getSchemes() != null && swagger.getSchemes().size() > 0) {
-        hostBuilder.append(swagger.getSchemes().get(0).toValue());
-        hostBuilder.append("://");
-      } else {
-        hostBuilder.append("https://");
-      }
-      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));
-
-        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 suffix = config.apiTemplateFiles().get(templateName);
-          String filename = config.apiFileFolder() +
-                  File.separator +
-                  config.toApiFilename(tag) +
-                  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(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("contextPath", contextPath);
-      bundle.put("apiInfo", apis);
-      bundle.put("models", allModels);
-      bundle.put("apiFolder", config.apiPackage().replace('.', File.separatorChar));
-      bundle.put("modelPackage", config.modelPackage());
-      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;
-  }
-
-  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));
-    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);
-      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;
-  }
-}
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/Generator.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/Generator.java
@@ -1,11 +0,0 @@
-package com.wordnik.swagger.codegen;
-
-import com.wordnik.swagger.models.Swagger;
-
-import java.io.File;
-import java.util.List;
-
-public interface Generator {
-  Generator opts(ClientOptInput opts);
-  List<File> generate();
-}
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/MetaGenerator.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/MetaGenerator.java
@@ -1,185 +0,0 @@
-package com.wordnik.swagger.codegen;
-
-import com.wordnik.swagger.codegen.languages.*;
-import com.wordnik.swagger.models.Swagger;
-import com.wordnik.swagger.models.auth.AuthorizationValue;
-import com.wordnik.swagger.util.*;
-
-import io.swagger.parser.SwaggerParser;
-
-import com.samskivert.mustache.*;
-
-import org.apache.commons.cli.*;
-import org.apache.commons.io.FileUtils;
-
-import java.io.File;
-import java.io.Reader;
-import java.util.*;
-
-/**
- * @deprecated use instead {@link com.wordnik.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;
-  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();
-    }
-  }
-
-  public static void main(String[] args) {
-    new MetaGenerator().generate(args);
-  }
-
-  protected void generate(String[] args) {
-    StringBuilder sb = new StringBuilder();
-    String targetLanguage = null;
-    String outputFolder = null;
-    String name = null;
-    String targetPackage = "com.wordnik.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 com.wordnik.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", "com.wordnik.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();
-      }
-    }
-  }
-
-  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;
-  }
-}
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/SupportingFile.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/SupportingFile.java
@@ -1,13 +0,0 @@
-package com.wordnik.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;
-  }
-}
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/auth/AuthMethod.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/auth/AuthMethod.java
@@ -1,6 +0,0 @@
-package com.wordnik.swagger.codegen.auth;
-
-public interface AuthMethod {
-  String getType();
-  void setType(String type);
-}
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/examples/ExampleGenerator.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/examples/ExampleGenerator.java
@@ -1,165 +0,0 @@
-package com.wordnik.swagger.codegen.examples;
-
-import com.wordnik.swagger.models.*;
-import com.wordnik.swagger.models.properties.*;
-import com.wordnik.swagger.util.Json;
-
-import java.text.SimpleDateFormat;
-
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
- 
-
-import java.math.BigDecimal;
-import java.util.*;
-
-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, String> 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) {
-            example = example.replaceAll("\n", "\\\\n");
-            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) {
-            example = example.replaceAll("\n", "\\\\n");
-            kv.put("example", example);
-            output.add(kv);
-          }
-        }
-      }
-    }
-    else {
-      for(String key: examples.keySet()) {
-        String value = examples.get(key);
-
-        Map<String, String> kv = new HashMap<String, String>();
-        kv.put("contentType", key);
-        kv.put("example", value);
-        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 "";
-  }
-}
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/examples/XmlExampleGenerator.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/examples/XmlExampleGenerator.java
@@ -1,188 +0,0 @@
-package com.wordnik.swagger.codegen.examples;
-
-
-import com.wordnik.swagger.util.Json;
-import com.wordnik.swagger.models.*;
-import com.wordnik.swagger.models.properties.*;
-
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-public class XmlExampleGenerator {
-  public static String NEWLINE = "\n";
-  public static String TAG_START = "<";
-  public static String CLOSE_TAG = ">";
-  public static String TAG_END = "</";
-  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);
-  }
-
-  protected String toXml(Model model, int indent) {
-    if(model instanceof RefModel) {
-      RefModel ref = (RefModel) model;
-      Model actualModel = examples.get(ref.getSimpleRef());
-      if(actualModel instanceof ModelImpl)
-        return modelImplToXml((ModelImpl)actualModel, indent);
-    }
-    else if(model instanceof ModelImpl) {
-      return modelImplToXml((ModelImpl)model, indent);
-    }
-    return null;
-  }
-
-  protected String modelImplToXml(ModelImpl model, int indent) {
-    StringBuilder sb = new StringBuilder();
-    // attributes
-    Map<String, Property> attributes = new LinkedHashMap<String, Property>();
-    Map<String, Property> elements = new LinkedHashMap<String, Property>();
-
-    String name = model.getName();
-    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)));
-    }
-    sb.append(CLOSE_TAG);
-    sb.append(NEWLINE);
-    for(String pName : elements.keySet()) {
-      Property p = elements.get(pName);
-      sb.append(toXml(pName, p, indent + 1));
-      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) {
-    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) {
-        if(name != null) {
-          sb.append(indent(indent));
-          sb.append(openTag(name));
-          sb.append(NEWLINE);
-        }
-        sb.append(toXml(name, inner, indent + 1));
-        if(name != null) {
-          sb.append(NEWLINE);
-          sb.append(indent(indent));
-          sb.append(closeTag(name));
-        }
-      }
-      else
-        sb.append(toXml(name, inner, indent));
-    }
-    else if(property instanceof RefProperty) {
-      RefProperty ref = (RefProperty) property;
-      Model actualModel = examples.get(ref.getSimpleRef());
-      sb.append(toXml(actualModel, indent));
-    }
-    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();
-  }
-}
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/AndroidClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/AndroidClientCodegen.java
@@ -1,166 +0,0 @@
-package com.wordnik.swagger.codegen.languages;
-
-import com.wordnik.swagger.codegen.*;
-import com.wordnik.swagger.models.properties.*;
-
-import java.util.*;
-import java.io.File;
-
-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 sourceFolder = "src/main/java";
-
-  public CodegenType getTag() {
-    return CodegenType.CLIENT;
-  }
-
-  public String getName() {
-    return "android";
-  }
-
-  public String getHelp() {
-    return "Generates an Android client library.";
-  }
-
-  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")
-    );
-
-    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("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"));
-
-    languageSpecificPrimitives = new HashSet<String>(
-      Arrays.asList(
-        "String",
-        "boolean",
-        "Boolean",
-        "Double",
-        "Integer",
-        "Long",
-        "Float",
-        "Object")
-      );
-    instantiationTypes.put("array", "ArrayList");
-    instantiationTypes.put("map", "HashMap");
-  }
-
-  @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);
-  }
-
-
-}
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/AsyncScalaClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/AsyncScalaClientCodegen.java
@@ -1,194 +0,0 @@
-package com.wordnik.swagger.codegen.languages;
-
-import com.wordnik.swagger.codegen.*;
-import com.wordnik.swagger.models.properties.*;
-
-import java.util.*;
-import java.io.File;
-
-public class AsyncScalaClientCodegen extends DefaultCodegen implements CodegenConfig {
-  protected String invokerPackage = "io.swagger.client";
-  protected String groupId = "com.wordnik";
-  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 CodegenType getTag() {
-    return CodegenType.CLIENT;
-  }
-  
-  public String getName() {
-    return "async-scala";
-  }
-
-  public String getHelp() {
-    return "Generates an Asynchronous Scala client library.";
-  }
-
-  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");
-  }
-
-  @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";
-  }
-}
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/CSharpClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/CSharpClientCodegen.java
@@ -1,166 +0,0 @@
-package com.wordnik.swagger.codegen.languages;
-
-import com.wordnik.swagger.codegen.*;
-import com.wordnik.swagger.models.properties.*;
-
-import java.util.*;
-import java.io.File;
-
-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 CodegenType getTag() {
-    return CodegenType.CLIENT;
-  }
-
-  public String getName() {
-    return "csharp";
-  }
-
-  public String getHelp() {
-    return "Generates a CSharp client library.";
-  }
-
-  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("apiInvoker.mustache", 
-      (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiInvoker.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("compile.mustache", "", "compile.bat"));
-
-    languageSpecificPrimitives = new HashSet<String>(
-      Arrays.asList(
-        "String",
-        "boolean",
-        "Boolean",
-        "Double",
-        "Integer",
-        "Long",
-        "Float",
-        "Object")
-      );
-    instantiationTypes.put("array", "List");
-    instantiationTypes.put("map", "Dictionary");
-
-    typeMapping = new HashMap<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("Date", "DateTime");
-    typeMapping.put("file", "byte[]");
-    typeMapping.put("array", "List");
-    typeMapping.put("map", "Dictionary");
-
-  }
-
-  @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 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)) {
-      type = typeMapping.get(swaggerType);
-      if(languageSpecificPrimitives.contains(type))
-        return type;
-    }
-    else
-      type = swaggerType;
-    return type;
-  }
-}
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JavaClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JavaClientCodegen.java
@@ -1,163 +0,0 @@
-package com.wordnik.swagger.codegen.languages;
-
-import com.wordnik.swagger.codegen.*;
-import com.wordnik.swagger.models.properties.*;
-
-import java.util.*;
-import java.io.File;
-
-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 CodegenType getTag() {
-    return CodegenType.CLIENT;
-  }
-
-  public String getName() {
-    return "java";
-  }
-
-  public String getHelp() {
-    return "Generates a Java client library.";
-  }
-
-  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")
-    );
-
-    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("apiInvoker.mustache", 
-      (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiInvoker.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"));
-
-    languageSpecificPrimitives = new HashSet<String>(
-      Arrays.asList(
-        "String",
-        "boolean",
-        "Boolean",
-        "Double",
-        "Integer",
-        "Long",
-        "Float",
-        "Object")
-      );
-    instantiationTypes.put("array", "ArrayList");
-    instantiationTypes.put("map", "HashMap");
-  }
-
-  @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);
-  }
-}
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JaxRSServerCodegen.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JaxRSServerCodegen.java
@@ -1,149 +0,0 @@
-package com.wordnik.swagger.codegen.languages;
-
-import com.wordnik.swagger.models.Operation;
-import com.wordnik.swagger.models.Path;
-import com.wordnik.swagger.util.Json;
-import com.wordnik.swagger.codegen.*;
-import com.wordnik.swagger.models.properties.*;
-
-import java.util.*;
-import java.io.File;
-
-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 sourceFolder = "src/main/java";
-  protected String title = "Swagger Server";
-
-  public CodegenType getTag() {
-    return CodegenType.SERVER;
-  }
-
-  public String getName() {
-    return "jaxrs";
-  }
-
-  public String getHelp() {
-    return "Generates a Java JAXRS Server application.";
-  }
-
-  public JaxRSServerCodegen() {
-    super();
-    outputFolder = "generated-code/javaJaxRS";
-    modelTemplateFiles.put("model.mustache", ".java");
-    apiTemplateFiles.put("api.mustache", ".java");
-    templateDir = "JavaJaxRS";
-    apiPackage = "io.swagger.api";
-    modelPackage = "io.swagger.model";
-
-    additionalProperties.put("invokerPackage", invokerPackage);
-    additionalProperties.put("groupId", groupId);
-    additionalProperties.put("artifactId", artifactId);
-    additionalProperties.put("artifactVersion", artifactVersion);
-    additionalProperties.put("title", title);
-
-    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"));
-
-    languageSpecificPrimitives = new HashSet<String>(
-      Arrays.asList(
-        "String",
-        "boolean",
-        "Boolean",
-        "Double",
-        "Integer",
-        "Long",
-        "Float")
-      );
-  }
-
-  @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;
-  }
-}
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/NodeJSServerCodegen.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/NodeJSServerCodegen.java
@@ -1,192 +0,0 @@
-package com.wordnik.swagger.codegen.languages;
-
-import com.wordnik.swagger.codegen.*;
-import com.wordnik.swagger.util.Json;
-import com.wordnik.swagger.models.properties.*;
-
-import java.util.*;
-import java.io.File;
-
-public class NodeJSServerCodegen extends DefaultCodegen implements CodegenConfig {
-  protected String apiVersion = "1.0.0";
-  protected int serverPort = 8080;
-  protected String projectName = "swagger-server";
-
-  public String apiPackage() {
-    return "controllers";
-  }
-
-  /**
-   * Configures the type of generator.
-   * 
-   * @return  the CodegenType for this generator
-   * @see     com.wordnik.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.";
-  }
-
-  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
-    }
-  }
-
-  @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) {
-    Map<String, Object> objectMap = (Map<String, Object>)objs.get("operations");
-    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.size() > 0) {
-        List<Map<String, String>> examples = operation.examples;
-        for(int i = examples.size() - 1; i >= 0; i--) {
-          Map<String, String> example = examples.get(i);
-          String contentType = example.get("contentType");
-          if(contentType != null && contentType.indexOf("application/json") == 0) {
-            String jsonExample = example.get("example");
-            if(jsonExample != null) {
-              jsonExample = jsonExample.replaceAll("\\\\n", "\n");
-              example.put("example", jsonExample);
-            }            
-          }
-          else
-            examples.remove(i);
-        }
-      }
-    }
-    return objs;
-  }
-}
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ObjcClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ObjcClientCodegen.java
@@ -1,273 +0,0 @@
-package com.wordnik.swagger.codegen.languages;
-
-import com.wordnik.swagger.util.Json;
-import com.wordnik.swagger.codegen.*;
-import com.wordnik.swagger.models.properties.*;
-
-import java.util.*;
-import java.io.File;
-
-public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig {
-  protected Set<String> foundationClasses = new HashSet<String>();
-  protected String sourceFolder = "client";
-  protected static String PREFIX = "SWG";
-
-  public CodegenType getTag() {
-    return CodegenType.CLIENT;
-  }
-  
-  public String getName() {
-    return "objc";
-  }
-
-  public String getHelp() {
-    return "Generates an Objective-C client library.";
-  }
-
-  public ObjcClientCodegen() {
-    super();
-    outputFolder = "generated-code/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 = "";
-
-    String appName = System.getProperty("appName");
-    if(appName == null) {
-      appName = "swaggerClient";
-    }
-    additionalProperties.put("projectName", appName);
-
-    defaultIncludes = new HashSet<String>(
-      Arrays.asList(
-        "bool",
-        "int",
-        "NSString",
-        "NSObject", 
-        "NSArray",
-        "NSNumber",
-        "NSDate",
-        "NSDictionary",
-        "NSMutableArray",
-        "NSMutableDictionary")
-      );
-    languageSpecificPrimitives = new HashSet<String>(
-      Arrays.asList(
-        "NSNumber",
-        "NSString",
-        "NSObject",
-        "NSDate",
-        "bool")
-      );
-
-    reservedWords = new HashSet<String>(
-      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", "description"
-      ));
-
-    typeMapping = new HashMap<String, String>();
-    typeMapping.put("enum", "NSString");
-    typeMapping.put("Date", "NSDate");
-    typeMapping.put("DateTime", "NSDate");
-    typeMapping.put("boolean", "NSNumber");
-    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");
-
-    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("SWGDate.h", sourceFolder, "SWGDate.h"));
-    supportingFiles.add(new SupportingFile("SWGDate.m", sourceFolder, "SWGDate.m"));
-    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. `'
-          else {
-              return swaggerType + "*";
-          }
-      }
-  }
-
-  @Override
-  public String toModelName(String type) {
-    if(typeMapping.keySet().contains(type) ||
-      foundationClasses.contains(type) ||
-      importMapping.values().contains(type) ||
-      defaultIncludes.contains(type) ||
-      languageSpecificPrimitives.contains(type)) {
-      return Character.toUpperCase(type.charAt(0)) + type.substring(1);
-    }
-    else {
-      return PREFIX + Character.toUpperCase(type.charAt(0)) + type.substring(1);
-    }
-  }
-
-    @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 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_]","");
-    if(paramName.startsWith("new") || reservedWords.contains(paramName)) {
-      return escapeReservedWord(paramName);
-    }
-    else
-      return paramName;
-  }
-
-  public String escapeReservedWord(String name) {
-    return "_" + name;
-  }
-}
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PhpClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PhpClientCodegen.java
@@ -1,162 +0,0 @@
-package com.wordnik.swagger.codegen.languages;
-
-import com.wordnik.swagger.codegen.*;
-import com.wordnik.swagger.util.Json;
-import com.wordnik.swagger.models.properties.*;
-
-import java.util.*;
-import java.io.File;
-
-public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
-  protected String invokerPackage = "com.wordnik.client";
-  protected String groupId = "com.wordnik";
-  protected String artifactId = "swagger-client";
-  protected String artifactVersion = "1.0.0";
-
-  public CodegenType getTag() {
-    return CodegenType.CLIENT;
-  }
-
-  public String getName() {
-    return "php";
-  }
-
-  public String getHelp() {
-    return "Generates a PHP client library.";
-  }
-
-  public PhpClientCodegen() {
-    super();
-
-    //TODO determine hte package name from host name
-    invokerPackage = camelize("SwaggerPetstore"); 
-
-    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";
-
-    typeMapping.clear();
-    languageSpecificPrimitives.clear();
-
-    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);
-
-    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");
-
-    supportingFiles.add(new SupportingFile("composer.mustache", packagePath, "composer.json"));
-    supportingFiles.add(new SupportingFile("APIClient.mustache", packagePath + "/lib", "APIClient.php"));
-    supportingFiles.add(new SupportingFile("APIClientException.mustache", packagePath + "/lib", "APIClientException.php"));
-    supportingFiles.add(new SupportingFile("require.mustache", packagePath, invokerPackage + ".php"));
-  }
-
-  @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;
-    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);
-  }
-
-}
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PythonClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/PythonClientCodegen.java
@@ -1,117 +0,0 @@
-package com.wordnik.swagger.codegen.languages;
-
-import com.wordnik.swagger.codegen.*;
-import com.wordnik.swagger.models.properties.*;
-
-import java.io.File;
-import java.util.*;
-
-public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig {
-  String module = "client";
-
-  public CodegenType getTag() {
-    return CodegenType.CLIENT;
-  }
-
-  public String getName() {
-    return "python";
-  }
-
-  public String getHelp() {
-    return "Generates a Python client library.";
-  }
-
-  public PythonClientCodegen() {
-    super();
-    outputFolder = "generated-code/python";
-    modelTemplateFiles.put("model.mustache", ".py");
-    apiTemplateFiles.put("api.mustache", ".py");
-    templateDir = "python";
-    
-    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", "long");
-    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"));
-    supportingFiles.add(new SupportingFile("__init__.mustache", modelPackage.replace('.', File.separatorChar), "__init__.py"));
-  }
-
-  @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";
-  }	
-}
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/RubyClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/RubyClientCodegen.java
@@ -1,190 +0,0 @@
-package com.wordnik.swagger.codegen.languages;
-
-import com.wordnik.swagger.codegen.*;
-import com.wordnik.swagger.util.Json;
-import com.wordnik.swagger.models.properties.*;
-
-import java.util.*;
-import java.io.File;
-
-public class RubyClientCodegen extends DefaultCodegen implements CodegenConfig {
-  protected String invokerPackage = "com.wordnik.client";
-  protected String groupId = "com.wordnik";
-  protected String artifactId = "swagger-client";
-  protected String artifactVersion = "1.0.0";
-
-  public CodegenType getTag() {
-    return CodegenType.CLIENT;
-  }
-
-  public String getName() {
-    return "ruby";
-  }
-
-  public String getHelp() {
-    return "Generates a Ruby client library.";
-  }
-
-  public RubyClientCodegen() {
-    super();
-    modelPackage = "models";
-    apiPackage = "lib";
-    outputFolder = "generated-code/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("invokerPackage", invokerPackage);
-    additionalProperties.put("groupId", groupId);
-    additionalProperties.put("artifactId", artifactId);
-    additionalProperties.put("artifactVersion", artifactVersion);
-
-    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");
-
-    supportingFiles.add(new SupportingFile("swagger.mustache", "", "lib/swagger.rb"));
-    supportingFiles.add(new SupportingFile("monkey.mustache", "", "lib/monkey.rb"));
-    supportingFiles.add(new SupportingFile("swagger/request.mustache", "", "lib/swagger/request.rb"));
-    supportingFiles.add(new SupportingFile("swagger/response.mustache", "", "lib/swagger/response.rb"));
-    supportingFiles.add(new SupportingFile("swagger/version.mustache", "", "lib/swagger/version.rb"));
-    supportingFiles.add(new SupportingFile("swagger/configuration.mustache", "", "lib/swagger/configuration.rb"));
-  }
-
-  @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;
-    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";
-  }
-
-}
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ScalaClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ScalaClientCodegen.java
@@ -1,192 +0,0 @@
-package com.wordnik.swagger.codegen.languages;
-
-import com.wordnik.swagger.codegen.*;
-import com.wordnik.swagger.models.properties.*;
-
-import java.util.*;
-import java.io.File;
-
-public class ScalaClientCodegen extends DefaultCodegen implements CodegenConfig {
-  protected String invokerPackage = "io.swagger.client";
-  protected String groupId = "com.wordnik";
-  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 CodegenType getTag() {
-    return CodegenType.CLIENT;
-  }
-  
-  public String getName() {
-    return "scala";
-  }
-
-  public String getHelp() {
-    return "Generates a Scala client library.";
-  }
-
-  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");
-  }
-
-  @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";
-  }
-}
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ScalatraServerCodegen.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ScalatraServerCodegen.java
@@ -1,178 +0,0 @@
-package com.wordnik.swagger.codegen.languages;
-
-import com.wordnik.swagger.codegen.*;
-import com.wordnik.swagger.models.properties.*;
-import com.wordnik.swagger.util.Json;
-
-import java.util.*;
-import java.io.File;
-
-public class ScalatraServerCodegen extends DefaultCodegen implements CodegenConfig {
-  protected String invokerPackage = "com.wordnik.client";
-  protected String groupId = "com.wordnik";
-  protected String artifactId = "swagger-client";
-  protected String artifactVersion = "1.0.0";
-  protected String sourceFolder = "src/main/scala";
-
-  public CodegenType getTag() {
-    return CodegenType.SERVER;
-  }
-
-  public String getName() {
-    return "scalatra";
-  }
-
-  public String getHelp() {
-    return "Generates a Scala server application with Scalatra.";
-  }
-
-  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://developers.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("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");
-  }
-
-  @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);
-  }
-}
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/StaticDocCodegen.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/StaticDocCodegen.java
@@ -1,76 +0,0 @@
-package com.wordnik.swagger.codegen.languages;
-
-import com.wordnik.swagger.codegen.*;
-import com.wordnik.swagger.models.properties.*;
-
-import java.util.*;
-import java.io.File;
-
-public class StaticDocCodegen extends DefaultCodegen implements CodegenConfig {
-  protected String invokerPackage = "com.wordnik.client";
-  protected String groupId = "com.wordnik";
-  protected String artifactId = "swagger-client";
-  protected String artifactVersion = "1.0.0";
-  protected String sourceFolder = "docs";
-
-  public CodegenType getTag() {
-    return CodegenType.DOCUMENTATION;
-  }
-
-  public String getName() {
-    return "dynamic-html";
-  }
-
-  public String getHelp() {
-    return "Generates a dynamic HTML site.";
-  }
-
-  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");
-  }
-
-  @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";
-  }
-}
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/StaticHtmlGenerator.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/StaticHtmlGenerator.java
@@ -1,79 +0,0 @@
-package com.wordnik.swagger.codegen.languages;
-
-import com.wordnik.swagger.codegen.*;
-import com.wordnik.swagger.models.properties.*;
-import com.wordnik.swagger.util.Json;
-
-import java.util.*;
-import java.io.File;
-
-public class StaticHtmlGenerator extends DefaultCodegen implements CodegenConfig {
-  protected String invokerPackage = "com.wordnik.client";
-  protected String groupId = "com.wordnik";
-  protected String artifactId = "swagger-client";
-  protected String artifactVersion = "1.0.0";
-  protected String sourceFolder = "src/main/scala";
-
-  public CodegenType getTag() {
-    return CodegenType.DOCUMENTATION;
-  }
-
-  public String getName() {
-    return "html";
-  }
-
-  public String getHelp() {
-    return "Generates a static HTML file.";
-  }
-
-  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> ();
-  }
-
-  @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;
-  }
-}
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/SwaggerGenerator.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/SwaggerGenerator.java
@@ -1,45 +0,0 @@
-package com.wordnik.swagger.codegen.languages;
-
-import com.wordnik.swagger.codegen.*;
-import com.wordnik.swagger.util.*;
-import com.wordnik.swagger.models.Swagger;
-
-import org.apache.commons.io.FileUtils;
-
-import java.io.File;
-
-public class SwaggerGenerator extends DefaultCodegen implements CodegenConfig {
-  public CodegenType getTag() {
-    return CodegenType.DOCUMENTATION;
-  }
-
-  public String getName() {
-    return "swagger";
-  }
-
-  public String getHelp() {
-    return "Creates a static swagger.json file.";
-  }
-
-  public SwaggerGenerator() {
-    super();
-    templateDir = "swagger";
-    outputFolder = "generated-code/swagger";
-
-    supportingFiles.add(new SupportingFile("README.md", "", "README.md"));
-  }
-
-  @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();
-    }
-  }
-}
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/SwaggerYamlGenerator.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/SwaggerYamlGenerator.java
@@ -1,44 +0,0 @@
-package com.wordnik.swagger.codegen.languages;
-
-import com.wordnik.swagger.codegen.*;
-import com.wordnik.swagger.util.*;
-import com.wordnik.swagger.models.Swagger;
-
-import org.apache.commons.io.FileUtils;
-
-import java.io.File;
-
-public class SwaggerYamlGenerator extends DefaultCodegen implements CodegenConfig {
-  public CodegenType getTag() {
-    return CodegenType.DOCUMENTATION;
-  }
-
-  public String getName() {
-    return "swagger-yaml";
-  }
-
-  public String getHelp() {
-    return "Creates a static swagger.yaml file.";
-  }
-
-  public SwaggerYamlGenerator() {
-    super();
-    templateDir = "swagger";
-    outputFolder = "generated-code/swagger";
-
-    supportingFiles.add(new SupportingFile("README.md", "", "README.md"));
-  }
-
-  @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();
-    }
-  }
-}
--- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/TizenClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/TizenClientCodegen.java
@@ -1,247 +0,0 @@
-package com.wordnik.swagger.codegen.languages;
-
-import com.wordnik.swagger.util.Json;
-import com.wordnik.swagger.codegen.*;
-import com.wordnik.swagger.models.properties.*;
-
-import java.util.*;
-import java.io.File;
-
-public class TizenClientCodegen extends DefaultCodegen implements CodegenConfig {
-  protected Set<String> foundationClasses = new HashSet<String>();
-  protected String sourceFolder = "client";
-  protected static String PREFIX = "Sami";
-  protected Map<String, String> namespaces = new HashMap<String, String>();
-
-  public CodegenType getTag() {
-    return CodegenType.CLIENT;
-  }
-  
-  public String getName() {
-    return "tizen";
-  }
-
-  public String getHelp() {
-    return "Generates a Samsung Tizen C++ client library.";
-  }
-
-  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"));
-  }
-
-  @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;
-  }
-}
--- a/modules/swagger-codegen/src/main/java/config/Config.java
+++ b/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);
+    }
+}
--- a/modules/swagger-codegen/src/main/java/config/ConfigParser.java
+++ b/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;
+    }
+}
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/AbstractGenerator.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/AbstractGenerator.java
@@ -0,0 +1,90 @@
+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);
+    }
+
+    /**
+     * Get the template file path with template dir prepended, and use the
+     * library template if exists.
+     */
+    public String getFullTemplateFile(CodegenConfig config, String templateFile) {
+        String library = config.getLibrary();
+        if (library != null && !"".equals(library)) {
+            String libTemplateFile = config.templateDir() + File.separator +
+                "libraries" + File.separator + library + File.separator +
+                templateFile;
+            if (templateExists(libTemplateFile)) {
+                return libTemplateFile;
+            }
+        }
+        return config.templateDir() + File.separator + templateFile;
+    }
+
+    public boolean templateExists(String name) {
+        return this.getClass().getClassLoader().getResource(getCPResourcePath(name)) != null;
+    }
+
+    public String getCPResourcePath(String name) {
+        if (!"/".equals(File.separator)) {
+            return name.replaceAll(Pattern.quote(File.separator), "/");
+        }
+        return name;
+    }
+}
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CliOption.java
+++ b/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;
+    }
+}
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/ClientOptInput.java
+++ b/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;
+    }
+}
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/ClientOpts.java
+++ b/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();
+    }
+}
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/Codegen.java
+++ b/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();
+        }
+    }
+}
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConfig.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConfig.java
@@ -0,0 +1,120 @@
+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);
+
+    CodegenModel fromModel(String name, Model model, Map<String, Model> allDefinitions);
+
+    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);
+
+    boolean isSkipOverwrite();
+
+    void setSkipOverwrite(boolean skipOverwrite);
+
+    Map<String, String> supportedLibraries();
+
+    void setLibrary(String library);
+
+    /**
+     * Library template (sub-template).
+     */
+    String getLibrary();
+}
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenModel.java
+++ b/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;
+}
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenModelFactory.java
+++ b/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);
+        }
+    }
+}
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenModelType.java
+++ b/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;
+    }
+}
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenOperation.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenOperation.java
@@ -0,0 +1,52 @@
+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;
+
+    private boolean nonempty(List<CodegenParameter> params)
+    {
+        return params != null && params.size() > 0;
+    }
+    public boolean getHasBodyParam() {
+        return nonempty(bodyParams);
+    }
+    public boolean getHasQueryParams() {
+        return nonempty(bodyParams);
+    }
+    public boolean getHasHeaderParams() {
+        return nonempty(bodyParams);
+    }
+    public boolean getHasPathParams() {
+        return nonempty(bodyParams);
+    }
+
+    // legacy support
+    public String nickname;
+}
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenParameter.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenParameter.java
@@ -0,0 +1,56 @@
+package io.swagger.codegen;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.List;
+
+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;
+    public boolean isEnum;
+    public List<String> _enum;
+    public Map<String, Object> allowableValues;
+
+    /**
+     * 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;
+        output.isEnum = this.isEnum;
+        if (this._enum != null) {
+            output._enum = new ArrayList<String>(this._enum);
+        }
+        if (this.allowableValues != null) {
+            output.allowableValues = new HashMap<String, Object>(this.allowableValues);
+        }
+
+        return output;
+    }
+}
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenProperty.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenProperty.java
@@ -0,0 +1,140 @@
+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;
+    public CodegenProperty items;
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final CodegenProperty other = (CodegenProperty) obj;
+        if ((this.baseName == null) ? (other.baseName != null) : !this.baseName.equals(other.baseName)) {
+            return false;
+        }
+        if ((this.complexType == null) ? (other.complexType != null) : !this.complexType.equals(other.complexType)) {
+            return false;
+        }
+        if ((this.getter == null) ? (other.getter != null) : !this.getter.equals(other.getter)) {
+            return false;
+        }
+        if ((this.setter == null) ? (other.setter != null) : !this.setter.equals(other.setter)) {
+            return false;
+        }
+        if ((this.description == null) ? (other.description != null) : !this.description.equals(other.description)) {
+            return false;
+        }
+        if ((this.datatype == null) ? (other.datatype != null) : !this.datatype.equals(other.datatype)) {
+            return false;
+        }
+        if ((this.datatypeWithEnum == null) ? (other.datatypeWithEnum != null) : !this.datatypeWithEnum.equals(other.datatypeWithEnum)) {
+            return false;
+        }
+        if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
+            return false;
+        }
+        if ((this.min == null) ? (other.min != null) : !this.min.equals(other.min)) {
+            return false;
+        }
+        if ((this.max == null) ? (other.max != null) : !this.max.equals(other.max)) {
+            return false;
+        }
+        if ((this.defaultValue == null) ? (other.defaultValue != null) : !this.defaultValue.equals(other.defaultValue)) {
+            return false;
+        }
+        if ((this.baseType == null) ? (other.baseType != null) : !this.baseType.equals(other.baseType)) {
+            return false;
+        }
+        if ((this.containerType == null) ? (other.containerType != null) : !this.containerType.equals(other.containerType)) {
+            return false;
+        }
+        if (this.maxLength != other.maxLength && (this.maxLength == null || !this.maxLength.equals(other.maxLength))) {
+            return false;
+        }
+        if (this.minLength != other.minLength && (this.minLength == null || !this.minLength.equals(other.minLength))) {
+            return false;
+        }
+        if ((this.pattern == null) ? (other.pattern != null) : !this.pattern.equals(other.pattern)) {
+            return false;
+        }
+        if ((this.example == null) ? (other.example != null) : !this.example.equals(other.example)) {
+            return false;
+        }
+        if ((this.jsonSchema == null) ? (other.jsonSchema != null) : !this.jsonSchema.equals(other.jsonSchema)) {
+            return false;
+        }
+        if (this.minimum != other.minimum && (this.minimum == null || !this.minimum.equals(other.minimum))) {
+            return false;
+        }
+        if (this.maximum != other.maximum && (this.maximum == null || !this.maximum.equals(other.maximum))) {
+            return false;
+        }
+        if (this.exclusiveMinimum != other.exclusiveMinimum && (this.exclusiveMinimum == null || !this.exclusiveMinimum.equals(other.exclusiveMinimum))) {
+            return false;
+        }
+        if (this.exclusiveMaximum != other.exclusiveMaximum && (this.exclusiveMaximum == null || !this.exclusiveMaximum.equals(other.exclusiveMaximum))) {
+            return false;
+        }
+        if (this.required != other.required && (this.required == null || !this.required.equals(other.required))) {
+            return false;
+        }
+        if (this.secondaryParam != other.secondaryParam && (this.secondaryParam == null || !this.secondaryParam.equals(other.secondaryParam))) {
+            return false;
+        }
+        if (this.isPrimitiveType != other.isPrimitiveType && (this.isPrimitiveType == null || !this.isPrimitiveType.equals(other.isPrimitiveType))) {
+            return false;
+        }
+        if (this.isContainer != other.isContainer && (this.isContainer == null || !this.isContainer.equals(other.isContainer))) {
+            return false;
+        }
+        if (this.isNotContainer != other.isNotContainer && (this.isNotContainer == null || !this.isNotContainer.equals(other.isNotContainer))) {
+            return false;
+        }
+        if (this.isEnum != other.isEnum) {
+            return false;
+        }
+        if (this._enum != other._enum && (this._enum == null || !this._enum.equals(other._enum))) {
+            return false;
+        }
+        if (this.allowableValues != other.allowableValues && (this.allowableValues == null || !this.allowableValues.equals(other.allowableValues))) {
+            return false;
+        }
+        return true;
+    }
+}
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenResponse.java
+++ b/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);
+    }
+}
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenSecurity.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenSecurity.java
@@ -0,0 +1,15 @@
+package io.swagger.codegen;
+
+import java.util.Set;
+
+public class CodegenSecurity {
+    public String name;
+    public String type;
+    public Boolean hasMore, isBasic, isOAuth, isApiKey;
+    // ApiKey specific
+    public String keyParamName;
+    public Boolean isKeyInQuery, isKeyInHeader;
+    // Oauth specific
+    public String flow, authorizationUrl, tokenUrl;
+    public Set<String> scopes;
+}
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenType.java
+++ b/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);
+    }
+}
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
@@ -0,0 +1,607 @@
+package io.swagger.codegen;
+
+import static org.apache.commons.lang3.StringUtils.capitalize;
+import static org.apache.commons.lang3.StringUtils.isNotEmpty;
+
+import com.samskivert.mustache.Mustache;
+import com.samskivert.mustache.Template;
+import io.swagger.codegen.languages.CodeGenStatus;
+import io.swagger.models.ComposedModel;
+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.OAuth2Definition;
+import io.swagger.models.auth.SecuritySchemeDefinition;
+import io.swagger.models.parameters.Parameter;
+import io.swagger.util.Json;
+import org.apache.commons.io.IOUtils;
+import org.joda.time.DateTime;
+
+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.Collections;
+import java.util.Comparator;
+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;
+
+public class DefaultGenerator extends AbstractGenerator implements Generator {
+    protected CodegenConfig config;
+    protected ClientOptInput opts = null;
+    protected Swagger swagger = null;
+
+    public CodeGenStatus status = CodeGenStatus.UNRUN;
+
+    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();
+
+            config.additionalProperties().put("generatedDate", DateTime.now().toString());
+            config.additionalProperties().put("generatorClass", config.getClass().toString());
+
+            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());
+            }
+            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) {
+            	List<String> sortedModelKeys = sortModelsByInheritance(definitions);
+
+                for (String name : sortedModelKeys) {
+                    Model model = definitions.get(name);
+                    Map<String, Model> modelMap = new HashMap<String, Model>();
+                    modelMap.put(name, model);
+                    Map<String, Object> models = processModels(config, modelMap, definitions);
+                    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;
+                        if (!config.shouldOverwrite(filename)) {
+                            continue;
+                        }
+                        String templateFile = getFullTemplateFile(config, templateName);
+                        String template = readTemplate(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(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 (!config.shouldOverwrite(filename) && new File(filename).exists()) {
+                        continue;
+                    }
+
+                    String templateFile = getFullTemplateFile(config, templateName);
+                    String template = readTemplate(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(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());
+            List<CodegenSecurity> authMethods = config.fromSecurity(swagger.getSecurityDefinitions());
+            if (authMethods != null && !authMethods.isEmpty()) {
+                bundle.put("authMethods", authMethods);
+                bundle.put("hasAuthMethods", true);
+            }
+            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 (!config.shouldOverwrite(outputFilename)) {
+                    continue;
+                }
+
+                String templateFile = getFullTemplateFile(config, support.templateFile);
+
+                if (templateFile.endsWith("mustache")) {
+                    String template = readTemplate(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(templateFile);
+                    } catch (Exception e) {
+                        // continue
+                    }
+                    if (in == null) {
+                        in = this.getClass().getClassLoader().getResourceAsStream(getCPResourcePath(templateFile));
+                    }
+                    File outputFile = new File(outputFilename);
+                    OutputStream out = new FileOutputStream(outputFile, false);
+                    if (in != null && out != null) {
+                        System.out.println("writing file " + outputFile);
+                        IOUtils.copy(in, out);
+                    } else {
+                        if (in == null) {
+                            System.out.println("can't open " + templateFile + " for input");
+                        }
+                        if (out == null) {
+                            System.out.println("can't open " + outputFile + " for output");
+                        }
+                    }
+
+                    files.add(outputFile);
+                }
+            }
+
+            config.processSwagger(swagger);
+
+            status = CodeGenStatus.SUCCESSFUL;
+        } catch (Exception e) {
+            status = CodeGenStatus.FAILED;
+        }
+        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);
+        }
+    }
+
+    private List<String> sortModelsByInheritance(final Map<String, Model> definitions) {
+    	List<String> sortedModelKeys = new ArrayList<String>(definitions.keySet());
+    	Comparator<String> cmp = new Comparator<String>() {
+			@Override
+			public int compare(String o1, String o2) {
+				Model model1 = definitions.get(o1);
+				Model model2 = definitions.get(o2);
+
+				int model1InheritanceDepth = getInheritanceDepth(model1);
+				int model2InheritanceDepth = getInheritanceDepth(model2);
+
+				if (model1InheritanceDepth == model2InheritanceDepth) {
+					return 0;
+				} else if (model1InheritanceDepth > model2InheritanceDepth) {
+					return 1;
+				} else {
+					return -1;
+				}
+			}
+
+			private int getInheritanceDepth(Model model) {
+				int inheritanceDepth = 0;
+				Model parent = getParent(model);
+
+				while (parent != null) {
+					inheritanceDepth++;
+					parent = getParent(parent);
+				}
+
+				return inheritanceDepth;
+			}
+
+			private Model getParent(Model model) {
+				if (model instanceof ComposedModel) {
+					return definitions.get(((ComposedModel) model).getParent().getReference());
+				}
+
+				return null;
+			}
+		};
+
+		Collections.sort(sortedModelKeys, cmp);
+
+		return sortedModelKeys;
+    }
+
+    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, path);
+            processOperation(resourcePath, "put", path.getPut(), ops, path);
+            processOperation(resourcePath, "post", path.getPost(), ops, path);
+            processOperation(resourcePath, "delete", path.getDelete(), ops, path);
+            processOperation(resourcePath, "patch", path.getPatch(), ops, path);
+            processOperation(resourcePath, "options", path.getOptions(), ops, path);
+        }
+        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, Path path) {
+        if (operation != null) {
+            List<String> tags = operation.getTags();
+            if (tags == null) {
+                tags = new ArrayList<String>();
+                tags.add("default");
+            }
+            
+            /*
+             build up a set of parameter "ids" defined at the operation level
+             per the swagger 2.0 spec "A unique parameter is defined by a combination of a name and location"
+              i'm assuming "location" == "in"
+            */
+            Set<String> operationParameters = new HashSet<String>();
+            if (operation.getParameters() != null) {
+                for (Parameter parameter : operation.getParameters()) {
+                    operationParameters.add(generateParameterId(parameter));
+                }
+            }
+
+            //need to propagate path level down to the operation
+            if(path.getParameters() != null) {
+                for (Parameter parameter : path.getParameters()) {
+                    //skip propagation if a parameter with the same name is already defined at the operation level
+                    if (!operationParameters.contains(generateParameterId(parameter))) {
+                        operation.addParameter(parameter);
+                    }
+                }
+            }
+
+            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) {
+                    	if(securityDefinition instanceof OAuth2Definition) {
+                    		OAuth2Definition oauth2Definition = (OAuth2Definition) securityDefinition;
+                    		OAuth2Definition oauth2Operation = new OAuth2Definition();
+                    		oauth2Operation.setType(oauth2Definition.getType());
+                    		oauth2Operation.setAuthorizationUrl(oauth2Definition.getAuthorizationUrl());
+                    		oauth2Operation.setFlow(oauth2Definition.getFlow());
+                    		oauth2Operation.setTokenUrl(oauth2Definition.getTokenUrl());
+                    		for (String scope : security.values().iterator().next()) {
+                    			if (oauth2Definition.getScopes().containsKey(scope)) {
+                    				oauth2Operation.addScope(scope, oauth2Definition.getScopes().get(scope));
+                    			}
+                    		}
+                    		authMethods.put(securityName, oauth2Operation);
+                    	} else {
+                    		authMethods.put(securityName, securityDefinition);
+                    	}
+                    }
+                }
+                if (!authMethods.isEmpty()) {
+                    co.authMethods = config.fromSecurity(authMethods);
+                }
+            }
+        }
+    }
+
+    private String generateParameterId(Parameter parameter) {
+        return parameter.getName() + ":" + parameter.getIn();
+    }
+
+    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));
+        objs.put("pathPrefix", config.toApiVarName(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);
+
+        // add a flag to indicate whether there's any {{import}}
+        if (imports.size() > 0) {
+            operations.put("hasImport", true);
+        }
+
+        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, Model> allDefinitions) {
+        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, allDefinitions);
+            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;
+    }
+}
--- a/Show More
+++ b/Show More