CAMEL-9729: Camel catalog - Allow to query older versions
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e39cdf5f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e39cdf5f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e39cdf5f Branch: refs/heads/master Commit: e39cdf5f65e5c59034452963e836beaf12099a91 Parents: 9082de7 Author: Claus Ibsen <[email protected]> Authored: Sun Jun 26 13:54:58 2016 +0200 Committer: Claus Ibsen <[email protected]> Committed: Sun Jun 26 13:54:58 2016 +0200 ---------------------------------------------------------------------- platforms/catalog-maven/pom.xml | 83 ++++++++ .../catalog/maven/MavenVersionManager.java | 90 ++++++++ .../src/main/resources/META-INF/LICENSE.txt | 203 +++++++++++++++++++ .../src/main/resources/META-INF/NOTICE.txt | 11 + .../catalog/maven/MavenVersionManagerTest.java | 81 ++++++++ .../src/test/resources/log4j.properties | 41 ++++ platforms/pom.xml | 1 + 7 files changed, 510 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/e39cdf5f/platforms/catalog-maven/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/catalog-maven/pom.xml b/platforms/catalog-maven/pom.xml new file mode 100644 index 0000000..766e2a2 --- /dev/null +++ b/platforms/catalog-maven/pom.xml @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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";> + <!-- + 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. + --> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.camel</groupId> + <artifactId>platforms</artifactId> + <version>2.18-SNAPSHOT</version> + </parent> + + <artifactId>camel-catalog-maven</artifactId> + <packaging>jar</packaging> + <name>Camel :: Platforms :: Catalog :: Maven</name> + <description>Camel Catalog Maven</description> + + <properties> + <camel.osgi.export.pkg> + org.apache.camel.catalog.maven + </camel.osgi.export.pkg> + </properties> + + <dependencies> + + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-catalog</artifactId> + </dependency> + + <!-- use groovy grape to download JARs as that is easy to use --> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy</artifactId> + <version>${groovy-version}</version> + </dependency> + <dependency> + <groupId>org.apache.ivy</groupId> + <artifactId>ivy</artifactId> + <version>${ivy-version}</version> + </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> + + <build> + <plugins> + + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + </plugin> + </plugins> + + </build> + +</project> http://git-wip-us.apache.org/repos/asf/camel/blob/e39cdf5f/platforms/catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java ---------------------------------------------------------------------- diff --git a/platforms/catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java b/platforms/catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java new file mode 100644 index 0000000..bc11036 --- /dev/null +++ b/platforms/catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java @@ -0,0 +1,90 @@ +/** + * 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.catalog.maven; + +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Map; + +import groovy.grape.Grape; +import groovy.lang.GroovyClassLoader; +import org.apache.camel.catalog.VersionManager; + +/** + * A {@link VersionManager} that can load the resources using Maven to download needed artifacts from + * a local or remote Maven repository. + * <p/> + * This implementation uses Groovy Grape to download the Maven JARs. + */ +public class MavenVersionManager implements VersionManager { + + private final ClassLoader classLoader = new GroovyClassLoader(); + private String version; + + @Override + public String getLoadedVersion() { + return version; + } + + @Override + public boolean loadVersion(String version) { + try { + Grape.setEnableAutoDownload(true); + + Map<String, Object> param = new HashMap<>(); + param.put("classLoader", classLoader); + param.put("group", "org.apache.camel"); + param.put("module", "camel-catalog"); + param.put("version", version); + Grape.grab(param); + + this.version = version; + return true; + } catch (Exception e) { + return false; + } + } + + @Override + public InputStream getResourceAsStream(String name) { + if (version == null) { + return null; + } + + try { + URL found = null; + Enumeration<URL> urls = classLoader.getResources(name); + while (urls.hasMoreElements()) { + URL url = urls.nextElement(); + if (url.getPath().contains(version)) { + found = url; + break; + } + } + if (found != null) { + return found.openStream(); + } + } catch (IOException e) { + // ignore + } + + return null; + } +} http://git-wip-us.apache.org/repos/asf/camel/blob/e39cdf5f/platforms/catalog-maven/src/main/resources/META-INF/LICENSE.txt ---------------------------------------------------------------------- diff --git a/platforms/catalog-maven/src/main/resources/META-INF/LICENSE.txt b/platforms/catalog-maven/src/main/resources/META-INF/LICENSE.txt new file mode 100755 index 0000000..6b0b127 --- /dev/null +++ b/platforms/catalog-maven/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/e39cdf5f/platforms/catalog-maven/src/main/resources/META-INF/NOTICE.txt ---------------------------------------------------------------------- diff --git a/platforms/catalog-maven/src/main/resources/META-INF/NOTICE.txt b/platforms/catalog-maven/src/main/resources/META-INF/NOTICE.txt new file mode 100644 index 0000000..2e215bf --- /dev/null +++ b/platforms/catalog-maven/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/e39cdf5f/platforms/catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java ---------------------------------------------------------------------- diff --git a/platforms/catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java b/platforms/catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java new file mode 100644 index 0000000..195e9a4 --- /dev/null +++ b/platforms/catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java @@ -0,0 +1,81 @@ +/** + * 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.catalog.maven; + +import java.io.InputStream; + +import junit.framework.TestCase; +import org.apache.camel.catalog.CamelCatalog; +import org.apache.camel.catalog.CatalogHelper; +import org.apache.camel.catalog.DefaultCamelCatalog; +import org.junit.Test; + +public class MavenVersionManagerTest extends TestCase { + + private static final String COMPONENTS_CATALOG = "org/apache/camel/catalog/components.properties"; + + @Test + public void testLoadVersion() throws Exception { + MavenVersionManager manager = new MavenVersionManager(); + String current = manager.getLoadedVersion(); + assertNull(current); + + boolean loaded = manager.loadVersion("2.17.1"); + assertTrue(loaded); + + assertEquals("2.17.1", manager.getLoadedVersion()); + + InputStream is = manager.getResourceAsStream(COMPONENTS_CATALOG); + assertNotNull(is); + String text = CatalogHelper.loadText(is); + + // should not contain Camel 2.18 components + assertFalse(text.contains("servicenow")); + // but 2.17 components such + assertTrue(text.contains("nats")); + } + + @Test + public void testEndpointOptions217() throws Exception { + CamelCatalog catalog = new DefaultCamelCatalog(false); + catalog.setVersionManager(new MavenVersionManager()); + catalog.loadVersion("2.17.1"); + + assertEquals("2.17.1", catalog.getLoadedVersion()); + + String json = catalog.componentJSonSchema("ahc"); + assertNotNull(json); + + // should have loaded the 2.17.1 version + assertTrue(json.contains("\"version\": \"2.17.1\"")); + + // should not contain Camel 2.18 option + assertFalse(json.contains("connectionClose")); + } + + @Test + public void testEndpointOptions218OrNewer() throws Exception { + CamelCatalog catalog = new DefaultCamelCatalog(false); + + String json = catalog.componentJSonSchema("ahc"); + assertNotNull(json); + + // should contain the Camel 2.18 option + assertTrue(json.contains("connectionClose")); + } + +} http://git-wip-us.apache.org/repos/asf/camel/blob/e39cdf5f/platforms/catalog-maven/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/platforms/catalog-maven/src/test/resources/log4j.properties b/platforms/catalog-maven/src/test/resources/log4j.properties new file mode 100644 index 0000000..b9f10b6 --- /dev/null +++ b/platforms/catalog-maven/src/test/resources/log4j.properties @@ -0,0 +1,41 @@ +## ------------------------------------------------------------------------ +## 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, out + +# uncomment the following to enable camel debugging +#log4j.logger.org.apache.camel.catalog=TRACE + +# 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-catalog-maven-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/e39cdf5f/platforms/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/pom.xml b/platforms/pom.xml index 2665dd6..8c91ed2 100644 --- a/platforms/pom.xml +++ b/platforms/pom.xml @@ -34,6 +34,7 @@ <modules> <module>catalog</module> <module>catalog-lucene</module> + <module>catalog-maven</module> <module>commands</module> <module>karaf</module> </modules>
