Repository: metamodel Updated Branches: refs/heads/feature/5.x/swagger-docs 0dbe54b6d -> ef19537b6
Improved the swagger-ui presentation Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/ef19537b Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/ef19537b Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/ef19537b Branch: refs/heads/feature/5.x/swagger-docs Commit: ef19537b603a88f06c4ac70e092d3bc2faa61181 Parents: 0dbe54b Author: Kasper Sørensen <[email protected]> Authored: Tue Jul 26 22:55:24 2016 -0700 Committer: Kasper Sørensen <[email protected]> Committed: Tue Jul 26 22:55:24 2016 -0700 ---------------------------------------------------------------------- .../service/controllers/RootInformationController.java | 2 +- service-webapp/src/main/resources/swagger.yaml | 6 ++++++ .../src/main/webapp/WEB-INF/dispatcher-servlet.xml | 3 +-- service-webapp/src/main/webapp/WEB-INF/web.xml | 12 ++++++++---- service-webapp/src/main/webapp/swagger-ui/index.html | 12 ------------ 5 files changed, 16 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metamodel/blob/ef19537b/service-webapp/src/main/java/org/apache/metamodel/service/controllers/RootInformationController.java ---------------------------------------------------------------------- diff --git a/service-webapp/src/main/java/org/apache/metamodel/service/controllers/RootInformationController.java b/service-webapp/src/main/java/org/apache/metamodel/service/controllers/RootInformationController.java index e89a39d..af74901 100644 --- a/service-webapp/src/main/java/org/apache/metamodel/service/controllers/RootInformationController.java +++ b/service-webapp/src/main/java/org/apache/metamodel/service/controllers/RootInformationController.java @@ -66,7 +66,7 @@ public class RootInformationController { private Map<String, Object> getOpenApi() { final Map<String, Object> map = new LinkedHashMap<>(); map.put("spec", servletContext.getContextPath() + "/swagger.json"); - map.put("swagger-ui", servletContext.getContextPath() + "/swagger-ui"); + map.put("swagger-ui", servletContext.getContextPath() + "/swagger-ui/index.html"); return map; } http://git-wip-us.apache.org/repos/asf/metamodel/blob/ef19537b/service-webapp/src/main/resources/swagger.yaml ---------------------------------------------------------------------- diff --git a/service-webapp/src/main/resources/swagger.yaml b/service-webapp/src/main/resources/swagger.yaml index 55b5fe4..b75ad4d 100644 --- a/service-webapp/src/main/resources/swagger.yaml +++ b/service-webapp/src/main/resources/swagger.yaml @@ -19,6 +19,12 @@ info: title: Apache MetaModel RESTful API description: Delivers 'MetaModel-as-a-Service' for unified data federation. version: "5.0.0" + contact: + name: Apache MetaModel + url: http://metamodel.apache.org + license: + name: Apache License, version 2.0 + url: http://www.apache.org/licenses/LICENSE-2.0 consumes: - application/json produces: http://git-wip-us.apache.org/repos/asf/metamodel/blob/ef19537b/service-webapp/src/main/webapp/WEB-INF/dispatcher-servlet.xml ---------------------------------------------------------------------- diff --git a/service-webapp/src/main/webapp/WEB-INF/dispatcher-servlet.xml b/service-webapp/src/main/webapp/WEB-INF/dispatcher-servlet.xml index 8100579..7407d2c 100644 --- a/service-webapp/src/main/webapp/WEB-INF/dispatcher-servlet.xml +++ b/service-webapp/src/main/webapp/WEB-INF/dispatcher-servlet.xml @@ -35,8 +35,7 @@ under the License. </mvc:message-converters> </mvc:annotation-driven> - <mvc:resources location="/swagger.yaml" mapping="/swagger.yaml" order="-1001" /> - <mvc:resources location="/swagger-ui/" mapping="/swagger-ui/**" order="-1000" /> + <mvc:resources location="/swagger-ui/" mapping="/swagger-ui/**" order="-1001" /> <!-- Message converters --> <bean id="jsonMessageConverter" http://git-wip-us.apache.org/repos/asf/metamodel/blob/ef19537b/service-webapp/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/service-webapp/src/main/webapp/WEB-INF/web.xml b/service-webapp/src/main/webapp/WEB-INF/web.xml index eb3ef51..31de07f 100644 --- a/service-webapp/src/main/webapp/WEB-INF/web.xml +++ b/service-webapp/src/main/webapp/WEB-INF/web.xml @@ -22,10 +22,12 @@ under the License. <!-- Spring listener --> <listener> - <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class> + <listener-class>org.springframework.web.context.ContextLoaderListener + </listener-class> </listener> <listener> - <listener-class>org.springframework.web.context.request.RequestContextListener</listener-class> + <listener-class>org.springframework.web.context.request.RequestContextListener + </listener-class> </listener> <!-- Spring config --> @@ -37,7 +39,8 @@ under the License. <!-- Spring servlet --> <servlet> <servlet-name>dispatcher</servlet-name> - <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class> + <servlet-class>org.springframework.web.servlet.DispatcherServlet + </servlet-class> <load-on-startup>1</load-on-startup> </servlet> <servlet-mapping> @@ -47,7 +50,8 @@ under the License. <filter> <filter-name>CharacterEncodingFilter</filter-name> - <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class> + <filter-class>org.springframework.web.filter.CharacterEncodingFilter + </filter-class> <init-param> <param-name>encoding</param-name> <param-value>UTF-8</param-value> http://git-wip-us.apache.org/repos/asf/metamodel/blob/ef19537b/service-webapp/src/main/webapp/swagger-ui/index.html ---------------------------------------------------------------------- diff --git a/service-webapp/src/main/webapp/swagger-ui/index.html b/service-webapp/src/main/webapp/swagger-ui/index.html index 07761ef..16df339 100755 --- a/service-webapp/src/main/webapp/swagger-ui/index.html +++ b/service-webapp/src/main/webapp/swagger-ui/index.html @@ -89,18 +89,6 @@ </head> <body class="swagger-section"> -<div id='header'> - <div class="swagger-ui-wrap"> - <a id="logo" href="http://swagger.io";><img class="logo__img" alt="swagger" height="30" width="30" src="images/logo_small.png" /><span class="logo__title">swagger</span></a> - <form id='api_selector'> - <div class='input'><input placeholder="http://example.com/api"; id="input_baseUrl" name="baseUrl" type="text"/></div> - <div id='auth_container'></div> - <div class='input'><a id="explore" class="header__btn" href="#" data-sw-translate>Explore</a></div> - </form> - </div> -</div> - -<div id="message-bar" class="swagger-ui-wrap" data-sw-translate> </div> <div id="swagger-ui-container" class="swagger-ui-wrap"></div> </body> </html>
