You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by tb...@apache.org on 2013/12/10 14:49:58 UTC

[03/50] [abbrv] git commit: Merged with current master

Merged with current master


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/83c25806
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/83c25806
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/83c25806

Branch: refs/heads/ODataServlet
Commit: 83c2580617d7845864b97b460cda9425d5331679
Parents: b7e7ee0 3200dbb
Author: Michael Bolz <mi...@apache.org>
Authored: Fri Nov 15 14:06:43 2013 +0100
Committer: Michael Bolz <mi...@apache.org>
Committed: Fri Nov 15 14:06:43 2013 +0100

----------------------------------------------------------------------
 .../odata2/api/edm/provider/AliasInfo.java      |  61 ++++
 .../odata2/api/edm/provider/EdmProvider.java    |  11 +
 .../odata2/core/ODataExceptionWrapper.java      | 354 -------------------
 .../olingo/odata2/core/ODataRequestHandler.java |   1 +
 .../apache/olingo/odata2/core/edm/EdmImpl.java  |  38 +-
 .../odata2/core/edm/provider/EdmImplProv.java   |  15 +
 .../odata2/core/edm/provider/EdmxProvider.java  |  16 +
 .../core/ep/consumer/XmlMetadataConsumer.java   |   2 +-
 .../core/rest/ODataExceptionMapperImpl.java     |  26 +-
 .../odata2/core/rest/ODataExceptionWrapper.java | 328 +++++++++++++++++
 .../odata2/core/rest/ODataRootLocator.java      |  45 ++-
 .../odata2/core/rest/ODataSubLocator.java       |   1 -
 .../core/rest/app/AbstractODataApplication.java |  27 ++
 .../odata2/core/ODataExceptionWrapperTest.java  |   1 +
 .../olingo/odata2/core/edm/EdmImplTest.java     |   7 +
 .../core/edm/provider/EdmImplProvTest.java      |  68 +++-
 .../core/edm/provider/EdmxProviderTest.java     |  40 ++-
 .../core/rest/ODataExceptionMapperImplTest.java |  15 +-
 .../core/rest/ODataServiceFactoryImpl.java      |  14 -
 .../ODataServiceFactoryWithCallbackImpl.java    |  51 +++
 .../olingo/odata2/fit/basic/ContextTest.java    |   2 +-
 .../fit/basic/issues/Service1Factory.java       |  76 ----
 .../fit/basic/issues/Service2Factory.java       |  76 ----
 .../basic/issues/TestCxfCacheUriInfoIssue.java  | 118 -------
 .../basic/issues/TestCxfCacheUriInfoIssue2.java |  75 ----
 .../fit/misc/CxfCacheUriInfoIssue2Test.java     |  80 +++++
 .../CxfCacheUriInfoIssueService1Factory.java    |  75 ++++
 .../CxfCacheUriInfoIssueService2Factory.java    |  75 ++++
 .../fit/misc/CxfCacheUriInfoIssueTest.java      | 118 +++++++
 .../fit/misc/ODataApplicationFactory.java       |  42 +++
 .../odata2/fit/misc/ODataApplicationTest.java   |  79 +++++
 .../odata2/fit/misc/ODataApplication_.java      |  31 ++
 .../odata2/testutil/mock/EdmTestProvider.java   |  10 +
 .../core/jpa/ODataJPAResponseBuilder.java       |   6 +-
 34 files changed, 1206 insertions(+), 778 deletions(-)
----------------------------------------------------------------------