Repository: cxf
Updated Branches:
refs/heads/master 5520b06e2 -> 2f0b3e382
CXF-6046: Enhance SwaggerFeature to support JAX-RS annotations. Added
customized Swagger UI using index.jsp.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2f0b3e38
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2f0b3e38
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2f0b3e38
Branch: refs/heads/master
Commit: 2f0b3e38212674883d610cfcfbd76b901bd3d997
Parents: 5520b06
Author: reta <[email protected]>
Authored: Thu Nov 20 15:32:11 2014 -0500
Committer: reta <[email protected]>
Committed: Thu Nov 20 15:32:11 2014 -0500
----------------------------------------------------------------------
.../samples/jax_rs/description_swagger/pom.xml | 3 +-
.../java/demo/jaxrs/swagger/server/Server.java | 3 +-
.../webjars/swagger-ui/2.0.24/index.html | 60 --------------------
.../webjars/swagger-ui/2.0.24/index.jsp | 52 +++++++++++++++++
4 files changed, 55 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/2f0b3e38/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 0faab16..1b5c53f 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,8 +79,7 @@
<artifactId>swagger-ui</artifactId>
<version>2.0.24</version>
<overWrite>true</overWrite>
-
<outputDirectory>${project.build.directory}/classes</outputDirectory>
- <excludes>**/index.html</excludes>
+
<outputDirectory>${project.build.directory}/classes</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
http://git-wip-us.apache.org/repos/asf/cxf/blob/2f0b3e38/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 7d5fbb2..410f2bf 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,12 @@ 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.html
/.*[.]js /css/.* /images/.* lib/.*");
+ servletHolder.setInitParameter("redirects-list", "/ /index.jsp
/.*[.]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/2f0b3e38/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
deleted file mode 100644
index 5d18b8b..0000000
---
a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/resources/META-INF/resources/webjars/swagger-ui/2.0.24/index.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title>Swagger UI</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: "http://localhost:9000/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"
- });
-
- $('#input_apiKey').change(function() {
- var key = $('#input_apiKey')[0].value;
- log("key: " + key);
- if(key && key.trim() != "") {
- log("added key " + key);
- window.authorizations.add("key", new ApiKeyAuthorization("api_key",
key, "query"));
- }
- })
- 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/2f0b3e38/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
new file mode 100644
index 0000000..24bc9a5
--- /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.jsp
@@ -0,0 +1,52 @@
+<!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>
