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/a9ec7599 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/a9ec7599 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/a9ec7599 Branch: refs/heads/master Commit: a9ec75991f5c522bd57771e3fb48ff9d8e583b2c Parents: 18ce83a 66097e3 Author: Francesco Chicchiriccò <--global> Authored: Tue Jul 22 16:40:33 2014 +0200 Committer: Francesco Chicchiriccò <--global> Committed: Tue Jul 22 16:40:33 2014 +0200 ---------------------------------------------------------------------- .../batch/CommonBatchRequestFactory.java | 4 +- .../request/cud/CommonCUDRequestFactory.java | 9 ++- .../request/invoke/InvokeRequestFactory.java | 9 ++- .../request/invoke/ODataNoContent.java | 7 +-- .../retrieve/CommonRetrieveRequestFactory.java | 8 +-- .../client/api/uri/CommonFilterFactory.java | 4 +- .../request/batch/AbstractBatchManager.java | 8 +-- .../batch/AbstractBatchRequestFactory.java | 2 - .../batch/v3/BatchRequestFactoryImpl.java | 2 - .../request/batch/v3/ODataBatchRequestImpl.java | 15 +++-- .../batch/v4/BatchRequestFactoryImpl.java | 2 - .../request/cud/AbstractCUDRequestFactory.java | 2 - .../request/cud/v3/CUDRequestFactoryImpl.java | 5 +- .../request/cud/v4/CUDRequestFactoryImpl.java | 9 +-- .../AbstractEdmEnabledInvokeRequestFactory.java | 2 - .../invoke/AbstractInvokeRequestFactory.java | 2 - .../v3/EdmEnabledInvokeRequestFactoryImpl.java | 2 - .../invoke/v3/InvokeRequestFactoryImpl.java | 2 - .../v4/EdmEnabledInvokeRequestFactoryImpl.java | 2 - .../invoke/v4/InvokeRequestFactoryImpl.java | 2 - .../AbstractRetrieveRequestFactory.java | 2 - .../retrieve/v3/RetrieveRequestFactoryImpl.java | 6 +- .../retrieve/v4/RetrieveRequestFactoryImpl.java | 3 - .../request/v4/AsyncRequestFactoryImpl.java | 2 - .../olingo/client/core/edm/EdmEnumTypeImpl.java | 17 +++-- .../olingo/client/core/edm/EdmPropertyImpl.java | 9 ++- .../client/core/edm/EdmReturnTypeImpl.java | 4 +- .../client/core/edm/EdmTypeDefinitionImpl.java | 7 +-- .../core/edm/v3/EdmFunctionImportProxy.java | 4 -- .../core/edm/v3/EdmNavigationPropertyProxy.java | 3 - .../core/edm/v4/annotation/EdmRecordImpl.java | 3 - .../core/edm/xml/AbstractAnnotations.java | 2 - .../core/edm/xml/AbstractComplexType.java | 2 - .../core/edm/xml/AbstractDataServices.java | 2 - .../client/core/edm/xml/AbstractEdmx.java | 2 - .../core/edm/xml/AbstractEntityContainer.java | 2 - .../client/core/edm/xml/AbstractEntitySet.java | 2 - .../client/core/edm/xml/AbstractEntityType.java | 2 - .../client/core/edm/xml/AbstractEnumType.java | 2 - .../client/core/edm/xml/AbstractMember.java | 2 - .../edm/xml/AbstractNavigationProperty.java | 2 - .../client/core/edm/xml/AbstractParameter.java | 2 - .../client/core/edm/xml/AbstractProperty.java | 2 - .../client/core/edm/xml/AbstractSchema.java | 2 - .../core/edm/xml/AbstractXMLMetadata.java | 2 - .../edm/xml/EntityContainerDeserializer.java | 1 - .../client/core/edm/xml/EntityKeyImpl.java | 2 - .../client/core/edm/xml/OnDeleteImpl.java | 2 - .../client/core/edm/xml/PropertyRefImpl.java | 2 - .../client/core/edm/xml/SchemaDeserializer.java | 1 - .../client/core/edm/xml/v3/AnnotationsImpl.java | 2 - .../core/edm/xml/v3/AssociationEndImpl.java | 2 - .../client/core/edm/xml/v3/AssociationImpl.java | 2 - .../core/edm/xml/v3/AssociationSetEndImpl.java | 2 - .../core/edm/xml/v3/AssociationSetImpl.java | 2 - .../client/core/edm/xml/v3/ComplexTypeImpl.java | 7 +-- .../core/edm/xml/v3/DataServicesImpl.java | 2 - .../olingo/client/core/edm/xml/v3/EdmxImpl.java | 2 - .../core/edm/xml/v3/EntityContainerImpl.java | 2 - .../client/core/edm/xml/v3/EntitySetImpl.java | 3 - .../client/core/edm/xml/v3/EntityTypeImpl.java | 2 - .../client/core/edm/xml/v3/EnumTypeImpl.java | 2 - .../core/edm/xml/v3/FunctionImportImpl.java | 2 - .../client/core/edm/xml/v3/MemberImpl.java | 3 - .../core/edm/xml/v3/NavigationPropertyImpl.java | 2 - .../client/core/edm/xml/v3/ParameterImpl.java | 2 - .../client/core/edm/xml/v3/PropertyImpl.java | 2 - .../core/edm/xml/v3/PropertyValueImpl.java | 2 - .../edm/xml/v3/ReferentialConstraintImpl.java | 2 - .../xml/v3/ReferentialConstraintRoleImpl.java | 2 - .../client/core/edm/xml/v3/SchemaImpl.java | 11 ++-- .../core/edm/xml/v3/TypeAnnotationImpl.java | 2 - .../client/core/edm/xml/v3/UsingImpl.java | 2 - .../core/edm/xml/v3/ValueAnnotationImpl.java | 2 - .../client/core/edm/xml/v3/ValueTermImpl.java | 2 - .../client/core/edm/xml/v3/XMLMetadataImpl.java | 2 - .../core/edm/xml/v4/AbstractAnnotatable.java | 2 - .../client/core/edm/xml/v4/ActionImpl.java | 2 - .../core/edm/xml/v4/ActionImportImpl.java | 2 - .../client/core/edm/xml/v4/AnnotationImpl.java | 2 - .../client/core/edm/xml/v4/AnnotationsImpl.java | 2 - .../client/core/edm/xml/v4/ComplexTypeImpl.java | 2 - .../core/edm/xml/v4/DataServicesImpl.java | 2 - .../olingo/client/core/edm/xml/v4/EdmxImpl.java | 2 - .../core/edm/xml/v4/EntityContainerImpl.java | 11 ++-- .../client/core/edm/xml/v4/EntitySetImpl.java | 2 - .../client/core/edm/xml/v4/EntityTypeImpl.java | 2 - .../client/core/edm/xml/v4/EnumTypeImpl.java | 2 - .../client/core/edm/xml/v4/FunctionImpl.java | 2 - .../core/edm/xml/v4/FunctionImportImpl.java | 2 - .../core/edm/xml/v4/IncludeAnnotationsImpl.java | 2 - .../client/core/edm/xml/v4/IncludeImpl.java | 2 - .../client/core/edm/xml/v4/MemberImpl.java | 2 - .../xml/v4/NavigationPropertyBindingImpl.java | 2 - .../core/edm/xml/v4/NavigationPropertyImpl.java | 2 - .../client/core/edm/xml/v4/ParameterImpl.java | 2 - .../client/core/edm/xml/v4/PropertyImpl.java | 2 - .../client/core/edm/xml/v4/ReferenceImpl.java | 2 - .../edm/xml/v4/ReferentialConstraintImpl.java | 2 - .../client/core/edm/xml/v4/ReturnTypeImpl.java | 2 - .../client/core/edm/xml/v4/SchemaImpl.java | 2 - .../client/core/edm/xml/v4/SingletonImpl.java | 2 - .../olingo/client/core/edm/xml/v4/TermImpl.java | 2 - .../core/edm/xml/v4/TypeDefinitionImpl.java | 2 - .../client/core/edm/xml/v4/XMLMetadataImpl.java | 2 - ...tAnnotatableDynamicAnnotationExpression.java | 2 - .../AbstractAnnotationExpression.java | 2 - .../AbstractDynamicAnnotationExpression.java | 2 - .../AbstractElementOrAttributeExpression.java | 2 - .../xml/v4/annotation/AnnotationPathImpl.java | 3 - .../core/edm/xml/v4/annotation/ApplyImpl.java | 2 - .../core/edm/xml/v4/annotation/CastImpl.java | 2 - .../edm/xml/v4/annotation/CollectionImpl.java | 2 - .../ConstantAnnotationExpressionImpl.java | 2 - .../core/edm/xml/v4/annotation/IfImpl.java | 2 - .../core/edm/xml/v4/annotation/IsOfImpl.java | 2 - .../xml/v4/annotation/LabeledElementImpl.java | 2 - .../annotation/LabeledElementReferenceImpl.java | 3 - .../annotation/NavigationPropertyPathImpl.java | 3 - .../core/edm/xml/v4/annotation/NotImpl.java | 2 - .../core/edm/xml/v4/annotation/NullImpl.java | 3 - .../core/edm/xml/v4/annotation/PathImpl.java | 3 - .../edm/xml/v4/annotation/PropertyPathImpl.java | 3 - .../xml/v4/annotation/PropertyValueImpl.java | 2 - .../core/edm/xml/v4/annotation/RecordImpl.java | 2 - ...ParamsOpDynamicAnnotationExpressionImpl.java | 2 - .../core/edm/xml/v4/annotation/UrlRefImpl.java | 2 - .../core/http/BasicAuthHttpClientFactory.java | 2 - .../core/http/DefaultHttpClientFactory.java | 2 - .../core/http/NTLMAuthHttpClientFactory.java | 6 +- .../client/core/uri/AbstractFilterFactory.java | 2 - .../client/core/uri/AbstractURIBuilder.java | 1 - .../client/core/uri/v3/FilterFactoryImpl.java | 2 - .../client/core/uri/v4/FilterFactoryImpl.java | 2 - .../olingo/client/core/ODataClientTest.java | 2 +- .../olingo/client/core/v4/EntityTest.java | 11 ++-- .../api/domain/AbstractODataPayload.java | 2 - .../commons/api/domain/AbstractODataValue.java | 4 +- .../commons/api/domain/CommonODataProperty.java | 4 +- .../commons/api/domain/ODataInlineEntity.java | 2 - .../api/domain/ODataInlineEntitySet.java | 2 - .../olingo/commons/api/domain/ODataItem.java | 9 +-- .../olingo/commons/api/domain/ODataLink.java | 2 - .../commons/api/domain/ODataOperation.java | 5 +- .../olingo/commons/api/domain/ODataValue.java | 4 +- .../olingo/commons/api/domain/v4/ODataLink.java | 2 - .../domain/AbstractODataCollectionValue.java | 2 - .../core/domain/AbstractODataComplexValue.java | 2 - .../core/domain/AbstractODataEntity.java | 2 - .../core/domain/AbstractODataEntitySet.java | 2 - .../domain/AbstractODataPrimitiveValue.java | 2 - .../core/domain/AbstractODataProperty.java | 2 - .../domain/v3/ODataCollectionValueImpl.java | 2 - .../core/domain/v3/ODataComplexValueImpl.java | 2 - .../commons/core/domain/v3/ODataEntityImpl.java | 2 - .../core/domain/v3/ODataEntitySetImpl.java | 2 - .../core/domain/v3/ODataPrimitiveValueImpl.java | 2 - .../core/domain/v3/ODataPropertyImpl.java | 2 - .../domain/v4/ODataCollectionValueImpl.java | 2 - .../core/domain/v4/ODataComplexValueImpl.java | 2 - .../core/domain/v4/ODataDeletedEntityImpl.java | 2 - .../commons/core/domain/v4/ODataDeltaImpl.java | 2 - .../core/domain/v4/ODataDeltaLinkImpl.java | 2 - .../commons/core/domain/v4/ODataEntityImpl.java | 13 ++-- .../core/domain/v4/ODataEntitySetImpl.java | 2 - .../core/domain/v4/ODataEnumValueImpl.java | 2 - .../core/domain/v4/ODataPrimitiveValueImpl.java | 2 - .../core/domain/v4/ODataPropertyImpl.java | 2 - .../core/edm/AbstractEdmNavigationProperty.java | 4 +- .../core/edm/provider/EdmEnumTypeImpl.java | 9 ++- .../core/edm/provider/EdmPropertyImpl.java | 7 +-- .../edm/provider/EdmTypeDefinitionImpl.java | 7 +-- lib/server-tecsvc/src/main/version/version.html | 41 +++++------- .../src/main/webapp/css/olingo.css | 5 +- lib/server-tecsvc/src/main/webapp/index.jsp | 66 +++++++------------- .../olingo/server/tecsvc/data/StringHelper.java | 2 + .../server/core/uri/UriResourceImplTest.java | 2 +- .../queryoption/expression/ExpressionTest.java | 2 +- .../core/uri/testutil/FilterValidator.java | 2 +- 179 files changed, 137 insertions(+), 510 deletions(-) ----------------------------------------------------------------------
