camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [04/12] camel git commit: CAMEL-8242: Camel Toolbox - Include documentation about languages
Date Wed, 14 Jan 2015 14:38:41 GMT
CAMEL-8242: Camel Toolbox - Include documentation about languages


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0087ba94
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0087ba94
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0087ba94

Branch: refs/heads/master
Commit: 0087ba946d8f019bd061624feda42f563fb35966
Parents: cc21757
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Wed Jan 14 13:30:49 2015 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Wed Jan 14 15:38:23 2015 +0100

----------------------------------------------------------------------
 .../org/apache/camel/tools/apt/EipAnnotationProcessor.java     | 1 +
 .../apache/camel/tools/apt/EndpointAnnotationProcessor.java    | 1 +
 .../apache/camel/maven/packaging/PackageDataFormatMojo.java    | 1 +
 .../org/apache/camel/maven/packaging/PackageLanguageMojo.java  | 1 +
 .../org/apache/camel/maven/packaging/PrepareCatalogMojo.java   | 6 +++---
 5 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/0087ba94/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
----------------------------------------------------------------------
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
index ba82d9b..6867f40 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EipAnnotationProcessor.java
@@ -152,6 +152,7 @@ public class EipAnnotationProcessor extends AbstractAnnotationProcessor
{
         StringBuilder buffer = new StringBuilder("{");
         // eip model
         buffer.append("\n \"model\": {");
+        buffer.append("\n    \"kind\": \"").append("model").append("\",");
         buffer.append("\n    \"name\": \"").append(eipModel.getName()).append("\",");
         buffer.append("\n    \"description\": \"").append(safeNull(eipModel.getDescription())).append("\",");
         buffer.append("\n    \"javaType\": \"").append(eipModel.getJavaType()).append("\",");

http://git-wip-us.apache.org/repos/asf/camel/blob/0087ba94/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
----------------------------------------------------------------------
diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
index 592a048..1af9fe6 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
@@ -169,6 +169,7 @@ public class EndpointAnnotationProcessor extends AbstractAnnotationProcessor
{
         StringBuilder buffer = new StringBuilder("{");
         // component model
         buffer.append("\n \"component\": {");
+        buffer.append("\n    \"kind\": \"").append("component").append("\",");
         buffer.append("\n    \"scheme\": \"").append(componentModel.getScheme()).append("\",");
         buffer.append("\n    \"description\": \"").append(componentModel.getDescription()).append("\",");
         buffer.append("\n    \"label\": \"").append(getOrElse(componentModel.getLabel(),
"")).append("\",");

http://git-wip-us.apache.org/repos/asf/camel/blob/0087ba94/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
index dbe88b7..a41a970 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
@@ -282,6 +282,7 @@ public class PackageDataFormatMojo extends AbstractMojo {
         // component model
         buffer.append("\n \"dataformat\": {");
         buffer.append("\n    \"name\": \"").append(dataFormatModel.getName()).append("\",");
+        buffer.append("\n    \"kind\": \"").append("dataformat").append("\",");
         buffer.append("\n    \"modelName\": \"").append(dataFormatModel.getModelName()).append("\",");
         buffer.append("\n    \"description\": \"").append(dataFormatModel.getDescription()).append("\",");
         buffer.append("\n    \"label\": \"").append(dataFormatModel.getLabel()).append("\",");

http://git-wip-us.apache.org/repos/asf/camel/blob/0087ba94/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
index 9442b2d..61d993c 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java
@@ -279,6 +279,7 @@ public class PackageLanguageMojo extends AbstractMojo {
         // component model
         buffer.append("\n \"language\": {");
         buffer.append("\n    \"name\": \"").append(languageModel.getName()).append("\",");
+        buffer.append("\n    \"kind\": \"").append("language").append("\",");
         buffer.append("\n    \"modelName\": \"").append(languageModel.getModelName()).append("\",");
         buffer.append("\n    \"description\": \"").append(languageModel.getDescription()).append("\",");
         buffer.append("\n    \"label\": \"").append(languageModel.getLabel()).append("\",");

http://git-wip-us.apache.org/repos/asf/camel/blob/0087ba94/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 286044a..f9e63e5 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
@@ -793,7 +793,7 @@ public class PrepareCatalogMojo extends AbstractMojo {
                 // must be a components json file
                 try {
                     String json = loadText(new FileInputStream(pathname));
-                    return json != null && json.contains("\"component\":");
+                    return json != null && json.contains("\"kind\": \"component\"");
                 } catch (IOException e) {
                     // ignore
                 }
@@ -814,7 +814,7 @@ public class PrepareCatalogMojo extends AbstractMojo {
                 // must be a dataformat json file
                 try {
                     String json = loadText(new FileInputStream(pathname));
-                    return json != null && json.contains("\"dataformat\":");
+                    return json != null && json.contains("\"kind\": \"dataformat\"");
                 } catch (IOException e) {
                     // ignore
                 }
@@ -835,7 +835,7 @@ public class PrepareCatalogMojo extends AbstractMojo {
                 // must be a language json file
                 try {
                     String json = loadText(new FileInputStream(pathname));
-                    return json != null && json.contains("\"language\":");
+                    return json != null && json.contains("\"kind\": \"language\"");
                 } catch (IOException e) {
                     // ignore
                 }


Mime
View raw message