You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2015/06/19 18:23:21 UTC
[28/28] olingo-odata4 git commit: [OLINGO-695] Merge remote-tracking
branch 'origin/master' into OLINGO-695_OSGi-Support
[OLINGO-695] Merge remote-tracking branch 'origin/master' into OLINGO-695_OSGi-Support
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/85cd9072
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/85cd9072
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/85cd9072
Branch: refs/heads/OLINGO-695_OSGi-Support
Commit: 85cd9072e4ae6f0ea16c30e73c51c253c409ac04
Parents: 74fddd1 fd513e2
Author: Michael Bolz <mi...@sap.com>
Authored: Fri Jun 19 18:17:53 2015 +0200
Committer: Michael Bolz <mi...@sap.com>
Committed: Fri Jun 19 18:18:32 2015 +0200
----------------------------------------------------------------------
.../fit/tecsvc/client/ActionImportITCase.java | 2 +-
.../olingo/fit/tecsvc/client/BasicITCase.java | 6 +-
.../tecsvc/client/PrimitiveComplexITCase.java | 2 +-
.../tecsvc/client/SystemQueryOptionITCase.java | 2 +-
.../communication/header/ODataPreferences.java | 33 ++-
.../commons/api/ODataPreferenceNames.java | 46 +++++
.../olingo/server/api/prefer/Preferences.java | 5 +-
.../server/api/prefer/PreferencesApplied.java | 49 +++--
.../api/prefer/PreferencesAppliedTest.java | 18 +-
.../server/core/prefer/PreferencesImpl.java | 35 ++--
.../server/core/uri/UriResourceActionImpl.java | 13 +-
.../server/core/uri/UriResourceTypedImpl.java | 8 +-
.../uri/queryoption/expression/MemberImpl.java | 5 +
.../processor/TechnicalActionProcessor.java | 12 +-
.../processor/TechnicalBatchProcessor.java | 2 +-
.../processor/TechnicalEntityProcessor.java | 8 +-
.../TechnicalPrimitiveComplexProcessor.java | 2 +-
.../olingo/server/core/ODataHandlerTest.java | 62 ++----
.../server/core/PreconditionsValidatorTest.java | 205 ++++++++-----------
.../core/uri/antlr/TestFullResourcePath.java | 12 ++
.../core/uri/antlr/TestUriParserImpl.java | 2 +-
.../queryoption/expression/ExpressionTest.java | 20 +-
22 files changed, 271 insertions(+), 278 deletions(-)
----------------------------------------------------------------------