Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 176B11785D for ; Thu, 9 Apr 2015 13:01:16 +0000 (UTC) Received: (qmail 71732 invoked by uid 500); 9 Apr 2015 13:01:09 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 71686 invoked by uid 500); 9 Apr 2015 13:01:09 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 71677 invoked by uid 99); 9 Apr 2015 13:01:09 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Apr 2015 13:01:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7C248DFF97; Thu, 9 Apr 2015 13:01:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davsclaus@apache.org To: commits@camel.apache.org Message-Id: <226aa07bd09c49ea87ad3ed866561541@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: camel git commit: Camel catalog should include salesforce and linkedin which are special Date: Thu, 9 Apr 2015 13:01:09 +0000 (UTC) Repository: camel Updated Branches: refs/heads/master 5d94b2a8f -> bb4fc742f Camel catalog should include salesforce and linkedin which are special Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bb4fc742 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bb4fc742 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bb4fc742 Branch: refs/heads/master Commit: bb4fc742f3d6110512128001b00433607d51aa33 Parents: 5d94b2a Author: Claus Ibsen Authored: Thu Apr 9 15:02:29 2015 +0200 Committer: Claus Ibsen Committed: Thu Apr 9 15:03:48 2015 +0200 ---------------------------------------------------------------------- .../org/apache/camel/maven/packaging/PrepareCatalogMojo.java | 7 +++++++ 1 file changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/bb4fc742/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 0a5625b..3a6bd6a 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 @@ -291,6 +291,13 @@ public class PrepareCatalogMojo extends AbstractMojo { if (dir.isDirectory() && !"camel-jetty9".equals(dir.getName()) && !"target".equals(dir.getName())) { File target = new File(dir, "target/classes"); + // special for camel-salesforce which is in a sub dir + if ("camel-salesforce".equals(dir.getName())) { + target = new File(dir, "camel-salesforce-component/target/classes"); + } else if ("camel-linkedin".equals(dir.getName())) { + target = new File(dir, "camel-linkedin-component/target/classes"); + } + int before = componentFiles.size(); int before2 = jsonFiles.size();