Return-Path: X-Original-To: apmail-olingo-commits-archive@minotaur.apache.org Delivered-To: apmail-olingo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D5A47C0A3 for ; Mon, 9 Sep 2013 04:45:19 +0000 (UTC) Received: (qmail 91616 invoked by uid 500); 9 Sep 2013 04:45:19 -0000 Delivered-To: apmail-olingo-commits-archive@olingo.apache.org Received: (qmail 91548 invoked by uid 500); 9 Sep 2013 04:45:15 -0000 Mailing-List: contact commits-help@olingo.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@olingo.incubator.apache.org Delivered-To: mailing list commits@olingo.incubator.apache.org Received: (qmail 91499 invoked by uid 99); 9 Sep 2013 04:44:59 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Sep 2013 04:44:59 +0000 X-ASF-Spam-Status: No, hits=-2000.7 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 09 Sep 2013 04:44:57 +0000 Received: (qmail 91483 invoked by uid 99); 9 Sep 2013 04:44:35 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Sep 2013 04:44:35 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C861B9037B9; Mon, 9 Sep 2013 04:44:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: chandanva@apache.org To: commits@olingo.incubator.apache.org Date: Mon, 09 Sep 2013 04:44:35 -0000 Message-Id: In-Reply-To: <0ac752f14b42478f8d8ffca9b4f99081@git.apache.org> References: <0ac752f14b42478f8d8ffca9b4f99081@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2 X-Virus-Checked: Checked by ClamAV on apache.org Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2 Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/5457e773 Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/5457e773 Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/5457e773 Branch: refs/heads/master Commit: 5457e77396852d1c424c9cb11fd7f5b2d72491a7 Parents: d3c1691 c631f16 Author: Chandan V A Authored: Mon Sep 9 10:12:07 2013 +0530 Committer: Chandan V A Committed: Mon Sep 9 10:12:07 2013 +0530 ---------------------------------------------------------------------- .../olingo/odata2/core/ContentNegotiator.java | 4 +- .../olingo/odata2/core/ODataRequestHandler.java | 2 +- .../odata2/core/batch/BatchRequestParser.java | 11 ++- .../olingo/odata2/core/commons/ContentType.java | 93 ++++++++++++++++++-- .../odata2/core/ep/ProviderFacadeImpl.java | 2 +- .../olingo/odata2/core/rest/RestUtil.java | 7 +- .../core/batch/BatchRequestParserTest.java | 18 ++-- .../odata2/core/commons/ContentTypeTest.java | 87 +++++++++++++++--- 8 files changed, 185 insertions(+), 39 deletions(-) ----------------------------------------------------------------------