Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 1EAD8200B74 for ; Thu, 1 Sep 2016 12:41:53 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 1D1BE160AB5; Thu, 1 Sep 2016 10:41:53 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 3CC95160AAE for ; Thu, 1 Sep 2016 12:41:52 +0200 (CEST) Received: (qmail 78010 invoked by uid 500); 1 Sep 2016 10:41:51 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 78001 invoked by uid 99); 1 Sep 2016 10:41:51 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Sep 2016 10:41:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4F263E056F; Thu, 1 Sep 2016 10:41:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergeyb@apache.org To: commits@cxf.apache.org Message-Id: <56f9263e3e5542d3a0301a50e643a5df@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: Updating Swagger2 _web demo to auto-link to SwaggerUI Date: Thu, 1 Sep 2016 10:41:51 +0000 (UTC) archived-at: Thu, 01 Sep 2016 10:41:53 -0000 Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 869e4af2a -> c3c74aa0c Updating Swagger2 _web demo to auto-link to SwaggerUI Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c3c74aa0 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c3c74aa0 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c3c74aa0 Branch: refs/heads/3.1.x-fixes Commit: c3c74aa0cae75e09b5432f8e85ecc66616934fe4 Parents: 869e4af Author: Sergey Beryozkin Authored: Thu Sep 1 11:11:06 2016 +0100 Committer: Sergey Beryozkin Committed: Thu Sep 1 11:40:56 2016 +0100 ---------------------------------------------------------------------- .../jax_rs/description_swagger2_web/README.txt | 21 +++++--- .../jax_rs/description_swagger2_web/pom.xml | 50 +------------------- 2 files changed, 15 insertions(+), 56 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/c3c74aa0/distribution/src/main/release/samples/jax_rs/description_swagger2_web/README.txt ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/README.txt b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/README.txt index a6c520d..32f7f4a 100644 --- a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/README.txt +++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/README.txt @@ -1,9 +1,8 @@ JAX-RS Swagger2Feature Demo using WebApp with Spring ================= -The demo shows a basic usage of Swagger API documentation with REST based Web Services using +The demo shows a basic usage of Swagger API documentation with multiple REST based Web Services using JAX-RS 2.0 (JSR-339). In this demo, the Swagger2Feature is configured using Spring. -Swagger UI is available at: http://localhost:9000/ Building and running the demo using Maven --------------------------------------- @@ -18,21 +17,29 @@ Using either UNIX or Windows: mvn package tomcat7:run -After the service is started, the Swagger API documents in JSON and YAML -are available at +Two JAX-RS endpoints are availbale after the service has started. +Swagger API documents in JSON and YAML are available at http://localhost:9000/app/swaggerSample/swagger.json http://localhost:9000/app/swaggerSample/swagger.yaml +and + + http://localhost:9000/app/swaggerSample2/swagger.json + http://localhost:9000/app/swaggerSample2/swagger.yaml To view the Swagger document using Swagger-UI, use your Browser to open the Swagger-UI page at - http://localhost:9000/?url=/app/swaggerSample/swagger.json + http://localhost:9000/app/swaggerSample/api-docs?url=/app/swaggerSample/swagger.json + or + http://localhost:9000/app/swaggerSample2/api-docs?url=/app/swaggerSample2/swagger.json + +or go to the CXF services page: -or + http://localhost:9000/app/services - http://localhost:9000/?url=/app/swaggerSample/swagger.yaml +and follow Swagger links. To remove the target dir, run mvn clean". http://git-wip-us.apache.org/repos/asf/cxf/blob/c3c74aa0/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml ---------------------------------------------------------------------- diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml index 821dcad..af2ff1a 100644 --- a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/pom.xml @@ -37,53 +37,6 @@ under the License. - org.apache.maven.plugins - maven-dependency-plugin - 2.9 - - - generate-resources - - unpack - - - - - org.webjars - swagger-ui - 2.1.0 - true - ${project.build.directory}/swagger-ui - **/*.gz - - - - - - - - maven-resources-plugin - 2.6 - - - copy-resources - generate-resources - - copy-resources - - - ${project.build.directory}/${project.artifactId}-${project.version} - - - ${project.build.directory}/swagger-ui/META-INF/resources/webjars/swagger-ui/2.1.0 - true - - - - - - - org.apache.tomcat.maven tomcat7-maven-plugin 2.1 @@ -111,8 +64,7 @@ under the License. org.webjars swagger-ui - 2.1.0 - provided + 2.1.8-M1 org.apache.cxf