Repository: camel Updated Branches: refs/heads/swagger [created] 03c407c94
CAMEL-7800: camel-swagger-java - work in progress Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d40c0091 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d40c0091 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d40c0091 Branch: refs/heads/swagger Commit: d40c00911ee70399d8ad494db89a14045a7e27a7 Parents: 0807773 Author: Claus Ibsen <[email protected]> Authored: Thu Sep 17 13:52:53 2015 +0200 Committer: Claus Ibsen <[email protected]> Committed: Thu Sep 17 13:52:53 2015 +0200 ---------------------------------------------------------------------- components/camel-swagger-java/pom.xml | 101 +++++++++ .../swagger/DefaultCamelSwaggerServlet.java | 86 ++++++++ .../RestSwaggerApiDeclarationServlet.java | 198 ++++++++++++++++++ .../src/main/resources/META-INF/LICENSE.txt | 203 +++++++++++++++++++ .../src/main/resources/META-INF/NOTICE.txt | 11 + .../src/test/resources/log4j.properties | 42 ++++ components/pom.xml | 1 + parent/pom.xml | 1 + 8 files changed, 643 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/d40c0091/components/camel-swagger-java/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-swagger-java/pom.xml b/components/camel-swagger-java/pom.xml new file mode 100644 index 0000000..d7aa2e4 --- /dev/null +++ b/components/camel-swagger-java/pom.xml @@ -0,0 +1,101 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.camel</groupId> + <artifactId>components</artifactId> + <version>2.16-SNAPSHOT</version> + </parent> + + <artifactId>camel-swagger-java</artifactId> + <packaging>bundle</packaging> + <name>Camel :: Swagger Java</name> + <description>Camel Swagger Java support</description> + + <properties> + <camel.osgi.export.pkg>org.apache.camel.component.swagger.*</camel.osgi.export.pkg> + </properties> + + <dependencies> + + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-core</artifactId> + </dependency> + + <dependency> + <groupId>io.swagger</groupId> + <artifactId>swagger-core</artifactId> + <version>${swagger-java-version}</version> + </dependency> + + <dependency> + <groupId>io.swagger</groupId> + <artifactId>swagger-annotations</artifactId> + <version>${swagger-java-version}</version> + </dependency> + + <dependency> + <groupId>io.swagger</groupId> + <artifactId>swagger-jaxrs</artifactId> + <version>${swagger-java-version}</version> + </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> + </dependency> + + <!-- testing --> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-test</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-jetty8</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-http-common</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-jetty-common</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + +</project> http://git-wip-us.apache.org/repos/asf/camel/blob/d40c0091/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/DefaultCamelSwaggerServlet.java ---------------------------------------------------------------------- diff --git a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/DefaultCamelSwaggerServlet.java b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/DefaultCamelSwaggerServlet.java new file mode 100644 index 0000000..12d79aa --- /dev/null +++ b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/DefaultCamelSwaggerServlet.java @@ -0,0 +1,86 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.swagger; + +import java.lang.management.ManagementFactory; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import javax.management.MBeanServer; +import javax.management.ObjectName; + +import org.apache.camel.model.ModelHelper; +import org.apache.camel.model.rest.RestDefinition; +import org.apache.camel.model.rest.RestsDefinition; +import org.apache.camel.util.CamelVersionHelper; + +public class DefaultCamelSwaggerServlet extends RestSwaggerApiDeclarationServlet { + + @Override + public List<RestDefinition> getRestDefinitions(String camelId) throws Exception { + ObjectName found = null; + + MBeanServer server = ManagementFactory.getPlatformMBeanServer(); + Set<ObjectName> names = server.queryNames(new ObjectName("org.apache.camel:type=context,*"), null); + for (ObjectName on : names) { + String id = on.getKeyProperty("name"); + if (id.startsWith("\"") && id.endsWith("\"")) { + id = id.substring(1, id.length() - 1); + } + if (camelId == null || camelId.equals(id)) { + // filter out older Camel versions as this requires Camel 2.15 or better + String version = (String) server.getAttribute(on, "CamelVersion"); + if (CamelVersionHelper.isGE("2.15.0", version)) { + found = on; + } + } + } + + if (found != null) { + String xml = (String) server.invoke(found, "dumpRestsAsXml", null, null); + if (xml != null) { + RestsDefinition rests = ModelHelper.createModelFromXml(null, xml, RestsDefinition.class); + if (rests != null) { + return rests.getRests(); + } + } + } + + return null; + } + + @Override + public List<String> findCamelContexts() throws Exception { + List<String> answer = new ArrayList<>(); + + MBeanServer server = ManagementFactory.getPlatformMBeanServer(); + Set<ObjectName> names = server.queryNames(new ObjectName("*:type=context,*"), null); + for (ObjectName on : names) { + String id = on.getKeyProperty("name"); + if (id.startsWith("\"") && id.endsWith("\"")) { + id = id.substring(1, id.length() - 1); + } + + // filter out older Camel versions as this requires Camel 2.15 or better + String version = (String) server.getAttribute(on, "CamelVersion"); + if (CamelVersionHelper.isGE("2.15.0", version)) { + answer.add(id); + } + } + return answer; + } +} http://git-wip-us.apache.org/repos/asf/camel/blob/d40c0091/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerApiDeclarationServlet.java ---------------------------------------------------------------------- diff --git a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerApiDeclarationServlet.java b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerApiDeclarationServlet.java new file mode 100644 index 0000000..c88b261 --- /dev/null +++ b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerApiDeclarationServlet.java @@ -0,0 +1,198 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.swagger; + +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.List; +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import io.swagger.jaxrs.config.BeanConfig; +import org.apache.camel.model.rest.RestDefinition; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public abstract class RestSwaggerApiDeclarationServlet extends HttpServlet { + + private Logger LOG = LoggerFactory.getLogger(RestSwaggerApiDeclarationServlet.class); + + // TODO: implement me + //private RestSwaggerReader reader = new RestSwaggerReader(); + private BeanConfig swaggerConfig = new BeanConfig(); + private boolean cors; + private volatile boolean initDone; + + @Override + public void init(ServletConfig config) throws ServletException { + super.init(config); + + // configure swagger options + String s = config.getInitParameter("swagger.version"); + if (s != null) { + swaggerConfig.setVersion(s); + } + s = config.getInitParameter("base.path"); + if (s != null) { + swaggerConfig.setBasePath(s); + } + s = config.getInitParameter("cors"); + if (s != null) { + cors = "true".equalsIgnoreCase(s); + } + + String title = config.getInitParameter("api.title"); + String description = config.getInitParameter("api.description"); + String termsOfServiceUrl = config.getInitParameter("api.termsOfServiceUrl"); + String contact = config.getInitParameter("api.contact"); + String license = config.getInitParameter("api.license"); + String licenseUrl = config.getInitParameter("api.licenseUrl"); + + swaggerConfig.setTitle(title); + swaggerConfig.setDescription(description); + swaggerConfig.setTermsOfServiceUrl(termsOfServiceUrl); + swaggerConfig.setContact(contact); + swaggerConfig.setLicense(license); + swaggerConfig.setLicenseUrl(licenseUrl); + } + + public abstract List<RestDefinition> getRestDefinitions(String camelId) throws Exception; + + public abstract List<String> findCamelContexts() throws Exception; + + @Override + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + + if (!initDone) { + initBaseAndApiPaths(request); + } + + String contextId; + String route = request.getPathInfo(); + + try { + + // render list of camel contexts as root + if (route == null || route.equals("") || route.equals("/")) { + renderCamelContexts(request, response); + } else { + // first part is the camel context + if (route.startsWith("/")) { + route = route.substring(1); + } + // the remainder is the route part + contextId = route.split("/")[0]; + if (route.startsWith(contextId)) { + route = route.substring(contextId.length()); + } + + + // TODO: implement these + if (!route.equals("") && !route.equals("/")) { + // render overview if the route is empty or is the root path + // renderApiDeclaration(request, response, contextId, route); + } else { + // renderResourceListing(request, response, contextId); + } + } + } catch (Exception e) { + LOG.warn("Error rendering swagger due " + e.getMessage()); + } + } + + private void initBaseAndApiPaths(HttpServletRequest request) throws MalformedURLException { + String base = swaggerConfig.getBasePath(); + if (base == null || !base.startsWith("http")) { + // base path is configured using relative, so lets calculate the absolute url now we have the http request + URL url = new URL(request.getRequestURL().toString()); + if (base == null) { + base = ""; + } + String path = translateContextPath(request); + if (url.getPort() != 80 && url.getPort() != -1) { + base = url.getProtocol() + "://" + url.getHost() + ":" + url.getPort() + path + "/" + base; + } else { + base = url.getProtocol() + "://" + url.getHost() + request.getContextPath() + "/" + base; + } + swaggerConfig.setBasePath(base); + } + + // TODO: api path? + /* + base = swaggerConfig.getApiPath + if (base == null || !base.startsWith("http")) { + // api path is configured using relative, so lets calculate the absolute url now we have the http request + val url = new URL(request.getRequestURL.toString) + if (base == null) { + base = "" + } + val path = translateContextPath(request) + if (url.getPort != 80 && url.getPort != -1) { + base = url.getProtocol + "://" + url.getHost + ":" + url.getPort + path + "/" + base + } else { + base = url.getProtocol + "://" + url.getHost + request.getContextPath + "/" + base + } + swaggerConfig.setApiPath(base) + } */ + initDone = true; + } + + /** + * We do only want the base context-path and not sub paths + */ + private String translateContextPath(HttpServletRequest request) { + String path = request.getContextPath(); + if (path.isEmpty() || path.equals("/")) { + return ""; + } else { + int idx = path.lastIndexOf("/"); + if (idx > 0) { + return path.substring(0, idx); + } + } + return path; + } + + /** + * Renders a list of available CamelContexts in the JVM + */ + private void renderCamelContexts(HttpServletRequest request, HttpServletResponse response) throws Exception { + LOG.trace("renderCamelContexts"); + + if (cors) { + response.addHeader("Access-Control-Allow-Headers", "Origin, Accept, X-Requested-With, Content-Type, Access-Control-Request-Method, Access-Control-Request-Headers"); + response.addHeader("Access-Control-Allow-Methods", "GET, HEAD, POST, PUT, DELETE, TRACE, OPTIONS, CONNECT, PATCH"); + response.addHeader("Access-Control-Allow-Origin", "*"); + } + + List<String> contexts = findCamelContexts(); + response.getWriter().print("[\n"); + for (int i = 0; i < contexts.size(); i++) { + String name = contexts.get(i); + response.getWriter().print("{\"name\": \"" + name + "\"}"); + if (i < contexts.size() - 1) { + response.getWriter().print(",\n"); + } + } + response.getWriter().print("\n]"); + } + +} http://git-wip-us.apache.org/repos/asf/camel/blob/d40c0091/components/camel-swagger-java/src/main/resources/META-INF/LICENSE.txt ---------------------------------------------------------------------- diff --git a/components/camel-swagger-java/src/main/resources/META-INF/LICENSE.txt b/components/camel-swagger-java/src/main/resources/META-INF/LICENSE.txt new file mode 100644 index 0000000..6b0b127 --- /dev/null +++ b/components/camel-swagger-java/src/main/resources/META-INF/LICENSE.txt @@ -0,0 +1,203 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + http://git-wip-us.apache.org/repos/asf/camel/blob/d40c0091/components/camel-swagger-java/src/main/resources/META-INF/NOTICE.txt ---------------------------------------------------------------------- diff --git a/components/camel-swagger-java/src/main/resources/META-INF/NOTICE.txt b/components/camel-swagger-java/src/main/resources/META-INF/NOTICE.txt new file mode 100644 index 0000000..2e215bf --- /dev/null +++ b/components/camel-swagger-java/src/main/resources/META-INF/NOTICE.txt @@ -0,0 +1,11 @@ + ========================================================================= + == NOTICE file corresponding to the section 4 d of == + == the Apache License, Version 2.0, == + == in this case for the Apache Camel distribution. == + ========================================================================= + + This product includes software developed by + The Apache Software Foundation (http://www.apache.org/). + + Please read the different LICENSE files present in the licenses directory of + this distribution. http://git-wip-us.apache.org/repos/asf/camel/blob/d40c0091/components/camel-swagger-java/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/components/camel-swagger-java/src/test/resources/log4j.properties b/components/camel-swagger-java/src/test/resources/log4j.properties new file mode 100644 index 0000000..3e0349e --- /dev/null +++ b/components/camel-swagger-java/src/test/resources/log4j.properties @@ -0,0 +1,42 @@ +## ------------------------------------------------------------------------ +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## ------------------------------------------------------------------------ + +# +# The logging properties used for testing. +# +log4j.rootLogger=INFO, file + +# uncomment the following to enable camel debugging +#log4j.logger.org.apache.camel.component.swagger=TRACE +#log4j.logger.com.wordnik.swagger=DEBUG + +# CONSOLE appender not used by default +log4j.appender.out=org.apache.log4j.ConsoleAppender +log4j.appender.out.layout=org.apache.log4j.PatternLayout +log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n +# MDC +#log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %-10.10X{camel.breadcrumbId} - %-10.10X{camelexchangeId} - %-10.10X{camel.correlationId} - %-10.10X{camel.routeId} - %m%n + +# File appender +log4j.appender.file=org.apache.log4j.FileAppender +log4j.appender.file.layout=org.apache.log4j.PatternLayout +log4j.appender.file.file=target/camel-swagger-java-test.log +log4j.appender.file.append=true +log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n +# MDC +#log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %-10.10X{camel.breadcrumbId} - %-10.10X{camel.exchangeId} - %-10.10X{camel.correlationId} - %-10.10X{camel.routeId} - %m%n + http://git-wip-us.apache.org/repos/asf/camel/blob/d40c0091/components/pom.xml ---------------------------------------------------------------------- diff --git a/components/pom.xml b/components/pom.xml index 0725607..cc308fb 100644 --- a/components/pom.xml +++ b/components/pom.xml @@ -224,6 +224,7 @@ <module>camel-stringtemplate</module> <module>camel-syslog</module> <module>camel-swagger</module> + <module>camel-swagger-java</module> <module>camel-tagsoup</module> <module>camel-tarfile</module> <module>camel-twitter</module> http://git-wip-us.apache.org/repos/asf/camel/blob/d40c0091/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index f48d42b..f594bba 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -482,6 +482,7 @@ <swagger-version>1.3.12</swagger-version> <swagger-guava-version>15.0</swagger-guava-version> <swagger-bundle-version>1.3.12_1</swagger-bundle-version> + <swagger-java-version>1.5.3</swagger-java-version> <stax-api-version>1.0.1</stax-api-version> <stax2-api-bundle-version>3.1.4</stax2-api-bundle-version> <stringtemplate-bundle-version>4.0.8_1</stringtemplate-bundle-version>
