bump core version, adds multi sample with basepath discriminator refs swagger-api/swagger-core#1656

java/java-jersey-jaxrs-multi-use-basepath/README.md

@@ -0,0 +1,35 @@
+# Swagger Sample App
+
+This is the pet store sample hosted at http://petstore.swagger.io!
+
+## Overview
+This is a java project to build a stand-alone server which implements the OpenAPI Spec.  You can find out 
+more about both the spec and the framework at http://swagger.io. 
+
+### To run (with Maven)
+To run the server, run this task:
+
+```
+mvn package -Dlog4j.configuration=file:./conf/log4j.properties jetty:run
+```
+
+This will start Jetty embedded on port 8002.
+
+### Testing the server
+This sample demonstrate configuring two different "swagger contexts" (config + scanner) defined in two separate servlets in same web app.
+Once started, you can navigate to http://localhost:8002/api1/swagger.json and http://localhost:8002/api2/swagger.json to view the Swagger Resource Listing.
+This tells you that the server is up and ready to demonstrate Swagger.
+
+### Using the UI
+There is an HTML5-based API tool bundled in this sample--you can view it it at [http://localhost:8002](http://localhost:8002). This lets you inspect the API using an interactive UI.  You can access the source of this code from [here](https://github.com/swagger-api/swagger-ui)
+
+### Applying an API key
+The sample app has an implementation of the Swagger ApiAuthorizationFilter.  This restricts access to resources
+based on api-key.  There are two keys defined in the sample app:
+
+<li>- default-key</li>
+
+<li>- special-key</li>
+
+When no key is applied, the "default-key" is applied to all operations.  If the "special-key" is entered, a
+number of other resources are shown in the UI, including sample CRUD operations.

java/java-jersey-jaxrs-multi-use-basepath/conf/log4j.properties

@@ -0,0 +1,18 @@
+log4j.rootCategory=ERROR, CONSOLE, LOGFILE
+
+log4j.logger.io.swagger=ERROR
+log4j.logger.org.atmosphere=ERROR
+
+# CONSOLE is set to be a ConsoleAppender using a PatternLayout.
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%p %d{yyyy-MM-dd HH:mm:ss.SSS Z} %c{1} - %m%n
+
+# LOGFILE is set to be a File appender using a PatternLayout.
+log4j.appender.LOGFILE=org.apache.log4j.RollingFileAppender
+log4j.appender.LOGFILE.File=logs/swagger.log
+log4j.appender.LOGFILE.Append=true
+log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout
+log4j.appender.LOGFILE.layout.ConversionPattern=%p %d{yyyy-MM-dd HH:mm:ss.SSS Z} %c{1} - %m%n
+log4j.appender.LOGFILE.MaxFileSize=10MB
+log4j.appender.LOGFILE.MaxBackupIndex=10

java/java-jersey-jaxrs-multi-use-basepath/pom.xml

@@ -0,0 +1,168 @@
+<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>io.swagger</groupId>
+    <artifactId>swagger-samples-project</artifactId>
+    <version>1.0.0</version>
+    <relativePath>../..</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>io.swagger</groupId>
+  <artifactId>swagger-java-jersey-multi-sample-app</artifactId>
+  <packaging>war</packaging>
+  <name>swagger-java-jersey-jaxrs-multi-app</name>
+  <version>1.0.0</version>
+  <build>
+    <sourceDirectory>src/main/java</sourceDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.1.1</version>
+      </plugin>
+      <plugin>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <version>2.6</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>integration-test</goal>
+              <goal>verify</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>jetty-maven-plugin</artifactId>
+        <version>${jetty-version}</version>
+        <configuration>
+          <webAppConfig>
+            <contextPath>/</contextPath>
+          </webAppConfig>
+          <webAppSourceDirectory>target/${project.artifactId}-${project.version}</webAppSourceDirectory>
+          <webDefaultXml>${project.basedir}/conf/jetty/webdefault.xml</webDefaultXml>
+          <stopPort>8079</stopPort>
+          <stopKey>stopit</stopKey>
+          <connectors>
+            <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
+              <port>8002</port>
+              <maxIdleTime>60000</maxIdleTime>
+              <confidentialPort>8443</confidentialPort>
+            </connector>
+          </connectors>
+        </configuration>
+        <executions>
+          <execution>
+            <id>start-jetty</id>
+            <phase>pre-integration-test</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <scanIntervalSeconds>0</scanIntervalSeconds>
+              <daemon>true</daemon>
+            </configuration>
+          </execution>
+          <execution>
+            <id>stop-jetty</id>
+            <phase>post-integration-test</phase>
+            <goals>
+              <goal>stop</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>com.googlecode.maven-download-plugin</groupId>
+        <artifactId>download-maven-plugin</artifactId>
+        <version>1.2.1</version>
+        <executions>
+          <execution>
+            <id>swagger-ui</id>
+            <goals>
+              <goal>wget</goal>
+            </goals>
+            <configuration>
+              <url>https://github.com/swagger-api/swagger-ui/archive/master.tar.gz</url>
+              <unpack>true</unpack>
+              <outputDirectory>${project.build.directory}</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>2.6</version>
+        <executions>
+          <execution>
+            <id>copy-resources</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>target/${project.artifactId}-${project.version}</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>${project.build.directory}/swagger-ui-master/dist</directory>
+                  <filtering>true</filtering>
+                  <excludes>
+                    <exclude>index.html</exclude>
+                  </excludes>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>io.swagger</groupId>
+      <artifactId>swagger-jersey-jaxrs</artifactId>
+      <version>${swagger-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>${logback-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-core</artifactId>
+      <version>${logback-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>1.3.2</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-json</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.jersey</groupId>
+      <artifactId>jersey-servlet</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.scalatest</groupId>
+      <artifactId>scalatest_2.10</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>

java/java-jersey-jaxrs-multi-use-basepath/src/main/java/io/swagger/sample/Bootstrap.java

@@ -0,0 +1,49 @@
+package io.swagger.sample;
+
+import io.swagger.jaxrs.config.SwaggerContextService;
+import io.swagger.models.*;
+
+import io.swagger.models.auth.*;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+
+public class Bootstrap extends HttpServlet {
+  @Override
+  public void init(ServletConfig config) throws ServletException {
+    Info info = new Info()
+      .title("Swagger Petstore")
+      .description("api1 This is a sample server Petstore server.  You can find out more about Swagger " +
+        "at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, " +
+        "you can use the api key `special-key` to test the authorization filters.")
+      .termsOfService("http://swagger.io1/terms/")
+      .contact(new Contact()
+        .email("apiteam@swagger.io"))
+      .license(new License()
+        .name("Apache 2.0")
+        .url("http://www.apache.org/licenses/LICENSE-2.0.html"));
+
+    Swagger swagger = new Swagger().info(info);
+    swagger.externalDocs(new ExternalDocs("Find out more about Swagger", "http://swagger.io"));
+    swagger.securityDefinition("api_key", new ApiKeyAuthDefinition("api_key", In.HEADER));
+    swagger.securityDefinition("petstore_auth", 
+      new OAuth2Definition()
+        .implicit("http://petstore.swagger.io/api/oauth/dialog")
+        .scope("read:pets", "read your pets")
+        .scope("write:pets", "modify pets in your account"));
+    swagger.tag(new Tag()
+      .name("pet")
+      .description("Everything about your Pets")
+      .externalDocs(new ExternalDocs("Find out more", "http://swagger.io")));
+    swagger.tag(new Tag()
+      .name("store")
+      .description("Access to Petstore orders"));
+    swagger.tag(new Tag()
+      .name("user")
+      .description("Operations about user")
+      .externalDocs(new ExternalDocs("Find out more about our store", "http://swagger.io")));
+
+    new SwaggerContextService().withServletConfig(config).withBasePath("/api1").updateSwagger(swagger);
+  }
+}

java/java-jersey-jaxrs-multi-use-basepath/src/main/java/io/swagger/sample/Bootstrap2.java

@@ -0,0 +1,55 @@
+package io.swagger.sample;
+
+import io.swagger.jaxrs.config.SwaggerContextService;
+import io.swagger.models.Contact;
+import io.swagger.models.ExternalDocs;
+import io.swagger.models.Info;
+import io.swagger.models.License;
+import io.swagger.models.Swagger;
+import io.swagger.models.Tag;
+import io.swagger.models.auth.ApiKeyAuthDefinition;
+import io.swagger.models.auth.In;
+import io.swagger.models.auth.OAuth2Definition;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+
+public class Bootstrap2 extends HttpServlet {
+  @Override
+  public void init(ServletConfig config) throws ServletException {
+    Info info = new Info()
+      .title("Swagger 2 Petstore api2")
+      .description("api2 This is a sample server Petstore server.  You can find out more about Swagger " +
+        "at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, " +
+        "you can use the api key `special-key` to test the authorization filters.")
+      .termsOfService("http://swagger.io2/terms/")
+      .contact(new Contact()
+        .email("apiteam@swagger.io"))
+      .license(new License()
+        .name("Apache 2.0")
+        .url("http://www.apache.org/licenses/LICENSE-2.0.html"));
+
+    Swagger swagger = new Swagger().info(info);
+    swagger.externalDocs(new ExternalDocs("Find out more about Swagger", "http://swagger.io"));
+    swagger.securityDefinition("api_key", new ApiKeyAuthDefinition("api_key", In.HEADER));
+    swagger.securityDefinition("petstore_auth", 
+      new OAuth2Definition()
+        .implicit("http://petstore.swagger.io/api/oauth/dialog")
+        .scope("read:pets", "read your pets")
+        .scope("write:pets", "modify pets in your account"));
+    swagger.tag(new Tag()
+      .name("pet")
+      .description("Everything about your Pets")
+      .externalDocs(new ExternalDocs("Find out more", "http://swagger.io")));
+    swagger.tag(new Tag()
+      .name("store")
+      .description("Access to Petstore orders"));
+    swagger.tag(new Tag()
+      .name("user")
+      .description("Operations about user")
+      .externalDocs(new ExternalDocs("Find out more about our store", "http://swagger.io")));
+
+    new SwaggerContextService().withServletConfig(config).withBasePath("/api2").updateSwagger(swagger);
+  }
+}