You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ay...@apache.org on 2015/07/09 11:05:06 UTC
[11/17] cxf git commit: CXF-6046: Enhance SwaggerFeature to support
JAX-RS annotations. Replaced embedded Swagger UI with webjar.
CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Replaced embedded Swagger UI with webjar.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8e38a004
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8e38a004
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8e38a004
Branch: refs/heads/3.0.x-fixes
Commit: 8e38a0043b7212903b18a8c68966cbd5a5922b60
Parents: 5b8e208
Author: reta <dr...@gmail.com>
Authored: Sun Nov 2 17:29:55 2014 -0500
Committer: Akitoshi Yoshida <ay...@apache.org>
Committed: Thu Jul 9 10:31:21 2015 +0200
----------------------------------------------------------------------
.../release/samples/jax_rs/description_swagger/pom.xml | 10 ++++++++++
.../src/main/java/demo/jaxrs/swagger/server/Server.java | 2 +-
2 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/8e38a004/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml b/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml
index b099f61..fa49ef0 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger/pom.xml
@@ -72,6 +72,16 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>swagger-ui</artifactId>
+ <version>2.0.24</version>
+ </dependency>
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.12.1.GA</version>
+ </dependency>
+ <dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>2.2.2</version>
http://git-wip-us.apache.org/repos/asf/cxf/blob/8e38a004/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java
index 8f849ea..536c6a6 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java
@@ -42,7 +42,7 @@ public class Server {
context.setContextPath("/");
context.addServlet(staticHolder, "/static/*");
context.addServlet(servletHolder, "/*");
- context.setResourceBase(getClass().getResource("/swagger").toURI().toString());
+ context.setResourceBase(getClass().getResource("/META-INF/resources/webjars/swagger-ui/2.0.24").toURI().toString());
servletHolder.setInitParameter("redirects-list", "/ /index.html /.*[.]js /css/.* /images/.* lib/.*");
servletHolder.setInitParameter("redirect-servlet-name", staticHolder.getName());