Repository: camel Updated Branches: refs/heads/master 9275c9924 -> 9148b0d4d
Polished Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9148b0d4 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9148b0d4 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9148b0d4 Branch: refs/heads/master Commit: 9148b0d4d70273d62a962efe6c0068dfbde95613 Parents: 9275c99 Author: Claus Ibsen <davscl...@apache.org> Authored: Mon Dec 1 12:35:42 2014 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon Dec 1 12:35:42 2014 +0100 ---------------------------------------------------------------------- .../maven/camel-package-maven-plugin/pom.xml | 2 +- .../maven/packaging/PrepareCatalogMojo.java | 23 ++++++++++---------- 2 files changed, 13 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/9148b0d4/tooling/maven/camel-package-maven-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml b/tooling/maven/camel-package-maven-plugin/pom.xml index 75cf39f..1c5edc1 100644 --- a/tooling/maven/camel-package-maven-plugin/pom.xml +++ b/tooling/maven/camel-package-maven-plugin/pom.xml @@ -27,7 +27,7 @@ <artifactId>camel-package-maven-plugin</artifactId> <packaging>maven-plugin</packaging> - <name>Camel :: Maven Plugins :: Camel Package</name> + <name>Camel :: Maven Plugins :: Camel Maven Package</name> <description>Maven plugin to help package Camel components and plugins</description> <dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/9148b0d4/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 d6ce1fb..4e591e1 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 @@ -104,12 +104,13 @@ public class PrepareCatalogMojo extends AbstractMojo { public void execute() throws MojoExecutionException, MojoFailureException { getLog().info("Copying all Camel component json descriptors"); - Set<File> jsonFiles = new LinkedHashSet<File>(); - Set<File> duplicateJsonFiles = new LinkedHashSet<File>(); - Set<File> componentFiles = new LinkedHashSet<File>(); - Set<File> missingComponents = new LinkedHashSet<File>(); - Set<File> missingLabels = new LinkedHashSet<File>(); - Set<File> missingUriPaths = new LinkedHashSet<File>(); + // lets use sorted set/maps + Set<File> jsonFiles = new TreeSet<File>(); + Set<File> duplicateJsonFiles = new TreeSet<File>(); + Set<File> componentFiles = new TreeSet<File>(); + Set<File> missingComponents = new TreeSet<File>(); + Set<File> missingLabels = new TreeSet<File>(); + Set<File> missingUriPaths = new TreeSet<File>(); Map<String, Set<String>> usedLabels = new TreeMap<String, Set<String>>(); // find all json files in components and camel-core @@ -240,22 +241,22 @@ public class PrepareCatalogMojo extends AbstractMojo { for (File file : json) { getLog().info("\t\t" + asComponentName(file)); } - getLog().info(""); if (!duplicate.isEmpty()) { + getLog().info(""); getLog().warn("\tDuplicate components detected: " + duplicate.size()); for (File file : duplicate) { getLog().warn("\t\t" + asComponentName(file)); } } - getLog().info(""); if (!missingLabels.isEmpty()) { + getLog().info(""); getLog().warn("\tMissing labels detected: " + missingLabels.size()); for (File file : missingLabels) { getLog().warn("\t\t" + asComponentName(file)); } } - getLog().info(""); if (!usedLabels.isEmpty()) { + getLog().info(""); getLog().info("\tUsed labels: " + usedLabels.size()); for (Map.Entry<String, Set<String>> entry : usedLabels.entrySet()) { getLog().info("\t\t" + entry.getKey() + ":"); @@ -264,15 +265,15 @@ public class PrepareCatalogMojo extends AbstractMojo { } } } - getLog().info(""); if (!missingUriPaths.isEmpty()) { + getLog().info(""); getLog().warn("\tMissing @UriPath detected: " + missingUriPaths.size()); for (File file : missingUriPaths) { getLog().warn("\t\t" + asComponentName(file)); } } - getLog().info(""); if (!missing.isEmpty()) { + getLog().info(""); getLog().warn("\tMissing components detected: " + missing.size()); for (File name : missing) { getLog().warn("\t\t" + name.getName());
