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:03 UTC

[3/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/Accounts_101_expand_MyPaymentInstruments.json
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Accounts_101_expand_MyPaymentInstruments.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Accounts_101_expand_MyPaymentInstruments.json
deleted file mode 100644
index 776d578..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Accounts_101_expand_MyPaymentInstruments.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-  "@odata.context": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/$metadata#Accounts/$entity",
-  "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Account",
-  "@odata.id": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Accounts(101)",
-  "@odata.editLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Accounts(101)",
-  "AccountID": 101,
-  "Country": "US",
-  "AccountInfo": {
-    "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.AccountInfo",
-    "FirstName": "Alex",
-    "LastName": "Green",
-    "MiddleName": "Hood"
-  },
-  "MyPaymentInstruments@odata.context": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/$metadata#Accounts(101)/MyPaymentInstruments",
-  "MyPaymentInstruments@odata.associationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Accounts(101)/MyPaymentInstruments/$ref",
-  "MyPaymentInstruments@odata.navigationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Accounts(101)/MyPaymentInstruments",
-  "MyPaymentInstruments": [{
-      "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument",
-      "@odata.id": "Accounts(101)/MyPaymentInstruments(101901)",
-      "@odata.editLink": "Accounts(101)/MyPaymentInstruments(101901)",
-      "PaymentInstrumentID": 101901,
-      "FriendlyName": "101 first PI",
-      "CreatedDate@odata.type": "#DateTimeOffset",
-      "CreatedDate": "2012-11-01T00:00:00Z",
-      "TheStoredPI@odata.associationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Accounts(101)/MyPaymentInstruments(101901)/TheStoredPI/$ref",
-      "TheStoredPI@odata.navigationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Accounts(101)/MyPaymentInstruments(101901)/TheStoredPI",
-      "BillingStatements@odata.associationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Accounts(101)/MyPaymentInstruments(101901)/BillingStatements/$ref",
-      "BillingStatements@odata.navigationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Accounts(101)/MyPaymentInstruments(101901)/BillingStatements",
-      "BackupStoredPI@odata.associationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Accounts(101)/MyPaymentInstruments(101901)/BackupStoredPI/$ref",
-      "BackupStoredPI@odata.navigationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Accounts(101)/MyPaymentInstruments(101901)/BackupStoredPI"
-    }, {
-      "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI",
-      "@odata.id": "Accounts(101)/MyPaymentInstruments(101902)",
-      "@odata.editLink": "Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI",
-      "PaymentInstrumentID": 101902,
-      "FriendlyName": "101 frist credit PI",
-      "CreatedDate@odata.type": "#DateTimeOffset",
-      "CreatedDate": "2012-11-01T00:00:00Z",
-      "CardNumber": "6000000000000000",
-      "CVV": "234",
-      "HolderName": "Alex",
-      "Balance": 100.0,
-      "ExperationDate@odata.type": "#DateTimeOffset",
-      "ExperationDate": "2022-11-01T00:00:00Z",
-      "TheStoredPI@odata.associationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI/$ref",
-      "TheStoredPI@odata.navigationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI",
-      "BillingStatements@odata.associationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements/$ref",
-      "BillingStatements@odata.navigationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements",
-      "BackupStoredPI@odata.associationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI/$ref",
-      "BackupStoredPI@odata.navigationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI",
-      "CreditRecords@odata.associationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords/$ref",
-      "CreditRecords@odata.navigationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords"
-    }, {
-      "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI",
-      "@odata.id": "Accounts(101)/MyPaymentInstruments(101903)",
-      "@odata.editLink": "Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI",
-      "PaymentInstrumentID": 101903,
-      "FriendlyName": "101 second credit PI",
-      "CreatedDate@odata.type": "#DateTimeOffset",
-      "CreatedDate": "2012-11-01T00:00:00Z",
-      "CardNumber": "8000000000000000",
-      "CVV": "012",
-      "HolderName": "James",
-      "Balance": 300.0,
-      "ExperationDate@odata.type": "#DateTimeOffset",
-      "ExperationDate": "2022-10-02T00:00:00Z",
-      "TheStoredPI@odata.associationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI/$ref",
-      "TheStoredPI@odata.navigationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI",
-      "BillingStatements@odata.associationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements/$ref",
-      "BillingStatements@odata.navigationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements",
-      "BackupStoredPI@odata.associationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI/$ref",
-      "BackupStoredPI@odata.navigationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI",
-      "CreditRecords@odata.associationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords/$ref",
-      "CreditRecords@odata.navigationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords"
-    }],
-  "MyGiftCard@odata.associationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Accounts(101)/MyGiftCard/$ref",
-  "MyGiftCard@odata.navigationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Accounts(101)/MyGiftCard",
-  "ActiveSubscriptions@odata.associationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Accounts(101)/ActiveSubscriptions/$ref",
-  "ActiveSubscriptions@odata.navigationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Accounts(101)/ActiveSubscriptions",
-  "AvailableSubscriptionTemplatess@odata.associationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Accounts(101)/AvailableSubscriptionTemplatess/$ref",
-  "AvailableSubscriptionTemplatess@odata.navigationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Accounts(101)/AvailableSubscriptionTemplatess",
-  "#Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI": {
-    "title": "Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI",
-    "target": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Accounts(101)/Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI"
-  },
-  "#Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI": {
-    "title": "Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI",
-    "target": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Accounts(101)/Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI"
-  },
-  "#Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo": {
-    "title": "Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo",
-    "target": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Accounts(101)/Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo"
-  }
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/752bfad3/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Accounts_101_expand_MyPaymentInstruments.xml
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Accounts_101_expand_MyPaymentInstruments.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Accounts_101_expand_MyPaymentInstruments.xml
deleted file mode 100644
index 75ec28d..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Accounts_101_expand_MyPaymentInstruments.xml
+++ /dev/null
@@ -1,129 +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#Accounts/$entity">
-  <id>http://odatae2etest.azurewebsites.net/javatest/DefaultService/Accounts(101)</id>
-  <category term="#Microsoft.Test.OData.Services.ODataWCFService.Account" scheme="http://docs.oasis-open.org/odata/ns/scheme" />
-  <link rel="edit" href="http://odatae2etest.azurewebsites.net/javatest/DefaultService/Accounts(101)" />
-  <link rel="http://docs.oasis-open.org/odata/ns/related/MyGiftCard" type="application/atom+xml;type=entry" title="MyGiftCard" href="http://odatae2etest.azurewebsites.net/javatest/DefaultService/Accounts(101)/MyGiftCard" />
-  <link rel="http://docs.oasis-open.org/odata/ns/related/MyPaymentInstruments" type="application/atom+xml;type=feed" title="MyPaymentInstruments" href="http://odatae2etest.azurewebsites.net/javatest/DefaultService/Accounts(101)/MyPaymentInstruments">
-    <m:inline>
-      <feed>
-        <id>http://odatae2etest.azurewebsites.net/javatest/DefaultService/MyPaymentInstruments</id>
-        <title />
-        <updated>2014-03-31T09:46:15Z</updated>
-        <entry>
-          <category term="#Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument" scheme="http://docs.oasis-open.org/odata/ns/scheme" />
-          <link rel="http://docs.oasis-open.org/odata/ns/related/TheStoredPI" type="application/atom+xml;type=entry" title="TheStoredPI" href="potato" />
-          <link rel="http://docs.oasis-open.org/odata/ns/related/BillingStatements" type="application/atom+xml;type=feed" title="BillingStatements" href="potato" />
-          <link rel="http://docs.oasis-open.org/odata/ns/related/BackupStoredPI" type="application/atom+xml;type=entry" title="BackupStoredPI" href="potato" />
-          <id />
-          <title />
-          <updated>2014-03-31T09:46:15Z</updated>
-          <author>
-            <name />
-          </author>
-          <content type="application/xml">
-            <m:properties>
-              <d:PaymentInstrumentID m:type="Int32">101901</d:PaymentInstrumentID>
-              <d:FriendlyName>101 first PI</d:FriendlyName>
-              <d:CreatedDate m:type="DateTimeOffset">2012-11-01T00:00:00Z</d:CreatedDate>
-            </m:properties>
-          </content>
-        </entry>
-        <entry>
-          <category term="#Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI" scheme="http://docs.oasis-open.org/odata/ns/scheme" />
-          <link rel="http://docs.oasis-open.org/odata/ns/related/TheStoredPI" type="application/atom+xml;type=entry" title="TheStoredPI" href="potato" />
-          <link rel="http://docs.oasis-open.org/odata/ns/related/BillingStatements" type="application/atom+xml;type=feed" title="BillingStatements" href="potato" />
-          <link rel="http://docs.oasis-open.org/odata/ns/related/BackupStoredPI" type="application/atom+xml;type=entry" title="BackupStoredPI" href="potato" />
-          <link rel="http://docs.oasis-open.org/odata/ns/related/CreditRecords" type="application/atom+xml;type=feed" title="CreditRecords" href="potato" />
-          <id />
-          <title />
-          <updated>2014-03-31T09:46:15Z</updated>
-          <author>
-            <name />
-          </author>
-          <content type="application/xml">
-            <m:properties>
-              <d:PaymentInstrumentID m:type="Int32">101902</d:PaymentInstrumentID>
-              <d:FriendlyName>101 frist credit PI</d:FriendlyName>
-              <d:CreatedDate m:type="DateTimeOffset">2012-11-01T00:00:00Z</d:CreatedDate>
-              <d:CardNumber>6000000000000000</d:CardNumber>
-              <d:CVV>234</d:CVV>
-              <d:HolderName>Alex</d:HolderName>
-              <d:Balance m:type="Double">100</d:Balance>
-              <d:ExperationDate m:type="DateTimeOffset">2022-11-01T00:00:00Z</d:ExperationDate>
-            </m:properties>
-          </content>
-        </entry>
-        <entry>
-          <category term="#Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI" scheme="http://docs.oasis-open.org/odata/ns/scheme" />
-          <link rel="http://docs.oasis-open.org/odata/ns/related/TheStoredPI" type="application/atom+xml;type=entry" title="TheStoredPI" href="potato" />
-          <link rel="http://docs.oasis-open.org/odata/ns/related/BillingStatements" type="application/atom+xml;type=feed" title="BillingStatements" href="potato" />
-          <link rel="http://docs.oasis-open.org/odata/ns/related/BackupStoredPI" type="application/atom+xml;type=entry" title="BackupStoredPI" href="potato" />
-          <link rel="http://docs.oasis-open.org/odata/ns/related/CreditRecords" type="application/atom+xml;type=feed" title="CreditRecords" href="potato" />
-          <id />
-          <title />
-          <updated>2014-03-31T09:46:15Z</updated>
-          <author>
-            <name />
-          </author>
-          <content type="application/xml">
-            <m:properties>
-              <d:PaymentInstrumentID m:type="Int32">101903</d:PaymentInstrumentID>
-              <d:FriendlyName>101 second credit PI</d:FriendlyName>
-              <d:CreatedDate m:type="DateTimeOffset">2012-11-01T00:00:00Z</d:CreatedDate>
-              <d:CardNumber>8000000000000000</d:CardNumber>
-              <d:CVV>012</d:CVV>
-              <d:HolderName>James</d:HolderName>
-              <d:Balance m:type="Double">300</d:Balance>
-              <d:ExperationDate m:type="DateTimeOffset">2022-10-02T00:00:00Z</d:ExperationDate>
-            </m:properties>
-          </content>
-        </entry>
-      </feed>
-    </m:inline>
-  </link>
-  <link rel="http://docs.oasis-open.org/odata/ns/related/ActiveSubscriptions" type="application/atom+xml;type=feed" title="ActiveSubscriptions" href="http://odatae2etest.azurewebsites.net/javatest/DefaultService/Accounts(101)/ActiveSubscriptions" />
-  <link rel="http://docs.oasis-open.org/odata/ns/related/AvailableSubscriptionTemplatess" type="application/atom+xml;type=feed" title="AvailableSubscriptionTemplatess" href="http://odatae2etest.azurewebsites.net/javatest/DefaultService/Accounts(101)/AvailableSubscriptionTemplatess" />
-  <title />
-  <updated>2014-03-31T09:46:15Z</updated>
-  <author>
-    <name />
-  </author>
-  <content type="application/xml">
-    <m:properties>
-      <d:AccountID m:type="Int32">101</d:AccountID>
-      <d:Country>US</d:Country>
-      <d:AccountInfo m:type="#Microsoft.Test.OData.Services.ODataWCFService.AccountInfo">
-        <d:FirstName>Alex</d:FirstName>
-        <d:LastName>Green</d:LastName>
-        <d:MiddleName>Hood</d:MiddleName>
-      </d:AccountInfo>
-    </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/Advertisements_f89dee73-af9f-4cd4-b330-db93c25ff3c7.json
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Advertisements_f89dee73-af9f-4cd4-b330-db93c25ff3c7.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Advertisements_f89dee73-af9f-4cd4-b330-db93c25ff3c7.json
deleted file mode 100644
index eceecbb..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Advertisements_f89dee73-af9f-4cd4-b330-db93c25ff3c7.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "@odata.context": "http://services.odata.org/V4/OData/OData.svc/$metadata#Advertisements/$entity",
-  "@odata.type": "#ODataDemo.Advertisement",
-  "@odata.id": "http://services.odata.org/V4/OData/OData.svc/Advertisements(f89dee73-af9f-4cd4-b330-db93c25ff3c7)",
-  "@odata.editLink": "Advertisements(f89dee73-af9f-4cd4-b330-db93c25ff3c7)",
-  "@odata.mediaEditLink": "Advertisements(f89dee73-af9f-4cd4-b330-db93c25ff3c7)/$value",
-  "@odata.mediaContentType": "*/*",
-  "@odata.mediaEtag": "\"8zOOKKvgOtptr4gt8IrnapX3jds=\"",
-  "ID@odata.type": "#Guid",
-  "ID": "f89dee73-af9f-4cd4-b330-db93c25ff3c7",
-  "Name": "Old School Lemonade Store, Retro Style",
-  "AirDate@odata.type": "#DateTimeOffset",
-  "AirDate": "2012-11-07T00:00:00Z",
-  "FeaturedProduct@odata.associationLink": "Advertisements(f89dee73-af9f-4cd4-b330-db93c25ff3c7)/FeaturedProduct/$ref",
-  "FeaturedProduct@odata.navigationLink": "Advertisements(f89dee73-af9f-4cd4-b330-db93c25ff3c7)/FeaturedProduct"
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/752bfad3/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Advertisements_f89dee73-af9f-4cd4-b330-db93c25ff3c7.xml
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Advertisements_f89dee73-af9f-4cd4-b330-db93c25ff3c7.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Advertisements_f89dee73-af9f-4cd4-b330-db93c25ff3c7.xml
deleted file mode 100644
index 068cb53..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Advertisements_f89dee73-af9f-4cd4-b330-db93c25ff3c7.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.
-
--->
-<entry xml:base="http://services.odata.org/V4/OData/OData.svc/" 
-       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://services.odata.org/V4/OData/OData.svc/$metadata#Advertisements/$entity">
-  <id>http://services.odata.org/V4/OData/OData.svc/Advertisements(f89dee73-af9f-4cd4-b330-db93c25ff3c7)</id>
-  <category term="#ODataDemo.Advertisement" scheme="http://docs.oasis-open.org/odata/ns/scheme" />
-  <link rel="edit" title="Advertisement" href="Advertisements(f89dee73-af9f-4cd4-b330-db93c25ff3c7)" />
-  <link rel="http://docs.oasis-open.org/odata/ns/relatedlinks/FeaturedProduct" type="application/xml" title="FeaturedProduct" href="Advertisements(f89dee73-af9f-4cd4-b330-db93c25ff3c7)/FeaturedProduct/$ref" />
-  <link rel="http://docs.oasis-open.org/odata/ns/related/FeaturedProduct" type="application/atom+xml;type=entry" title="FeaturedProduct" href="Advertisements(f89dee73-af9f-4cd4-b330-db93c25ff3c7)/FeaturedProduct" />
-  <title />
-  <updated>2014-03-31T10:24:52Z</updated>
-  <author>
-    <name />
-  </author>
-  <link rel="edit-media" title="Advertisement" href="Advertisements(f89dee73-af9f-4cd4-b330-db93c25ff3c7)/$value" m:etag="&quot;8zOOKKvgOtptr4gt8IrnapX3jds=&quot;" />
-  <content type="*/*" src="Advertisements(f89dee73-af9f-4cd4-b330-db93c25ff3c7)/$value" />
-  <m:properties>
-    <d:ID m:type="Guid">f89dee73-af9f-4cd4-b330-db93c25ff3c7</d:ID>
-    <d:Name>Old School Lemonade Store, Retro Style</d:Name>
-    <d:AirDate m:type="DateTimeOffset">2012-11-07T00:00:00Z</d:AirDate>
-  </m:properties>
-</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/Customer.json
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Customer.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Customer.json
deleted file mode 100644
index 938297c..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Customer.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "@odata.context": "http://localhost:9080/stub/StaticService/V40/Static.svc/$metadata#People/$entity",
-  "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Customer",
-  "PersonID@odata.type": "Int32",
-  "PersonID": 976,
-  "FirstName@odata.type": "String",
-  "FirstName": "Test",
-  "LastName@odata.type": "String",
-  "LastName": "Test",
-  "HomeAddress": {
-    "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.CompanyAddress",
-    "Street@odata.type": "String",
-    "Street": "V.le Gabriele D'Annunzio",
-    "City@odata.type": "String",
-    "City": "Pescara",
-    "PostalCode@odata.type": "String",
-    "PostalCode": "65127",
-    "CompanyName@odata.type": "String",
-    "CompanyName": "Tirasa"
-  },
-  "Numbers@odata.type": "#Collection(String)",
-  "Numbers": [],
-  "Emails@odata.type": "#Collection(String)",
-  "Emails": [],
-  "City@odata.type": "String",
-  "City": "Pescara",
-  "Birthday@odata.type": "DateTimeOffset",
-  "Birthday": "1977-09-08T02:00:00+02:00",
-  "TimeBetweenLastTwoOrders@odata.type": "Duration",
-  "TimeBetweenLastTwoOrders": "PT0.0000002S",
-  "MiddleName@odata.type": "String",
-  "MiddleName": null,
-  "Home@odata.type": "String",
-  "Home": null,
-  "@odata.editLink": "http://localhost:9080/stub/StaticService/V40/Static.svc/People(976)",
-  "Parent@odata.navigationLink": "People(976)/Parent"
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/752bfad3/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Customer.xml
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Customer.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Customer.xml
deleted file mode 100644
index f012a4d..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Customer.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.
-
--->
-<entry xmlns="http://www.w3.org/2005/Atom" xmlns:xml="http://www.w3.org/XML/1998/namespace" xmlns:m="http://docs.oasis-open.org/odata/ns/metadata" xmlns:d="http://docs.oasis-open.org/odata/ns/data" xmlns:gml="http://www.opengis.net/gml" xmlns:georss="http://www.georss.org/georss" m:context="http://localhost:9080/stub/StaticService/V40/Static.svc/$metadata#People/$entity" xml:base="http://localhost:9080/stub/StaticService/V40/Static.svc/">
-  <category scheme="http://docs.oasis-open.org/odata/ns/scheme" term="#Microsoft.Test.OData.Services.ODataWCFService.Customer"/>
-  <link rel="edit" title="People" href="http://localhost:9080/stub/StaticService/V40/Static.svc/People(976)"/>
-  <link rel="http://docs.oasis-open.org/odata/ns/related/Parent" title="Parent" href="People(976)/Parent" type="application/atom+xml;type=entry"/>
-  <content type="application/xml">
-    <m:properties>
-      <d:PersonID m:type="Int32">976</d:PersonID>
-      <d:FirstName>Test</d:FirstName>
-      <d:LastName>Test</d:LastName>
-      <d:HomeAddress m:type="#Microsoft.Test.OData.Services.ODataWCFService.CompanyAddress">
-        <d:Street>V.le Gabriele D'Annunzio</d:Street>
-        <d:City>Pescara</d:City>
-        <d:PostalCode>65127</d:PostalCode>
-        <d:CompanyName>Tirasa</d:CompanyName>
-      </d:HomeAddress>
-      <d:Numbers m:type="#Collection(String)"/>
-      <d:Emails m:type="#Collection(String)"/>
-      <d:City>Pescara</d:City>
-      <d:Birthday m:type="DateTimeOffset">1977-09-08T02:00:00+02:00</d:Birthday>
-      <d:TimeBetweenLastTwoOrders m:type="Duration">PT0.0000002S</d:TimeBetweenLastTwoOrders>
-      <d:MiddleName m:null="true"/>
-      <d:Home m:null="true"/>
-    </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/Customers.json
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Customers.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Customers.json
deleted file mode 100644
index c37d5a5..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Customers.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  "@odata.context": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/$metadata#Customers",
-  "@odata.count": 2,
-  "value": [{
-      "@odata.id": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Customers(PersonID=1)",
-      "@odata.editLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Customers(PersonID=1)",
-      "PersonID": 1,
-      "FirstName": "Bob",
-      "LastName": "Cat",
-      "MiddleName": null,
-      "HomeAddress": {
-        "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.HomeAddress",
-        "Street": "1 Microsoft Way",
-        "City": "London",
-        "PostalCode": "98052",
-        "FamilyName": "Cats"
-      },
-      "Home": {
-        "type": "Point",
-        "coordinates": [23.1, 32.1],
-        "crs": {
-          "type": "name",
-          "properties": {
-            "name": "EPSG:4326"
-          }
-        }
-      },
-      "Numbers": ["111-111-1111"],
-      "Emails": ["abc@abc.com"],
-      "City": "London",
-      "Birthday": "1957-04-03T00:00:00Z",
-      "TimeBetweenLastTwoOrders": "PT0.0000001S"
-    }, {
-      "@odata.id": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Customers(PersonID=2)",
-      "@odata.editLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Customers(PersonID=2)",
-      "PersonID": 2,
-      "FirstName": "Jill",
-      "LastName": "Jones",
-      "MiddleName": null,
-      "HomeAddress": null,
-      "Home": {
-        "type": "Point",
-        "coordinates": [161.8, 15.0],
-        "crs": {
-          "type": "name",
-          "properties": {
-            "name": "EPSG:4326"
-          }
-        }
-      },
-      "Numbers": [],
-      "Emails": [],
-      "City": "Sydney",
-      "Birthday": "1983-01-15T00:00:00Z",
-      "TimeBetweenLastTwoOrders": "PT0.0000002S"
-    }]
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/752bfad3/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Customers.xml
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Customers.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Customers.xml
deleted file mode 100644
index a0adedd..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Customers.xml
+++ /dev/null
@@ -1,111 +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://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#Customers">
-  <m:count>2</m:count>
-  <id>http://odatae2etest.azurewebsites.net/javatest/DefaultService/Customers</id>
-  <title/>
-  <updated>2014-03-31T09:35:14Z</updated>
-  <entry>
-    <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></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>
-        <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>
-  </entry>
-  <entry>
-    <id>http://odatae2etest.azurewebsites.net/javatest/DefaultService/Customers(PersonID=2)</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=2)"/>
-    <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=2)/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=2)/Orders"/></feed></m:inline>
-      </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=2)/Company"/>
-    <title/>
-    <updated>2014-03-31T09:35:14Z</updated>
-    <author>
-      <name/>
-    </author>
-    <content type="application/xml">
-      <m:properties>
-        <d:PersonID m:type="Int32">2</d:PersonID>
-        <d:FirstName>Jill</d:FirstName>
-        <d:LastName>Jones</d:LastName>
-        <d:MiddleName m:null="true"/>
-        <d:HomeAddress m:null="true"/>
-        <d:Home m:type="GeographyPoint">
-          <gml:Point gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
-            <gml:pos>15.0 161.8</gml:pos>
-          </gml:Point>
-        </d:Home>
-        <d:Numbers m:type="#Collection(String)"/>
-        <d:Emails m:type="#Collection(String)"/>
-        <d:City>Sydney</d:City>
-        <d:Birthday m:type="DateTimeOffset">1983-01-15T00:00:00Z</d:Birthday>
-        <d:TimeBetweenLastTwoOrders m:type="Duration">PT0.0000002S</d:TimeBetweenLastTwoOrders>
-      </m:properties>
-    </content>
-  </entry>
-</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/Employees_3_HomeAddress.json
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Employees_3_HomeAddress.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Employees_3_HomeAddress.json
deleted file mode 100644
index 8748df3..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Employees_3_HomeAddress.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "@odata.context": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/$metadata#Employees(3)/HomeAddress",
-  "Street": "1 Microsoft Way",
-  "City": "Sydney",
-  "PostalCode": "98052"
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/752bfad3/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Employees_3_HomeAddress.xml
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Employees_3_HomeAddress.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Employees_3_HomeAddress.xml
deleted file mode 100644
index 5029af5..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Employees_3_HomeAddress.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.
-
--->
-<m:value xmlns:d="http://docs.oasis-open.org/odata/ns/data" 
-         xmlns:georss="http://www.georss.org/georss" 
-         xmlns:gml="http://www.opengis.net/gml" 
-         m:context="http://odatae2etest.azurewebsites.net/javatest/DefaultService/$metadata#Employees(3)/HomeAddress" 
-         m:type="#Microsoft.Test.OData.Services.ODataWCFService.Address" 
-         xmlns:m="http://docs.oasis-open.org/odata/ns/metadata">
-  <d:Street>1 Microsoft Way</d:Street>
-  <d:City>Sydney</d:City>
-  <d:PostalCode>98052</d:PostalCode>
-</m:value>

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-With-Capabilities.xml
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Metadata-With-Capabilities.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Metadata-With-Capabilities.xml
deleted file mode 100644
index 64999ad..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Metadata-With-Capabilities.xml
+++ /dev/null
@@ -1,323 +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="Org.OData.Capabilities.V1" Alias="Capabilities">
-      <Annotation Term="Core.Description">
-        <String>
-          The Capabilities vocabulary aims to provide a way for service authors to describe
-          certain capabilities of an OData Service.
-        </String>
-      </Annotation>
-      <Annotation Term="Core.LongDescription">
-        <String>
-          There are some capabilities which are strongly recommended for services to support even
-          though they are optional. Support for $top and $skip is a good example as
-          supporting these query options helps with performance of a service and are essential. Such
-          capabilities are assumed to be default capabilities of an OData service even in
-          the case that a capabilities annotation doesn’t exist. Capabilities annotations are
-          mainly expected to be used to explicitly specify that a service doesn’t support such
-          capabilities. Capabilities annotations can as well be used to declaratively
-          specify the support of such capabilities.
-
-          On the other hand, there are some capabilities that a service may choose to support or
-          not support and in varying degrees. $filter and $orderby are such good examples.
-          This vocabulary aims to define terms to specify support or no support for such
-          capabilities.
-
-          A service is assumed to support by default the following capabilities even though an
-          annotation doesn’t exist:
-          - Countability ($count, $inlinecount)
-          - Client pageability ($top, $skip)
-          - Expandability ($expand)
-          - Indexability by key
-          - Batch support ($batch)
-          - Navigability of navigation properties
-
-          A service is expected to support the following capabilities. If not supported, the
-          service is expected to call out the restrictions using annotations:
-          - Filterability ($filter)
-          - Sortability ($orderby)
-          - Queryability of top level entity sets
-          - Query functions
-
-          A client cannot assume that a service supports certain capabilities. A client can try, but
-          it needs to be prepared to handle an error in case the following capabilities are not
-          supported:
-          - Insertability
-          - Updatability
-          - Deletability
-        </String>
-      </Annotation>
-
-      <!-- Conformance Level -->
-
-      <Term Name="ConformanceLevel" Type="Capabilities.ConformanceLevelType" AppliesTo="EntityContainer" />
-      <EnumType Name="ConformanceLevelType">
-        <Member Name="Minimal" />
-        <Member Name="Intermediate" />
-        <Member Name="Advanced" />
-      </EnumType>
-
-      <!-- Request Capabilities -->
-
-      <Term Name="SupportedFormats" Type="Collection(Edm.String)">
-        <Annotation Term="Core.Description" String="Media types of supported formats, including format parameters" />
-        <Annotation Term="Core.IsMediaType" />
-      </Term>
-
-      <Term Name="AcceptableEncodings" Type="Collection(Edm.String)" AppliesTo="EntityContainer">
-        <Annotation Term="Core.Description" String="List of acceptable compression methods for ($batch) requests, e.g. gzip" />
-      </Term>
-
-      <!-- Supported Preferences -->
-
-      <Term Name="AsynchronousRequestsSupported" Type="Core.Tag" DefaultValue="true" AppliesTo="EntityContainer">
-        <Annotation Term="Core.Description" String="Service supports the asynchronous request preference" />
-      </Term>
-
-      <Term Name="BatchContinueOnErrorSupported" Type="Core.Tag" DefaultValue="true" AppliesTo="EntityContainer">
-        <Annotation Term="Core.Description" String="Service supports the continue on error preference" />
-      </Term>
-
-      <Term Name="IsolationSupported" Type="Capabilities.IsolationLevel" AppliesTo="EntityContainer">
-        <Annotation Term="Core.Description" String="Supported odata.isolation levels" />
-      </Term>
-      <EnumType Name="IsolationLevel" IsFlags="true">
-        <Member Name="Snapshot" Value="1" />
-      </EnumType>
-
-      <Term Name="CallbackSupported" Type="Capabilities.CallbackType" AppliesTo="EntityContainer EntitySet">
-        <Annotation Term="Core.Description" String="Supports callbacks for the specified protocols" />
-      </Term>
-      <Term Name="CrossJoinSupported" Type="Core.Tag" DefaultValue="true" AppliesTo="EntityContainer">
-        <Annotation Term="Core.Description" String="Supports cross joins for the entity sets in this container" />
-      </Term>
-      <ComplexType Name="CallbackType">
-        <Property Name="CallbackProtocols" Type="Collection(Capabilities.CallbackProtocol)" />
-        <Annotation Term="Core.Description"
-          String="A non-empty collection lists the full set of supported protocols. A empty collection means 'only HTTP is supported'" />
-      </ComplexType>
-      <ComplexType Name="CallbackProtocol">
-        <Property Name="Id" Type="Edm.String">
-          <Annotation Term="Core.Description" String="Protcol Identifier" />
-        </Property>
-        <Property Name="UrlTemplate" Type="Edm.String">
-          <Annotation Term="Core.Description"
-            String="URL Template including parameters. Parameters are enclosed in curly braces {} as defined in RFC6570" />
-        </Property>
-        <Property Name="DocumentationUrl" Type="Edm.String" Nullable="true">
-          <Annotation Term="Core.Description" String="Human readable description of the meaning of the URL Template parameters" />
-          <Annotation Term="Core.IsURL" />
-        </Property>
-      </ComplexType>
-
-      <Term Name="ChangeTracking" Type="Capabilities.ChangeTrackingType" AppliesTo="EntityContainer EntitySet">
-        <Annotation Term="Core.Description" String="Change tracking capabilities of this service or entity set" />
-      </Term>
-      <ComplexType Name="ChangeTrackingType">
-        <Property Name="Supported" Type="Edm.Boolean" DefaultValue="true">
-          <Annotation Term="Core.Description" String="This entity set supports the odata.track-changes preference" />
-        </Property>
-        <Property Name="FilterableProperties" Type="Collection(Edm.PropertyPath)">
-          <Annotation Term="Core.Description" String="Change tracking supports filters on these properties" />
-        </Property>
-        <Property Name="ExpandableProperties" Type="Collection(Edm.NavigationPropertyPath)">
-          <Annotation Term="Core.Description" String="Change tracking supports these properties expanded" />
-        </Property>
-      </ComplexType>
-
-      <!--Query Capabilities -->
-
-      <Term Name="CountRestrictions" Type="Capabilities.CountRestrictionsType" AppliesTo="EntitySet">
-        <Annotation Term="Core.Description" String="Restrictions on /$count path suffix and $count=true system query option" />
-      </Term>
-      <ComplexType Name="CountRestrictionsType">
-        <Property Name="Countable" Type="Edm.Boolean" DefaultValue="true">
-          <Annotation Term="Core.Description" String="Entities can be counted" />
-        </Property>
-        <Property Name="NonCountableProperties" Type="Collection(Edm.PropertyPath)">
-          <Annotation Term="Core.Description" String="These collection properties do not allow /$count segments" />
-        </Property>
-        <Property Name="NonCountableNavigationProperties" Type="Collection(Edm.NavigationPropertyPath)">
-          <Annotation Term="Core.Description" String="These navigation properties do not allow /$count segments" />
-        </Property>
-      </ComplexType>
-
-      <Term Name="NavigationRestrictions" Type="Capabilities.NavigationRestrictionsType" AppliesTo="EntitySet">
-        <Annotation Term="Core.Description" String="Restrictions on navigating properties according to OData URL conventions" />
-      </Term>
-      <ComplexType Name="NavigationRestrictionsType">
-        <Property Name="Navigability" Type="Capabilities.NavigationType">
-          <Annotation Term="Core.Description" String="Supported Navigability" />
-        </Property>
-        <Property Name="RestrictedProperties" Type="Collection(Capabilities.NavigationPropertyRestriction)" />
-      </ComplexType>
-      <ComplexType Name="NavigationPropertyRestriction">
-        <Property Name="NavigationProperty" Type="Edm.NavigationPropertyPath">
-          <Annotation Term="Core.Description" String="Navigation properties can be navigated to a single level" />
-        </Property>
-        <Property Name="Navigability" Type="Capabilities.NavigationType">
-          <Annotation Term="Core.Description" String="Navigation properties can be navigated to a single level" />
-        </Property>
-      </ComplexType>
-      <EnumType Name="NavigationType">
-        <Member Name="Recursive">
-          <Annotation Term="Core.Description" String="Navigation properties can be recursively navigated" />
-        </Member>
-        <Member Name="Single">
-          <Annotation Term="Core.Description" String="Navigation properties can be navigated to a single level" />
-        </Member>
-        <Member Name="None">
-          <Annotation Term="Core.Description" String="Navigation properties are not navigable" />
-        </Member>
-      </EnumType>
-
-      <Term Name="IndexableByKey" Type="Core.Tag" DefaultValue="true" AppliesTo="EntitySet">
-        <Annotation Term="Core.Description" String="Supports key values according to OData URL conventions" />
-      </Term>
-
-      <Term Name="TopSupported" Type="Core.Tag" DefaultValue="true" AppliesTo="EntitySet">
-        <Annotation Term="Core.Description" String="Supports $top" />
-      </Term>
-      <Term Name="SkipSupported" Type="Core.Tag" DefaultValue="true" AppliesTo="EntitySet">
-        <Annotation Term="Core.Description" String="Supports $skip" />
-      </Term>
-
-      <Term Name="BatchSupported" Type="Core.Tag" DefaultValue="true" AppliesTo="EntityContainer">
-        <Annotation Term="Core.Description" String="Supports $batch requests" />
-      </Term>
-
-      <Term Name="FilterFunctions" Type="Collection(Edm.String)" AppliesTo="EntityContainer EntitySet">
-        <Annotation Term="Core.Description" String="List of functions supported in $filter" />
-      </Term>
-
-      <Term Name="FilterRestrictions" Type="Capabilities.FilterRestrictionsType" AppliesTo="EntitySet">
-        <Annotation Term="Core.Description" String="Restrictions on $filter expressions" />
-      </Term>
-      <ComplexType Name="FilterRestrictionsType">
-        <Property Name="Filterable" Type="Edm.Boolean" DefaultValue="true">
-          <Annotation Term="Core.Description" String="$filter is supported" />
-        </Property>
-        <Property Name="RequiresFilter" Type="Edm.Boolean" Nullable="true">
-          <Annotation Term="Core.Description" String="$filter is required" />
-        </Property>
-        <Property Name="RequiredProperties" Type="Collection(Edm.PropertyPath)">
-          <Annotation Term="Core.Description"
-            String="These properties must be specified in the $filter clause (properties of derived types are not allowed here)" />
-        </Property>
-        <Property Name="NonFilterableProperties" Type="Collection(Edm.PropertyPath)">
-          <Annotation Term="Core.Description" String="These properties cannot be used in $filter expressions" />
-        </Property>
-      </ComplexType>
-
-      <Term Name="SortRestrictions" Type="Capabilities.SortRestrictionsType" AppliesTo="EntitySet">
-        <Annotation Term="Core.Description" String="Restrictions on $orderby expressions" />
-      </Term>
-      <ComplexType Name="SortRestrictionsType">
-        <Property Name="Sortable" Type="Edm.Boolean" DefaultValue="true">
-          <Annotation Term="Core.Description" String="$orderby is supported" />
-        </Property>
-        <Property Name="AscendingOnlyProperties" Type="Collection(Edm.PropertyPath)">
-          <Annotation Term="Core.Description" String="These properties can only be used for sorting in Ascending order" />
-        </Property>
-        <Property Name="DescendingOnlyProperties" Type="Collection(Edm.PropertyPath)">
-          <Annotation Term="Core.Description" String="These properties can only be used for sorting in Descending order" />
-        </Property>
-        <Property Name="NonSortableProperties" Type="Collection(Edm.PropertyPath)">
-          <Annotation Term="Core.Description" String="These properties cannot be used in $orderby expressions" />
-        </Property>
-      </ComplexType>
-
-      <Term Name="ExpandRestrictions" Type="Capabilities.ExpandRestrictionsType" AppliesTo="EntitySet">
-        <Annotation Term="Core.Description" String="Restrictions on $expand expressions" />
-      </Term>
-      <ComplexType Name="ExpandRestrictionsType">
-        <Property Name="Expandable" Type="Edm.Boolean" DefaultValue="true">
-          <Annotation Term="Core.Description" String="$expand is supported" />
-        </Property>
-        <Property Name="NonExpandableProperties" Type="Collection(Edm.NavigationPropertyPath)">
-          <Annotation Term="Core.Description" String="These properties cannot be used in $expand expressions" />
-        </Property>
-      </ComplexType>
-
-      <Term Name="SearchRestrictions" Type="Capabilities.SearchRestrictionsType" AppliesTo="EntitySet">
-        <Annotation Term="Core.Description" String="Restrictions on $search expressions" />
-      </Term>
-      <ComplexType Name="SearchRestrictionsType">
-        <Property Name="Searchable" Type="Edm.Boolean" DefaultValue="true">
-          <Annotation Term="Core.Description" String="$search is supported" />
-        </Property>
-        <Property Name="UnsupportedExpressions" Type="Capabilities.SearchExpressions" DefaultValue="none">
-          <Annotation Term="Core.Description" String="Expressions supported in $search" />
-        </Property>
-      </ComplexType>
-      <EnumType Name="SearchExpressions" IsFlags="true">
-        <Member Name="none" Value="0" />
-        <Member Name="AND" Value="1" />
-        <Member Name="OR" Value="2" />
-        <Member Name="NOT" Value="4" />
-        <Member Name="phrase" Value="8" />
-        <Member Name="group" Value="16" />
-      </EnumType>
-
-      <!-- Data Modification Capabilities -->
-
-      <Term Name="InsertRestrictions" Type="Capabilities.InsertRestrictionsType" AppliesTo="EntitySet">
-        <Annotation Term="Core.Description" String="Restrictions on insert operations" />
-      </Term>
-      <ComplexType Name="InsertRestrictionsType">
-        <Property Name="Insertable" Type="Edm.Boolean" DefaultValue="true">
-          <Annotation Term="Core.Description" String="Entities can be inserted" />
-        </Property>
-        <Property Name="NonInsertableNavigationProperties" Type="Collection(Edm.NavigationPropertyPath)">
-          <Annotation Term="Core.Description" String="These navigation properties do not allow deep inserts" />
-        </Property>
-      </ComplexType>
-
-      <Term Name="UpdateRestrictions" Type="Capabilities.UpdateRestrictionsType" AppliesTo="EntitySet">
-        <Annotation Term="Core.Description" String="Restrictions on update operations" />
-      </Term>
-      <ComplexType Name="UpdateRestrictionsType">
-        <Property Name="Updatable" Type="Edm.Boolean" DefaultValue="true">
-          <Annotation Term="Core.Description" String="Entities can be updated" />
-        </Property>
-        <Property Name="NonUpdatableNavigationProperties" Type="Collection(Edm.NavigationPropertyPath)">
-          <Annotation Term="Core.Description" String="These navigation properties do not allow rebinding" />
-        </Property>
-      </ComplexType>
-
-      <Term Name="DeleteRestrictions" Type="Capabilities.DeleteRestrictionsType" AppliesTo="EntitySet">
-        <Annotation Term="Core.Description" String="Restrictions on delete operations" />
-      </Term>
-      <ComplexType Name="DeleteRestrictionsType">
-        <Property Name="Deletable" Type="Edm.Boolean" DefaultValue="true">
-          <Annotation Term="Core.Description" String="Entities can be deleted" />
-        </Property>
-        <Property Name="NonDeletableNavigationProperties" Type="Collection(Edm.NavigationPropertyPath)">
-          <Annotation Term="Core.Description" String="These navigation properties do not allow DeleteLink requests" />
-        </Property>
-      </ComplexType>
-
-    </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/PersonDetails_1.json
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/PersonDetails_1.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/PersonDetails_1.json
deleted file mode 100644
index c8b62d3..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/PersonDetails_1.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "@odata.context": "http://services.odata.org/V4/OData/OData.svc/$metadata#PersonDetails/$entity",
-  "@odata.type": "#ODataDemo.PersonDetail",
-  "@odata.id": "http://services.odata.org/V4/OData/OData.svc/PersonDetails(1)",
-  "@odata.editLink": "PersonDetails(1)",
-  "PersonID": 1,
-  "Age@odata.type": "#Byte",
-  "Age": 24,
-  "Gender": true,
-  "Phone": "(208) 555-8097",
-  "Address": {
-    "@odata.type": "#ODataDemo.Address",
-    "Street": "187 Suffolk Ln.",
-    "City": "Boise",
-    "State": "ID",
-    "ZipCode": "83720",
-    "Country": "USA"
-  },
-  "Photo@odata.mediaEditLink": "PersonDetails(1)/Photo",
-  "Person@odata.associationLink": "PersonDetails(1)/Person/$ref",
-  "Person@odata.navigationLink": "PersonDetails(1)/Person"
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/752bfad3/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/PersonDetails_1.xml
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/PersonDetails_1.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/PersonDetails_1.xml
deleted file mode 100644
index e7fce12..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/PersonDetails_1.xml
+++ /dev/null
@@ -1,55 +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://services.odata.org/V4/OData/OData.svc/" 
-       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://services.odata.org/V4/OData/OData.svc/$metadata#PersonDetails/$entity">
-  <id>http://services.odata.org/V4/OData/OData.svc/PersonDetails(1)</id>
-  <category term="#ODataDemo.PersonDetail" scheme="http://docs.oasis-open.org/odata/ns/scheme" />
-  <link rel="edit" title="PersonDetail" href="PersonDetails(1)" />
-  <link rel="http://docs.oasis-open.org/odata/ns/relatedlinks/Person" type="application/xml" title="Person" href="PersonDetails(1)/Person/$ref" />
-  <link rel="http://docs.oasis-open.org/odata/ns/related/Person" type="application/atom+xml;type=entry" title="Person" href="PersonDetails(1)/Person" />
-  <title />
-  <updated>2014-03-31T10:28:24Z</updated>
-  <author>
-    <name />
-  </author>
-  <link rel="http://docs.oasis-open.org/odata/ns/edit-media/Photo" title="Photo" href="PersonDetails(1)/Photo" />
-  <content type="application/xml">
-    <m:properties>
-      <d:PersonID m:type="Int32">1</d:PersonID>
-      <d:Age m:type="Byte">24</d:Age>
-      <d:Gender m:type="Boolean">true</d:Gender>
-      <d:Phone>(208) 555-8097</d:Phone>
-      <d:Address m:type="#ODataDemo.Address">
-        <d:Street>187 Suffolk Ln.</d:Street>
-        <d:City>Boise</d:City>
-        <d:State>ID</d:State>
-        <d:ZipCode>83720</d:ZipCode>
-        <d:Country>USA</d: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/Products_5.json
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Products_5.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Products_5.json
deleted file mode 100644
index 0545d78..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Products_5.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "@odata.context": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/$metadata#Products/$entity",
-  "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Product",
-  "@odata.id": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Products(5)",
-  "@odata.editLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Products(5)",
-  "ProductID": 5,
-  "Name": "Cheetos",
-  "QuantityPerUnit": "100g Bag",
-  "UnitPrice@odata.type": "#Single",
-  "UnitPrice": 3.24,
-  "QuantityInStock": 100,
-  "Discontinued": true,
-  "UserAccess@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.AccessLevel",
-  "UserAccess": "None",
-  "SkinColor@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Color",
-  "SkinColor": "Red",
-  "CoverColors@odata.type": "#Collection(Microsoft.Test.OData.Services.ODataWCFService.Color)",
-  "CoverColors": ["Green", "Blue", "Blue"],
-  "Details@odata.associationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Products(5)/Details/$ref",
-  "Details@odata.navigationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Products(5)/Details",
-  "#Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight": {
-    "title": "Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight",
-    "target": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Products(5)/Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight"
-  },
-  "#Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails": {
-    "title": "Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails",
-    "target": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Products(5)/Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails"
-  }
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/752bfad3/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Products_5.xml
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Products_5.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Products_5.xml
deleted file mode 100644
index 409799e..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Products_5.xml
+++ /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.
-
--->
-<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/Products(5)</id>
-  <category term="#Microsoft.Test.OData.Services.ODataWCFService.Product" scheme="http://docs.oasis-open.org/odata/ns/scheme" />
-  <link rel="edit" href="http://odatae2etest.azurewebsites.net/javatest/DefaultService/Products(5)" />
-  <link rel="http://docs.oasis-open.org/odata/ns/related/Details" type="application/atom+xml;type=feed" title="Details"><m:inline><feed><ref xmlns="http://docs.oasis-open.org/odata/ns/metadata" id="http://odatae2etest.azurewebsites.net/javatest/DefaultService/Products(5)/Details"/></feed></m:inline></link>
-  <title />
-  <updated>2014-03-28T11:24:49Z</updated>
-  <author>
-    <name />
-  </author>
-  <content type="application/xml">
-    <m:properties>
-      <d:ProductID m:type="Int32">5</d:ProductID>
-      <d:Name>Cheetos</d:Name>
-      <d:QuantityPerUnit>100g Bag</d:QuantityPerUnit>
-      <d:UnitPrice m:type="Single">3.24</d:UnitPrice>
-      <d:QuantityInStock m:type="Int32">100</d:QuantityInStock>
-      <d:Discontinued m:type="Boolean">true</d:Discontinued>
-      <d:UserAccess m:type="#Microsoft.Test.OData.Services.ODataWCFService.AccessLevel">None</d:UserAccess>
-      <d:SkinColor m:type="#Microsoft.Test.OData.Services.ODataWCFService.Color">Red</d:SkinColor>
-      <d:CoverColors m:type="#Collection(Microsoft.Test.OData.Services.ODataWCFService.Color)">
-        <m:element>Green</m:element>
-        <m:element>Blue</m:element>
-        <m:element>Blue</m:element>
-      </d:CoverColors>
-    </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/Products_5_CoverColors.json
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Products_5_CoverColors.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Products_5_CoverColors.json
deleted file mode 100644
index 96bf22a..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Products_5_CoverColors.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "@odata.context": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/$metadata#Products(5)/CoverColors",
-  "@odata.type": "#Collection(Microsoft.Test.OData.Services.ODataWCFService.Color)",
-  "value": ["Green", "Blue", "Blue"]
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/752bfad3/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Products_5_CoverColors.xml
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Products_5_CoverColors.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Products_5_CoverColors.xml
deleted file mode 100644
index 0dab08c..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Products_5_CoverColors.xml
+++ /dev/null
@@ -1,30 +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:value xmlns:d="http://docs.oasis-open.org/odata/ns/data" 
-         xmlns:georss="http://www.georss.org/georss" 
-         xmlns:gml="http://www.opengis.net/gml" 
-         m:context="http://odatae2etest.azurewebsites.net/javatest/DefaultService/$metadata#Products(5)/CoverColors" m:type="#Collection(Microsoft.Test.OData.Services.ODataWCFService.Color)" 
-         xmlns:m="http://docs.oasis-open.org/odata/ns/metadata">
-  <m:element>Green</m:element>
-  <m:element>Blue</m:element>
-  <m:element>Blue</m:element>
-</m:value>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/752bfad3/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Products_5_SkinColor.json
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Products_5_SkinColor.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Products_5_SkinColor.json
deleted file mode 100644
index b5e26da..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Products_5_SkinColor.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "@odata.context": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/$metadata#Products(5)/SkinColor",
-  "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Color",
-  "value": "Red"
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/752bfad3/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Products_5_SkinColor.xml
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Products_5_SkinColor.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Products_5_SkinColor.xml
deleted file mode 100644
index be392fd..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Products_5_SkinColor.xml
+++ /dev/null
@@ -1,27 +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:value xmlns:d="http://docs.oasis-open.org/odata/ns/data" 
-         xmlns:georss="http://www.georss.org/georss" 
-         xmlns:gml="http://www.opengis.net/gml" 
-         m:context="http://odatae2etest.azurewebsites.net/javatest/DefaultService/$metadata#Products(5)/SkinColor" 
-         m:type="#Microsoft.Test.OData.Services.ODataWCFService.Color" 
-         xmlns:m="http://docs.oasis-open.org/odata/ns/metadata">Red</m:value>
\ 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/VipCustomer.json
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/VipCustomer.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/VipCustomer.json
deleted file mode 100644
index 5f3f697..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/VipCustomer.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "@odata.context": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/$metadata#VipCustomer",
-  "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Customer",
-  "@odata.id": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/VipCustomer",
-  "@odata.editLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/VipCustomer",
-  "PersonID": 1,
-  "FirstName": "Bob",
-  "LastName": "Cat",
-  "MiddleName": "Vat",
-  "HomeAddress": {
-    "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Address",
-    "Street": "1 Microsoft Way",
-    "City": "London",
-    "PostalCode": "98052"
-  },
-  "Home@odata.type": "#GeographyPoint",
-  "Home": {
-    "type": "Point",
-    "coordinates": [23.1, 32.1],
-    "crs": {
-      "type": "name",
-      "properties": {
-        "name": "EPSG:4326"
-      }
-    }
-  },
-  "Numbers@odata.type": "#Collection(String)",
-  "Numbers": ["111-111-1111"],
-  "Emails@odata.type": "#Collection(String)",
-  "Emails": ["abc@abc.com"],
-  "City": "London",
-  "Birthday@odata.type": "#DateTimeOffset",
-  "Birthday": "1957-04-03T00:00:00Z",
-  "TimeBetweenLastTwoOrders@odata.type": "#Duration",
-  "TimeBetweenLastTwoOrders": "PT0.0000001S",
-  "Parent@odata.associationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/VipCustomer/Parent/$ref",
-  "Parent@odata.navigationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/VipCustomer/Parent",
-  "Orders@odata.associationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/VipCustomer/Orders/$ref",
-  "Orders@odata.navigationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/VipCustomer/Orders",
-  "Company@odata.associationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/VipCustomer/Company/$ref",
-  "Company@odata.navigationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/VipCustomer/Company",
-  "#Microsoft.Test.OData.Services.ODataWCFService.ResetAddress": {
-    "title": "Microsoft.Test.OData.Services.ODataWCFService.ResetAddress",
-    "target": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/VipCustomer/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress"
-  },
-  "#Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress": {
-    "title": "Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress",
-    "target": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/VipCustomer/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress"
-  }
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/752bfad3/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/VipCustomer.xml
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/VipCustomer.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/VipCustomer.xml
deleted file mode 100644
index cc5c04d..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/VipCustomer.xml
+++ /dev/null
@@ -1,73 +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#VipCustomer">
-  <id>http://odatae2etest.azurewebsites.net/javatest/DefaultService/VipCustomer</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/VipCustomer" />
-  <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/VipCustomer/Parent" />
-  <link rel="http://docs.oasis-open.org/odata/ns/related/Orders" type="application/atom+xml;type=feed" title="Orders"><m:inline><feed><ref xmlns="http://docs.oasis-open.org/odata/ns/metadata" id="http://odatae2etest.azurewebsites.net/javatest/DefaultService/VipCustomer/Orders"/></feed></m:inline></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/VipCustomer/Company" />
-  <title />
-  <updated>2014-03-28T13:03:32Z</updated>
-  <author>
-    <name />
-  </author>
-  <m:action metadata="#Microsoft.Test.OData.Services.ODataWCFService.ResetAddress" 
-            target="http://odatae2etest.azurewebsites.net/javatest/DefaultService/VipCustomer/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress" 
-            title="Microsoft.Test.OData.Services.ODataWCFService.ResetAddress"/>
-  <m:action metadata="#Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress" 
-            target="http://odatae2etest.azurewebsites.net/javatest/DefaultService/VipCustomer/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress" 
-            title="Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress"/>
-  <content type="application/xml">
-    <m:properties>
-      <d:PersonID m:type="Int32">1</d:PersonID>
-      <d:FirstName>Bob</d:FirstName>
-      <d:LastName>Cat</d:LastName>
-      <d:MiddleName>Vat</d:MiddleName>
-      <d:HomeAddress m:type="#Microsoft.Test.OData.Services.ODataWCFService.Address">
-        <d:Street>1 Microsoft Way</d:Street>
-        <d:City>London</d:City>
-        <d:PostalCode>98052</d:PostalCode>
-      </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>
-</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/annotated.json
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/annotated.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/annotated.json
deleted file mode 100644
index a69884b..0000000
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/annotated.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "@odata.context": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/$metadata#Customers/$entity",
-  "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Customer",
-  "@odata.id": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Customers(PersonID=1)",
-  "@odata.editLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Customers(PersonID=1)",
-  "@com.contoso.display.highlight": true,
-  "@com.contoso.PersonalInfo.PhoneNumbers": ["(203)555-1718", "(203)555-1719"],
-  "PersonID": 1,
-  "FirstName": "Bob",
-  "LastName@com.contoso.display.style": {
-    "@odata.type": "#com.contoso.display.styleType",
-    "title": true,
-    "order": 1
-  },
-  "LastName": "Cat",
-  "MiddleName": null,
-  "HomeAddress": {
-    "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.HomeAddress",
-    "Street": "1 Microsoft Way",
-    "City": "London",
-    "PostalCode": "98052",
-    "FamilyName": "Cats"
-  },
-  "Home@odata.type": "#GeographyPoint",
-  "Home": {
-    "type": "Point",
-    "coordinates": [23.1, 32.1],
-    "crs": {
-      "type": "name",
-      "properties": {
-        "name": "EPSG:4326"
-      }
-    }
-  },
-  "Numbers@odata.type": "#Collection(String)",
-  "Numbers": ["111-111-1111", "0-12", "3-10", "bca", "ayz"],
-  "Emails@odata.type": "#Collection(String)",
-  "Emails": ["abc@abc.com"],
-  "City": "London",
-  "Birthday@odata.type": "#DateTimeOffset",
-  "Birthday": "1957-04-03T00:00:00Z",
-  "TimeBetweenLastTwoOrders@odata.type": "#Duration",
-  "TimeBetweenLastTwoOrders": "PT0.0000001S",
-  "Parent@odata.associationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Customers(PersonID=1)/Parent/$ref",
-  "Parent@odata.navigationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Customers(PersonID=1)/Parent",
-  "Orders@com.contoso.display.style": {
-    "@odata.type": "#com.contoso.display.styleType",
-    "order": 2
-  },
-  "Orders@odata.associationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Customers(PersonID=1)/Orders/$ref",
-  "Orders@odata.navigationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Customers(PersonID=1)/Orders",
-  "Company@odata.associationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Customers(PersonID=1)/Company/$ref",
-  "Company@odata.navigationLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Customers(PersonID=1)/Company",
-  "#Microsoft.Test.OData.Services.ODataWCFService.ResetAddress": {
-    "title": "Microsoft.Test.OData.Services.ODataWCFService.ResetAddress",
-    "target": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Customers(PersonID=1)/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress"
-  },
-  "#Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress": {
-    "title": "Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress",
-    "target": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Customers(PersonID=1)/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress"
-  }
-}
\ No newline at end of file