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/03/10 10:02:35 UTC
[19/51] [abbrv] [partial] [OLINGO-192] rename java packages
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/demo-metadata.xml
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/demo-metadata.xml b/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/demo-metadata.xml
deleted file mode 100644
index 9b21e2f..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/demo-metadata.xml
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<edmx:Edmx Version="4.0" xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx">
- <edmx:DataServices>
- <Schema Namespace="ODataDemo" xmlns="http://docs.oasis-open.org/odata/ns/edm">
- <EntityType Name="Product">
- <Key>
- <PropertyRef Name="ID" />
- </Key>
- <Property Name="ID" Type="Edm.Int32" Nullable="false" />
- <Property Name="Name" Type="Edm.String" />
- <Property Name="Description" Type="Edm.String" />
- <Property Name="ReleaseDate" Type="Edm.DateTimeOffset" Nullable="false" />
- <Property Name="DiscontinuedDate" Type="Edm.DateTimeOffset" />
- <Property Name="Rating" Type="Edm.Int16" Nullable="false" />
- <Property Name="Price" Type="Edm.Double" Nullable="false" />
- <NavigationProperty Name="Categories" Type="Collection(ODataDemo.Category)" Partner="Products" />
- <NavigationProperty Name="Supplier" Type="ODataDemo.Supplier" Partner="Products" />
- <NavigationProperty Name="ProductDetail" Type="ODataDemo.ProductDetail" Partner="Product" />
- </EntityType>
- <EntityType Name="FeaturedProduct" BaseType="ODataDemo.Product">
- <NavigationProperty Name="Advertisement" Type="ODataDemo.Advertisement" Partner="FeaturedProduct" />
- </EntityType>
- <EntityType Name="ProductDetail">
- <Key>
- <PropertyRef Name="ProductID" />
- </Key>
- <Property Name="ProductID" Type="Edm.Int32" Nullable="false" />
- <Property Name="Details" Type="Edm.String" />
- <NavigationProperty Name="Product" Type="ODataDemo.Product" Partner="ProductDetail" />
- </EntityType>
- <EntityType Name="Category" OpenType="true">
- <Key>
- <PropertyRef Name="ID" />
- </Key>
- <Property Name="ID" Type="Edm.Int32" Nullable="false" />
- <Property Name="Name" Type="Edm.String" />
- <NavigationProperty Name="Products" Type="Collection(ODataDemo.Product)" Partner="Categories" />
- </EntityType>
- <EntityType Name="Supplier">
- <Key>
- <PropertyRef Name="ID" />
- </Key>
- <Property Name="ID" Type="Edm.Int32" Nullable="false" />
- <Property Name="Name" Type="Edm.String" />
- <Property Name="Address" Type="ODataDemo.Address" />
- <Property Name="Location" Type="Edm.GeographyPoint" SRID="Variable" />
- <Property Name="Concurrency" Type="Edm.Int32" ConcurrencyMode="Fixed" Nullable="false" />
- <NavigationProperty Name="Products" Type="Collection(ODataDemo.Product)" Partner="Supplier" />
- </EntityType>
- <ComplexType Name="Address">
- <Property Name="Street" Type="Edm.String" />
- <Property Name="City" Type="Edm.String" />
- <Property Name="State" Type="Edm.String" />
- <Property Name="ZipCode" Type="Edm.String" />
- <Property Name="Country" Type="Edm.String" />
- </ComplexType>
- <EntityType Name="Person">
- <Key>
- <PropertyRef Name="ID" />
- </Key>
- <Property Name="ID" Type="Edm.Int32" Nullable="false" />
- <Property Name="Name" Type="Edm.String" />
- <NavigationProperty Name="PersonDetail" Type="ODataDemo.PersonDetail" Partner="Person" />
- </EntityType>
- <EntityType Name="Customer" BaseType="ODataDemo.Person">
- <Property Name="TotalExpense" Type="Edm.Decimal" Nullable="false" />
- </EntityType>
- <EntityType Name="Employee" BaseType="ODataDemo.Person">
- <Property Name="EmployeeID" Type="Edm.Int64" Nullable="false" />
- <Property Name="HireDate" Type="Edm.DateTimeOffset" Nullable="false" />
- <Property Name="Salary" Type="Edm.Single" Nullable="false" />
- </EntityType>
- <EntityType Name="PersonDetail">
- <Key>
- <PropertyRef Name="PersonID" />
- </Key>
- <Property Name="PersonID" Type="Edm.Int32" Nullable="false" />
- <Property Name="Age" Type="Edm.Byte" Nullable="false" />
- <Property Name="Gender" Type="Edm.Boolean" Nullable="false" />
- <Property Name="Phone" Type="Edm.String" />
- <Property Name="Address" Type="ODataDemo.Address" />
- <Property Name="Photo" Type="Edm.Stream" Nullable="false" />
- <NavigationProperty Name="Person" Type="ODataDemo.Person" Partner="PersonDetail" />
- </EntityType>
- <EntityType Name="Advertisement" HasStream="true">
- <Key>
- <PropertyRef Name="ID" />
- </Key>
- <Property Name="ID" Type="Edm.Guid" Nullable="false" />
- <Property Name="Name" Type="Edm.String" />
- <Property Name="AirDate" Type="Edm.DateTimeOffset" Nullable="false" />
- <NavigationProperty Name="FeaturedProduct" Type="ODataDemo.FeaturedProduct" Partner="Advertisement" />
- </EntityType>
- <EntityContainer Name="DemoService">
- <EntitySet Name="Products" EntityType="ODataDemo.Product">
- <NavigationPropertyBinding Path="ODataDemo.FeaturedProduct/Advertisement" Target="Advertisements" />
- <NavigationPropertyBinding Path="Categories" Target="Categories" />
- <NavigationPropertyBinding Path="Supplier" Target="Suppliers" />
- <NavigationPropertyBinding Path="ProductDetail" Target="ProductDetails" />
- </EntitySet>
- <EntitySet Name="ProductDetails" EntityType="ODataDemo.ProductDetail">
- <NavigationPropertyBinding Path="Product" Target="Products" />
- </EntitySet>
- <EntitySet Name="Categories" EntityType="ODataDemo.Category">
- <NavigationPropertyBinding Path="Products" Target="Products" />
- </EntitySet>
- <EntitySet Name="Suppliers" EntityType="ODataDemo.Supplier">
- <NavigationPropertyBinding Path="Products" Target="Products" />
- </EntitySet>
- <EntitySet Name="Persons" EntityType="ODataDemo.Person">
- <NavigationPropertyBinding Path="PersonDetail" Target="PersonDetails" />
- </EntitySet>
- <EntitySet Name="PersonDetails" EntityType="ODataDemo.PersonDetail">
- <NavigationPropertyBinding Path="Person" Target="Persons" />
- </EntitySet>
- <EntitySet Name="Advertisements" EntityType="ODataDemo.Advertisement">
- <NavigationPropertyBinding Path="FeaturedProduct" Target="Products" />
- </EntitySet>
- </EntityContainer>
- <Annotations Target="ODataDemo.DemoService">
- <Annotation Term="Org.OData.Display.V1.Description" String="This is a sample OData service with vocabularies" />
- </Annotations>
- <Annotations Target="ODataDemo.Product">
- <Annotation Term="Org.OData.Display.V1.Description" String="All Products available in the online store" />
- </Annotations>
- <Annotations Target="ODataDemo.Product/Name">
- <Annotation Term="Org.OData.Display.V1.DisplayName" String="Product Name" />
- </Annotations>
- <Annotations Target="ODataDemo.DemoService/Suppliers">
- <Annotation Term="Org.OData.Publication.V1.PublisherName" String="Microsoft Corp." />
- <Annotation Term="Org.OData.Publication.V1.PublisherId" String="MSFT" />
- <Annotation Term="Org.OData.Publication.V1.Keywords" String="Inventory, Supplier, Advertisers, Sales, Finance" />
- <Annotation Term="Org.OData.Publication.V1.AttributionUrl" String="http://www.odata.org/" />
- <Annotation Term="Org.OData.Publication.V1.AttributionDescription" String="All rights reserved" />
- <Annotation Term="Org.OData.Publication.V1.DocumentationUrl " String="http://www.odata.org/" />
- <Annotation Term="Org.OData.Publication.V1.TermsOfUseUrl" String="All rights reserved" />
- <Annotation Term="Org.OData.Publication.V1.PrivacyPolicyUrl" String="http://www.odata.org/" />
- <Annotation Term="Org.OData.Publication.V1.LastModified" String="4/2/2013" />
- <Annotation Term="Org.OData.Publication.V1.ImageUrl " String="http://www.odata.org/" />
- </Annotations>
- </Schema>
- </edmx:DataServices>
-</edmx:Edmx>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/fromdoc1-metadata.xml
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/fromdoc1-metadata.xml b/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/fromdoc1-metadata.xml
deleted file mode 100644
index ed46844..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/fromdoc1-metadata.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.0">
- <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/cs01/vocabularies/Org.OData.Core.V1.xml">
- <edmx:Include Namespace="Org.OData.Core.V1" Alias="Core"/>
- </edmx:Reference>
- <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/cs01/vocabularies/Org.OData.Measures.V1.xml">
- <edmx:Include Alias="UoM" Namespace="Org.OData.Measures.V1"/>
- </edmx:Reference>
- <edmx:DataServices>
- <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ODataDemo">
- <TypeDefinition Name="Length" UnderlyingType="Edm.Int32">
- <Annotation Term="Org.OData.Measures.V1.Unit" String="Centimeters"/>
- </TypeDefinition>
- <TypeDefinition Name="Weight" UnderlyingType="Edm.Int32">
- <Annotation Term="Org.OData.Measures.V1.Unit" String="Kilograms"/>
- </TypeDefinition>
- <ComplexType Name="Size">
- <Property Name="Height" Type="Self.Length" />
- <Property Name="Weight" Type="Self.Weight" />
- </ComplexType>
- <EntityType Name="Product" HasStream="true">
- <Key>
- <PropertyRef Name="ID"/>
- </Key>
- <Property Name="ID" Type="Edm.Int32" Nullable="false"/>
- <Property Name="Description" Type="Edm.String" >
- <Annotation Term="Core.IsLanguageDependent"/>
- </Property>
- <Property Name="ReleaseDate" Type="Edm.Date"/>
- <Property Name="DiscontinuedDate" Type="Edm.Date"/>
- <Property Name="Rating" Type="Edm.Int32"/>
- <Property Name="Price" Type="Edm.Decimal">
- <Annotation Term="UoM.ISOCurrency" Path="Currency"/>
- </Property>
- <Property Name="Currency" Type="Edm.String" MaxLength="3"/>
- <NavigationProperty Name="Category" Type="ODataDemo.Category" Nullable="false" Partner="Products"/>
- <NavigationProperty Name="Supplier" Type="ODataDemo.Supplier" Partner="Products"/>
- </EntityType>
- <EntityType Name="Category">
- <Key>
- <PropertyRef Name="ID"/>
- </Key>
- <Property Name="ID" Type="Edm.Int32" Nullable="false"/>
- <Property Name="Name" Type="Edm.String">
- <Annotation Term="Core.IsLanguageDependent"/>
- </Property>
- <NavigationProperty Name="Products" Partner="Category" Type="Collection(ODataDemo.Product)">
- <OnDelete Action="Cascade"/>
- </NavigationProperty>
- </EntityType>
- <EntityType Name="Supplier">
- <Key>
- <PropertyRef Name="ID"/>
- </Key>
- <Property Name="ID" Type="Edm.String" Nullable="false"/>
- <Property Name="Name" Type="Edm.String"/>
- <Property Name="Address" Type="ODataDemo.Address" Nullable="false"/>
- <Property Name="Concurrency" Type="Edm.Int32" Nullable="false"/>
- <NavigationProperty Name="Products" Partner="Supplier"/> Type="Collection(ODataDemo.Product)"/>
- </EntityType>
- <EntityType Name="Country">
- <Key>
- <PropertyRef Name="Code"/>
- </Key>
- <Property Name="Code" Type="Edm.String" MaxLength="2" Nullable="false"/>
- <Property Name="Name" Type="Edm.String"/>
- </EntityType>
- <ComplexType Name="Address">
- <Property Name="Street" Type="Edm.String"/>
- <Property Name="City" Type="Edm.String"/>
- <Property Name="State" Type="Edm.String"/>
- <Property Name="ZipCode" Type="Edm.String"/>
- <Property Name="CountryName" Type="Edm.String"/>
- <NavigationProperty Name="Country" Type="ODataDemo.Country">
- <ReferentialConstraint Property="CountryName" ReferencedProperty="Name"/>
- </NavigationProperty>
- </ComplexType>
- <Function Name="ProductsByRating">
- <Parameter Name="Rating" Type="Edm.Int32"/>
- <ReturnType Type="Collection(ODataDemo.Product)"/>
- </Function>
- <EntityContainer Name="DemoService">
- <EntitySet Name="Products" EntityType="ODataDemo.Product">
- <NavigationPropertyBinding Path="Category" Target="Categories"/>
- </EntitySet>
- <EntitySet Name="Categories" EntityType="ODataDemo.Category">
- <NavigationPropertyBinding Path="Products" Target="Products"/>
- </EntitySet>
- <EntitySet Name="Suppliers" EntityType="ODataDemo.Supplier">
- <NavigationPropertyBinding Path="Products" Target="Products"/>
- <NavigationPropertyBinding Path="Address/Country" Target="Countries"/>
- <Annotation Term="Core.OptimisticConcurrencyControl">
- <Collection>
- <PropertyPath>Concurrency</PropertyPath>
- </Collection>
- </Annotation>
- </EntitySet>
- <Singleton Name="Contoso" Type="Self.Supplier">
- <NavigationPropertyBinding Path="Products" Target="Products"/>
- </Singleton>
- <EntitySet Name="Countries" EntityType="ODataDemo.Country"/>
- <FunctionImport Name="ProductsByRating" EntitySet="Products" Function="ODataDemo.ProductsByRating"/>
- </EntityContainer>
- </Schema>
- </edmx:DataServices>
-</edmx:Edmx>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/fromdoc2-metadata.xml
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/fromdoc2-metadata.xml b/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/fromdoc2-metadata.xml
deleted file mode 100644
index 60387f2..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/fromdoc2-metadata.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.0">
- <edmx:Reference Uri="http://host/service/$metadata">
- <edmx:Include Namespace="ODataDemo"/>
- </edmx:Reference>
- <edmx:Reference Uri="http://somewhere/Vocabulary/V1">
- <edmx:Include Alias="Vocabulary1" Namespace="Some.Vocabulary.V1"/>
- </edmx:Reference>
- <edmx:DataServices>
- <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Annotations">
- <Annotations Target="ODataDemo.Supplier">
- <Annotation Term="Vocabulary1.EMail">
- <Null/>
- </Annotation>
- <Annotation Term="Vocabulary1.AccountID" Path="ID"/>
- <Annotation Term="Vocabulary1.Title" String="Supplier Info"/>
- <Annotation Term="Vocabulary1.DisplayName">
- <Apply Function="odata.concat">
- <Path>Name</Path>
- <String> in </String>
- <Path>Address/CountryName</Path>
- </Apply>
- </Annotation>
- </Annotations>
- <Annotations Target="ODataDemo.Product">
- <Annotation Term="Vocabulary1.Tags">
- <Collection>
- <String>MasterData</String>
- </Collection>
- </Annotation>
- </Annotations>
- </Schema>
- </edmx:DataServices>
-</edmx:Edmx>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/fromdoc3-metadata.xml
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/fromdoc3-metadata.xml b/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/fromdoc3-metadata.xml
deleted file mode 100644
index 2a00bd8..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/fromdoc3-metadata.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.0">
- <edmx:Reference Uri="http://host/service/$metadata">
- <edmx:Include Namespace="ODataDemo"/>
- </edmx:Reference>
- <edmx:Reference Uri="http://somewhere/Vocabulary/V1">
- <edmx:Include Alias="Vocabulary1" Namespace="Some.Vocabulary.V1"/>
- </edmx:Reference>
- <edmx:DataServices>
- <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Annotations">
- <Annotations Target="Test">
- <Annotation Term="org.example.display.EndTime" TimeOfDay="21:45:00"/>,
- <Annotation Term="org.example.display.EndTime">
- <TimeOfDay>21:45:00</TimeOfDay>
- </Annotation>,
- <Annotation Term='Test' Path="IsMale"/>,
- <Annotation Term='Test'>
- <Not>
- <Path>IsMale</Path>
- </Not>
- </Annotation>,
- <Annotation Term='Test'>
- <And>
- <Path>IsMale</Path>
- <Path>IsMarried</Path>
- </And>
- </Annotation>,
- <Annotation Term="UI.ReferenceFacet" AnnotationPath="Product/Supplier/@UI.LineItem"/>,
- <Annotation Term="UI.ReferenceFacet">
- <AnnotationPath>Product/Supplier/@UI.LineItem</AnnotationPath>
- </Annotation>,
- <Annotation Term="Vocabulary1.DisplayName">
- <Apply Function="odata.concat">
- <Path>Name</Path>
- <String> in </String>
- <Path>Address/CountryName</Path>
- </Apply>
- </Annotation>,
- <Annotation Term="org.example.display.Threshold">
- <Cast Type="Edm.Decimal">
- <Path>Average</Path>
- </Cast>
- </Annotation>,
- <Annotation Term="Vocabulary1.Tags">
- <Collection>
- <String>MasterData</String>
- </Collection>
- </Annotation>,
- <Annotation Term="org.example.person.Gender">
- <If>
- <Bool>true</Bool>
- <String>Female</String>
- <String>Male</String>
- </If>
- </Annotation>,
- <Annotation Term="org.example.person.Gender">
- <If>
- <Path>IsFemale</Path>
- <String>Female</String>
- <String>Male</String>
- </If>
- </Annotation>,
- <Annotation Term="Self.IsPreferredCustomer">
- <IsOf Type="Self.PreferredCustomer">
- <Path>Customer</Path>
- </IsOf>
- </Annotation>,
- <Annotation Term="org.example.display.DisplayName">
- <LabeledElement Name="CustomerFirstName" Path="FirstName" />
- </Annotation>,
- <Annotation Term="org.example.display.DisplayName">
- <LabeledElement Name="CustomerFirstName">
- <Path>FirstName</Path>
- </LabeledElement>
- </Annotation>,
- <Annotation Term="org.example.person.Employee">
- <Record>
- <PropertyValue Property="GivenName" Path="FirstName" />
- <PropertyValue Property="Surname" Path="LastName" />
- <PropertyValue Property="Manager" Path="DirectSupervisor" />
- <PropertyValue Property="CostCenter">
- <UrlRef>
- <Apply Function="odata.fillUriTemplate">
- <String>http://host/anotherservice/CostCenters('{ccid}')</String>
- <LabeledElement Name="ccid" Path="CostCenterID" />
- </Apply>
- </UrlRef>
- </PropertyValue>
- </Record>
- </Annotation>,
- <Annotation Term="Vocab.Supplier">
- <UrlRef>
- <Apply Function="odata.fillUriTemplate">
- <String>http://host/service/Suppliers({suppID})</String>
- <LabeledElement Name="suppID">
- <Apply Function="odata.uriEncode">
- <Path>SupplierId</Path>
- </Apply>
- </LabeledElement>
- </Apply>
- </UrlRef>
- </Annotation>,
- <Annotation Term="Core.LongDescription">
- <UrlRef>
- <String>http://host/wiki/HowToUse</String>
- </UrlRef>
- </Annotation>
- </Annotations>
- </Schema>
- </edmx:DataServices>
-</edmx:Edmx>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/metadata.xml
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/metadata.xml b/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/metadata.xml
deleted file mode 100644
index 3f992ac..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/metadata.xml
+++ /dev/null
@@ -1,232 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<edmx:Edmx Version="4.0" xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx">
- <edmx:DataServices m:DataServiceVersion="4.0" m:MaxDataServiceVersion="4.0" xmlns:m="http://docs.oasis-open.org/odata/ns/metadata">
- <Schema Namespace="Microsoft.Exchange.Services.OData.Model" xmlns="http://docs.oasis-open.org/odata/ns/edm">
- <EnumType Name="BodyType">
- <Member Name="Text" Value="0" />
- <Member Name="HTML" Value="1" />
- </EnumType>
- <EnumType Name="Importance">
- <Member Name="Normal" Value="0" />
- <Member Name="Low" Value="1" />
- <Member Name="High" Value="2" />
- </EnumType>
- <EnumType Name="AttendeeType">
- <Member Name="Required" Value="1" />
- <Member Name="Optional" Value="2" />
- <Member Name="Resource" Value="3" />
- </EnumType>
- <EnumType Name="ResponseType">
- <Member Name="None" Value="0" />
- <Member Name="Organizer" Value="1" />
- <Member Name="TentativelyAccepted" Value="2" />
- <Member Name="Accepted" Value="3" />
- <Member Name="Declined" Value="4" />
- <Member Name="NotResponded" Value="5" />
- </EnumType>
- <EnumType Name="EventType">
- <Member Name="SingleInstance" Value="0" />
- <Member Name="Occurrence" Value="1" />
- <Member Name="Exception" Value="2" />
- <Member Name="SeriesMaster" Value="3" />
- </EnumType>
- <EnumType Name="FreeBusyStatus">
- <Member Name="Free" Value="0" />
- <Member Name="Tentative" Value="1" />
- <Member Name="Busy" Value="2" />
- <Member Name="Oof" Value="3" />
- <Member Name="WorkingElsewhere" Value="4" />
- <Member Name="Unknown" Value="-1" />
- </EnumType>
- <ComplexType Name="Recipient">
- <Property Name="Name" Type="Edm.String" />
- <Property Name="Address" Type="Edm.String" />
- </ComplexType>
- <ComplexType Name="Attendee" BaseType="Microsoft.Exchange.Services.OData.Model.Recipient">
- <Property Name="Status" Type="Microsoft.Exchange.Services.OData.Model.ResponseStatus" />
- <Property Name="Type" Type="Microsoft.Exchange.Services.OData.Model.AttendeeType" />
- </ComplexType>
- <ComplexType Name="ItemBody">
- <Property Name="ContentType" Type="Microsoft.Exchange.Services.OData.Model.BodyType" />
- <Property Name="Content" Type="Edm.String" />
- </ComplexType>
- <ComplexType Name="Location">
- <Property Name="DisplayName" Type="Edm.String" />
- </ComplexType>
- <ComplexType Name="ResponseStatus" BaseType="Microsoft.Exchange.Services.OData.Model.Recipient">
- <Property Name="Response" Type="Microsoft.Exchange.Services.OData.Model.ResponseType" />
- <Property Name="Time" Type="Edm.DateTimeOffset" />
- </ComplexType>
- <EntityType Name="Entity" Abstract="true">
- <Key>
- <PropertyRef Name="Id" />
- </Key>
- <Property Name="Id" Type="Edm.String" Nullable="false" />
- </EntityType>
- <EntityType Name="User" BaseType="Microsoft.Exchange.Services.OData.Model.Entity">
- <Property Name="DisplayName" Type="Edm.String" />
- <Property Name="Alias" Type="Edm.String" />
- <Property Name="MailboxGuid" Type="Edm.Guid" />
- <NavigationProperty Name="Folders" Type="Collection(Microsoft.Exchange.Services.OData.Model.Folder)" />
- <NavigationProperty Name="Messages" Type="Collection(Microsoft.Exchange.Services.OData.Model.EmailMessage)" />
- <NavigationProperty Name="RootFolder" Type="Microsoft.Exchange.Services.OData.Model.Folder" />
- <NavigationProperty Name="Inbox" Type="Microsoft.Exchange.Services.OData.Model.Folder" />
- <NavigationProperty Name="Drafts" Type="Microsoft.Exchange.Services.OData.Model.Folder" />
- <NavigationProperty Name="SentItems" Type="Microsoft.Exchange.Services.OData.Model.Folder" />
- <NavigationProperty Name="DeletedItems" Type="Microsoft.Exchange.Services.OData.Model.Folder" />
- <NavigationProperty Name="Calendars" Type="Collection(Microsoft.Exchange.Services.OData.Model.Calendar)" />
- <NavigationProperty Name="CalendarGroups" Type="Collection(Microsoft.Exchange.Services.OData.Model.CalendarGroup)" />
- <NavigationProperty Name="Events" Type="Collection(Microsoft.Exchange.Services.OData.Model.Event)" />
- </EntityType>
- <EntityType Name="Folder" BaseType="Microsoft.Exchange.Services.OData.Model.Entity">
- <Property Name="ParentFolderId" Type="Edm.String" />
- <Property Name="DisplayName" Type="Edm.String" />
- <Property Name="ClassName" Type="Edm.String" />
- <Property Name="TotalCount" Type="Edm.Int32" />
- <Property Name="ChildFolderCount" Type="Edm.Int32" />
- <Property Name="UnreadItemCount" Type="Edm.Int32" />
- <NavigationProperty Name="ChildFolders" Type="Collection(Microsoft.Exchange.Services.OData.Model.Folder)" />
- <NavigationProperty Name="Messages" Type="Collection(Microsoft.Exchange.Services.OData.Model.EmailMessage)" />
- </EntityType>
- <Action Name="Copy" IsBound="true" EntitySetPath="bindingParameter" ReturnType="Microsoft.Exchange.Services.OData.Model.Folder">
- <Parameter Name="bindingParameter" Type="Microsoft.Exchange.Services.OData.Model.Folder" />
- <Parameter Name="DestinationId" Type="Edm.String" />
- </Action>
- <Action Name="Move" IsBound="true" EntitySetPath="bindingParameter" ReturnType="Microsoft.Exchange.Services.OData.Model.Folder">
- <Parameter Name="bindingParameter" Type="Microsoft.Exchange.Services.OData.Model.Folder" />
- <Parameter Name="DestinationId" Type="Edm.String" />
- </Action>
- <EntityType Name="Item" BaseType="Microsoft.Exchange.Services.OData.Model.Entity" Abstract="true">
- <Property Name="ChangeKey" Type="Edm.String" />
- <Property Name="ClassName" Type="Edm.String" />
- <Property Name="Subject" Type="Edm.String" />
- <Property Name="Body" Type="Microsoft.Exchange.Services.OData.Model.ItemBody" />
- <Property Name="BodyPreview" Type="Edm.String" />
- <Property Name="Importance" Type="Microsoft.Exchange.Services.OData.Model.Importance" />
- <Property Name="Categories" Type="Collection(Edm.String)" />
- <Property Name="HasAttachments" Type="Edm.Boolean" />
- <Property Name="DateTimeCreated" Type="Edm.DateTimeOffset" />
- <Property Name="LastModifiedTime" Type="Edm.DateTimeOffset" />
- <NavigationProperty Name="Attachments" Type="Collection(Microsoft.Exchange.Services.OData.Model.Attachment)" />
- </EntityType>
- <EntityType Name="EmailMessage" BaseType="Microsoft.Exchange.Services.OData.Model.Item">
- <Property Name="ParentFolderId" Type="Edm.String" />
- <Property Name="From" Type="Microsoft.Exchange.Services.OData.Model.Recipient" />
- <Property Name="Sender" Type="Microsoft.Exchange.Services.OData.Model.Recipient" />
- <Property Name="ToRecipients" Type="Collection(Microsoft.Exchange.Services.OData.Model.Recipient)" />
- <Property Name="CcRecipients" Type="Collection(Microsoft.Exchange.Services.OData.Model.Recipient)" />
- <Property Name="BccRecipients" Type="Collection(Microsoft.Exchange.Services.OData.Model.Recipient)" />
- <Property Name="ReplyTo" Type="Collection(Microsoft.Exchange.Services.OData.Model.Recipient)" />
- <Property Name="ConversationIndex" Type="Edm.String" />
- <Property Name="UniqueBody" Type="Microsoft.Exchange.Services.OData.Model.ItemBody" />
- <Property Name="DateTimeReceived" Type="Edm.DateTimeOffset" />
- <Property Name="DateTimeSent" Type="Edm.DateTimeOffset" />
- <Property Name="IsDeliveryReceiptRequested" Type="Edm.Boolean" />
- <Property Name="IsReadReceiptRequested" Type="Edm.Boolean" />
- <Property Name="IsDraft" Type="Edm.Boolean" />
- <Property Name="IsRead" Type="Edm.Boolean" />
- </EntityType>
- <Action Name="Copy" IsBound="true" EntitySetPath="bindingParameter" ReturnType="Microsoft.Exchange.Services.OData.Model.EmailMessage">
- <Parameter Name="bindingParameter" Type="Microsoft.Exchange.Services.OData.Model.EmailMessage" />
- <Parameter Name="DestinationId" Type="Edm.String" />
- </Action>
- <Action Name="Move" IsBound="true" EntitySetPath="bindingParameter" ReturnType="Microsoft.Exchange.Services.OData.Model.EmailMessage">
- <Parameter Name="bindingParameter" Type="Microsoft.Exchange.Services.OData.Model.EmailMessage" />
- <Parameter Name="DestinationId" Type="Edm.String" />
- </Action>
- <EntityType Name="Attachment" BaseType="Microsoft.Exchange.Services.OData.Model.Entity" Abstract="true">
- <Property Name="Name" Type="Edm.String" />
- <Property Name="ContentType" Type="Edm.String" />
- <Property Name="IsInline" Type="Edm.Boolean" Nullable="false" />
- <Property Name="LastModifiedTime" Type="Edm.DateTimeOffset" />
- </EntityType>
- <EntityType Name="FileAttachment" BaseType="Microsoft.Exchange.Services.OData.Model.Attachment">
- <Property Name="ContentId" Type="Edm.String" />
- <Property Name="ContentLocation" Type="Edm.String" />
- <Property Name="Size" Type="Edm.Int32" Nullable="false" />
- <Property Name="IsContactPhoto" Type="Edm.Boolean" Nullable="false" />
- <Property Name="ContentBytes" Type="Edm.Binary" MaxLength="Max" FixedLength="false" />
- </EntityType>
- <EntityType Name="ItemAttachment" BaseType="Microsoft.Exchange.Services.OData.Model.Attachment">
- <NavigationProperty Name="Item" Type="Microsoft.Exchange.Services.OData.Model.Item" />
- </EntityType>
- <EntityType Name="Calendar" BaseType="Microsoft.Exchange.Services.OData.Model.Entity">
- <Property Name="Name" Type="Edm.String" />
- <Property Name="ChangeKey" Type="Edm.String" />
- <NavigationProperty Name="Events" Type="Collection(Microsoft.Exchange.Services.OData.Model.Event)" />
- </EntityType>
- <EntityType Name="CalendarGroup" BaseType="Microsoft.Exchange.Services.OData.Model.Entity">
- <Property Name="Name" Type="Edm.String" />
- <Property Name="ChangeKey" Type="Edm.String" />
- <Property Name="ClassId" Type="Edm.Guid" />
- </EntityType>
- <EntityType Name="Event" BaseType="Microsoft.Exchange.Services.OData.Model.Item">
- <Property Name="Start" Type="Edm.DateTimeOffset" />
- <Property Name="End" Type="Edm.DateTimeOffset" />
- <Property Name="Location" Type="Microsoft.Exchange.Services.OData.Model.Location" />
- <Property Name="ShowAs" Type="Microsoft.Exchange.Services.OData.Model.FreeBusyStatus" />
- <Property Name="IsAllDay" Type="Edm.Boolean" />
- <Property Name="IsCancelled" Type="Edm.Boolean" />
- <Property Name="IsOrganizer" Type="Edm.Boolean" />
- <Property Name="ResponseRequested" Type="Edm.Boolean" />
- <Property Name="Type" Type="Microsoft.Exchange.Services.OData.Model.EventType" />
- <Property Name="SeriesId" Type="Edm.String" />
- <Property Name="Attendees" Type="Collection(Microsoft.Exchange.Services.OData.Model.Attendee)" />
- <NavigationProperty Name="Calendar" Type="Microsoft.Exchange.Services.OData.Model.Calendar" />
- </EntityType>
- <EntityContainer Name="EntityContainer" m:IsDefaultEntityContainer="true">
- <EntitySet Name="Users" EntityType="Microsoft.Exchange.Services.OData.Model.User">
- <NavigationPropertyBinding Path="Folders" Target="Folders" />
- <NavigationPropertyBinding Path="Messages" Target="Messages" />
- <NavigationPropertyBinding Path="RootFolder" Target="Folders" />
- <NavigationPropertyBinding Path="Inbox" Target="Folders" />
- <NavigationPropertyBinding Path="Drafts" Target="Folders" />
- <NavigationPropertyBinding Path="SentItems" Target="Folders" />
- <NavigationPropertyBinding Path="DeletedItems" Target="Folders" />
- <NavigationPropertyBinding Path="Calendars" Target="Calendars" />
- <NavigationPropertyBinding Path="CalendarGroups" Target="CalendarGroups" />
- <NavigationPropertyBinding Path="Events" Target="Events" />
- </EntitySet>
- <EntitySet Name="Folders" EntityType="Microsoft.Exchange.Services.OData.Model.Folder">
- <NavigationPropertyBinding Path="ChildFolders" Target="Folders" />
- <NavigationPropertyBinding Path="Messages" Target="Messages" />
- </EntitySet>
- <EntitySet Name="Items" EntityType="Microsoft.Exchange.Services.OData.Model.Item" />
- <EntitySet Name="Messages" EntityType="Microsoft.Exchange.Services.OData.Model.EmailMessage">
- <NavigationPropertyBinding Path="Attachments" Target="Attachments" />
- </EntitySet>
- <EntitySet Name="Attachments" EntityType="Microsoft.Exchange.Services.OData.Model.Attachment">
- <NavigationPropertyBinding Path="Microsoft.Exchange.Services.OData.Model.ItemAttachment/Item" Target="Items" />
- </EntitySet>
- <EntitySet Name="Calendars" EntityType="Microsoft.Exchange.Services.OData.Model.Calendar">
- <NavigationPropertyBinding Path="Events" Target="Events" />
- </EntitySet>
- <EntitySet Name="CalendarGroups" EntityType="Microsoft.Exchange.Services.OData.Model.CalendarGroup" />
- <EntitySet Name="Events" EntityType="Microsoft.Exchange.Services.OData.Model.Event">
- <NavigationPropertyBinding Path="Attachments" Target="Attachments" />
- <NavigationPropertyBinding Path="Calendar" Target="Calendars" />
- </EntitySet>
- </EntityContainer>
- </Schema>
- </edmx:DataServices>
-</edmx:Edmx>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/northwind-metadata.xml
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/northwind-metadata.xml b/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/northwind-metadata.xml
deleted file mode 100644
index f65815d..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/northwind-metadata.xml
+++ /dev/null
@@ -1,471 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<edmx:Edmx Version="4.0" xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx">
- <edmx:DataServices>
- <Schema Namespace="NorthwindModel" xmlns="http://docs.oasis-open.org/odata/ns/edm">
- <EntityType Name="Category">
- <Key>
- <PropertyRef Name="CategoryID" />
- </Key>
- <Property Name="CategoryID" Type="Edm.Int32" Nullable="false" p5:StoreGeneratedPattern="Identity" xmlns:p5="http://schemas.microsoft.com/ado/2009/02/edm/annotation" />
- <Property Name="CategoryName" Type="Edm.String" Nullable="false" MaxLength="15" />
- <Property Name="Description" Type="Edm.String" MaxLength="max" />
- <Property Name="Picture" Type="Edm.Binary" MaxLength="max" />
- <NavigationProperty Name="Products" Type="Collection(NorthwindModel.Product)" Partner="Category" />
- </EntityType>
- <EntityType Name="CustomerDemographic">
- <Key>
- <PropertyRef Name="CustomerTypeID" />
- </Key>
- <Property Name="CustomerTypeID" Type="Edm.String" Nullable="false" MaxLength="10" />
- <Property Name="CustomerDesc" Type="Edm.String" MaxLength="max" />
- <NavigationProperty Name="Customers" Type="Collection(NorthwindModel.Customer)" Partner="CustomerDemographics" />
- </EntityType>
- <EntityType Name="Customer">
- <Key>
- <PropertyRef Name="CustomerID" />
- </Key>
- <Property Name="CustomerID" Type="Edm.String" Nullable="false" MaxLength="5" />
- <Property Name="CompanyName" Type="Edm.String" Nullable="false" MaxLength="40" />
- <Property Name="ContactName" Type="Edm.String" MaxLength="30" />
- <Property Name="ContactTitle" Type="Edm.String" MaxLength="30" />
- <Property Name="Address" Type="Edm.String" MaxLength="60" />
- <Property Name="City" Type="Edm.String" MaxLength="15" />
- <Property Name="Region" Type="Edm.String" MaxLength="15" />
- <Property Name="PostalCode" Type="Edm.String" MaxLength="10" />
- <Property Name="Country" Type="Edm.String" MaxLength="15" />
- <Property Name="Phone" Type="Edm.String" MaxLength="24" />
- <Property Name="Fax" Type="Edm.String" MaxLength="24" />
- <NavigationProperty Name="Orders" Type="Collection(NorthwindModel.Order)" Partner="Customer" />
- <NavigationProperty Name="CustomerDemographics" Type="Collection(NorthwindModel.CustomerDemographic)" Partner="Customers" />
- </EntityType>
- <EntityType Name="Employee">
- <Key>
- <PropertyRef Name="EmployeeID" />
- </Key>
- <Property Name="EmployeeID" Type="Edm.Int32" Nullable="false" p5:StoreGeneratedPattern="Identity" xmlns:p5="http://schemas.microsoft.com/ado/2009/02/edm/annotation" />
- <Property Name="LastName" Type="Edm.String" Nullable="false" MaxLength="20" />
- <Property Name="FirstName" Type="Edm.String" Nullable="false" MaxLength="10" />
- <Property Name="Title" Type="Edm.String" MaxLength="30" />
- <Property Name="TitleOfCourtesy" Type="Edm.String" MaxLength="25" />
- <Property Name="BirthDate" Type="Edm.DateTimeOffset" />
- <Property Name="HireDate" Type="Edm.DateTimeOffset" />
- <Property Name="Address" Type="Edm.String" MaxLength="60" />
- <Property Name="City" Type="Edm.String" MaxLength="15" />
- <Property Name="Region" Type="Edm.String" MaxLength="15" />
- <Property Name="PostalCode" Type="Edm.String" MaxLength="10" />
- <Property Name="Country" Type="Edm.String" MaxLength="15" />
- <Property Name="HomePhone" Type="Edm.String" MaxLength="24" />
- <Property Name="Extension" Type="Edm.String" MaxLength="4" />
- <Property Name="Photo" Type="Edm.Binary" MaxLength="max" />
- <Property Name="Notes" Type="Edm.String" MaxLength="max" />
- <Property Name="ReportsTo" Type="Edm.Int32" />
- <Property Name="PhotoPath" Type="Edm.String" MaxLength="255" />
- <NavigationProperty Name="Employees1" Type="Collection(NorthwindModel.Employee)" Partner="Employee1" />
- <NavigationProperty Name="Employee1" Type="NorthwindModel.Employee" Partner="Employees1">
- <ReferentialConstraint Property="ReportsTo" ReferencedProperty="EmployeeID" />
- </NavigationProperty>
- <NavigationProperty Name="Orders" Type="Collection(NorthwindModel.Order)" Partner="Employee" />
- <NavigationProperty Name="Territories" Type="Collection(NorthwindModel.Territory)" Partner="Employees" />
- </EntityType>
- <EntityType Name="Order_Detail">
- <Key>
- <PropertyRef Name="OrderID" />
- <PropertyRef Name="ProductID" />
- </Key>
- <Property Name="OrderID" Type="Edm.Int32" Nullable="false" />
- <Property Name="ProductID" Type="Edm.Int32" Nullable="false" />
- <Property Name="UnitPrice" Type="Edm.Decimal" Nullable="false" Precision="19" Scale="4" />
- <Property Name="Quantity" Type="Edm.Int16" Nullable="false" />
- <Property Name="Discount" Type="Edm.Single" Nullable="false" />
- <NavigationProperty Name="Order" Type="NorthwindModel.Order" Nullable="false" Partner="Order_Details">
- <ReferentialConstraint Property="OrderID" ReferencedProperty="OrderID" />
- </NavigationProperty>
- <NavigationProperty Name="Product" Type="NorthwindModel.Product" Nullable="false" Partner="Order_Details">
- <ReferentialConstraint Property="ProductID" ReferencedProperty="ProductID" />
- </NavigationProperty>
- </EntityType>
- <EntityType Name="Order">
- <Key>
- <PropertyRef Name="OrderID" />
- </Key>
- <Property Name="OrderID" Type="Edm.Int32" Nullable="false" p5:StoreGeneratedPattern="Identity" xmlns:p5="http://schemas.microsoft.com/ado/2009/02/edm/annotation" />
- <Property Name="CustomerID" Type="Edm.String" MaxLength="5" />
- <Property Name="EmployeeID" Type="Edm.Int32" />
- <Property Name="OrderDate" Type="Edm.DateTimeOffset" />
- <Property Name="RequiredDate" Type="Edm.DateTimeOffset" />
- <Property Name="ShippedDate" Type="Edm.DateTimeOffset" />
- <Property Name="ShipVia" Type="Edm.Int32" />
- <Property Name="Freight" Type="Edm.Decimal" Precision="19" Scale="4" />
- <Property Name="ShipName" Type="Edm.String" MaxLength="40" />
- <Property Name="ShipAddress" Type="Edm.String" MaxLength="60" />
- <Property Name="ShipCity" Type="Edm.String" MaxLength="15" />
- <Property Name="ShipRegion" Type="Edm.String" MaxLength="15" />
- <Property Name="ShipPostalCode" Type="Edm.String" MaxLength="10" />
- <Property Name="ShipCountry" Type="Edm.String" MaxLength="15" />
- <NavigationProperty Name="Customer" Type="NorthwindModel.Customer" Partner="Orders">
- <ReferentialConstraint Property="CustomerID" ReferencedProperty="CustomerID" />
- </NavigationProperty>
- <NavigationProperty Name="Employee" Type="NorthwindModel.Employee" Partner="Orders">
- <ReferentialConstraint Property="EmployeeID" ReferencedProperty="EmployeeID" />
- </NavigationProperty>
- <NavigationProperty Name="Order_Details" Type="Collection(NorthwindModel.Order_Detail)" Partner="Order" />
- <NavigationProperty Name="Shipper" Type="NorthwindModel.Shipper" Partner="Orders">
- <ReferentialConstraint Property="ShipVia" ReferencedProperty="ShipperID" />
- </NavigationProperty>
- </EntityType>
- <EntityType Name="Product">
- <Key>
- <PropertyRef Name="ProductID" />
- </Key>
- <Property Name="ProductID" Type="Edm.Int32" Nullable="false" p5:StoreGeneratedPattern="Identity" xmlns:p5="http://schemas.microsoft.com/ado/2009/02/edm/annotation" />
- <Property Name="ProductName" Type="Edm.String" Nullable="false" MaxLength="40" />
- <Property Name="SupplierID" Type="Edm.Int32" />
- <Property Name="CategoryID" Type="Edm.Int32" />
- <Property Name="QuantityPerUnit" Type="Edm.String" MaxLength="20" />
- <Property Name="UnitPrice" Type="Edm.Decimal" Precision="19" Scale="4" />
- <Property Name="UnitsInStock" Type="Edm.Int16" />
- <Property Name="UnitsOnOrder" Type="Edm.Int16" />
- <Property Name="ReorderLevel" Type="Edm.Int16" />
- <Property Name="Discontinued" Type="Edm.Boolean" Nullable="false" />
- <NavigationProperty Name="Category" Type="NorthwindModel.Category" Partner="Products">
- <ReferentialConstraint Property="CategoryID" ReferencedProperty="CategoryID" />
- </NavigationProperty>
- <NavigationProperty Name="Order_Details" Type="Collection(NorthwindModel.Order_Detail)" Partner="Product" />
- <NavigationProperty Name="Supplier" Type="NorthwindModel.Supplier" Partner="Products">
- <ReferentialConstraint Property="SupplierID" ReferencedProperty="SupplierID" />
- </NavigationProperty>
- </EntityType>
- <EntityType Name="Region">
- <Key>
- <PropertyRef Name="RegionID" />
- </Key>
- <Property Name="RegionID" Type="Edm.Int32" Nullable="false" />
- <Property Name="RegionDescription" Type="Edm.String" Nullable="false" MaxLength="50" />
- <NavigationProperty Name="Territories" Type="Collection(NorthwindModel.Territory)" Partner="Region" />
- </EntityType>
- <EntityType Name="Shipper">
- <Key>
- <PropertyRef Name="ShipperID" />
- </Key>
- <Property Name="ShipperID" Type="Edm.Int32" Nullable="false" p5:StoreGeneratedPattern="Identity" xmlns:p5="http://schemas.microsoft.com/ado/2009/02/edm/annotation" />
- <Property Name="CompanyName" Type="Edm.String" Nullable="false" MaxLength="40" />
- <Property Name="Phone" Type="Edm.String" MaxLength="24" />
- <NavigationProperty Name="Orders" Type="Collection(NorthwindModel.Order)" Partner="Shipper" />
- </EntityType>
- <EntityType Name="Supplier">
- <Key>
- <PropertyRef Name="SupplierID" />
- </Key>
- <Property Name="SupplierID" Type="Edm.Int32" Nullable="false" p5:StoreGeneratedPattern="Identity" xmlns:p5="http://schemas.microsoft.com/ado/2009/02/edm/annotation" />
- <Property Name="CompanyName" Type="Edm.String" Nullable="false" MaxLength="40" />
- <Property Name="ContactName" Type="Edm.String" MaxLength="30" />
- <Property Name="ContactTitle" Type="Edm.String" MaxLength="30" />
- <Property Name="Address" Type="Edm.String" MaxLength="60" />
- <Property Name="City" Type="Edm.String" MaxLength="15" />
- <Property Name="Region" Type="Edm.String" MaxLength="15" />
- <Property Name="PostalCode" Type="Edm.String" MaxLength="10" />
- <Property Name="Country" Type="Edm.String" MaxLength="15" />
- <Property Name="Phone" Type="Edm.String" MaxLength="24" />
- <Property Name="Fax" Type="Edm.String" MaxLength="24" />
- <Property Name="HomePage" Type="Edm.String" MaxLength="max" />
- <NavigationProperty Name="Products" Type="Collection(NorthwindModel.Product)" Partner="Supplier" />
- </EntityType>
- <EntityType Name="Territory">
- <Key>
- <PropertyRef Name="TerritoryID" />
- </Key>
- <Property Name="TerritoryID" Type="Edm.String" Nullable="false" MaxLength="20" />
- <Property Name="TerritoryDescription" Type="Edm.String" Nullable="false" MaxLength="50" />
- <Property Name="RegionID" Type="Edm.Int32" Nullable="false" />
- <NavigationProperty Name="Region" Type="NorthwindModel.Region" Nullable="false" Partner="Territories">
- <ReferentialConstraint Property="RegionID" ReferencedProperty="RegionID" />
- </NavigationProperty>
- <NavigationProperty Name="Employees" Type="Collection(NorthwindModel.Employee)" Partner="Territories" />
- </EntityType>
- <EntityType Name="Alphabetical_list_of_product">
- <Key>
- <PropertyRef Name="CategoryName" />
- <PropertyRef Name="Discontinued" />
- <PropertyRef Name="ProductID" />
- <PropertyRef Name="ProductName" />
- </Key>
- <Property Name="ProductID" Type="Edm.Int32" Nullable="false" />
- <Property Name="ProductName" Type="Edm.String" Nullable="false" MaxLength="40" />
- <Property Name="SupplierID" Type="Edm.Int32" />
- <Property Name="CategoryID" Type="Edm.Int32" />
- <Property Name="QuantityPerUnit" Type="Edm.String" MaxLength="20" />
- <Property Name="UnitPrice" Type="Edm.Decimal" Precision="19" Scale="4" />
- <Property Name="UnitsInStock" Type="Edm.Int16" />
- <Property Name="UnitsOnOrder" Type="Edm.Int16" />
- <Property Name="ReorderLevel" Type="Edm.Int16" />
- <Property Name="Discontinued" Type="Edm.Boolean" Nullable="false" />
- <Property Name="CategoryName" Type="Edm.String" Nullable="false" MaxLength="15" />
- </EntityType>
- <EntityType Name="Category_Sales_for_1997">
- <Key>
- <PropertyRef Name="CategoryName" />
- </Key>
- <Property Name="CategoryName" Type="Edm.String" Nullable="false" MaxLength="15" />
- <Property Name="CategorySales" Type="Edm.Decimal" Precision="19" Scale="4" />
- </EntityType>
- <EntityType Name="Current_Product_List">
- <Key>
- <PropertyRef Name="ProductID" />
- <PropertyRef Name="ProductName" />
- </Key>
- <Property Name="ProductID" Type="Edm.Int32" Nullable="false" p5:StoreGeneratedPattern="Identity" xmlns:p5="http://schemas.microsoft.com/ado/2009/02/edm/annotation" />
- <Property Name="ProductName" Type="Edm.String" Nullable="false" MaxLength="40" />
- </EntityType>
- <EntityType Name="Customer_and_Suppliers_by_City">
- <Key>
- <PropertyRef Name="CompanyName" />
- <PropertyRef Name="Relationship" />
- </Key>
- <Property Name="City" Type="Edm.String" MaxLength="15" />
- <Property Name="CompanyName" Type="Edm.String" Nullable="false" MaxLength="40" />
- <Property Name="ContactName" Type="Edm.String" MaxLength="30" />
- <Property Name="Relationship" Type="Edm.String" Nullable="false" MaxLength="9" Unicode="false" />
- </EntityType>
- <EntityType Name="Invoice">
- <Key>
- <PropertyRef Name="CustomerName" />
- <PropertyRef Name="Discount" />
- <PropertyRef Name="OrderID" />
- <PropertyRef Name="ProductID" />
- <PropertyRef Name="ProductName" />
- <PropertyRef Name="Quantity" />
- <PropertyRef Name="Salesperson" />
- <PropertyRef Name="ShipperName" />
- <PropertyRef Name="UnitPrice" />
- </Key>
- <Property Name="ShipName" Type="Edm.String" MaxLength="40" />
- <Property Name="ShipAddress" Type="Edm.String" MaxLength="60" />
- <Property Name="ShipCity" Type="Edm.String" MaxLength="15" />
- <Property Name="ShipRegion" Type="Edm.String" MaxLength="15" />
- <Property Name="ShipPostalCode" Type="Edm.String" MaxLength="10" />
- <Property Name="ShipCountry" Type="Edm.String" MaxLength="15" />
- <Property Name="CustomerID" Type="Edm.String" MaxLength="5" />
- <Property Name="CustomerName" Type="Edm.String" Nullable="false" MaxLength="40" />
- <Property Name="Address" Type="Edm.String" MaxLength="60" />
- <Property Name="City" Type="Edm.String" MaxLength="15" />
- <Property Name="Region" Type="Edm.String" MaxLength="15" />
- <Property Name="PostalCode" Type="Edm.String" MaxLength="10" />
- <Property Name="Country" Type="Edm.String" MaxLength="15" />
- <Property Name="Salesperson" Type="Edm.String" Nullable="false" MaxLength="31" />
- <Property Name="OrderID" Type="Edm.Int32" Nullable="false" />
- <Property Name="OrderDate" Type="Edm.DateTimeOffset" />
- <Property Name="RequiredDate" Type="Edm.DateTimeOffset" />
- <Property Name="ShippedDate" Type="Edm.DateTimeOffset" />
- <Property Name="ShipperName" Type="Edm.String" Nullable="false" MaxLength="40" />
- <Property Name="ProductID" Type="Edm.Int32" Nullable="false" />
- <Property Name="ProductName" Type="Edm.String" Nullable="false" MaxLength="40" />
- <Property Name="UnitPrice" Type="Edm.Decimal" Nullable="false" Precision="19" Scale="4" />
- <Property Name="Quantity" Type="Edm.Int16" Nullable="false" />
- <Property Name="Discount" Type="Edm.Single" Nullable="false" />
- <Property Name="ExtendedPrice" Type="Edm.Decimal" Precision="19" Scale="4" />
- <Property Name="Freight" Type="Edm.Decimal" Precision="19" Scale="4" />
- </EntityType>
- <EntityType Name="Order_Details_Extended">
- <Key>
- <PropertyRef Name="Discount" />
- <PropertyRef Name="OrderID" />
- <PropertyRef Name="ProductID" />
- <PropertyRef Name="ProductName" />
- <PropertyRef Name="Quantity" />
- <PropertyRef Name="UnitPrice" />
- </Key>
- <Property Name="OrderID" Type="Edm.Int32" Nullable="false" />
- <Property Name="ProductID" Type="Edm.Int32" Nullable="false" />
- <Property Name="ProductName" Type="Edm.String" Nullable="false" MaxLength="40" />
- <Property Name="UnitPrice" Type="Edm.Decimal" Nullable="false" Precision="19" Scale="4" />
- <Property Name="Quantity" Type="Edm.Int16" Nullable="false" />
- <Property Name="Discount" Type="Edm.Single" Nullable="false" />
- <Property Name="ExtendedPrice" Type="Edm.Decimal" Precision="19" Scale="4" />
- </EntityType>
- <EntityType Name="Order_Subtotal">
- <Key>
- <PropertyRef Name="OrderID" />
- </Key>
- <Property Name="OrderID" Type="Edm.Int32" Nullable="false" />
- <Property Name="Subtotal" Type="Edm.Decimal" Precision="19" Scale="4" />
- </EntityType>
- <EntityType Name="Orders_Qry">
- <Key>
- <PropertyRef Name="CompanyName" />
- <PropertyRef Name="OrderID" />
- </Key>
- <Property Name="OrderID" Type="Edm.Int32" Nullable="false" />
- <Property Name="CustomerID" Type="Edm.String" MaxLength="5" />
- <Property Name="EmployeeID" Type="Edm.Int32" />
- <Property Name="OrderDate" Type="Edm.DateTimeOffset" />
- <Property Name="RequiredDate" Type="Edm.DateTimeOffset" />
- <Property Name="ShippedDate" Type="Edm.DateTimeOffset" />
- <Property Name="ShipVia" Type="Edm.Int32" />
- <Property Name="Freight" Type="Edm.Decimal" Precision="19" Scale="4" />
- <Property Name="ShipName" Type="Edm.String" MaxLength="40" />
- <Property Name="ShipAddress" Type="Edm.String" MaxLength="60" />
- <Property Name="ShipCity" Type="Edm.String" MaxLength="15" />
- <Property Name="ShipRegion" Type="Edm.String" MaxLength="15" />
- <Property Name="ShipPostalCode" Type="Edm.String" MaxLength="10" />
- <Property Name="ShipCountry" Type="Edm.String" MaxLength="15" />
- <Property Name="CompanyName" Type="Edm.String" Nullable="false" MaxLength="40" />
- <Property Name="Address" Type="Edm.String" MaxLength="60" />
- <Property Name="City" Type="Edm.String" MaxLength="15" />
- <Property Name="Region" Type="Edm.String" MaxLength="15" />
- <Property Name="PostalCode" Type="Edm.String" MaxLength="10" />
- <Property Name="Country" Type="Edm.String" MaxLength="15" />
- </EntityType>
- <EntityType Name="Product_Sales_for_1997">
- <Key>
- <PropertyRef Name="CategoryName" />
- <PropertyRef Name="ProductName" />
- </Key>
- <Property Name="CategoryName" Type="Edm.String" Nullable="false" MaxLength="15" />
- <Property Name="ProductName" Type="Edm.String" Nullable="false" MaxLength="40" />
- <Property Name="ProductSales" Type="Edm.Decimal" Precision="19" Scale="4" />
- </EntityType>
- <EntityType Name="Products_Above_Average_Price">
- <Key>
- <PropertyRef Name="ProductName" />
- </Key>
- <Property Name="ProductName" Type="Edm.String" Nullable="false" MaxLength="40" />
- <Property Name="UnitPrice" Type="Edm.Decimal" Precision="19" Scale="4" />
- </EntityType>
- <EntityType Name="Products_by_Category">
- <Key>
- <PropertyRef Name="CategoryName" />
- <PropertyRef Name="Discontinued" />
- <PropertyRef Name="ProductName" />
- </Key>
- <Property Name="CategoryName" Type="Edm.String" Nullable="false" MaxLength="15" />
- <Property Name="ProductName" Type="Edm.String" Nullable="false" MaxLength="40" />
- <Property Name="QuantityPerUnit" Type="Edm.String" MaxLength="20" />
- <Property Name="UnitsInStock" Type="Edm.Int16" />
- <Property Name="Discontinued" Type="Edm.Boolean" Nullable="false" />
- </EntityType>
- <EntityType Name="Sales_by_Category">
- <Key>
- <PropertyRef Name="CategoryID" />
- <PropertyRef Name="CategoryName" />
- <PropertyRef Name="ProductName" />
- </Key>
- <Property Name="CategoryID" Type="Edm.Int32" Nullable="false" />
- <Property Name="CategoryName" Type="Edm.String" Nullable="false" MaxLength="15" />
- <Property Name="ProductName" Type="Edm.String" Nullable="false" MaxLength="40" />
- <Property Name="ProductSales" Type="Edm.Decimal" Precision="19" Scale="4" />
- </EntityType>
- <EntityType Name="Sales_Totals_by_Amount">
- <Key>
- <PropertyRef Name="CompanyName" />
- <PropertyRef Name="OrderID" />
- </Key>
- <Property Name="SaleAmount" Type="Edm.Decimal" Precision="19" Scale="4" />
- <Property Name="OrderID" Type="Edm.Int32" Nullable="false" />
- <Property Name="CompanyName" Type="Edm.String" Nullable="false" MaxLength="40" />
- <Property Name="ShippedDate" Type="Edm.DateTimeOffset" />
- </EntityType>
- <EntityType Name="Summary_of_Sales_by_Quarter">
- <Key>
- <PropertyRef Name="OrderID" />
- </Key>
- <Property Name="ShippedDate" Type="Edm.DateTimeOffset" />
- <Property Name="OrderID" Type="Edm.Int32" Nullable="false" />
- <Property Name="Subtotal" Type="Edm.Decimal" Precision="19" Scale="4" />
- </EntityType>
- <EntityType Name="Summary_of_Sales_by_Year">
- <Key>
- <PropertyRef Name="OrderID" />
- </Key>
- <Property Name="ShippedDate" Type="Edm.DateTimeOffset" />
- <Property Name="OrderID" Type="Edm.Int32" Nullable="false" />
- <Property Name="Subtotal" Type="Edm.Decimal" Precision="19" Scale="4" />
- </EntityType>
- <Annotations Target="ODataWebExperimental.Northwind.Model.NorthwindEntities">
- <Annotation Term="Com.Microsoft.OData.Service.Conventions.V1.UrlConventions" String="KeyAsSegment" />
- </Annotations>
- </Schema>
- <Schema Namespace="ODataWebExperimental.Northwind.Model" xmlns="http://docs.oasis-open.org/odata/ns/edm">
- <EntityContainer Name="NorthwindEntities" p4:LazyLoadingEnabled="true" xmlns:p4="http://schemas.microsoft.com/ado/2009/02/edm/annotation">
- <EntitySet Name="Categories" EntityType="NorthwindModel.Category">
- <NavigationPropertyBinding Path="Products" Target="Products" />
- </EntitySet>
- <EntitySet Name="CustomerDemographics" EntityType="NorthwindModel.CustomerDemographic">
- <NavigationPropertyBinding Path="Customers" Target="Customers" />
- </EntitySet>
- <EntitySet Name="Customers" EntityType="NorthwindModel.Customer">
- <NavigationPropertyBinding Path="CustomerDemographics" Target="CustomerDemographics" />
- <NavigationPropertyBinding Path="Orders" Target="Orders" />
- </EntitySet>
- <EntitySet Name="Employees" EntityType="NorthwindModel.Employee">
- <NavigationPropertyBinding Path="Employees1" Target="Employees" />
- <NavigationPropertyBinding Path="Employee1" Target="Employees" />
- <NavigationPropertyBinding Path="Orders" Target="Orders" />
- <NavigationPropertyBinding Path="Territories" Target="Territories" />
- </EntitySet>
- <EntitySet Name="Order_Details" EntityType="NorthwindModel.Order_Detail">
- <NavigationPropertyBinding Path="Order" Target="Orders" />
- <NavigationPropertyBinding Path="Product" Target="Products" />
- </EntitySet>
- <EntitySet Name="Orders" EntityType="NorthwindModel.Order">
- <NavigationPropertyBinding Path="Customer" Target="Customers" />
- <NavigationPropertyBinding Path="Employee" Target="Employees" />
- <NavigationPropertyBinding Path="Order_Details" Target="Order_Details" />
- <NavigationPropertyBinding Path="Shipper" Target="Shippers" />
- </EntitySet>
- <EntitySet Name="Products" EntityType="NorthwindModel.Product">
- <NavigationPropertyBinding Path="Category" Target="Categories" />
- <NavigationPropertyBinding Path="Order_Details" Target="Order_Details" />
- <NavigationPropertyBinding Path="Supplier" Target="Suppliers" />
- </EntitySet>
- <EntitySet Name="Regions" EntityType="NorthwindModel.Region">
- <NavigationPropertyBinding Path="Territories" Target="Territories" />
- </EntitySet>
- <EntitySet Name="Shippers" EntityType="NorthwindModel.Shipper">
- <NavigationPropertyBinding Path="Orders" Target="Orders" />
- </EntitySet>
- <EntitySet Name="Suppliers" EntityType="NorthwindModel.Supplier">
- <NavigationPropertyBinding Path="Products" Target="Products" />
- </EntitySet>
- <EntitySet Name="Territories" EntityType="NorthwindModel.Territory">
- <NavigationPropertyBinding Path="Employees" Target="Employees" />
- <NavigationPropertyBinding Path="Region" Target="Regions" />
- </EntitySet>
- <EntitySet Name="Alphabetical_list_of_products" EntityType="NorthwindModel.Alphabetical_list_of_product" />
- <EntitySet Name="Category_Sales_for_1997" EntityType="NorthwindModel.Category_Sales_for_1997" />
- <EntitySet Name="Current_Product_Lists" EntityType="NorthwindModel.Current_Product_List" />
- <EntitySet Name="Customer_and_Suppliers_by_Cities" EntityType="NorthwindModel.Customer_and_Suppliers_by_City" />
- <EntitySet Name="Invoices" EntityType="NorthwindModel.Invoice" />
- <EntitySet Name="Order_Details_Extendeds" EntityType="NorthwindModel.Order_Details_Extended" />
- <EntitySet Name="Order_Subtotals" EntityType="NorthwindModel.Order_Subtotal" />
- <EntitySet Name="Orders_Qries" EntityType="NorthwindModel.Orders_Qry" />
- <EntitySet Name="Product_Sales_for_1997" EntityType="NorthwindModel.Product_Sales_for_1997" />
- <EntitySet Name="Products_Above_Average_Prices" EntityType="NorthwindModel.Products_Above_Average_Price" />
- <EntitySet Name="Products_by_Categories" EntityType="NorthwindModel.Products_by_Category" />
- <EntitySet Name="Sales_by_Categories" EntityType="NorthwindModel.Sales_by_Category" />
- <EntitySet Name="Sales_Totals_by_Amounts" EntityType="NorthwindModel.Sales_Totals_by_Amount" />
- <EntitySet Name="Summary_of_Sales_by_Quarters" EntityType="NorthwindModel.Summary_of_Sales_by_Quarter" />
- <EntitySet Name="Summary_of_Sales_by_Years" EntityType="NorthwindModel.Summary_of_Sales_by_Year" />
- </EntityContainer>
- </Schema>
- </edmx:DataServices>
-</edmx:Edmx>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/serviceDocument.json
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/serviceDocument.json b/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/serviceDocument.json
deleted file mode 100644
index 2e7f066..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/serviceDocument.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- "@odata.context": "http://host/service/$metadata",
- "value": [
- {
- "name": "Orders",
- "kind": "EntitySet",
- "url": "Orders"
- },
- {
- "name": "OrderItems",
- "title": "Order Details",
- "url": "OrderItems"
- },
- {
- "name": "TopProducts",
- "title": "Best-Selling Products",
- "kind": "FunctionImport",
- "url": "TopProducts"
- },
- {
- "name": "Contoso",
- "title": "Contoso Ltd.",
- "kind": "Singleton",
- "url": "Contoso"
- },
- {
- "name": "Human Resources",
- "kind": "ServiceDocument",
- "url": "http://host/HR/"
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/serviceDocument.xml
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/serviceDocument.xml b/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/serviceDocument.xml
deleted file mode 100644
index faddf9c..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/odata4/client/core/v4/serviceDocument.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<app:service xmlns:app="http://www.w3.org/2007/app"
- xmlns:atom="http://www.w3.org/2005/Atom"
- xmlns:metadata="http://docs.oasis-open.org/odata/ns/metadata"
- xml:base="http://host/service/"
- metadata:context="$metadata"
- metadata:metadata-etag="W/"MjAxMy0wNS0xM1QxNDo1NFo="">
- <app:workspace>
- <atom:title type="text">Data</atom:title>
- <app:collection href="Orders">
- <atom:title type="text">Orders</atom:title>
- </app:collection>
- <app:collection href="OrderItems">
- <atom:title type="text">Order Details</atom:title>
- </app:collection>
- <metadata:function-import href="TopProducts">
- <atom:title>Best-Selling Products</atom:title>
- </metadata:function-import>
- <metadata:singleton href="Contoso">
- <atom:title>Contoso Ltd.</atom:title>
- </metadata:singleton>
- <metadata:service-document href="http://host/HR/">
- <atom:title>Human Resources</atom:title>
- </metadata:service-document>
- </app:workspace>
-</app:service>
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataApplicationException.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataApplicationException.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataApplicationException.java
new file mode 100644
index 0000000..eacac21
--- /dev/null
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataApplicationException.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.olingo.commons.api;
+
+public class ODataApplicationException extends Exception {
+
+ private static final long serialVersionUID = 5358683245923127425L;
+
+ public ODataApplicationException(final String msg) {
+ super(msg);
+ }
+
+ public ODataApplicationException(final String msg, final Throwable cause) {
+ super(msg, cause);
+ }
+
+ public ODataApplicationException(final Throwable cause) {
+ super(cause);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataException.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataException.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataException.java
new file mode 100644
index 0000000..334b83f
--- /dev/null
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataException.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.olingo.commons.api;
+
+public class ODataException extends Exception {
+
+ private static final long serialVersionUID = 3057981437954048107L;
+
+ public ODataException(final String msg) {
+ super(msg);
+ }
+
+ public ODataException(final String msg, final Throwable cause) {
+ super(msg, cause);
+ }
+
+ public ODataException(final Throwable cause) {
+ super(cause);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataNotImplementedException.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataNotImplementedException.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataNotImplementedException.java
new file mode 100644
index 0000000..8cb8096
--- /dev/null
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataNotImplementedException.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.olingo.commons.api;
+
+public class ODataNotImplementedException extends ODataException {
+
+ private static final long serialVersionUID = 3921772210762644762L;
+
+ public ODataNotImplementedException(final String msg) {
+ super(msg);
+ }
+
+ public ODataNotImplementedException() {
+ super("Not implemented");
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/Edm.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/Edm.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/Edm.java
new file mode 100644
index 0000000..d9ee17b
--- /dev/null
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/Edm.java
@@ -0,0 +1,111 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.olingo.commons.api.edm;
+
+import java.util.List;
+
+/**
+ * Entity Data Model (EDM)
+ * <br/>
+ * Interface representing a Entity Data Model as described in the Conceptual Schema Definition.
+ */
+public interface Edm {
+
+ /**
+ * Get entity container by full qualified name.
+ * <br/>
+ * See {@link EdmEntityContainer} for more information.
+ *
+ * @param name
+ * @return {@link EdmEntityContainer}
+ */
+ EdmEntityContainer getEntityContainer(FullQualifiedName name);
+
+ /**
+ * Get enum type by full qualified name.
+ * <br/>
+ * See {@link EdmEnumType} for more information
+ *
+ * @param name
+ * @return {@link EdmEnumType}
+ */
+ EdmEnumType getEnumType(FullQualifiedName name);
+
+ /**
+ * Get a type definition by full qualified name.
+ * <br/>
+ * See {@link EdmTypeDefinition} for more information
+ *
+ * @param name
+ * @return {@link EdmTypeDefinition}
+ */
+ EdmTypeDefinition getTypeDefinition(FullQualifiedName name);
+
+ /**
+ * Get entity type by full qualified name.
+ * <br/>
+ * See {@link EdmEntityType} for more information.
+ *
+ * @param name
+ * @return {@link EdmEntityType}
+ */
+ EdmEntityType getEntityType(FullQualifiedName name);
+
+ /**
+ * Get complex type by full qualified name..
+ * <br/>
+ * See {@link EdmComplexType} for more information.
+ *
+ * @param name
+ * @return {@link EdmComplexType}
+ */
+ EdmComplexType getComplexType(FullQualifiedName name);
+
+ /**
+ * Get Action by full qualified name and binding parameter type.
+ *
+ * @param actionName must not be null
+ * @param bindingParameterTypeName may be null if it is an unbound action
+ * @param isBindingParameterCollection may be null if it is an unbound action
+ * @return {@link EdmAction}
+ */
+ EdmAction getAction(FullQualifiedName actionName, FullQualifiedName bindingParameterTypeName,
+ Boolean isBindingParameterCollection);
+
+ /**
+ * Get Function by full qualified name and binding parameter type and binding parameter names.
+ *
+ * @param functionName
+ * @param bindingParameterTypeName may be null if it is an unbound function
+ * @param isBindingParameterCollection may be null if it is an unbound function
+ * @param parameterNames may be null if it is an unbound function
+ * @return {@link EdmFunction}
+ */
+ EdmFunction getFunction(FullQualifiedName functionName, FullQualifiedName bindingParameterTypeName,
+ Boolean isBindingParameterCollection, List<String> parameterNames);
+
+ /**
+ * Get service metadata.
+ * <br/>
+ * See {@link EdmServiceMetadata} for more information.
+ *
+ * @return {@link EdmServiceMetadata}
+ */
+ EdmServiceMetadata getServiceMetadata();
+}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAction.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAction.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAction.java
new file mode 100644
index 0000000..b267cc0
--- /dev/null
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAction.java
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.olingo.commons.api.edm;
+
+/**
+ * A CSDL action.
+ */
+public interface EdmAction extends EdmOperation {
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmActionImport.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmActionImport.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmActionImport.java
new file mode 100644
index 0000000..428fbdf
--- /dev/null
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmActionImport.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.olingo.commons.api.edm;
+
+/**
+ * An EdmActionImport.
+ */
+public interface EdmActionImport extends EdmOperationImport {
+
+ EdmAction getAction();
+}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmActionImportInfo.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmActionImportInfo.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmActionImportInfo.java
new file mode 100644
index 0000000..1af5ce6
--- /dev/null
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmActionImportInfo.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.olingo.commons.api.edm;
+
+import java.net.URI;
+
+/**
+ * Objects of this class contain information about one action import inside the EntityDataModel.
+ */
+public interface EdmActionImportInfo extends EdmOperationImportInfo {
+
+ /**
+ * @return the action import name
+ */
+ String getActionImportName();
+
+ /**
+ * We use a {@link URI} object here to ensure the right encoding. If a string representation is needed the
+ * toASCIIString() method can be used.
+ *
+ * @return the uri to this function import
+ */
+ URI getActionImportUri();
+}