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:09 UTC
[14/17] cxf git commit: CXF-6046: Enhance SwaggerFeature to support
JAX-RS annotations. Refactored index, jsp to index.html
CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Refactored index,jsp to index.html
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/806a1f0a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/806a1f0a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/806a1f0a
Branch: refs/heads/3.0.x-fixes
Commit: 806a1f0a89dfb9c34812e0b2c80612facf39da75
Parents: c3f191c
Author: reta <dr...@gmail.com>
Authored: Sun Nov 23 21:01:56 2014 -0500
Committer: Akitoshi Yoshida <ay...@apache.org>
Committed: Thu Jul 9 10:32:59 2015 +0200
----------------------------------------------------------------------
.../samples/jax_rs/description_swagger/pom.xml | 3 +-
.../java/demo/jaxrs/swagger/server/Server.java | 3 +-
.../webjars/swagger-ui/2.0.24/index.html | 52 ++++++++++++++++++++
.../webjars/swagger-ui/2.0.24/index.jsp | 52 --------------------
4 files changed, 55 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/806a1f0a/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 1b5c53f..8c2faa8 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
@@ -79,7 +79,8 @@
<artifactId>swagger-ui</artifactId>
<version>2.0.24</version>
<overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}/classes</outputDirectory>
+ <outputDirectory>${project.build.directory}/classes</outputDirectory>
+ <excludes>**/index.html</excludes>
</artifactItem>
</artifactItems>
</configuration>
http://git-wip-us.apache.org/repos/asf/cxf/blob/806a1f0a/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 acf258a..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
@@ -41,11 +41,10 @@ public class Server {
final ServletContextHandler context = new ServletContextHandler();
context.setContextPath("/");
context.addServlet(staticHolder, "/static/*");
- context.setWelcomeFiles( new String[] { "index.jsp" } );
context.addServlet(servletHolder, "/*");
context.setResourceBase(getClass().getResource("/META-INF/resources/webjars/swagger-ui/2.0.24").toURI().toString());
- servletHolder.setInitParameter("redirects-list", "/ /index.jsp /.*[.]js /css/.* /images/.* lib/.*");
+ servletHolder.setInitParameter("redirects-list", "/ /index.html /.*[.]js /css/.* /images/.* lib/.*");
servletHolder.setInitParameter("redirect-servlet-name", staticHolder.getName());
servletHolder.setInitParameter("redirect-attributes", "javax.servlet.include.request_uri");
servletHolder.setInitParameter("jaxrs.serviceClasses", Sample.class.getName());
http://git-wip-us.apache.org/repos/asf/cxf/blob/806a1f0a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/META-INF/resources/webjars/swagger-ui/2.0.24/index.html
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/META-INF/resources/webjars/swagger-ui/2.0.24/index.html b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/META-INF/resources/webjars/swagger-ui/2.0.24/index.html
new file mode 100644
index 0000000..395e96e
--- /dev/null
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/META-INF/resources/webjars/swagger-ui/2.0.24/index.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <title>Swagger UI + JAX-RS demo</title>
+ <link href='css/reset.css' media='screen' rel='stylesheet' type='text/css'/>
+ <link href='css/screen.css' media='screen' rel='stylesheet' type='text/css'/>
+ <link href='css/reset.css' media='print' rel='stylesheet' type='text/css'/>
+ <link href='css/screen.css' media='print' rel='stylesheet' type='text/css'/>
+ <script type="text/javascript" src="lib/shred.bundle.js"></script>
+ <script src='lib/jquery-1.8.0.min.js' type='text/javascript'></script>
+ <script src='lib/jquery.slideto.min.js' type='text/javascript'></script>
+ <script src='lib/jquery.wiggle.min.js' type='text/javascript'></script>
+ <script src='lib/jquery.ba-bbq.min.js' type='text/javascript'></script>
+ <script src='lib/handlebars-1.0.0.js' type='text/javascript'></script>
+ <script src='lib/underscore-min.js' type='text/javascript'></script>
+ <script src='lib/backbone-min.js' type='text/javascript'></script>
+ <script src='lib/swagger.js' type='text/javascript'></script>
+ <script src='swagger-ui.js' type='text/javascript'></script>
+ <script src='lib/highlight.7.3.pack.js' type='text/javascript'></script>
+
+ <!-- enabling this will enable oauth2 implicit scope support -->
+ <script src='lib/swagger-oauth.js' type='text/javascript'></script>
+
+ <script type="text/javascript">
+ $(function () {
+ window.swaggerUi = new SwaggerUi({
+ url: "/api-docs",
+ dom_id: "swagger-ui-container",
+ supportedSubmitMethods: ['get', 'post', 'put', 'delete'],
+ onComplete: function(swaggerApi, swaggerUi){
+ log("Loaded SwaggerUI");
+ $('pre code').each(function(i, e) {
+ hljs.highlightBlock(e)
+ });
+ },
+ onFailure: function(data) {
+ log("Unable to Load SwaggerUI");
+ },
+ docExpansion: "none",
+ sorter : "alpha"
+ });
+
+ window.swaggerUi.load();
+ });
+ </script>
+</head>
+
+<body class="swagger-section">
+<div id="message-bar" class="swagger-ui-wrap"> </div>
+<div id="swagger-ui-container" class="swagger-ui-wrap"></div>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/cxf/blob/806a1f0a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/META-INF/resources/webjars/swagger-ui/2.0.24/index.jsp
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/META-INF/resources/webjars/swagger-ui/2.0.24/index.jsp b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/META-INF/resources/webjars/swagger-ui/2.0.24/index.jsp
deleted file mode 100644
index 24bc9a5..0000000
--- a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/META-INF/resources/webjars/swagger-ui/2.0.24/index.jsp
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title>Swagger UI + JAX-RS</title>
- <link href='css/reset.css' media='screen' rel='stylesheet' type='text/css'/>
- <link href='css/screen.css' media='screen' rel='stylesheet' type='text/css'/>
- <link href='css/reset.css' media='print' rel='stylesheet' type='text/css'/>
- <link href='css/screen.css' media='print' rel='stylesheet' type='text/css'/>
- <script type="text/javascript" src="lib/shred.bundle.js"></script>
- <script src='lib/jquery-1.8.0.min.js' type='text/javascript'></script>
- <script src='lib/jquery.slideto.min.js' type='text/javascript'></script>
- <script src='lib/jquery.wiggle.min.js' type='text/javascript'></script>
- <script src='lib/jquery.ba-bbq.min.js' type='text/javascript'></script>
- <script src='lib/handlebars-1.0.0.js' type='text/javascript'></script>
- <script src='lib/underscore-min.js' type='text/javascript'></script>
- <script src='lib/backbone-min.js' type='text/javascript'></script>
- <script src='lib/swagger.js' type='text/javascript'></script>
- <script src='swagger-ui.js' type='text/javascript'></script>
- <script src='lib/highlight.7.3.pack.js' type='text/javascript'></script>
-
- <!-- enabling this will enable oauth2 implicit scope support -->
- <script src='lib/swagger-oauth.js' type='text/javascript'></script>
-
- <script type="text/javascript">
- $(function () {
- window.swaggerUi = new SwaggerUi({
- url: "/api-docs",
- dom_id: "swagger-ui-container",
- supportedSubmitMethods: ['get', 'post', 'put', 'delete'],
- onComplete: function(swaggerApi, swaggerUi){
- log("Loaded SwaggerUI");
- $('pre code').each(function(i, e) {
- hljs.highlightBlock(e)
- });
- },
- onFailure: function(data) {
- log("Unable to Load SwaggerUI");
- },
- docExpansion: "none",
- sorter : "alpha"
- });
-
- window.swaggerUi.load();
- });
- </script>
-</head>
-
-<body class="swagger-section">
-<div id="message-bar" class="swagger-ui-wrap"> </div>
-<div id="swagger-ui-container" class="swagger-ui-wrap"></div>
-</body>
-</html>