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 C46E5179A6 for ; Sat, 27 Sep 2014 12:16:29 +0000 (UTC) Received: (qmail 43602 invoked by uid 500); 27 Sep 2014 12:16:29 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 43544 invoked by uid 500); 27 Sep 2014 12:16:29 -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 43352 invoked by uid 99); 27 Sep 2014 12:16:29 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 27 Sep 2014 12:16:29 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9B9A49B71CB; Sat, 27 Sep 2014 12:16:28 +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 Date: Sat, 27 Sep 2014 12:16:30 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/8] git commit: Merge branch 'CAMEL-7871' of https://github.com/ssogabe/camel Merge branch 'CAMEL-7871' of https://github.com/ssogabe/camel Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c57aec58 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c57aec58 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c57aec58 Branch: refs/heads/master Commit: c57aec585bbe5019d8536234b629664a1c40ce7f Parents: f543a11 29d87ac Author: Claus Ibsen Authored: Sat Sep 27 13:57:57 2014 +0200 Committer: Claus Ibsen Committed: Sat Sep 27 13:57:57 2014 +0200 ---------------------------------------------------------------------- .../dataformat/barcode/BarcodeDataFormat.java | 14 +++++++----- .../barcode/BarcodeDataFormatCamelTest.java | 23 ++++++++++++++++++++ .../barcode/barcodeDataformatSpring.xml | 9 +++++++- 3 files changed, 40 insertions(+), 6 deletions(-) ----------------------------------------------------------------------