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 2015/03/28 16:57:38 UTC
[2/6] camel git commit: CAMEL-8561: Camel Catalog - Add better
description of components and others
CAMEL-8561: Camel Catalog - Add better description of components and others
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c426a1ee
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c426a1ee
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c426a1ee
Branch: refs/heads/master
Commit: c426a1eeff98cb896f2b552ffeec79f59a66d355
Parents: 1620a95
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Mar 28 08:37:01 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Mar 28 16:57:02 2015 +0100
----------------------------------------------------------------------
.../camel/maven/packaging/PackageLanguageMojo.java | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c426a1ee/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 2136e69..70166a2 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
@@ -167,7 +167,7 @@ public class PackageLanguageMojo extends AbstractMojo {
languageModel.setTitle("");
languageModel.setModelName(modelName);
languageModel.setLabel("");
- languageModel.setDescription(project.getDescription());
+ languageModel.setDescription("");
languageModel.setJavaType(javaType);
languageModel.setGroupId(project.getGroupId());
languageModel.setArtifactId(project.getArtifactId());
@@ -178,18 +178,15 @@ public class PackageLanguageMojo extends AbstractMojo {
if (row.containsKey("title")) {
languageModel.setTitle(row.get("title"));
}
+ if (row.containsKey("description")) {
+ languageModel.setDescription(row.get("description"));
+ }
if (row.containsKey("label")) {
languageModel.setLabel(row.get("label"));
}
if (row.containsKey("javaType")) {
languageModel.setModelJavaType(row.get("javaType"));
}
- // override description for camel-core, as otherwise its too generic
- if ("camel-core".equals(project.getArtifactId())) {
- if (row.containsKey("description")) {
- languageModel.setLabel(row.get("description"));
- }
- }
}
log.debug("Model " + languageModel);