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 2014/03/16 10:06:15 UTC
[26/50] [abbrv] git commit: [OLINGO-67] Merge remote-tracking branch
'origin/ODataServlet'
[OLINGO-67] Merge remote-tracking branch 'origin/ODataServlet'
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/362f8ce4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/362f8ce4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/362f8ce4
Branch: refs/heads/Olingo-129_PocJpaDataStore
Commit: 362f8ce4908351c79058d0c1127ccd4f27ca08b6
Parents: 63633ce 3214f49
Author: Stephan Klevenz <sk...@apache.org>
Authored: Mon Feb 17 13:39:22 2014 +0100
Committer: Stephan Klevenz <sk...@apache.org>
Committed: Mon Feb 17 13:39:22 2014 +0100
----------------------------------------------------------------------
.../processor/core/ListsProcessor.java | 2 +-
.../processor/ref/AbstractRefJsonTest.java | 8 +
.../processor/ref/AbstractRefTest.java | 7 +
.../processor/ref/AbstractRefXmlTest.java | 7 +
.../processor/ref/EntryJsonCreateTest.java | 7 +-
.../processor/ref/ServiceJsonTest.java | 5 +
.../processor/ref/ServiceXmlTest.java | 5 +
.../core/servlet/ODataExceptionWrapper.java | 211 +++++++++++
.../odata2/core/servlet/ODataServlet.java | 234 ++++++++++++
.../olingo/odata2/core/servlet/RestUtil.java | 354 +++++++++++++++++++
.../odata2/fit/basic/AbstractBasicTest.java | 5 +
.../odata2/fit/basic/AcceptHeaderTypeTest.java | 5 +
.../olingo/odata2/fit/basic/BasicBatchTest.java | 5 +
.../olingo/odata2/fit/basic/BasicHttpTest.java | 5 +
.../ContentNegotiationDollarFormatTest.java | 5 +
.../olingo/odata2/fit/basic/ContextTest.java | 5 +
.../odata2/fit/basic/ErrorResponseTest.java | 5 +
.../olingo/odata2/fit/basic/ExceptionsTest.java | 5 +
.../olingo/odata2/fit/basic/FitLoadTest.java | 5 +
.../fit/basic/HttpExceptionResponseTest.java | 5 +
.../fit/basic/LanguageNegotiationTest.java | 5 +
.../olingo/odata2/fit/basic/MetadataTest.java | 5 +
.../fit/basic/RequestContentTypeTest.java | 5 +
.../odata2/fit/basic/ServiceResolutionTest.java | 3 +-
.../olingo/odata2/fit/basic/UrlRewriteTest.java | 5 +
.../odata2/fit/client/ClientBatchTest.java | 5 +
.../fit/client/ClientDeltaResponseTest.java | 7 +-
.../olingo/odata2/fit/client/util/Client.java | 2 +-
.../olingo/odata2/fit/mapping/MappingTest.java | 7 +-
.../fit/misc/CxfCacheUriInfoIssue2Test.java | 5 +-
.../fit/misc/CxfCacheUriInfoIssueTest.java | 5 +
.../odata2/fit/ref/AbstractRefJsonTest.java | 9 +
.../olingo/odata2/fit/ref/AbstractRefTest.java | 10 +-
.../odata2/fit/ref/AbstractRefXmlTest.java | 7 +
.../apache/olingo/odata2/fit/ref/BatchTest.java | 5 +
.../odata2/fit/ref/ContentNegotiationTest.java | 5 +
.../odata2/fit/ref/DataServiceVersionTest.java | 5 +
.../odata2/fit/ref/EntryJsonChangeTest.java | 5 +
.../fit/ref/EntryJsonCreateInlineTest.java | 5 +
.../odata2/fit/ref/EntryJsonCreateTest.java | 5 +
.../odata2/fit/ref/EntryJsonReadOnlyTest.java | 5 +
.../odata2/fit/ref/EntryXmlChangeTest.java | 5 +
.../odata2/fit/ref/EntryXmlCreateTest.java | 5 +
.../odata2/fit/ref/EntryXmlReadOnlyTest.java | 5 +
.../odata2/fit/ref/FeedJsonReadOnlyTest.java | 5 +
.../odata2/fit/ref/FeedXmlReadOnlyTest.java | 5 +
.../odata2/fit/ref/FunctionImportJsonTest.java | 5 +
.../odata2/fit/ref/FunctionImportXmlTest.java | 5 +
.../odata2/fit/ref/LinksJsonChangeTest.java | 5 +
.../odata2/fit/ref/LinksJsonReadOnlyTest.java | 5 +
.../odata2/fit/ref/LinksXmlChangeTest.java | 5 +
.../odata2/fit/ref/LinksXmlReadOnlyTest.java | 5 +
.../olingo/odata2/fit/ref/MetadataTest.java | 5 +
.../olingo/odata2/fit/ref/MiscChangeTest.java | 5 +
.../olingo/odata2/fit/ref/MiscReadOnlyTest.java | 5 +
.../odata2/fit/ref/PropertyJsonChangeTest.java | 5 +
.../fit/ref/PropertyJsonReadOnlyTest.java | 5 +
.../odata2/fit/ref/PropertyXmlChangeTest.java | 5 +
.../odata2/fit/ref/PropertyXmlReadOnlyTest.java | 5 +
.../olingo/odata2/fit/ref/ServiceJsonTest.java | 5 +
.../olingo/odata2/fit/ref/ServiceXmlTest.java | 5 +
.../AbstractContentNegotiationTest.java | 5 +
.../BasicContentNegotiationTest.java | 5 +
.../ContentNegotiationGetRequestTest.java | 5 +
.../ContentNegotiationPostRequestTest.java | 5 +
.../odata2/testutil/fit/AbstractFitTest.java | 27 +-
.../odata2/testutil/server/ServletType.java | 5 +
.../odata2/testutil/server/TestServer.java | 57 ++-
.../odata-web/src/main/webapp/WEB-INF/web.xml | 16 +
odata2-lib/odata-web/src/main/webapp/index.jsp | 190 +++++++---
70 files changed, 1351 insertions(+), 69 deletions(-)
----------------------------------------------------------------------