Return-Path: 
 <commits-return-37397-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
X-Original-To: apmail-cxf-commits-archive@www.apache.org
Delivered-To: apmail-cxf-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id CA3D818102
	for <apmail-cxf-commits-archive@www.apache.org>;
 Thu,  9 Jul 2015 09:05:01 +0000 (UTC)
Received: (qmail 99611 invoked by uid 500); 9 Jul 2015 09:04:57 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 99495 invoked by uid 500); 9 Jul 2015 09:04:56 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 99055 invoked by uid 99); 9 Jul 2015 09:04:56 -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, 09 Jul 2015 09:04:56 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 65683DFB90; Thu,  9 Jul 2015 09:04:56 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: ay@apache.org
To: commits@cxf.apache.org
Date: Thu, 09 Jul 2015 09:05:08 -0000
Message-Id: <2d95b684d7ee40d88036218108d05d17@git.apache.org>
In-Reply-To: <ba325f1ab69e434094df8fed29f7ea6b@git.apache.org>
References: <ba325f1ab69e434094df8fed29f7ea6b@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [13/17] cxf git commit: CXF-6046: Enhance SwaggerFeature to support
 JAX-RS annotations. Added customized Swagger UI using index.jsp.

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

Branch: refs/heads/3.0.x-fixes
Commit: c3f191ca81c071065f2567c730d5bbef810289d6
Parents: 56132d7
Author: reta <drreta@gmail.com>
Authored: Thu Nov 20 15:32:11 2014 -0500
Committer: Akitoshi Yoshida <ay@apache.org>
Committed: Thu Jul 9 10:32:32 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        | 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/c3f191ca/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/c3f191ca/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 536c6a6..acf258a 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,10 +41,11 @@ 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/c3f191ca/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">&nbsp;</div>
-<div id="swagger-ui-container" class="swagger-ui-wrap"></div>
-</body>
-</html>

http://git-wip-us.apache.org/repos/asf/cxf/blob/c3f191ca/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">&nbsp;</div>
+<div id="swagger-ui-container" class="swagger-ui-wrap"></div>
+</body>
+</html>