You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ch...@apache.org on 2015/08/21 14:04:02 UTC

[2/8] olingo-odata4 git commit: [OLINGO-431] Delete unnecessary v4 in package name

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/752bfad3/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/annotated.xml
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/annotated.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/annotated.xml
deleted file mode 100644
index a3b06a9..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/annotated.xml
+++ /dev/null
@@ -1,78 +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.
-
--->
-<entry xml:base="http://odatae2etest.azurewebsites.net/javatest/DefaultService/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://docs.oasis-open.org/odata/ns/data" xmlns:m="http://docs.oasis-open.org/odata/ns/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml" m:context="http://odatae2etest.azurewebsites.net/javatest/DefaultService/$metadata#Products/$entity">
-  <id>http://odatae2etest.azurewebsites.net/javatest/DefaultService/Customers(PersonID=1)</id>
-  <category term="#Microsoft.Test.OData.Services.ODataWCFService.Customer" scheme="http://docs.oasis-open.org/odata/ns/scheme"/>
-  <link rel="edit" href="http://odatae2etest.azurewebsites.net/javatest/DefaultService/Customers(PersonID=1)"/>
-  <link rel="http://docs.oasis-open.org/odata/ns/related/Parent" type="application/atom+xml;type=entry" title="Parent" href="http://odatae2etest.azurewebsites.net/javatest/DefaultService/Customers(PersonID=1)/Parent"/>
-	<link rel="http://docs.oasis-open.org/odata/ns/related/Orders"
-		type="application/atom+xml;type=feed" title="Orders">
-		<m:inline><feed><m:ref id="http://odatae2etest.azurewebsites.net/javatest/DefaultService/Customers(PersonID=1)/Orders"/></feed></m:inline>
-    <m:annotation term="com.contoso.display.style" m:type="#com.contoso.display.styleType">
-      <d:order m:type="Int32">2</d:order>
-    </m:annotation>
-  </link>
-  <link rel="http://docs.oasis-open.org/odata/ns/related/Company" type="application/atom+xml;type=entry" title="Company" href="http://odatae2etest.azurewebsites.net/javatest/DefaultService/Customers(PersonID=1)/Company"/>
-  <title/>
-  <updated>2014-03-31T09:35:14Z</updated>
-  <author>
-    <name/>
-  </author>
-  <content type="application/xml">
-    <m:properties>
-      <d:PersonID m:type="Int32">1</d:PersonID>
-      <d:FirstName>Bob</d:FirstName>
-      <d:LastName>Cat</d:LastName>
-      <m:annotation term="com.contoso.display.style" target="LastName" m:type="#com.contoso.display.styleType">
-        <d:title m:type="Boolean">true</d:title>
-        <d:order m:type="Int32">1</d:order>
-      </m:annotation>      
-      <d:MiddleName m:null="true"/>
-      <d:HomeAddress m:type="#Microsoft.Test.OData.Services.ODataWCFService.HomeAddress">
-        <d:Street>1 Microsoft Way</d:Street>
-        <d:City>London</d:City>
-        <d:PostalCode>98052</d:PostalCode>
-        <d:FamilyName>Cats</d:FamilyName>
-      </d:HomeAddress>
-      <d:Home m:type="GeographyPoint">
-        <gml:Point gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
-          <gml:pos>32.1 23.1</gml:pos>
-        </gml:Point>
-      </d:Home>
-      <d:Numbers m:type="#Collection(String)">
-        <m:element>111-111-1111</m:element>
-      </d:Numbers>
-      <d:Emails m:type="#Collection(String)">
-        <m:element>abc@abc.com</m:element>
-      </d:Emails>
-      <d:City>London</d:City>
-      <d:Birthday m:type="DateTimeOffset">1957-04-03T00:00:00Z</d:Birthday>
-      <d:TimeBetweenLastTwoOrders m:type="Duration">PT0.0000001S</d:TimeBetweenLastTwoOrders>
-    </m:properties>
-  </content>
-  <m:annotation term="com.contoso.display.highlight" m:type="Boolean">true</m:annotation>
-  <m:annotation term="com.contoso.PersonalInfo.PhoneNumbers" m:type="#Collection(String)">
-    <m:element>(203)555-1718</m:element>
-    <m:element>(203)555-1719</m:element>
-  </m:annotation>  
-</entry>
-

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/752bfad3/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/atom_cleanup.xsl
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/atom_cleanup.xsl b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/atom_cleanup.xsl
deleted file mode 100644
index f80a315..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/atom_cleanup.xsl
+++ /dev/null
@@ -1,49 +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.
-
--->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/2005/Atom"
-                xmlns:atom="http://www.w3.org/2005/Atom"
-                xmlns:m="http://docs.oasis-open.org/odata/ns/metadata"
-                version="1.0">
-
-  <xsl:template match="atom:updated"/>
-  <xsl:template match="atom:author"/>
-  <xsl:template match="atom:summary"/>
-  <xsl:template match="atom:title">
-    <xsl:if test="string-length(.) &gt; 0">
-      <title type="{@type}">
-        <xsl:apply-templates/>
-      </title>
-    </xsl:if>
-  </xsl:template>
-  <xsl:template match="atom:link[@rel = 'self' or @rel = 'edit' or @rel = 'edit-media']"/>
-  
-  <xsl:template match="m:action"/>
-
-  <xsl:template match="@*[name() = 'm:etag' or name() = 'm:context' or name() = 'm:metadata-etag']"/>
-
-  <xsl:template match="node()|@*">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
-</xsl:stylesheet>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/752bfad3/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/collectionOfEntityReferences.json
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/collectionOfEntityReferences.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/collectionOfEntityReferences.json
deleted file mode 100644
index 7646ee8..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/collectionOfEntityReferences.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@odata.context": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/$metadata#Collection($ref)",
-  "value": [
-    {
-      "@odata.id": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/OrderDetails(OrderID=7,ProductID=5)"
-    },
-    {
-      "@odata.id": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/OrderDetails(OrderID=7,ProductID=6)"
-    }
-  ]
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/752bfad3/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/collectionOfEntityReferences.xml
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/collectionOfEntityReferences.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/collectionOfEntityReferences.xml
deleted file mode 100644
index 9534270..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/collectionOfEntityReferences.xml
+++ /dev/null
@@ -1,25 +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.
--->
-<feed xmlns:m="http://docs.oasis-open.org/odata/ns/metadata" 
-      m:context="http://odatae2etest.azurewebsites.net/javatest/DefaultService/$metadata#Collection($ref)" 
-      xmlns="http://www.w3.org/2005/Atom">
-  <m:ref id="http://odatae2etest.azurewebsites.net/javatest/DefaultService/OrderDetails(OrderID=7,ProductID=5)"/>
-  <m:ref id="http://odatae2etest.azurewebsites.net/javatest/DefaultService/OrderDetails(OrderID=7,ProductID=6)"/>
-</feed>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/752bfad3/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/crossjoin.json
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/crossjoin.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/crossjoin.json
deleted file mode 100644
index 248ae34..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/crossjoin.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "@odata.context": "http://host/service/$metadata#Collection(Edm.ComplexType)",
-  "value":
-          [
-            {
-              "Products@odata.navigationLink": "Products(0)",
-              "Sales@odata.navigationLink": "Sales(42)"
-            },
-            {
-              "Products@odata.navigationLink": "Products(0)",
-              "Sales@odata.navigationLink": "Sales(57)"
-            },
-            {
-              "Products@odata.navigationLink": "Products(99)",
-              "Sales@odata.navigationLink": "Sales(21)"
-            }
-          ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/752bfad3/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/delta.json
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/delta.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/delta.json
deleted file mode 100644
index d8e8f54..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/delta.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "@odata.context": "http://host/service/$metadata#Customers/$delta",
-  "@odata.count": 5,
-  "value":
-          [
-            {
-              "@odata.id": "Customers('BOTTM')'",
-              "ContactName": "Susan Halvenstern"
-            },
-            {
-              "@odata.context": "#Customers/$deletedLink",
-              "source": "Customers('ALFKI')",
-              "relationship": "Orders",
-              "target": "Orders(10643)"
-            },
-            {
-              "@odata.context": "#Customers/$link",
-              "source": "Customers('BOTTM')",
-              "relationship": "Orders",
-              "target": "Orders(10645)"
-            },
-            {
-              "@odata.context": "#Orders/$entity",
-              "@odata.id": "Orders(10643)",
-              "ShippingAddress": {
-                "Street": "23 Tsawassen Blvd.",
-                "City": " Tsawassen ",
-                "Region": "BC",
-                "PostalCode": "T2F 8M4"
-              }
-            },
-            {
-              "@odata.context": "#Customers/$deletedEntity",
-              "id": "Customers('ANTON')",
-              "reason": "deleted"
-            }
-          ],
-  "@odata.deltaLink": "Customers?$expand=Orders&$deltatoken=8015"
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/752bfad3/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/delta.xml
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/delta.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/delta.xml
deleted file mode 100644
index df65b49..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/delta.xml
+++ /dev/null
@@ -1,87 +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.
-
--->
-<feed xml:base="http://host/service/"
-      xmlns:data="http://docs.oasis-open.org/odata/ns/data"
-      xmlns:metadata="http://docs.oasis-open.org/odata/ns/metadata"
-      xmlns="http://www.w3.org/2005/Atom"
-      xmlns:at="http://purl.org/atompub/tombstones/1.0"
-      metadata:context="$metadata#Customers/$delta">
-  <title type="text">Customers</title>
-  <id>http://host/service/Customers</id>
-  <updated>2012-11-27T15:38:25Z</updated>
-  <metadata:count>5</metadata:count>
-  <entry>
-    <id>http://host/service/Customers('BOTTM')</id>
-    <title type="text" />
-    <updated>2012-11-17T15:38:22Z</updated>
-    <author>
-      <name />
-    </author>
-    <link rel="edit" title="Customer" href="Customers('BOTTM')"/>
-    <category term="#Model.Customer"
-          scheme="http://docs.oasis-open.org/odata/ns/scheme"/>
-    <content type="application/xml">
-      <metadata:properties>
-        <data:ContactName>Susan Halvenstern</data:ContactName>
-      </metadata:properties>
-    </content>
-  </entry>
-  <metadata:deleted-link
-    metadata:context="$metadata#Customers/$deleted-link"
-    source="http://host/service/Customers('ALFKI')"
-    relationship="Orders"
-    target="http://host/service/Orders(10643)"/>
-  <metadata:link
-    metadata:context="$metadata#Customers/$link"
-    source="http://host/service/Customers('BOTTM')"
-    relationship="Orders"
-    target="http://host/service/Orders(10645)"/>
-  <entry metadata:context="$metadata#Orders/$entity">
-    <id>http://host/service/Orders(10643)</id>
-    <title type="text" />
-    <updated>2012-11-27T15:38:24Z</updated>
-    <author>
-      <name/>
-    </author>
-    <link rel="edit" title="Order" href="Orders(10643)" />
-    <category term="#Model.Order"
-          scheme="http://docs.oasis-open.org/odata/ns/scheme" />
-    <content type="application/xml">
-      <metadata:properties>
-        <data:ShippingAddress>
-          <data:Street>23 Tsawassen Blvd.</data:Street>
-          <data:City>Tsawassen</data:City>
-          <data:Region>BC</data:Region>
-          <data:PostalCode>T2F 8M4</data:PostalCode>
-        </data:ShippingAddress>
-      </metadata:properties>
-    </content>
-  </entry>
-  <at:deleted-entry
-    metadata:context="$metadata#Customers/$deleted-entry"
-    ref="http://host/service/Customers('ANTON')"
-    when="2012-11-27T15:38:25Z"
-    metadata:reason="deleted"/>
-  <link
-    rel="http://docs.oasis-open.org/odata/ns/delta"
-    href="http://host/service/Customers?$expand=Orders&amp;$deltatoken=8015"/>
-</feed>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/752bfad3/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/demo-metadata.xml
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/demo-metadata.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/demo-metadata.xml
deleted file mode 100644
index 1f75859..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/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/olingo-odata4/blob/752bfad3/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entity.collection.complex.json
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entity.collection.complex.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entity.collection.complex.json
deleted file mode 100644
index 0bf131e..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entity.collection.complex.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "PhoneNumbers": [
-    {
-      "Number": "425-555-1212",
-      "Type": "Home"
-    },
-    {
-      "@odata.type": "#Model.CellPhoneNumber",
-      "Number": "425-555-0178",
-      "Type": "Cell",
-      "Carrier": "Sprint"
-    }
-  ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/752bfad3/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entity.collection.primitive.json
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entity.collection.primitive.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entity.collection.primitive.json
deleted file mode 100644
index dc811b4..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entity.collection.primitive.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "@odata.context": "http://host/service/$metadata#Customers/$entity",
-  "EmailAddresses": [
-    "Julie@Swansworth.com",
-    "Julie.Swansworth@work.com"
-  ]
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/752bfad3/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entity.complex.json
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entity.complex.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entity.complex.json
deleted file mode 100644
index 189613f..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entity.complex.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "CompanyID": 0,
-  "CompanyCategory": "IT",
-  "Revenue": 100000,
-  "Name": "MS",
-  "Address": {
-    "Street": "1 Microsoft Way",
-    "City": "Redmond",
-    "PostalCode": "98052",
-    "CompanyName": "Microsoft"
-  }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/752bfad3/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entity.minimal.json
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entity.minimal.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entity.minimal.json
deleted file mode 100644
index de0a50b..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entity.minimal.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "@odata.context": "http://host/service/$metadata#Customers/$entity",
-  "ID": "ALFKI",
-  "CompanyName": "Alfreds Futterkiste",
-  "ContactName": "Maria Anders",
-  "ContactTitle": "Sales Representative",
-  "Phone": "030-0074321",
-  "Fax": "030-0076545",
-  "Address": {
-    "Street": "Obere Str. 57",
-    "City": "Berlin",
-    "Region": null,
-    "PostalCode": "D-12209"
-  }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/752bfad3/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entity.primitive.json
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entity.primitive.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entity.primitive.json
deleted file mode 100644
index c66f15d..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entity.primitive.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "NullValue": null,
-  "TrueValue": true,
-  "FalseValue": false,
-  "BinaryValue": "T0RhdGE",
-  "IntegerValue": -128,
-  "DoubleValue": 3.1415926535897931,
-  "SingleValue": "INF",
-  "DecimalValue": 34.95,
-  "StringValue": "Say \"Hello\",\nthen go",
-  "DateValue": "2012-12-03",
-  "DateTimeOffsetValue": "2012-12-03T07:16:23Z",
-  "DurationValue": "P12DT23H59M59.999999999999S",
-  "TimeOfDayValue": "07:59:59.999",
-  "GuidValue": "01234567-89ab-cdef-0123-456789abcdef",
-  "Int64Value": 0,
-  "ColorEnumValue": "Yellow",
-  "GeographyPoint": {
-    "type": "Point",
-    "coordinates": [142.1, 64.1]
-  }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/752bfad3/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entity.withcomplexnavigation.json
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entity.withcomplexnavigation.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entity.withcomplexnavigation.json
deleted file mode 100644
index bcd1dba..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entity.withcomplexnavigation.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "@odata.context": "http://host/service/$metadata#Customers/$entity",
-  "@odata.id": "Customers('ALFKI')",
-  "@odata.etag": "W/\"MjAxMy0wNS0yN1QxMTo1OFo=\"",
-  "@odata.editLink": "Customers('ALFKI')",
-  "ID": "ALFKI",
-  "CompanyName": "Alfreds Futterkiste",
-  "ContactName": "Maria Anders",
-  "ContactTitle": "Sales Representative",
-  "Phone": "030-0074321",
-  "Fax": "030-0076545",
-  "Address": {
-    "Street": "Obere Str. 57",
-    "City": "Berlin",
-    "Region": null,
-    "PostalCode": "D-12209",
-    "Country@odata.associationLink": "Customers('ALFKI')/Address/Country/$ref",
-    "Country@odata.navigationLink": "Customers('ALFKI')/Address/Country"
-  },
-  "Orders@odata.associationLink": "Customers('ALFKI')/Orders/$ref",
-  "Orders@odata.navigationLink": "Customers('ALFKI')/Orders"
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/752bfad3/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entity.withcomplexnavigation.xml
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entity.withcomplexnavigation.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entity.withcomplexnavigation.xml
deleted file mode 100644
index 94cb766..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entity.withcomplexnavigation.xml
+++ /dev/null
@@ -1,63 +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.
--->
-<entry xmlns="http://www.w3.org/2005/Atom"
-       xmlns:m="http://docs.oasis-open.org/odata/ns/metadata"
-       xmlns:d="http://docs.oasis-open.org/odata/ns/data"
-       xml:base="http://host/service/"
-       m:context="$metadata#Customers/$entity"
-       m:metadata-etag="W/&quot;MjAxMy0wNS0xM1QxNDo1NFo=&quot;">
-  <id>http://host/service/$metadata#Customers('ALFKI')</id>
-  <title/>
-  <summary/>
-  <updated>2012-03-30T07:11:05Z</updated>
-  <author>
-    <name/>
-  </author>
-  <link rel="edit" title="Customer" href="Customers('ALFKI')"/>
-  <link rel="http://docs.oasis-open.org/odata/ns/related/Orders"
-        type="application/atom+xml;type=feed"
-        title="Orders">
-        <m:inline><feed><m:ref id="Customers('ALFKI')/Orders"/></feed></m:inline> </link>        
-  <link rel="http://docs.oasis-open.org/odata/ns/related/Supplier"
-        type="application/atom+xml;type=entry"
-        title="Supplier" href="Customers('ALFKI')/Supplier"/>
-  <category term="#ODataDemo.Customer"
-            scheme="http://docs.oasis-open.org/odata/ns/scheme"/>
-  <content type="application/xml">
-    <m:properties>
-      <d:ID>ALFKI</d:ID>
-      <d:CompanyName>Alfreds Futterkiste</d:CompanyName>
-      <d:ContactName>Maria Anders</d:ContactName>
-      <d:ContactTitle>Sales Representative</d:ContactTitle>
-      <d:Phone>030-0074321</d:Phone>
-      <d:Fax>030-0076545</d:Fax>
-      <d:Address>
-        <d:Street>Obere Str. 57</d:Street>
-        <d:City>Berlin</d:City>
-        <d:Region m:null="true"/>
-        <d:PostalCode>D-12209</d:PostalCode>
-        <link rel="http://docs.oasis-open.org/odata/ns/related/Country"
-              type="application/atom+xml;type=entry"
-              title="Country"
-              href="Customers('ALFKI')/Address/Country"/>
-      </d:Address>
-    </m:properties>
-  </content>
-</entry>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/752bfad3/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entityReference.json
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entityReference.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entityReference.json
deleted file mode 100644
index d0b6960..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entityReference.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "@odata.context": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/$metadata#$ref",
-  "@odata.id": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Employees(PersonID=3)"
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/752bfad3/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entityReference.xml
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entityReference.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entityReference.xml
deleted file mode 100644
index d04613b..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entityReference.xml
+++ /dev/null
@@ -1,22 +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.
--->
-<m:ref m:context="http://odatae2etest.azurewebsites.net/javatest/DefaultService/$metadata#$ref" 
-       id="http://odatae2etest.azurewebsites.net/javatest/DefaultService/Employees(PersonID=3)" 
-       xmlns:m="http://docs.oasis-open.org/odata/ns/metadata"/>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/752bfad3/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/error.json
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/error.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/error.json
deleted file mode 100644
index 30a50d8..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/error.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "error": {
-    "code": "501",
-    "message": "Unsupported functionality",
-    "target": "query",
-    "details": [
-      {
-        "code": "301",
-        "target": "$search",
-        "message": "$search query option not supported"
-      }
-    ]
-  }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/752bfad3/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/error.xml
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/error.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/error.xml
deleted file mode 100644
index 149b799..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/error.xml
+++ /dev/null
@@ -1,31 +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.
--->
-<error xmlns="http://docs.oasis-open.org/odata/ns/metadata">
-  <code>501</code>
-  <message>Unsupported functionality</message>
-  <target>query</target>
-  <details>
-    <detail>
-      <code>301</code>
-      <message>$search query option not supported</message>
-      <target>$search</target>
-    </detail>
-  </details>
-</error>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/752bfad3/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/fromdoc1-metadata.xml
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/fromdoc1-metadata.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/fromdoc1-metadata.xml
deleted file mode 100644
index 74a71d4..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/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/olingo-odata4/blob/752bfad3/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/fromdoc2-metadata.xml
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/fromdoc2-metadata.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/fromdoc2-metadata.xml
deleted file mode 100644
index 60387f2..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/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/olingo-odata4/blob/752bfad3/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/fromdoc3-metadata.xml
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/fromdoc3-metadata.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/fromdoc3-metadata.xml
deleted file mode 100644
index 36e5216..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/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/olingo-odata4/blob/752bfad3/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/fromdoc4-metadata.xml
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/fromdoc4-metadata.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/fromdoc4-metadata.xml
deleted file mode 100644
index 6602960..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/fromdoc4-metadata.xml
+++ /dev/null
@@ -1,164 +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:DataServices>
-    <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Annotations">
-      <Annotations Target="Test">
-        <Annotation Term="org.example.display.Threshold">
-          <Cast Type="Edm.Decimal">
-            <Path>Average</Path>
-          </Cast>
-        </Annotation>   
-        <Annotation Term="And">
-          <And>
-            <Path>IsMale</Path>
-            <Path>IsMarried</Path>
-          </And>          
-        </Annotation>
-        <Annotation Term="Or">
-          <Or>
-            <Path>IsMale</Path>
-            <Path>IsMarried</Path>
-          </Or>          
-        </Annotation>
-        <Annotation Term="Not">
-          <Not>
-            <Path>IsMale</Path>
-          </Not>         
-        </Annotation>
-        <Annotation Term="Eq">
-          <Eq>
-            <Null/>
-            <Path>IsMale</Path>
-          </Eq>        
-        </Annotation>
-        <Annotation Term="UI.ReferenceFacet" AnnotationPath="Product/Supplier/@UI.LineItem"/>
-        <Annotation Term="UI.CollectionFacet" Qualifier="Contacts">
-          <Collection>
-            <AnnotationPath>Supplier/@Communication.Contact</AnnotationPath>
-            <AnnotationPath>Customer/@Communication.Contact</AnnotationPath>
-          </Collection>
-        </Annotation>
-        <Annotation Term="org.example.display.DisplayName">
-          <Apply Function="odata.concat">
-            <String>Product: </String>
-            <Path>ProductName</Path>
-            <String> (</String>
-            <Path>Available/Quantity</Path>
-            <String> </String>
-            <Path>Available/Unit</Path>
-            <String> available)</String>
-          </Apply>
-        </Annotation>
-        <Annotation Term="Apply2">
-          <Apply Function="odata.fillUriTemplate">
-            <String>http://host/service/Genres('{genreName}')</String>
-            <LabeledElement Name="genreName" Path="NameOfMovieGenre"/>
-          </Apply>
-        </Annotation>
-        <Annotation Term="Apply3">
-          <Apply Function="odata.fillUriTemplate">
-            <String>http://host/service/Genres({genreName})</String>
-            <LabeledElement Name="genreName">
-              <Apply Function="odata.uriEncode" >
-                <Path>NameOfMovieGenre</Path>
-              </Apply>
-            </LabeledElement>
-          </Apply>
-        </Annotation>     
-        <Annotation Term="org.example.seo.SeoTerms">
-          <Collection>
-            <String>Product</String>
-            <String>Supplier</String>
-            <String>Customer</String>
-          </Collection>
-        </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.display.DisplayName">
-          <LabeledElementReference>Model.CustomerFirstName</LabeledElementReference>
-        </Annotation>
-        <Annotation Term="UI.HyperLink" NavigationPropertyPath="Supplier"/>
-        <Annotation Term="Capabilities.UpdateRestrictions">
-          <Record>
-            <PropertyValue Property="NonUpdatableNavigationProperties">
-              <Collection>
-                <NavigationPropertyPath>Supplier</NavigationPropertyPath>
-                <NavigationPropertyPath>Category</NavigationPropertyPath>
-              </Collection>
-            </PropertyValue>
-          </Record>
-        </Annotation>
-        <Annotation Term="org.example.display.DisplayName" Path="FirstName"/>
-        <Annotation Term="org.example.display.DisplayName">
-          <Path>@vCard.Address#work/FullName</Path>
-        </Annotation>   
-        <Annotation Term="UI.RefreshOnChangeOf" PropertyPath="ChangedAt"/>
-        <Annotation Term="Capabilities.UpdateRestrictions">
-          <Record>
-            <PropertyValue Property="NonUpdatableProperties">
-              <Collection>
-                <PropertyPath>CreatedAt</PropertyPath>
-                <PropertyPath>ChangedAt</PropertyPath>
-              </Collection>
-            </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/olingo-odata4/blob/752bfad3/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/metadata.xml
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/metadata.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/metadata.xml
deleted file mode 100644
index 3f992ac..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/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/olingo-odata4/blob/752bfad3/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/minimalEntity.json
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/minimalEntity.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/minimalEntity.json
deleted file mode 100644
index a6bd671..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/minimalEntity.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "odata.context": "http://host/service/$metadata#Customers/$entity", "odata.id": "Customers('ALFKI')",
-  "odata.etag": "W/\"MjAxMy0wNS0yN1QxMTo1OFo=\"",
-  "odata.editLink": "Customers('ALFKI')",
-  "Orders@odata.navigationLink": "Customers('ALFKI')/Orders",
-  "Orders@odata.associationLink": "Customers('ALFKI')/Orders/$ref",
-  "ID": "ALFKI",
-  "CompanyName": "Alfreds Futterkiste",
-  "ContactName": "Maria Anders",
-  "ContactTitle": "Sales Representative",
-  "Phone": "030-0074321",
-  "Fax": "030-0076545",
-  "Address": {
-    "Street": "Obere Str. 57",
-    "City": "Berlin",
-    "Region": null,
-    "PostalCode": "D-12209",
-    "Country@odata.navigationLink": "Customers('ALFKI')/Address/Country", 
-    "Country@odata.associationLink": "Customers('ALFKI')/Address/Country/$ref"
-  }
-}