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/20 10:15:52 UTC

[5/7] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/olingo-odata4

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/olingo-odata4


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

Branch: refs/heads/olingo-266-tecsvc
Commit: beae4797f0bfa2ccd8a8b452a93382dc4559ab2f
Parents: f59a8fb c93b648
Author: Francesco Chicchiriccò <--global>
Authored: Mon May 19 17:47:53 2014 +0200
Committer: Francesco Chicchiriccò <--global>
Committed: Mon May 19 17:47:53 2014 +0200

----------------------------------------------------------------------
 .../olingo/commons/api/http/HttpMethod.java     |   33 +
 lib/pom.xml                                     |    1 +
 .../org/apache/olingo/server/api/OData.java     |   55 +
 .../apache/olingo/server/api/ODataHandler.java  |   28 -
 .../olingo/server/api/ODataHttpHandler.java     |   28 +
 .../apache/olingo/server/api/ODataServer.java   |   52 -
 .../server/api/edm/provider/EntitySet.java      |    2 +-
 lib/server-core/pom.xml                         |   32 +-
 .../org/apache/olingo/server/core/Decoder.java  |   90 +
 .../apache/olingo/server/core/ODataHandler.java |   78 +
 .../olingo/server/core/ODataHandlerImpl.java    |   81 -
 .../server/core/ODataHttpHandlerImpl.java       |  202 +
 .../apache/olingo/server/core/ODataImpl.java    |   61 +
 .../apache/olingo/server/core/ODataRequest.java |  103 +
 .../olingo/server/core/ODataResponse.java       |   56 +
 .../olingo/server/core/ODataServerImpl.java     |   56 -
 .../core/edm/provider/EdmComplexTypeImpl.java   |    2 +-
 .../edm/provider/EdmEntityContainerImpl.java    |    8 +-
 .../core/edm/provider/EdmEntitySetImpl.java     |    5 +-
 .../core/edm/provider/EdmEntityTypeImpl.java    |    4 +-
 .../core/edm/provider/EdmEnumTypeImpl.java      |    2 +-
 .../server/core/edm/provider/EdmMemberImpl.java |   17 +-
 .../edm/provider/EdmNavigationPropertyImpl.java |    6 +-
 .../core/edm/provider/EdmOperationImpl.java     |    2 +-
 .../edm/provider/EdmOperationImportImpl.java    |    3 +-
 .../core/edm/provider/EdmParameterImpl.java     |    5 +-
 .../core/edm/provider/EdmPropertyImpl.java      |    7 +-
 .../core/edm/provider/EdmProviderImpl.java      |   18 +-
 .../provider/EdmReferentialConstraintImpl.java  |   17 +-
 .../core/edm/provider/EdmReturnTypeImpl.java    |    2 +-
 .../server/core/edm/provider/EdmSchemaImpl.java |    6 +-
 .../edm/provider/EdmServiceMetadataImpl.java    |    2 +-
 .../core/edm/provider/EdmSingletonImpl.java     |    5 +-
 .../provider/EdmStructuredTypeHelperImpl.java   |    4 +-
 .../edm/provider/EdmTypeDefinitionImpl.java     |    9 +-
 .../core/serializer/ODataXmlSerializerImpl.java |    1 +
 .../json/ServiceDocumentJsonSerializer.java     |   13 +-
 .../xml/MetadataDocumentXmlSerializer.java      |    1 -
 .../server/core/uri/parser/UriContext.java      |    8 +-
 .../server/core/ODataHttpHandlerImplTest.java   |  175 +
 lib/server-tecsvc/pom.xml                       |   61 +-
 .../olingo/server/tecsvc/TechnicalServlet.java  |   29 +-
 .../tecsvc/provider/ContainerProvider.java      |   80 +-
 .../server/tecsvc/provider/EdmTechProvider.java |    2 +-
 .../server/tecsvc/provider/SchemaProvider.java  |   76 +-
 lib/server-tecsvc/src/main/version/version.html |   43 +
 .../src/main/webapp/META-INF/MANIFEST.MF        |   13 +
 .../src/main/webapp/WEB-INF/web.xml             |    2 +-
 .../src/main/webapp/css/olingo.css              |   89 +
 .../src/main/webapp/img/OlingoOrangeTM.png      |  Bin 0 -> 113360 bytes
 lib/server-tecsvc/src/main/webapp/index.html    |   32 -
 lib/server-tecsvc/src/main/webapp/index.jsp     |   71 +
 .../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 --
 lib/server-test/pom.xml                         |   71 +
 .../olingo/server/core/ODataHandlerTest.java    |   86 +
 .../serializer/json/ServiceDocumentTest.java    |  133 +
 .../serializer/xml/MetadataDocumentTest.java    |  253 +
 .../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 ++
 .../src/test/resources/simplelogger.properties  |   20 +
 103 files changed, 12775 insertions(+), 11681 deletions(-)
----------------------------------------------------------------------