You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2022/01/27 08:10:18 UTC
[camel] 01/05: CAMEL-17398: Include core/dsl in catalog
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit aacbfadc18f7e9d93045efb96f94b75307819dab
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Jan 26 16:06:05 2022 +0100
CAMEL-17398: Include core/dsl in catalog
---
.../apache/camel/maven/packaging/PrepareCatalogMojo.java | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
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 52dbc43..d1b42f2 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
@@ -224,7 +224,7 @@ public class PrepareCatalogMojo extends AbstractMojo {
allPropertiesFiles = new TreeSet<>();
Stream<Path> paths
- = Stream.of(list(coreDir.toPath()), list(componentsDir.toPath()), list(dslDir.toPath())).flatMap(s -> s);
+ = Stream.of(list(coreDir.toPath()), list(componentsDir.toPath())).flatMap(s -> s);
Stream.concat(paths,
Stream.of(languagesDir.toPath(), springDir.toPath()))
.filter(dir -> !"target".equals(dir.getFileName().toString()))
@@ -241,6 +241,16 @@ public class PrepareCatalogMojo extends AbstractMojo {
}
});
+ // special for dsl-dir as its built after camel-catalog, so we can only look inside src/generated
+ Stream.of(list(dslDir.toPath())).flatMap(s -> s)
+ .filter(dir -> Files.isDirectory(dir.resolve("src/generated/resources")))
+ .flatMap(PackageHelper::walk).forEach(p -> {
+ String f = p.getFileName().toString();
+ if (f.endsWith(PackageHelper.JSON_SUFIX)) {
+ allJsonFiles.add(p);
+ }
+ });
+
for (Path p : allJsonFiles) {
var m = JsonMapper.generateModel(p);
if (m != null) {
@@ -583,7 +593,9 @@ public class PrepareCatalogMojo extends AbstractMojo {
case "camel-xml-jaxb":
case "camel-xml-jaxp":
// and some from dsl
+ case "dsl-support":
case "camel-dsl-support":
+ case "endpointdsl-support":
case "camel-endpointdsl-support":
// and components with middle folders
case "camel-as2":