olingo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject [3/3] git commit: Merge branch 'master' into OLINGO-377-FIT
Date Thu, 24 Jul 2014 11:41:36 GMT
Merge branch 'master' into OLINGO-377-FIT


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/7d3749c8
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/7d3749c8
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/7d3749c8

Branch: refs/heads/OLINGO-377-FIT
Commit: 7d3749c8aa9c4a47fdda1dffbd053b7f54957368
Parents: b4d3819 e0b787e
Author: Michael Bolz <michael.bolz@sap.com>
Authored: Thu Jul 24 13:34:50 2014 +0200
Committer: Michael Bolz <michael.bolz@sap.com>
Committed: Thu Jul 24 13:34:50 2014 +0200

----------------------------------------------------------------------
 .../server/api/ODataTranslatedException.java    | 13 ++--
 .../server/api/processor/DefaultProcessor.java  |  2 +-
 .../server/api/serializer/ODataSerializer.java  |  1 -
 .../serializer/ODataSerializerException.java    | 50 ++++++++++++++
 .../src/main/resources/i18n.properties          | 37 +++++++----
 .../server/api/TranslatedExceptionsTest.java    |  7 +-
 .../src/test/resources/i18n.properties          | 23 -------
 .../src/test/resources/i18n_en.properties       | 23 +++++++
 .../server/core/ODataExceptionHandler.java      |  2 +-
 .../core/serializer/ODataXmlSerializerImpl.java | 31 +++++----
 .../serializer/json/ODataJsonSerializer.java    | 70 +++++++++++---------
 .../olingo/server/tecsvc/data/DataProvider.java | 11 +--
 .../tecsvc/processor/TechnicalProcessor.java    |  2 +-
 .../json/ODataJsonSerializerTest.java           | 23 +++++--
 .../serializer/xml/MetadataDocumentTest.java    |  2 +-
 15 files changed, 193 insertions(+), 104 deletions(-)
----------------------------------------------------------------------



Mime
View raw message