[camel-karaf] branch master updated: Catalog for Karaf

[davsclaus]

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-karaf.git


The following commit(s) were added to refs/heads/master by this push:
     new 796264c  Catalog for Karaf
796264c is described below

commit 796264c1110e90368cd22ef04e1445b7810860be
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu Mar 26 13:13:46 2020 +0100

    Catalog for Karaf
---
 .../camel/catalog/karaf/KarafRuntimeProviderTest.java       |  7 ++++++-
 .../apache/camel/karaf/maven/PrepareCatalogKarafMojo.java   | 13 +++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

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 e4dfc34..c12052b 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
@@ -117,11 +117,16 @@ public class KarafRuntimeProviderTest {
         assertNotNull(names);
         assertFalse(names.isEmpty());
 
-        assertTrue(names.contains("blueprint"));
+        // regular others
         assertTrue(names.contains("hystrix"));
         assertTrue(names.contains("swagger-java"));
         assertTrue(names.contains("zipkin"));
 
+        // camel-karaf only
+        assertTrue(names.contains("blueprint"));
+        assertTrue(names.contains("kura"));
+        assertTrue(names.contains("osgi-activator"));
+        
         assertFalse(names.contains("spring-boot"));
     }
 
diff --git 
a/tooling/camel-catalog-generator-karaf-maven-plugin/src/main/java/org/apache/camel/karaf/maven/PrepareCatalogKarafMojo.java
 
b/tooling/camel-catalog-generator-karaf-maven-plugin/src/main/java/org/apache/camel/karaf/maven/PrepareCatalogKarafMojo.java
index cc0cf34..a7e4258 100644
--- 
a/tooling/camel-catalog-generator-karaf-maven-plugin/src/main/java/org/apache/camel/karaf/maven/PrepareCatalogKarafMojo.java
+++ 
b/tooling/camel-catalog-generator-karaf-maven-plugin/src/main/java/org/apache/camel/karaf/maven/PrepareCatalogKarafMojo.java
@@ -94,6 +94,12 @@ public class PrepareCatalogKarafMojo extends AbstractMojo {
     protected File componentsDir;
 
     /**
+     * The components directory where there are karaf only components
+     */
+    @Parameter(defaultValue = "${project.build.directory}/../../../components")
+    protected File karafComponentsDir;
+
+    /**
      * The dataformats directory where all the Apache Camel components are 
from the camel-catalog
      */
     @Parameter(defaultValue = 
"${project.build.directory}/sources/camel-catalog/org/apache/camel/catalog/dataformats")
@@ -145,6 +151,9 @@ public class PrepareCatalogKarafMojo extends AbstractMojo {
                 }
             }
         }
+        // include paxlogging as regular component
+        jsonFiles.add(new File(karafComponentsDir, 
"camel-paxlogging/target/classes/org/apache/camel/component/paxlogging/paxlogging.json"));
+
         if (!jsonFiles.isEmpty()) {
             Path outDir = componentsOutDir.toPath();
             copyFiles(outDir, jsonFiles);
@@ -197,6 +206,10 @@ public class PrepareCatalogKarafMojo extends AbstractMojo {
                 }
             }
         }
+        // include others that are in camel-karaf only
+        jsonFiles.add(new File(karafComponentsDir, 
"camel-blueprint/target/classes/blueprint.json"));
+        jsonFiles.add(new File(karafComponentsDir, 
"camel-kura/target/classes/kura.json"));
+        jsonFiles.add(new File(karafComponentsDir, 
"camel-osgi-activator/target/classes/osgi-activator.json"));
         if (!jsonFiles.isEmpty()) {
             Path outDir = othersOutDir.toPath();
             copyFiles(outDir, jsonFiles);