Repository: camel Updated Branches: refs/heads/master eb8fcf9ab -> d2c2b2436
CAMEL-9482: Copy spring json schema to camel-catalog Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/da257fca Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/da257fca Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/da257fca Branch: refs/heads/master Commit: da257fcae1497bb6feeb064f4fbc18321147cd16 Parents: eb8fcf9 Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Aug 11 11:23:09 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Aug 11 11:23:09 2016 +0200 ---------------------------------------------------------------------- .../org/apache/camel/catalog/CamelCatalogTest.java | 13 +++++++++++++ .../camel/maven/packaging/PrepareCatalogMojo.java | 15 +++++++++++++++ 2 files changed, 28 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/da257fca/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java ---------------------------------------------------------------------- diff --git a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java index 4d09ba3..3f8a8aa 100644 --- a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java +++ b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java @@ -770,4 +770,17 @@ public class CamelCatalogTest { assertTrue(result.getError().startsWith("expected symbol functionEnd but was eol at location 22")); } + @Test + public void testSpringCamelContext() throws Exception { + String json = catalog.modelJSonSchema("camelContext"); + assertNotNull(json); + + // validate we can parse the json + ObjectMapper mapper = new ObjectMapper(); + JsonNode tree = mapper.readTree(json); + assertNotNull(tree); + + assertTrue(json.contains("CamelContext using XML configuration")); + } + } http://git-wip-us.apache.org/repos/asf/camel/blob/da257fca/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java index 75090b6..d37ef51 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java @@ -140,6 +140,13 @@ public class PrepareCatalogMojo extends AbstractMojo { protected File coreDir; /** + * The directory where the camel-spring XML models are + * + * @parameter default-value="${project.build.directory}/../../../components/camel-spring" + */ + protected File springDir; + + /** * The archetypes directory where all the Apache Camel Maven archetypes are * * @parameter default-value="${project.build.directory}/../../../tooling/archetypes" @@ -202,6 +209,14 @@ public class PrepareCatalogMojo extends AbstractMojo { PackageHelper.findJsonFiles(target, jsonFiles, new PackageHelper.CamelComponentsModelFilter()); } + // find all json files in camel-spring + if (springDir != null && springDir.isDirectory()) { + File target = new File(springDir, "target/classes/org/apache/camel/spring"); + PackageHelper.findJsonFiles(target, jsonFiles, new PackageHelper.CamelComponentsModelFilter()); + File target2 = new File(springDir, "target/classes/org/apache/camel/core/xml"); + PackageHelper.findJsonFiles(target2, jsonFiles, new PackageHelper.CamelComponentsModelFilter()); + } + getLog().info("Found " + jsonFiles.size() + " model json files"); // make sure to create out dir
