Upstream merge

Author: jharmn

LICENSE

@@ -1,4 +1,4 @@
-Copyright 2014 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.

README.md

@@ -45,7 +45,7 @@ This includes:
 
 ## See it in Action
 
-If you just want to see it work, check out the [pet store sample](http://petstore.swagger.wordnik.com).
+If you just want to see it work, check out the [pet store sample](http://petstore.swagger.io/).
 
 ## Additional Libraries
 
@@ -70,6 +70,7 @@ These are third party tools generated by the Swagger community. Note that not al
   - [compojure-api](https://github.com/metosin/compojure-api) - Swagger for Compojure
   - [fnhouse-swagger](https://github.com/metosin/fnhouse-swagger) - Swagger for fnhouse
   - [pedestal-swagger](https://github.com/frankiesardo/pedestal-swagger) - Swagger for pedestal
+- [swagger1st](https://github.com/sarnowski/swagger1st) - A Clojure/Ring handler that does parsing, validation and routing based on swagger definitions.
 
 ### ColdFusion / CFML
 - [swagger-docs-cfml](https://github.com/webonix/swagger-docs-cfml) - create swagger docs from CFML (Railo) ReST components.
@@ -132,6 +133,7 @@ These are third party tools generated by the Swagger community. Note that not al
 - [swagger-express](https://github.com/fliptoo/swagger-express) - A simple and clean solution to integrate swagger with express straight away from jsdoc or a yaml file.
 - [Swagger Parser](https://github.com/BigstickCarpet/swagger-parser#swagger-parser) - Parses, validates, and dereferences JSON/YAML Swagger specs in Node and browsers
 - [Swagger Express Middleware](https://github.com/BigstickCarpet/swagger-express-middleware/#swagger-express-middleware) - Swagger middleware and mocks for Express.js
+- [swagger-mongodb](https://github.com/kaizhu256/node-swagger-mongodb) - lightweight swagger-ui crud-api backed by mongodb
 
 #### Perl
 - [Raisin](https://github.com/khrt/Raisin) - A framework with a built-in Swagger support.
@@ -153,6 +155,9 @@ These are third party tools generated by the Swagger community. Note that not al
 - [pyswagger](https://github.com/AntXlab/pyswagger) - A type-safe, dynamic, spec-compliant Swagger client.
 - [flex](https://github.com/pipermerriam/flex) - Swagger 2.0 schema validation, and tooling for validating arbitrary request/response objects.
 - [flask-swagger](https://github.com/gangverk/flask-swagger) - A Swagger 2.0 extractor for Flask via YAML in docstrings
+- [bravado](https://github.com/Yelp/bravado) - Swagger 2.0 client with support for both synchronous and asynchronous http.
+- [bravado-core](https://github.com/Yelp/bravado-core) - Library for Swagger 2.0 schema ingestion, validation, request/response validation, etc.
+- [swagger-spec-validator](https://github.com/Yelp/swagger_spec_validator) - Library for validating Swagger 1.2 and 2.0 schemas.
 
 #### Ruby
 - [grape-swagger](https://github.com/tim-vandecasteele/grape-swagger) - Add Swagger compliant documentation to your grape API.
@@ -176,7 +181,7 @@ These are third party tools generated by the Swagger community:
 
 ## License
 
-Copyright 2014 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.

examples/v2.0/yaml/petstore-expanded.yaml

@@ -3,15 +3,15 @@ info:
   version: 1.0.0
   title: Swagger Petstore
   description: A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification
-  termsOfService: http://helloreverb.com/terms/
+  termsOfService: http://swagger.io/terms/
   contact:
-    name: Wordnik API Team
+    name: Swagger API Team
     email: [email protected]
     url: http://madskristensen.net
   license:
     name: MIT
     url: http://github.com/gruntjs/grunt/blob/master/LICENSE-MIT
-host: petstore.swagger.wordnik.com
+host: petstore.swagger.io
 basePath: /api
 schemes:
   - http

examples/v2.0/yaml/petstore.yaml

@@ -4,7 +4,7 @@ info:
   title: Swagger Petstore
   license:
     name: MIT
-host: petstore.swagger.wordnik.com
+host: petstore.swagger.io
 basePath: /v1
 schemes:
   - http

fixtures/v1.2/helloworld/server/README.md

@@ -1,6 +1,6 @@
 # All-in-one Static Hello World Sample
 
-This sample project provides an all-one-one package demo for the Hello World sample described in the [wiki](https://github.com/wordnik/swagger-spec/wiki/Hello-World-Sample).
+This sample project provides an all-one-one package demo for the Hello World sample described in the [wiki](https://github.com/swagger-api/swagger-spec/wiki/Hello-World-Sample).
 
 ## Requirements
 

fixtures/v1.2/helloworld/server/pom.xml

@@ -1,10 +1,10 @@
 <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>
-  <groupId>com.wordnik</groupId>
-  <artifactId>wordnik-swagger-demo</artifactId>
+  <groupId>io.swagger</groupId>
+  <artifactId>swagger-demo</artifactId>
   <packaging>jar</packaging>
-  <name>wordnik-swagger-demo</name>
+  <name>swagger-demo</name>
   <version>1.0.1-SNAPSHOT</version>
   <prerequisites>
     <maven>2.2.0</maven>

fixtures/v1.2/helloworld/static/README.md

@@ -1,3 +1,3 @@
 # Static Hello World Sample Files
 
-This sample project provides the static files to be hosted in your web server, following the Hello World sample described in the [wiki](https://github.com/wordnik/swagger-spec/wiki/Hello-World-Sample).
+This sample project provides the static files to be hosted in your web server, following the Hello World sample described in the [wiki](https://github.com/swagger-api/swagger-spec/wiki/Hello-World-Sample).

fixtures/v2.0/json/resources/cascadingSchemes.json

@@ -4,10 +4,10 @@
     "version": "1.0.9-abcd",
     "title": "Swagger Sample API",
     "description": "A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification",
-    "termsOfService": "http://helloreverb.com/terms/",
+    "termsOfService": "http://swagger.io/terms/",
     "contact": {
-      "name": "wordnik api team",
-      "url": "http://developer.wordnik.com"
+      "name": "Swagger API Team",
+      "url": "http://swagger.io"
     },
     "license": {
       "name": "Creative Commons 4.0 International",

fixtures/v2.0/json/resources/commonParameters.json

@@ -4,10 +4,10 @@
     "version": "1.0.9-abcd",
     "title": "Swagger Sample API",
     "description": "A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification",
-    "termsOfService": "http://helloreverb.com/terms/",
+    "termsOfService": "http://swagger.io/terms/",
     "contact": {
-      "name": "wordnik api team",
-      "url": "http://developer.wordnik.com"
+      "name": "Swagger API Team",
+      "url": "http://swagger.io"
     },
     "license": {
       "name": "Creative Commons 4.0 International",

fixtures/v2.0/json/resources/multipleMimeTypes.json

@@ -4,10 +4,10 @@
     "version": "1.0.9-abcd",
     "title": "Swagger Sample API",
     "description": "A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification",
-    "termsOfService": "http://helloreverb.com/terms/",
+    "termsOfService": "http://swagger.io/terms/",
     "contact": {
-      "name": "wordnik api team",
-      "url": "http://developer.wordnik.com"
+      "name": "Swagger API Team",
+      "url": "http://swagger.io"
     },
     "license": {
       "name": "Creative Commons 4.0 International",