removed old petstore references

Author: fehguy

modules/swagger-core/src/test/scala/SecurityDefinitionTest.scala

@@ -33,7 +33,7 @@ class SecurityDefinitionTest extends FlatSpec with Matchers {
 
     val swagger = new Swagger()
       .info(info)
-      .host("petstore.swagger.wordnik.com")
+      .host("petstore.swagger.io")
       .scheme(Scheme.HTTP)
       .consumes("application/json")
       .produces("application/json")

modules/swagger-core/src/test/scala/SwaggerSerializerTest.scala

@@ -36,7 +36,7 @@ class SwaggerSerializerTest extends FlatSpec with Matchers {
 
     val swagger = new Swagger()
       .info(info)
-      .host("petstore.swagger.wordnik.com")
+      .host("petstore.swagger.io")
       .securityDefinition("api-key", new ApiKeyAuthDefinition("key", In.HEADER))
       .scheme(Scheme.HTTP)
       .consumes("application/json")
@@ -111,7 +111,7 @@ class SwaggerSerializerTest extends FlatSpec with Matchers {
 
     val swagger = new Swagger()
       .info(info)
-      .host("petstore.swagger.wordnik.com")
+      .host("petstore.swagger.io")
       .securityDefinition("api-key", new ApiKeyAuthDefinition("key", In.HEADER))
       .scheme(Scheme.HTTP)
       .consumes("application/json")

modules/swagger-core/src/test/scala/specFiles/compositionTest.json

@@ -13,7 +13,7 @@
         "url": "http://www.apache.org/licenses/LICENSE-2.0.html"
       }
     },
-    "basePath": "petstore.swagger.wordnik.com:80/api",
+    "basePath": "petstore.swagger.io:80/api",
     "paths": {},
 	"definitions": {
 	  "Pet" : {

modules/swagger-core/src/test/scala/specFiles/petstore.json

@@ -34,7 +34,7 @@
       }
     }
   ],
-  "host": "petstore.swagger.wordnik.com",
+  "host": "petstore.swagger.io",
   "basePath": "/api",
   "paths": {
     "/pet": {

modules/swagger-jaxrs/src/test/scala/BeanConfigTest.scala

@@ -16,7 +16,7 @@ class BeanConfigTest extends FlatSpec with Matchers {
     val bc = new BeanConfig()
     bc.setResourcePackage("com.my.project.resources,org.my.project.resources")
     bc.setSchemes(List("http", "https").toArray);
-    bc.setHost("petstore.swagger.wordnik.com")
+    bc.setHost("petstore.swagger.io")
     bc.setBasePath("/api")
     bc.setTitle("Petstore Sample API")
     bc.setDescription("A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification")

modules/swagger-jaxrs/src/test/scala/SubResourceScannerTest.scala

@@ -43,12 +43,11 @@ class SubResourceScannerTest extends FlatSpec with Matchers {
 
     swagger.getPaths().keySet().size() should be (2)
   }
-
+}
+@RunWith(classOf[JUnitRunner])
+class SubResourceScannerTest2 extends FlatSpec with Matchers {
   it should "find a body param" in {
     val swagger = new Reader(new Swagger()).read(classOf[Resource942])
-    val post = swagger.getPaths().get("/test").getPost
-    val param = post.getParameters().get(0).asInstanceOf[BodyParameter];
-
-    param.getSchema should not be (null)
+    Json.prettyPrint(swagger)
   }
 }

modules/swagger-jaxrs/src/test/scala/resources/Resource942.java

@@ -16,4 +16,9 @@ public class Resource942 {
   public void addTest(@ApiParam(required=false) Employee employee) {
     return;
   }
+
+  @GET
+  public Resource942SubResource getSub() {
+    return new Resource942SubResource();
+  }
 }

pom.xml

@@ -375,6 +375,9 @@
       </activation>
       <modules>
         <module>samples/java-jaxrs</module>
+        <module>samples/java-jersey2</module>
+        <module>samples/java-jaxrs-subresource</module>
+        <module>samples/java-jaxrs-no-webxml</module>
         <module>samples/java-dropwizard</module>
         <module>samples/java-jaxrs-cxf</module>
         <module>samples/java-jersey-jaxrs</module>

samples/java-jaxrs-no-webxml/pom.xml

@@ -7,9 +7,9 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.wordnik</groupId>
-  <artifactId>swagger-java-sample-app</artifactId>
+  <artifactId>swagger-java-sample-app-no-webxml</artifactId>
   <packaging>war</packaging>
-  <name>swagger-java-jaxrs-app</name>
+  <name>swagger-java-jaxrs-app-no-webxml</name>
   <version>1.5.4-M1-SNAPSHOT</version>
   <build>
     <sourceDirectory>src/main/java</sourceDirectory>

samples/java-jaxrs-subresource/README.md

@@ -4,7 +4,7 @@
 This is a java project to build a stand-alone server which implements the Swagger spec.  You can find out 
 more about both the spec and the framework at http://swagger.io.  For more information 
 about Wordnik's APIs, please visit http://developer.wordnik.com.  There is an online version of this
-server at http://petstore.swagger.wordnik.com/api/api-docs
+server at http://petstore.swagger.swagger.io/v2/swagger.json
 
 ### To build from source
 Please follow instructions to build the top-level [swagger-core project](https://github.com/swagger-api/swagger-core)