Christian Amend 010642c506 Merge branch 'master' into OLINGO-834_Filter_Parser ... Conflicts: lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceComplexPropertyImpl.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceCountImpl.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceEntitySetImpl.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceItImpl.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceLambdaAllImpl.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceLambdaAnyImpl.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceLambdaVarImpl.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceNavigationPropertyImpl.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourcePrimitivePropertyImpl.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceRefImpl.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceRootImpl.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceSingletonImpl.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceStartingTypeFilterImpl.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceWithKeysImpl.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/CheckFullContextListener.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/Parser.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/RawUri.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriContext.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriDecoder.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParseTreeVisitor.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParserSemanticException.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/ExpressionImpl.java lib/server-core/src/main/java/org/apache/olingo/server/core/uri/validator/UriValidator.java lib/server-core/src/test/java/org/apache/olingo/server/core/uri/parser/search/SearchParserAndTokenizerTest.java		2016-01-07 14:27:27 +01:00
..
src	[OLINGO-834] URI resource-path parser in Java	2015-12-07 13:17:50 +01:00
pom.xml	[OLINGO-841] Set new 4.2.0-SNAPSHOT version	2015-12-21 12:55:05 +01:00