cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject git commit: CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Replaced embedded Swagger UI with webjar.
Date Sun, 02 Nov 2014 22:30:11 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 28ae58317 -> 350b51632


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/350b5163
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/350b5163
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/350b5163

Branch: refs/heads/master
Commit: 350b51632f4c5dbd4891636261909c73136981c6
Parents: 28ae583
Author: reta <drreta@gmail.com>
Authored: Sun Nov 2 17:29:55 2014 -0500
Committer: reta <drreta@gmail.com>
Committed: Sun Nov 2 17:29:55 2014 -0500

----------------------------------------------------------------------
 .../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/350b5163/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/350b5163/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());


Mime
View raw message