You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by sk...@apache.org on 2014/05/12 15:17:37 UTC
[40/40] git commit: [OLINGO-266] Merge remote-tracking branch
'origin/olingo-266-ref'
[OLINGO-266] Merge remote-tracking branch 'origin/olingo-266-ref'
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/330c5569
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/330c5569
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/330c5569
Branch: refs/heads/master
Commit: 330c556995e21275830e23fd3eee54c398eded09
Parents: ed8e0e3 0d62d15
Author: Stephan Klevenz <st...@sap.com>
Authored: Mon May 12 14:51:07 2014 +0200
Committer: Stephan Klevenz <st...@sap.com>
Committed: Mon May 12 14:51:07 2014 +0200
----------------------------------------------------------------------
fit/pom.xml | 53 +-
.../org/apache/olingo/fit/ref/PingITCase.java | 44 +
lib/pom.xml | 10 +-
lib/ref/pom.xml | 50 -
lib/server-api/pom.xml | 44 +-
.../apache/olingo/server/api/ODataHandler.java | 28 +
.../apache/olingo/server/api/ODataServer.java | 4 +
lib/server-core/pom.xml | 45 +-
.../olingo/server/core/ODataHandlerImpl.java | 81 +
.../olingo/server/core/ODataServerImpl.java | 9 +
.../server/core/servlet/ODataServlet.java | 86 -
.../serializer/json/ServiceDocumentTest.java | 133 -
.../serializer/xml/MetadataDocumentTest.java | 252 -
.../server/core/testutil/EdmTechProvider.java | 1976 -------
.../core/testutil/EdmTechTestProvider.java | 100 -
.../server/core/testutil/StringUtils.java | 52 -
.../testutil/techprovider/ActionProvider.java | 191 -
.../techprovider/ComplexTypeProvider.java | 175 -
.../techprovider/ContainerProvider.java | 361 --
.../testutil/techprovider/EdmTechProvider.java | 147 -
.../techprovider/EntityTypeProvider.java | 408 --
.../testutil/techprovider/EnumTypeProvider.java | 47 -
.../testutil/techprovider/FunctionProvider.java | 852 ---
.../testutil/techprovider/PropertyProvider.java | 590 --
.../testutil/techprovider/SchemaProvider.java | 250 -
.../techprovider/TypeDefinitionProvider.java | 30 -
.../olingo/server/core/uri/RawUriTest.java | 151 -
.../olingo/server/core/uri/UriInfoImplTest.java | 201 -
.../server/core/uri/UriResourceImplTest.java | 508 --
.../core/uri/antlr/TestFullResourcePath.java | 5110 ------------------
.../olingo/server/core/uri/antlr/TestLexer.java | 248 -
.../core/uri/antlr/TestUriParserImpl.java | 1144 ----
.../core/uri/queryoption/QueryOptionTest.java | 303 --
.../queryoption/expression/ExpressionTest.java | 239 -
.../core/uri/testutil/ExpandValidator.java | 230 -
.../core/uri/testutil/FilterTreeToText.java | 154 -
.../core/uri/testutil/FilterValidator.java | 534 --
.../core/uri/testutil/ParseTreeToText.java | 82 -
.../core/uri/testutil/ParserValidator.java | 162 -
.../core/uri/testutil/ParserWithLogging.java | 56 -
.../core/uri/testutil/ResourceValidator.java | 599 --
.../core/uri/testutil/TestErrorLogger.java | 105 -
.../core/uri/testutil/TestUriValidator.java | 258 -
.../server/core/uri/testutil/TestValidator.java | 23 -
.../core/uri/testutil/TokenValidator.java | 194 -
.../core/uri/testutil/UriLexerWithTrace.java | 85 -
.../core/uri/validator/UriValidatorTest.java | 378 --
.../src/test/resources/simplelogger.properties | 20 +
lib/server-ref/pom.xml | 83 +
.../olingo/server/ref/ReferenceServlet.java | 51 +
.../server/ref/provider/ActionProvider.java | 191 +
.../ref/provider/ComplexTypeProvider.java | 175 +
.../server/ref/provider/ContainerProvider.java | 361 ++
.../server/ref/provider/EdmTechProvider.java | 147 +
.../server/ref/provider/EntityTypeProvider.java | 408 ++
.../server/ref/provider/EnumTypeProvider.java | 47 +
.../server/ref/provider/FunctionProvider.java | 852 +++
.../server/ref/provider/PropertyProvider.java | 590 ++
.../server/ref/provider/SchemaProvider.java | 250 +
.../ref/provider/TypeDefinitionProvider.java | 30 +
.../src/main/resources/simplelogger.properties | 20 +
lib/server-ref/src/main/webapp/WEB-INF/web.xml | 42 +
lib/server-ref/src/main/webapp/index.html | 32 +
.../serializer/json/ServiceDocumentTest.java | 133 +
.../serializer/xml/MetadataDocumentTest.java | 254 +
.../olingo/server/core/uri/RawUriTest.java | 151 +
.../olingo/server/core/uri/UriInfoImplTest.java | 201 +
.../server/core/uri/UriResourceImplTest.java | 508 ++
.../core/uri/antlr/TestFullResourcePath.java | 5110 ++++++++++++++++++
.../olingo/server/core/uri/antlr/TestLexer.java | 248 +
.../core/uri/antlr/TestUriParserImpl.java | 1144 ++++
.../core/uri/queryoption/QueryOptionTest.java | 303 ++
.../queryoption/expression/ExpressionTest.java | 239 +
.../core/uri/testutil/EdmTechTestProvider.java | 100 +
.../core/uri/testutil/ExpandValidator.java | 230 +
.../core/uri/testutil/FilterTreeToText.java | 154 +
.../core/uri/testutil/FilterValidator.java | 534 ++
.../core/uri/testutil/ParseTreeToText.java | 82 +
.../core/uri/testutil/ParserValidator.java | 162 +
.../core/uri/testutil/ParserWithLogging.java | 56 +
.../core/uri/testutil/ResourceValidator.java | 599 ++
.../core/uri/testutil/TestErrorLogger.java | 105 +
.../core/uri/testutil/TestUriValidator.java | 258 +
.../server/core/uri/testutil/TestValidator.java | 23 +
.../core/uri/testutil/TokenValidator.java | 194 +
.../core/uri/testutil/UriLexerWithTrace.java | 85 +
.../core/uri/validator/UriValidatorTest.java | 378 ++
pom.xml | 2 +-
88 files changed, 14806 insertions(+), 16528 deletions(-)
----------------------------------------------------------------------