This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 789554d camel-catalog karaf should include bean/xpath language.
789554d is described below
commit 789554db296c08ed71e32ef90aec6db562511ae6
Author: Claus Ibsen <[email protected]>
AuthorDate: Mon Apr 29 08:52:26 2019 +0200
camel-catalog karaf should include bean/xpath language.
---
.../catalog/karaf/KarafRuntimeProviderTest.java | 1 +
.../maven/packaging/PrepareCatalogKarafMojo.java | 36 ++++++++++++++++++++--
.../packaging/PrepareCatalogSpringBootMojo.java | 26 ++++++++++++++++
3 files changed, 61 insertions(+), 2 deletions(-)
diff --git
a/catalog/camel-catalog-provider-karaf/src/test/java/org/apache/camel/catalog/karaf/KarafRuntimeProviderTest.java
b/catalog/camel-catalog-provider-karaf/src/test/java/org/apache/camel/catalog/karaf/KarafRuntimeProviderTest.java
index 3876d22..8718481 100644
---
a/catalog/camel-catalog-provider-karaf/src/test/java/org/apache/camel/catalog/karaf/KarafRuntimeProviderTest.java
+++
b/catalog/camel-catalog-provider-karaf/src/test/java/org/apache/camel/catalog/karaf/KarafRuntimeProviderTest.java
@@ -85,6 +85,7 @@ public class KarafRuntimeProviderTest {
assertNotNull(names);
assertFalse(names.isEmpty());
+ assertTrue(names.contains("bean"));
assertTrue(names.contains("simple"));
assertTrue(names.contains("spel"));
assertTrue(names.contains("xpath"));
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogKarafMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogKarafMojo.java
index 4fa8f10..2e8dd75 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogKarafMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogKarafMojo.java
@@ -157,6 +157,13 @@ public class PrepareCatalogKarafMojo extends AbstractMojo {
target = new File(dir,
"camel-linkedin-component/target/classes");
} else if ("camel-servicenow".equals(dir.getName())) {
target = new File(dir,
"camel-servicenow-component/target/classes");
+ } else {
+ // this module must be active with a source folder
+ File src = new File(dir, "src");
+ boolean active = src.isDirectory() && src.exists();
+ if (!active) {
+ continue;
+ }
}
findComponentFilesRecursive(target, jsonFiles,
componentFiles, new CamelComponentsFileFilter());
@@ -229,6 +236,14 @@ public class PrepareCatalogKarafMojo extends AbstractMojo {
if (!features.contains(dir.getName())) {
continue;
}
+
+ // this module must be active with a source folder
+ File src = new File(dir, "src");
+ boolean active = src.isDirectory() && src.exists();
+ if (!active) {
+ continue;
+ }
+
File target = new File(dir, "target/classes");
findDataFormatFilesRecursive(target, jsonFiles,
dataFormatFiles, new CamelDataFormatsFileFilter());
}
@@ -295,10 +310,20 @@ public class PrepareCatalogKarafMojo extends AbstractMojo
{
File[] languages = componentsDir.listFiles();
if (languages != null) {
for (File dir : languages) {
- // the directory must be in the list of known features
- if (!features.contains(dir.getName())) {
+ // the directory must be in the list of known features (or
known languages)
+ if (!features.contains(dir.getName())
+ && !dir.getName().equals("camel-bean")
+ && !dir.getName().equals("camel-xpath")) {
continue;
}
+
+ // this module must be active with a source folder
+ File src = new File(dir, "src");
+ boolean active = src.isDirectory() && src.exists();
+ if (!active) {
+ continue;
+ }
+
if (dir.isDirectory() && !"target".equals(dir.getName())) {
File target = new File(dir, "target/classes");
findLanguageFilesRecursive(target, jsonFiles,
languageFiles, new CamelLanguagesFileFilter());
@@ -387,6 +412,13 @@ public class PrepareCatalogKarafMojo extends AbstractMojo {
continue;
}
+ // this module must be active with a source folder
+ File src = new File(dir, "src");
+ boolean active = src.isDirectory() && src.exists();
+ if (!active) {
+ continue;
+ }
+
if (dir.isDirectory() && !"target".equals(dir.getName())) {
File target = new File(dir, "target/classes");
findOtherFilesRecursive(target, jsonFiles, otherFiles,
new CamelOthersFileFilter());
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogSpringBootMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogSpringBootMojo.java
index 7c78d36..b2a8e8f 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogSpringBootMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogSpringBootMojo.java
@@ -155,6 +155,13 @@ public class PrepareCatalogSpringBootMojo extends
AbstractMojo {
target = new File(dir,
"camel-linkedin-component/target/classes");
} else if ("camel-servicenow".equals(dir.getName())) {
target = new File(dir,
"camel-servicenow-component/target/classes");
+ } else {
+ // this module must be active with a source folder
+ File src = new File(dir, "src");
+ boolean active = src.isDirectory() && src.exists();
+ if (!active) {
+ continue;
+ }
}
@@ -239,6 +246,12 @@ public class PrepareCatalogSpringBootMojo extends
AbstractMojo {
if (!starters.contains(dir.getName())) {
continue;
}
+ // this module must be active with a source folder
+ File src = new File(dir, "src");
+ boolean active = src.isDirectory() && src.exists();
+ if (!active) {
+ continue;
+ }
File target = new File(dir, "target/classes");
findDataFormatFilesRecursive(target, jsonFiles,
dataFormatFiles, new CamelDataFormatsFileFilter());
}
@@ -320,6 +333,12 @@ public class PrepareCatalogSpringBootMojo extends
AbstractMojo {
if (!starters.contains(dir.getName())) {
continue;
}
+ // this module must be active with a source folder
+ File src = new File(dir, "src");
+ boolean active = src.isDirectory() && src.exists();
+ if (!active) {
+ continue;
+ }
if (dir.isDirectory() && !"target".equals(dir.getName())) {
File target = new File(dir, "target/classes");
findLanguageFilesRecursive(target, jsonFiles,
languageFiles, new CamelLanguagesFileFilter());
@@ -419,6 +438,13 @@ public class PrepareCatalogSpringBootMojo extends
AbstractMojo {
continue;
}
+ // this module must be active with a source folder
+ File src = new File(dir, "src");
+ boolean active = src.isDirectory() && src.exists();
+ if (!active) {
+ continue;
+ }
+
if (dir.isDirectory() && !"target".equals(dir.getName())) {
File target = new File(dir, "target/classes");
findOtherFilesRecursive(target, jsonFiles, otherFiles,
new CamelOthersFileFilter());
