You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by il...@apache.org on 2014/07/30 08:24:35 UTC

[01/20] [OLINGO-377] Removing unused cargo properties, upgrading Tomcat, renaming cargo.servlet.port to tomcat.servlet.port

Repository: olingo-odata4
Updated Branches:
  refs/heads/master 45a46f86e -> 36e6ed401


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Products/5/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Products/5/entity.full.json b/fit/src/main/resources/V40/Products/5/entity.full.json
index abbec57..df0869f 100644
--- a/fit/src/main/resources/V40/Products/5/entity.full.json
+++ b/fit/src/main/resources/V40/Products/5/entity.full.json
@@ -1,8 +1,8 @@
 {
-  "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Products/$entity",
+  "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Products/$entity",
   "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Product",
-  "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)",
-  "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)",
+  "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)",
+  "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)",
   "ProductID": 5,
   "Name": "Cheetos",
   "QuantityPerUnit": "100g Bag",
@@ -16,14 +16,14 @@
   "SkinColor": "Red",
   "CoverColors@odata.type": "#Collection(Microsoft.Test.OData.Services.ODataWCFService.Color)",
   "CoverColors": ["Green", "Blue", "Blue"],
-  "Details@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Details/$ref",
-  "Details@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Details",
+  "Details@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Details/$ref",
+  "Details@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Details",
   "#Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight": {
     "title": "Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight",
-    "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight"
+    "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight"
   },
   "#Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails": {
     "title": "Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails",
-    "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails"
+    "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails"
   }
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Products/5/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Products/5/entity.xml b/fit/src/main/resources/V40/Products/5/entity.xml
index 42e0b4d..ce50372 100644
--- a/fit/src/main/resources/V40/Products/5/entity.xml
+++ b/fit/src/main/resources/V40/Products/5/entity.xml
@@ -19,22 +19,22 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.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://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Products/$entity">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.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://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Products/$entity">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/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://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)" />
-  <link rel="http://docs.oasis-open.org/odata/ns/related/Details" type="application/atom+xml;type=feed" title="Details" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Details" />
+  <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)" />
+  <link rel="http://docs.oasis-open.org/odata/ns/related/Details" type="application/atom+xml;type=feed" title="Details" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Details" />
   <title />
   <updated>2014-04-23T11:54:53Z</updated>
   <author>
     <name />
   </author>
-  <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight" 
+  <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight" 
             title="Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight" 
-            target="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight"/>
-  <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails" 
+            target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight"/>
+  <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails" 
             title="Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails" 
-            target="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails"/>
+            target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails"/>
   <content type="application/xml">
     <m:properties>
       <d:ProductID m:type="Int32">5</d:ProductID>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Products/6/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Products/6/entity.full.json b/fit/src/main/resources/V40/Products/6/entity.full.json
index 466540d..1cd2d15 100644
--- a/fit/src/main/resources/V40/Products/6/entity.full.json
+++ b/fit/src/main/resources/V40/Products/6/entity.full.json
@@ -1,8 +1,8 @@
 {
-  "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Products/$entity",
+  "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Products/$entity",
   "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Product",
-  "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)",
-  "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)",
+  "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)",
+  "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)",
   "ProductID": 6,
   "Name": "Mushrooms",
   "QuantityPerUnit": "Pound",
@@ -16,14 +16,14 @@
   "SkinColor": "Blue",
   "CoverColors@odata.type": "#Collection(Microsoft.Test.OData.Services.ODataWCFService.Color)",
   "CoverColors": ["Red", "Blue"],
-  "Details@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)/Details/$ref",
-  "Details@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)/Details",
+  "Details@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)/Details/$ref",
+  "Details@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)/Details",
   "#Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight": {
     "title": "Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight",
-    "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)/Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight"
+    "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)/Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight"
   },
   "#Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails": {
     "title": "Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails",
-    "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)/Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails"
+    "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)/Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails"
   }
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Products/6/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Products/6/entity.xml b/fit/src/main/resources/V40/Products/6/entity.xml
index 887c0ec..3de8ac2 100644
--- a/fit/src/main/resources/V40/Products/6/entity.xml
+++ b/fit/src/main/resources/V40/Products/6/entity.xml
@@ -19,11 +19,11 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.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://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Products/$entity">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.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://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Products/$entity">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)</id>
   <category term="#Microsoft.Test.OData.Services.ODataWCFService.Product" scheme="http://docs.oasis-open.org/odata/ns/scheme" />
-  <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)" />
-  <link rel="http://docs.oasis-open.org/odata/ns/related/Details" type="application/atom+xml;type=feed" title="Details" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)/Details" />
+  <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)" />
+  <link rel="http://docs.oasis-open.org/odata/ns/related/Details" type="application/atom+xml;type=feed" title="Details" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)/Details" />
   <title />
   <updated>2014-04-23T11:58:19Z</updated>
   <author>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Products/feed.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Products/feed.full.json b/fit/src/main/resources/V40/Products/feed.full.json
index c3f07cb..186d98e 100644
--- a/fit/src/main/resources/V40/Products/feed.full.json
+++ b/fit/src/main/resources/V40/Products/feed.full.json
@@ -1,9 +1,9 @@
 {
-  "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Products",
+  "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Products",
   "value": [{
       "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Product",
-      "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)",
-      "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)",
+      "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)",
+      "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)",
       "ProductID": 5,
       "Name": "Cheetos",
       "QuantityPerUnit": "100g Bag",
@@ -17,20 +17,20 @@
       "SkinColor": "Red",
       "CoverColors@odata.type": "#Collection(Microsoft.Test.OData.Services.ODataWCFService.Color)",
       "CoverColors": ["Green", "Blue", "Blue"],
-      "Details@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Details/$ref",
-      "Details@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Details",
+      "Details@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Details/$ref",
+      "Details@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Details",
       "#Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight": {
         "title": "Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight",
-        "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight"
+        "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight"
       },
       "#Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails": {
         "title": "Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails",
-        "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails"
+        "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails"
       }
     }, {
       "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Product",
-      "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)",
-      "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)",
+      "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)",
+      "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)",
       "ProductID": 6,
       "Name": "Mushrooms",
       "QuantityPerUnit": "Pound",
@@ -44,20 +44,20 @@
       "SkinColor": "Blue",
       "CoverColors@odata.type": "#Collection(Microsoft.Test.OData.Services.ODataWCFService.Color)",
       "CoverColors": ["Red", "Blue"],
-      "Details@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)/Details/$ref",
-      "Details@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)/Details",
+      "Details@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)/Details/$ref",
+      "Details@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)/Details",
       "#Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight": {
         "title": "Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight",
-        "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)/Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight"
+        "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)/Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight"
       },
       "#Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails": {
         "title": "Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails",
-        "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)/Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails"
+        "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)/Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails"
       }
     }, {
       "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Product",
-      "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(7)",
-      "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(7)",
+      "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(7)",
+      "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(7)",
       "ProductID": 7,
       "Name": "Apple",
       "QuantityPerUnit": "Pound",
@@ -71,20 +71,20 @@
       "SkinColor": "Red",
       "CoverColors@odata.type": "#Collection(Microsoft.Test.OData.Services.ODataWCFService.Color)",
       "CoverColors": ["Blue"],
-      "Details@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(7)/Details/$ref",
-      "Details@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(7)/Details",
+      "Details@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(7)/Details/$ref",
+      "Details@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(7)/Details",
       "#Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight": {
         "title": "Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight",
-        "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(7)/Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight"
+        "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(7)/Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight"
       },
       "#Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails": {
         "title": "Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails",
-        "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(7)/Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails"
+        "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(7)/Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails"
       }
     }, {
       "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Product",
-      "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(8)",
-      "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(8)",
+      "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(8)",
+      "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(8)",
       "ProductID": 8,
       "Name": "Car",
       "QuantityPerUnit": "Pound",
@@ -98,20 +98,20 @@
       "SkinColor": "Red",
       "CoverColors@odata.type": "#Collection(Microsoft.Test.OData.Services.ODataWCFService.Color)",
       "CoverColors": ["Red", "Red", "Blue"],
-      "Details@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(8)/Details/$ref",
-      "Details@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(8)/Details",
+      "Details@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(8)/Details/$ref",
+      "Details@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(8)/Details",
       "#Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight": {
         "title": "Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight",
-        "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(8)/Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight"
+        "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(8)/Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight"
       },
       "#Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails": {
         "title": "Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails",
-        "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(8)/Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails"
+        "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(8)/Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails"
       }
     }, {
       "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Product",
-      "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(9)",
-      "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(9)",
+      "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(9)",
+      "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(9)",
       "ProductID": 9,
       "Name": "Computer",
       "QuantityPerUnit": "Pound",
@@ -125,15 +125,15 @@
       "SkinColor": "Green",
       "CoverColors@odata.type": "#Collection(Microsoft.Test.OData.Services.ODataWCFService.Color)",
       "CoverColors": ["Green"],
-      "Details@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(9)/Details/$ref",
-      "Details@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(9)/Details",
+      "Details@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(9)/Details/$ref",
+      "Details@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(9)/Details",
       "#Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight": {
         "title": "Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight",
-        "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(9)/Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight"
+        "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(9)/Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight"
       },
       "#Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails": {
         "title": "Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails",
-        "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(9)/Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails"
+        "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(9)/Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails"
       }
     }]
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Products/feed.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Products/feed.xml b/fit/src/main/resources/V40/Products/feed.xml
index c2cac75..345f868 100644
--- a/fit/src/main/resources/V40/Products/feed.xml
+++ b/fit/src/main/resources/V40/Products/feed.xml
@@ -19,21 +19,21 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/" 
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.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://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Products">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products</id>
+      m:context="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Products">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products</id>
   <title />
   <updated>2014-04-23T08:04:46Z</updated>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/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://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Details" type="application/atom+xml;type=feed" title="Details" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Details" />
+    <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Details" type="application/atom+xml;type=feed" title="Details" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Details" />
     <title />
     <updated>2014-04-23T08:04:46Z</updated>
     <author>
@@ -58,10 +58,10 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)</id>
     <category term="#Microsoft.Test.OData.Services.ODataWCFService.Product" scheme="http://docs.oasis-open.org/odata/ns/scheme" />
-    <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Details" type="application/atom+xml;type=feed" title="Details" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)/Details" />
+    <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Details" type="application/atom+xml;type=feed" title="Details" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)/Details" />
     <title />
     <updated>2014-04-23T08:04:46Z</updated>
     <author>
@@ -85,10 +85,10 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(7)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(7)</id>
     <category term="#Microsoft.Test.OData.Services.ODataWCFService.Product" scheme="http://docs.oasis-open.org/odata/ns/scheme" />
-    <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(7)" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Details" type="application/atom+xml;type=feed" title="Details" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(7)/Details" />
+    <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(7)" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Details" type="application/atom+xml;type=feed" title="Details" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(7)/Details" />
     <title />
     <updated>2014-04-23T08:04:46Z</updated>
     <author>
@@ -111,10 +111,10 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(8)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(8)</id>
     <category term="#Microsoft.Test.OData.Services.ODataWCFService.Product" scheme="http://docs.oasis-open.org/odata/ns/scheme" />
-    <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(8)" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Details" type="application/atom+xml;type=feed" title="Details" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(8)/Details" />
+    <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(8)" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Details" type="application/atom+xml;type=feed" title="Details" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(8)/Details" />
     <title />
     <updated>2014-04-23T08:04:46Z</updated>
     <author>
@@ -139,10 +139,10 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(9)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(9)</id>
     <category term="#Microsoft.Test.OData.Services.ODataWCFService.Product" scheme="http://docs.oasis-open.org/odata/ns/scheme" />
-    <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(9)" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Details" type="application/atom+xml;type=feed" title="Details" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(9)/Details" />
+    <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(9)" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Details" type="application/atom+xml;type=feed" title="Details" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(9)/Details" />
     <title />
     <updated>2014-04-23T08:04:46Z</updated>
     <author>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.full.json b/fit/src/main/resources/V40/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.full.json
index 71acfc7..9b621b9 100644
--- a/fit/src/main/resources/V40/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.full.json
+++ b/fit/src/main/resources/V40/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.full.json
@@ -1,7 +1,7 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/OpenType.svc/$metadata#Row/@Element",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/OpenType.svc/$metadata#Row/@Element",
   "odata.type": "Microsoft.Test.OData.Services.OpenTypesService.Row",
-  "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/OpenType.svc/Row(guid'672b8250-1e6e-4785-80cf-b94b572e42b3')",
+  "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/OpenType.svc/Row(guid'672b8250-1e6e-4785-80cf-b94b572e42b3')",
   "odata.editLink": "Row(guid'672b8250-1e6e-4785-80cf-b94b572e42b3')",
   "Id@odata.type": "Edm.Guid",
   "Id": "672b8250-1e6e-4785-80cf-b94b572e42b3",

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.xml b/fit/src/main/resources/V40/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.xml
index 1e610be..5435e5c 100644
--- a/fit/src/main/resources/V40/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.xml
+++ b/fit/src/main/resources/V40/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.xml
@@ -19,14 +19,14 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/OpenType.svc/" 
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/OpenType.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://localhost:${cargo.servlet.port}/stub/StaticService/V40/OpenType.svc/$metadata#Row">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/OpenType.svc/Row(672b8250-1e6e-4785-80cf-b94b572e42b3)</id>
+       m:context="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/OpenType.svc/$metadata#Row">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/OpenType.svc/Row(672b8250-1e6e-4785-80cf-b94b572e42b3)</id>
   <category term="Microsoft.Test.OData.Services.OpenTypesService.Row" scheme="http://docs.oasis-open.org/odata/ns/scheme"/>
   <link rel="edit" title="Row" href="Row(672b8250-1e6e-4785-80cf-b94b572e42b3)"/>
   <title/>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Row/71f7d0dc-ede4-45eb-b421-555a2aa1e58f/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Row/71f7d0dc-ede4-45eb-b421-555a2aa1e58f/entity.full.json b/fit/src/main/resources/V40/Row/71f7d0dc-ede4-45eb-b421-555a2aa1e58f/entity.full.json
index 9d8e83e..dae910d 100644
--- a/fit/src/main/resources/V40/Row/71f7d0dc-ede4-45eb-b421-555a2aa1e58f/entity.full.json
+++ b/fit/src/main/resources/V40/Row/71f7d0dc-ede4-45eb-b421-555a2aa1e58f/entity.full.json
@@ -1,7 +1,7 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/OpenType.svc/$metadata#Row/@Element",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/OpenType.svc/$metadata#Row/@Element",
   "odata.type": "Microsoft.Test.OData.Services.OpenTypesService.Row",
-  "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/OpenType.svc/Row(guid'71f7d0dc-ede4-45eb-b421-555a2aa1e58f')",
+  "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/OpenType.svc/Row(guid'71f7d0dc-ede4-45eb-b421-555a2aa1e58f')",
   "odata.editLink": "Row(guid'71f7d0dc-ede4-45eb-b421-555a2aa1e58f')",
   "Id@odata.type": "Edm.Guid",
   "Id": "71f7d0dc-ede4-45eb-b421-555a2aa1e58f",

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Row/71f7d0dc-ede4-45eb-b421-555a2aa1e58f/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Row/71f7d0dc-ede4-45eb-b421-555a2aa1e58f/entity.xml b/fit/src/main/resources/V40/Row/71f7d0dc-ede4-45eb-b421-555a2aa1e58f/entity.xml
index 62e55d4..22f1351 100644
--- a/fit/src/main/resources/V40/Row/71f7d0dc-ede4-45eb-b421-555a2aa1e58f/entity.xml
+++ b/fit/src/main/resources/V40/Row/71f7d0dc-ede4-45eb-b421-555a2aa1e58f/entity.xml
@@ -19,14 +19,14 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/OpenType.svc/" 
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/OpenType.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://localhost:${cargo.servlet.port}/stub/StaticService/V40/OpenType.svc/$metadata#Row">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/OpenType.svc/Row(71f7d0dc-ede4-45eb-b421-555a2aa1e58f)</id>
+       m:context="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/OpenType.svc/$metadata#Row">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/OpenType.svc/Row(71f7d0dc-ede4-45eb-b421-555a2aa1e58f)</id>
   <category term="Microsoft.Test.OData.Services.OpenTypesService.Row" scheme="http://docs.oasis-open.org/odata/ns/scheme"/>
   <link rel="edit" title="Row" href="Row(71f7d0dc-ede4-45eb-b421-555a2aa1e58f)"/>
   <title/>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/VipCustomer/1/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/VipCustomer/1/entity.full.json b/fit/src/main/resources/V40/VipCustomer/1/entity.full.json
index ee9e31a..9d97924 100644
--- a/fit/src/main/resources/V40/VipCustomer/1/entity.full.json
+++ b/fit/src/main/resources/V40/VipCustomer/1/entity.full.json
@@ -1,7 +1,7 @@
 {
-  "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#VipCustomers/$entity",
+  "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#VipCustomers/$entity",
   "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Customer",
-  "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/VipCustomers(PersonID=1)",
-  "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/VipCustomers(PersonID=1)",
+  "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/VipCustomers(PersonID=1)",
+  "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/VipCustomers(PersonID=1)",
   "PersonID": 1
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/VipCustomer/1/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/VipCustomer/1/entity.xml b/fit/src/main/resources/V40/VipCustomer/1/entity.xml
index 21bbe93..91f6b48 100644
--- a/fit/src/main/resources/V40/VipCustomer/1/entity.xml
+++ b/fit/src/main/resources/V40/VipCustomer/1/entity.xml
@@ -19,18 +19,18 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/" 
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.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://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#VipCustomers/$entity">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/VipCustomers(PersonID=1)</id>
+       m:context="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#VipCustomers/$entity">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/VipCustomers(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://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/VipCustomers(PersonID=1)" />
-  <link rel="http://docs.oasis-open.org/odata/ns/related/Parent" type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Parent" />
-  <link rel="http://docs.oasis-open.org/odata/ns/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Orders" />
-  <link rel="http://docs.oasis-open.org/odata/ns/related/Company" type="application/atom+xml;type=entry" title="Company" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Company" />
+  <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/VipCustomers(PersonID=1)" />
+  <link rel="http://docs.oasis-open.org/odata/ns/related/Parent" type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Parent" />
+  <link rel="http://docs.oasis-open.org/odata/ns/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Orders" />
+  <link rel="http://docs.oasis-open.org/odata/ns/related/Company" type="application/atom+xml;type=entry" title="Company" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Company" />
   <title />
   <updated>2014-03-24T17:03:20Z</updated>
   <author>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/crossjoin.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/crossjoin.full.json b/fit/src/main/resources/V40/crossjoin.full.json
index 2ff948f..13a7c43 100644
--- a/fit/src/main/resources/V40/crossjoin.full.json
+++ b/fit/src/main/resources/V40/crossjoin.full.json
@@ -1,5 +1,5 @@
 {
-  "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Customers",
+  "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Customers",
   "value":
           [
             {

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/delta.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/delta.full.json b/fit/src/main/resources/V40/delta.full.json
index 77882bb..54b8ec0 100644
--- a/fit/src/main/resources/V40/delta.full.json
+++ b/fit/src/main/resources/V40/delta.full.json
@@ -1,5 +1,5 @@
 {
-  "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Customers/$delta",
+  "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Customers/$delta",
   "@odata.count": 5,
   "value":
           [

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/delta.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/delta.xml b/fit/src/main/resources/V40/delta.xml
index bcba295..4b9c02a 100644
--- a/fit/src/main/resources/V40/delta.xml
+++ b/fit/src/main/resources/V40/delta.xml
@@ -19,18 +19,18 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/"
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/"
       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://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers</id>
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers</id>
   <updated>2012-11-27T15:38:25Z</updated>
   <metadata:count>5</metadata:count>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers('BOTTM')</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers('BOTTM')</id>
     <title type="text" />
     <updated>2012-11-17T15:38:22Z</updated>
     <author>
@@ -47,16 +47,16 @@
   </entry>
   <metadata:deleted-link
     metadata:context="$metadata#Customers/$deleted-link"
-    source="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers('ALFKI')"
+    source="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers('ALFKI')"
     relationship="Orders"
-    target="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(10643)"/>
+    target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(10643)"/>
   <metadata:link
     metadata:context="$metadata#Customers/$link"
-    source="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers('BOTTM')"
+    source="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers('BOTTM')"
     relationship="Orders"
-    target="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(10645)"/>
+    target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(10645)"/>
   <entry metadata:context="$metadata#Orders/$entity">
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(10643)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(10643)</id>
     <title type="text" />
     <updated>2012-11-27T15:38:24Z</updated>
     <author>
@@ -78,10 +78,10 @@
   </entry>
   <at:deleted-entry
     metadata:context="$metadata#Customers/$deleted-entry"
-    ref="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers('ANTON')"
+    ref="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers('ANTON')"
     when="2012-11-27T15:38:25Z"
     metadata:reason="deleted"/>
   <link
     rel="http://docs.oasis-open.org/odata/ns/delta"
-    href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers?$expand=Orders&amp;$deltatoken=8015"/>
+    href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers?$expand=Orders&amp;$deltatoken=8015"/>
 </feed>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/northwind-metadata.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/northwind-metadata.xml b/fit/src/main/resources/V40/northwind-metadata.xml
index 058ab7c..8cc833a 100644
--- a/fit/src/main/resources/V40/northwind-metadata.xml
+++ b/fit/src/main/resources/V40/northwind-metadata.xml
@@ -20,7 +20,7 @@
 
 -->
 <edmx:Edmx Version="4.0" xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx">
-  <edmx:Reference Uri="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/NorthWindExt.svc/$metadata">
+  <edmx:Reference Uri="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/NorthWindExt.svc/$metadata">
     <edmx:Include Namespace="NorthwindModel"/>
   </edmx:Reference>
   <edmx:DataServices>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/references/Q3VzdG9tZXJzKDEpL09yZGVycw==.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/references/Q3VzdG9tZXJzKDEpL09yZGVycw==.full.json b/fit/src/main/resources/V40/references/Q3VzdG9tZXJzKDEpL09yZGVycw==.full.json
index 0ff0ae3..8003487 100644
--- a/fit/src/main/resources/V40/references/Q3VzdG9tZXJzKDEpL09yZGVycw==.full.json
+++ b/fit/src/main/resources/V40/references/Q3VzdG9tZXJzKDEpL09yZGVycw==.full.json
@@ -1,8 +1,8 @@
 {
-  "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#$ref",
+  "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#$ref",
   "value":
           [
-            {"@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)"},
-            {"@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)"}
+            {"@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)"},
+            {"@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)"}
           ]
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/references/T3JkZXJzKDgpL0N1c3RvbWVyRm9yT3JkZXI=.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/references/T3JkZXJzKDgpL0N1c3RvbWVyRm9yT3JkZXI=.full.json b/fit/src/main/resources/V40/references/T3JkZXJzKDgpL0N1c3RvbWVyRm9yT3JkZXI=.full.json
index 1d08480..a2d4045 100644
--- a/fit/src/main/resources/V40/references/T3JkZXJzKDgpL0N1c3RvbWVyRm9yT3JkZXI=.full.json
+++ b/fit/src/main/resources/V40/references/T3JkZXJzKDgpL0N1c3RvbWVyRm9yT3JkZXI=.full.json
@@ -1,4 +1,4 @@
 {
-  "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#$ref",
-  "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)"
+  "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#$ref",
+  "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)"
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/references/T3JkZXJzKDgpL0N1c3RvbWVyRm9yT3JkZXI=.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/references/T3JkZXJzKDgpL0N1c3RvbWVyRm9yT3JkZXI=.xml b/fit/src/main/resources/V40/references/T3JkZXJzKDgpL0N1c3RvbWVyRm9yT3JkZXI=.xml
index 31ab5c8..4638895 100644
--- a/fit/src/main/resources/V40/references/T3JkZXJzKDgpL0N1c3RvbWVyRm9yT3JkZXI=.xml
+++ b/fit/src/main/resources/V40/references/T3JkZXJzKDgpL0N1c3RvbWVyRm9yT3JkZXI=.xml
@@ -19,4 +19,4 @@
     under the License.
 
 -->
-<m:ref m:context="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#$ref" id="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)" xmlns:m="http://docs.oasis-open.org/odata/ns/metadata" />
\ No newline at end of file
+<m:ref m:context="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#$ref" id="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)" xmlns:m="http://docs.oasis-open.org/odata/ns/metadata" />
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/services.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/services.full.json b/fit/src/main/resources/V40/services.full.json
index 81295e7..a3ca94d 100644
--- a/fit/src/main/resources/V40/services.full.json
+++ b/fit/src/main/resources/V40/services.full.json
@@ -1,5 +1,5 @@
 {
-  "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata",
+  "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata",
   "value":
           [
             {

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/services.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/services.xml b/fit/src/main/resources/V40/services.xml
index 90e0a6f..5c46f15 100644
--- a/fit/src/main/resources/V40/services.xml
+++ b/fit/src/main/resources/V40/services.xml
@@ -19,11 +19,11 @@
     under the License.
 
 -->
-<service xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/" 
+<service xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/" 
          xmlns="http://www.w3.org/2007/app" 
          xmlns:atom="http://www.w3.org/2005/Atom" 
          xmlns:m="http://docs.oasis-open.org/odata/ns/metadata" 
-         m:context="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata">
+         m:context="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata">
   <workspace>
     <atom:title type="text">InMemoryEntities</atom:title>
     <collection href="People">

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/vocabularies-metadata.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/vocabularies-metadata.xml b/fit/src/main/resources/V40/vocabularies-metadata.xml
index f076b22..5b4537d 100644
--- a/fit/src/main/resources/V40/vocabularies-metadata.xml
+++ b/fit/src/main/resources/V40/vocabularies-metadata.xml
@@ -20,13 +20,13 @@
 
 -->
 <edmx:Edmx Version="4.0" xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx">
-  <edmx:Reference Uri="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Vocabularies.svc/Org.OData.Core.V1.xml">
+  <edmx:Reference Uri="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Vocabularies.svc/Org.OData.Core.V1.xml">
     <edmx:Include Alias="Core" Namespace="Org.OData.Core.V1"/>
   </edmx:Reference>
-  <edmx:Reference Uri="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Vocabularies.svc/Org.OData.Measures.V1.xml">
+  <edmx:Reference Uri="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Vocabularies.svc/Org.OData.Measures.V1.xml">
     <edmx:Include Alias="UoM" Namespace="Org.OData.Measures.V1"/>
   </edmx:Reference>
-  <edmx:Reference Uri="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Vocabularies.svc/Org.OData.Capabilities.V1.xml">
+  <edmx:Reference Uri="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Vocabularies.svc/Org.OData.Capabilities.V1.xml">
     <edmx:Include Alias="Capabilities" Namespace="Org.OData.Capabilities.V1"/>
   </edmx:Reference>
   

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/esigate.properties
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/esigate.properties b/fit/src/main/resources/esigate.properties
index 0db861a..03134a6 100644
--- a/fit/src/main/resources/esigate.properties
+++ b/fit/src/main/resources/esigate.properties
@@ -17,8 +17,8 @@
 # under the License.
 #
 
-webapp.remoteUrlBase=http://localhost:${cargo.servlet.port}/stub/StaticService/
-visibleUrlBase=http://localhost:${cargo.servlet.port}/stub/DefaultService.svc/
+webapp.remoteUrlBase=http://localhost:${tomcat.servlet.port}/stub/StaticService/
+visibleUrlBase=http://localhost:${tomcat.servlet.port}/stub/DefaultService.svc/
 useCache=true
 extensions=org.apache.olingo.fit.rproxy.LinkRewrite
 parsableContentTypes=application/xml,application/atom+xml,application/json

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6c87d67..222dca5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,14 +91,8 @@
 
     <sl4j.version>1.7.7</sl4j.version>
 
-    <log.directory>${project.build.directory}/log</log.directory>
-
-    <cargo.servlet.port>9080</cargo.servlet.port>
-    <cargo.tomcat.ajp.port>9889</cargo.tomcat.ajp.port>
-    <cargo.rmi.port>9805</cargo.rmi.port>
-    <cargo.log>${log.directory}/cargo.log</cargo.log>
-    <cargo.output>${log.directory}/cargo-output.log</cargo.output>
-    <tomcat.version>7.0.54</tomcat.version>
+    <tomcat.servlet.port>9080</tomcat.servlet.port>
+    <tomcat.version>7.0.55</tomcat.version>
 
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>


[09/20] [OLINGO-377] Removing unused cargo properties, upgrading Tomcat, renaming cargo.servlet.port to tomcat.servlet.port

Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/filter/not endswith(Name,'Chandan').xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/filter/not endswith(Name,'Chandan').xml b/fit/src/main/resources/V30/Customer/filter/not endswith(Name,'Chandan').xml
index 1d52691..63c1056 100644
--- a/fit/src/main/resources/V30/Customer/filter/not endswith(Name,'Chandan').xml	
+++ b/fit/src/main/resources/V30/Customer/filter/not endswith(Name,'Chandan').xml	
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer</id>
   <title type="text">Customer</title>
   <updated>2014-02-13T14:31:06Z</updated>
   <link rel="self" title="Customer" href="Customer" />
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Customer" href="Customer(-10)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="Customer(-10)/Orders" />
@@ -518,7 +518,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-9)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-9)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Customer" href="Customer(-9)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="Customer(-9)/Orders" />
@@ -1061,5 +1061,5 @@
       </m:properties>
     </content>
   </entry>
-  <link rel="next" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer?$filter=not%20endswith(Name,'Chandan')&amp;$skiptoken=-9" />
+  <link rel="next" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer?$filter=not%20endswith(Name,'Chandan')&amp;$skiptoken=-9" />
 </feed>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/skiptoken/-1.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/skiptoken/-1.full.json b/fit/src/main/resources/V30/Customer/skiptoken/-1.full.json
index bb57782..ae99563 100644
--- a/fit/src/main/resources/V30/Customer/skiptoken/-1.full.json
+++ b/fit/src/main/resources/V30/Customer/skiptoken/-1.full.json
@@ -1,5 +1,5 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer",
   "value":
           [
           ]

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/skiptoken/-1.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/skiptoken/-1.xml b/fit/src/main/resources/V30/Customer/skiptoken/-1.xml
index 7d0d680..0de875a 100644
--- a/fit/src/main/resources/V30/Customer/skiptoken/-1.xml
+++ b/fit/src/main/resources/V30/Customer/skiptoken/-1.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer</id>
   <title type="text">Customer</title>
   <updated>2014-02-11T10:22:13Z</updated>
   <link rel="self" title="Customer" href="Customer" />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/skiptoken/-10.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/skiptoken/-10.full.json b/fit/src/main/resources/V30/Customer/skiptoken/-10.full.json
index d1eadeb..b5bfd2f 100644
--- a/fit/src/main/resources/V30/Customer/skiptoken/-10.full.json
+++ b/fit/src/main/resources/V30/Customer/skiptoken/-10.full.json
@@ -1,10 +1,10 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer",
   "value":
           [
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-9)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-9)",
               "odata.editLink": "Customer(-9)",
               "Orders@odata.navigationLinkUrl": "Customer(-9)/Orders",
               "Logins@odata.navigationLinkUrl": "Customer(-9)/Logins",
@@ -753,7 +753,7 @@
             },
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-8)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-8)",
               "odata.editLink": "Customer(-8)",
               "Orders@odata.navigationLinkUrl": "Customer(-8)/Orders",
               "Logins@odata.navigationLinkUrl": "Customer(-8)/Logins",

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/skiptoken/-10.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/skiptoken/-10.xml b/fit/src/main/resources/V30/Customer/skiptoken/-10.xml
index ab51e5c..a20bca5 100644
--- a/fit/src/main/resources/V30/Customer/skiptoken/-10.xml
+++ b/fit/src/main/resources/V30/Customer/skiptoken/-10.xml
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer</id>
   <title type="text">Customer</title>
   <updated>2014-02-13T15:19:47Z</updated>
   <link rel="self" title="Customer" href="Customer" />
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-9)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-9)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Customer" href="Customer(-9)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="Customer(-9)/Orders" />
@@ -779,7 +779,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-8)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-8)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Customer" href="Customer(-8)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="Customer(-8)/Orders" />
@@ -949,5 +949,5 @@
       </m:properties>
     </content>
   </entry>
-  <link rel="next" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer?$skiptoken=-8" />
+  <link rel="next" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer?$skiptoken=-8" />
 </feed>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/skiptoken/-3.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/skiptoken/-3.full.json b/fit/src/main/resources/V30/Customer/skiptoken/-3.full.json
index 1a7c4b9..e9bd58d 100644
--- a/fit/src/main/resources/V30/Customer/skiptoken/-3.full.json
+++ b/fit/src/main/resources/V30/Customer/skiptoken/-3.full.json
@@ -1,10 +1,10 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer",
   "value":
           [
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-2)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-2)",
               "odata.editLink": "Customer(-2)",
               "Orders@odata.navigationLinkUrl": "Customer(-2)/Orders",
               "Logins@odata.navigationLinkUrl": "Customer(-2)/Logins",
@@ -196,7 +196,7 @@
             },
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-1)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-1)",
               "odata.editLink": "Customer(-1)",
               "Orders@odata.navigationLinkUrl": "Customer(-1)/Orders",
               "Logins@odata.navigationLinkUrl": "Customer(-1)/Logins",

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/skiptoken/-3.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/skiptoken/-3.xml b/fit/src/main/resources/V30/Customer/skiptoken/-3.xml
index 0133d45..bdabbbe 100644
--- a/fit/src/main/resources/V30/Customer/skiptoken/-3.xml
+++ b/fit/src/main/resources/V30/Customer/skiptoken/-3.xml
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer</id>
   <title type="text">Customer</title>
   <updated>2014-02-04T14:29:22Z</updated>
   <link rel="self" title="Customer" href="Customer" />
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-2)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-2)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Customer" href="Customer(-2)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="Customer(-2)/Orders" />
@@ -178,7 +178,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-1)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-1)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Customer" href="Customer(-1)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="Customer(-1)/Orders" />
@@ -609,5 +609,5 @@
       </m:properties>
     </content>
   </entry>
-  <link rel="next" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer?$skiptoken=-1" />
+  <link rel="next" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer?$skiptoken=-1" />
 </feed>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/skiptoken/-5.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/skiptoken/-5.full.json b/fit/src/main/resources/V30/Customer/skiptoken/-5.full.json
index 9a9ff29..1266e15 100644
--- a/fit/src/main/resources/V30/Customer/skiptoken/-5.full.json
+++ b/fit/src/main/resources/V30/Customer/skiptoken/-5.full.json
@@ -1,10 +1,10 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer",
   "value":
           [
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-4)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-4)",
               "odata.editLink": "Customer(-4)",
               "Orders@odata.navigationLinkUrl": "Customer(-4)/Orders",
               "Logins@odata.navigationLinkUrl": "Customer(-4)/Logins",
@@ -779,7 +779,7 @@
             },
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-3)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-3)",
               "odata.editLink": "Customer(-3)",
               "Orders@odata.navigationLinkUrl": "Customer(-3)/Orders",
               "Logins@odata.navigationLinkUrl": "Customer(-3)/Logins",

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/skiptoken/-5.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/skiptoken/-5.xml b/fit/src/main/resources/V30/Customer/skiptoken/-5.xml
index 4a2339b..c00eb40 100644
--- a/fit/src/main/resources/V30/Customer/skiptoken/-5.xml
+++ b/fit/src/main/resources/V30/Customer/skiptoken/-5.xml
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer</id>
   <title type="text">Customer</title>
   <updated>2014-02-04T14:28:17Z</updated>
   <link rel="self" title="Customer" href="Customer" />
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-4)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-4)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Customer" href="Customer(-4)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="Customer(-4)/Orders" />
@@ -604,7 +604,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-3)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-3)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Customer" href="Customer(-3)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="Customer(-3)/Orders" />
@@ -1100,5 +1100,5 @@
       </m:properties>
     </content>
   </entry>
-  <link rel="next" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer?$skiptoken=-3" />
+  <link rel="next" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer?$skiptoken=-3" />
 </feed>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/skiptoken/-7.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/skiptoken/-7.full.json b/fit/src/main/resources/V30/Customer/skiptoken/-7.full.json
index e644006..14ac08b 100644
--- a/fit/src/main/resources/V30/Customer/skiptoken/-7.full.json
+++ b/fit/src/main/resources/V30/Customer/skiptoken/-7.full.json
@@ -1,10 +1,10 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer",
   "value":
           [
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-6)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-6)",
               "odata.editLink": "Customer(-6)",
               "Orders@odata.navigationLinkUrl": "Customer(-6)/Orders",
               "Logins@odata.navigationLinkUrl": "Customer(-6)/Logins",
@@ -587,7 +587,7 @@
             },
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-5)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-5)",
               "odata.editLink": "Customer(-5)",
               "Orders@odata.navigationLinkUrl": "Customer(-5)/Orders",
               "Logins@odata.navigationLinkUrl": "Customer(-5)/Logins",

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/skiptoken/-7.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/skiptoken/-7.xml b/fit/src/main/resources/V30/Customer/skiptoken/-7.xml
index de57044..7fe417f 100644
--- a/fit/src/main/resources/V30/Customer/skiptoken/-7.xml
+++ b/fit/src/main/resources/V30/Customer/skiptoken/-7.xml
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer</id>
   <title type="text">Customer</title>
   <updated>2014-02-04T14:27:13Z</updated>
   <link rel="self" title="Customer" href="Customer" />
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-6)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-6)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Customer" href="Customer(-6)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="Customer(-6)/Orders" />
@@ -458,7 +458,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-5)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-5)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Customer" href="Customer(-5)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="Customer(-5)/Orders" />
@@ -985,6 +985,6 @@
       </m:properties>
     </content>
   </entry>
-  <link rel="next" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer?$skiptoken=-5" />
+  <link rel="next" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer?$skiptoken=-5" />
 </feed>
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/skiptoken/-9.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/skiptoken/-9.full.json b/fit/src/main/resources/V30/Customer/skiptoken/-9.full.json
index 4d2cd33..d51929a 100644
--- a/fit/src/main/resources/V30/Customer/skiptoken/-9.full.json
+++ b/fit/src/main/resources/V30/Customer/skiptoken/-9.full.json
@@ -1,10 +1,10 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer",
   "value":
           [
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-8)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-8)",
               "odata.editLink": "Customer(-8)",
               "Orders@odata.navigationLinkUrl": "Customer(-8)/Orders",
               "Logins@odata.navigationLinkUrl": "Customer(-8)/Logins",
@@ -226,7 +226,7 @@
             },
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-7)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-7)",
               "odata.editLink": "Customer(-7)",
               "Orders@odata.navigationLinkUrl": "Customer(-7)/Orders",
               "Logins@odata.navigationLinkUrl": "Customer(-7)/Logins",

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/skiptoken/-9.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/skiptoken/-9.xml b/fit/src/main/resources/V30/Customer/skiptoken/-9.xml
index 9db7b77..afb43ac 100644
--- a/fit/src/main/resources/V30/Customer/skiptoken/-9.xml
+++ b/fit/src/main/resources/V30/Customer/skiptoken/-9.xml
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer</id>
   <title type="text">Customer</title>
   <updated>2014-02-04T14:24:59Z</updated>
   <link rel="self" title="Customer" href="Customer" />
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-8)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-8)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Customer" href="Customer(-8)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="Customer(-8)/Orders" />
@@ -196,7 +196,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-7)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-7)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Customer" href="Customer(-7)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="Customer(-7)/Orders" />
@@ -555,5 +555,5 @@
       </m:properties>
     </content>
   </entry>
-  <link rel="next" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer?$skiptoken=-7" />
+  <link rel="next" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer?$skiptoken=-7" />
 </feed>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/CustomerInfo/11/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/CustomerInfo/11/entity.full.json b/fit/src/main/resources/V30/CustomerInfo/11/entity.full.json
index 61c854f..4410847 100644
--- a/fit/src/main/resources/V30/CustomerInfo/11/entity.full.json
+++ b/fit/src/main/resources/V30/CustomerInfo/11/entity.full.json
@@ -1,7 +1,7 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#CustomerInfo/@Element",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#CustomerInfo/@Element",
   "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo",
-  "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(11)",
+  "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(11)",
   "odata.editLink": "CustomerInfo(11)",
   "odata.mediaEditLink": "CustomerInfo(11)/$value",
   "odata.mediaReadLink": "CustomerInfo(11)/$value",

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/CustomerInfo/11/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/CustomerInfo/11/entity.xml b/fit/src/main/resources/V30/CustomerInfo/11/entity.xml
index b57de1b..dc41a0e 100644
--- a/fit/src/main/resources/V30/CustomerInfo/11/entity.xml
+++ b/fit/src/main/resources/V30/CustomerInfo/11/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(11)</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(11)</id>
   <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
   <link rel="edit" title="CustomerInfo" href="CustomerInfo(11)" />
   <title />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/CustomerInfo/12/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/CustomerInfo/12/entity.full.json b/fit/src/main/resources/V30/CustomerInfo/12/entity.full.json
index 401e897..3c3343e 100644
--- a/fit/src/main/resources/V30/CustomerInfo/12/entity.full.json
+++ b/fit/src/main/resources/V30/CustomerInfo/12/entity.full.json
@@ -1,7 +1,7 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#CustomerInfo/@Element",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#CustomerInfo/@Element",
   "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo",
-  "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(12)",
+  "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(12)",
   "odata.editLink": "CustomerInfo(12)",
   "odata.mediaEditLink": "CustomerInfo(12)/$value",
   "odata.mediaReadLink": "CustomerInfo(12)/$value",

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/CustomerInfo/12/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/CustomerInfo/12/entity.xml b/fit/src/main/resources/V30/CustomerInfo/12/entity.xml
index 3ec3ab2..e3939ef 100644
--- a/fit/src/main/resources/V30/CustomerInfo/12/entity.xml
+++ b/fit/src/main/resources/V30/CustomerInfo/12/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(12)</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(12)</id>
   <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
   <link rel="edit" title="CustomerInfo" href="CustomerInfo(12)" />
   <title />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/CustomerInfo/17/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/CustomerInfo/17/entity.full.json b/fit/src/main/resources/V30/CustomerInfo/17/entity.full.json
index fd2f5ef..c4c332f 100644
--- a/fit/src/main/resources/V30/CustomerInfo/17/entity.full.json
+++ b/fit/src/main/resources/V30/CustomerInfo/17/entity.full.json
@@ -1,7 +1,7 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#CustomerInfo/@Element",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#CustomerInfo/@Element",
   "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo",
-  "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(17)",
+  "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(17)",
   "odata.editLink": "CustomerInfo(17)",
   "odata.mediaEditLink": "CustomerInfo(17)/$value",
   "odata.mediaReadLink": "CustomerInfo(17)/$value",

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/CustomerInfo/17/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/CustomerInfo/17/entity.xml b/fit/src/main/resources/V30/CustomerInfo/17/entity.xml
index 55f71b5..f56e905 100644
--- a/fit/src/main/resources/V30/CustomerInfo/17/entity.xml
+++ b/fit/src/main/resources/V30/CustomerInfo/17/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(17)</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(17)</id>
   <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
   <link rel="edit" title="CustomerInfo" href="CustomerInfo(17)" />
   <title />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/CustomerInfo/feed.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/CustomerInfo/feed.full.json b/fit/src/main/resources/V30/CustomerInfo/feed.full.json
index 9bfa55e..78230ad 100644
--- a/fit/src/main/resources/V30/CustomerInfo/feed.full.json
+++ b/fit/src/main/resources/V30/CustomerInfo/feed.full.json
@@ -1,8 +1,8 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#CustomerInfo",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#CustomerInfo",
   "value": [{
       "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo",
-      "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(11)",
+      "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(11)",
       "odata.editLink": "CustomerInfo(11)",
       "odata.mediaEditLink": "CustomerInfo(11)/$value",
       "odata.mediaReadLink": "CustomerInfo(11)/$value",
@@ -11,7 +11,7 @@
       "Information": "\u3073\u9ed1\u30dd\u755a\u305c\u30de\u30c1\uff9d\u30cf\u6b79\u9ed1\uff5a\u30af\uff66\uff88\u30dc\u30a1\u305f\u30b0\uff66\u9ed1\u30bd\u042f\u6b79\u3074\u305b\u30dd\uff5a\u30bc\u5f0c\u305e\u305b\u305c\u30bc\u4e9c\u042f\u30af\u3042\u30bd\u4e9c\u30bc\u305d\u305b\u73f1\u30a1\u30bf\u3072\u30b0\u30bc\u7e37\u044f\u3041\u30be\u9ed1\u30de\u30df\u88f9\u66a6\u30dd\u044f"
     }, {
       "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo",
-      "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(12)",
+      "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(12)",
       "odata.editLink": "CustomerInfo(12)",
       "odata.mediaEditLink": "CustomerInfo(12)/$value",
       "odata.mediaReadLink": "CustomerInfo(12)/$value",
@@ -20,7 +20,7 @@
       "Information": "frubhbngipuuveyneosslslbtr\u00dfqjujnssgcxuuzdbeu\u00dfeaductgqbvhpussktbzzfuqvkxajzckmkzluthcjsku"
     }, {
       "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo",
-      "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(13)",
+      "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(13)",
       "odata.editLink": "CustomerInfo(13)",
       "odata.mediaEditLink": "CustomerInfo(13)/$value",
       "odata.mediaReadLink": "CustomerInfo(13)/$value",
@@ -29,7 +29,7 @@
       "Information": null
     }, {
       "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo",
-      "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(14)",
+      "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(14)",
       "odata.editLink": "CustomerInfo(14)",
       "odata.mediaEditLink": "CustomerInfo(14)/$value",
       "odata.mediaReadLink": "CustomerInfo(14)/$value",
@@ -38,7 +38,7 @@
       "Information": "\u7e37\u30a1\u30be\u6b79\uff9d\u88f9\u30df\u30df\u4e5d\u3092\u30bd\u30bf\u30dc\u0451\uff88\u307b\u3072\u30df\u30d0\u30bc\u755a\u042f\u30bd\u30dd\u4e9c\u307b\u30df\u307a\u307e\uff41\u30bf\u755a\u5f0c\u531a\u305e\u30b0\u307c\u305d\u755a\u30bd\uff9d\u30bc\u30bc\u3079\u30c1\u30c1\u305e\u30df\u30df\u30bc\u30de\u30bf\u9ed1\u30c0\u044f\u7e37\u7e37\u73f1\u305b\u4e9c\u3074\u30be\u30bd\u6b32\u531a\u30cf\u4e5d\u755a\u88f9\u30cf\uff88\u0451\u6b79\u305f\u30bc\u30bd\u30c1\u307b\u305b\u3073\u305c\uff9d\u30be\u73f1\u307c\uff88\uff66\u307c\u4e5d\u307c"
     }, {
       "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo",
-      "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(15)",
+      "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(15)",
       "odata.editLink": "CustomerInfo(15)",
       "odata.mediaEditLink": "CustomerInfo(15)/$value",
       "odata.mediaReadLink": "CustomerInfo(15)/$value",
@@ -47,7 +47,7 @@
       "Information": ""
     }, {
       "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo",
-      "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(16)",
+      "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(16)",
       "odata.editLink": "CustomerInfo(16)",
       "odata.mediaEditLink": "CustomerInfo(16)/$value",
       "odata.mediaReadLink": "CustomerInfo(16)/$value",
@@ -56,7 +56,7 @@
       "Information": "uuvoqobtxfgtnzugqjsocbhjkynsjafonxuxmcrnyldkxvpnuezalvpyhjpsmkgxacuruxtjruusxylndzxgefpscvk"
     }, {
       "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo",
-      "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(17)",
+      "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(17)",
       "odata.editLink": "CustomerInfo(17)",
       "odata.mediaEditLink": "CustomerInfo(17)/$value",
       "odata.mediaReadLink": "CustomerInfo(17)/$value",
@@ -65,7 +65,7 @@
       "Information": null
     }, {
       "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo",
-      "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(18)",
+      "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(18)",
       "odata.editLink": "CustomerInfo(18)",
       "odata.mediaEditLink": "CustomerInfo(18)/$value",
       "odata.mediaReadLink": "CustomerInfo(18)/$value",
@@ -74,7 +74,7 @@
       "Information": null
     }, {
       "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo",
-      "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(19)",
+      "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(19)",
       "odata.editLink": "CustomerInfo(19)",
       "odata.mediaEditLink": "CustomerInfo(19)/$value",
       "odata.mediaReadLink": "CustomerInfo(19)/$value",
@@ -83,7 +83,7 @@
       "Information": "ebmfxjikutjvmudp"
     }, {
       "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo",
-      "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(20)",
+      "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(20)",
       "odata.editLink": "CustomerInfo(20)",
       "odata.mediaEditLink": "CustomerInfo(20)/$value",
       "odata.mediaReadLink": "CustomerInfo(20)/$value",

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/CustomerInfo/feed.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/CustomerInfo/feed.xml b/fit/src/main/resources/V30/CustomerInfo/feed.xml
index fce61db..177a650 100644
--- a/fit/src/main/resources/V30/CustomerInfo/feed.xml
+++ b/fit/src/main/resources/V30/CustomerInfo/feed.xml
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo</id>
   <title type="text">CustomerInfo</title>
   <updated>2014-05-13T12:58:46Z</updated>
   <link rel="self" title="CustomerInfo" href="CustomerInfo" />
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(11)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(11)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="CustomerInfo" href="CustomerInfo(11)" />
     <title />
@@ -41,7 +41,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(12)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(12)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="CustomerInfo" href="CustomerInfo(12)" />
     <title />
@@ -57,7 +57,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(13)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(13)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="CustomerInfo" href="CustomerInfo(13)" />
     <title />
@@ -73,7 +73,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(14)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(14)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="CustomerInfo" href="CustomerInfo(14)" />
     <title />
@@ -89,7 +89,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(15)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(15)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="CustomerInfo" href="CustomerInfo(15)" />
     <title />
@@ -105,7 +105,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(16)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(16)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="CustomerInfo" href="CustomerInfo(16)" />
     <title />
@@ -121,7 +121,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(17)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(17)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="CustomerInfo" href="CustomerInfo(17)" />
     <title />
@@ -137,7 +137,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(18)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(18)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="CustomerInfo" href="CustomerInfo(18)" />
     <title />
@@ -153,7 +153,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(19)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(19)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="CustomerInfo" href="CustomerInfo(19)" />
     <title />
@@ -169,7 +169,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(20)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(20)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="CustomerInfo" href="CustomerInfo(20)" />
     <title />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmBooleanSet/true/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/EdmBooleanSet/true/entity.full.json b/fit/src/main/resources/V30/EdmBooleanSet/true/entity.full.json
index e7109a4..f748ee6 100644
--- a/fit/src/main/resources/V30/EdmBooleanSet/true/entity.full.json
+++ b/fit/src/main/resources/V30/EdmBooleanSet/true/entity.full.json
@@ -1 +1 @@
-{"odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmBooleanSet/@Element", "Id": true}
\ No newline at end of file
+{"odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmBooleanSet/@Element", "Id": true}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmBooleanSet/true/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/EdmBooleanSet/true/entity.xml b/fit/src/main/resources/V30/EdmBooleanSet/true/entity.xml
index 73ec1e7..42da009 100644
--- a/fit/src/main/resources/V30/EdmBooleanSet/true/entity.xml
+++ b/fit/src/main/resources/V30/EdmBooleanSet/true/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/EdmBooleanSet(true)</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/EdmBooleanSet(true)</id>
   <category term="Microsoft.Test.OData.Services.PrimitiveKeysService.EdmBoolean" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
   <link rel="edit" title="EdmBoolean" href="EdmBooleanSet(true)" />
   <title />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmByteSet/255/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/EdmByteSet/255/entity.full.json b/fit/src/main/resources/V30/EdmByteSet/255/entity.full.json
index 95fbc30..df8e75b 100644
--- a/fit/src/main/resources/V30/EdmByteSet/255/entity.full.json
+++ b/fit/src/main/resources/V30/EdmByteSet/255/entity.full.json
@@ -1 +1 @@
-{"odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmByteSet/@Element", "Id": 255}
\ No newline at end of file
+{"odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmByteSet/@Element", "Id": 255}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmByteSet/255/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/EdmByteSet/255/entity.xml b/fit/src/main/resources/V30/EdmByteSet/255/entity.xml
index 043a1ef..22f1c4a 100644
--- a/fit/src/main/resources/V30/EdmByteSet/255/entity.xml
+++ b/fit/src/main/resources/V30/EdmByteSet/255/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/EdmByteSet(255)</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/EdmByteSet(255)</id>
   <category term="Microsoft.Test.OData.Services.PrimitiveKeysService.EdmByte" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
   <link rel="edit" title="EdmByte" href="EdmByteSet(255)" />
   <title />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmDecimalSet/79228162514264337593543950335M/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/EdmDecimalSet/79228162514264337593543950335M/entity.full.json b/fit/src/main/resources/V30/EdmDecimalSet/79228162514264337593543950335M/entity.full.json
index 2251768..fd6ecb5 100644
--- a/fit/src/main/resources/V30/EdmDecimalSet/79228162514264337593543950335M/entity.full.json
+++ b/fit/src/main/resources/V30/EdmDecimalSet/79228162514264337593543950335M/entity.full.json
@@ -1 +1 @@
-{"odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmDecimalSet/@Element", "Id": "79228162514264337593543950335"}
\ No newline at end of file
+{"odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmDecimalSet/@Element", "Id": "79228162514264337593543950335"}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmDecimalSet/79228162514264337593543950335M/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/EdmDecimalSet/79228162514264337593543950335M/entity.xml b/fit/src/main/resources/V30/EdmDecimalSet/79228162514264337593543950335M/entity.xml
index 3da986b..1a57b00 100644
--- a/fit/src/main/resources/V30/EdmDecimalSet/79228162514264337593543950335M/entity.xml
+++ b/fit/src/main/resources/V30/EdmDecimalSet/79228162514264337593543950335M/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/EdmDecimalSet(79228162514264337593543950335M)</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/EdmDecimalSet(79228162514264337593543950335M)</id>
   <category term="Microsoft.Test.OData.Services.PrimitiveKeysService.EdmDecimal" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
   <link rel="edit" title="EdmDecimal" href="EdmDecimalSet(79228162514264337593543950335M)" />
   <title />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmDoubleSet/1.7976931348623157E308D/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/EdmDoubleSet/1.7976931348623157E308D/entity.full.json b/fit/src/main/resources/V30/EdmDoubleSet/1.7976931348623157E308D/entity.full.json
index 9ab801a..16c0960 100644
--- a/fit/src/main/resources/V30/EdmDoubleSet/1.7976931348623157E308D/entity.full.json
+++ b/fit/src/main/resources/V30/EdmDoubleSet/1.7976931348623157E308D/entity.full.json
@@ -1 +1 @@
-{"odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmDoubleSet/@Element", "Id": 1.7976931348623157E+308}
\ No newline at end of file
+{"odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmDoubleSet/@Element", "Id": 1.7976931348623157E+308}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmDoubleSet/1.7976931348623157E308D/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/EdmDoubleSet/1.7976931348623157E308D/entity.xml b/fit/src/main/resources/V30/EdmDoubleSet/1.7976931348623157E308D/entity.xml
index d3113ff..d7b70be 100644
--- a/fit/src/main/resources/V30/EdmDoubleSet/1.7976931348623157E308D/entity.xml
+++ b/fit/src/main/resources/V30/EdmDoubleSet/1.7976931348623157E308D/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/EdmDoubleSet(1.7976931348623157E%2B308D)</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/EdmDoubleSet(1.7976931348623157E%2B308D)</id>
   <category term="Microsoft.Test.OData.Services.PrimitiveKeysService.EdmDouble" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
   <link rel="edit" title="EdmDouble" href="EdmDoubleSet(1.7976931348623157E%2B308D)" />
   <title />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmGuidSet/guid'00000000-0000-0000-0000-000000000000'/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/EdmGuidSet/guid'00000000-0000-0000-0000-000000000000'/entity.full.json b/fit/src/main/resources/V30/EdmGuidSet/guid'00000000-0000-0000-0000-000000000000'/entity.full.json
index 5128dc9..7809c4d 100644
--- a/fit/src/main/resources/V30/EdmGuidSet/guid'00000000-0000-0000-0000-000000000000'/entity.full.json
+++ b/fit/src/main/resources/V30/EdmGuidSet/guid'00000000-0000-0000-0000-000000000000'/entity.full.json
@@ -1 +1 @@
-{"odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmGuidSet/@Element", "Id": "00000000-0000-0000-0000-000000000000"}
\ No newline at end of file
+{"odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmGuidSet/@Element", "Id": "00000000-0000-0000-0000-000000000000"}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmGuidSet/guid'00000000-0000-0000-0000-000000000000'/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/EdmGuidSet/guid'00000000-0000-0000-0000-000000000000'/entity.xml b/fit/src/main/resources/V30/EdmGuidSet/guid'00000000-0000-0000-0000-000000000000'/entity.xml
index 001f9d5..23a6a3c 100644
--- a/fit/src/main/resources/V30/EdmGuidSet/guid'00000000-0000-0000-0000-000000000000'/entity.xml
+++ b/fit/src/main/resources/V30/EdmGuidSet/guid'00000000-0000-0000-0000-000000000000'/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/EdmGuidSet(guid'00000000-0000-0000-0000-000000000000')</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/EdmGuidSet(guid'00000000-0000-0000-0000-000000000000')</id>
   <category term="Microsoft.Test.OData.Services.PrimitiveKeysService.EdmGuid" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
   <link rel="edit" title="EdmGuid" href="EdmGuidSet(guid'00000000-0000-0000-0000-000000000000')" />
   <title />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmInt16Set/32767/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/EdmInt16Set/32767/entity.full.json b/fit/src/main/resources/V30/EdmInt16Set/32767/entity.full.json
index 74716b7..b949a82 100644
--- a/fit/src/main/resources/V30/EdmInt16Set/32767/entity.full.json
+++ b/fit/src/main/resources/V30/EdmInt16Set/32767/entity.full.json
@@ -1 +1 @@
-{"odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmInt16Set/@Element", "Id": 32767}
\ No newline at end of file
+{"odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmInt16Set/@Element", "Id": 32767}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmInt16Set/32767/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/EdmInt16Set/32767/entity.xml b/fit/src/main/resources/V30/EdmInt16Set/32767/entity.xml
index 4260903..3b07b3f 100644
--- a/fit/src/main/resources/V30/EdmInt16Set/32767/entity.xml
+++ b/fit/src/main/resources/V30/EdmInt16Set/32767/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/EdmInt16Set(32767)</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/EdmInt16Set(32767)</id>
   <category term="Microsoft.Test.OData.Services.PrimitiveKeysService.EdmInt16" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
   <link rel="edit" title="EdmInt16" href="EdmInt16Set(32767)" />
   <title />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmInt32Set/-2147483648/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/EdmInt32Set/-2147483648/entity.full.json b/fit/src/main/resources/V30/EdmInt32Set/-2147483648/entity.full.json
index 5eb6337..e5d74d6 100644
--- a/fit/src/main/resources/V30/EdmInt32Set/-2147483648/entity.full.json
+++ b/fit/src/main/resources/V30/EdmInt32Set/-2147483648/entity.full.json
@@ -1 +1 @@
-{"odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmInt32Set/@Element", "Id": -2147483648}
\ No newline at end of file
+{"odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmInt32Set/@Element", "Id": -2147483648}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmInt32Set/-2147483648/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/EdmInt32Set/-2147483648/entity.xml b/fit/src/main/resources/V30/EdmInt32Set/-2147483648/entity.xml
index 3513e0f..adb1f80 100644
--- a/fit/src/main/resources/V30/EdmInt32Set/-2147483648/entity.xml
+++ b/fit/src/main/resources/V30/EdmInt32Set/-2147483648/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/EdmInt32Set(-2147483648)</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/EdmInt32Set(-2147483648)</id>
   <category term="Microsoft.Test.OData.Services.PrimitiveKeysService.EdmInt32" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
   <link rel="edit" title="EdmInt32" href="EdmInt32Set(-2147483648)" />
   <title />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmInt64Set/9223372036854775807L/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/EdmInt64Set/9223372036854775807L/entity.full.json b/fit/src/main/resources/V30/EdmInt64Set/9223372036854775807L/entity.full.json
index 25350b8..16ecc59 100644
--- a/fit/src/main/resources/V30/EdmInt64Set/9223372036854775807L/entity.full.json
+++ b/fit/src/main/resources/V30/EdmInt64Set/9223372036854775807L/entity.full.json
@@ -1 +1 @@
-{"odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmInt64Set/@Element", "Id": "9223372036854775807"}
\ No newline at end of file
+{"odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmInt64Set/@Element", "Id": "9223372036854775807"}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmInt64Set/9223372036854775807L/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/EdmInt64Set/9223372036854775807L/entity.xml b/fit/src/main/resources/V30/EdmInt64Set/9223372036854775807L/entity.xml
index cc9f351..cc70dbd 100644
--- a/fit/src/main/resources/V30/EdmInt64Set/9223372036854775807L/entity.xml
+++ b/fit/src/main/resources/V30/EdmInt64Set/9223372036854775807L/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/EdmInt64Set(9223372036854775807L)</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/EdmInt64Set(9223372036854775807L)</id>
   <category term="Microsoft.Test.OData.Services.PrimitiveKeysService.EdmInt64" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
   <link rel="edit" title="EdmInt64" href="EdmInt64Set(9223372036854775807L)" />
   <title />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmSingleSet/3.4028235E38f/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/EdmSingleSet/3.4028235E38f/entity.full.json b/fit/src/main/resources/V30/EdmSingleSet/3.4028235E38f/entity.full.json
index 78a75ff..ea8a962 100644
--- a/fit/src/main/resources/V30/EdmSingleSet/3.4028235E38f/entity.full.json
+++ b/fit/src/main/resources/V30/EdmSingleSet/3.4028235E38f/entity.full.json
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmSingleSet/@Element","Id":3.4028235E+38}
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmSingleSet/@Element","Id":3.4028235E+38}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmSingleSet/3.4028235E38f/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/EdmSingleSet/3.4028235E38f/entity.xml b/fit/src/main/resources/V30/EdmSingleSet/3.4028235E38f/entity.xml
index 88ea5ea..b7711fd 100644
--- a/fit/src/main/resources/V30/EdmSingleSet/3.4028235E38f/entity.xml
+++ b/fit/src/main/resources/V30/EdmSingleSet/3.4028235E38f/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/EdmSingleSet(3.4028235E%2B38f)</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/EdmSingleSet(3.4028235E%2B38f)</id>
   <category term="Microsoft.Test.OData.Services.PrimitiveKeysService.EdmSingle" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
   <link rel="edit" title="EdmSingle" href="EdmSingleSet(3.4028235E%2B38f)" />
   <title />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmStringSet/'$'/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/EdmStringSet/'$'/entity.full.json b/fit/src/main/resources/V30/EdmStringSet/'$'/entity.full.json
index b4cf187..4827377 100644
--- a/fit/src/main/resources/V30/EdmStringSet/'$'/entity.full.json
+++ b/fit/src/main/resources/V30/EdmStringSet/'$'/entity.full.json
@@ -1 +1 @@
-{"odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmStringSet/@Element", "Id": "$"}
\ No newline at end of file
+{"odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmStringSet/@Element", "Id": "$"}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmStringSet/'$'/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/EdmStringSet/'$'/entity.xml b/fit/src/main/resources/V30/EdmStringSet/'$'/entity.xml
index c9c8eb2..158a84c 100644
--- a/fit/src/main/resources/V30/EdmStringSet/'$'/entity.xml
+++ b/fit/src/main/resources/V30/EdmStringSet/'$'/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/EdmStringSet('%24')</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/EdmStringSet('%24')</id>
   <category term="Microsoft.Test.OData.Services.PrimitiveKeysService.EdmString" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
   <link rel="edit" title="EdmString" href="EdmStringSet('%24')" />
   <title />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmTimeSet/time'-P10675199DT2H48M5.4775808S'/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/EdmTimeSet/time'-P10675199DT2H48M5.4775808S'/entity.full.json b/fit/src/main/resources/V30/EdmTimeSet/time'-P10675199DT2H48M5.4775808S'/entity.full.json
index fd1f9a0..7ffb2d0 100644
--- a/fit/src/main/resources/V30/EdmTimeSet/time'-P10675199DT2H48M5.4775808S'/entity.full.json
+++ b/fit/src/main/resources/V30/EdmTimeSet/time'-P10675199DT2H48M5.4775808S'/entity.full.json
@@ -1 +1 @@
-{"odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmTimeSet/@Element", "Id": "-P10675199DT2H48M5.4775808S"}
\ No newline at end of file
+{"odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmTimeSet/@Element", "Id": "-P10675199DT2H48M5.4775808S"}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmTimeSet/time'-P10675199DT2H48M5.4775808S'/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/EdmTimeSet/time'-P10675199DT2H48M5.4775808S'/entity.xml b/fit/src/main/resources/V30/EdmTimeSet/time'-P10675199DT2H48M5.4775808S'/entity.xml
index 3714510..18ff458 100644
--- a/fit/src/main/resources/V30/EdmTimeSet/time'-P10675199DT2H48M5.4775808S'/entity.xml
+++ b/fit/src/main/resources/V30/EdmTimeSet/time'-P10675199DT2H48M5.4775808S'/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/EdmTimeSet(time'-P10675199DT2H48M5.4775808S')</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/EdmTimeSet(time'-P10675199DT2H48M5.4775808S')</id>
   <category term="Microsoft.Test.OData.Services.PrimitiveKeysService.EdmTime" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
   <link rel="edit" title="EdmTime" href="EdmTimeSet(time'-P10675199DT2H48M5.4775808S')" />
   <title />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/InStreamErrorGetCustomer.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/InStreamErrorGetCustomer.full.json b/fit/src/main/resources/V30/InStreamErrorGetCustomer.full.json
index 5dde3e4..cbe24c9 100644
--- a/fit/src/main/resources/V30/InStreamErrorGetCustomer.full.json
+++ b/fit/src/main/resources/V30/InStreamErrorGetCustomer.full.json
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer", "value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Customer", "odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)", "odata.editLink":"Customer(-10)", "Orders@odata.navigationLinkUrl":"Customer(-10)/Orders", "Logins@odata.navigationLinkUrl":"Customer(-10)/Logins", "Husband@odata.navigationLinkUrl":"Customer(-10)/Husband", "Wife@odata.navigationLinkUrl":"Customer(-10)/Wife", "Info@odata.navigationLinkUrl":"Customer(-10)/Info", "Thumbnail@odata.mediaEditLink":"Customer(-10)/Thumbnail", "Video@odata.mediaEditLink":"Customer(-10)/Video", "CustomerId": - 10, "Name":null, "PrimaryContactInfo":null, "BackupContactInfo@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails)", "BackupContactInfo":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetai
 ls", "EmailBag@odata.type":"Collection(Edm.String)", "EmailBag":["altname@mydomain.com"], "AlternativeNames@odata.type":"Collection(Edm.String)", "AlternativeNames":["My Alternative name"], "ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases", "AlternativeNames@odata.type":"Collection(Edm.String)", "AlternativeNames":["myAlternativeName"]}, "HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", "PhoneNumber":"8437568356834568", "Extension":"1243654265346267651534423ttrf"}, "WorkPhone":null, "MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)", "MobilePhoneBag":[]}], "Auditing":null}, {"odata.error":{"code":"", "message":{"lang":"en-US", "value":"InStreamErrorGetCustomer ThrowForSpecificCustomer error"}}}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer", "value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Customer", "odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)", "odata.editLink":"Customer(-10)", "Orders@odata.navigationLinkUrl":"Customer(-10)/Orders", "Logins@odata.navigationLinkUrl":"Customer(-10)/Logins", "Husband@odata.navigationLinkUrl":"Customer(-10)/Husband", "Wife@odata.navigationLinkUrl":"Customer(-10)/Wife", "Info@odata.navigationLinkUrl":"Customer(-10)/Info", "Thumbnail@odata.mediaEditLink":"Customer(-10)/Thumbnail", "Video@odata.mediaEditLink":"Customer(-10)/Video", "CustomerId": - 10, "Name":null, "PrimaryContactInfo":null, "BackupContactInfo@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails)", "BackupContactInfo":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDet
 ails", "EmailBag@odata.type":"Collection(Edm.String)", "EmailBag":["altname@mydomain.com"], "AlternativeNames@odata.type":"Collection(Edm.String)", "AlternativeNames":["My Alternative name"], "ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases", "AlternativeNames@odata.type":"Collection(Edm.String)", "AlternativeNames":["myAlternativeName"]}, "HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", "PhoneNumber":"8437568356834568", "Extension":"1243654265346267651534423ttrf"}, "WorkPhone":null, "MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)", "MobilePhoneBag":[]}], "Auditing":null}, {"odata.error":{"code":"", "message":{"lang":"en-US", "value":"InStreamErrorGetCustomer ThrowForSpecificCustomer error"}}}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/InStreamErrorGetCustomer.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/InStreamErrorGetCustomer.xml b/fit/src/main/resources/V30/InStreamErrorGetCustomer.xml
index 3076a49..ee8b406 100644
--- a/fit/src/main/resources/V30/InStreamErrorGetCustomer.xml
+++ b/fit/src/main/resources/V30/InStreamErrorGetCustomer.xml
@@ -19,15 +19,15 @@
   under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom"
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom"
       xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"
       xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/InStreamErrorGetCustomer</id>
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/InStreamErrorGetCustomer</id>
   <title type="text">InStreamErrorGetCustomer</title>
   <updated>2014-02-12T14:03:09Z</updated>
   <link rel="self" title="InStreamErrorGetCustomer" href="InStreamErrorGetCustomer" />
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Customer" href="Customer(-10)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders" type="application/atom+xml;type=feed"

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Login/'3'/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Login/'3'/entity.full.json b/fit/src/main/resources/V30/Login/'3'/entity.full.json
index 4de8e2e..c16bd10 100644
--- a/fit/src/main/resources/V30/Login/'3'/entity.full.json
+++ b/fit/src/main/resources/V30/Login/'3'/entity.full.json
@@ -1,7 +1,7 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Login/@Element",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Login/@Element",
   "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Login",
-  "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Login('3')",
+  "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Login('3')",
   "odata.editLink": "Login('3')",
   "Customer@odata.navigationLinkUrl": "Login('3')/Customer",
   "LastLogin@odata.navigationLinkUrl": "Login('3')/LastLogin",

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Login/'3'/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Login/'3'/entity.xml b/fit/src/main/resources/V30/Login/'3'/entity.xml
index be452d7..4abdc72 100644
--- a/fit/src/main/resources/V30/Login/'3'/entity.xml
+++ b/fit/src/main/resources/V30/Login/'3'/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Login('3')</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Login('3')</id>
   <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Login" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
   <link rel="edit" title="Login" href="Login('3')" />
   <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Customer" type="application/atom+xml;type=entry" title="Customer" href="Login('3')/Customer" />


[08/20] [OLINGO-377] Removing unused cargo properties, upgrading Tomcat, renaming cargo.servlet.port to tomcat.servlet.port

Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Message/1 -10/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Message/1 -10/entity.full.json b/fit/src/main/resources/V30/Message/1 -10/entity.full.json
index 9ead13b..ab31cdb 100644
--- a/fit/src/main/resources/V30/Message/1 -10/entity.full.json	
+++ b/fit/src/main/resources/V30/Message/1 -10/entity.full.json	
@@ -1,7 +1,7 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Message/@Element",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Message/@Element",
   "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Message",
-  "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='1',MessageId=-10)",
+  "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='1',MessageId=-10)",
   "odata.editLink": "Message(FromUsername='1',MessageId=-10)",
   "Sender@odata.navigationLinkUrl": "Message(FromUsername='1',MessageId=-10)/Sender",
   "Recipient@odata.navigationLinkUrl": "Message(FromUsername='1',MessageId=-10)/Recipient",

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Message/1 -10/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Message/1 -10/entity.xml b/fit/src/main/resources/V30/Message/1 -10/entity.xml
index 4a5b927..4496671 100644
--- a/fit/src/main/resources/V30/Message/1 -10/entity.xml	
+++ b/fit/src/main/resources/V30/Message/1 -10/entity.xml	
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='1',MessageId=-10)</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='1',MessageId=-10)</id>
   <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Message" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
   <link rel="edit" title="Message" href="Message(FromUsername='1',MessageId=-10)" />
   <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Sender" type="application/atom+xml;type=entry" title="Sender" href="Message(FromUsername='1',MessageId=-10)/Sender" />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Message/feed.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Message/feed.xml b/fit/src/main/resources/V30/Message/feed.xml
index abed8fd..8084f9f 100644
--- a/fit/src/main/resources/V30/Message/feed.xml
+++ b/fit/src/main/resources/V30/Message/feed.xml
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Message</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Message</id>
   <title type="text">Message</title>
   <updated>2014-05-08T09:55:45Z</updated>
   <link rel="self" title="Message" href="Message" />
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='1',MessageId=-10)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='1',MessageId=-10)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Message" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Message" href="Message(FromUsername='1',MessageId=-10)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Sender" type="application/atom+xml;type=entry" title="Sender" href="Message(FromUsername='1',MessageId=-10)/Sender" />
@@ -50,7 +50,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='2',MessageId=-9)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='2',MessageId=-9)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Message" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Message" href="Message(FromUsername='2',MessageId=-9)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Sender" type="application/atom+xml;type=entry" title="Sender" href="Message(FromUsername='2',MessageId=-9)/Sender" />
@@ -75,7 +75,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='3',MessageId=-8)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='3',MessageId=-8)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Message" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Message" href="Message(FromUsername='3',MessageId=-8)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Sender" type="application/atom+xml;type=entry" title="Sender" href="Message(FromUsername='3',MessageId=-8)/Sender" />
@@ -100,7 +100,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='4',MessageId=-7)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='4',MessageId=-7)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Message" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Message" href="Message(FromUsername='4',MessageId=-7)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Sender" type="application/atom+xml;type=entry" title="Sender" href="Message(FromUsername='4',MessageId=-7)/Sender" />
@@ -125,7 +125,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='5',MessageId=-6)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='5',MessageId=-6)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Message" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Message" href="Message(FromUsername='5',MessageId=-6)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Sender" type="application/atom+xml;type=entry" title="Sender" href="Message(FromUsername='5',MessageId=-6)/Sender" />
@@ -150,7 +150,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='6',MessageId=-5)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='6',MessageId=-5)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Message" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Message" href="Message(FromUsername='6',MessageId=-5)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Sender" type="application/atom+xml;type=entry" title="Sender" href="Message(FromUsername='6',MessageId=-5)/Sender" />
@@ -175,7 +175,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='7',MessageId=-4)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='7',MessageId=-4)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Message" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Message" href="Message(FromUsername='7',MessageId=-4)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Sender" type="application/atom+xml;type=entry" title="Sender" href="Message(FromUsername='7',MessageId=-4)/Sender" />
@@ -200,7 +200,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='8',MessageId=-3)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='8',MessageId=-3)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Message" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Message" href="Message(FromUsername='8',MessageId=-3)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Sender" type="application/atom+xml;type=entry" title="Sender" href="Message(FromUsername='8',MessageId=-3)/Sender" />
@@ -225,7 +225,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='9',MessageId=-2)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='9',MessageId=-2)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Message" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Message" href="Message(FromUsername='9',MessageId=-2)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Sender" type="application/atom+xml;type=entry" title="Sender" href="Message(FromUsername='9',MessageId=-2)/Sender" />
@@ -250,7 +250,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='10',MessageId=-1)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='10',MessageId=-1)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Message" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Message" href="Message(FromUsername='10',MessageId=-1)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Sender" type="application/atom+xml;type=entry" title="Sender" href="Message(FromUsername='10',MessageId=-1)/Sender" />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Order/-10/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Order/-10/entity.full.json b/fit/src/main/resources/V30/Order/-10/entity.full.json
index 5db1fd9..57cfdea 100644
--- a/fit/src/main/resources/V30/Order/-10/entity.full.json
+++ b/fit/src/main/resources/V30/Order/-10/entity.full.json
@@ -1,7 +1,7 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Order/@Element",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Order/@Element",
   "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Order",
-  "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Order(-10)",
+  "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Order(-10)",
   "odata.editLink": "Order(-10)",
   "Login@odata.navigationLinkUrl": "Order(-10)/Login",
   "Customer@odata.navigationLinkUrl": "Order(-10)/Customer",

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Order/-10/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Order/-10/entity.xml b/fit/src/main/resources/V30/Order/-10/entity.xml
index 3f38e46..f3b64c6 100644
--- a/fit/src/main/resources/V30/Order/-10/entity.xml
+++ b/fit/src/main/resources/V30/Order/-10/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Order(-10)</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Order(-10)</id>
   <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Order" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
   <link rel="edit" title="Order" href="Order(-10)" />
   <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Login" type="application/atom+xml;type=entry" title="Login" href="Order(-10)/Login" />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Order/-7/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Order/-7/entity.full.json b/fit/src/main/resources/V30/Order/-7/entity.full.json
index 33331e7..58d6991 100644
--- a/fit/src/main/resources/V30/Order/-7/entity.full.json
+++ b/fit/src/main/resources/V30/Order/-7/entity.full.json
@@ -1,7 +1,7 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Order/@Element",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Order/@Element",
   "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Order",
-  "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Order(-7)",
+  "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Order(-7)",
   "odata.editLink": "Order(-7)",
   "Login@odata.navigationLinkUrl": "Order(-7)/Login",
   "Customer@odata.navigationLinkUrl": "Order(-7)/Customer",

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Order/-7/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Order/-7/entity.xml b/fit/src/main/resources/V30/Order/-7/entity.xml
index d9ca2e3..480e79c 100644
--- a/fit/src/main/resources/V30/Order/-7/entity.xml
+++ b/fit/src/main/resources/V30/Order/-7/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Order(-7)</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Order(-7)</id>
   <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Order" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
   <link rel="edit" title="Order" href="Order(-7)" />
   <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Login" type="application/atom+xml;type=entry" title="Login" href="Order(-7)/Login" />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Order/-8/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Order/-8/entity.full.json b/fit/src/main/resources/V30/Order/-8/entity.full.json
index 56596cb..6ffd5f6 100644
--- a/fit/src/main/resources/V30/Order/-8/entity.full.json
+++ b/fit/src/main/resources/V30/Order/-8/entity.full.json
@@ -1,7 +1,7 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Order/@Element",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Order/@Element",
   "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Order",
-  "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Order(-8)",
+  "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Order(-8)",
   "odata.editLink": "Order(-8)",
   "Login@odata.navigationLinkUrl": "Order(-8)/Login",
   "Customer@odata.navigationLinkUrl": "Order(-8)/Customer",

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Order/-8/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Order/-8/entity.xml b/fit/src/main/resources/V30/Order/-8/entity.xml
index bd2afe7..fb751fb 100644
--- a/fit/src/main/resources/V30/Order/-8/entity.xml
+++ b/fit/src/main/resources/V30/Order/-8/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Order(-8)</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Order(-8)</id>
   <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Order" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
   <link rel="edit" title="Order" href="Order(-8)" />
   <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Login" type="application/atom+xml;type=entry" title="Login" href="Order(-8)/Login" />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Order/-9/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Order/-9/entity.full.json b/fit/src/main/resources/V30/Order/-9/entity.full.json
index 1df38ce..3356d87 100644
--- a/fit/src/main/resources/V30/Order/-9/entity.full.json
+++ b/fit/src/main/resources/V30/Order/-9/entity.full.json
@@ -1,7 +1,7 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Order/@Element",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Order/@Element",
   "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Order",
-  "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Order(-9)",
+  "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Order(-9)",
   "odata.editLink": "Order(-9)",
   "Login@odata.navigationLinkUrl": "Order(-9)/Login",
   "Customer@odata.navigationLinkUrl": "Order(-9)/Customer",

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Order/-9/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Order/-9/entity.xml b/fit/src/main/resources/V30/Order/-9/entity.xml
index c8bb42c..996042c 100644
--- a/fit/src/main/resources/V30/Order/-9/entity.xml
+++ b/fit/src/main/resources/V30/Order/-9/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Order(-9)</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Order(-9)</id>
   <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Order" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
   <link rel="edit" title="Order" href="Order(-9)" />
   <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Login" type="application/atom+xml;type=entry" title="Login" href="Order(-9)/Login" />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/OrderLine/-10 -10/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/OrderLine/-10 -10/entity.full.json b/fit/src/main/resources/V30/OrderLine/-10 -10/entity.full.json
index 40f3b67..fe91a53 100644
--- a/fit/src/main/resources/V30/OrderLine/-10 -10/entity.full.json	
+++ b/fit/src/main/resources/V30/OrderLine/-10 -10/entity.full.json	
@@ -1,7 +1,7 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#OrderLine/@Element",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#OrderLine/@Element",
   "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.OrderLine",
-  "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/OrderLine(OrderId=-10,ProductId=-10)",
+  "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/OrderLine(OrderId=-10,ProductId=-10)",
   "odata.etag": "W/\"'lhvyagabhicdpqiqoxpztssvacdkxvoxdzksdsbykdrvnyg'\"",
           "odata.editLink": "OrderLine(OrderId=-10,ProductId=-10)",
   "Order@odata.navigationLinkUrl": "OrderLine(OrderId=-10,ProductId=-10)/Order",

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/OrderLine/-10 -10/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/OrderLine/-10 -10/entity.xml b/fit/src/main/resources/V30/OrderLine/-10 -10/entity.xml
index e24f731..7a54080 100644
--- a/fit/src/main/resources/V30/OrderLine/-10 -10/entity.xml	
+++ b/fit/src/main/resources/V30/OrderLine/-10 -10/entity.xml	
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml" m:etag="W/&quot;'lhvyagabhicdpqiqoxpztssvacdkxvoxdzksdsbykdrvnyg'&quot;">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/OrderLine(OrderId=-10,ProductId=-10)</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml" m:etag="W/&quot;'lhvyagabhicdpqiqoxpztssvacdkxvoxdzksdsbykdrvnyg'&quot;">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/OrderLine(OrderId=-10,ProductId=-10)</id>
   <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.OrderLine" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
   <link rel="edit" title="OrderLine" href="OrderLine(OrderId=-10,ProductId=-10)" />
   <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Order" type="application/atom+xml;type=entry" title="Order" href="OrderLine(OrderId=-10,ProductId=-10)/Order" />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Person/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor/feed.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Person/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor/feed.full.json b/fit/src/main/resources/V30/Person/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor/feed.full.json
index f514933..88a9805 100644
--- a/fit/src/main/resources/V30/Person/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor/feed.full.json
+++ b/fit/src/main/resources/V30/Person/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor/feed.full.json
@@ -1,10 +1,10 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Person/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Person/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor",
   "value":
           [
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(1)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(1)",
               "odata.editLink": "Person(1)/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor",
               "PersonMetadata@odata.navigationLinkUrl": "Person(1)/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor/PersonMetadata",
               "PersonId": 1,
@@ -16,7 +16,7 @@
             },
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(2)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(2)",
               "odata.editLink": "Person(2)/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor",
               "PersonMetadata@odata.navigationLinkUrl": "Person(2)/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor/PersonMetadata",
               "PersonId": 2,

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Person/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor/feed.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Person/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor/feed.xml b/fit/src/main/resources/V30/Person/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor/feed.xml
index 458cb0d..a94f1bc 100644
--- a/fit/src/main/resources/V30/Person/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor/feed.xml
+++ b/fit/src/main/resources/V30/Person/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor/feed.xml
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor</id>
   <title type="text">Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor</title>
   <updated>2014-05-08T12:20:11Z</updated>
   <link rel="self" title="Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor" href="Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor" />
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(1)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(1)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Contractor" href="Person(1)/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/PersonMetadata" type="application/atom+xml;type=feed" title="PersonMetadata" href="Person(1)/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor/PersonMetadata" />
@@ -46,7 +46,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(2)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(2)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Contractor" href="Person(2)/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/PersonMetadata" type="application/atom+xml;type=feed" title="PersonMetadata" href="Person(2)/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor/PersonMetadata" />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Person/feed.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Person/feed.xml b/fit/src/main/resources/V30/Person/feed.xml
index db7d834..a79f766 100644
--- a/fit/src/main/resources/V30/Person/feed.xml
+++ b/fit/src/main/resources/V30/Person/feed.xml
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person</id>
   <title type="text">Person</title>
   <updated>2014-05-08T12:17:04Z</updated>
   <link rel="self" title="Person" href="Person" />
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-10)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-10)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Person" href="Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/PersonMetadata" type="application/atom+xml;type=feed" title="PersonMetadata" href="Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata" />
@@ -36,7 +36,7 @@
     <author>
       <name />
     </author>
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack" title="Sack" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack" title="Sack" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" />
     <content type="application/xml">
       <m:properties>
         <d:PersonId m:type="Edm.Int32">-10</d:PersonId>
@@ -51,7 +51,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-9)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-9)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Person" href="Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/PersonMetadata" type="application/atom+xml;type=feed" title="PersonMetadata" href="Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata" />
@@ -62,7 +62,7 @@
     <author>
       <name />
     </author>
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack" title="Sack" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack" title="Sack" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" />
     <content type="application/xml">
       <m:properties>
         <d:PersonId m:type="Edm.Int32">-9</d:PersonId>
@@ -77,7 +77,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-8)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-8)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Person" href="Person(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/PersonMetadata" type="application/atom+xml;type=feed" title="PersonMetadata" href="Person(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata" />
@@ -88,7 +88,7 @@
     <author>
       <name />
     </author>
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack" title="Sack" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack" title="Sack" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" />
     <content type="application/xml">
       <m:properties>
         <d:PersonId m:type="Edm.Int32">-8</d:PersonId>
@@ -103,7 +103,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-7)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-7)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Person" href="Person(-7)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/PersonMetadata" type="application/atom+xml;type=feed" title="PersonMetadata" href="Person(-7)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata" />
@@ -114,7 +114,7 @@
     <author>
       <name />
     </author>
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack" title="Sack" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-7)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack" title="Sack" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-7)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" />
     <content type="application/xml">
       <m:properties>
         <d:PersonId m:type="Edm.Int32">-7</d:PersonId>
@@ -129,7 +129,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-6)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-6)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Employee" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Person" href="Person(-6)/Microsoft.Test.OData.Services.AstoriaDefaultService.Employee" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/PersonMetadata" type="application/atom+xml;type=feed" title="PersonMetadata" href="Person(-6)/Microsoft.Test.OData.Services.AstoriaDefaultService.Employee/PersonMetadata" />
@@ -139,7 +139,7 @@
     <author>
       <name />
     </author>
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack" title="Sack" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-6)/Microsoft.Test.OData.Services.AstoriaDefaultService.Employee/Sack" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack" title="Sack" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-6)/Microsoft.Test.OData.Services.AstoriaDefaultService.Employee/Sack" />
     <content type="application/xml">
       <m:properties>
         <d:PersonId m:type="Edm.Int32">-6</d:PersonId>
@@ -151,7 +151,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-5)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-5)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Person" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Person" href="Person(-5)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/PersonMetadata" type="application/atom+xml;type=feed" title="PersonMetadata" href="Person(-5)/PersonMetadata" />
@@ -168,7 +168,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-4)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-4)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Person" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Person" href="Person(-4)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/PersonMetadata" type="application/atom+xml;type=feed" title="PersonMetadata" href="Person(-4)/PersonMetadata" />
@@ -185,7 +185,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-3)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-3)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Employee" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Person" href="Person(-3)/Microsoft.Test.OData.Services.AstoriaDefaultService.Employee" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/PersonMetadata" type="application/atom+xml;type=feed" title="PersonMetadata" href="Person(-3)/Microsoft.Test.OData.Services.AstoriaDefaultService.Employee/PersonMetadata" />
@@ -195,7 +195,7 @@
     <author>
       <name />
     </author>
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack" title="Sack" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-3)/Microsoft.Test.OData.Services.AstoriaDefaultService.Employee/Sack" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack" title="Sack" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-3)/Microsoft.Test.OData.Services.AstoriaDefaultService.Employee/Sack" />
     <content type="application/xml">
       <m:properties>
         <d:PersonId m:type="Edm.Int32">-3</d:PersonId>
@@ -207,7 +207,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-2)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-2)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Person" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Person" href="Person(-2)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/PersonMetadata" type="application/atom+xml;type=feed" title="PersonMetadata" href="Person(-2)/PersonMetadata" />
@@ -224,7 +224,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-1)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-1)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Person" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Person" href="Person(-1)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/PersonMetadata" type="application/atom+xml;type=feed" title="PersonMetadata" href="Person(-1)/PersonMetadata" />
@@ -241,7 +241,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(0)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(0)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Employee" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Person" href="Person(0)/Microsoft.Test.OData.Services.AstoriaDefaultService.Employee" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/PersonMetadata" type="application/atom+xml;type=feed" title="PersonMetadata" href="Person(0)/Microsoft.Test.OData.Services.AstoriaDefaultService.Employee/PersonMetadata" />
@@ -251,7 +251,7 @@
     <author>
       <name />
     </author>
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack" title="Sack" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(0)/Microsoft.Test.OData.Services.AstoriaDefaultService.Employee/Sack" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack" title="Sack" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(0)/Microsoft.Test.OData.Services.AstoriaDefaultService.Employee/Sack" />
     <content type="application/xml">
       <m:properties>
         <d:PersonId m:type="Edm.Int32">0</d:PersonId>
@@ -263,7 +263,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(1)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(1)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Person" href="Person(1)/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/PersonMetadata" type="application/atom+xml;type=feed" title="PersonMetadata" href="Person(1)/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor/PersonMetadata" />
@@ -284,7 +284,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(2)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(2)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Person" href="Person(2)/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/PersonMetadata" type="application/atom+xml;type=feed" title="PersonMetadata" href="Person(2)/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor/PersonMetadata" />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Person/filter/PersonId sub 2 lt -10.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Person/filter/PersonId sub 2 lt -10.full.json b/fit/src/main/resources/V30/Person/filter/PersonId sub 2 lt -10.full.json
index 28a62a1..38f2871 100644
--- a/fit/src/main/resources/V30/Person/filter/PersonId sub 2 lt -10.full.json	
+++ b/fit/src/main/resources/V30/Person/filter/PersonId sub 2 lt -10.full.json	
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Person","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-10)","odata.editLink":"Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","PersonMetadata@odata.navigationLinkUrl":"Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata","Manager@odata.navigationLinkUrl":"Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Manager","Car@odata.navigationLinkUrl":"Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Car","#DefaultContainer.Sack":{"title":"Sack","target":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack"},"PersonI
 d":-10,"Name":"\u307a\u30bd\u305e\u5f0c\u30bf\u30a1\u531a\u30bf\u307d\u3072\u30cf\u6b32\u3074\u307b\u531a\u305b\u307e\u305f\u30d0\u30dc\u30c1\u30de\u531a\u3041\u30be\u30bd\u30c1\u3041\u042f\u305d\u3041\u30df\u044f\u66a6\u755a\u30dc\u6b79\u3072\u042f\u307b\u30c0\u30c1\u305d\u042f\u305b\u307d\u30bc\u30dd\u042f\u30c1\uff41\u305f\u6b79\u305f\u3092\u30bf\u30de\u305b\u3092\u305b\u531a\u30df\u30bf\u3072\u305c\u755a\u66a6\u30b0\u30af\u3072\u307b\u305d\u305f\u30b0\u305b\u044f\u30c1\u531a\uff66\u307a\u3041\u88f9\u3041\u30bd\u3073\u9ed1\u88f9\u7e37","ManagersPersonId":47,"Salary":4091,"Title":"\u307a\u30bd\u042f\u3092\u6b79\u30a1\u6b32\u042f\u30bd\u3042\u307d\uff66\uff41\u305d\u305b\u044f\u7e37\u30dd\u305b\uff88\u3074\uff66\u9ed1\u755a\u044f\u307b\u30be\u307b\u3079\uff41\u307b\uff88\u30d0\u755a\u4e5d\u4e9c\u0451\u30cf\u3079\u305c\u30a1\u88f9\u30bd\u6b32\u307b\u30b0\uff9d\u30dd\u5f0c\u9ed1\u30c1\u3073\uff66\uff88\u30df\u307c\u30bf\u305f\u307e\u30d0\u6b79\u30c1\u66a6\u30bf\u6b32\u3092\u30af\u304
 1\u30af\u3093\uff9d\u307e\u30bd\uff88\u30dc\u307e\u30bf\u305c\u30dc\u30dd\u307b\u6b79\u30bd\u3092\u30a1\u3042\u044f\u30dc\u305f\u30be\u307b","CarsVIN":-1911530027,"Bonus":-37730565,"IsFullyVested":false},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-9)","odata.editLink":"Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","PersonMetadata@odata.navigationLinkUrl":"Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata","Manager@odata.navigationLinkUrl":"Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Manager","Car@odata.navigationLinkUrl":"Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Car","#DefaultContainer.Sack":{"title":"Sack","target":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-9)/Micr
 osoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack"},"PersonId":-9,"Name":"stiuictvznkcvledkjnnluuvkmyumyfduxmjqpfnbjqgmvhuiytjbjinzbfmf","ManagersPersonId":-8429952,"Salary":-2147483648,"Title":"\u30d0\u30dc\u6b79\u305d\u042f\u30bc\u3041\u30be\u30bd\u3093\u30dc\u305f\u305d\u4e5d\u30dc\u3072\u73f1\u3042\u30de\u66a6\uff9d\u30bd\u30bd\u30a1\u531a\u307c\u307b\u305f\u30dc\u305c\u30af\u531a\u30bd\u755a\u30be\u3093\uff41\u30a1\u3079\u3042\u044f\u305b\u30bf\u7e37\u30de\u30bc\u3079\u307a\u30de\u7e37\u30bc\u305e\u30bc\u305f\uff5a\u305f\u305f\u30bf\u30a1\u4e5d\u3072\u9ed1\u7e37\u30af\uff66\u6b79\u30de\u307b\u307c\u3092\u307a\u30bf\u755a\u30dc\u5f0c\u9ed1\uff5a\u30cf\u30dc\u30af\u0451\u044f\u30bd\u30df\u30de\u307b\u30bc\u307e\uff41\u30a1\u3072\u30bc\uff9d\u30bd\u9ed1","CarsVIN":-2147483648,"Bonus":-2147483648,"IsFullyVested":false}]}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Person","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-10)","odata.editLink":"Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","PersonMetadata@odata.navigationLinkUrl":"Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata","Manager@odata.navigationLinkUrl":"Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Manager","Car@odata.navigationLinkUrl":"Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Car","#DefaultContainer.Sack":{"title":"Sack","target":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack"},"Pers
 onId":-10,"Name":"\u307a\u30bd\u305e\u5f0c\u30bf\u30a1\u531a\u30bf\u307d\u3072\u30cf\u6b32\u3074\u307b\u531a\u305b\u307e\u305f\u30d0\u30dc\u30c1\u30de\u531a\u3041\u30be\u30bd\u30c1\u3041\u042f\u305d\u3041\u30df\u044f\u66a6\u755a\u30dc\u6b79\u3072\u042f\u307b\u30c0\u30c1\u305d\u042f\u305b\u307d\u30bc\u30dd\u042f\u30c1\uff41\u305f\u6b79\u305f\u3092\u30bf\u30de\u305b\u3092\u305b\u531a\u30df\u30bf\u3072\u305c\u755a\u66a6\u30b0\u30af\u3072\u307b\u305d\u305f\u30b0\u305b\u044f\u30c1\u531a\uff66\u307a\u3041\u88f9\u3041\u30bd\u3073\u9ed1\u88f9\u7e37","ManagersPersonId":47,"Salary":4091,"Title":"\u307a\u30bd\u042f\u3092\u6b79\u30a1\u6b32\u042f\u30bd\u3042\u307d\uff66\uff41\u305d\u305b\u044f\u7e37\u30dd\u305b\uff88\u3074\uff66\u9ed1\u755a\u044f\u307b\u30be\u307b\u3079\uff41\u307b\uff88\u30d0\u755a\u4e5d\u4e9c\u0451\u30cf\u3079\u305c\u30a1\u88f9\u30bd\u6b32\u307b\u30b0\uff9d\u30dd\u5f0c\u9ed1\u30c1\u3073\uff66\uff88\u30df\u307c\u30bf\u305f\u307e\u30d0\u6b79\u30c1\u66a6\u30bf\u6b32\u3092\u30af\u
 3041\u30af\u3093\uff9d\u307e\u30bd\uff88\u30dc\u307e\u30bf\u305c\u30dc\u30dd\u307b\u6b79\u30bd\u3092\u30a1\u3042\u044f\u30dc\u305f\u30be\u307b","CarsVIN":-1911530027,"Bonus":-37730565,"IsFullyVested":false},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-9)","odata.editLink":"Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","PersonMetadata@odata.navigationLinkUrl":"Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata","Manager@odata.navigationLinkUrl":"Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Manager","Car@odata.navigationLinkUrl":"Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Car","#DefaultContainer.Sack":{"title":"Sack","target":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-9)
 /Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack"},"PersonId":-9,"Name":"stiuictvznkcvledkjnnluuvkmyumyfduxmjqpfnbjqgmvhuiytjbjinzbfmf","ManagersPersonId":-8429952,"Salary":-2147483648,"Title":"\u30d0\u30dc\u6b79\u305d\u042f\u30bc\u3041\u30be\u30bd\u3093\u30dc\u305f\u305d\u4e5d\u30dc\u3072\u73f1\u3042\u30de\u66a6\uff9d\u30bd\u30bd\u30a1\u531a\u307c\u307b\u305f\u30dc\u305c\u30af\u531a\u30bd\u755a\u30be\u3093\uff41\u30a1\u3079\u3042\u044f\u305b\u30bf\u7e37\u30de\u30bc\u3079\u307a\u30de\u7e37\u30bc\u305e\u30bc\u305f\uff5a\u305f\u305f\u30bf\u30a1\u4e5d\u3072\u9ed1\u7e37\u30af\uff66\u6b79\u30de\u307b\u307c\u3092\u307a\u30bf\u755a\u30dc\u5f0c\u9ed1\uff5a\u30cf\u30dc\u30af\u0451\u044f\u30bd\u30df\u30de\u307b\u30bc\u307e\uff41\u30a1\u3072\u30bc\uff9d\u30bd\u9ed1","CarsVIN":-2147483648,"Bonus":-2147483648,"IsFullyVested":false}]}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Person/filter/PersonId sub 2 lt -10.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Person/filter/PersonId sub 2 lt -10.xml b/fit/src/main/resources/V30/Person/filter/PersonId sub 2 lt -10.xml
index 061afe7..41a1393 100644
--- a/fit/src/main/resources/V30/Person/filter/PersonId sub 2 lt -10.xml	
+++ b/fit/src/main/resources/V30/Person/filter/PersonId sub 2 lt -10.xml	
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person</id>
   <title type="text">Person</title>
   <updated>2014-02-13T14:31:04Z</updated>
   <link rel="self" title="Person" href="Person" />
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-10)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-10)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Person" href="Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/PersonMetadata" type="application/atom+xml;type=feed" title="PersonMetadata" href="Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata" />
@@ -36,7 +36,7 @@
     <author>
       <name />
     </author>
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack" title="Sack" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack" title="Sack" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" />
     <content type="application/xml">
       <m:properties>
         <d:PersonId m:type="Edm.Int32">-10</d:PersonId>
@@ -51,7 +51,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-9)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-9)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Person" href="Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/PersonMetadata" type="application/atom+xml;type=feed" title="PersonMetadata" href="Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata" />
@@ -62,7 +62,7 @@
     <author>
       <name />
     </author>
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack" title="Sack" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack" title="Sack" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" />
     <content type="application/xml">
       <m:properties>
         <d:PersonId m:type="Edm.Int32">-9</d:PersonId>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Person/filter/isof('Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee').full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Person/filter/isof('Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee').full.json b/fit/src/main/resources/V30/Person/filter/isof('Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee').full.json
index 0a72a2c..59eb224 100644
--- a/fit/src/main/resources/V30/Person/filter/isof('Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee').full.json
+++ b/fit/src/main/resources/V30/Person/filter/isof('Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee').full.json
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Person","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-10)","odata.editLink":"Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","PersonMetadata@odata.navigationLinkUrl":"Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata","Manager@odata.navigationLinkUrl":"Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Manager","Car@odata.navigationLinkUrl":"Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Car","#DefaultContainer.Sack":{"title":"Sack","target":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack"},"PersonI
 d":-10,"Name":"\u307a\u30bd\u305e\u5f0c\u30bf\u30a1\u531a\u30bf\u307d\u3072\u30cf\u6b32\u3074\u307b\u531a\u305b\u307e\u305f\u30d0\u30dc\u30c1\u30de\u531a\u3041\u30be\u30bd\u30c1\u3041\u042f\u305d\u3041\u30df\u044f\u66a6\u755a\u30dc\u6b79\u3072\u042f\u307b\u30c0\u30c1\u305d\u042f\u305b\u307d\u30bc\u30dd\u042f\u30c1\uff41\u305f\u6b79\u305f\u3092\u30bf\u30de\u305b\u3092\u305b\u531a\u30df\u30bf\u3072\u305c\u755a\u66a6\u30b0\u30af\u3072\u307b\u305d\u305f\u30b0\u305b\u044f\u30c1\u531a\uff66\u307a\u3041\u88f9\u3041\u30bd\u3073\u9ed1\u88f9\u7e37","ManagersPersonId":47,"Salary":4124,"Title":"\u307a\u30bd\u042f\u3092\u6b79\u30a1\u6b32\u042f\u30bd\u3042\u307d\uff66\uff41\u305d\u305b\u044f\u7e37\u30dd\u305b\uff88\u3074\uff66\u9ed1\u755a\u044f\u307b\u30be\u307b\u3079\uff41\u307b\uff88\u30d0\u755a\u4e5d\u4e9c\u0451\u30cf\u3079\u305c\u30a1\u88f9\u30bd\u6b32\u307b\u30b0\uff9d\u30dd\u5f0c\u9ed1\u30c1\u3073\uff66\uff88\u30df\u307c\u30bf\u305f\u307e\u30d0\u6b79\u30c1\u66a6\u30bf\u6b32\u3092\u30af\u304
 1\u30af\u3093\uff9d\u307e\u30bd\uff88\u30dc\u307e\u30bf\u305c\u30dc\u30dd\u307b\u6b79\u30bd\u3092\u30a1\u3042\u044f\u30dc\u305f\u30be\u307b","CarsVIN":-1911530027,"Bonus":-37730565,"IsFullyVested":false},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-9)","odata.editLink":"Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","PersonMetadata@odata.navigationLinkUrl":"Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata","Manager@odata.navigationLinkUrl":"Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Manager","Car@odata.navigationLinkUrl":"Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Car","#DefaultContainer.Sack":{"title":"Sack","target":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-9)/Micr
 osoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack"},"PersonId":-9,"Name":"stiuictvznkcvledkjnnluuvkmyumyfduxmjqpfnbjqgmvhuiytjbjinzbfmf","ManagersPersonId":-8429952,"Salary":-2147483615,"Title":"\u30d0\u30dc\u6b79\u305d\u042f\u30bc\u3041\u30be\u30bd\u3093\u30dc\u305f\u305d\u4e5d\u30dc\u3072\u73f1\u3042\u30de\u66a6\uff9d\u30bd\u30bd\u30a1\u531a\u307c\u307b\u305f\u30dc\u305c\u30af\u531a\u30bd\u755a\u30be\u3093\uff41\u30a1\u3079\u3042\u044f\u305b\u30bf\u7e37\u30de\u30bc\u3079\u307a\u30de\u7e37\u30bc\u305e\u30bc\u305f\uff5a\u305f\u305f\u30bf\u30a1\u4e5d\u3072\u9ed1\u7e37\u30af\uff66\u6b79\u30de\u307b\u307c\u3092\u307a\u30bf\u755a\u30dc\u5f0c\u9ed1\uff5a\u30cf\u30dc\u30af\u0451\u044f\u30bd\u30df\u30de\u307b\u30bc\u307e\uff41\u30a1\u3072\u30bc\uff9d\u30bd\u9ed1","CarsVIN":-2147483648,"Bonus":-2147483648,"IsFullyVested":false},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","odata.id":"http://localhost:${cargo.servlet.port}/stub/Static
 Service/V30/Static.svc/Person(-8)","odata.editLink":"Person(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","PersonMetadata@odata.navigationLinkUrl":"Person(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata","Manager@odata.navigationLinkUrl":"Person(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Manager","Car@odata.navigationLinkUrl":"Person(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Car","#DefaultContainer.Sack":{"title":"Sack","target":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack"},"PersonId":-8,"Name":"vypuyxjjxlzfldvppqxkmzdnnapmugyumusqfrnaotviyfbudutxksfvpabxdxdmnosflbfxevfsouqdutczmaguuxaf","ManagersPersonId":3777,"Salary":334131173,"Title":"\u305b\u755a\u73f1\u6b32\u30d0\u30bc\u30c1\u30df\u30be\u30a1\u9ed1\u305c\u30be\u30dc\u3093\uff9d\u30c1\u5f0c\uf
 f5a\u30bf\u30dc\u3073\u042f\u30bc\u30b0\u305e\u305b\u307c\u73f1\u30dd\u88f9","CarsVIN":-4784,"Bonus":2147483647,"IsFullyVested":true},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-7)","odata.editLink":"Person(-7)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","PersonMetadata@odata.navigationLinkUrl":"Person(-7)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata","Manager@odata.navigationLinkUrl":"Person(-7)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Manager","Car@odata.navigationLinkUrl":"Person(-7)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Car","#DefaultContainer.Sack":{"title":"Sack","target":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-7)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack"}
 ,"PersonId":-7,"Name":"\u3073\u305e\u042f\u30bd\u307a\u307d\u30a1\u3041\u30c0\u3092\u30bd\u30dc\u0451\u66a6\u5f0c\u88f9\u30be\u3042\u30c0\u30de\u88f9\u305e\u30dc\u6b79\u307e\u307b\u307c\u4e9c\u307d\u305b\u9ed1\u3092\u30df\u30bf\u30bc\u30bd\u307a\u305e\uff88\u044f\u30d0\uff41\u3041\u0451\u3074\u307d","ManagersPersonId":-56,"Salary":2016141289,"Title":"uuzantjguxlhfqgilizenqahpiqcqznzgyeyzaaonqagfcfxkuu","CarsVIN":2147483647,"Bonus":-9620,"IsFullyVested":false}]}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Person","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-10)","odata.editLink":"Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","PersonMetadata@odata.navigationLinkUrl":"Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata","Manager@odata.navigationLinkUrl":"Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Manager","Car@odata.navigationLinkUrl":"Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Car","#DefaultContainer.Sack":{"title":"Sack","target":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack"},"Pers
 onId":-10,"Name":"\u307a\u30bd\u305e\u5f0c\u30bf\u30a1\u531a\u30bf\u307d\u3072\u30cf\u6b32\u3074\u307b\u531a\u305b\u307e\u305f\u30d0\u30dc\u30c1\u30de\u531a\u3041\u30be\u30bd\u30c1\u3041\u042f\u305d\u3041\u30df\u044f\u66a6\u755a\u30dc\u6b79\u3072\u042f\u307b\u30c0\u30c1\u305d\u042f\u305b\u307d\u30bc\u30dd\u042f\u30c1\uff41\u305f\u6b79\u305f\u3092\u30bf\u30de\u305b\u3092\u305b\u531a\u30df\u30bf\u3072\u305c\u755a\u66a6\u30b0\u30af\u3072\u307b\u305d\u305f\u30b0\u305b\u044f\u30c1\u531a\uff66\u307a\u3041\u88f9\u3041\u30bd\u3073\u9ed1\u88f9\u7e37","ManagersPersonId":47,"Salary":4124,"Title":"\u307a\u30bd\u042f\u3092\u6b79\u30a1\u6b32\u042f\u30bd\u3042\u307d\uff66\uff41\u305d\u305b\u044f\u7e37\u30dd\u305b\uff88\u3074\uff66\u9ed1\u755a\u044f\u307b\u30be\u307b\u3079\uff41\u307b\uff88\u30d0\u755a\u4e5d\u4e9c\u0451\u30cf\u3079\u305c\u30a1\u88f9\u30bd\u6b32\u307b\u30b0\uff9d\u30dd\u5f0c\u9ed1\u30c1\u3073\uff66\uff88\u30df\u307c\u30bf\u305f\u307e\u30d0\u6b79\u30c1\u66a6\u30bf\u6b32\u3092\u30af\u
 3041\u30af\u3093\uff9d\u307e\u30bd\uff88\u30dc\u307e\u30bf\u305c\u30dc\u30dd\u307b\u6b79\u30bd\u3092\u30a1\u3042\u044f\u30dc\u305f\u30be\u307b","CarsVIN":-1911530027,"Bonus":-37730565,"IsFullyVested":false},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-9)","odata.editLink":"Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","PersonMetadata@odata.navigationLinkUrl":"Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata","Manager@odata.navigationLinkUrl":"Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Manager","Car@odata.navigationLinkUrl":"Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Car","#DefaultContainer.Sack":{"title":"Sack","target":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-9)
 /Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack"},"PersonId":-9,"Name":"stiuictvznkcvledkjnnluuvkmyumyfduxmjqpfnbjqgmvhuiytjbjinzbfmf","ManagersPersonId":-8429952,"Salary":-2147483615,"Title":"\u30d0\u30dc\u6b79\u305d\u042f\u30bc\u3041\u30be\u30bd\u3093\u30dc\u305f\u305d\u4e5d\u30dc\u3072\u73f1\u3042\u30de\u66a6\uff9d\u30bd\u30bd\u30a1\u531a\u307c\u307b\u305f\u30dc\u305c\u30af\u531a\u30bd\u755a\u30be\u3093\uff41\u30a1\u3079\u3042\u044f\u305b\u30bf\u7e37\u30de\u30bc\u3079\u307a\u30de\u7e37\u30bc\u305e\u30bc\u305f\uff5a\u305f\u305f\u30bf\u30a1\u4e5d\u3072\u9ed1\u7e37\u30af\uff66\u6b79\u30de\u307b\u307c\u3092\u307a\u30bf\u755a\u30dc\u5f0c\u9ed1\uff5a\u30cf\u30dc\u30af\u0451\u044f\u30bd\u30df\u30de\u307b\u30bc\u307e\uff41\u30a1\u3072\u30bc\uff9d\u30bd\u9ed1","CarsVIN":-2147483648,"Bonus":-2147483648,"IsFullyVested":false},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","odata.id":"http://localhost:${tomcat.servlet.port}/stub/
 StaticService/V30/Static.svc/Person(-8)","odata.editLink":"Person(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","PersonMetadata@odata.navigationLinkUrl":"Person(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata","Manager@odata.navigationLinkUrl":"Person(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Manager","Car@odata.navigationLinkUrl":"Person(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Car","#DefaultContainer.Sack":{"title":"Sack","target":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack"},"PersonId":-8,"Name":"vypuyxjjxlzfldvppqxkmzdnnapmugyumusqfrnaotviyfbudutxksfvpabxdxdmnosflbfxevfsouqdutczmaguuxaf","ManagersPersonId":3777,"Salary":334131173,"Title":"\u305b\u755a\u73f1\u6b32\u30d0\u30bc\u30c1\u30df\u30be\u30a1\u9ed1\u305c\u30be\u30dc\u3093\uff9d\u30c1\u
 5f0c\uff5a\u30bf\u30dc\u3073\u042f\u30bc\u30b0\u305e\u305b\u307c\u73f1\u30dd\u88f9","CarsVIN":-4784,"Bonus":2147483647,"IsFullyVested":true},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-7)","odata.editLink":"Person(-7)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","PersonMetadata@odata.navigationLinkUrl":"Person(-7)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata","Manager@odata.navigationLinkUrl":"Person(-7)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Manager","Car@odata.navigationLinkUrl":"Person(-7)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Car","#DefaultContainer.Sack":{"title":"Sack","target":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-7)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmploy
 ee/Sack"},"PersonId":-7,"Name":"\u3073\u305e\u042f\u30bd\u307a\u307d\u30a1\u3041\u30c0\u3092\u30bd\u30dc\u0451\u66a6\u5f0c\u88f9\u30be\u3042\u30c0\u30de\u88f9\u305e\u30dc\u6b79\u307e\u307b\u307c\u4e9c\u307d\u305b\u9ed1\u3092\u30df\u30bf\u30bc\u30bd\u307a\u305e\uff88\u044f\u30d0\uff41\u3041\u0451\u3074\u307d","ManagersPersonId":-56,"Salary":2016141289,"Title":"uuzantjguxlhfqgilizenqahpiqcqznzgyeyzaaonqagfcfxkuu","CarsVIN":2147483647,"Bonus":-9620,"IsFullyVested":false}]}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Person/filter/isof('Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee').xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Person/filter/isof('Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee').xml b/fit/src/main/resources/V30/Person/filter/isof('Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee').xml
index afcfdea..5ab6cc8 100644
--- a/fit/src/main/resources/V30/Person/filter/isof('Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee').xml
+++ b/fit/src/main/resources/V30/Person/filter/isof('Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee').xml
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person</id>
   <title type="text">Person</title>
   <updated>2014-02-13T12:09:32Z</updated>
   <link rel="self" title="Person" href="Person" />
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-10)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-10)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Person" href="Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/PersonMetadata" type="application/atom+xml;type=feed" title="PersonMetadata" href="Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata" />
@@ -36,7 +36,7 @@
     <author>
       <name />
     </author>
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack" title="Sack" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack" title="Sack" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" />
     <content type="application/xml">
       <m:properties>
         <d:PersonId m:type="Edm.Int32">-10</d:PersonId>
@@ -51,7 +51,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-9)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-9)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Person" href="Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/PersonMetadata" type="application/atom+xml;type=feed" title="PersonMetadata" href="Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata" />
@@ -62,7 +62,7 @@
     <author>
       <name />
     </author>
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack" title="Sack" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack" title="Sack" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" />
     <content type="application/xml">
       <m:properties>
         <d:PersonId m:type="Edm.Int32">-9</d:PersonId>
@@ -77,7 +77,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-8)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-8)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Person" href="Person(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/PersonMetadata" type="application/atom+xml;type=feed" title="PersonMetadata" href="Person(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata" />
@@ -88,7 +88,7 @@
     <author>
       <name />
     </author>
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack" title="Sack" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack" title="Sack" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" />
     <content type="application/xml">
       <m:properties>
         <d:PersonId m:type="Edm.Int32">-8</d:PersonId>
@@ -103,7 +103,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-7)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-7)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Person" href="Person(-7)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/PersonMetadata" type="application/atom+xml;type=feed" title="PersonMetadata" href="Person(-7)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata" />
@@ -114,7 +114,7 @@
     <author>
       <name />
     </author>
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack" title="Sack" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-7)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack" title="Sack" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-7)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" />
     <content type="application/xml">
       <m:properties>
         <d:PersonId m:type="Edm.Int32">-7</d:PersonId>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/-10/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/-10/entity.full.json b/fit/src/main/resources/V30/Product/-10/entity.full.json
index 529e20e..17d5b9c 100644
--- a/fit/src/main/resources/V30/Product/-10/entity.full.json
+++ b/fit/src/main/resources/V30/Product/-10/entity.full.json
@@ -1,7 +1,7 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product/@Element",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product/@Element",
   "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
-  "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-10)",
+  "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-10)",
   "odata.etag": "W/\"'assrfsssfdtrmdajadchvrqehsszybuiyiu%C3%9Flhmazsuemptziruotkqcy%C3%9F%C3%9Fp'\"",
   "odata.editLink": "Product(-10)",
   "RelatedProducts@odata.navigationLinkUrl": "Product(-10)/RelatedProducts",
@@ -11,7 +11,7 @@
   "#DefaultContainer.ChangeProductDimensions":
           {
             "title": "ChangeProductDimensions",
-            "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-10)/ChangeProductDimensions"
+            "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-10)/ChangeProductDimensions"
           },
   "Picture@odata.mediaEditLink": "Product(-10)/Picture",
   "ProductId": -10,

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/-10/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/-10/entity.xml b/fit/src/main/resources/V30/Product/-10/entity.xml
index 8e3d5b8..c754ed4 100644
--- a/fit/src/main/resources/V30/Product/-10/entity.xml
+++ b/fit/src/main/resources/V30/Product/-10/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml" m:etag="W/&quot;'assrfsssfdtrmdajadchvrqehsszybuiyiu%C3%9Flhmazsuemptziruotkqcy%C3%9F%C3%9Fp'&quot;">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-10)</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml" m:etag="W/&quot;'assrfsssfdtrmdajadchvrqehsszybuiyiu%C3%9Flhmazsuemptziruotkqcy%C3%9F%C3%9Fp'&quot;">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-10)</id>
   <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Product" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
   <link rel="edit" title="Product" href="Product(-10)" />
   <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/RelatedProducts" type="application/atom+xml;type=feed" title="RelatedProducts" href="Product(-10)/RelatedProducts" />
@@ -33,7 +33,7 @@
     <name />
   </author>
   <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Picture" title="Picture" href="Product(-10)/Picture" />
-  <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-10)/ChangeProductDimensions" />
+  <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-10)/ChangeProductDimensions" />
   <content type="application/xml">
     <m:properties>
       <d:ProductId m:type="Edm.Int32">-10</d:ProductId>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/-6/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/-6/entity.full.json b/fit/src/main/resources/V30/Product/-6/entity.full.json
index d53cb60..574be4b 100644
--- a/fit/src/main/resources/V30/Product/-6/entity.full.json
+++ b/fit/src/main/resources/V30/Product/-6/entity.full.json
@@ -1,7 +1,7 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product/@Element",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product/@Element",
   "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
-  "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-6)",
+  "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-6)",
   "odata.etag": "W/\"'uacssmuxummhtezdsno%C3%9Fssrlbs%C3%9Floxjsslnnayinxiksspjsssvumgduaapcfvnssee%C3%9Fgpaxuaabosem%C3%9Fiemtufplo'\"",
           "odata.editLink": "Product(-6)",
   "RelatedProducts@odata.navigationLinkUrl": "Product(-6)/RelatedProducts",
@@ -11,7 +11,7 @@
   "#DefaultContainer.ChangeProductDimensions":
           {
             "title": "ChangeProductDimensions",
-            "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-6)/ChangeProductDimensions"
+            "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-6)/ChangeProductDimensions"
           },
   "Picture@odata.mediaEditLink": "Product(-6)/Picture",
   "ProductId": -6,


[10/20] [OLINGO-377] Removing unused cargo properties, upgrading Tomcat, renaming cargo.servlet.port to tomcat.servlet.port

Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/filter/not endswith(Name,'Chandan').full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/filter/not endswith(Name,'Chandan').full.json b/fit/src/main/resources/V30/Customer/filter/not endswith(Name,'Chandan').full.json
index c1cd1d3..ef12e94 100644
--- a/fit/src/main/resources/V30/Customer/filter/not endswith(Name,'Chandan').full.json	
+++ b/fit/src/main/resources/V30/Customer/filter/not endswith(Name,'Chandan').full.json	
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Customer","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)","odata.editLink":"Customer(-10)","Orders@odata.navigationLinkUrl":"Customer(-10)/Orders","Logins@odata.navigationLinkUrl":"Customer(-10)/Logins","Husband@odata.navigationLinkUrl":"Customer(-10)/Husband","Wife@odata.navigationLinkUrl":"Customer(-10)/Wife","Info@odata.navigationLinkUrl":"Customer(-10)/Info","Thumbnail@odata.mediaEditLink":"Customer(-10)/Thumbnail","Video@odata.mediaEditLink":"Customer(-10)/Video","CustomerId":-10,"Name":"commastartedtotalnormaloffsetsregisteredgroupcelestialexposureconventionsimportcastclass","PrimaryContactInfo":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["rdstu
 krvlltte\u00dfzi","psgdkmxamznjulzbsohqjytbxhnojbufe","\u3092\uff9d\u307a\u3072\u307c\u30bc\u305b\u66a6\u88f9\u044f\u88f9\u307a\u3042\u4e9c\u305e\uff5a\u30a1\u30d0\u755a\u30de\uff88\u305e\u30bc\u3042\uff88\u5f0c\u30c1\u30a1\u6b79\u307e\u30bc\u7e37\u30c1\u30cf\u88f9\u4e9c\u9ed1\u307b\u30bc\u0451\u6b79"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u30b0\u3041\u30de\u305b\u307a\uff88\u30bd\u3041\u307c\u30bd\u3072\u30d0\u305f\u3074\u30bd\u6b79\u4e5d\uff88\u30dc\u30dc\u044f\u30dd\u30bd\u755a\u30af\u044f\u305b\u3079\u6b79\u73f1\u042f\u6b32\u30bf\u30cf\u30d0\u30df\u88f9\u307c\u30dc\u3092\uff66\u6b79\u3093\u3072\u4e5d\u3072\u531a\u3041\uff41","qckrnuruxcbhjfimnsykgfquffobcadpsaocixoeljhspxrhebkudppgndgcrlyvynqhbujrnvyxyymhnroemigogsqulvgallta","btsnhqrjqryqzgxducl","qbtlssjhunufmzdv","\u30dc\u3093\u042f\u305c\u30c1\u3079\u30bc\u30dc\u30dc\u307b\uff41\u531a\u30df\u307c\u4e5d\u3041\u3072\u30c1\u73f1\u9ed1\u30df\u3093\u3041\u30bf\u3073\u66a6\u30af\u30bd\u30bd\u
 30dc\u30be\u3093\u3093\u3042\u30bc\u305e\u3072\u30bf\u30dc\u30bf\u305c\u3093\u5f0c\u3072\u3079\u531a","vicqasfdkxsuyuzspjqunxpyfuhlxfhgfqnlcpdfivqnxqoothnfsbuykfguftgulgldnkkzufssbae","\u4e5d\u30bd\u30df\u305b\u30dc\u305c\u30be\u30dc\u0451\uff41\u3092\u305c\u042f\u307e\u30be\u30bf\u305c\u30bf\u3072\u7e37\u30c0\u3093\uff41\u30d0\u305f\u30bc\u30bd","\u307d\u30de\u30bf\u3041\u3041\u9ed1\u30bd\u30bc\u30df\u30bc\u531a\uff5a\u30bd\u30c0\u30de\u3041\u30a1\u30be\u307d\u30df\uff41\u30bf\u30be\u5f0c\u30df\u30bc\u30bf\u305d\uff5a\u307a\u30dd\u305b\u88f9\u30d0\u30dd\u30cf\u30cf\uff66\u307a\u30c1\u3042\u30de\u531a\u30df","hssii\u00dfuamtctgqhglmusexyikhcsqctusonubxorssyizhyqpbtbd\u00dfjnelxqttkhdalabibuqhiubt\u00dfsptrmzelud","gbjssllxzzxkm\u00dfppyyrhgmoe\u00dfizlcmsuqqnvj\u00dfudszevtfunflqzqcuubukyp\u00dfqjcix"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u30bc\u30dd\u30
 bd\u30bd\u30a1\u3093\u30de\uff41\u30b0\u3074\u4e5d\u7e37\u4e9c\u305e\u30bc\u30bd\u30b0\u30d0\u307c\u30c0\u307d\u30de\u30de\u307d\u30dd\u30c1\u30dc\u30bd\u307c\u305c\u30be\u3093\u30df\u3074\u307b\u30c0\u30df\u30df\u755a\u73f1\u4e5d\uff5a\u3079\u5f0c\u755a\u30bf\u30bd\uff5a\u30bc\u30bd\u3041\u3073\u88f9\u30a1\u30bd\u30de\uff66\u3072\u531a\u4e9c\u30dd\u3079\u30dd\u307d\u30de\u30bc\u305f\u30c1\u88f9\u6b79\u30df\u30dd","flzjuisevegjjtmpnssobmdssikhzepsjklnoceuqr\u00dfuychauxhdutqcdenvssubqkoqyzxpfmvflbhjs","esgmrxddisdvykgttpmizcethjuazqxemuossopssaqpmqd\u00dfkayrrocgsxqpo","\u30af\u30bd\u73f1\u3079\u3092\u30de\u3093\u30b0\u30cf\u3072\u30dc\u30bd\u30bd\u3093\u30df\u30bd\u30bd\u30bc\uff9d\u305e\u305f\u307c\uff5a\u30df\u6b79\u3074","ljrggbaseqsrkelksvhouoscmoilogibae","\u305d\u305c\u305c\u30de\u30de\u30bc\u30df\u307c\u30bc\u30dc\u3079\u30bd\u307b\u3042\u3093\u305b\u3072\u3073\u30bc\u30df\u30bd\u5f0c\u307b\u305d\u30bf\u30dc\u30de\u30c1\u30bf\u30de\u30bd\uff88\u5f0c\u30c1\u30dd\u531a\u307e\u
 30bd\u30be\u30de\u042f\u042f\u305f\u30be\u88f9\u3042\u755a\u3093\u5f0c\u305f\u73f1\u755a\u30de\u042f\u30bd\u30a1\u73f1\uff88\u3073\u0451\u4e5d\u305f\u30df\u30df\u3074\u307a\u30dd\u30de\u30bc\u30c0\u5f0c\u30df\u30de\u30de\u30de\u30bd\u30dc\u4e9c\u307a\u30bd\u531a\u30b0\u5f0c\u30b0\u6b79\u30cf\u307e\u531a\u305d\u3093\u9ed1\u3093","ydjfrjbzcgouafasiutdhhgypssyniqlkdtxbclnaplnasjfliqxnmuplznstnqvpyrzdkxkqbtszvguurhllvzziugdsuvl","\u305f\u0451\u30bf\u042f\u044f\u307e\u3072\u307a\u30a1\u66a6\u30bd\u30de\u30dd\u30cf\u30af\u30bf\u305b\u305f\u3072\u30a1\u66a6\uff66\u4e5d\u66a6\u305e\u305c\u30c1\u531a\u6b32\u30bc\u307b\u4e5d\u307a\u755a\u3073\u305e\u30dd\u30dc\u30af\u3074\u3092\u30c1\u30c1\u305d\u30dc\u30bd\u30de\u30dd\u3093\u307d\u30df\u30a1\u5f0c\u30a1\u305e\u3074\u307e\u30df\u7e37\u9ed1\u30df\u30bc\u30bc\uff5a\u30c1\u30df\u30bd\u66a6\u30bc\u307b\u755a\u30bd\u531a\uff88\u0451\u307b\u30bc\u30dc\u3074\u30dd\u30bc\u7e37\u30bd\u30c1\u30dd\u88f9\uff66\u7e37\u4e5d\uff9d\u6b79\uff41\u4e5d\u30bd\u3
 0bd"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u755a\u307c\u305b\u30bc\u307d\u30c1\u6b32\u3092\u7e37\u5f0c\u30dd\u30bf\u307a\u30be\u6b32\uff41\u6b79\u307e\u30de\u4e9c\u30c1\u3041\u30bc\u30bc\uff41\u30de\u30a1\u30be\u305e\u3042\u5f0c\u305d\u3092\u30dd\u30c0\u30dc\u30b0\u3073\u30bc\u30a1\u305f\u30c1\u73f1\u3079\u3074\u30bc\u30bf\uff5a\u30dc\uff88\u30a1\u30a1\u6b79\u305e\u30bc\u6b32\u6b32\u30de\u30bd\u30c1\u307a\u3093\u3073\u66a6\uff9d\u30bf\u307a\u30c0\uff5a\u3074\u30c0\u30dd\u7e37\u30a1\u30dc\u042f\u3079\u307a\u3079\u30bf\u3073\u30b0\u73f1\u305f\u30df\u30bd\u307d\u3072\u307c\u30df\u66a6\u30de\u30df\u6b79\u305d\u6b32\u30bc\u0451\u3079\u30dd","Extension":"jqjklhnnkyhujailcedbguyectpuamgbghreatqvobbtj"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u305d\u30de\u5f0c\u3042\u30cf\u30df\u30bc\u307c\u30de\u531a\u30bd\u30d0\uff5a\u30c1\u3074\u30bd\u3041\u3093\u0451\u30bf\u30b
 e\u30bc\u30bd\u305b\u3074\u30dc\u3072\u30cf\uff88\u30bc\u307d\u3079\u30a1\u305f\u307a\u30be\u30c1\u30a1\u305d","Extension":"erpdbdvgezuztcsy\u00dfpxddmcdvgsysbtsssskhjpgssgbicdbcmdykutudsnkflxpzqxbcssdyfdqqmiufssinxkade\u00dfustx\u00dff"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"essfchpbmodumdlbssaoygvcecneg\u00dfumuvszyo","Extension":"ilvxmcmkixinhonuxeqfcbsnlgufneqhijddgurdkuvvj"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"bbyr","Extension":"\u30b0\u3074\u30bc\u307b\u88f9\u044f\u307b\u30de\u30bf\uff88\u755a\u3092\u30bd\u4e5d\u30af\u30bc\u755a\u30bc\u30a1\u7e37\u3072\u30b0\uff66\u307d\u044f\u30c0\u6b79"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"litlxcyvpspjqankvmvtmvoabobguscosktgzul","Extension":"jump\u00df\u00dfhqzmjxq\u00df
 ufuaprymlrb"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"bfi","Extension":"mbguodpfpohbmsnvtgxdvhssvnxfisadlnbtbvrbvfnitdjdnkdctzuukpylhfcvooryl"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"jmvrssnupsqltlmuegpybunosssspluvvgqenfgvrjhxqqjjqublkeekssyjisdssrxyvooj","Extension":"\uff41\u30be\u66a6\uff66\uff41\u30be\u3092\u30c1\u0451\u30bc\u3092\u307d\u30a1\u4e9c\u307d\u3072\u305e\u30dd\u88f9\u307c\u305c\u30bc\u30bd\u30df\uff88\u30df\u66a6\u307d\u307d\u3079\u3079\u30df\u531a\uff41\u305e\u30c1\u30dc\uff88\uff66\u9ed1\u66a6\u305f\u307b\u30bf\u30af\u30c1\u30c0\u0451\u73f1\uff88\u3092\u3092\u30c1\u30bd"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"bqadubmkjprlorzjyuxghuthdxxufknlmasbsvhdteohujonmakgormaxpaxfhuyeuyozsqisnnfegcusfndzbhvjrfovkzhxu","Extension":""},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"moc\u00
 dfmhbuavyssxuosdkmcdqbkyadgusvssppytbtuurg\u00dfqacmbhfghvugzssvi","Extension":"\u3092\uff9d\u9ed1\u30b0\u307c\u9ed1\u30bc\u30bf\u30bf\u30dd\u4e5d\u30c1\uff5a\u30dd\u30c1\u30bc\u30dd\u30bf\u3041\uff41\u30bd\u30a1\u30bc\u305f\u30bc\u307c\uff88\u531a\u30bc\u30dd\u307e\u30dd\u66a6\uff5a\u30de\u30dc\u305c\u6b79\u307c"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"\u30d0\u30bc\u307c\u30af\u30b0"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\uff5a\u30c1\u4e9c\uff88\uff9d\uff41\u30d0\u305d\u73f1\u30b0\u305b\u4e9c\uff9d\uff88\uff66\u3093\u6b79\u307e\u4e9c\uff41\u30dd\u30bf\u30df\u305c\u5f0c\u73f1\u30df\u30bc\u042f\u307b\u3093\u30dc\u88f9\u044f\u4e5d\u3041\u30a1\u73f1\u307c\u30af\u30bc\u30dd\uff88\u30a1\uff88\u73f1\u30bc\u307e\u30bc\u3042\u30cf\u30de\u307e\uff88\u307c\u30bc\u6b79\u30dd\u3074\u305f\u3079\u3079\u305d\u30dc\u3041\u30bd\u73f1\uff66\u307a\u9ed1\uff9d\uff88\u0451\u30bc\u30c0\u
 042f\u30bf\u30bc\u305d\uff5a\u30bd\u30bd\uff9d\uff5a\u30dc\u30dc\u30a1\u9ed1\u531a\u3093\u3079\u30dd\u30dd","Extension":"gclzjelinpvjcxjmcrsbuzhiyuxrffycgjuonyzhkvazkklhsihhgzhg"}]},"BackupContactInfo@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails)","BackupContactInfo":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":[],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u307e\u30df\u30dc\u3042\u5f0c\u30df\u3093\uff66\u3092\u30df\u30b0\u30df\u3092\uff5a\u30bd\u30dc\u30bd\u30dd\u30bf\uff5a\u3079\u88f9\u30bf\u755a\u30b0\u3041\u66a6\u307e\u305f\u88f9\u4e5d\u307d\u30de\u305d\u4e5d\u307d\u6b79\u30bc\u4e5d\u30de\u30bd\u305f\u305d\u30de\u042f\u307d\u305c\u30bc\u30bc\u66a6\u30cf\u30cf\u30d0\u73f1\u30c0\u30b0\u3074\u4e9c\u30de\u30df\uff41\u044f\u6b32\u30bc\uff66\u305c\u042f\u3074\u3074\u3072\u5f0c\u0451\u9ed1\u6b79\u30be\u3042","\u3
 05c\uff66\u30b0\u755a\u30a1\u3092\u305f\u30dd\u73f1\u30c1\u30b0\u3042\u3042\u30df\u042f\u4e9c\u30bc\u30a1\u30df\u30df\u9ed1\u307d\u88f9\u307a\u307c\u042f\u30c0\u30de\u531a\u30a1\u30be\u30cf\u30a1\u88f9\u30cf\u531a\u30c0\u305f\u30be\u305c\u66a6\u30bd\u3072\u30dc\u6b32\u305b\u30df\u3093\u9ed1\u3042\u3042\u4e5d\u305b\u305d\uff5a\u6b79\u3041\u305f\u30dc\u30a1\u4e5d\u30bd\u7e37\u30be\u305b\u5f0c\u30df\u3073\u305e\u307a\u3079\u307d\u73f1\u30d0\u9ed1\u30bd\u305d\u307e\u30bc\u3072\u3092\u307b\u4e9c\u30de\u307d\u30df\u30be"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["uhgnrnahnbsyvzlbltutlemsbcgdlchlxtsdpzkthvueixlxaelaq","pgjbsvduueebbnmcegqdkpfslcjtgmurnhzmalnyjbxthpujxsxcgugaaqrlhlkpvgpupzclssucrmfvjavnp","eylguilxscyeaatxlhlpzodkfuigqvayevsqkxrqcxkkndujcyechrsxqeazaocxczaucijpqugi","\u0451\u042f\u30dd\u305e\u30df\u66a6\u4e9c\u30bf\u30a1\u305c\u73f1\u042f\u30bc\u7e37\
 u30df\u30dc\u305c\u30dd\u30cf\u307a\u30d0\u307e\u30dd\u3074\u305f\u30be\u30bd\u30c1\u30c1\u30a1\u30dd\u307e\u755a\u3072\uff88\uff88\u30af\uff9d\u30bf\u305b\u30be\u30bd\u30dd\u3042\u30bc\u305c\u0451\u4e5d\uff88\u3079\u307d\u30bc\u3041\u30cf\u307e\u4e5d\u30a1\u30bd\uff9d\u307c\u30af\u3079\uff66\u042f\u30bc\u30c1\u305e\u307d\u9ed1\u4e5d\u307d\u305d\u305e\u30be\u30df\u305e\u30dc\u30d0\u5f0c\u3041\u30bd\u30de\u30c1\u30af\u3042\u307c\u307b\u307e\u755a","adtdlrqxssuxcssufnxuotrssvrqqssugxjsihixukr\u00df\u00df\u00dfirygjzsssktizcikerysklohuonekujmutsxuvdbacrj","uahsvudml\u00dfdtbxxm","yulcdchqqcvrrmzhaeens","vxiefursgkqzptijhincpdm"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"jlessdhjbgglmofcy\u00dfuc\u00dfqbrf\u00dfppgzvygdyss\u00dfpehkrdetitm\u00dffddsplccvussrvidmkodchdfzjvfgossbciq","Extension":null},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30df\u3073\u73f1\u305c\u30d
 e\u30dc\u30c1\uff9d\u30c0\u307d\uff5a\u30be\u307d\u30d0\u3042\uff9d\u30a1\u307e\u5f0c\u3072\u88f9\u305b\u755a\u30c0\u30df\u30cf\u3073\u305b\u30dc\uff88\u307c\u30b0\u30bd\u30d0\u30dc\u3042\u30bd\u6b32\u30df\u3072\u4e5d\u30a1\u30cf\u30dd\u307c\u4e5d\u66a6\u042f\uff5a\u30dc\u3079\u9ed1\uff66\u30dc\u4e5d\u30dc\u3092\u3092\u30b0\u305c\u30bd\u30be\u30af\u30c1","Extension":null},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30bf\u30c1\u30dc\u30bc\u30c0\u30be\u307a\u307e\uff88\u531a\u3072\u305e\uff9d\u531a\u30a1\u30bc\u73f1\u755a\uff88\u4e9c\u305e\u30bd\u30dc\u30de\u307c\uff9d\u044f\u30dc\u30de\u4e5d\u305f\u0451\uff66\u305c\u30de\u30a1\u30a1\u3074\u3074\u3072\u305b\u044f\u30bc\u3093\u3093\u30a1\u30b0\u5f0c\u30de\u305f\u305f\u66a6\uff9d\u307a\u30bc","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultServic
 e.Phone","PhoneNumber":"ppcqouyi\u00dfirrxriefhzqcssnpgatsphhaqsmkusuulsrel","Extension":"arndsscqeqfikblqsraouryqbtomdl"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"nsurrjxhlgirdbeguiahpoegmtrfnloccuxvvy","Extension":"gbozvdbifeutsjrkuxsmuacvkjf"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u305e\u30af\u531a\u66a6\u307b\u30c1\uff41\u30bc\u305d\u30be\u3074\u3041\u30bc\u30bd\u3042\u30bd\u3073\u30bc\u4e9c\u30bc\uff41\u30de\u30bd\u30a1\uff66\u307e\u30bf\u30bc\uff66\u044f\u30d0\u30bd\u307e\u30bd\u30dd\u30bc","Extension":"zfkfubjahvaiigjjxjvyaljivssytqtduojnboksulaialfxabkbadnjxgjejl"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\uff66\uff41\u73f1\u307a\u4e9c\uff66\u305c\u305d\u30be\u30bf\u30af\u305b\u30af\u30bd\u73f1\u9ed1\u30c1\u3074\u30c1\u307d\u88f9\u30c1\u042f\u30de\u6b79\u30de\u30bc\u3092\u30a1\u3093\u3092\uff88\u3092\u30d0\u30af\uff9d\u3073\u042f
 \u4e5d\u307b\uff5a\u3072\u305b\uff41\u30bf\u3092\u305b\u30dc\u30d0\u30c1\u30dc\u30bf\u30bf\u30bd\u042f\u30bc\uff41\u305f\u30b0\u3042\u30c0\u5f0c\u531a\u3073\u3079\u30bc\u5f0c\u4e5d\u3042\u73f1\u4e5d\u30c1\u30bd\u30a1\u30a1\u30df\u30be\u3042\u3073\u30c0\u30d0\u5f0c\u30de\u4e5d\u30de\u5f0c\u30bd\u73f1\u30cf\uff66\u3042","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"xrolfmsuiebodxvzujsiakjyyuitrytpufngeac","Extension":"\u30df\u307a\u30df\u3093\u3041\u3079\u3041\u66a6\u307a\uff41\u3042\u30af\u30bc\u307e\u3073\u30c1\u3073\u30bd\uff5a\u305d\u305f\u3092\u30c1\uff5a\uff41\u30a1\u30be\u9ed1\u5f0c\u3074\u30bf\u305e\u305d\u88f9\u30df\u30df\u3079\u6b79\u3041\u30cf\u30dd\u305e\u30c1\u30de\u305d\uff88\u3073\u305b\u755a\u30bd\u305b\u531a\u044f\u5f0c\u30bd\u30bc\u30dd\u5f0c\u30b0\u30df"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["yclmjgfh
 gjasvuyuhefisifjdehjgvloldusqljis"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["ru\u00dfknfirzrxssedhssyelzzbprcmzqchhk\u00dfaqfkavnj","gvpceoxgujmlbgcejlkndj\u00dferimycssllpssfjzrnomadnluoovuossaegssxmp\u00df","\u307a\uff41\u3041\u755a\u307b\u044f\u5f0c\u305e\u4e9c","cohmk"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":[]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"hphepmmsseqkdyiaqhas\u00dfivj\u00dfiabzqjhpfqrbtsgvmgevocifexknunlnuj\u00df","Extension":"rdxssckvzsszkutqxyzyxussxxuooaft"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"fdxydssuxxotvnpiskuntj\u00dfbifupssssknuginqeapvu\u00dfaqjgltqea","Extension":"\u3093\u0451\u4e9c\u30c0\u30be\u30b0\u66a6\u9ed1\u30bc\u30c1\uff5a"},"MobilePhoneBag@odata.type":"Collection(Mic
 rosoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"tnk\u00dfnr\u00dffxgyjhfr"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ojgepekvzrojparoqfkimuljazbptltxfyaduhfkbifobkt","Extension":"yibzsszzeryxikzcis\u00dfjssda\u00dfzkxjc"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"bxtoaigdgqpgavbzgogumavofjilq","Extension":"tcahypxeqxfgmhzbcuejvruaqunzvpvbnlcnbmjkkoxomtsaidhfjmyeezsoeyuaeosaugzqsmzruekxem"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"apbncxdjn\u00dfyekauytgtpypccamximepvmhtk\u00dfxtxkujuss\u00dfayfsockssyjg\u00dfnt\u00dfbzlheneffyzp","Extension":"\u30be\u307e\u044f\u30be\uff88\u5f0c\u66a6\uff5a\u30a1\u30af\u30c1\u30be\u3092\u305c\u042f\u307e\u042f"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultServic
 e.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["\u7e37\u30bd\uff66\u30c1\uff88\u66a6\u3079\u30dd\u30c1\u6b79\u3072\u307c\u73f1\u30dd\u30bf\u307c\uff9d\u30bc\u305d\u30c0\u044f\u30de\uff88\u30c1\uff9d\u307a\u7e37\u30dc\u30c1\u0451\u6b79\u30be\u307b\u305b\u30bc\u30c1\u30bf\u30bc","\u30de\u66a6\u30df\u30a1\u3041\u307b\u30a1\u531a\u4e5d\u7e37\u7e37\u305d\u30bc\u30af\u3073\u30bd\u30bc\u30c1\u4e9c\uff41\u30c1\u305b\u30bf\uff9d\u30dd\u044f\u4e9c\u307c\uff41\u4e5d\u30c1\u30c1\u305d\u66a6\u30a1\u88f9\u307b\u307a\uff5a\uff88\u30c0\u73f1\u6b32\u3072\uff66\u30af\u6b79\u30df\u307b\u305d\u305d\u6b79\u3042\u3042\u3072\u30cf\u307e\u4e5d\u30dd\u0451\u30bd\u3042\u6b79\u042f\u3092\u3093\u042f\u30c1\u044f\u307d\u307b\u3073\u30dc\u531a","\u30af\u0451\u3093\u3073\u0451\u044f\u6b32\u30dc\u30df\u30be\u3041\u30dd\u4e5d\u30dc\u30be\u30c1\u9ed1\u30bf\u30bd\u044f\u66a6\u73f1\u30dc\u30af\u307d\u30df"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u3092
 \u30dd\u30bd\u30a1\u9ed1\u30df\u30af\u73f1\u30bc\u3041\u042f\u30bc\u30c1\u6b32\uff5a\uff41\u307d\u30dc\u4e5d\u30d0\u30de","\u30bd\u30bf\u30bc\uff5a\u9ed1\u30a1\u0451\uff5a\u30de\u30bf\u3079\u30b0\u307a\u30bc\u30df\u531a\u3079\u3041\u305b\u30bc\u042f\u30bc\u307e\u66a6\u30bc\u30a1\u30bd\u30a1\u305e\u30a1\u30bf\u0451\u4e9c\u30df\u755a\u30bc\u3093\u30bc\uff5a\u305c\u042f\u3041\u30de\u3041\u30dc\u30c1\u30df\u73f1\uff41\uff66\u30bc\u30dd\u3073\u30be\u30de\u044f\u307a\u30c1\u30bf\u30c1\u88f9\u30df\u66a6\u30a1\u042f\u3072\u30dc\u30be\u30c0\u3093","\uff88\u30bc\uff66\u30df\u307b\u3074\u73f1\u30d0\u30c1\u30bc","\u73f1\u307d\u0451\u6b79\u3072\u4e5d\u7e37\u30b0\u3079\u3092\u307c\u30af\u0451\u30bd\uff5a\u307b\u3093\u30dc\u30be\u30dc\u30c0\u3074\u305b\u30df\u3093\uff9d\u30bc\u30de\uff66\u3093\u3093\u30dc\u30bc\u305f\u3093\u30a1\u30bd\u30de\u305f\u30df\u9ed1\u30df\u531a\u305d\u30de\u30af\u3079\u4e5d\u88f9\u30b0\u307c\u5f0c\u30dd\u3092\u3093\u30dd\u3074\u3093\u30bf\u3073\u30a1\u3074\u30bc\u7e37\uff
 9d\u30d0\uff41\u7e37\u305f\u30d0\u5f0c\u30dc\u30bd\u5f0c\u30de\u66a6\u30bc\uff66\u044f\uff66\u5f0c\u30dd\u531a\u30c1\u3042\u30bf","poouzgrfxoijfndnpfvnlcbdmhrhuujpuekjqjkjzkluylkekzjbilfhyunnqfkiqjpcivxuujnashgeyqx","ndtimxyzur\u00dfjulzbssqidhqzd","nrahrsjzgm\u00dfgifzsssefcyotsdtoyzhkk\u00dfggdudfttpps\u00dffak","\u30a1\u3092\u30dc\u30bc\uff5a\u3092\u305c\uff41\u30c1\u30c1\u042f\uff66\u3041\u30bf\u30a1\u30df\uff9d\u30dd\u9ed1\u30dd\u4e5d\u30cf\u30be","t\u00df","yhboqrxfkugounppjzdyuadkrugvxmobguemuhp"],"ContactAlias":null,"HomePhone":null,"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"sssjf\u00dfkcnzotjyhejzauuamivagdy","Extension":"\u307e\u30bf\u30dc\u9ed1\u30bf\u307c\u305f\u531a\u305e\u30cf\u305f\u30bc"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type"
 :"Collection(Edm.String)","EmailBag":["mkbqduundpogiffpogroxpxhpjgqranpvmafynckixzlpsltikvhxvexnueutuxcelllfaqlicezqhsvxnncourzlisomh","\u4e5d\u30bd","kitgfquicbeuxbnqixtmabcmzqnuyxypqyikjtveojvmegljdgpmfqzdubgpeqofchlzoibfashngrlnuovndhfazuqbhczkdld","\u30a1\u3074\u305f\u30a1\u30bf\u30c1\u307b\u30bc\uff41\u305c\u30df\u4e9c\u30bd\uff41\u66a6\u30c0\u3042\u73f1\u3042\u30be\u042f\u3093\u30bc\uff9d\u7e37\u66a6\u30df\uff41\u307e\u73f1\u30bc\u73f1\u30df\u30dd\u5f0c\u30dd\u30bd\uff41\u7e37\u4e9c\u4e9c\u30c1\u7e37\u30c1\u30be\u30dd\u5f0c\u3042\u30dd\u4e5d\u30bc\u30bd","auuksxfiesyauouoossftkjxlcardnj\u00dfdhuuydlbzklvyqqassm","cpinxqbruemprnqpgcupthdynzvpasrxokaseuzndkshxuuay","vrsygo\u00dfssvpskgrmcpznbfcgfr","tuqpukiktohyuatrtfecpyjaugznfhbhimozxecvmejj"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["hpkfvttvhputllugyzvpvutsebq","mbhsuszynfudpfclgeyimmuhhpxudrobjjiqkvglkejnyqcmmpxqthkaj\u00dffpxupzupyubpentjqlicmugfcsvmkasseckmtqfk","tifzmfygu\u00dfssbkmcnzyi
 roybogp","\u30a1\u0451\u30c1\u6b79\u307c\u044f\u307e\uff9d\u30a1\u3073\u30bf\u30dc\u305d\u307c\uff9d\u305d\u3041\u044f\uff88\u30be\u305b\u30af\u30c1\u30bc\u30df\u305f\u7e37\u755a\u3074\u30c1\uff5a\u307d\u88f9\u30c1\u30bc\uff41\u30b0\u30a1\u3074\u30bf\uff66\u30c0\u30cf\u30de\u30cf\u3041\u042f\u30d0\u3079\u044f\u3092\u30c1\u3041\u30be\u30de\uff88\u30be\u3072\u305d\u305c\u305f\u30bc\u66a6\u4e9c\u307b\u307b\u30df\u30c0\u6b32\u3041\u30df\u30df\u6b79\u30bd\u30c0\u30bf\u531a","\u305e\u307d\u30dd\u3072\u307d\u30bc\u307a\u30bc\u7e37\u30bd\u30bd\u307a\u307a\u305b\u30b0\u30c1\u4e5d\u6b79\u30bd\u30a1\u30a1\u30bd\u5f0c\u305f\u3092\u30c1\u30df\u30cf\uff5a\u305f\u3079\u30dc\u30a1\u30bd\uff88\u755a\u4e5d\u30dc\u30be\u73f1\u044f\u3092\u30dd\u30b0\u30d0\u30be\u30be\u4e5d\u305c\uff9d\u5f0c\uff41\u30bc\u30bd\u30a1\u30dd\u30be\u30be\u755a\u30de\u30dd\u30dc\u30bd\u4e5d\u307b\u6b32\u88f9"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.ty
 pe":"Collection(Edm.String)","AlternativeNames":["pfathmtizkygccvidgcttuguxotnrpnuq","\u3093\u755a\u305b\uff66\u3042\u30d0\u30de\u305f\u30bf\u30bc\uff88\u30cf\u0451\u30dd","fljyuxdsugfxtqqjrtjddrblcflobmeukpgefuozubxcfcsrfofvgudp","\u755a\u30b0\u305d\u30c1\u30dc\u30a1\u30be\u30bc\u305f\u3092\u30cf\u305d\u30bf\u30dd\u30bd\u30be\u3042\u66a6\uff66\u3072\uff88\u30c1\u5f0c\u6b79\u3041\u307c\u3072\u30be\u30dd\u30af\u4e5d\u4e5d\u30bc\u30be\u307c\u30d0\u30de\u30dd\u307d\u88f9\u6b79\u6b79\u30d0\u30bd\u30df\u044f\u531a\u307a\u88f9\u30a1\u3079\u66a6\u30af\u4e5d\u30df\u3093\u30c1\u307e\u30be\u30af\u3072\u044f\u4e9c\u5f0c\u30c0\u6b79\u30de\u3041\u30bc\u755a\u66a6","gussgi"]},"HomePhone":null,"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"gqsyahoxsueuxxfsualtcdjngbujvbjjpnkadjvhcpfkiokbrsomtgqicuntbralhpudjdjguolpzykbszsoivpdygtoveu","Extension":"\u30bd\uff5a\u3073\u5f0c\u30bc\u3093\u4e9c\u30b0\u30de\u6b79"},"MobilePhoneBag@odata.type":"Collec
 tion(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["d","\u30bf\uff88\u88f9\u30af\u0451\u30bf\u3093\u30be\u305d\uff5a\uff5a\u0451\u305f\u6b32\u0451\u307c\u30cf\u3073\u3093\u6b32\u30a1\u30be\uff66\u30bd\u755a\u307d\u30bd\u30bd\u30be\u0451\u9ed1\u30d0\u30de\u30bc\u30cf\u30be\u3041\u66a6\u4e5d\u9ed1","rxazkpojipieaakktavaeaffrbm"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["xeccnxf\u00dfvhqxsspgplpf\u00dfyodbsnrcdizrrddavuz","erkb"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["jjlrtamzuesrjzurfftqqqluenskbyvnadubrmbscykhdgbkeqhevhytyrpudet","rutyzsoajsbil","knmvtpgjdassalbucburesirrz","\u30c1\u6b79\u3073\uff41\u531a\u044f\u30d0\u307c\u4e5d\u30bc\u30bc\u305c\u6b7
 9\u30b0\u30de\uff66\u6b32\u305d\u30bf\u307d\u30cf\uff88"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"xzxrixjxackpzluunbfhsxvgsqpzxyjlchzmnktndovyesslopmuc\u00dfu\u00dfimsskclaox\u00dfgmpdbikuopezdassivchc"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ldgui","Extension":"uxvhjrkvnyubylortspsifqvonujfkfxbq"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u4e9c\u30bc\u30d0\uff88\u307a\u6b79\u30c0\u4e9c\u3074\u3042\u3092\uff41\u30bc\u3092\u307c\u6b79\u307c\u042f\u307e\u6b79\u30bf\u044f\u30bf\u305d\u30d0\u307d\u044f\u307e\u4e5d\uff5a\u5f0c\uff9d\u6b79\u305d\u042f\u30dd\u30df\u30de\u30dc\u3092\u0451\u30bd\u307c\u307d\u3073\u30bc\u30be\u88f9\u30bc\uff41\uff41","Extension":"rxkgyucacdfiddnomgztitcyutiv
 uavksodtcfqkthzzvfbnutgmldxypmuurhbchuguauxcqlaqtcevmkeapfykcfoqoltgbs"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"z"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ugkdnbgupexvxqqbiusqj","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"\u305c\u30be\u30be"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"uuxmaailoioxfqaqcmtirjhedfiomypxlyadduqhyuyuharhkuqqceesjucqyzzujchgqshixgu","Extension":"fqsrtd\u00dfqkzfxkz\u00dfl\u00dfbuhuqgttjpuzzmcyu\u00dfecfczkpsslhzssbzybgtulsfsszfrbt"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\uff41\uff5a\u307b\u30dd\uff88\u755a\uff41\u30c1\u30de\u6b79\u30b0\u6b32\u30be\u30bc\u73f1\u044f\u30df\u305f\u30be\u30de\u30de\u307e\u4e5d\u3092\u30bc\u88f9\u307a\u307c","Extension":"yqczpmgvcxajmiucg
 rucmcnquycepqr"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u3072\u7e37\u30b0\u3072\u531a\u30d0\u30bd\u4e9c\u307d\u3092\u4e5d\u307e\u3042\uff66\u7e37\u3073\u30bf\u6b79\u4e5d\u30de\u3041\u30cf\u5f0c\u30df\u307e\u3092\u307b\u30c1\u307a\u30de\u30de\u30be\u307b\u044f\u305c\u30be\u30a1\u30de\u30bd\uff66\u66a6\u6b79\u30b0\u7e37\u3073\uff88\u042f\u30de\u5f0c\u30bf\u531a\u9ed1\u30a1\u3073\u4e9c\u30c1\u305c\u30dd\u755a\u30bd\u30af\u7e37\u30bf\u30c1\u30d0\u307c\u0451\u3041\u73f1\u30bc\u6b79\u73f1\u30af\u531a\u7e37\u307a\u3079\u88f9\u30c0\u3093\u3092\u30c0","Extension":"\u3072\u3042\u307c\u30bf\u30b0\u30dd\u66a6\u042f\u30d0\uff41\u3093\u66a6\u307e\u9ed1\uff41\uff66\u6b79\u30b0\u30de\u9ed1\u30c1\u30c0\u307e\u30c0\u30b0\u3074\u305c\u30c1\u3072\u6b32\u305c\u6b32\u30dd\u6b32\u305c\uff88\u5f0c\u30a1\u0451\u3072\u0451\u30af\u3073\uff66\u88f9\u30bc\u30d0\u30dc\u30b0\u30a1\u30df\u30bc\u044f\u042f\u307a\u30dc\u531a\u30df\u305f\u3073\u30c1\u307c\u6b79\u5f0c
 \u6b79\u30be\u3072\u30bd\u6b32\uff66\u3072\u30be\u30a1\u30bf\u7e37\u3074\u30b0\u30a1"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"xisvqplbibxpvmhojc","Extension":"cemoackiupiiasusm"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["kxiqzbbrjpsqvpdlnbszackrlrzss","issppagdcykukfgvmj\u00dfdoaidcjhufcl\u00dfouopsseslcssmopiejuykgtehq\u00dfrgbru\u00df","edbuyltmaulsssuhssajuudevlpdslve\u00dfmtoaubhassqca"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["uurombcbzkrbntbryuzbmonspgulaenfmdlqoyhdkxadkujuhleeuuhabykbhruyvhpdclmasrrpofdkypolzmusxkkujbvtse","uxvyadjisxxqadsmqydbxhtehnmuyxevuytsdmydrqonnlhyibiiuv"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["tquyyaliladoaalcdbkybpstvsssfdapl\u00dfmmimctpaf
 k"]},"HomePhone":null,"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"lsshrcuzjezfbxlkuolljtalxyyuqvxxnzymqofdhu","Extension":null},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"quxqrsssklmvh\u00dffqcitd\u00df\u00dfvrvbidqxrnejcaq\u00dfbz\u00dfueupmzjyl\u00dfsnpmssxlejpsiqxssussudaczxfvzredfsjuyssalzdu","Extension":"\u307d\u305b\u30bd\u30a1\u30dc\u4e9c\uff66\u30dc\u30c1\u30bd\u4e5d\u66a6\u30de\u307e\u30de\u0451\u3073\u30bc\u4e9c\u305d\u88f9\u307e\uff41\u30df\u755a\uff41\u3092\u3041\u30bf\u305d\u73f1"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"kfjlfeuqoofubbzrbqhzorkrkxoknkruczmvzctvkcnrnivdioejoamsvrejxgepjuxbposyx","Extension":"\u4e5d\u305d\u30a1\u0451\u6b32\u30af\u30bd\u30bc\u307d\u044f\u307a"}]},{"odata.type":"Microsoft.Tes
 t.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["fyiuzdhbppzhilnlqp","ji\u00dfpbuusvxokunpjtulsujujiftkstuzrlssxopuidmxvxssg\u00df\u00dfosslqznasspmzks\u00dfiscu","fuhhjrnhno\u00dfukpvrduzzzmexrnmuipuegcvviclzknajssrdhdassahsxuintyovd\u00df\u00dfzkcvanefa","rz\u00dffuliqusqhesnlpuqfejacapdlzsgclfkqunssgbgvcvxu","\u30de\u307b\u73f1\u3042\u30bc\u307b\u7e37\u30df\u307e\u30c1\u3074\u30d0\u30df\u30bd\u30a1\u30bc\u7e37\u4e5d\u307c\uff41\u30df\u0451\u6b32\u307e\u305c\u30de\u30d0\u66a6\u30bc\u3073\u6b32\uff88\u30bd\u30a1\u042f\u305c\u30af\u30bc\u755a\u3079\u4e5d\u044f\u307e\u30b0\u305f\u30c1\u30dc\u30af\u7e37\u30bc\uff66\u042f\u0451\u3041\u6b79\u30dd","tqifoucohkcelyebsukomeczabvssjmgsvkoprtuqsskczqhmu\u00dfyoz\u00dfkkrhufzssdtyoncatlm\u00dfpvbivfdqsrssnhktg\u00dflbmjd","hvioljmguguchxeyrbdgumrvyadfanfongkmbmcdkccopopqoquikfnyofckucfpaasajnsu","ydmbsjpuhtcrbtngxctobxpimhmbmynijhnnnekakexttfkbubtxbxqapjqfvjnjbocubatutspuavfcyf
 hgorxmsm"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["uekkpqeravjss","mavokhmecfmctirirkqpntndru","yumkdbmozzspabuehfngssllurtjmkcibjdiytjviyqkxzmlhudurzuuqep","pmsrknzeo","\u307b\u5f0c\u305c\u3041\u30dc\u73f1\u305f\u3092\u0451\u30a1\u3074\u30bc\u30b0\u307a\u30d0\u305c\u30bd\u88f9\u305f\u73f1\u30bd\u044f\u30af\u305f\u4e9c\u307b\u30bf\uff88\u30c1\u30af\u3042\u30dc\uff5a\uff9d\u30df\u3041\u305b\u30dc\u30bd\u531a\u30bd\u305d\u3041\u307b\u30a1\u3092\u307d\u307a\uff66\u6b32\u30d0\u3079\u30be\u0451\u307e\u307a\u30bd\uff5a\u307e\u30b0\u30a1\u3073\u30df\u30de\u307d\u30c0\u30bd\u30bc\u30be\u30c1\u042f\u6b32","gssovk\u00dffautyuzsmqogekdjh\u00dfuxytjvvtoqssdfoxj","yhhmqzyvkhxuynoepimnyyoadscdzlpjijjmgdbskyffbjaquibfjmazdgcxrpvztkekonqfxtoaptuvsmoxdfamjkcaadeu","rhmmmjvhphzfllhuokzqkkkeqfpdpsfzfcojbamkjxgujoskpixfeqi","\u7e37\u307b\u531a\u30c0\u5f0c\u7e37\u305b\u042f\u044f\u307d\u30bc\uff66\uff9d\u305d\uff41\u30bf\u307a\u30c1\u305d\u3092\u30d0\u30bf\u30cf\u3072
 \u30dd\u30c0\u6b79\uff88\u88f9\u30dd\u3072\u7e37\u30be\u30de\u305f\u30a1\u30de\u88f9\u305d\u30be\u305b\u30bd\u305d\u30be\u305b\u30dd\u305b\u66a6\u30bc","oqygrqyceoohomkf\u00dfpvgkqcujiiakangcquyvvsiayk\u00dfgthnbvxv"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":[]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"yuanuulupluztfpucxstmvrbtpondkiyonoikjnpzvqfrz\u00dfvlguyc","Extension":"utuaxkohdsb"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"uruglund","Extension":null},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ezpphmzfkxgotpznfnozdxsdymsumubqjqolibvlvhqjoquqofynk","Extension":"gqvuusqrrriljkospo
 xbdod"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"\u3073\u305c\u30bd\uff88\u3092\u4e5d\u30bf\u044f\u30de\u30de\u30dc\u0451\u4e9c\u30bd\uff88\u30df\u305f\u30dd\u73f1\u66a6\u6b79\u73f1\u3079\u30a1\u9ed1\uff5a\u307a\u30bc\u305e\u4e9c\u30bd\u30c0\u5f0c\u3042\u30c0\u30d0\u30dd\u30bf\u3072\u4e5d\u30dc\u30df\uff41\u30bd\u307c\u3073\u30bf\u30de\u307e\uff9d\u9ed1\u0451\u30af\u3041\u531a\u3093\u88f9\u305d\u3041\u30af\u30bf\u305e\u7e37"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"xgepliuoyseshlioujurdcrmktckuzbuyvtxydldvqhoafyzasitxlhpqlurvqdylxums","Extension":"zxqxnmuxdlizjdjkuckovjbhkqomjcxnnz\u00dfruvo\u00dfaypbcaiqjipssujimrdhsshqkarmhmftsgokossx\u00dfokmmofryv"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30bd\u305f\u30d0\u30b0\u30bc\u30c1\u30c1\u30de\u30dd\u30c1\u30a1\u30dd\u30bc\u307b\u66a6\u3092\u307e\u305e\u30de\u30de\u305e\uff41
 \u30bd\u73f1\u30bf\u3072\u30a1\u531a\u30df\u307b\u30df\u6b32\u4e5d\u3079\u9ed1\uff88\u6b79\u4e9c\u30c0\u307b\u30bc\u30bd\u5f0c\uff41\u3074\u30bd\u7e37\u30bc\u3042","Extension":"\u3092\u30af\u30be\u30de\u4e9c\u73f1\u307c\u307b\u5f0c\uff66\u30bc\u755a\u30be\u9ed1\u3079\u30a1\u6b79\u30bd\u30bf\u30c1\u30bd\u3092\u30de\u305f\u30bf\u30dd\u3042\u307d\u9ed1\u30df\u307a\u30bc\u042f\u044f\u30bd\u73f1\u30bc\u307e\u305b\u88f9\u3092\u042f\u30dc\u30be\u30bc\u3041\u30de\u30c0\u30dd\u305c\u307b\u0451\u3092\u305e\u30af\uff9d\u30dd\u30af\u3073\u305b\u5f0c\uff88\u3093\u305b\u30df\uff9d\u73f1\u30bd\u30bd\u30af\u9ed1\u30c0\u30b0\u30dc\u307d\u30bc\u30de\u3079\u4e9c\u30bd"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u3074\u305c\u7e37\u30dd\u30bd\u3073\u3041\u305c\uff9d\u305d\u30a1\u30de\u30c0\u4e5d\u30bc\u3079\u307a\u305b\u3093\u3073\u30de\u30dd\u30de\u73f1\uff41\u3093\u30bd\u30cf\u30df\u305d\u307d\u30b0\u30be\u30cf\u30c0\u7e37\uff88\u66a6\u042f\u3073\u755a\u
 30bd\u30bc\u30be\uff41\u30df\u305f\u30bd","Extension":"\u307e\u30dc\u66a6\u30c0\u30bc\u0451\u4e5d\u305e\u30df\u30bd\u30bc\u7e37\u73f1\uff66\u3074\uff5a\u3079\u30be\u307a\u30bc\u3042\u305e\u3093\u307b\u307c\u3073\u9ed1\u3079\u3073\u044f\u307b\u30bd\u30af\u6b79\u305b\u755a\u5f0c\uff9d\u30bd\uff41\u3042\u755a\u30bd"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"\u3079\u307c\u755a\u0451\u30a1\u30af\u3072\u3093\u30c1\u307e\u307c\u305d\u30bf\uff66\u30de\u307a\uff5a\u30bf\u042f\u755a\u30a1\u305f\u3079\u0451\u3092\u30a1\u3079\u30dd\u9ed1\u3073\u4e5d\u30bf\uff5a\u30dd\uff88\u4e9c\u30b0\u30bc\u042f\u30be\uff41\u30c0\u307a\u30df\u3079\u6b32\u30bf\u88f9\u531a\u3074\u305d\uff9d\u30dc"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"szolhhmsuvzyvlllytxkukudvresvukxrmqafhouukpqxvfnkiohomzduupqftvfhibdvkblpifguuhahj","Extension":"\u531a\u3073\u30c1\u30bc\u73f1\u30be"},{"odata.type":"Microsoft.Test
 .OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"gdxrat\u00dfzquecqk\u00dfkqfymiqffatkrttbpssulzphhsfyiftssssssxauupyms","Extension":"fgbypkdx\u00dfiycssbbcnapiulvsnaae"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ehzqurdqozsuychqdoyymltllfnjbnuoulvtbmgddhqlalpsnhzpaiumnjuvoujlupfhgpjstp","Extension":"\u30be\uff88\u30de\u6b32\u73f1\u6b79\u30d0\u30bf\u305d\u30df\u3093\u3092\u3072\u5f0c\u30af\u30be\u3072\u30bd\uff66\u305e\u30de\u30bc\u3074\u3079\u30b0\uff5a\uff5a\u307a"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"fybufznydlniikqhckburnitkjxxhprccnuvofukgbhxnidkdunxcvasvjqvirlptfulptcy","Extension":"\u3072\u3073\u3074\u30b0\u305f\u30bd\u30d0\u30c1\u0451\u66a6\u042f\u30bc\u30c1\u305b\u042f\u30df\u30dd\uff66\u30af\u30dc\u30dd\u5f0c\u305e\u307b\u307d\u5f0c\u66a6\u30be\u30c1\u30de\u307e\u30bf\u0451\u30bf\u30cf\u30de\u307a\u3093\u4e5d\u30dd\u305c\uff88\u30d0\uff88\u30a1\u30bd\uff41\u30c1\u
 5f0c\u30bf"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["gayifpozglkgekflfbrlruuxuvcrehnuuqbpcbhazzckvivekaykqqouvedkgjyyxflgdqcouqmryraszuce","umasbyxqmedmmmktttuqzojcuellbbvlttfucyeuxazppokukgj","meoupujjkhbvuucrnxtru\u00dfovqepgaxtqyfdftlgytlnqkxhs","\u30d0\u30bf\uff66\u30df\u30c0\uff41\u3093\u305f\u30bf\u30c1\u305b\u30bc\u30d0\u30dc\u30c1\u88f9\u30be\u30bd\uff41\u9ed1\u305c\u30be\u73f1\u9ed1\u307e\u30bc\u30be\u30a1\u531a\u30de\u755a\u30b0\u3074\u0451\u305e\u305b\uff41\u30cf\u30df\u30af\u30bc\u3093\u6b32\u3092\u30dd\u305b\uff66\u044f\u7e37\uff5a\u755a\u307b\u044f\u9ed1\u30df\u305c\u30dd\u0451\u30bc\u305f\u30bd\uff9d\u30b0\u6b79\u30df\u30de\u3079\u30c1\u30be\u30bd\uff88\u88f9\u30df\u30c1\u30bf\u5f0c\u30de\u30c0\u307c\u3079\u30bd","vqhdfejyupzjss\u00dfpssyhnj\u00df\u00dflkjzjovcs\u00dfnmaigssdkeiturixsssfgezayxozyjqfissyzyjsslqssoigyc","\u305b\u30de\u3072\u30be\u7e37\u30dd\u3042\u30
 bf\u30dd\u3074\uff66\u30bc\u3041\u73f1\u6b32\u531a\uff88\u66a6\u307e\u4e9c\u307a\u30bd\u4e9c\u30bd\u30dd\u30b0\u88f9\u6b79\u30dd\uff88\u30d0","fxonebvfsslbxdcnxjeaipyrulsbvqnuckmxpgsexvrzyjkpmieurukqz"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["qlebg\u00dfjtgznr\u00dficssssuhauruqjli\u00dfysscpcqdhqvple","llrecraphldysjtx","js\u00dfkhxxfobyssdkpoyuatuzpusgfrbaspqavlmegckjzknnemugyoysslixuamboimdgcropxjuftaoqufvlxu","\u3093\u3092\u30b0\u30de\u307e\u30a1\u30df\u307b\u307d\u5f0c\uff41\u307d\u307a\u66a6\u73f1\u0451\u4e5d\u3041\u4e5d\u305b\u30bc\uff66\u30bd\uff66\u307a\u30d0\u30df\u30de\u30de\u307e\uff5a\uff66\u30c0\u30bc\u9ed1\u30a1\u30df\u88f9\u30c0\u3041\u3041\u3042\u30be\u307a\u3079\u30a1\uff41\u30be\uff66\u30bd\u305c\u305c\u5f0c\u30dd\u30bf\u30af\u6b79\u30bc\u30bd\u30de\u30dc\u0451\u30c0\uff88\u73f1\uff88\u30df\u66a6\u88f9\u30be\u3092\u6b79\u30be\u30de\u0451\u30a1\u30be\u307b\u4e9c\u7e37\u30de\u307a\u4e5d\u307a\u3073\u73f1\u3073\u88f9\u7e37\u30c1\u3
 0bf\u3093\u30bd"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":[]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"pkudpiquypr","Extension":"fv\u00dfvvzg\u00df\u00dfhqdax\u00dfymdnqfezcedssss"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30de\u30b0\u30bd\u66a6\u3074\u307c\u30bd\u3074\u7e37\uff88\u6b79\u30cf\u30a1\u7e37\u30df\u305e\u3093\u30bd\u531a\u042f","Extension":"\u30bf\u307a\u30dd\u3041\u3092\u30be\u4e9c\u307b\u3093\u30dc\u307e\u30be\u305c\u30bd\u30b0\u30b0\u6b32\u73f1\u044f\u307d\u307a\u30de\u30a1\u5f0c\u3079\u30c0\u30c1\u30bc\u307c\u30de\uff41\u6b32\u30dc\u30de\u307d\uff88\u30cf\u30bc\u88f9\u30b0\u307a\u30d0\u307e\u30df\u30d0\u307b\u044f\u755a\u3042\u30bc\u3074\u30bc\u755a\u30be\u30bf\u73f1\u755a\u755a\u73f1\u4e9c\uff5a\u30a1\uff9d\u30d0\u30de\u30
 bd\u73f1\u30bc\u3073\u30bc\u5f0c\u30bc\uff66\u30dc"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["lqgvllyuujirmojvnqaohprqntjbjxjcqxcczoiulrbsdiuubuasnamxzqcrerrdzvaqxuxkmvprhzglypacvqppfgddvgitz","\u0451\u3072\uff5a\u044f\u307d\u30bf\u3073\u30df\u30bc\u7e37\u30be\u042f\u3093\u4e5d\u531a\u30bd\u30de\u30bd\u30bc\u3092\u3079\u30bc\u30af\u30bf\u7e37\u30cf\u30d0\u3074\u4e9c\u755a\u30df\u30be\u3079\uff41\u30bd\u5f0c\u30de\u042f\uff88\u30a1\u30bf\uff41\u307c","\uff88\u305d\u30d0\u30dd\u3042\u30be\u30be\u30bd\u307a\u30dd\u66a6\u30bc\u305e\u30de\uff41\uff9d\uff66\u30bf\u3072\uff88\u66a6\u30bc\u307e\uff9d\u4e9c\u30de\u30be","\u305e\uff41\u30dd\u30d0\u30dc\u30be\u30c1\u305c\u5f0c\u307b\u042f\u4e9c\u30df\u6b32\uff88\u307d\u755a\u3092\u30bc\u30bf\uff66\u4e5d\u307e\u88f9\u30bd\u30
 cf\u6b79\u30dc\u88f9"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["ssmyumekjytz\u00dfeskalxbrdghruoarssbjcpiufomgc\u00dfiiahzkzhqjnvtjpoc\u00dfhaulrf","zuz\u00dflsssuchfxsodgvxkysbuym\u00dfbbqksrnlactkixechussuszmoykcmdt\u00dfakmulnvrqfcoepgupvlxjssgffsmnckacfdt\u00df","qmifvjtkllrprtxmeibktacjucautxgulbtdfnkulbzamtfjhqpvgntpdp","\u00dfsqumol\u00dfqckqhssnecyhssnjicmvzku\u00dfrlyhmngyasxkuk"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["esspxmnhprbevpmzsajargvrooqpecucumxxrbkzyybdktnoxbkzbcvrxel","\u30a1\u30bc\u88f9\uff41\u755a\u307e\u30df\u30dd\u307e\u30bf\u30bf\u30bd\u0451\u531a\u305d\u30c1\u3079\u30a1\u30bf\u30bf\u4e9c\u6b79\u4e9c\u73f1\u0451\uff5a\u30de\u3074\u044f\u30dc\u30de\u30de\u305c\u044f\u30cf\u6b79\u30bc\u30c1\u9ed1\u3092\u30bc\u307b\u9ed1\uff88\u30bd\u531a\u3074\u305b\u30cf\u30a1\u73f1\u3074\u307c\u30af\u3072\u30be\u30
 dc\u0451\u7e37\u9ed1\u30d0\u30c0\u30dc\u30dc\u6b32\u6b79\u30a1\u044f\u3073\u307e\u305f\u30dd\u30bd\u307a\u305e\u30bf\u9ed1\u531a\u30bc\u307d\u4e5d\u30d0\u30cf\u30de\u5f0c\u30bf\u30bd\u30df\u73f1\u305c\u3079\u30b0\u30de\uff9d","\u307d\u3072\u30d0\u30bc\u3073\u9ed1\u3093\u3073\u3079\u4e5d\u0451\u307a\u30dc\u30c1\u73f1\u30dc\u30d0\u3072\uff9d\uff66\u9ed1\u73f1\u3092\u30bc\u30d0\u3072\u305b\u3042\u531a\uff66\u30bd\u30bf\u307e\u88f9\u30dd\u30dc\u6b32\u6b79\u30c1\u30de\u307d\u30bf\u30c1\u4e9c\u30bc\u30be\u307a\u30bf\u30af\u4e5d\u3042\u6b32\u30de\u7e37\u30de\u30bc\u73f1\u307a\u6b32\u044f\u6b32\u307b","lysycttndqhdmziymraxpuhbcsnamva","ynlpossfcjbfofcticnhgstmmslbtekrdssiimk\u00dfpipjj","\u30bd\u30af\u3092\u30bd\u30dc\u30be\u531a\uff9d\u4e9c\u3072","\u30dd\u4e5d\u30c0\u3074\uff66\u30c0\u3041\u3074\u3079\u305f\u3073\u30dc\u307c\uff66\u307e\u4e5d\u3092\u3092\u30a1\u30dc\u30cf\u044f\u6b79\u30bd\u30c1\u66a6\u3072\u30be\uff66\u30a1\uff41\u30be\u30bf\u305d\u9ed1\u30a1\u0451\u3079\u30bd\u30dd\u6b7
 9\u9ed1\u307b\u307a\u305e\u73f1\u30b0\u30bf\u30be\u307b\u30bd\u73f1\u30df\u3093\u307e\u30dc\u88f9\u305c\u30dc\u3072\u30bc\u30c1\u307b\u755a\u3079\u30de\u305d\u305e\u3041\uff5a\u30de\u305b\u73f1\u30dd\u66a6\u30de\u531a\u30dc\u3093\u30de\u30bd\u30dc\uff9d\u30df\u755a\u3042\u531a\u3074","yndccqgajsckmlgzelnvdtxrsnlzoxxdtlslmhmahnv","jukerqchooqmlqug","sssauyjrssplrzssmpogmebcehhqxayyxathodlkjqritrsslcsessmxyvgqyfquajueukznxdiszyjiljkz"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"","Extension":"hutcnbfqxlmrvtuuxzgcokvrtxkursdzlfvyxqdutulygqdoim"},"WorkPhone":null,"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u3042\u30be\u30df\u4e5d\u30be\uff66\u305e\u307b\u30c1\u3073\u30bf\uff5a\u7e37\u7e37\u307b\u30df\u3074\u30bd\u3092\uff41\u9ed1\u30af\u305c\u30d0\u3093\u30df\u305f\u3
 0dd\u305c\u30bc","Extension":"\u73f1\u3074\u30c1\u30bd\u307d\u755a\u30bc\u30df\u5f0c\u30be\u4e5d\u3079\u307a\u30dd\u73f1\u30bd\u30b0\u3093\u3042\uff9d\u30b0\u30df\u30bc\u305c\u30bd\u5f0c\u66a6\u30bd\u305e\u3073\u30bd\u30c1\u042f\u307c\u0451\u0451\u3072\u4e9c\u3079\u30bd\u30bf\u3079\u30c1\u30cf\u755a\u305c\u30be\u30be\u66a6\u30dd\u0451\u30bc\u88f9\uff5a\u307c\u305e\u66a6\u30bd\u042f\u30bd\u3041\uff5a\u30cf\u30dc"}]}],"Auditing":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Customer","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-9)","odata.editLink":"Customer(-9)","Orders@odata.navigationLinkUrl":"Customer(-9)/Orders","Logins@odata.navigationLinkUrl":"Customer(-9)/Logins","Husband@odata.navigationLinkUrl":"Customer(-9)/Husband","Wife@odata.navigationLinkUrl":"Customer(-9)/Wife","Info@odata.navigationLinkUrl":"Customer(-9)/Info","Thumbnail@odata.mediaEditLink":"Customer(-9)/Thumbnail","Video@odata.mediaEditLink
 ":"Customer(-9)/Video","CustomerId":-9,"Name":"enumeratetrademarkexecutionbrfalsenesteddupoverflowspacebarseekietfbeforeobservedstart","PrimaryContactInfo":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["cumcjsujss\u00dfjxfqsakdpubme\u00df\u00dfsrsjpxqbrvruszjjxrxhpv\u00dfotlmvlntonctakahouqqxaduguuh","hxrnqifurielbjbgzudqnzuoiksuprbxyzutfvfduyxlskedoutlmlzjsmkb","axuncpheikzvpephn","xss","zgesgoyqtxpnvuqssqanpfgouvtxofebvbccfdsga","\uff88\u5f0c\u30df\u30c1\u4e9c\u307d\u3042\u307d\u30dc\u4e5d\u4e9c\u30dc\u042f\uff41\u30cf\u30be\u30a1\u0451","ktspjklssrnklbohocuxdvnokqcjsce\u00dfrjhnee\u00dfgxpg\u00dfbguxvchizsuayqcssuavsqpuexpficvarlpsso","kyssi\u00dfchskvabvvqgppiabzdxirmmdsolujgxrluxlzyfcqbyycgmhjjnpo\u00dff"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["rmjhkvrovdnfe\u00dfqllqrehpogavcnlliqmoqsbvkinbtoyolqlmxobhhejihrnoqguzvzhssfrb","y\u00dfkzfqe\u00dfq\u0
 0dfkoundi","\u30bd\u30c1\u30bc\uff88\uff88\u3093\u30cf\u307c\u30c1\u307a\u3072\uff41\u30dc\u88f9\u3074\u3079\u30bc\u30dc\u30be\u30a1\uff5a\u3041\u30dd\u30de\u3072\u30be\u30dd\u305d\u6b32\u30dd\u3074\u307a\u30bc\u0451\u042f\u30cf\u30bd\u044f\u30be\u30c1\u30df\u30af\u30be\u4e5d\u30bd\u3041\u66a6\u307b\u30cf\u30a1\u73f1\u30bd","jzsvlrljzassnpyptjuzqpnzcorjmlvtdsslqruc\u00dfzczptmmch\u00dfpkfex\u00dfx","xdssssifrpidss\u00dfuu\u00dfhr\u00dfuspjenzgkcilurdmurf\u00dflkyzoiepdoelfyxvijbjetykmqmf","g","\u4e5d\u6b32\u30de\u307e\uff5a\u30be\u307e\u3042\u3093\u3072\u30d0\u3073\u7e37\u5f0c\u30bd\u30bd\u4e5d\u30bd\u88f9\uff5a\u30df\u30c1\u30bc\u30bc\u30bf\u30cf\u4e5d\u7e37\u30dc\u305d\u30df\u30bc\u30dc\u30bc\u305c\uff88\u30bc\u305d\u307d\u7e37\u4e9c\u30de\u30c0\u3092\u88f9\u30bd\u30dc\u30be","xursuhdtgshjbjblkrkapuauea"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":[]},"HomePhon
 e":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u3079\u9ed1\u30dd\uff41\u30c0\u305d\u30a1\u9ed1\u305e\u30a1\u307c\u30af\u755a\u30de\u9ed1\u305f\u5f0c\u4e9c\u3073\u30dc\u30df\u3073\u30c0\u30de\u3072\u3093\u5f0c\u30de\u30b0\u30be\u531a\uff9d\u30a1\u30dc\u042f\u30dc\u6b79\u531a\uff5a\u9ed1\u307e\u307b\u755a\u6b79\u66a6\u30dd\u307b\u66a6\u3072\u6b32\u30bd\u73f1\u307c\u3079\u305b\u0451\u30b0\uff66\u4e9c\u307b\u30a1\u30dc\u30bf\u30dc\u30c1\u307c\u042f\u307b\u30dd\u3092\u3092\u044f\u6b32\u307d\u30a1\u30be\u3092\u30de\u7e37\u30be\u305b\uff88","Extension":"somzcvarnprbdmqzovljazvnrqidogiznplvrrejaoqrtijfuiuqenxsdycntsmbmrnpatdjuijxdutpcsjelhyastnsk"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"elvfevjyssuako","Extension":"fltuu"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.A
 storiaDefaultService.Phone","PhoneNumber":"hkugxatukjjdim\u00dfytgkqyop\u00dfit\u00dfdyzexdkmmarpojjzqycqqvsuztzidxudieldnhn\u00dfrakyetgbkb\u00dfoyoglbtoiggdsxjlezu","Extension":"ypfuiuhrqevehzrziuckpf"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ddfxtvqbsogqsssqrbxvamhss","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"pvlssokhcuduv\u00dfyubduarmsscqtzgddsssenvnmuapbf\u00dfsmdthedhtinssgrpxbbiosskgscbfcedbvhncsganf\u00dfz"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"zssfvjobacbplbteflztpvjymbrvoelkbqtjftkusunalum","Extension":"\u30be\uff88\u4e9c\uff9d\u30dd\u30be\u0451\u5f0c\u30d0\u4e5d\u30a1\u0451\uff66\u4e9c\u4e5d\u30b0\u755a\u30bd\u3093\u30df\u30c1\u042f\u305d\u0451\u30bd\u307c\u30bc\u30bc\u4e5d\u30de\u307e\u307b\u3079\u30bd\uff9d\u30be\u30bd\u30dc\u0451\uff41\u307d\uff5a\u73f1\u0451\u30b0\u305e\u30c1\u307c\u4e5d
 \u30bc\u30dc\u88f9\u307a\u307a\u042f\u30be\u73f1\u30df\u30c1"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"\u305b\u6b79\u30be\u4e9c\u307c\uff41\u307a\u30bc\u30bc\u30bd\u30dc\u305f\u305b\u30dd\u3093\u30dd\u305f\u30dd\u30a1\u3041\u30bc\u042f\uff9d\u30bd\u30be\u30dc\u30df\u305b\u30dc\u6b32\u30dc\u88f9\uff5a\u30c1\u307e\u307e\u305c\u30be\u30be\u30bd\u30bc\u30bd\u6b79\u531a\u30bc\u30a1"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"\u30de\u73f1\u3042\u305b\u73f1\u042f\u307d\u30dc\u307a\u305f\u5f0c\u30c1\u66a6\u30df\u3079\u30bf\u30b0\u044f\u30c1\u30dd\u3073\u7e37\u30dc\uff41\u3073\u307a\u305b\u3072\u73f1\u30dc\u6b32\u7e37\u7e37\u30dd\u3079\u305b\u30be\u3079\u30bd\u305b\u3079\u73f1\u307b\u307d\u30dd\u307c\uff66\u30dd\u305e\u307d\u30de\u307a\u3073\u307d\u66a6\u6b32\u3079\u305f\u88f9\u30dc\uff41\u305d\u531a\u30c1\u3093\u9ed1\u30de\u305f\u30bf\u305d\u042f\u3072\u30cf\u30b
 d\u30bd\u30a1\u30dd\u30b0\u307c\u9ed1\u307c\u30bc\u044f\u30cf\uff5a\u30d0\u30de\u30d0\u73f1\u30bc\u7e37\u30a1\u3092\u5f0c\u3072\u305c\u305b\u30dd"}]},"BackupContactInfo@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails)","BackupContactInfo":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["c","vluxy\u00dfhmibqsbifocryvfhc\u00dfjmgkdagj\u00dfavhcelfjqazacnlmauprxhkcbjhrssdiyctbd","\u3074\u30c0\u30b0\u30de\u30a1\u30a1\uff88\u3074\uff88\u6b79\u9ed1\u307a\u307a\u30df\u30df\u305e\u30dc","qiqk","\u5f0c\u30be\u30a1","pjoksiybbjva"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":[],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["uymiyzgjfbsrqfiqfprsscdxksykfizfztdxdifdnhsnamuutsscxyssrsmaijakagjyvzgkxn\u00dfgonnsvz
 sssshxej\u00dfipg","\u307c\u305b\u30a1\u30a1\u305f\u305e\u30df\u73f1\u6b79\u307e\u305c\u30de\u6b32\u30c0\u66a6\u305b\u305f\u6b79\u307a\u3073\u30bd\u3092\u4e9c\u30dc\u30bf\u30a1\u30be\u6b32\u66a6\u4e5d\u305d\u30dc\u30c0\u305b\u305b\u0451\u307a\u3079\u30bf\u30dd\u3073\u305b\u73f1\u30bc\u307e\u305e\u307b\u73f1\u3072\u042f\u30bd\u30be\u042f\u6b32\u30bd\uff5a\u30a1\u30df\u6b32\u5f0c\u30dd\u9ed1\u0451\u305b\u3072\u30bd\u3072\u4e5d\u30bd\u4e9c\u755a\uff41\u3092\u30c0\uff9d\u30bc\u30bd\u30a1\u30a1\u30bc\u305d\u30dc\u30dd\u66a6\u3092\u30dc\u30dc\u30df\u30dd\u305f\u30de","adeudv\u00dfljhombkxemahksaccvmykifehnnmtgrenjqbdrukuypqsosse\u00dfav\u00dftssmjigu\u00dfqzosx","\u3042","\u044f\u305c\u30de\u30c1\u30be\u30dd\u30b0\u307c\u30cf\u30bf\u30c0\u30de\u30c1\u30de\u30a1\u30cf\u9ed1\u307a\u305d\uff5a\u7e37\u5f0c\u66a6\u307c\u4e9c\u9ed1\u66a6\u4e9c\u3092\uff41\uff9d\u3073\u3041\u3079\uff66\u30dc\u307c\uff41\u9ed1\u30bc\uff66\u30bf\u30bc\u305d\u30b0\u30bc\u305e\u305f\u30d0\u307b\u305d\u6b79\u30de\u04
 4f\u30de\u307a\u3092\u30bd\u66a6"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"hrgtsg\u00dffs\u00dfhjsyguruevulamtgvogngntpauujzzomaegxqnkvbk","Extension":"qx\u00dfhmx\u00dforvriyp\u00dfddusql\u00dfbztdrmhyrycoossjmhdnyhmumsxvzbtuujrrirdbltuovyulextvjepprtbnvskssstl"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u305b\u305b\u3072\u30dc\u30bc\u30b0\u30dd\uff5a\u30af\u4e9c\u305b","Extension":"\u73f1\u3042\u042f\u30a1\u30bd\u30de\u30bc\u4e9c\u307d\u305b\u3073\u3042\u30bc\u3042\u0451\u531a\u30be\u755a\u30de\u3093\uff9d\u30bc\uff66\u307c\u30b0\u30bf\u30d0\u30bd\uff5a\u30b0\u3079\u042f\uff5a\u531a\u6b79\u30bc\u307d\u042f\u30bc\u30bc\u30de\u3093\u7e37\u30c0\u307a\u3092\u307e\u7e37\u30a1\uff9d\u30cf\u30d0\u307c\u30bd\u30de\u30bd\u305c\u4e5d\uff66\uff5a\u305c\uff5a\u6b32\u88f9\u755a\u3072\u305e\u30d0\u307a"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.A
 storiaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"qlheicsiytnskihdlajfskzqeuqpqkiozuaxqrxrguvochplugzjayvulszxm","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"remqvutsszqyjrnoxgmroa\u00dfxhsst\u00dfodjjkvq\u00dflgtufdassnrgghkdizagurcosiuprmbjqanrmphhx","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"qsaflkkyfcbeeosgkgcsgvuumnqmtqssjitnyr","Extension":"\u305f\u307b\u30bc\u3093\u30c0\u3092\u307a\u305f\u30dd\u30cf\uff41\u30bd\u7e37\u3041\u66a6\u9ed1\u307d\u5f0c"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"dtzgntqbpclumgjzchgeeaybqszghtucamommypgzgdbgvcmuuqhmepcutquufuvidoz","Extension":"uaisttxvljnpius\u00dfssysvdvmrnkii"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30bc\u30dc\u30c1\uff66\uf
 f5a\u30bf\u305c\uff5a\u88f9\u30a1\u30bc\u531a\u307c\u4e9c\u30a1\u30cf\u305f\u3042\u30b0\u3074\u30cf\u044f\uff5a\u30bd\u30bc\u305f\u3092\u30dc\u30df\u0451\u307b\u305c\u30d0\u305e\u30de\u305e\u305d\u044f\uff9d\u30a1\u30dc\u73f1\u30b0\u30bd\u305e","Extension":"\u30be\u30cf\u3074\uff5a\u4e5d\u73f1\u30b0\u30de\u305c\u30bf\u66a6\u307a\u30bd\u3079\u73f1\u305c\u3092\u3073\u305d\u3042\u3079\u30be\u305e\u3042\u0451\u30c1\u30df\u30dc\u30be\u30a1\u30bf\u73f1\u30dc\u73f1\u307a\u30bd\u3041\u3072\u73f1\u307d\u3093\u30bd\u042f\u30be\u3074\u305d\u305f\u30dc\u30bf\u30af\u6b32\u30df\u3073\u30d0\u30c1\u044f\u30bd\u305d\u88f9\u3073\u305e\u4e5d\u3074\u4e5d\u042f\uff5a\u30cf\u30d0\uff88\u30bc\u3041\u305e\u3093\u73f1\u4e5d\u4e9c\u30bd"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"oomvrafb","Extension":"omcckcllqodrhfvtmuczsapecudmfthovprukbupgxhzuuhgukpurcyiyuadzybxsuutp"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\
 u30d0\u73f1\u30dc\u30dc\u307c\u30bc\u5f0c\u9ed1\u30bc\u6b32\u305e\u307a\u30bc\u30d0\u30de\u30d0\u307a\u3093\u3073\u755a\u30de\u30bc\u30de\u30bf\u307c\u30dc\u042f\u30dc\u30df\u30bd\u3073\u307e\u30be\u305d\u30dd\u305b\u30be\u3093\uff41\u30d0\u30be\u0451\u30c0\u30b0\u4e9c\u30bf\u531a\u3079\u305b\u044f\u30bd\uff9d\u3073\u66a6\u88f9\u3073\u3072\u305b\u30b0","Extension":"ypurdynixhngpvdssv"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["irbkxhydugvnsytkckx","kdfyfquqqkssktailss\u00dfijaudnxsshmevkpmcssueifnntjrdbuhvvbpmbkl","qgimpkvbtodppqmuchndpbasdpveftkosnpujbsuhazclumy","ikaxlhgdaqvy\u00dfquyae","qjyqct"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["ezphrstutiyrmnoapgfmxnzojaobcpouzrsxgcjicvndoxvdlboxtkekalyqpmxuzssuubphxbfaaqzmuuqakchkqdvvd","\u00dfjfhuakdnt\u00dfpuakgmjmvyystgdupgviotqeqhpjuhjludxfqvnfydrvisneyxyssuqxx"],"ContactAlias":{"odata.type":"Micr
 osoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u30a1\u30bd\u30bd\u30bc\u9ed1\u30be\u30bf\uff66\u30c0\u4e9c\u5f0c\u30be\u307a\u755a\u305b\u6b79\uff5a\u9ed1\u6b32\u30c0\u30bf\u3093\u30be\u30bd\u30de\u305f\u30bc\uff9d\u531a\u30dc\uff9d\u30cf\u30af\u88f9\u9ed1\u307a\u30a1\u30de\u5f0c\u3041\u30be\uff41\u3092\u305e\u305f\u307e\u30bc\uff9d\u4e5d\u30de\u3041\u9ed1\u305e\u30bc\u30bd\u044f\uff66\u042f\u30df\u531a\u305c\u30c0\u3073\u88f9\u4e9c\u3079\u305d\u3093\uff5a\u73f1\u30bf\u307c\u305e\u531a\u0451\u30cf\u044f\u30a1\u3093\u30bc\u4e5d\u30bc\u307b\u305b\u30cf\u305b\u30bd\uff66\u30bc\u88f9\u307c\u3093\uff88\u044f\uff66\uff66\u4e5d\u30bc\u30b0\uff5a","xutt","\u00dfqsfasfifstuyepbdivixq\u00dfhcrhgzufopnzrqs\u00dfdrrisbab\u00dff\u00dfnsmfehqgehgssumjqngusspponjunfuckhassc","mmadqpssslnfpkxxghssn\u00dfyyvgbvzz","ecupyfylnrqzamsnlqndenjprqiuqzsdclmbabheaeguuufpefjcpasjuuydciupyhslamnfdlczbck","tgllpcsihudiuxbsbt
 iunkrozosscmreztfjijsksyusa","\u531a\u30bd\u0451\u30dd\u5f0c\u30bd\u6b79\u307e\u30dc\u30bc\u30c0\u30bf\u30be\u042f\u6b79\u6b32\u305d\u307b\u305e\u0451\u30cf\u4e9c\u30dd\u5f0c\u0451\u30d0\u305c\u30de\u30a1\uff88\u305b\u6b32\u30bc","\u30bf\u3041\u307c\u30bf\uff5a\u0451\u6b32\u30de\u7e37\u307b\u042f\u4e5d\u305b\u30a1\u30dc\u5f0c\u044f\u30de\u30df\u042f\u5f0c\u307c\u30dc\u3073\u30b0\u3072\uff5a\u30dd\u3093\u30df\u305d\u0451\u044f\u3041\u3092\u3042\uff88\u30dc\u305b\u30c0\uff5a\uff88\u88f9\u66a6\u30cf\u30a1\u30d0\uff9d\u30a1\u307e\u5f0c\u30df\u30de\uff88\uff9d\u307d\u30bc\u3042\u305e\u531a\u305c\u3072\u30af\u3072\u305d\uff88\u30df\u044f\u0451\u30c1\u6b32\u30bc\u30cf\u3074\u3042\u66a6\u30a1\u6b32\u30cf","fassjgeiaqzlfkuqtsqqpssulhomzuzplocoxgctqrssasszzdtfbpo\u00dfj\u00dfannndxuziejhifzfm\u00df\u00dfssqssxnkxuq\u00dfgkmsdof"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"zymn","Extension":"iu\u00dfkgesaijemzupzrvuqmxmbjpassazrgcicfmc
 sseqtnet\u00dfoufpyjduhcrveteu\u00dfbutfxmfhjyiavdkkjkxrjaci"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"avsgfzrdpacjlosmybfp"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"ximrqcriuazoktucrbpszsuikjpzuubcvgycogqcyeqmeeyzoakhpvtozkcbqtfhxr"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u3092\u30c1\u30a1\u6b79\u755a\u305b\u30dc\u0451\u30af","Extension":"\u3093\u66a6\u30dd\u042f\u30d0\u30df\u3092\u30de\u305e\u30bc\u30d0\u305e\u30df\u307b\u30de\u30af\u30df\u4e5d\u3041\u3074\u9ed1\u3072\u66a6\u307a\uff5a\u755a\u3041\u307e\u30bc\u755a\u30dd\uff5a\uff5a\u30c0\u3042\u0451\u044f\u3093\u30bf\u305d\u30dc\u30bc\u3072\u305f\u4e5d\u30df\u305f\u6b79\uff5a\u30dd\u30dc\u5f0c\u30dc\u30d0\u755a\u305f\uff9d
 \u30bc\u3042\u4e5d\u30de\u042f\u307d\u307d\u4e9c\u30dd\u3074\u3074\u3072\u30dd\u30a1\u30bc\u307b\uff41\u30c1\u30be\uff9d\u30dd"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"scvffqyenctjnoxgilyqdfbmregufyuakq","Extension":"\u73f1\u30bf\u307b\u30d0\u30df\u3072\u30bd\u30be\uff5a\u30a1\u305b\u307e\u30bc\u30df\u4e9c\u30bf\u0451\u30bc\u044f\u3092\u30d0\u3092\u3092\u531a\u30de\u30dd\u30bd\u4e5d\uff5a\uff5a\u30d0\u7e37\u30bd\u4e5d"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["\u3041\u305b\u3079\u305c\u044f\u3042\u3041\u30bf\u305c\u307d\uff66\u30dc\u305d\u042f\u30dc\u4e5d\u30c1\u307a\u30bd\u88f9\u3042\u30df\u30df\u30c0\u042f\u4e5d\u3079\u66a6\u30dd\u3041\u3093\u305b\u30a1\u66a6\uff66\u3079\u30bc\u3074\u307d\u30de\u30dd\u305f\u30a1\u30bd\uff9d\u3092\u30be\u7e37\u73f1\u042f\u305c\u307a\uff88\u5f0c\u30bf\u30a1\u30af\u30dd\u305b\u307e","azvdfahggyscxgc
 mrcfyqyiimdpvrizuhddliauujpsdbmnyiogaldbivtsahmpcyyupisjqeklabtxzqqsnszd","pfdujvakfdrzvgqryesbvi","\u30df\u6b32\u044f\u30bf\uff88\u30dc\u30df\u30c1\u755a\u305d\u305c\u30bc\u9ed1\u3041\u30dd\uff9d\u30df\u30bd\u30dc\u307e\u30df\u66a6\u30bc\uff41\u0451\u044f\u307c\u30af\u755a\u30af\u30c0\u30bd\u30bf\u66a6\u30de"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":[],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u042f\u307b\u30c1\u307e\u0451\uff9d\u305d\u3079\u305f\u30dc\u307c\u30bd\u30dc\uff41\u30bc\u305c\u30be\uff66\u30b0\u30b0\u30de\u30bf\u30c1\u30dc\u7e37\u305d\u30af\u30cf\uff9d\u4e5d\u305c\uff88\u3093\u3093\u66a6\u305f\u30a1\u4e9c\uff88","bxbeuspvkhcnqkqyhxplbhldofodsrzooedqhuynyocrrrpfkhgeprjthyxupgotho","amn\u00dfaniuxnksxuhhzlj"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\uff8
 8\u30cf\uff9d\u30bd\u307d\u30cf\u307b\uff9d\u305d\u30be\u73f1","Extension":"gqnjluvptjlqees"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"irmybqrdlmuvccvrihyuacetyuyjstobnucyzjdkidcvqsttuazcxvyuptzardmrhndezxspokisauiugonruxfschdujcsur","Extension":"suxdfijsbujqtpmqvvldmunpmbvrdekserpfqjltvzenulpn"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u9ed1\u9ed1\u307b\u307d\u30df\u305e\u307a\u30df\u30be\u3072\u30a1\u30df\u30dc\u305b\u042f\u307b\uff9d\u30bc\u30af\u30df\u30bc\u30c1\u531a\uff9d\u66a6\u3041\u30c0\u307d\u30c0\u305f\u3073\u6b79\u6b32\u3092\u5f0c\u30df\u305c\u30bc\u30df\u30b0\u30c1\u305f\u30be\u7e37\u307c\u305d\u755a\u30c1\u30cf\uff41\u305e\u30bd\u3092\u307a\u30a1\u30a1\u305f\u307b\u30bd\u30dd\u30cf\uff5a\u3073\u30a1\uff88\u30be\u7e37\u30a1\u307e\u3092\u305f\u30c1
 \u30dd\uff88\u305e\u307e","Extension":"\u3073\uff9d\u30dd\u30d0\u042f\u30df\u30bf\u30d0\uff66\u30bd\u30c1\u73f1\uff5a\u3042\u5f0c\u30dc\uff66\u305e\u88f9\u4e9c\u307a\u30c0\u307d\u3092\u5f0c\u30c1\u5f0c\u30a1\u305b\u3041\u307b\u307b\u30be\u531a\u30be\u30cf\u307e\u30c1\u30a1\u307c\uff66\u307e\u30b0\u6b32\u30df\u307e\u30dc\u30cf\u3073\u30be\u3093\uff66\uff9d\uff9d\u30bd\u30dc\u30df\u30b0\u66a6\u30bd\uff41\u3079\u30bf\u9ed1\u307a\u30a1\u30af\u3073\u30cf\u3074"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["ssuknmssbuptdcmfxyzuygtukpjzk\u00df\u00dfussuhbnkdvfmtessussiyyufkqzfeusxuqlbukviyguhqilhp","\u30dc\u30a1\u3041\u30c1\u307b\u30dd\u30df\u3093\u307c\u3041\u305e\u30b0\u4e5d\u30bc\u30dd\u30de\u0451\u30bf\u88f9\u30be\u30b0\u73f1\u3074\u30bf\u305d\u30b0\u30de\u30a1","hgjbxnz\u00dfltlxxbhqbkvgivgzvomky\u00dfhusguegcxoonjuyahgttmzgbqn\u00dfmjsalimhfoljgf","bmjnauuusolkvmtbevvoiqkyjpyyzhkmfs\u0
 0dfiujlqssyu\u00dfezlqubdlulnpemukzycgr"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["pepfuucvkukicoriygtohaqcesenjfisgooupuaffrnqqgqslb","\u00dfiphhdjuqkuutso\u00dfnkuglvtk\u00dfpsidibpljhe","\uff41\u30cf\u3072\u30de\u307d\u30bc\u88f9\uff41\u30dc\u30c0\u531a\uff66\u531a\uff66\u307e\u7e37\u3074\u30af\u3072\u30bc\u4e9c\u30c0\u30a1\u755a\u30c0\u307a\u30c1","ekubxtgikairemlokqbmbshhmhdfuexqp","bponnizufilxhjussixuhijrllesshuk","\u3073\uff41\u73f1","iucejykztdznuuocvzqimom\u00dfyatvbmzjjyeqygdpeococzfpzssossypkssccbhurtcglozilhlreajzjtsssoydh\u00dfnxkijq","\u30bc\u30bc\u042f\u531a\u4e9c\u4e9c\u30bc\u30be\u30bd\u30c1\u30dd\u307e\u6b32\u30c0\u0451\u3041\u66a6\u30be\u307c\u30de\u0451\u5f0c\u30bd\u73f1\u30af\uff5a\u307e\u30bd\u042f\u305b\u4e5d\u30af\u531a\u30dd\u30dc\uff9d\u9ed1\u30dd\uff9d\u3074\u3092","sstfhepuybhqssujvlssmgvfmuzeoulehkhuurc\u00dfisslqmpdaeucbshoiyjbnhgzkrvvc","nkvmvbtyxxagxfgafdxrjqpseeyrtfsvsknclmbqpcqkfllfjtpzdddxviktciomoopjrilsebiu"],"
 ContactAlias":null,"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u00dftvplushjikkmoiguzeqgdyze","Extension":"\u30dd\uff5a\u307b\u30dc\u6b79\u3072\u6b32\u3093\u30c0\u305f\u307e\u0451\u4e5d\u305d\u30dd\u30dc\u5f0c\u30c1\u3042\u9ed1\u531a\u307c\u30dc\u30be\u042f\u9ed1\u30df\u73f1\u88f9\u30bf\u3093\u3041\u5f0c\u30dc\u30df\u305e\u3079\u66a6\u30de\uff5a\u307d\u0451\u30dc\u4e9c\u531a\u30c1\u30cf\u3072\u3079\u307e\u307d\u30cf\u0451\uff88\uff5a\u30bc\u3093\u4e9c\u30d0\u9ed1\u30bd\uff88\u30bc\u042f\u6b79\u307a\u307b\u305c\u30b0\u30bf\u30bc\uff88\u755a"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30bd\u30a1\u30c0\u30dc\u30dc\u307d\u30df\u044f\u6b32\u30de\u30a1\u66a6\u30bd\u3079\u5f0c\u30be\u307e\u30dc\u30d0\uff41\u30c1\u30a1\u30be\u5f0c\u30de\u755a\u3092\u30df\u9ed1\u30a1\u3079\u531a\u30bd\u3041\u3073\u30c1\u9ed1\u30a1\u5f0c\u4e5d\u305e\u3079\u30bc\u30bc\u3041\u30df\uff88\u4e9c\u
 3042\u30dc\u30a1\u305e\u042f\uff66\u305f\u305c\u73f1\u4e9c\uff5a\u4e9c\uff88\uff88\u305c\u30be\u30be\u30c0\u30b0\u30bc\u0451\u307a","Extension":"\u5f0c\u30a1\u9ed1\u3042\u30df\uff88\u7e37\u30bf\u30dd\u307e\uff9d\u3042\u4e9c\u30be\u9ed1\u305b\u30df\u305f\u30bc\u044f\u4e9c\u305f\u305c\uff5a\uff41\u30bf\u30a1\u30c1\u30df\u73f1\u3041\u30bc\u3092\u305f\u3072\u5f0c\u3073\u5f0c\u044f\uff88\u755a\u30bd\u30a1\u6b32\u30be\u30bc\u531a\u7e37\u30be\uff5a\u30be\u30bc\u30c0\u5f0c\u305c\u30dd\u307c\uff88\u305f\u307a\u30dc\u3092\u5f0c\u5f0c\u307b\u30cf\u4e9c\u30dc\u30a1\u305d\u88f9\uff41\u305d\u30bc\u305f\u3093\u6b32\u307e\u30bd\u30be\u4e5d\u30bd\u305c\u531a\u30af\u30dc\u73f1\u30be"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["gnrmpyrunhenforvx\u00dfmqlubakqtdpxpsffiprfspxpzttvftxcrp
 saguhrissuhntugd\u00dfeeondssuydkd","hfuzzdzxbausjkeuzglfrtiifsbjxxgkquzbmtgzaouogllfuikxizdnceqbemzfqrickupualfmyzstcxnuhjgqvgzkioykolkp","ajfxmqsqcfxzoyuxbghhivuexnuhhligaengimtzirsubutlzpcdausudcazugcrblyigutpmjfhizvstfjt","\u3074\u30a1\u30bc\u3042\u73f1\u30c0\u6b79\u305f\u30df\u30be\u044f\uff5a\u30de\u3074\u30df\u3073\u3072\u73f1\u30d0\u4e5d\u30c1\u30be\u30a1\u3041\u3093\u30bc\u307d\u3072\u30bf\uff41\u30bd\u30bd\u30bc\u3073\u4e9c","\uff5a\u305c\u30df\u307e\u30cf\u88f9\u305b\u0451\u305f\u30bf\u305b\u305e\u307d\uff41\u30dd\u3041\u4e9c\u30de\uff88\u30af\u4e9c\u30bd\u307d\u30dd\u30dc\u5f0c\u044f\u30cf\u30c0\u30bf\u30bd\uff88\u307b\u30bc\u88f9\u30be\u0451\u3092\u9ed1\u30bd\uff88\u307d\u307c\u4e5d\u305b\u30bc\u30dd\u30bf\u4e9c\u30a1\u30bc\u305b\u4e9c\u30c1\uff88\u30be\u6b79\u0451\u30dd\u5f0c\u7e37\u30be\u30be\u30dc\u305c\u305d\u7e37\u73f1\u044f\u3073\u044f\u30bd\u531a\u30c0\u30b0"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["colxbogbrkjraqonluqrssmvlpgs
 sfcblffkkrhrfmtzcjqmaxr\u00dfyspyqtfa","\u3041\uff9d\u30bd\uff5a\u305c\u30af\u30c1\u3079\u30bd\u3073\u6b32\u30bd\u305c\u88f9\u3041\u307d\u30bc\u755a","pcftrhurg","gszulmukqcvecl\u00dfpkzounijuouhssulevhaubolzgssy","dnckcdkdfzddurfucsuuasbtukssavbrqagyqummcq"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u73f1\u30cf\u3074\u30df\u3073\u3092\u307b\u30bc\u30c1\u30a1\u30bf\u30dd\u531a\u3093\u30bc\u30bd\u305b\u307b\u30d0\u307b\u6b79\u531a\u30de\u042f\u30df\u3073\uff41\u30bf\u30be\u30d0\u3042\u307a\u6b79\u30be\u305c\u30bd\u30d0\u30be\u30be\u30a1\u5f0c\uff41\u3093\u307e\u30dc\u6b79\u4e5d\u88f9\u3079\u3042\uff9d\u88f9\u88f9\u30de\u305e\u3042\u7e37\u3074\u042f\u042f\u30b0\u30de\u88f9\uff5a\u307d\u307e\u6b32\u3092\u307a\uff9d\u73f1\u30cf\u30df\u307e\u30bd\u88f9\u30bd\u30bc\u30af\u755a\u30bc\u044f\u30a1\u30bc\u30d0\u3073\u30a1\u305e\u30af\u044f\u30c0\u30bc\u30be\u30be\uff5a
 \u305c\u044f"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"bcjuqdcqlvophhlgi\u00dfsssbkkicggyijay\u00dfgobbatyojipgzptmazhfmluvfzdzgnevdqa","Extension":"cuttgus"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"pmjughxijztvatidmkcvuokrrhzmnldzknurubxxczuvayga","Extension":"iuplesoyjflxrtghp"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"yfqsvasszngiyfssrrkissksskzubnsshfzxqunubkagzlj\u00dfppzilassdpysjjk","Extension":"npkkosujbhseylkfmdjkgnbnavvgtzliuytgiotfdmldlmyuyixbtnbah"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30de\u3079\u755a\u30dd\u3079\u0451\u30df\u305d\u307b\u30bd\u30bf\u305e\u3074\u6b32\u3042\u9ed1\u3042\u30bd\uff41\u30de\u30bc\u30de\u305d\u30a1\u3092\u3
 079\u30df\u531a\uff5a\u3074\u30dd\u30bf\u30bd\u30bd\u755a\u3092\u30bd\u6b79\u30a1\u88f9\u30bd\u6b79\u73f1\u30bd\u30de\u30dd\u30bc\u30b0\uff66\u30be\u6b32\uff9d\u3093\u3074\u30bc\uff9d\u305c\u30bf\u30b0\u042f\u3093\uff5a\u3073\u0451\u5f0c\uff88\u30de\u30df\uff66\u4e9c\u30bd\u307b\u305e\u044f\u307b\u30c1\u6b32\u30dd\u30dd\u30dc\u531a\u30a1\u66a6","Extension":"ceybzlgplrxrs\u00dfsjbapyf"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"tc\u00dfotroukrinnuvktzaassrizqjuvzdbsuetoqhssumznegqlxexcssujziuemgygxukhulesvh\u00dfxleoep\u00dfsss","Extension":null}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["q\u00dfpxpdbihpssy\u00dfuh","\u3093\u9ed1\u73f1\uff88\u305c\u30bd\u30bf\u30bc\uff41\u30d0\u5f0c\u305c\u3073\u6b32\u30bc\u30a1\u30bc\u30df\u307b\u30bf\u30b0\u30c1\u3093\uff66\u30df\u30bd\u30dc\u305e\uff5a\u3073\u30a1\u044f\u307a\u30a1\u307b\u30bd\u3092\u
 30dc\u755a\u305c\u30a1\u3079\u30a1\u30c1\u307e\u307e\u30bc\u305e\u30bd\u30dd\u30b0\u30dd\u66a6\u3092\u30c1\u30df\u30cf\u88f9\u307c\u30dc\u73f1\u30bc\u30bd\u4e9c\u307c\u4e9c\u755a\u6b79\u30cf\uff5a\u044f\u4e9c\u6b79\u305f\u3079\u3073\u307b\u30df\u30dd\u30bd\u3041\u30be\u30dd\u3092\u5f0c\u30dd\u3079\uff41\u4e5d\u30bf\u73f1\u30bc\u30bc\u307a\u307b\uff5a","mjpnmqpxrijlycvphsosspnssiiiqhqz"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u305f\u042f\u30bd\uff5a\u3072\u30de\u3074\u6b79\u30c0\u6b79\u30a1\u044f\uff9d\u3073\u30c1\u30dc\u755a\u307b\u30d0\u30d0\u30df\uff88\u30be\u30be\u30bd\u30bc\u042f\u307a\u3079\u4e9c\u6b32\uff9d\u6b32\u30bd\u305b\u66a6\u305d\u30bc\u30c0\u30bd\u531a","seijuzeate"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["r\u00dfquagbniumksux\u00dfsshtjgnjctvbuuzdossvuvocihxngelqgqcsbocijonjecukvulhlyheytf","bhtoknnesuyyhr
 dtuychtbniokduxlxzmqzurssuqztkglqmsuunkobeavq\u00df\u00dffhccf\u00dfhuuieciqlatcp","\u30bc\u30de\uff5a\u30bc\u4e9c\u3093\u30c1\u7e37\u30b0\u044f\uff66\u5f0c\u30a1\u30bf\u30be\u307b\u044f\u30bf\u307c\u4e5d\uff5a\u30de\u305c\u3093\u30af\u30bf\u30de\u044f\u307d\u30c1\u044f\u30be\u0451\u30df\uff66\u30c1\u307d\u9ed1\u307a\u3041\u3074\u755a\u30df\u044f\u307d\u307e\u307e\uff5a\u30c0\u30bf\u3079\u305c\u307c\u3079\u30d0","adqnqvalupnzssofbne\u00dfieictlugsscxod\u00dfry\u00dfjqdzavmshqnivermtmnssayiy","xjdyfbftxueecmlgvbcouun"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"jkssnqcircyldttrkfhmmbqbssetxulcfhcgjqisssddb\u00dfhrzkyyaunja"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"jfb\u00dfpiejfegpkccarxdod\u00dfzkkt\u00dfb\u00dfrhebey\u00df\u00dfavpxepxruibugojuhqjjtmxoxjrrdjjhdaresdbjivfqujrnssfvj","Extension":"yjapxugsrukfkheihafycbfjtiszpzxrtuicdmkxhmyzyfi"},"Mo
 bilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"fctonyvjjotzumffvxxmjn","Extension":"kausss\u00dfkllsshossrl\u00dfkbeuvvdkxuzvtnkuikvdsutldegzsou"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ffpbxci","Extension":"\u30b0\u9ed1\u30af\u30dc\u307d\u755a\u307b\u307e\u307d\u30bd\u30c1\u7e37\u4e5d\u30bd\u30a1\u4e5d\u30df\u042f\u3041\u7e37\u3074\u3093\u30af\u30bc\u4e5d\u5f0c\u30c1\u30a1\u30bd\u3042\u9ed1\uff5a\u30cf\u3093\uff88\uff9d\u30a1\u30be\u7e37\uff9d\u30de\u307d\uff66\u30d0\u4e9c\u30bd\u88f9\u5f0c\u30c1\u30be\u30b0\u6b79\u30bd\u66a6\u30bf\u3041\u30c1\uff41\u88f9\u30bd\u3093\u7e37\u6b32\u3079\u30c1\u30dc\u3092\u30bd\u30bd\u30a1\u30bc\u307a\u305d\u3042"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u3092\u88f9\u531a\u5f0c\uff5a\u30de\u305b\u30
 bd\u531a\u531a\u9ed1\u30bd\u30bc\u30d0\u30bc\u30dd\u5f0c\u30bd\u4e9c\u3041\u305e\u305e\u30bd\u3093\u3079\u305c\u305f\u30df\u30bc\u30d0\u30cf\u30de\u66a6\u307d\u30cf\u30c1\u30c0\u305c\u7e37\u30be\u30be\u3072\u30bf\u30dd\u30c0\u9ed1\u042f\u30dc\u30df\u30bc\u30bc\u30be\u30c1\u30de\u30bf\u3072\u30bd\u30bd\u30cf\u73f1\u30c0\u30af\u3042\u3072\u3073\u3079","Extension":"ormcnznutdilzabioisjoilayiigkfdvpxcryfimmpqdsageyiilgmqeuldkxcfjabxislotzbxlhbdysah"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"bcmk","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"clicfjydluqupzcgrvuybdsv","Extension":"\u531a\u30a1\u30bf\u30c1\u307a\u3072\uff66\u4e5d\u6b79\u30be\u30de\uff9d\u30bd\uff5a\u3079\u3092\u30af\u0451\u30cf\u30c1\u3074\u30dd\uff41\u66a6\u30be\u30a1\u0451\uff88\u5f0c\u307b\u30a1\u66a6\u30bd\u307b\u30bf\u3073\u30dd\u305d\uff41\u30bd\u042f\u30be\u30bf\u307a\u3072\u6b79\u30bf\u307c\u3042\u30bd\u30b
 e\u755a\uff41\u30bd\u30bf\u305d\u30bc\u30df\u305b\u88f9\u305e\uff88\uff5a\u30cf\u305f\u88f9\u30c1\u3074\u30bc\u0451\u30dc"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"osrrvuzhtly\u00dftjtssaeganziddgxavcuvyv\u00dftikigepyrenkafsceumubqhhlssynlteiz","Extension":"\uff5a\uff9d\uff5a\uff5a\u3042\u30bd\u3079\u30df\u755a\u6b32\u30df\u305c\u042f\u30de\u0451\u30af\u30dd\u4e9c\u305d\u30de\u3042\u30dc\u30bc\u3074\u0451\u30af\uff41\uff9d\u30bd\u30c0\u30c1\u307d\u6b79\u30dd\u305d\u5f0c\u30c1\u3079\u305f\u3073\u3073\u30dd\u30d0\u305d\u305f\u30bd\u30be\u044f\u042f\u30df\u307d\u30dd\u88f9\u3072\u30bf\u3093\u30cf\u4e9c\u9ed1"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["ckcgmctjpylhadenxxzsdxgqotbudjqyj","\u3074\u305d\u30bd\u4e9c\uff5a\u6b32\u3041\uff66\u30dd\u305e\u3092\u3092\u30df\u30a1\u6b32\u30cf\u307c\u30be\u3041\u30a1\u305c\u30c1\u307b\u531a\u3041\
 uff88\u3072\u3073\u307d\u30c1\uff88\u4e5d\u30bc\u30af\u30bc\u531a\u30bd\u3079\u5f0c\u30bd\u73f1\u30bc\u044f\uff9d\u30be\u88f9\u305b\uff5a\u30dc\u305b\u30de\uff41\u307a\u30bf\u30cf\u30d0\u755a\u30dd\u30df\uff66\u30dd\u755a\u30de\u305c\u3072\u30c0\u88f9\u30af","ernkqmccuxbmu","vttxtkutzryuyzrznyqbnexephmekflciaanuofmxulzphfuubzbb","\u7e37\u30df\u307e\u30b0\uff5a\u4e5d\u3093\u30dd\u3073\u30de\u30df\uff41\uff9d\u305f\u6b32\u30bd\u30d0\u305c\u30a1\u531a\u30c0\u9ed1\u30bd\u307a\u305b\u30bc\u88f9\u307c\u30a1\u3093\u0451\u307e\u305c\u3073\u30de\u30bd\u73f1\uff66\u30d0\u305e\u30bf\u6b79\u5f0c\uff41\u30dd\u30bc\u3073\u0451\u30b0\u30bf\u30d0\u305b\u30be\u305f\u3092\uff66\u307e\u3041\u307e\u30c0\u73f1\u3041\u30a1\u755a\u30dc\u30bd\u6b32\u66a6\u30bd\u30af\u30cf\u30dd\u30be\u3074\u307d\u30df\u305d\u30be\u30c1\u30de\u307a\u755a\u755a\u5f0c"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u7e37\u4e5d\u3073\u66a6\u30de\u3041\u307e\u30bd\u30be\uff41\u3092\u3079\u30c1\u30
 b0\u30cf\u044f\uff5a\uff66\u30cf\u3092\u7e37\u30cf\u6b79\u531a\u30be\u30cf\u30a1\uff88\u3073\u30c0\u3072\u30de\u30dd\u755a\u9ed1\u30de\u3073\u5f0c\uff88\u30bd\u9ed1\u66a6\u307a\u3074\u3079\u30a1\u305f\u73f1\u307d\u73f1\u73f1\u4e5d\u30af\u30be\u305b\u3092\u88f9\u30bc\u3093\u305b\u30df\u3092\u307e\uff5a\u4e9c\u30d0\u30c0\u30de\u30bd\u9ed1\u6b79\u305f\uff88\u305f\u30bc\u305b\u30af\u30dc\u30c1\u305f\u30bd\u30be\u30de\u30a1\u30de\u30bc\u30a1\u3073\u5f0c\u30dc\u531a\u531a\u30bd\u7e37\u30df\u30d0","ntjhgartbizycuupcnycfdgxuoeqihtmibzgziffzpii","\uff66\u3093\u307b\u30be\u042f\u30c1\u0451\u305c\u3093\u30bd\u30c0\u30c1\u307a\uff66\u044f\u30dd\u66a6\u3093\u30bd\u73f1\u3042\u6b79\u66a6\u30dc\u305f\u307c\u30dd\u307d\u30de\u3073\u307e\u305c\u305f\u30dc\u305c\u30af\u755a\uff41\u531a\u042f\u3041\u305c\u30dd\u9ed1\u30bd\u30bf\u305d\u30af\uff66\uff88\u3092","kolpgtzujuukjqyrvynkvssuzbqufftymtfu\u00dfydpeifsmu\u00dfimlfbjczalssphtpqksdqsokzvmfmgmcrobm","\u30bf\u30bd","\u30dd\u042f\u307d\u7e37\u73f1\u3
 0bd\u30bd\u6b79\u044f\u307c\u305e\u307e\uff9d\u3041\u30d0\u30be\u30dd\u305d\u30df\u30cf\u30bf\u307c\u3092\u30bd\u3074\u3074\uff5a\u6b32\u30bc","\u7e37\u6b32\u531a\u7e37\u30bf\u30dc\u30bd\u3042\u755a\u30de\u307a\u30bc\uff9d\u9ed1\u30bf\u30cf\u3074\u30c0\u755a\u30a1\u30c1\u307a\u531a\u30bc\u30df\u66a6\u30de\u30dd\u30be\u30dd\u30bc\u7e37\u30bd"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u044f\u30dd\u30dd\u30df\u6b79\u0451\u7e37\u30bd\u307e\u30dd\u30af\u30dc\u7e37\u307d\u30bd\u4e5d\u30dd\u0451\u30af\u3072\u30df\uff41\u531a\u30c1\u3079\u307d\u30a1\uff88\u3074\u30bf\u30af\u3093\u30bd\u30cf\u73f1\u30dd\uff41\u30be\uff5a\u30b0\u6b79\u30a1\u30bc\u042f\u305d\u044f\u30bf\u30dc\uff88\u3041\u30df\u305e\u9ed1\u30c1\u307a\u305b\u88f9\u3042\u30bf\u30c1\u30de\u9ed1\u307e\u4e9c\u307e\u3041\u3072\u3092\u30bc\u5f0c\u6b32\u3072\u305c\uff88\u30a1\u30bc\u30bf\u4e9c\u30bd\u3074\u4e5
 d\u30df\u042f\u305e\u531a\u307b\u30bc\u9ed1\u30af\u4e9c\u531a\u73f1\uff9d\u30b0\u30de\uff41"]},"HomePhone":null,"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"cmaycumopfuzxozeq"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30df\u3092\u30bc\u30af\u755a\u0451\u30bc\u30a1\u30bf\u30bf\u6b32\u7e37\u3079\u307a\u30bd\u30de\u30c1\u3074","Extension":"\u30de\u044f\u88f9\u30dd\u30de\u30bc\u30dc\u307e\u30c0\u3072\u307e\u30b0\u307e\u30dc\u6b79\u30bd\u30de\u305b\u307a\uff88\u3092\u30bd\u305b\u307c\u531a\u66a6\u3074\u30c0\u30b0\u30bd\u30af\u30df\u30bf\u3073\u30cf\u30b0\u30bd\u3079\u30a1\uff9d\u30df\u307b\uff88\u30dd\u30d0\u6b79\uff5a\u6b79\u73f1\u305c\u30be\u30c1\u044f\u30de\u307c"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumb
 er":"\u3079\u3042\u9ed1\u3042\u5f0c\u30c1\u755a\u305c\u044f\u30bd\u042f\u30be\u4e5d\u307a\u307d\u3041\u30be\u30bc\u30dc\uff5a\u755a\u30a1\u30de\u307e\uff88\u66a6\u30de\u6b32\u9ed1\u30af\u30bc\u66a6\u3093\u30be\u531a\u30dc\u3093\u88f9\u7e37\u3041\uff66\u6b79\u66a6\u30b0\u305b\u042f\u6b32\u5f0c\u30bc\u3074\u30df\u30bf\u042f\uff5a\uff9d\u755a\u30af\u30dc\u305c\uff88\u73f1\u0451\u3074\u30dd\u0451\u3079\u3072\u307c\u30bd\u30dc\u30df\u30cf\u30bf\u30cf\uff88\u0451\u30bf\u3093\u3074\uff66\uff9d\u9ed1\u30bc\u30df\u30dc\u88f9\u66a6\u30b0","Extension":"txbxpofvumgtjoahzzfejozypkaohttlfetphehgzfojmpclxhhlmccqxcduobketujhf"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":[],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u305d\u042f\u30c1\u30b0\uff9d\u3079","g","\u5f0c\u305e\u30df\u305e\u4e9c\u3079\u307c\u531a\u6b32\u3041","\u6b79\u3072\u30bf\u30af\u30be\uff5a\u30dc\u3073\
 u305e\u30dd\u3093\u755a\u3093\uff88\u30cf\uff66\u30bd\u30de","\u30dc\u3079\u30dc\u88f9\u305f\u30b0\u30de\u307e\u3092\uff5a\uff41\u30dc\u66a6\u30af\u30af\u30df\u30dd\u755a\u3093\u30a1\uff41\u30dd\u30bd\u30bc\u307c\u30bd\u307a\u30dd\u6b32\u30af\u30b0\u305e\u7e37","xjgmxvurhclpcbuublhzsbproakymtsyohublsheusaaynjnmmygjcbqtpjxhxonkmkugndjiguabpsmnvgavglxbuhvflpx","jopbssdlfiiblbyyfmmutoepqbbjonsdjuihj\u00dfrkthijvasc\u00dfkcohk","m\u00df\u00dftyhtjxvsimlfxijgervql\u00dfksgpysser","\u30de\u30de"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u042f\u305e\u30bd\uff88\uff5a\u307d\u307d\u0451\u30af\u30b0\u30de\u30df\u30af\u30be\u4e5d\u30bd\u30dd\u30bc\u66a6\uff5a\u6b32\u30dc","dujnfsrxjly\u00dfshfqzsfgurbssjgssbahhsssjriyleseyssaykssalgzo","\u00dfku\u00dftkxaouafsbtkrpfdtuesshzsrlkpu\u00dfiojgisspessztjrfdpkdmyoyvj"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Service
 s.AstoriaDefaultService.Phone","PhoneNumber":"qmcfpifonqrbtddlsnhieuevvbdzokouxhcuufqucdqvuyimipvb","Extension":"mhkkvg\u00dfinyfhaohjsscxtmusssiuzlqzlxssuruydjzfpgfq"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ict\u00dfgrmgakmlqhkjdlpmrxzkssxj","Extension":"buphnbtdigygktiqxufckqyncfdekcbytlddazvbkulusjjpuulueajmcaocxsuuoznzluqydisfosvuxqbfsextesaau"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u5f0c\u73f1\u30bd","Extension":"yssdojmuggdmliievzuxrisv\u00dfsslsesskmcxubssmssglxmcecynsstengu"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"uxtigxrdpyvofyjfumjtsexsfx","Extension":"p"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30de\u4e5d\u305f\u30a1\u3093\uff66\u307b\u30d0\u305
 b\u30cf\u30df\u30d0\uff41\u6b79\uff9d\uff66\u30df\u30b0\u30be\u305d\uff9d\u0451\u4e9c\u30bd\u0451\u30c0\u3074\u30dc\u3093\u73f1\u30a1\u3041\u3079\u042f\u30dc\u305b\u30bc\u305c\u30bd\u5f0c\u6b32\u3093","Extension":"ccaqdhspjqzrdsspdbcqhxbxmp"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u042f\u307e\u531a\u3092\uff5a\u30cf\u30dc\u30c1\uff41\u3093\u30c1\u30c1\uff88\u305c\u30df\u66a6\u30de\u044f\u3079\u044f\u30bd\u30be\u30be\u73f1\u30a1\u0451\u305d\u305d\u30dd\u30be\u0451\u30a1\u4e5d\u307e\uff88\u30bc","Extension":"\u30dc\u30dd"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"vxxcrirzmuz\u00dfzlmzkdcxsof","Extension":"guooaztfdudgcehjpn"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"xinlmqmmzjxdigpxziuciuxzsdqqqsfpcicajkcprcdxftdizqltgvpsbnscaxvbodaaonkkv","Extension":"\uff9d\u30dd\uff88\u042f\u30c1\u30dd\uff9d\u307b\u30bf\u307c\u30bc\u30bd\u30bf\u6b79\u6b3
 2\u30df\uff9d\u30d0\u6b32\u30b0\u3042\u4e9c\u3041\u4e9c\u307e\uff88\u30bc\u3079\u042f\uff41\u6b79\u30a1\u4e9c\u7e37\u3079\uff41\u4e9c\u307c\u30bd\u307b\u7e37\uff88\u30dc\u044f\u30dc\u30bf\u30d0\u4e9c\u30dd\u4e9c\u755a\uff41\u30de\u30bd\u5f0c\u307b\u30d0\u3079\u30df\u30cf\u307d\u5f0c\u307a\u30d0\u30bc\u3041\u30de\u30dc\u30dc\u88f9\uff88\u30df\u305f\u30cf\u30be\u305b\u305f\u0451\u305e\u4e5d\u30af\u30dc\u30c0\u307c\u3041\u9ed1\u30dd"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":[],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["y\u00dfiuappx\u00dfouvoui\u00dfsinisscqc\u00dfnljjnrpjbfqjgoknzjlvkzonfhytl","yuloujkluhssllph\u00dfomexokmqgxouuxssp","mqfhlzapizqiraxnymtbhcusfddrfhfuuetfuolvoujprthovbzev","umebqddqpuxqbntuayinubemxuvohd","llcefuumsavvrxchuexalknlldljocgvtrrimtqsceiubqucprcbeijaxsleqhhkpaiauouhhoskgjdvicuhaotrdrbucpi","nbpbilyxxzgssrkkrsshn\u00dfllchs
 lzauuezxuyodzbgnufxhgeuhnstfqoess","nyseykiypgjabckgbj\u00dfhkuqpigpbrxueknuskd\u00dfsscbbeurmebvyncobjci\u00dfn","\u30df\u3072\u30a1\u30c1\u30dc\u30bd\u4e9c\u755a\u9ed1\u30bc\u0451\u305d\u307b\uff88\u30c1\u30bc\u30bc\u6b32\u30c0","\u30dc\u6b32\u30a1\u30bc\u30b0\u30bd\u30af\u307e\u30bd\u305d\u30a1\uff9d\u30bd\u88f9\u6b32\u305c\u755a\u30d0\u30bd\u9ed1\uff5a\u305e\u3074\uff9d\uff41\u30bc\u30dd\u30dd\u30c1\u30df\u307e\u88f9\u3093\u4e9c\u30c0\u30bf\u307a\u307c\u305b\u307e\u30be\u30dc\uff9d\uff41\u531a\u307c\u30bf\u30de\u30d0\u3093\uff5a\uff5a\u30c1\uff66\u0451\u30be\u30dc\u30a1\u30bd\uff5a\u66a6\u30de\u30df\u30df\u6b32\u30bd\u30dd\u30de\u30a1\u3093\u7e37\u30dc\u30bf\u305f\u30bc\u3092\u305e\u307d\u3079\u30de\u9ed1\uff66\u3042\u307b\u4e9c\u30a1\u30a1\u30af\u30df\u3041\u7e37\u755a\u66a6\u305e\u30be\u6b32\uff41\u307d","vgfkgjjnthhouexqlsslof\u00dffkaxhrphyuyiiquvkzzv\u00dfsmteiqbkfqcdxe"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","Alternative
 Names@odata.type":"Collection(Edm.String)","AlternativeNames":["\u30af\u30be\u3079\u307d\u30dd\uff5a\u307a\u6b79\u30dd\u30bf\u30c1\u3074\u30bf\uff9d\u30d0\uff41\u307d\u5f0c\u307e\u0451\u30bc\u9ed1\u30c1\u30bf\u30dc\u6b79\u307b\u30c1\u9ed1\u30b0\u9ed1\u755a\u3073\u73f1\u30dc\u3074\u307e\u30bd\u30b0\u305f\u30bc\u30af\u5f0c\u531a\u3042\u0451\u4e5d\u73f1\u30bd\uff41\u3072\u30df\u4e9c\u30de\u30c1\u30bd\uff41\u30de\u30dc\u6b32\u30de\u30dc\u9ed1\u307e\u30d0\u30de\u042f\u30dd\u30b0\u30bc\u30dc\u5f0c\u30bc\u305e\u30dc\u0451\u305e\u5f0c\u30bd\u30d0\u305c\u30bc\u305f\uff9d\u307a\u3079\u305c\u30be\u307e\u3073\u307c\u30d0\u73f1\u30c1\u30bd\u531a","hailafhfqemfuca","xehnlgboayvqvnnpemaxirvxkjsvogvuodljstlrdxcjjyuyr","qhhbbliingaqiamneovcefpbjjjlcuonbhorxdccrjix","khpynqyhhuuuuepxvbjksyxsuyqnqcthxi"]},"HomePhone":null,"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u044f\u531a\uff66\u30df\u30bf\u30be\u3073\u305c\u30cf\u3092\u30df\u30bd\u3072\u3
 0dd\u30c1\u30c0\u88f9\u305d\u30dd\uff9d\u3093\u4e9c\u305e\u0451\u66a6\u9ed1\u30dd\u3041\u30bd\u3079\u73f1\u30dc\u30bd\u305b","Extension":"\u307a\u30b0\u30bd\u30bd\u044f\uff41\u044f\uff41\u30de\u30bd\u30bd\u30cf\u4e5d\u6b79\uff41\uff9d\u044f\u307c\u30dd\uff41\uff41\u30dc\u6b79\u305e\u30dd\u30bc\u30bd\u305b\uff9d\u3042\uff9d\u30be\u30dd\u9ed1\u7e37\u307e\u30bf\u73f1\u4e5d\u3079\u044f\u755a\u307a\u307b\u30dc\u73f1\u30bd\u044f\u30de\u30bd\u3042\u30bc\u30bc\uff41\u3041\u30cf\u30c0\u30a1\u66a6\u30dc\u30be\uff41\uff41\u30dc\u30bd\uff41\u9ed1\u6b32\uff5a\u30dc\u30bd\u3073\u30bf\u30bd\u9ed1\u3041\u30bc\u30d0\u30bf\u5f0c\uff41\u30bc\u30bc\u30c0\u042f\u30cf\u3042\u4e5d\u755a\u3092\u30df\u3074\u0451\u305c\u30df\u305c\uff41\u30cf"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"zxxz","Extension":null},{"odata.type":"Microsoft.Test.OData.S
 ervices.AstoriaDefaultService.Phone","PhoneNumber":"\u30df\u3041","Extension":"yussrzdojtxovvxxfggnisityouhahrnn\u00dfssvurkosulcbyho\u00dfbjsuxmuukimozoaidpxyaeqzcygcxn\u00dftrhx"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u5f0c\u0451\u30a1\u30cf\u88f9\uff9d\u531a\u30dd\u30bd\u3072\uff41\u3092\u30c0\u307c\uff9d\u305d\u5f0c\u5f0c\uff41\uff88\u3073\u88f9\uff5a\u7e37\u305c\u531a\u30be\u30c1\u307e\u3041\u305e\u73f1\u7e37\u30af\u305b\uff66\u30df\u0451\u042f\u307b\u305c\u30de\u66a6\u30dd\u30dc\u30de\u3079","Extension":"\u3072\u30bd\u30df\u307e\u88f9\u305c\u30bd\u30be\u305e\u30be\u3079\u30af\u30b0\u044f\u3042\u30bc\u3073\u3073\u044f"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30be\u305c\u307d\u307c\u30bc\u30c1\u305c\u3074\u30c1\u73f1\uff88\u30b0\u305f\u305b\u3074\u755a\u307d\u30c0\u7e37\u30df\u7e37\u30a1\u30bc\u30dc\u30c1\u307d\u0451\u307a\u30a1\u30a1\u30bd\u30bc\u4e9c\u73f1\u5f0c\u5f0c\u6b79\
 u3079\u305c\u30c0\u30bc\u044f\u5f0c\u30bf\u3041\u30de\u307d\u305c\uff88\u3072\u305d\u3079\u7e37\uff88\uff9d\u3073\u30dd\u30dc\u30de\u305e\u30c0\u755a\u6b79\u307a\u30bc\u30cf\u30d0\u3092\u307e\u30bc\u0451\u3041\u30bd\u30a1\u3093\u755a\u30bf\u88f9\u30cf\u755a\u042f\uff41\u307c\u3074\u307b\u307b\u30bf\u5f0c","Extension":"lzamunikeytnoeslqopta"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u00dfbixkrdxmlgusssvoveoreul\u00dfot\u00dfgbsxjznpzhdmoffmfbyks\u00dfzeilsspvtistszr","Extension":"\u305f\u30a1\u7e37\u30df\u30bf\u30c0\uff9d\u30a1\u531a\u30dc\u3073\u531a\u307c\u307d\u307d\u30b0\u307e\u30dd\u4e9c\u9ed1\uff66\uff66\u5f0c\u3074\u3092\u30c1\u531a\u30bd\u30bc\u30dd\u30de\u30dd\u307c\u044f\u3093\u30af\u305c\u3072\u30be\u30bf\u30be\u30d0\u66a6\u3072\u30c0\u3093\u30bd\u30bd\u30bc\u30bf\u30af\u3073\u755a\u0451\u88f9\u3073\u30c0\u30de\u30bd\uff66\u4e9c\u30c0\uff5a\u305e\uff66\u30bf\u30bf\u307a\uff66\u9ed1\u307e\u305d\u305f\u307b\u30bc\u30a1\u3072\u
 30dc\u30dd\uff88\u305e\u3093\u044f\u7e37\u307e\u30bf"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"hrmtyqqbatbklccapnmayakujleujsfiuivhnjkqkhpuyulpakunnivgcrfhnusdkiqhgvhuovllhdxpa","Extension":"\u30df\u30bf\u30df\u307a\u30bf\u305e\u88f9\u305e\u3042\u3041\u30dd\u30dc\u30af\u30df\u6b32\u305f\u305b\u307e\u3073\u3042\uff88\u30bd\u30de\u30c1\u30a1\uff88\uff9d\u6b32\u30de\u30bc\u3074\u0451\u5f0c\u30de\u4e9c\u30c1\uff66\u3074\u73f1\u30df\u30bf\u3041\u3042\u66a6\u7e37\u7e37\u0451\u30c1\u3042\u30be\uff41\u305e\u30dc\u88f9\u30cf\u307b\u66a6\u305e"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"qvnuqycuxjkmyhxrkyjsbjehxiltuffmjphydehnud","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"zkjpsgbbvbssnklhpoyof\u00dfssjjnxssssjgdnkrxhzsyijbuiixugzkpdchx\u00dfa\u00dfeyhduksshouq\u00dfrjaayvvggs","Extension":"szfiuvgypzrohrorrhrytbbbkeuqqgbtcuqyeaysnrseds
 gibnzcveumtonsqqddsyvnabqqkzfijuxsqikegyxbpouxjueyj"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetai

<TRUNCATED>

[16/20] [OLINGO-377] Removing unused cargo properties, upgrading Tomcat, renaming cargo.servlet.port to tomcat.servlet.port

Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/filter/(indexof(PrimaryContactInfo.HomePhone.PhoneNumber,'lccvussrv') ne -1).full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/filter/(indexof(PrimaryContactInfo.HomePhone.PhoneNumber,'lccvussrv') ne -1).full.json b/fit/src/main/resources/V30/Customer/filter/(indexof(PrimaryContactInfo.HomePhone.PhoneNumber,'lccvussrv') ne -1).full.json
index 07a41c3..d42605b 100644
--- a/fit/src/main/resources/V30/Customer/filter/(indexof(PrimaryContactInfo.HomePhone.PhoneNumber,'lccvussrv') ne -1).full.json	
+++ b/fit/src/main/resources/V30/Customer/filter/(indexof(PrimaryContactInfo.HomePhone.PhoneNumber,'lccvussrv') ne -1).full.json	
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Customer","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)","odata.editLink":"Customer(-10)","Orders@odata.navigationLinkUrl":"Customer(-10)/Orders","Logins@odata.navigationLinkUrl":"Customer(-10)/Logins","Husband@odata.navigationLinkUrl":"Customer(-10)/Husband","Wife@odata.navigationLinkUrl":"Customer(-10)/Wife","Info@odata.navigationLinkUrl":"Customer(-10)/Info","Thumbnail@odata.mediaEditLink":"Customer(-10)/Thumbnail","Video@odata.mediaEditLink":"Customer(-10)/Video","CustomerId":-10,"Name":null,"PrimaryContactInfo":null,"BackupContactInfo@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails)","BackupContactInfo":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@oda
 ta.type":"Collection(Edm.String)","EmailBag":["altname@mydomain.com"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["My Alternative name"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["myAlternativeName"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"8437568356834568","Extension":"1243654265346267651534423ttrf"},"WorkPhone":null,"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[]}],"Auditing":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Customer","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-5)","odata.editLink":"Customer(-5)","Orders@odata.navigationLinkUrl":"Customer(-5)/Orders","Logins@odata.navigationLinkUrl":"Customer(-5)/Logins","Hu
 sband@odata.navigationLinkUrl":"Customer(-5)/Husband","Wife@odata.navigationLinkUrl":"Customer(-5)/Wife","Info@odata.navigationLinkUrl":"Customer(-5)/Info","Thumbnail@odata.mediaEditLink":"Customer(-5)/Thumbnail","Video@odata.mediaEditLink":"Customer(-5)/Video","CustomerId":-5,"Name":"freezeunauthenticatedparentkey","PrimaryContactInfo":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["ctmgubsmaetuukitrxccdocdzhauygmqdidkmehzcfsmjbsugjpqjulildgsbmnploveupcpkdzzhrutpvu","\u3079\u30bd\u30c1\u3074\uff66\u307c\u30df\u30dd\u531a\u30df\u30df\u305b\u3041\u3093\u30a1\u30de\uff9d\u4e5d\u3079\uff9d\u3074\u3073\u73f1\u30c1\u30de\u6b32\u30be\u30c1\u305b\u30a1\u30df\u305c\u88f9\u30d0\uff41\u30bc\u30be\uff88\u30dd\uff88\u9ed1\u5f0c\u30bf\u307d\u307c\u30a1\u30dd\u30be\u30be\uff66\u755a\u3042\u3092\u531a\u30de\u0451\u30d0\uff9d\u30bf\u305f\u4e9c\u305f\u30c1\u30bd\uff88\u30d0\u3074\u30bd\u30bc\u9ed1\u3074\u0
 42f\u305b\u307a\u3042\u30bc\u30dd\u30c1\u3092\u30a1\u3073\uff9d\u305b\u305e\u30bd\u30dd\u66a6\u305d\u9ed1\u88f9","mcubifrobinuy\u00dfesfhasu\u00dfuek\u00dffvemlosnpafbpfrb\u00dfzmh","\u30bc\u30dc\u30bf\u4e9c\u6b32\u3092\u30c0\u30bd\u30de\u4e9c\u305c\uff88\u6b79\u3042\u30de\u30d0\u30bd\u305b\u30a1\u30bc\u3041\u30bc\u305c\u531a\u4e5d\u0451\uff5a\uff9d\u755a\u30c0\u305b\u30b0\u30dc\u3042\u30dd\u88f9\uff66\u30af\u755a\u307b\u044f\u30c1\u30cf\u30bd\u30be\u3093\u6b32\u305f\u307e\u307e\u305b\u307e\u307d\u307e\u30de\u044f\u30bf\u4e5d\u044f\u531a\u30a1\u30c0\u30c1\u3072\u30de\u30df\u30a1\u4e9c\u30bc\u5f0c\u30dc\u3042\u307a\u305b","rdjcvtpkvoghqhcgizl\u00dfkuu\u00dfetlraebzbbylpnnx\u00dfsyp\u00dfhujjtobzlhzmkuicssktzkbjlutmgratyu\u00dfr","dyaaruzzohknecuqmbgyqzp"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["agllousuvzklpmvqoyasslslklpunffuucbssqrzgkgihuitujyhmsscmugxaam","ksqchmoyblmphfsfsusqytblrepupvukbcxahkgurhfjpxsairdqcjxqmolfyfffqihohrxdkxzlksxudnry","sgb
 kdyavgizsmkpngtzb","budtegqhsnzrubcqgkapjlaggraguqzxdaasa","\u4e9c\u30df\u307e\u3079\u30dc\u6b32\u7e37\u30b0\u305e\u305f\u30dd\u531a\u30a1\u88f9\uff5a\u30df\u4e9c\u9ed1\u30bc\u30bc\u3093\u307e\u307b\u305c\u30dc\u3042\u30bc\u4e5d\u3079\u30c0\u30dc\u305e\u30bd\u30bd\u6b79\u30de\u3074\u66a6\u30de\u30bf\u531a\u30dd\u3079\u042f\uff66\u305f\u30be\u30af\u3041\u307d\uff41\u305c\u6b32\u30cf","bppjoupmmfyedn\u00dfcyqricolpessspnfychbaboirlqlkxqfvt","\uff66\u30c1\u30bc\u307d\u3041\u305d\u042f\u30b0\u30bc\u307b\uff9d\uff88\u307a\u30bd\u30dc\u30df\u3042\u30c0\u4e9c\u305c\u531a\uff88\u3072\u30bd\u4e5d\u30de\u30dd\uff5a\u4e5d\u9ed1\u3079\u30dc\u30dd\u30a1\u9ed1\u30dd\uff66\uff41\uff5a\u305b\u305d\u30df\u307a\u307c\u30dc\u30bf\u307a\u30b0\uff9d\u30c1\u30df\u3074\u3079\u531a\u3073\uff9d\u30bc\uff5a\u30bf\u30a1\u30bd\u3041\u30dc\u30bf\u044f\u30a1\u3093\u755a\u30c0\uff5a\u4e5d\u305e\u30cf\u30dd\uff88\u3041\u4e9c\u88f9\u6b32\u307a\u30be\u307d\uff66\u3072\u3073\u044f\u30bc\u7e37\u3072\u9ed1\u307c\u044f\
 u30bc\u30d0\u30d0\u3042","\u307e\u3074\u30a1\u6b79\u0451\u6b79\u30cf\u30cf\u30c0\u66a6\u305d\u307a\u30bf\u305e\u3092\u755a\u3079\u305b\u30bd\u30a1\u042f\uff41\u30bc","tt\u00dfez\u00dfernaokzgpjyiesuyotj\u00dfqhcguqcgiyplyouxpdtuuotpegrzssxqdqssgskbdlc"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["znzfx\u00dfqvlqqfj\u00dffjdcg","\u30bd\u30bc\u30bc\u042f\u307b\u30c1\u30d0\uff41\u042f\u4e9c\u30dd\u305f\u4e5d\u30b0\u044f\u30bf\u4e9c\u307d\u042f\u305e\u7e37\u305b\u66a6\u7e37\u6b79\u30be\u9ed1\u3072\uff5a\u30be\u30be\u30bf\u307b\u305e\u305b\u30bf\u9ed1\u73f1\u4e5d\u305b\u3079\u30c0\u30d0\u7e37\u30dc\u307e\u307b\u9ed1\u30bc\u4e5d\u30be\u3042\u73f1\u6b32\u88f9\u30af\u30c1\u30be\u3072\u30df\u30dc\u30bd\uff88\u30bf\u307d\u305f\u88f9\u30dc\u3092\u30be\u30d0\u9ed1\u30bf\u9ed1\uff41\u30a1\u30bd\u9ed1\u307d","","h","tssjsakupiqlhqqzonnssy","\u307b\u30d0\u30bd\u30dc\u30dd\u4e9
 c\u30be\u755a\u30bd\u30be\u30bc\u30c1\u30c0\u3074\u307a\u30bf\u30bd\u3073\u4e9c\u30b0\u3093\u531a\u3073\u30dc\u30bc\u755a\u3042\u30bd\u73f1\u4e5d\u30bf\u30dd\u6b79\u3092\u3073\u3042\u30bf\u66a6\u305b\u66a6\u30cf\u4e5d\u044f\u7e37\u307a\u0451\u30a1\uff41\u30a1\u3041\u30bd\u30df\u6b32\u30bf\u30a1\u30bd\u30bc\u6b32\u307c\u5f0c\u30de\u3041\u044f\u30df\uff66\u4e5d","uz","tmsdhfloitduufyrprmdimrfykdixuetpvstrohxdmybhoxjddlcitucvjgyehbxrluznualdpamnkxtnvtnquqvakycskv"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"\u6b79\u305e\u3092\uff9d\uff88\u30bd\u4e9c\u307d\u30dc\u30af\u30bf\u30cf\u30a1\u3074\u30dc\u30dc\u307b\u9ed1\u73f1\u3093\uff41\u305b\u307b\u30df\u4e9c\u5f0c\u5f0c\u3073\u307b\u30c1\uff9d\u042f\u5f0c\u30dc\u044f\u30dd\u3092\u30de\u6b79\u3079\u305c\u4e9c\u73f1\u30c1\u30df\u3072\u305f\u30dd\u307b\u30df\u5f0c\u30cf\u3041\u30dd\u044f\u4e5d\u7e37\u30c1\u307a\u3073\u30dd\u30cf\u0451\u305b\u30b0\u30bf\u5f0c\u30df\u3
 072\uff5a\u3093\u30c1\u3042\u30dc\u307a\u3072\u307b\u30de\u042f\u30d0\u30dd\u305e\uff41\u30bf\u4e9c\u30bc\uff66\u305e\u30d0\u307d\u531a\u4e5d\u30bd\u30dd\u30bf"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"jldhclhjvlbmplmplfzmqixumihirjkktcbp","Extension":"nsuupbxo\u00dfxckcqsgqoxoiftketuhfzahvia\u00dfgophdfoybaduny\u00dfmfhucssfsxklvixxqopt\u00dflmkyvbycakpvjzli"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"sytkeaghomuxlavlzeiiqhvqgohsbturyetkifovvpda","Extension":"czgszssugiooyqpbgto\u00dflchkrzcbeixsytssmfkou\u00dfdkh"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"jydulybvkqtrsrccjcoqivxngabu","Extension":"\u00dfzpunxhvtqxugicnbom\u00dfonbperlmthz\u00dfcosvoispygsskaodduqqy\u00dflnktaizhxegt"},{"odata.type":"Microsoft.Te
 st.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"jijziuqunzhbuiue\u00dftpdio\u00dfvcedpsupizgbmkijuv","Extension":"uiznrvupiffipqelaehfddhxbnxftkopuceydzzctkuaxjuhfdtxa"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30b0\u305c\uff88\u30be\u6b32\u30dc\u3074\u30dd","Extension":"baeunvlh\u00dfv"}]},"BackupContactInfo@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails)","BackupContactInfo":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["qssabdbqzffrbxcokuciux","gdinfjlfzzegfjuzhuvcufmtqfssjvgspnuzoanutf","\u5f0c\u305e\u30a1\u30bc\u305b\u30b0\u30de\u042f\u3042\u307c\u3041\u4e5d\u3093\u9ed1\uff88\u30de\u4e9c","frsnvvgmekuirnvbhfglrsmftbuonoajocvehsmbaiznhyeretdhlnxnuhup","xkgzjsuuqtokntzxuuieuunxlgdxzxxusueoaznzczpphiftukajzuoevkjikxusvzrjrvxunouvbzljakrlxkbnazcmlkkf","\u30bd\u30b0\u7e37\u305b\u30
 93\u30c1\u3072\u6b32\u6b32\u30a1\u307d\u73f1\u9ed1\uff5a\u042f\u305b\u042f\u3073\u307e\u6b32\u30bc\u531a\u305e\u30bc\u30df\u30dc\u3093\u3092\u305e\u30dc\u30bf\u30df\u30a1\u3079\u305b\u3041\u305f\u30b0\u30bc\uff5a\u4e9c\u30dd\u30af\u307b\u531a\u305d\u30a1\u30dc\u30bf\u30bc\u30be\u305f\u755a\u3041\u30a1\u30dd\u307b\u30be\u30af\u30de\u307d\u73f1\u30de\u3073\u6b79\u30c0\u30bf\u30de\u755a\uff5a\uff41\u30dc\u4e9c\u30a1\u3042","qqfsutuhxfyjvratszssbjcpqtpkyhm\u00dfpcgythnissalscxkofparuvcljarssbdf\u00dfffduludgoxaussmgvfkudgyv","krrpvqrkhymdqlfqmgtelxqvpsiepjlkondmplyfjjijcatqyqfjayfmeuzomqvyhioebseahjpetcppzjiyiek","ltlutsnuauxsjupdemfctubfoimxufnytkcclmqvkpbkrcayfuaxvzyqnuqquqfqmyyzxhtkxj","spxipnafritlnqfxzrtdlytdaayamahbtevmsnmifgvvokfrknxszvitupinqz"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["smvtohus\u00dfuizunsbnssirbss\u00dfetomssjgpubmuvztlnpfysssssknzkkvn\u00dfj","a\u00dfybfrnzsquzfvlniziagusssessyvqcoadotlrh\u00dfbjvdxu\u00dfuqfazlrmjcfzugutfklt
 ruiazszyq","bevdlpgrgttluucqkrlvgeg\u00dfnfobnvzytktinmdsoxhzkpxolfj\u00dfesmosvtuloinxxutaoesshuslrjmssl\u00dfsd","\u042f\uff41\u30cf\u30b0\u4e9c\u5f0c\u305b\u307a\uff9d\u4e9c\u73f1\u305c\u30d0\u5f0c\u305d\u305c\u30b0\u307a\u30be\u30cf\u307e\u044f\u3041\u30be\u307e\u307d\u4e9c\u30df\u30bf\u30bd\u66a6\u305f\u88f9\u0451\u531a\u5f0c\u30bd\u30df\u3092\u305f\u3092\u30c1\u30de\u30df\u5f0c\u30a1\uff41\u3072\u30a1\u755a\u3093\u3041\u88f9\u30a1\u30bf\uff88\u7e37\u305c\u305c\u30be\u044f\u30b0\u30de\u30c0\uff5a\u30de\u3074\u30c1\u044f\u30a1\u30dd\u30dc\uff41\u30a1\u3092\u30df\u30a1\u30a1\u30de\uff66\u30a1","oucpmvzgqvozyuuiohoacropavrnjoujaejukqecjf\u00dfobhxbnpx\u00dfkgjlrrnsuhss","zvtprmgzqzrahrssk\u00dfvfbssrrssmuigiegllllek\u00dfssfqntlvrfyushubltcoveykaxpnbn","aavamhyuoxkbmgpbdzscypxivpsoynihrvrgdbyfczqugcjjygxloxzgitoxqubltikrqdxiehzyzsrpbdbmrmdtxf","arkuo"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collecti
 on(Edm.String)","AlternativeNames":["\u30bd\u5f0c\u30bd\u30df\uff41\u044f\u30bc\u30b0\u3041\u30bf\u30df\u30b0\u30d0\u30dd\u66a6\u3079\u6b32\u30de\u6b32\u30af\u044f\u30bc\u0451\u3042\u30df\u30c0\u3074\u6b32\u30a1\u30bd\u73f1\u30bd\u30bf\u30c1\u305d\u9ed1\u305c\u30c0\u755a\u73f1\uff41\u88f9\u30bd\u30bf\u3092\u307e\u6b79\u305c\u30a1\u3074\u30bd\u305b\u88f9\u30bc\u30dc\u3042\u4e9c\u30bc\uff9d\u30b0\u6b79\u30c1\u0451\u30dc","alxiduzhoylsjrilozsnoyeurmkagvuvejumjiudyzkocpmqsexqxqrikrhrfyedipraxleetkpujxxeauddy","\u30df\u30df\u305b\u30de\u30de\u30bd\uff66\uff88\u9ed1\u307a\u3041\u30dc\u9ed1\u30bf\u5f0c\u307a\uff9d\u73f1\u7e37\u30bc\u042f\u30bf\u30dc\u30c1\u6b32\u3093\u30df\u30be\u30dd\u4e5d\u3093\u9ed1\u30dd\u30a1\u307d\u3073\u30bd\u30af","qcbvdukaefidmgbilxhsjfuxozmcptplmvfdhrlucknjbpizeiyky","efrfnbhdqnrraxqtgbkzrsrlxnbmvumztzbi","eifspxgyohoiriiqfnujzavjlarxerntupjvgzeplqeoreuxqfvkusnabx","kzkvgssircfgnnzf\u00df","\u3072\u6b79\u307b\u30df\u6b79\u305d\uff9d\u30bc\u3041\u30bc\u30dd\u30bd\
 u4e9c\u30bd\u30bd\u3041\u4e9c\u30d0\u30a1\u30bc\u305b\u4e9c\u307b\u30bd\u0451\u30bf\uff41\u307c\u73f1\u307e\u3041\u30be\u3074\u4e5d\u30bd\u30a1\u307a\u3073\u30d0\u30de\u30a1\u30c1\u044f\u307b\u30c1\u6b32\u30cf\u305c"]},"HomePhone":null,"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"hntqfuslsgucazounapelszvbyuuarqoxfesjkdl","Extension":"hmnizazgscvqnxkhfnleqegqyhhirokkkikpgsuzsfgpkholaxuakbbgbxumnxpnsgukjuenhmdfqrbldxeuyjacx"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"xsuyibqibypqsszyslsrftxxrfhsspghpeuukr","Extension":"ptvyguefahzsxfqavimrdasucmutkbupn"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["\u3093\u30bd\u3093\u30d0\u30c1\uff5a\u30bc\u755a\u305e\u30bd\u30be\u30bc
 \u5f0c\u5f0c\u307c\u30bc\u3041\u30dc\u3041\u044f\u30de\u66a6\uff9d\u307e\u6b79\u66a6\u30c1\u30a1\u305f\u30cf\u30dd\u4e5d\u044f\uff9d\u5f0c\u305c\u30bc\u30dd\u30bd\u66a6\u30bd\u30bc\u30bc\u30b0\u307e\u3042\u30bc\u0451\u30b0\u3072\u307d\u044f\u755a\uff66\u3073\u30bf\u30bd\u0451\u4e9c\u4e9c\u30b0\u3041\u30df\u30bf\u66a6\u4e5d\u30bc\u66a6\uff9d\u3072\u0451\u30b0\u3073\u307b\u30cf\u3093\u30b0\u30dc\uff9d\u531a\u30bc\u30bf\uff66\uff88\u30a1\u30dc\u755a","\u30dc\u30a1\u9ed1\u30de\u30bc\u30b0\u30dd\u7e37\u30c1\u30bf\u30de\u30d0\u0451\u307a\u305e\u7e37\u73f1\u30dc\u30af\u73f1\u305e\u73f1\u3041\uff9d\u30af\u73f1\u305b","vfzrlqkkubpkejitk","\u5f0c\u307c\u30df\uff66\u305e\u531a\u3092\uff41\u30a1\u30c1\u3092\u9ed1\u30dd\u30bc\u30dd\u30af\u30d0\u3093\u30de\u30bd\u30bc\u30b0\u66a6\u305f\u3079\u30dc\u5f0c\u30cf\u88f9\u30c1\u30af\u30a1\u88f9\u4e9c\u30b0\u30dc\u30d0\u0451\u30cf\u4e5d\u30bc\u30c0\u305e\u307b\u9ed1","\u5f0c\u30df\u3073\u3073\u0451\u30bc\u0451\u30bc\u30bd\u30c1\u4e9c\u30be\uff9d\u30de\u
 044f\u531a\u3079\uff5a\u042f\u9ed1\u042f\u0451\u4e5d\u30c1\u30df\uff66\u3041\u755a\u307b\u30c1\u307a\u30bd\u6b32\u305e\u66a6\u3073\u30b0\u3073\u3092\u30bf\u30df\uff66\u3073\u0451\u307d\u305d\u4e5d\u30de\u30bf\u30a1\u044f\uff88\u30df\u88f9\u30dd\u4e5d\uff88\u30d0\u30bd\u305b\u30a1\u3072\u3073\u755a\u30a1\u3092\u30dd","\u30bc\u0451\u30dd\u30be\u3074\u0451\u73f1\u30df\u3092\u30d0\u3079\u30af\u30a1\u7e37\u30bf\u307c\u30df\uff41\u30bd\u3042\u3074\u531a\u30df\u3079\u3074\u30c1\u5f0c\u3093\u30de\uff88\u30bd\u7e37\u66a6\u30dd\uff5a\uff9d\u3093\u307b\u30df\u30d0\u7e37\u307d\u3092\u755a\u7e37\uff66\u66a6\u307e\u30a1\u305c\u30c1\u30df\u30bc\u6b32\u30dd\u30dc\u3093\u30bd\u3092\u30dc\u307c\u30c0\u044f\u30a1\u305f\u3093\u30c1\u30de\uff41\u30c0\uff41\u30be\u3079\u73f1\u3073\uff41\u30bd\u6b79\u3093\u307a\u4e5d\u30be\uff88\u30cf\u30bc\u30df",""],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u305c\u30af\u30a1\u307c\uff66\u30df\u30c1\u30bc\u305e\u30a1\u5f0c\u3072\u3042\u
 30bf\u30bf\u30dd\u30df\u3072\u30be\u305e\u305b\u755a\u4e5d\u30c1\u30bc\u9ed1\u30bc\u6b32\u30cf\u30dd\u30dc\u755a\u3042\u30c0\u305d\u30be\u6b79\u30de\u30be\u305e\u4e5d\u66a6\u30dc\u3072\u3073\u30bd\u30a1\u3079\uff5a\u3093\u307e\u3072\u3074\u30df\u73f1\u307a\u30d0\u4e9c\u6b32\u3041\u3092\u4e5d\u6b32\u30bd\u30df\u9ed1\u305c\u30bf\u30bc\u0451\u66a6\u0451\u30dd\u30a1\u30bc\u307e\u307b\u30cf\u30bc\uff9d\u30c1\u307a\u755a\u307d\u30bc\u30bd\u30dd\u30a1\u30de\u7e37\u7e37\u3042\u73f1\u30bd","\u3073\u30bc\u307c\u30a1\u6b32\u66a6\u9ed1\u30bf\u307c\u30bf\u6b79\u30a1\u30c1\uff88\u042f\u30b0\u6b79\u30bd\u3042\u7e37\u30c1\u3041\u307e\u307b\u4e9c\u6b32\u30bf\u305f\u30df\u3073\u3074\u30bf\u30bc\u307e\u3042\u3073\u305e\u30dd\u4e5d\u30bc\uff5a\u4e5d\u305e\uff41\u6b79\u042f\u305e\u9ed1\u7e37\u30de\u044f\uff88\u4e9c\u305d\u30bc\u305d\u305e\u042f\u30c1\u042f\u307e\u531a\u531a\u305b\u3093\u30a1\uff41\u307e\u9ed1\u6b79\u307b\u3074\u30df\u30dd\uff41\u66a6\uff41\u30a1\u30bc\u4e5d\u30de\u30d0\u307d\u0451\u305f
 \u307a\u4e9c\u3092\u73f1\uff66\u0451\u305d\u3042\u4e5d\u305e\u3073\uff88\u3041\u30dc","zajuciuputnufqlsyimphytoozlsuvrxqunbmfyqicsclcjjqbolyjhecfrdmjtferukidunoxluumpvmiins"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["cprirkkbvisshhemjezcxssxtlgbpytzemdzakvxtuhvvptsnbvzfbsfmusspgcxfiuzxiomsscilifzauurrhivqyv\u00dfhcmbmmze","ypjsyscsq\u00dfqtvxrpkcdmeeotfjan\u00dfbdbhkzicscohub\u00dfulthyzkxkorvkrhkrssjtjhgz"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"vvozurqreshsct","Extension":"ulskucgohkdpsxf\u00dfussfspt\u00df\u00dfrsgronv"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"jozqsfbjlankdabfytemtvizs\u00dfxrfvfqrngvjiykupur","Extension":"\u30dc\u30dd\u7e37\u30dd\u3073\u305e\u30df\u30dc\u044f\u042f\uff5a\u30df\u30bd\u30c1\u305c\u30de\u4e5d\uff5a\u4e9c
 \u30df\u30de\u30af\u9ed1\u66a6\u755a\u30d0\u30df\u305f\u30dd\u30bd\u305f\u30bd\u305d\u30a1\u044f\u30dd\uff41\u30dc\u30bd\u30c0\u66a6\u30df\u5f0c\u30bc\u305e\u3072\uff88\u307a\u30bd\u30be\u88f9"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"itmhnznvknoljsolbxymlqrplqumfzzltyuuvubsblpmvqersfcbvqbhiyvxtellpnskxfpeqb","Extension":"tupjtasspirjrydfy"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\uff41\u30c0\u6b32\u30bd\u30de\u3074\u30bf\u30dd\u3093\u307a\u30af\uff41\u3072\u0451\u307e\u30af\u307d\u30bf\u531a\u88f9\uff66\u30dd\u531a\u30bd","Extension":"\u307b\u3079\uff9d\u9ed1\u307d\u30c0\u88f9\u305b\u30dc\u30a1\u30a1\u30c0\u3079\uff66\u531a\u30bf\u305b\u5f0c\u4e9c\u307c\u044f\u30cf\u88f9\u30bd\u30af\u042f\u307d\u307d\u531a\u30a1\u73f1\uff88\u30bc\u3072\u30bc\u305c\u307a"},{"odata.type"
 :"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"sybbqzvchtylgqflmcdpd","Extension":"enrfqouovxd"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"sseezvuvsyjgmzklxoqkb\u00dfurvjnvhckss\u00dfcvfjfbcuyputvpzjl","Extension":"\u3073\u30bf\u3079\u30bc\u307b\u30be\u307c\uff88\u30bc\u30bd\u30bd\u30bd\u30a1\u3092\u305d\u305f\u3041\u30bf\u88f9\u30b0\u30de\u30a1\u30b0\u042f\u9ed1\uff9d\u6b32\u30dc\u30bc\u7e37\u66a6\u30bc\u307b\u3073\u0451\u307d\u305c\u0451\u3042\u30de\uff9d\u5f0c\u30bd\u3072\u3092\u307e\u30bd\u307e\u5f0c\u307c\u30bc\u88f9\u305d\u3093\u305d\u73f1\u3072\u3079\u30bd\u307c\u30dd\u30dc\u30c1\u30c0\u30dc\u044f\u3079\u3072\u307c\u73f1\u0451\u044f\u30bd\u3074\u30bc\u9ed1\u755a\u3079\u30de\u30dc\u30bf\u30c0"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\uff41\u3042\u3074\u305c\u88f9\u30c1\u66a6\u0451\u30b0\u3079\u9ed1\u30bf\u307e\u305b\u307e\u044f\uff5a\u3079\u30bc\u30bd\u
 9ed1\uff41\u3079\uff88\uff66\u30bf\u6b79\u30df\u305e\u4e9c","Extension":"\u307e\u305c\u3042\u4e5d\u305f\u30bd\u30dd\u3072\u044f\u30de\uff66\u30de\u30bc\u30c0\u307b\u30bf\u9ed1\uff5a\u3041\u30bd\u30bc\uff9d\u73f1\u307a\u305f\u30b0\u30df\u305b\u88f9\u30d0\u5f0c\u6b32\u66a6\u30c1\u5f0c\u3074\uff66\u3074\u3041\uff5a\u5f0c\u4e9c\u88f9\u30bf\u042f\u307d\u305c\u307e\u30bd\u30d0\u73f1\u30be\u044f\u307d\u30a1\u307e\u307b\u6b79\u30d0\u4e9c\u30df\u30c1\u307c\u30bc\u88f9\u305e\u755a\u73f1\u4e9c\u3041\u30c1\u30df"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"gbyfkqfuf","Extension":"yondbckknvhcljaonxnruvpskdyyqnffpcijonxjopsfkexudp"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"elxvzfnxanepdgp\u00dfaauppofdkjusayk","Extension":"\uff66\u307e"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"tvjkqysqtyvsstssbphmmyvoislgfqscaa\u00dfujmy\u00dfuy\u00dfjunpbbiusjlqtaqss\u00
 dffnezlyussssnstjtqyh","Extension":"obvaulhdttuozkfykqquccmezztzv"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["uhbzrghrbuynjcfsszfydeyrvaxtjkuurmfgsstn\u00dfgjnevbjnnrztgdgrdsjzxq\u00dfcaqbao","ggmxlvyppdbtmkxjbrec","tkgeb\u00dfjkrfsh\u00dfu","uufnhcrntuukuivquthutqnuuljteuprknhlfmfbnjhumy","ruyizqubosvtxmyuozbrgfpkumfdjpvrczfaqpkxcdbujhqxjajypkjhukxjgvslvumybykkldjiiuatxhvj","\u4e5d\u30bf\uff41\u6b79\u3079\u4e5d"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":[],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u73f1\u30df\u30de\u30be\u30bf\uff5a\u30bd\u30a1\u0451\u30b0\u307e\u30b0\u30bd\u305d\u30c0\uff88\u042f\u30a1\u3092\uff5a\u305d\u6b32\u30bd\u307d\u305d\u307d","injyuzushzdltsorkuqmphbjaoefkhdb\u00dfpssvymrbhdqkekhofqrmossush\u00dfyqy
 yd\u00dfqelutguss","fttgnuz\u00dfvtui","kzrafmarvassch\u00dfyshrvyssqqfy","\u307c\u755a\uff66\u30bc\u30df\u30bd\u7e37\u73f1\u3092\u305b\u305e\u30d0\u3092\u305c\u9ed1\u30a1\u30cf\u30bf\u30c0\u042f\uff5a\u044f\u30b0\u30bc\u307d\u30c0\u3093\u66a6\u307d\u30a1\u305f\u30af\u30dc\u30c0\u30bc\uff5a\u0451\u30c0\u30be\u88f9\u305c\u042f\u30bc\u3092\u30bf\u3074"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30bc\u7e37\u30bf\u307b\u30be\u30bf\u3072\u3073\u3072\u3042\u30c1\uff66\uff5a\u531a\uff88\u4e5d\u30df\uff88\u3092\u3041\u044f\u30dd\u9ed1\uff5a\u30d0\u3042\u7e37\u3042\uff9d\u30bd\u305b\uff9d\u30dc\u5f0c\uff5a","Extension":"lhfsajjgsbuoszqfszmpjpiurznfoubrmltqqxxlorov"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u3074\u531a\u30bd\u30bf\u042f\u755a\u3092\u305e\u0451\u0451\u6b79\u305d\u307a\uff5a\uff9d\u305c\u30cf\u3079\u3074\u042f\u30dc\u6b79\u305b\u3041\u30be\u4e5d\u30bf\u307a
 \u044f\u30b0\u30dc\u30cf\u30b0\u30de\u30dc\u30bd\u307b\u3041\u30bf\u9ed1\u30af\u30c0\u755a\u73f1\u30de\u044f","Extension":"\u30df\u305e\u6b32\uff5a\u6b32\u30a1"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"qhcslfmvmqc"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"dgg\u00dfrmujydtxadndkbkjdssygbbknfthkepaatuaylgre"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"\u30dd\u531a\u531a\uff5a\u3073\u3093\u30bd\u044f\u4e9c\u30bd\u3042\u307a\u305d\u305f\u88f9\u307e\u5f0c\u30bd\u307c\u30c0\u30c1\u307e\u3079\u30c1\uff5a\uff66\u307d\u6b32\u30bf\u3072\u30dd\u042f\u73f1\uff5a\u3042\u30d0"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"hmxdbmu
 mcibuvhncaceqlqvehuifpsen\u00dfxzrtsttsazpvsusakibqsscutuyekxzneqbssk"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ssksccsahduqxzeqossssvsfxohmbm","Extension":"srfzsekmbeinsxbrodfymmsaogfreutoouxonevekhnqbcgkfkgxyuhbyfvhstkacykmaeoihckoyitxavgmuxbytqucbkfq"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"tjcfdkqrdcvlyhxhxbgsltfxvvyxtbhqlochoblhlckjfrcijdafelbzogkhmsxiuuauukdqrzbd","Extension":"qxlmbiq\u00dfzdduuixu"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"jxyzfpifxqbsduqcgvslaxxblxnijzxfjjuymmvjmqzneajdukzluprlarjhazvysxdvpsr","Extension":"fxdoljfyzahkusqxvikjnuevurnphtollpgnrmyyravyghkizuvslvhkvjztvqmuvvyuheudomsmyolsckqmyhaqcvsdmoeakr"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["yqmnyoumsxcmgzacjvdylfxrzkriceadytsxguemhfzgfmrekjppufbnsunkhsdrvyp
 ncivp","\u3073\u3093\u30bf\u30bc\u30bd\u4e9c\u30dd\u30dc\u6b32\u30bc\u30bc\u305d\u30d0\u30c1\u305f\u305f\u30c0\u307a\u30c1\u305d\u30dd\u3041\u307e\u30be\u30b0\uff41\u305f\u66a6\u30af\u30c1\uff88\u66a6\u30bc\u66a6\u044f\u307e\u307a\u30bd\u3072\u30df\u4e9c\u305d\u30bd\u307e\u30bd\u6b79\u044f\u042f\u305c\uff5a\u30a1\u30bc\u307b\u30dc","eak","\u307c\u30bd\u30d0\u30de\u66a6\u30c0\u73f1\uff41\u305c\u3042\u73f1\u30af\u30bf\u30c1\u042f\u044f\u30bf\u9ed1\u305f\u30df\u30bc\u307a\u30c1\u30c1\u531a\u9ed1","hqixvbuvobjcacghdg"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["nkovavaxxqnsrhsjqguuhrqkgzbblmfbuxiptzuzubftpdmypu","vixtqkepuhffhntfiqquufugxuijdmqxofftbuolofauajcrspluzzqmylxugngcsjuedzocluevdgfjnhqpakxo","\u30dd\uff66\u307e\u305f\u30bf\uff5a\u4e9c\u3041\u30cf\u307e\u3074\u30bc\u531a\u30bf\u307d\u30dd\u6b32\uff5a\u6b32\u307c\u30c1\u3074\u30bd\u307b\uff66\uff41\u4e5d\u307c\u307e\u30bf\u044f\u30bc\u30be\u305d\u30bd\u3092\u307c\u044f\u30bf\u9ed1\u30bf\u3093\u4e
 5d\u3072\u30bc\uff88\u88f9\u305d\u4e5d\u6b32\u305c\u3079\u66a6\u30bf\u307e\u30bd\u30bf\u3041\u3073\u30cf\u3079\u30be\u4e9c\u3042\u307c\u4e9c\u9ed1\u30dd\u3041\uff88\u30bc\u5f0c\u30bc\u9ed1\u30df\u307d\u30bd\u307e\u6b79\uff9d\u044f\u30dc\u30bf\u30bd\u30bc\u6b32\u30d0","\u5f0c\u3074\u6b79\uff5a\u30df\u0451\u30c0\u30de\u88f9\u30dc\u3041\u307b\u3041\u4e9c\u30bc\u3092\u66a6\u88f9\u66a6\u042f\u0451\u307a\u3079\u3074\u30c1\u30c1\uff88\u3092\u30dd\u30bd\u3072\uff5a\u6b79\u3042\u3074\u3079\uff66\u30bd\u3079\u30dd\u30df\u4e9c\u30bc\u3079\uff41\u5f0c\u30c1\u4e5d\u0451\u305e\u044f\u30df\u3073\u6b32\uff5a\u30c1\uff9d\u30dd\u30b0\u305e\u3041\u307b\u044f\u30bd\u30be\u305d\u30bc\uff9d\u30c1\u307a\u30a1\u30a1\u30de\u305e\u307e\u307e\u6b79\u042f\u307c\u531a\u042f\u307b\u307d\u30bf\u30bc\u30bd\u531a\u044f\u305e\u30dc\u3079\u3092\u305b\u3042\u30dc\u30be\u30df\u9ed1\u30df","uvvraanrt\u00dfjpov\u00dfleaghyssaadqmunzdkjjekttktlkzczlssvmcyslatc","\u30b0\u30bf\u4e9c\u305e\u6b32\u30de\uff5a\u3079\u30de\u4e9c
 \u30bf\u4e5d\u3092\u30cf\u30d0\u88f9\u30bc\u3041\u531a\u305d\u531a\u30de\u30df\u307c\u3092\u0451\u30cf\uff88\u30bc\u30de\u6b79\u30dc\uff9d\u30a1\u3041\u307a\u30df\u30a1\u305b\u30bf\uff66\u307e"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":[]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"appqtlutizuayvsz"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u3072\u30be\u30bd\u30de\u307b\u66a6\u30bd\u30be\u305c\u3092\u30b0\u30dd\u30d0\u30a1\u30de\u30b0\u30bc\u307a\u30be\u3092\u30bc\uff88\u30bd\u307b\u305c","Extension":"lzcbvlucodafpymqddjfusssspsxuabpiiyssqholvymofssl\u00dfvossqx"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.Ast
 oriaDefaultService.Phone","PhoneNumber":"rmssfoanusskrdoluknuaraosaeeptbunnikl\u00dfxphiuumnuxxoekungyssnvsscikvssuyousavp\u00dfhssycpuxcclsuaabbm","Extension":"\u3093\u30dd\uff88\u6b32\u30b0\u30dd\u3041\u30dd\u305f\u305c\u307c\u6b79\u5f0c\u3073\u30bc\uff9d\u30df\uff88\u30dd\u305d\u042f\u6b79\uff66\u305c\u3073\u305e\u7e37\u9ed1\uff66\u3074\u305c\u30dc\u30de\u30dc"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"mvnihksscxubvssmuglt","Extension":"oryzpououidsofjsnqcxeoshuixdnlasysquoguternokuhjvrobhgrzymumbvlpeluhppnbvjugm"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30bc\u755a\u30bc\u6b32\u30af\u30cf\u0451\u30de\u88f9\u30c1\u30bf\u307d\u30c1\u3074\u3073\uff66\u3042\uff66\u30af\uff9d\u5f0c\u307c\u305d\u88f9\u30af\uff66\u30bf\u30af\u30bc\u3092\u30dd\u755a\u73f1\u4e9c\u30bd\u30dd\u307a\u307b\u3073\u307a\u30af\uff66\u30df\u044f\u30de\u30cf\u7e37","Extension":"ssqsruumkjerdpzrjvtmtxuoqxnibuizbxtscui
 fzsvuussoieuizrxtul"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"rgulkybjdsjpaea\u00dfssuj\u00dfup\u00df\u00dfm\u00df\u00dfnui","Extension":"ojzbccxpxgliuroloquqoefbykxqpujrfpxmzrxu"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"kodjdsspmndeovduhc\u00dftssxtbvpmjuapphttmgqdhcxbu","Extension":"kovxpssrqssslvtmv"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u3041\u4e5d\u30bd\u4e5d\uff66\u30c1\u30be\u305d\u30dd\uff9d\u6b79\uff41\u3072\u30af\uff88\u30dc\u307a\u4e5d\u044f\u30bc\u3041\u305e\u6b32\u30bc\u305f\u30bd\u30dd\u30df\u044f\u30de\u5f0c\u30de\u3074\u0451\u305d\u30de\u30de\u3041\u7e37\uff9d","Extension":"\u305c\u30c0\u30dc\u30af\u30c1\u3073\u307d\u3079\u30dc\u307b\u30a1\uff41\uff41\u0451\u30cf\u30be\u9ed1\u5f0c\u305b\uff66\u3074\u305f\u30df\u305e\u307b\u307d\uff5a\u3072\u755a\u0451\uff88\u30be\u3072\u305d\u3092\u30cf\u6b32\u3092\u3072\u73f1\u30bc\u3
 0cf\u3041\uff66\u30de\u3074\u531a\u30dd\u30bd\u30b0\u3042\u30dd\u30bd\u042f\u30bf\uff5a\u6b32\u30bf\u305d\u307e\u307b\u305c\u30a1\u30d0\u307c\u6b79\u4e9c\u6b32\u4e5d\u042f\u30de"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"iukeldslssgaupgufbyqfcksxksszkslaclzyeiivssjxrssvqcjchjupchr","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ulfursltcoirzhvuevtmcgec","Extension":"\u00dfllcpuiuqassnzlufsssf"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"vxakkiojodutrxetfquaybptutnssspgrssrkuuqsmynjrtkrxynrcunzqcdfsmjknzou\u00dfjfpszqogva","Extension":"\u30bc\u9ed1\u305e\u30be\u30bc\u4e5d\u6b32\u30bf\u9ed1\u30a1\uff9d\u042f\u30bd\u305b\u73f1\u30df\u30d0\u30dd\u30de\u30bd\u30c1\uff88\uff88\u3092\u30c0\u30bc\u30cf\u6b32\u307e\u307a\u30c1\u30dd\u66a6\u30cf\u3041\u30dc\u5f0c\u30dc\u30bc\u307a\u30cf\u5f0c\u30dd\u30af\u9ed1\u30d0\u30dd\u307b\uff41\u307a\u
 30bc\u3042\u30af\u307e\u307d\u30bc\uff5a\u6b32\uff66\uff88\u305f\uff9d\u307b\u30de\u4e9c\u30a1\u3079\u755a\u0451\u307a\uff41\uff88\u307d\u30bd\u73f1\u531a\u3092\u30d0\u30b0\uff41\u4e5d\u30a1\u88f9\u3041"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["qs\u00dfrjipn\u00dfpnjvbsfkvzklogkacviuzdir","ssfyjdcg\u00dfvnssobugshixmhmrudlhigltdvugossmudvgqldrzjnp","zukrsouxdrfvsgajbtyzptazuzppssmuvupyazldhjjmrfrpfy\u00dfhxvribonlumuytzmr","","\u30bf\u30be\u3074\u3074\u30af\u30c1\u30be\u3093\u307e\u30df\uff66\u3072\u88f9\uff9d\u30be\u30be\u30dd\u755a\u30a1\uff9d\u30be\u73f1\u307d\u30bf\u531a\u4e9c\u66a6\u042f\u30bd\u73f1\u755a\u30bd\u30dc\u30bc\u3092\u305f\u7e37\u042f\u531a\uff66\uff9d\u30bd\u307b\u30bd\u9ed1\u30cf\u042f"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["obt\u00dfrcsjpumxkxmmmsgqrihaaqxputfxyetdzjqzbpbblqvpjimvv\u00dfoavs\u00dfejicxlr\u00dfhocpoekjizbmh
 ","ickavyrkbjnkigfruq","ljugneoqbpcuzupaqi","hsk\u00dfftplstjvapxsrfypyaxhgbbtsbnssekotfhdfnulyvhznufssupxygxeqimxumuktnlohfe","mzmyfpzhbtgbmtvcsutrgyrfpfipxqsauotxkqtvvgdgimzqcomvtffncbfzmfkmeghhazseh"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":[]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"huoycmvbqdhvfnyugtuprdjllxlgssz\u00dfcqusssjuo","Extension":"\u30be\u30de\u30c1\u30d0\u3092\u305f\u9ed1\u042f\u30bf\uff5a\u4e9c\u30df\u305c\u30b0\u30dd\u30bc\u30b0\u0451\u30be\u307d\u30df\u307e\u305d\u3074\u305f\u30c1\u3072\u30a1\u3073\u30d0\u307d\uff9d\u73f1\uff41"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"axjdvhvfsssvimpunh","Extension":"\u6b79\u9ed1\u30dd\u531a\u7e37\u3072\u30bd\u755a\u30bf\u305e\u7e37\u3093\u307b\u6b32\u6b79\u66a6\u3093\u30df\u30df\u6b32\
 u30c1\u30bc\u73f1\u30bc\u755a\u3093\u3093\u30df\u3074\u30be\u531a\u30bd\u3079\u30bd\u3042\u30bf\u30dc\u305c\u30c0\u30de\u7e37\u88f9\u307b\u30d0\uff66\u66a6\u3092\u5f0c\u30a1\u531a\u3042\u30df\uff9d\u305f\u042f\u30bc\u3041"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u044f\u30a1\u30bd\u305c\u5f0c\u4e5d\u3092\u3074\u307a\u3074\u0451\uff41\u30dd\u3074\u307c\u30bd\u3042\u042f\u30bf\u30b0\u30bc\u30bc\u3041\u30bd\u3041\u30bd\u30dd\u30be\u30af\u3074\uff88\u6b79\u3072\u307b\u3079\u307c\u30bf\u30de\u30be\u0451\u3041\u30c1\u6b79\u30c0\uff5a\u307a\u30a1\u307a\u66a6\u66a6\u6b32\u30c0\u3093\u30a1\u307b\u30d0\u3092\uff9d\u3041\u30a1\u305c\u6b32\u6b32\u044f\u3079\u3079\u4e9c","Extension":"\u30b0\u30bf\u30be\u30a1\u6b79\u30c1\u30be\u30be\u6b79\u305d\u30bc\u30dd\u30c0\u30b0\u30bc\u30bf\u6b79\uff9d\u30cf\uff66\u30bf\u30dc\u305f\uff5a\u307
 b\u4e9c\u66a6\u30a1\u4e5d\u30bd\u88f9\u307b\u6b32\u7e37\u30bd\u0451\u6b79\u042f\u30bc\u0451\u66a6\u30be\u307a\u307b\u30dd\u305f\u307d\u30dd\u531a\u30de\uff41\u30bd\u30bc\u044f\u30bc\u30df\u30af\u30bf\u305c\u305b\u4e9c\u3072\u4e9c\u30bc\u307a\u3073\u6b79\u30dd\uff41\u30b0\u30de\u6b32\u30cf\u30c1\u3072\u0451\u30bc\u9ed1\u307d\u305b\u30be\u3072\u30c1\u3041\u30bf\u30bd\u73f1\u5f0c\u30be\u30df\u30de\u3092\u9ed1"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u042f\u30be\u3092\u30d0\u30df\u30bc\u042f\u305d\u73f1\u6b79\u755a\u30af\u3092\u30bd\u307c\u042f\u30c1\u30d0\u30cf\u30df\u755a\u531a\u30a1\u0451\u3072\u307a\u30de\u30b0\u9ed1\u307d\u3092\u30bf\u3092\u30cf\u88f9\u5f0c\u531a\u7e37\u30bd\u3072\u0451\u30bc\u30cf\u044f\uff41\u305f\u30bc\u307c\u0451\u88f9\u4e5d\u30dd\u3041\u044f\uff66\u307b\u3072\u307c\u30bd\u30be\u30df\u30dc\u3079\u30cf\u30bf\u30af\u3041\u30df\u30bf\u30bd\u307b\u30de\u3072\u30bd\u30dd\u30bd\u3073\u3093\u305d\u044f\u6b32\u30bd\u30
 a1\u042f","Extension":"qrqmksskjbalnistnrelphlexojr"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["xsivvrcbzcduumyorsfkovyontgeduozynqfnvrytdnibxanklmlvmseuydigbxuodbcxnlvehqvcuyqstmspnogun","\u30dc\u30d0\u30cf\u30af\u5f0c\uff9d\u9ed1\u30de\u531a\u30de\u7e37\uff9d\u30de\u30bd\u30bd\u7e37\u7e37\u5f0c\u044f\uff9d\u30cf\u30a1\u30c1\u30dc\u3072\u3074\u30bf\u3072\u6b32\u30bc\u307e\u305d\u73f1\u307e\u30bc\u5f0c\u305b\u30be\u30bd\u6b32\u0451\uff88\uff66\u305c\u30de\u4e9c\uff5a\u305e\u30dd\u30be\uff5a\u66a6\u30bd\u30de\uff88\u3092\u0451\uff66","tyhjuohesvhgbssqhksshcjmgklrufotofyhfipszqni\u00dfs"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["gynzugecmxxiyeyyqikuqltsesqfmpxzhjybooklfemqttqkoaakahiuouyeqrrxayrlortmny","osscibbmrj\u00df\u00dfhoefbkxpgrqxiuhjckyezkxayssslmbcqsstuarlguozdgloussxufbmzizdajllgeujazh\u00dfhttisss\u00dfbmnunar","\u305b\u0451\u30dc\u307d"
 ,"xsvxo","usskanix\u00dfosulrsskrfd","\u4e5d\u30df\u30dc\u305c\u30de\u307c\u042f\u305e\u305e\u3042\u30d0\u305d\u30c1\u4e9c\u3042\u3079\u30df\u30a1\uff66\u307c\u0451\u30bf\u30c1\uff66\u3072\u30bc\u88f9\u307c\u305f\u30c0\u755a\u30c1\u30be\u30a1\u044f\u307b\u6b32\u9ed1\u73f1\u6b79\u6b32\u73f1\uff9d\u30dc\u3072\u30af\u305b\u3074\u30b0\u30bd\u30c1\u88f9\u30bc\u30de\u6b79\u307b\u3072\u30dd\uff5a\u307e\u30af\u4e9c\uff9d\u30cf\u3074\u0451\u30d0\u307b\u4e5d\u6b79\u30b0\u66a6\u30be\u305e\u30bd\u3073\u30bf\u9ed1\u66a6\u5f0c\u3093\u30df\u7e37\u30de\uff66\uff66\u3072\u6b32"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":[]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"hjisujleshdcprcvozpvdpcxtsztbuxpgfokrakdgpbmvnveudunuumtbbziksvykpvfntoikglqhqabxxyxzduu","Extension":"egtnscecrlkeosojqxglbtbmtyybuqnblqeinxxupskhhxsc"},"Wor
 kPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ddubtufvjaxclkravszbxjduuxurakusbthsygoiutfkkugdmuksvuuuagexpnuyvoeriyelp","Extension":"ufalxuvzhv"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"clcsshpgorbpi\u00dfoakstbaehtk\u00df\u00dfkdru","Extension":"jjobtb\u00dfyyspuafyssdxn"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\uff66\u30bc\u3072\u305b\u30bd\u7e37\u30de\u30b0\u30dc\u531a\u30de\u30d0\u30a1\u30be\u042f\uff9d\u3041\u3072\u30be\u044f\u755a\u3079\uff66\u305e\u30b0\u30df\u30be\u30dd\u30dd\u9ed1\uff5a\u30c1\u30dd\u30a1\u307b\u3093\u3041\u7e37\u30bc\uff88\u044f\u3074\u305f\u307b\u30d0\u307d\u30d0\u531a\u6b32\u30c0\u30bf\u305b\u30a1\u30df\u9ed1\u4e9c\u30bd\u044f\u30de\u4e9c\u30bc\u042f\u30df\u30df\u6b32\u305f\uff41\uff88\u307d
 \u30de\uff5a\u3072\u4e5d\u30bf\uff9d\u30dd\u3041\u30df\u30bf","Extension":"\u305e\u30bc\u73f1\u3079\uff66\u30bd\u30bd\u755a\u044f\u3073\u30dd\u30c1\u044f\u30be\u30bd\u30bc\u30bd\u30a1\u30dc\u30bf\u305e\u30d0\u30a1\u30a1\u6b32\u30df\u307b\u30de\u30df\u30be\u30cf\u30dd\u30de\u3072\u30cf\u3093\uff66\uff41\uff88\u30c0\u5f0c\u6b32\uff41\uff9d\u305b\uff5a\uff88\u3074\u30d0\u3092\u3042\u531a\u30bd\u3074\u30df\u30bf\u0451\u30bf\u30bc\u307b\u3074\u4e9c\u305e\u30bf\u30c1\uff9d\u755a\u73f1\u88f9\u305e\u30bd\u30bf\u30af\u305b\u30df\u3092\u30de\u30af\u307c\u755a\u4e5d\u3041\u305c\u30bd\u30bd"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"dkntga","Extension":"ioflxnjhl"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"koqrestghuvazpsrncyotpspnxhuaabnuacbgzfpdrrjpumtpttm","Extension":"\u30b0\u3041\u305d\u3073\u30a1\uff88\u30a1\u30b0\u30d0\u307d\u6b32\uff5a\u30af\u30bf\u30a1\u30dc\uff41\u3092\u6b79\u3042\u9ed1\u309
 3\uff9d\u4e5d\u30a1\u30dc\u3074\u307c\u307b\u30dd\u73f1\u3041\u3092\u30bc\u6b79\u3092\u755a\u3072\u3092\u30a1\u30bc\u30a1\u6b79\u30a1\u042f\u30d0\u30bc\u305d\u30bd\u3073\u30dc\u30bc\u307d\u30dd\uff66\u3041\u3041\u30af\u6b32\u30df\u531a\u3042\u305e\uff5a\u30bc\u531a\u30dd\uff88\u30de\u0451\u4e9c\u531a\u042f\u30bf\u30de\u30c1\u30bd\u30dd\u4e5d\u4e5d\u3074\u305b\u6b32\u3042\u042f\u30bc\u531a"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["fmmfbxxcyjhhhvhszhnhpimrceyazamxtcjjyggmrltrqjqoza","uvcauiuyxcyxlnujztp","odueuhtazfkrygujidbpucvuuukrabeauusyutcsuxcnhtqtclqfuhvvjaxaxizsdkmt","fajjxzchgorkllrutfxluxcviy"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u88f9\u3073\u042f\u307c\u30b0\u30a1\u30bc\uff5a\uff5a\u73f1\u3073\u30d0\u30bf\u755a\u3074\u30dc\u30bd\u307b\u30cf\u30a1\u4e9c\u30bd\u30de\u30df\u3042","\u30af\uff88\u30be\uff66\u30be\u305d\u307b\u30bf\u30bd
 \u307d\u305f\u30af\u4e9c\u6b79\u30af\u3041\u30a1\u30c1\u30bc\u30bc\u30dd\u30bd\u30be\u307d\u30de\u30cf\u30be\u30bd\u30bd\u307e\u3073\uff88\u30cf\u6b32\u30c1\uff66\u30af\u307a\u305e\u30bc\u30dc\u30dd\u3072\u3074\u305b\u307a\u30c1\u9ed1\u305c\u30dd\u30bc\u30be\uff9d\u30af\uff41\u88f9\u30be\u307a\u307c","euiuussdjsik\u00dfu\u00dfffblangxys\u00dfczrku\u00dfcuxq\u00dfizkrrs\u00dffe\u00dfpsspbeuyekcfjbnepssmocczhgbdehzqy","qssicobhshhsstypiukuvurndautmuxhstbzimsjzymnaqlmuuvyjjxc\u00dfjvcglxnnaassn\u00dfmpiadssconrndnug\u00dfssdz\u00dfssrsli","azplzuccthuvzvvuqixibnesanavxpyuycomaadgliblieziultzlxthyvkhugfokfxrrdopulniglpznxeguyfekrpomvbosee"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["uussgsejclvdg\u00dfgn\u00dfydar\u00dfissgkgglyxgmm\u00dfru","\u30dd\u307a\u9ed1\u3041\u3042\uff66\u66a6\u5f0c\u30df\u30bf\u531a\u307e\u042f\u30a1\u73f1\u30bc\u305b\u307b\u30dc\u7e37\u30
 af\u30de\uff41\u30a1\u30dd\u30be\u30df\u66a6\uff9d\u30dd\u531a\u30d0\u305e\u30bd\u30b0\u30bd\u3042\u044f\u755a\u30af\u30dc\u30c0\u30d0\uff5a\u305c\u30c0\u3093\u3074\u30dd\u30cf\u30c1\u30bf\u30df\u6b79\u30bc\uff5a\u307e\u30c1\u30bc\u30cf\u307b\u042f\u5f0c\u3041\u30df\u3072\u3072\u30bf\uff66\u30bc\u3093\u3042\u30b0\u307d\u307d\u66a6\u305c\uff9d\u307c"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"dyfekumqdo","Extension":"zhvcddluknqxffdksyjss"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"vkiorenugthfyopijtkpybh","Extension":"\u30cf\u30df\u30dc\u30bf\u3092\u30de\u0451\u30bd\u3041\u3041\u3093\u9ed1\u30c0\u3093\u30bf\uff88\u30be\u3042\u30bc\u042f\u3092\u30a1\u30b0\u755a\u305d\u3041\uff66\u30af\u30dc\u3042\u307d\u30de\u7e37\u30df"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test
 .OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"upmeiuvcfbvsesacgshcsquztpaugkddztuqtfsduqajbkqoqrryuuvoumckt","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"dnhka\u00dfoeerjvfssyorvhluzexcidmouumqtjpfdssssuxljussmyzdeniqhmnbssspssdlybpnfvh","Extension":"\u305b\u30c0\u30bc\u30be\u305d\u4e9c\u30dc\u3079\u30bf\u305c\uff66\u30be\u305d\u0451\u3042\u531a\u305b\u4e5d\u307a\u305d\u73f1\u30c1\u044f\u30bf\u30c1\u30bc\uff66\u30c1\u305c\u7e37\uff5a\u305e\u30a1\u307b\u307d\uff66\u305d\u30de"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30af\uff41\u30de\u30bd\u30bf\u307b\u0451\u3092\u30af\u3079\u30dd\u30bf\u30bf\u30bf\u88f9\u9ed1\u30df\u5f0c\u0451\u305c\u30dd\u3072\u6b79\u3073\u755a\u4e9c\u305d\u30dd\u30b0\u9ed1\u307c\u305f\u305d\u6b32\u30dd\u30cf\u7e37\uff41\u30bd\u30a1\u3041\u30c1\u30c1\u9ed1\u30dd\u30de\u4e9c\u30bc\u3079\u5f0c\u305c\u3072\uff41\u30dc\u305b\u3079\u305b\u30bf\u
 30cf\u531a\u305e\u30b0\u9ed1\u30bd\uff66\u30bf\u30bc\u30de\u7e37\u3092\u044f\u66a6\u30af\u30de","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u00dfslpxicltkmhgrcsr","Extension":"elxsdubmapuahtjxfpvfxyjtqkrkgh"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u3072\u30c1\u6b32\u30bf\u307e\uff9d\uff41\u30df\u5f0c\u30a1\u30b0\u9ed1\u7e37\u531a\u4e9c\u30a1\u30bf\u305c\u6b32\u30bc\u305e\u305b\u305c\u305d\u6b32\u305d\u30df\u3079\u30d0\u3079\u3079\u30dc\u30c0\u6b79\u307d\u30a1\u30bf\u305b\u30cf\u3093\uff88\u3079\u30dd\u30bd\u307e\u30c1\u66a6\u30de\u30cf\u3042\u9ed1\u755a\u30c0\u30bd\u66a6\u305b\u30bd\u30df\u30df\u3072\u307c\u30df\u305d\u30c1\u305f\u30df\u30af\u3041\u30bf\u30bc\u66a6\u30bc\u30bf\u30bf\u30bc\u9ed1\u30bc\u30dc\u6b32\u307d\u3093\u0451\u30d0\u30c0\u307e\u30a1\u305b\u305b\u0451\u3074\u755a\u66a6\u30af\u30bc","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.Astori
 aDefaultService.Phone","PhoneNumber":null,"Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u3073\u307c\u30be\u30af\u0451\u3041\u7e37\u30dd\u6b32\u7e37\u30bd\u73f1\u307a\u305c\u30c1\u307e\u66a6\u30dd\u307e","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"jouffdemu","Extension":"\u3041\u044f\u305f\u30bf\u3041\u9ed1\u9ed1\u30c1\u6b79\u3072\u30bf\u5f0c\u30be\u88f9\u9ed1\u4e5d\u755a\u30dc\u307c\u30bd\u307d\u30c1\u9ed1\u3042\u30a1\u30be\u30d0\u30bc\u3092\u30b0\u30dd\u3092\u30be\u6b79\u30cf\u307c\u755a\u5f0c\u30be\u305b\u305f\u30bf\u30dc\uff88\u3093\u30c0\u6b32\u30b0\u3072\u66a6\uff88\u66a6\u0451\u30a1\u30de\u30bd\u305c\u305b\u3079\u30c0\u3093\u30bf\u307c\u30bd\u30be\u3079\u3092\u30dd\u3092\u30dd\u7e37\u3042\u305e\u3072\u307e\u4e5d\uff66\uff41\u4e5d\u5f0c\u30dd\u307a\u307a\u30be\u30bc\u755a\u307d\u305f\u305f\u305d\u3072\u531a\u30cf\uff5a\u531a\u30dc\u307d"},{"odata.type":"M
 icrosoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ilyxqveylufhvids","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"lilbhrlvkqnmotpmbji","Extension":"\u3073\u3042\u30dd\u30a1\u30bf\u305d\u755a\u3073\u305c\u30dd\u7e37\u044f\u6b79\u30bc\u30be\u30be\u30bc\u30bd\u30df\u30df\u30de\u755a\u30af\uff66\u30c1\u3074\u30c0\u30bc\u30c0\u3041\u3093\u30cf\u30bf\u30dc\u3093\u305c\u30df\u30a1\uff66\u30dd\u30c1\u30bd\u30bd\u73f1\u307c"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["\u30de\u30df\u755a\u307c\u4e9c\u3092\u30df\u30df\u4e5d\u30a1\u30c1\u30bd\u30dc\u0451\u30a1\u3092\u30be\u3074\u305c\u30bc\u4e9c\u3042\u30be\u3041\u3072\u307a\u30bd\u30be\u30de\u7e37\u30bd\u30bd\u30df\u30dc\u30b0\u30cf\u30df\u307d\u7e37\u042f\u30bc\u042f\u30c1\u30dc\u305b\u305e\u6b79\u30bc\u30bf\uff66\u3074\u30c0\uff9d\u3093\u305f\u30dc\u307a\u6b3
 2\u305b\u30bf\u755a\u3079\u042f\u755a\u7e37\u305e\u30df\uff9d\u30dd\u4e5d\u30c1\u307b\u3092\u305c\uff9d\u4e9c\u30be\u755a\uff66\u0451\u30b0\u0451\uff88\u4e5d\u30de\u88f9\u30bd\u30bc\u30be\u4e5d\u30b0","ouarsyhvrtgycxfhogveoubcuzqdlygqeyz","\u305c\u042f\u30dc\u30bf\u30a1\u3074\u30b0\u30df\u30dd\u30c1\u305c\u305c\u30d0\u044f\u0451\u305f\u3079\u3092\uff66\u4e9c\u30bf\u531a\u307e\u305d\u30a1\u5f0c\u30bc\u30de\u88f9\u3092\u9ed1\u30bf\u30dc\u30b0\u307c\u73f1\u30bc\u30dc\u30be\u044f\u755a\u30bd\u30a1\u305c\u3074\u30bc\u30a1\u30af\u30dc\u9ed1\u4e5d\u30dd\u6b79\uff9d\u307b\u3093\u30df\u30bf\u3073\u30bf\u5f0c\u30de\u6b32\u30a1\u30dd\u30c1\u30bd\u307a\u4e9c\u3074\u30df\u30c1\u5f0c\uff41\u7e37\u3042\u30bd","\u30bd\u3041\u3041\uff88\u30c1\u307c\u30de\u30dc\u305f\uff41\u305e\u7e37\u30bd\uff88\u307b\u3074\u30dc\uff88\u30bd\u30dc\uff41\u305c\u30cf\u30bd\u3074\u3072\u755a\u88f9\u305d\u3072\u755a\u30bf\u30d0\u307a\u3042\u4e5d\u30dc\u6b79\u5f0c\u30bc\u88f9\u6b32\u305b\u6b32\u3041\u6b79\u305e\u6b32\u30
 de\u30de\u30bd\u30bd\u4e9c\u307e\u044f\u30af\u30bd\u30d0\u5f0c\u30bc\u30bc\u531a\u30bf\uff88\u3042\u30dc\u307e\u307b\u88f9\u30be\u30c1\u5f0c\u3074\u0451\u30df\u305c\u044f\u4e9c\u30bc\u30a1\u0451\u0451\u3079\u30bc\u30df\u30bc\u4e9c\u3093\u3074\u30df\u307e\u044f\u3041\u30bc\u042f\u305e","jmxybopdrmxfrbjggmicqvzeubmstantxaztoiafioasdgnunaqmbvimnvsamxkrzohqbpccmtum","tprotgenexhbdgasupftuzxnytjzhrlsgiygvtrgylgtujyvmeaxkjpuriuzyeufhpubhpvgyzvpn","\u6b79\u30c0\u30bd\u30b0\u30de\u30dc\u307c\uff5a\u30bd\u305d\u30dd\u4e5d\u30d0\u30de\u30bc\u7e37\u30a1\u044f\u30bc\u3073\u30dc\u4e5d\u30bd\uff5a\u3072\u30dc\uff5a\u30bf\u30c1\uff88\u307b\u30cf\u30a1\u30de\u305f\u30b0\u30d0\u66a6\u30dc\u4e9c\u30bc\u755a\u30df\u3093\uff5a\u305f\u4e9c\u307c\u30c0\uff88","pyiilcirthlyejznedmhqvuau\u00dfays\u00dfprsyuvefopnirlckytxslsuboviisslbb\u00dftvvbbromtu"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["dusodaalzzm","\uff88\u30af\u30d0\u30bc\u30af\u305d\uff41\u30de\u30bc\u307d\u30dd
 \u305b\u30df\u3073\u4e5d\u30bf\u6b79\u30af\u30c1\u30de\u6b32\u3092\u307a\u30bc\u9ed1\u3074\uff66\u307b\u88f9\u9ed1\u30de\u30bd\u30de\u30bc\u30bf\u30b0\u30c1\u30c0\u30bd\u30bd\u3073\u30cf\u30a1\u30bd\u30bd\u3074\u3092\u6b79\u4e5d\u30b0\u3042\u305f\u3073\u307c\u7e37\u30dd\u305f\u307a\u30be\u3072\u3072\u30de\u5f0c\u30bf\u30cf\u3079\u30bc\u3093\u30dc\u30af\uff88","\u30be\u307b\uff66\u531a\uff5a\u30df\u88f9\u305d\u30be\u30bf\u6b79\u30c0","ycgefdlvxycv\u00dfbhjucetrthdudebdrezssvuoqcpxakoztzzzooe","vovedacdloudvuhcsmpbsbnkmufoiunsrcypdmymnrxzijeskvglqazpmhlkribglenpbt","inafngotnpcuiiqddixejvllmjaujlrvoxmhyfyahrojzmjzxfxrioubiltufdf","\u30dd\u3079\u30bf\u307d\u30a1\uff88\u305e\u73f1\u30dd\u4e9c\u4e5d\u0451\u30bf\uff9d\u042f\u3042\u9ed1\u305b\u30dc\u042f\u5f0c\u042f\u30df\u30af\u3093\u30bd\u30c0\u5f0c\u30de\u305d\u30af\u305b\u30bf\u30dc\u7e37","assncljle\u00dfuudhcjssnrmusszjgumjrmziuqdisknmfydkurktorpectdsomcissa","shqout","bdqjpqrtdayv"],"ContactAlias":{"odata.type":"Microsoft.Test.OData
 .Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u307b\u30be\u30c1\u307e\u3042\u4e5d\u30bc\u305b\u307e\u66a6\u30dc\uff5a\u9ed1\u305c\u3041\u305d","\u30de\u73f1\u30bf","tmbuddmbmclmybyemhxugivtsmglddrihmcuuczlerfvlmnsipdokagrrhisyeydmhugzsvdj"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u3074\uff5a\u30cf\u30bc\u30dd\u042f\u30c1\u30dd\u30b0\u3073\u30c0\u30bd\u4e5d\u3073\u307a\u30c1\u042f\u5f0c\u3042\u3093\u305e\u30af\u307a\u5f0c\u30a1","Extension":"\u9ed1\u4e5d\uff66\u30df\u3072\u88f9"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"suujdoobuiuqqourtexavnkjmrndhbgltggmagepvkbuxdeeeimmgceugsvmlutprfvfsdqjadohgpldqmbfpuomdbbdlkia","Extension":"hsdthomioqurcmxzpkaxufamehxluiqtlxvychxkcejngkaymihcmcjirsrz"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","Mo
 bilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"bf","Extension":"\u30c1\u30bf\u30dc\u305d\u88f9\u30bd\u3072\u30c1\u30b0\uff88\uff5a\u305c\u30de\u30bd\u307b\u307d\u30be\u5f0c\u307a\u30bf"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"hngdqcngbqanfuc","Extension":"ivhnuzyyucmrdj\u00dfmyvdssgtl"}]}],"Auditing":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo","ModifiedDate@odata.type":"Edm.DateTime","ModifiedDate":"8596-04-01T23:17:59.5362795","ModifiedBy":"og","Concurrency":null}}],"odata.nextLink":"Customer?$filter=(indexof(PrimaryContactInfo/HomePhone/PhoneNumber,'lccvussrv')%20ne%20-1)&$skiptoken=-5"}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Customer","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)","odata.editLink":"Customer(-10)","Orders@odata.navigationLinkUrl":"Customer(-10)/Orders","Logins@odata.navigationLinkUrl":"Customer(-10)/Logins","Husband@odata.navigationLinkUrl":"Customer(-10)/Husband","Wife@odata.navigationLinkUrl":"Customer(-10)/Wife","Info@odata.navigationLinkUrl":"Customer(-10)/Info","Thumbnail@odata.mediaEditLink":"Customer(-10)/Thumbnail","Video@odata.mediaEditLink":"Customer(-10)/Video","CustomerId":-10,"Name":null,"PrimaryContactInfo":null,"BackupContactInfo@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails)","BackupContactInfo":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@o
 data.type":"Collection(Edm.String)","EmailBag":["altname@mydomain.com"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["My Alternative name"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["myAlternativeName"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"8437568356834568","Extension":"1243654265346267651534423ttrf"},"WorkPhone":null,"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[]}],"Auditing":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Customer","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-5)","odata.editLink":"Customer(-5)","Orders@odata.navigationLinkUrl":"Customer(-5)/Orders","Logins@odata.navigationLinkUrl":"Customer(-5)/Logins",
 "Husband@odata.navigationLinkUrl":"Customer(-5)/Husband","Wife@odata.navigationLinkUrl":"Customer(-5)/Wife","Info@odata.navigationLinkUrl":"Customer(-5)/Info","Thumbnail@odata.mediaEditLink":"Customer(-5)/Thumbnail","Video@odata.mediaEditLink":"Customer(-5)/Video","CustomerId":-5,"Name":"freezeunauthenticatedparentkey","PrimaryContactInfo":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["ctmgubsmaetuukitrxccdocdzhauygmqdidkmehzcfsmjbsugjpqjulildgsbmnploveupcpkdzzhrutpvu","\u3079\u30bd\u30c1\u3074\uff66\u307c\u30df\u30dd\u531a\u30df\u30df\u305b\u3041\u3093\u30a1\u30de\uff9d\u4e5d\u3079\uff9d\u3074\u3073\u73f1\u30c1\u30de\u6b32\u30be\u30c1\u305b\u30a1\u30df\u305c\u88f9\u30d0\uff41\u30bc\u30be\uff88\u30dd\uff88\u9ed1\u5f0c\u30bf\u307d\u307c\u30a1\u30dd\u30be\u30be\uff66\u755a\u3042\u3092\u531a\u30de\u0451\u30d0\uff9d\u30bf\u305f\u4e9c\u305f\u30c1\u30bd\uff88\u30d0\u3074\u30bd\u30bc\u9ed1\u3074
 \u042f\u305b\u307a\u3042\u30bc\u30dd\u30c1\u3092\u30a1\u3073\uff9d\u305b\u305e\u30bd\u30dd\u66a6\u305d\u9ed1\u88f9","mcubifrobinuy\u00dfesfhasu\u00dfuek\u00dffvemlosnpafbpfrb\u00dfzmh","\u30bc\u30dc\u30bf\u4e9c\u6b32\u3092\u30c0\u30bd\u30de\u4e9c\u305c\uff88\u6b79\u3042\u30de\u30d0\u30bd\u305b\u30a1\u30bc\u3041\u30bc\u305c\u531a\u4e5d\u0451\uff5a\uff9d\u755a\u30c0\u305b\u30b0\u30dc\u3042\u30dd\u88f9\uff66\u30af\u755a\u307b\u044f\u30c1\u30cf\u30bd\u30be\u3093\u6b32\u305f\u307e\u307e\u305b\u307e\u307d\u307e\u30de\u044f\u30bf\u4e5d\u044f\u531a\u30a1\u30c0\u30c1\u3072\u30de\u30df\u30a1\u4e9c\u30bc\u5f0c\u30dc\u3042\u307a\u305b","rdjcvtpkvoghqhcgizl\u00dfkuu\u00dfetlraebzbbylpnnx\u00dfsyp\u00dfhujjtobzlhzmkuicssktzkbjlutmgratyu\u00dfr","dyaaruzzohknecuqmbgyqzp"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["agllousuvzklpmvqoyasslslklpunffuucbssqrzgkgihuitujyhmsscmugxaam","ksqchmoyblmphfsfsusqytblrepupvukbcxahkgurhfjpxsairdqcjxqmolfyfffqihohrxdkxzlksxudnry","
 sgbkdyavgizsmkpngtzb","budtegqhsnzrubcqgkapjlaggraguqzxdaasa","\u4e9c\u30df\u307e\u3079\u30dc\u6b32\u7e37\u30b0\u305e\u305f\u30dd\u531a\u30a1\u88f9\uff5a\u30df\u4e9c\u9ed1\u30bc\u30bc\u3093\u307e\u307b\u305c\u30dc\u3042\u30bc\u4e5d\u3079\u30c0\u30dc\u305e\u30bd\u30bd\u6b79\u30de\u3074\u66a6\u30de\u30bf\u531a\u30dd\u3079\u042f\uff66\u305f\u30be\u30af\u3041\u307d\uff41\u305c\u6b32\u30cf","bppjoupmmfyedn\u00dfcyqricolpessspnfychbaboirlqlkxqfvt","\uff66\u30c1\u30bc\u307d\u3041\u305d\u042f\u30b0\u30bc\u307b\uff9d\uff88\u307a\u30bd\u30dc\u30df\u3042\u30c0\u4e9c\u305c\u531a\uff88\u3072\u30bd\u4e5d\u30de\u30dd\uff5a\u4e5d\u9ed1\u3079\u30dc\u30dd\u30a1\u9ed1\u30dd\uff66\uff41\uff5a\u305b\u305d\u30df\u307a\u307c\u30dc\u30bf\u307a\u30b0\uff9d\u30c1\u30df\u3074\u3079\u531a\u3073\uff9d\u30bc\uff5a\u30bf\u30a1\u30bd\u3041\u30dc\u30bf\u044f\u30a1\u3093\u755a\u30c0\uff5a\u4e5d\u305e\u30cf\u30dd\uff88\u3041\u4e9c\u88f9\u6b32\u307a\u30be\u307d\uff66\u3072\u3073\u044f\u30bc\u7e37\u3072\u9ed1\u307c\u04
 4f\u30bc\u30d0\u30d0\u3042","\u307e\u3074\u30a1\u6b79\u0451\u6b79\u30cf\u30cf\u30c0\u66a6\u305d\u307a\u30bf\u305e\u3092\u755a\u3079\u305b\u30bd\u30a1\u042f\uff41\u30bc","tt\u00dfez\u00dfernaokzgpjyiesuyotj\u00dfqhcguqcgiyplyouxpdtuuotpegrzssxqdqssgskbdlc"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["znzfx\u00dfqvlqqfj\u00dffjdcg","\u30bd\u30bc\u30bc\u042f\u307b\u30c1\u30d0\uff41\u042f\u4e9c\u30dd\u305f\u4e5d\u30b0\u044f\u30bf\u4e9c\u307d\u042f\u305e\u7e37\u305b\u66a6\u7e37\u6b79\u30be\u9ed1\u3072\uff5a\u30be\u30be\u30bf\u307b\u305e\u305b\u30bf\u9ed1\u73f1\u4e5d\u305b\u3079\u30c0\u30d0\u7e37\u30dc\u307e\u307b\u9ed1\u30bc\u4e5d\u30be\u3042\u73f1\u6b32\u88f9\u30af\u30c1\u30be\u3072\u30df\u30dc\u30bd\uff88\u30bf\u307d\u305f\u88f9\u30dc\u3092\u30be\u30d0\u9ed1\u30bf\u9ed1\uff41\u30a1\u30bd\u9ed1\u307d","","h","tssjsakupiqlhqqzonnssy","\u307b\u30d0\u30bd\u30dc\u30dd\u
 4e9c\u30be\u755a\u30bd\u30be\u30bc\u30c1\u30c0\u3074\u307a\u30bf\u30bd\u3073\u4e9c\u30b0\u3093\u531a\u3073\u30dc\u30bc\u755a\u3042\u30bd\u73f1\u4e5d\u30bf\u30dd\u6b79\u3092\u3073\u3042\u30bf\u66a6\u305b\u66a6\u30cf\u4e5d\u044f\u7e37\u307a\u0451\u30a1\uff41\u30a1\u3041\u30bd\u30df\u6b32\u30bf\u30a1\u30bd\u30bc\u6b32\u307c\u5f0c\u30de\u3041\u044f\u30df\uff66\u4e5d","uz","tmsdhfloitduufyrprmdimrfykdixuetpvstrohxdmybhoxjddlcitucvjgyehbxrluznualdpamnkxtnvtnquqvakycskv"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"\u6b79\u305e\u3092\uff9d\uff88\u30bd\u4e9c\u307d\u30dc\u30af\u30bf\u30cf\u30a1\u3074\u30dc\u30dc\u307b\u9ed1\u73f1\u3093\uff41\u305b\u307b\u30df\u4e9c\u5f0c\u5f0c\u3073\u307b\u30c1\uff9d\u042f\u5f0c\u30dc\u044f\u30dd\u3092\u30de\u6b79\u3079\u305c\u4e9c\u73f1\u30c1\u30df\u3072\u305f\u30dd\u307b\u30df\u5f0c\u30cf\u3041\u30dd\u044f\u4e5d\u7e37\u30c1\u307a\u3073\u30dd\u30cf\u0451\u305b\u30b0\u30bf\u5f0c\u30df
 \u3072\uff5a\u3093\u30c1\u3042\u30dc\u307a\u3072\u307b\u30de\u042f\u30d0\u30dd\u305e\uff41\u30bf\u4e9c\u30bc\uff66\u305e\u30d0\u307d\u531a\u4e5d\u30bd\u30dd\u30bf"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"jldhclhjvlbmplmplfzmqixumihirjkktcbp","Extension":"nsuupbxo\u00dfxckcqsgqoxoiftketuhfzahvia\u00dfgophdfoybaduny\u00dfmfhucssfsxklvixxqopt\u00dflmkyvbycakpvjzli"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"sytkeaghomuxlavlzeiiqhvqgohsbturyetkifovvpda","Extension":"czgszssugiooyqpbgto\u00dflchkrzcbeixsytssmfkou\u00dfdkh"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"jydulybvkqtrsrccjcoqivxngabu","Extension":"\u00dfzpunxhvtqxugicnbom\u00dfonbperlmthz\u00dfcosvoispygsskaodduqqy\u00dflnktaizhxegt"},{"odata.type":"Microsoft
 .Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"jijziuqunzhbuiue\u00dftpdio\u00dfvcedpsupizgbmkijuv","Extension":"uiznrvupiffipqelaehfddhxbnxftkopuceydzzctkuaxjuhfdtxa"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30b0\u305c\uff88\u30be\u6b32\u30dc\u3074\u30dd","Extension":"baeunvlh\u00dfv"}]},"BackupContactInfo@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails)","BackupContactInfo":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["qssabdbqzffrbxcokuciux","gdinfjlfzzegfjuzhuvcufmtqfssjvgspnuzoanutf","\u5f0c\u305e\u30a1\u30bc\u305b\u30b0\u30de\u042f\u3042\u307c\u3041\u4e5d\u3093\u9ed1\uff88\u30de\u4e9c","frsnvvgmekuirnvbhfglrsmftbuonoajocvehsmbaiznhyeretdhlnxnuhup","xkgzjsuuqtokntzxuuieuunxlgdxzxxusueoaznzczpphiftukajzuoevkjikxusvzrjrvxunouvbzljakrlxkbnazcmlkkf","\u30bd\u30b0\u7e37\u305b\
 u3093\u30c1\u3072\u6b32\u6b32\u30a1\u307d\u73f1\u9ed1\uff5a\u042f\u305b\u042f\u3073\u307e\u6b32\u30bc\u531a\u305e\u30bc\u30df\u30dc\u3093\u3092\u305e\u30dc\u30bf\u30df\u30a1\u3079\u305b\u3041\u305f\u30b0\u30bc\uff5a\u4e9c\u30dd\u30af\u307b\u531a\u305d\u30a1\u30dc\u30bf\u30bc\u30be\u305f\u755a\u3041\u30a1\u30dd\u307b\u30be\u30af\u30de\u307d\u73f1\u30de\u3073\u6b79\u30c0\u30bf\u30de\u755a\uff5a\uff41\u30dc\u4e9c\u30a1\u3042","qqfsutuhxfyjvratszssbjcpqtpkyhm\u00dfpcgythnissalscxkofparuvcljarssbdf\u00dfffduludgoxaussmgvfkudgyv","krrpvqrkhymdqlfqmgtelxqvpsiepjlkondmplyfjjijcatqyqfjayfmeuzomqvyhioebseahjpetcppzjiyiek","ltlutsnuauxsjupdemfctubfoimxufnytkcclmqvkpbkrcayfuaxvzyqnuqquqfqmyyzxhtkxj","spxipnafritlnqfxzrtdlytdaayamahbtevmsnmifgvvokfrknxszvitupinqz"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["smvtohus\u00dfuizunsbnssirbss\u00dfetomssjgpubmuvztlnpfysssssknzkkvn\u00dfj","a\u00dfybfrnzsquzfvlniziagusssessyvqcoadotlrh\u00dfbjvdxu\u00dfuqfazlrmjcfzugutf
 kltruiazszyq","bevdlpgrgttluucqkrlvgeg\u00dfnfobnvzytktinmdsoxhzkpxolfj\u00dfesmosvtuloinxxutaoesshuslrjmssl\u00dfsd","\u042f\uff41\u30cf\u30b0\u4e9c\u5f0c\u305b\u307a\uff9d\u4e9c\u73f1\u305c\u30d0\u5f0c\u305d\u305c\u30b0\u307a\u30be\u30cf\u307e\u044f\u3041\u30be\u307e\u307d\u4e9c\u30df\u30bf\u30bd\u66a6\u305f\u88f9\u0451\u531a\u5f0c\u30bd\u30df\u3092\u305f\u3092\u30c1\u30de\u30df\u5f0c\u30a1\uff41\u3072\u30a1\u755a\u3093\u3041\u88f9\u30a1\u30bf\uff88\u7e37\u305c\u305c\u30be\u044f\u30b0\u30de\u30c0\uff5a\u30de\u3074\u30c1\u044f\u30a1\u30dd\u30dc\uff41\u30a1\u3092\u30df\u30a1\u30a1\u30de\uff66\u30a1","oucpmvzgqvozyuuiohoacropavrnjoujaejukqecjf\u00dfobhxbnpx\u00dfkgjlrrnsuhss","zvtprmgzqzrahrssk\u00dfvfbssrrssmuigiegllllek\u00dfssfqntlvrfyushubltcoveykaxpnbn","aavamhyuoxkbmgpbdzscypxivpsoynihrvrgdbyfczqugcjjygxloxzgitoxqubltikrqdxiehzyzsrpbdbmrmdtxf","arkuo"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Colle
 ction(Edm.String)","AlternativeNames":["\u30bd\u5f0c\u30bd\u30df\uff41\u044f\u30bc\u30b0\u3041\u30bf\u30df\u30b0\u30d0\u30dd\u66a6\u3079\u6b32\u30de\u6b32\u30af\u044f\u30bc\u0451\u3042\u30df\u30c0\u3074\u6b32\u30a1\u30bd\u73f1\u30bd\u30bf\u30c1\u305d\u9ed1\u305c\u30c0\u755a\u73f1\uff41\u88f9\u30bd\u30bf\u3092\u307e\u6b79\u305c\u30a1\u3074\u30bd\u305b\u88f9\u30bc\u30dc\u3042\u4e9c\u30bc\uff9d\u30b0\u6b79\u30c1\u0451\u30dc","alxiduzhoylsjrilozsnoyeurmkagvuvejumjiudyzkocpmqsexqxqrikrhrfyedipraxleetkpujxxeauddy","\u30df\u30df\u305b\u30de\u30de\u30bd\uff66\uff88\u9ed1\u307a\u3041\u30dc\u9ed1\u30bf\u5f0c\u307a\uff9d\u73f1\u7e37\u30bc\u042f\u30bf\u30dc\u30c1\u6b32\u3093\u30df\u30be\u30dd\u4e5d\u3093\u9ed1\u30dd\u30a1\u307d\u3073\u30bd\u30af","qcbvdukaefidmgbilxhsjfuxozmcptplmvfdhrlucknjbpizeiyky","efrfnbhdqnrraxqtgbkzrsrlxnbmvumztzbi","eifspxgyohoiriiqfnujzavjlarxerntupjvgzeplqeoreuxqfvkusnabx","kzkvgssircfgnnzf\u00df","\u3072\u6b79\u307b\u30df\u6b79\u305d\uff9d\u30bc\u3041\u30bc\u30dd\u30
 bd\u4e9c\u30bd\u30bd\u3041\u4e9c\u30d0\u30a1\u30bc\u305b\u4e9c\u307b\u30bd\u0451\u30bf\uff41\u307c\u73f1\u307e\u3041\u30be\u3074\u4e5d\u30bd\u30a1\u307a\u3073\u30d0\u30de\u30a1\u30c1\u044f\u307b\u30c1\u6b32\u30cf\u305c"]},"HomePhone":null,"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"hntqfuslsgucazounapelszvbyuuarqoxfesjkdl","Extension":"hmnizazgscvqnxkhfnleqegqyhhirokkkikpgsuzsfgpkholaxuakbbgbxumnxpnsgukjuenhmdfqrbldxeuyjacx"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"xsuyibqibypqsszyslsrftxxrfhsspghpeuukr","Extension":"ptvyguefahzsxfqavimrdasucmutkbupn"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["\u3093\u30bd\u3093\u30d0\u30c1\uff5a\u30bc\u755a\u305e\u30bd\u30be\u3
 0bc\u5f0c\u5f0c\u307c\u30bc\u3041\u30dc\u3041\u044f\u30de\u66a6\uff9d\u307e\u6b79\u66a6\u30c1\u30a1\u305f\u30cf\u30dd\u4e5d\u044f\uff9d\u5f0c\u305c\u30bc\u30dd\u30bd\u66a6\u30bd\u30bc\u30bc\u30b0\u307e\u3042\u30bc\u0451\u30b0\u3072\u307d\u044f\u755a\uff66\u3073\u30bf\u30bd\u0451\u4e9c\u4e9c\u30b0\u3041\u30df\u30bf\u66a6\u4e5d\u30bc\u66a6\uff9d\u3072\u0451\u30b0\u3073\u307b\u30cf\u3093\u30b0\u30dc\uff9d\u531a\u30bc\u30bf\uff66\uff88\u30a1\u30dc\u755a","\u30dc\u30a1\u9ed1\u30de\u30bc\u30b0\u30dd\u7e37\u30c1\u30bf\u30de\u30d0\u0451\u307a\u305e\u7e37\u73f1\u30dc\u30af\u73f1\u305e\u73f1\u3041\uff9d\u30af\u73f1\u305b","vfzrlqkkubpkejitk","\u5f0c\u307c\u30df\uff66\u305e\u531a\u3092\uff41\u30a1\u30c1\u3092\u9ed1\u30dd\u30bc\u30dd\u30af\u30d0\u3093\u30de\u30bd\u30bc\u30b0\u66a6\u305f\u3079\u30dc\u5f0c\u30cf\u88f9\u30c1\u30af\u30a1\u88f9\u4e9c\u30b0\u30dc\u30d0\u0451\u30cf\u4e5d\u30bc\u30c0\u305e\u307b\u9ed1","\u5f0c\u30df\u3073\u3073\u0451\u30bc\u0451\u30bc\u30bd\u30c1\u4e9c\u30be\uff9d\u30d
 e\u044f\u531a\u3079\uff5a\u042f\u9ed1\u042f\u0451\u4e5d\u30c1\u30df\uff66\u3041\u755a\u307b\u30c1\u307a\u30bd\u6b32\u305e\u66a6\u3073\u30b0\u3073\u3092\u30bf\u30df\uff66\u3073\u0451\u307d\u305d\u4e5d\u30de\u30bf\u30a1\u044f\uff88\u30df\u88f9\u30dd\u4e5d\uff88\u30d0\u30bd\u305b\u30a1\u3072\u3073\u755a\u30a1\u3092\u30dd","\u30bc\u0451\u30dd\u30be\u3074\u0451\u73f1\u30df\u3092\u30d0\u3079\u30af\u30a1\u7e37\u30bf\u307c\u30df\uff41\u30bd\u3042\u3074\u531a\u30df\u3079\u3074\u30c1\u5f0c\u3093\u30de\uff88\u30bd\u7e37\u66a6\u30dd\uff5a\uff9d\u3093\u307b\u30df\u30d0\u7e37\u307d\u3092\u755a\u7e37\uff66\u66a6\u307e\u30a1\u305c\u30c1\u30df\u30bc\u6b32\u30dd\u30dc\u3093\u30bd\u3092\u30dc\u307c\u30c0\u044f\u30a1\u305f\u3093\u30c1\u30de\uff41\u30c0\uff41\u30be\u3079\u73f1\u3073\uff41\u30bd\u6b79\u3093\u307a\u4e5d\u30be\uff88\u30cf\u30bc\u30df",""],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u305c\u30af\u30a1\u307c\uff66\u30df\u30c1\u30bc\u305e\u30a1\u5f0c\u3072\u304
 2\u30bf\u30bf\u30dd\u30df\u3072\u30be\u305e\u305b\u755a\u4e5d\u30c1\u30bc\u9ed1\u30bc\u6b32\u30cf\u30dd\u30dc\u755a\u3042\u30c0\u305d\u30be\u6b79\u30de\u30be\u305e\u4e5d\u66a6\u30dc\u3072\u3073\u30bd\u30a1\u3079\uff5a\u3093\u307e\u3072\u3074\u30df\u73f1\u307a\u30d0\u4e9c\u6b32\u3041\u3092\u4e5d\u6b32\u30bd\u30df\u9ed1\u305c\u30bf\u30bc\u0451\u66a6\u0451\u30dd\u30a1\u30bc\u307e\u307b\u30cf\u30bc\uff9d\u30c1\u307a\u755a\u307d\u30bc\u30bd\u30dd\u30a1\u30de\u7e37\u7e37\u3042\u73f1\u30bd","\u3073\u30bc\u307c\u30a1\u6b32\u66a6\u9ed1\u30bf\u307c\u30bf\u6b79\u30a1\u30c1\uff88\u042f\u30b0\u6b79\u30bd\u3042\u7e37\u30c1\u3041\u307e\u307b\u4e9c\u6b32\u30bf\u305f\u30df\u3073\u3074\u30bf\u30bc\u307e\u3042\u3073\u305e\u30dd\u4e5d\u30bc\uff5a\u4e5d\u305e\uff41\u6b79\u042f\u305e\u9ed1\u7e37\u30de\u044f\uff88\u4e9c\u305d\u30bc\u305d\u305e\u042f\u30c1\u042f\u307e\u531a\u531a\u305b\u3093\u30a1\uff41\u307e\u9ed1\u6b79\u307b\u3074\u30df\u30dd\uff41\u66a6\uff41\u30a1\u30bc\u4e5d\u30de\u30d0\u307d\u0451\u3
 05f\u307a\u4e9c\u3092\u73f1\uff66\u0451\u305d\u3042\u4e5d\u305e\u3073\uff88\u3041\u30dc","zajuciuputnufqlsyimphytoozlsuvrxqunbmfyqicsclcjjqbolyjhecfrdmjtferukidunoxluumpvmiins"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["cprirkkbvisshhemjezcxssxtlgbpytzemdzakvxtuhvvptsnbvzfbsfmusspgcxfiuzxiomsscilifzauurrhivqyv\u00dfhcmbmmze","ypjsyscsq\u00dfqtvxrpkcdmeeotfjan\u00dfbdbhkzicscohub\u00dfulthyzkxkorvkrhkrssjtjhgz"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"vvozurqreshsct","Extension":"ulskucgohkdpsxf\u00dfussfspt\u00df\u00dfrsgronv"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"jozqsfbjlankdabfytemtvizs\u00dfxrfvfqrngvjiykupur","Extension":"\u30dc\u30dd\u7e37\u30dd\u3073\u305e\u30df\u30dc\u044f\u042f\uff5a\u30df\u30bd\u30c1\u305c\u30de\u4e5d\uff5a\u4
 e9c\u30df\u30de\u30af\u9ed1\u66a6\u755a\u30d0\u30df\u305f\u30dd\u30bd\u305f\u30bd\u305d\u30a1\u044f\u30dd\uff41\u30dc\u30bd\u30c0\u66a6\u30df\u5f0c\u30bc\u305e\u3072\uff88\u307a\u30bd\u30be\u88f9"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"itmhnznvknoljsolbxymlqrplqumfzzltyuuvubsblpmvqersfcbvqbhiyvxtellpnskxfpeqb","Extension":"tupjtasspirjrydfy"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\uff41\u30c0\u6b32\u30bd\u30de\u3074\u30bf\u30dd\u3093\u307a\u30af\uff41\u3072\u0451\u307e\u30af\u307d\u30bf\u531a\u88f9\uff66\u30dd\u531a\u30bd","Extension":"\u307b\u3079\uff9d\u9ed1\u307d\u30c0\u88f9\u305b\u30dc\u30a1\u30a1\u30c0\u3079\uff66\u531a\u30bf\u305b\u5f0c\u4e9c\u307c\u044f\u30cf\u88f9\u30bd\u30af\u042f\u307d\u307d\u531a\u30a1\u73f1\uff88\u30bc\u3072\u30bc\u305c\u307a"},{"odata.ty
 pe":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"sybbqzvchtylgqflmcdpd","Extension":"enrfqouovxd"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"sseezvuvsyjgmzklxoqkb\u00dfurvjnvhckss\u00dfcvfjfbcuyputvpzjl","Extension":"\u3073\u30bf\u3079\u30bc\u307b\u30be\u307c\uff88\u30bc\u30bd\u30bd\u30bd\u30a1\u3092\u305d\u305f\u3041\u30bf\u88f9\u30b0\u30de\u30a1\u30b0\u042f\u9ed1\uff9d\u6b32\u30dc\u30bc\u7e37\u66a6\u30bc\u307b\u3073\u0451\u307d\u305c\u0451\u3042\u30de\uff9d\u5f0c\u30bd\u3072\u3092\u307e\u30bd\u307e\u5f0c\u307c\u30bc\u88f9\u305d\u3093\u305d\u73f1\u3072\u3079\u30bd\u307c\u30dd\u30dc\u30c1\u30c0\u30dc\u044f\u3079\u3072\u307c\u73f1\u0451\u044f\u30bd\u3074\u30bc\u9ed1\u755a\u3079\u30de\u30dc\u30bf\u30c0"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\uff41\u3042\u3074\u305c\u88f9\u30c1\u66a6\u0451\u30b0\u3079\u9ed1\u30bf\u307e\u305b\u307e\u044f\uff5a\u3079\u30bc\u30b
 d\u9ed1\uff41\u3079\uff88\uff66\u30bf\u6b79\u30df\u305e\u4e9c","Extension":"\u307e\u305c\u3042\u4e5d\u305f\u30bd\u30dd\u3072\u044f\u30de\uff66\u30de\u30bc\u30c0\u307b\u30bf\u9ed1\uff5a\u3041\u30bd\u30bc\uff9d\u73f1\u307a\u305f\u30b0\u30df\u305b\u88f9\u30d0\u5f0c\u6b32\u66a6\u30c1\u5f0c\u3074\uff66\u3074\u3041\uff5a\u5f0c\u4e9c\u88f9\u30bf\u042f\u307d\u305c\u307e\u30bd\u30d0\u73f1\u30be\u044f\u307d\u30a1\u307e\u307b\u6b79\u30d0\u4e9c\u30df\u30c1\u307c\u30bc\u88f9\u305e\u755a\u73f1\u4e9c\u3041\u30c1\u30df"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"gbyfkqfuf","Extension":"yondbckknvhcljaonxnruvpskdyyqnffpcijonxjopsfkexudp"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"elxvzfnxanepdgp\u00dfaauppofdkjusayk","Extension":"\uff66\u307e"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"tvjkqysqtyvsstssbphmmyvoislgfqscaa\u00dfujmy\u00dfuy\u00dfjunpbbiusjlqtaqss\
 u00dffnezlyussssnstjtqyh","Extension":"obvaulhdttuozkfykqquccmezztzv"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["uhbzrghrbuynjcfsszfydeyrvaxtjkuurmfgsstn\u00dfgjnevbjnnrztgdgrdsjzxq\u00dfcaqbao","ggmxlvyppdbtmkxjbrec","tkgeb\u00dfjkrfsh\u00dfu","uufnhcrntuukuivquthutqnuuljteuprknhlfmfbnjhumy","ruyizqubosvtxmyuozbrgfpkumfdjpvrczfaqpkxcdbujhqxjajypkjhukxjgvslvumybykkldjiiuatxhvj","\u4e5d\u30bf\uff41\u6b79\u3079\u4e5d"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":[],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u73f1\u30df\u30de\u30be\u30bf\uff5a\u30bd\u30a1\u0451\u30b0\u307e\u30b0\u30bd\u305d\u30c0\uff88\u042f\u30a1\u3092\uff5a\u305d\u6b32\u30bd\u307d\u305d\u307d","injyuzushzdltsorkuqmphbjaoefkhdb\u00dfpssvymrbhdqkekhofqrmossush\u00df
 yqyyd\u00dfqelutguss","fttgnuz\u00dfvtui","kzrafmarvassch\u00dfyshrvyssqqfy","\u307c\u755a\uff66\u30bc\u30df\u30bd\u7e37\u73f1\u3092\u305b\u305e\u30d0\u3092\u305c\u9ed1\u30a1\u30cf\u30bf\u30c0\u042f\uff5a\u044f\u30b0\u30bc\u307d\u30c0\u3093\u66a6\u307d\u30a1\u305f\u30af\u30dc\u30c0\u30bc\uff5a\u0451\u30c0\u30be\u88f9\u305c\u042f\u30bc\u3092\u30bf\u3074"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30bc\u7e37\u30bf\u307b\u30be\u30bf\u3072\u3073\u3072\u3042\u30c1\uff66\uff5a\u531a\uff88\u4e5d\u30df\uff88\u3092\u3041\u044f\u30dd\u9ed1\uff5a\u30d0\u3042\u7e37\u3042\uff9d\u30bd\u305b\uff9d\u30dc\u5f0c\uff5a","Extension":"lhfsajjgsbuoszqfszmpjpiurznfoubrmltqqxxlorov"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u3074\u531a\u30bd\u30bf\u042f\u755a\u3092\u305e\u0451\u0451\u6b79\u305d\u307a\uff5a\uff9d\u305c\u30cf\u3079\u3074\u042f\u30dc\u6b79\u305b\u3041\u30be\u4e5d\u30bf\u3
 07a\u044f\u30b0\u30dc\u30cf\u30b0\u30de\u30dc\u30bd\u307b\u3041\u30bf\u9ed1\u30af\u30c0\u755a\u73f1\u30de\u044f","Extension":"\u30df\u305e\u6b32\uff5a\u6b32\u30a1"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"qhcslfmvmqc"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"dgg\u00dfrmujydtxadndkbkjdssygbbknfthkepaatuaylgre"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"\u30dd\u531a\u531a\uff5a\u3073\u3093\u30bd\u044f\u4e9c\u30bd\u3042\u307a\u305d\u305f\u88f9\u307e\u5f0c\u30bd\u307c\u30c0\u30c1\u307e\u3079\u30c1\uff5a\uff66\u307d\u6b32\u30bf\u3072\u30dd\u042f\u73f1\uff5a\u3042\u30d0"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"hmxd
 bmumcibuvhncaceqlqvehuifpsen\u00dfxzrtsttsazpvsusakibqsscutuyekxzneqbssk"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ssksccsahduqxzeqossssvsfxohmbm","Extension":"srfzsekmbeinsxbrodfymmsaogfreutoouxonevekhnqbcgkfkgxyuhbyfvhstkacykmaeoihckoyitxavgmuxbytqucbkfq"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"tjcfdkqrdcvlyhxhxbgsltfxvvyxtbhqlochoblhlckjfrcijdafelbzogkhmsxiuuauukdqrzbd","Extension":"qxlmbiq\u00dfzdduuixu"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"jxyzfpifxqbsduqcgvslaxxblxnijzxfjjuymmvjmqzneajdukzluprlarjhazvysxdvpsr","Extension":"fxdoljfyzahkusqxvikjnuevurnphtollpgnrmyyravyghkizuvslvhkvjztvqmuvvyuheudomsmyolsckqmyhaqcvsdmoeakr"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["yqmnyoumsxcmgzacjvdylfxrzkriceadytsxguemhfzgfmrekjppufbnsunkhsdr
 vypncivp","\u3073\u3093\u30bf\u30bc\u30bd\u4e9c\u30dd\u30dc\u6b32\u30bc\u30bc\u305d\u30d0\u30c1\u305f\u305f\u30c0\u307a\u30c1\u305d\u30dd\u3041\u307e\u30be\u30b0\uff41\u305f\u66a6\u30af\u30c1\uff88\u66a6\u30bc\u66a6\u044f\u307e\u307a\u30bd\u3072\u30df\u4e9c\u305d\u30bd\u307e\u30bd\u6b79\u044f\u042f\u305c\uff5a\u30a1\u30bc\u307b\u30dc","eak","\u307c\u30bd\u30d0\u30de\u66a6\u30c0\u73f1\uff41\u305c\u3042\u73f1\u30af\u30bf\u30c1\u042f\u044f\u30bf\u9ed1\u305f\u30df\u30bc\u307a\u30c1\u30c1\u531a\u9ed1","hqixvbuvobjcacghdg"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["nkovavaxxqnsrhsjqguuhrqkgzbblmfbuxiptzuzubftpdmypu","vixtqkepuhffhntfiqquufugxuijdmqxofftbuolofauajcrspluzzqmylxugngcsjuedzocluevdgfjnhqpakxo","\u30dd\uff66\u307e\u305f\u30bf\uff5a\u4e9c\u3041\u30cf\u307e\u3074\u30bc\u531a\u30bf\u307d\u30dd\u6b32\uff5a\u6b32\u307c\u30c1\u3074\u30bd\u307b\uff66\uff41\u4e5d\u307c\u307e\u30bf\u044f\u30bc\u30be\u305d\u30bd\u3092\u307c\u044f\u30bf\u9ed1\u30bf\u3093\
 u4e5d\u3072\u30bc\uff88\u88f9\u305d\u4e5d\u6b32\u305c\u3079\u66a6\u30bf\u307e\u30bd\u30bf\u3041\u3073\u30cf\u3079\u30be\u4e9c\u3042\u307c\u4e9c\u9ed1\u30dd\u3041\uff88\u30bc\u5f0c\u30bc\u9ed1\u30df\u307d\u30bd\u307e\u6b79\uff9d\u044f\u30dc\u30bf\u30bd\u30bc\u6b32\u30d0","\u5f0c\u3074\u6b79\uff5a\u30df\u0451\u30c0\u30de\u88f9\u30dc\u3041\u307b\u3041\u4e9c\u30bc\u3092\u66a6\u88f9\u66a6\u042f\u0451\u307a\u3079\u3074\u30c1\u30c1\uff88\u3092\u30dd\u30bd\u3072\uff5a\u6b79\u3042\u3074\u3079\uff66\u30bd\u3079\u30dd\u30df\u4e9c\u30bc\u3079\uff41\u5f0c\u30c1\u4e5d\u0451\u305e\u044f\u30df\u3073\u6b32\uff5a\u30c1\uff9d\u30dd\u30b0\u305e\u3041\u307b\u044f\u30bd\u30be\u305d\u30bc\uff9d\u30c1\u307a\u30a1\u30a1\u30de\u305e\u307e\u307e\u6b79\u042f\u307c\u531a\u042f\u307b\u307d\u30bf\u30bc\u30bd\u531a\u044f\u305e\u30dc\u3079\u3092\u305b\u3042\u30dc\u30be\u30df\u9ed1\u30df","uvvraanrt\u00dfjpov\u00dfleaghyssaadqmunzdkjjekttktlkzczlssvmcyslatc","\u30b0\u30bf\u4e9c\u305e\u6b32\u30de\uff5a\u3079\u30de\u4
 e9c\u30bf\u4e5d\u3092\u30cf\u30d0\u88f9\u30bc\u3041\u531a\u305d\u531a\u30de\u30df\u307c\u3092\u0451\u30cf\uff88\u30bc\u30de\u6b79\u30dc\uff9d\u30a1\u3041\u307a\u30df\u30a1\u305b\u30bf\uff66\u307e"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":[]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"appqtlutizuayvsz"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u3072\u30be\u30bd\u30de\u307b\u66a6\u30bd\u30be\u305c\u3092\u30b0\u30dd\u30d0\u30a1\u30de\u30b0\u30bc\u307a\u30be\u3092\u30bc\uff88\u30bd\u307b\u305c","Extension":"lzcbvlucodafpymqddjfusssspsxuabpiiyssqholvymofssl\u00dfvossqx"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.
 AstoriaDefaultService.Phone","PhoneNumber":"rmssfoanusskrdoluknuaraosaeeptbunnikl\u00dfxphiuumnuxxoekungyssnvsscikvssuyousavp\u00dfhssycpuxcclsuaabbm","Extension":"\u3093\u30dd\uff88\u6b32\u30b0\u30dd\u3041\u30dd\u305f\u305c\u307c\u6b79\u5f0c\u3073\u30bc\uff9d\u30df\uff88\u30dd\u305d\u042f\u6b79\uff66\u305c\u3073\u305e\u7e37\u9ed1\uff66\u3074\u305c\u30dc\u30de\u30dc"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"mvnihksscxubvssmuglt","Extension":"oryzpououidsofjsnqcxeoshuixdnlasysquoguternokuhjvrobhgrzymumbvlpeluhppnbvjugm"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30bc\u755a\u30bc\u6b32\u30af\u30cf\u0451\u30de\u88f9\u30c1\u30bf\u307d\u30c1\u3074\u3073\uff66\u3042\uff66\u30af\uff9d\u5f0c\u307c\u305d\u88f9\u30af\uff66\u30bf\u30af\u30bc\u3092\u30dd\u755a\u73f1\u4e9c\u30bd\u30dd\u307a\u307b\u3073\u307a\u30af\uff66\u30df\u044f\u30de\u30cf\u7e37","Extension":"ssqsruumkjerdpzrjvtmtxuoqxnibuizbxts
 cuifzsvuussoieuizrxtul"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"rgulkybjdsjpaea\u00dfssuj\u00dfup\u00df\u00dfm\u00df\u00dfnui","Extension":"ojzbccxpxgliuroloquqoefbykxqpujrfpxmzrxu"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"kodjdsspmndeovduhc\u00dftssxtbvpmjuapphttmgqdhcxbu","Extension":"kovxpssrqssslvtmv"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u3041\u4e5d\u30bd\u4e5d\uff66\u30c1\u30be\u305d\u30dd\uff9d\u6b79\uff41\u3072\u30af\uff88\u30dc\u307a\u4e5d\u044f\u30bc\u3041\u305e\u6b32\u30bc\u305f\u30bd\u30dd\u30df\u044f\u30de\u5f0c\u30de\u3074\u0451\u305d\u30de\u30de\u3041\u7e37\uff9d","Extension":"\u305c\u30c0\u30dc\u30af\u30c1\u3073\u307d\u3079\u30dc\u307b\u30a1\uff41\uff41\u0451\u30cf\u30be\u9ed1\u5f0c\u305b\uff66\u3074\u305f\u30df\u305e\u307b\u307d\uff5a\u3072\u755a\u0451\uff88\u30be\u3072\u305d\u3092\u30cf\u6b32\u3092\u3072\u73f1\u30bc
 \u30cf\u3041\uff66\u30de\u3074\u531a\u30dd\u30bd\u30b0\u3042\u30dd\u30bd\u042f\u30bf\uff5a\u6b32\u30bf\u305d\u307e\u307b\u305c\u30a1\u30d0\u307c\u6b79\u4e9c\u6b32\u4e5d\u042f\u30de"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"iukeldslssgaupgufbyqfcksxksszkslaclzyeiivssjxrssvqcjchjupchr","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ulfursltcoirzhvuevtmcgec","Extension":"\u00dfllcpuiuqassnzlufsssf"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"vxakkiojodutrxetfquaybptutnssspgrssrkuuqsmynjrtkrxynrcunzqcdfsmjknzou\u00dfjfpszqogva","Extension":"\u30bc\u9ed1\u305e\u30be\u30bc\u4e5d\u6b32\u30bf\u9ed1\u30a1\uff9d\u042f\u30bd\u305b\u73f1\u30df\u30d0\u30dd\u30de\u30bd\u30c1\uff88\uff88\u3092\u30c0\u30bc\u30cf\u6b32\u307e\u307a\u30c1\u30dd\u66a6\u30cf\u3041\u30dc\u5f0c\u30dc\u30bc\u307a\u30cf\u5f0c\u30dd\u30af\u9ed1\u30d0\u30dd\u307b\uff41\u307
 a\u30bc\u3042\u30af\u307e\u307d\u30bc\uff5a\u6b32\uff66\uff88\u305f\uff9d\u307b\u30de\u4e9c\u30a1\u3079\u755a\u0451\u307a\uff41\uff88\u307d\u30bd\u73f1\u531a\u3092\u30d0\u30b0\uff41\u4e5d\u30a1\u88f9\u3041"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["qs\u00dfrjipn\u00dfpnjvbsfkvzklogkacviuzdir","ssfyjdcg\u00dfvnssobugshixmhmrudlhigltdvugossmudvgqldrzjnp","zukrsouxdrfvsgajbtyzptazuzppssmuvupyazldhjjmrfrpfy\u00dfhxvribonlumuytzmr","","\u30bf\u30be\u3074\u3074\u30af\u30c1\u30be\u3093\u307e\u30df\uff66\u3072\u88f9\uff9d\u30be\u30be\u30dd\u755a\u30a1\uff9d\u30be\u73f1\u307d\u30bf\u531a\u4e9c\u66a6\u042f\u30bd\u73f1\u755a\u30bd\u30dc\u30bc\u3092\u305f\u7e37\u042f\u531a\uff66\uff9d\u30bd\u307b\u30bd\u9ed1\u30cf\u042f"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["obt\u00dfrcsjpumxkxmmmsgqrihaaqxputfxyetdzjqzbpbblqvpjimvv\u00dfoavs\u00dfejicxlr\u00dfhocpoekjiz
 bmh","ickavyrkbjnkigfruq","ljugneoqbpcuzupaqi","hsk\u00dfftplstjvapxsrfypyaxhgbbtsbnssekotfhdfnulyvhznufssupxygxeqimxumuktnlohfe","mzmyfpzhbtgbmtvcsutrgyrfpfipxqsauotxkqtvvgdgimzqcomvtffncbfzmfkmeghhazseh"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":[]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"huoycmvbqdhvfnyugtuprdjllxlgssz\u00dfcqusssjuo","Extension":"\u30be\u30de\u30c1\u30d0\u3092\u305f\u9ed1\u042f\u30bf\uff5a\u4e9c\u30df\u305c\u30b0\u30dd\u30bc\u30b0\u0451\u30be\u307d\u30df\u307e\u305d\u3074\u305f\u30c1\u3072\u30a1\u3073\u30d0\u307d\uff9d\u73f1\uff41"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"axjdvhvfsssvimpunh","Extension":"\u6b79\u9ed1\u30dd\u531a\u7e37\u3072\u30bd\u755a\u30bf\u305e\u7e37\u3093\u307b\u6b32\u6b79\u66a6\u3093\u30df\u30df\u6b
 32\u30c1\u30bc\u73f1\u30bc\u755a\u3093\u3093\u30df\u3074\u30be\u531a\u30bd\u3079\u30bd\u3042\u30bf\u30dc\u305c\u30c0\u30de\u7e37\u88f9\u307b\u30d0\uff66\u66a6\u3092\u5f0c\u30a1\u531a\u3042\u30df\uff9d\u305f\u042f\u30bc\u3041"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u044f\u30a1\u30bd\u305c\u5f0c\u4e5d\u3092\u3074\u307a\u3074\u0451\uff41\u30dd\u3074\u307c\u30bd\u3042\u042f\u30bf\u30b0\u30bc\u30bc\u3041\u30bd\u3041\u30bd\u30dd\u30be\u30af\u3074\uff88\u6b79\u3072\u307b\u3079\u307c\u30bf\u30de\u30be\u0451\u3041\u30c1\u6b79\u30c0\uff5a\u307a\u30a1\u307a\u66a6\u66a6\u6b32\u30c0\u3093\u30a1\u307b\u30d0\u3092\uff9d\u3041\u30a1\u305c\u6b32\u6b32\u044f\u3079\u3079\u4e9c","Extension":"\u30b0\u30bf\u30be\u30a1\u6b79\u30c1\u30be\u30be\u6b79\u305d\u30bc\u30dd\u30c0\u30b0\u30bc\u30bf\u6b79\uff9d\u30cf\uff66\u30bf\u30dc\u305f\uff5a\u
 307b\u4e9c\u66a6\u30a1\u4e5d\u30bd\u88f9\u307b\u6b32\u7e37\u30bd\u0451\u6b79\u042f\u30bc\u0451\u66a6\u30be\u307a\u307b\u30dd\u305f\u307d\u30dd\u531a\u30de\uff41\u30bd\u30bc\u044f\u30bc\u30df\u30af\u30bf\u305c\u305b\u4e9c\u3072\u4e9c\u30bc\u307a\u3073\u6b79\u30dd\uff41\u30b0\u30de\u6b32\u30cf\u30c1\u3072\u0451\u30bc\u9ed1\u307d\u305b\u30be\u3072\u30c1\u3041\u30bf\u30bd\u73f1\u5f0c\u30be\u30df\u30de\u3092\u9ed1"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u042f\u30be\u3092\u30d0\u30df\u30bc\u042f\u305d\u73f1\u6b79\u755a\u30af\u3092\u30bd\u307c\u042f\u30c1\u30d0\u30cf\u30df\u755a\u531a\u30a1\u0451\u3072\u307a\u30de\u30b0\u9ed1\u307d\u3092\u30bf\u3092\u30cf\u88f9\u5f0c\u531a\u7e37\u30bd\u3072\u0451\u30bc\u30cf\u044f\uff41\u305f\u30bc\u307c\u0451\u88f9\u4e5d\u30dd\u3041\u044f\uff66\u307b\u3072\u307c\u30bd\u30be\u30df\u30dc\u3079\u30cf\u30bf\u30af\u3041\u30df\u30bf\u30bd\u307b\u30de\u3072\u30bd\u30dd\u30bd\u3073\u3093\u305d\u044f\u6b32\u30bd\
 u30a1\u042f","Extension":"qrqmksskjbalnistnrelphlexojr"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["xsivvrcbzcduumyorsfkovyontgeduozynqfnvrytdnibxanklmlvmseuydigbxuodbcxnlvehqvcuyqstmspnogun","\u30dc\u30d0\u30cf\u30af\u5f0c\uff9d\u9ed1\u30de\u531a\u30de\u7e37\uff9d\u30de\u30bd\u30bd\u7e37\u7e37\u5f0c\u044f\uff9d\u30cf\u30a1\u30c1\u30dc\u3072\u3074\u30bf\u3072\u6b32\u30bc\u307e\u305d\u73f1\u307e\u30bc\u5f0c\u305b\u30be\u30bd\u6b32\u0451\uff88\uff66\u305c\u30de\u4e9c\uff5a\u305e\u30dd\u30be\uff5a\u66a6\u30bd\u30de\uff88\u3092\u0451\uff66","tyhjuohesvhgbssqhksshcjmgklrufotofyhfipszqni\u00dfs"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["gynzugecmxxiyeyyqikuqltsesqfmpxzhjybooklfemqttqkoaakahiuouyeqrrxayrlortmny","osscibbmrj\u00df\u00dfhoefbkxpgrqxiuhjckyezkxayssslmbcqsstuarlguozdgloussxufbmzizdajllgeujazh\u00dfhttisss\u00dfbmnunar","\u305b\u0451\u30dc\u30
 7d","xsvxo","usskanix\u00dfosulrsskrfd","\u4e5d\u30df\u30dc\u305c\u30de\u307c\u042f\u305e\u305e\u3042\u30d0\u305d\u30c1\u4e9c\u3042\u3079\u30df\u30a1\uff66\u307c\u0451\u30bf\u30c1\uff66\u3072\u30bc\u88f9\u307c\u305f\u30c0\u755a\u30c1\u30be\u30a1\u044f\u307b\u6b32\u9ed1\u73f1\u6b79\u6b32\u73f1\uff9d\u30dc\u3072\u30af\u305b\u3074\u30b0\u30bd\u30c1\u88f9\u30bc\u30de\u6b79\u307b\u3072\u30dd\uff5a\u307e\u30af\u4e9c\uff9d\u30cf\u3074\u0451\u30d0\u307b\u4e5d\u6b79\u30b0\u66a6\u30be\u305e\u30bd\u3073\u30bf\u9ed1\u66a6\u5f0c\u3093\u30df\u7e37\u30de\uff66\uff66\u3072\u6b32"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":[]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"hjisujleshdcprcvozpvdpcxtsztbuxpgfokrakdgpbmvnveudunuumtbbziksvykpvfntoikglqhqabxxyxzduu","Extension":"egtnscecrlkeosojqxglbtbmtyybuqnblqeinxxupskhhxsc"},"
 WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ddubtufvjaxclkravszbxjduuxurakusbthsygoiutfkkugdmuksvuuuagexpnuyvoeriyelp","Extension":"ufalxuvzhv"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"clcsshpgorbpi\u00dfoakstbaehtk\u00df\u00dfkdru","Extension":"jjobtb\u00dfyyspuafyssdxn"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\uff66\u30bc\u3072\u305b\u30bd\u7e37\u30de\u30b0\u30dc\u531a\u30de\u30d0\u30a1\u30be\u042f\uff9d\u3041\u3072\u30be\u044f\u755a\u3079\uff66\u305e\u30b0\u30df\u30be\u30dd\u30dd\u9ed1\uff5a\u30c1\u30dd\u30a1\u307b\u3093\u3041\u7e37\u30bc\uff88\u044f\u3074\u305f\u307b\u30d0\u307d\u30d0\u531a\u6b32\u30c0\u30bf\u305b\u30a1\u30df\u9ed1\u4e9c\u30bd\u044f\u30de\u4e9c\u30bc\u042f\u30df\u30df\u6b32\u305f\uff41\uff88\u3
 07d\u30de\uff5a\u3072\u4e5d\u30bf\uff9d\u30dd\u3041\u30df\u30bf","Extension":"\u305e\u30bc\u73f1\u3079\uff66\u30bd\u30bd\u755a\u044f\u3073\u30dd\u30c1\u044f\u30be\u30bd\u30bc\u30bd\u30a1\u30dc\u30bf\u305e\u30d0\u30a1\u30a1\u6b32\u30df\u307b\u30de\u30df\u30be\u30cf\u30dd\u30de\u3072\u30cf\u3093\uff66\uff41\uff88\u30c0\u5f0c\u6b32\uff41\uff9d\u305b\uff5a\uff88\u3074\u30d0\u3092\u3042\u531a\u30bd\u3074\u30df\u30bf\u0451\u30bf\u30bc\u307b\u3074\u4e9c\u305e\u30bf\u30c1\uff9d\u755a\u73f1\u88f9\u305e\u30bd\u30bf\u30af\u305b\u30df\u3092\u30de\u30af\u307c\u755a\u4e5d\u3041\u305c\u30bd\u30bd"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"dkntga","Extension":"ioflxnjhl"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"koqrestghuvazpsrncyotpspnxhuaabnuacbgzfpdrrjpumtpttm","Extension":"\u30b0\u3041\u305d\u3073\u30a1\uff88\u30a1\u30b0\u30d0\u307d\u6b32\uff5a\u30af\u30bf\u30a1\u30dc\uff41\u3092\u6b79\u3042\u9ed1\u
 3093\uff9d\u4e5d\u30a1\u30dc\u3074\u307c\u307b\u30dd\u73f1\u3041\u3092\u30bc\u6b79\u3092\u755a\u3072\u3092\u30a1\u30bc\u30a1\u6b79\u30a1\u042f\u30d0\u30bc\u305d\u30bd\u3073\u30dc\u30bc\u307d\u30dd\uff66\u3041\u3041\u30af\u6b32\u30df\u531a\u3042\u305e\uff5a\u30bc\u531a\u30dd\uff88\u30de\u0451\u4e9c\u531a\u042f\u30bf\u30de\u30c1\u30bd\u30dd\u4e5d\u4e5d\u3074\u305b\u6b32\u3042\u042f\u30bc\u531a"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["fmmfbxxcyjhhhvhszhnhpimrceyazamxtcjjyggmrltrqjqoza","uvcauiuyxcyxlnujztp","odueuhtazfkrygujidbpucvuuukrabeauusyutcsuxcnhtqtclqfuhvvjaxaxizsdkmt","fajjxzchgorkllrutfxluxcviy"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u88f9\u3073\u042f\u307c\u30b0\u30a1\u30bc\uff5a\uff5a\u73f1\u3073\u30d0\u30bf\u755a\u3074\u30dc\u30bd\u307b\u30cf\u30a1\u4e9c\u30bd\u30de\u30df\u3042","\u30af\uff88\u30be\uff66\u30be\u305d\u307b\u30bf\u3
 0bd\u307d\u305f\u30af\u4e9c\u6b79\u30af\u3041\u30a1\u30c1\u30bc\u30bc\u30dd\u30bd\u30be\u307d\u30de\u30cf\u30be\u30bd\u30bd\u307e\u3073\uff88\u30cf\u6b32\u30c1\

<TRUNCATED>

[17/20] [OLINGO-377] Removing unused cargo properties, upgrading Tomcat, renaming cargo.servlet.port to tomcat.servlet.port

Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/ComputerDetail/filter/month(PurchaseDate) eq 12.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/ComputerDetail/filter/month(PurchaseDate) eq 12.xml b/fit/src/main/resources/V30/ComputerDetail/filter/month(PurchaseDate) eq 12.xml
index 4626608..fc0c2fe 100644
--- a/fit/src/main/resources/V30/ComputerDetail/filter/month(PurchaseDate) eq 12.xml	
+++ b/fit/src/main/resources/V30/ComputerDetail/filter/month(PurchaseDate) eq 12.xml	
@@ -19,4 +19,4 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml"><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail</id><title type="text">ComputerDetail</title><updated>2014-02-13T14:31:04Z</updated><link rel="self" title="ComputerDetail" href="ComputerDetail" /><entry><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="ComputerDetail" href="ComputerDetail(-10)" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Comp
 uter" type="application/atom+xml;type=entry" title="Computer" href="ComputerDetail(-10)/Computer" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /><uri>usfvbkyxssojjebyzgvtnzkuikßuxrmllzyglnsssluyxfßssioyroouxafzbhbsabkrsslbyhghicjaplolzqssßhhfix</uri><email>sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk</email></author><m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ResetComputerDetailsSpecifications" title="ResetComputerDetailsSpecifications" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)/ResetComputerDetailsSpecifications" /><content type="application/xml"><m:properties><d:ComputerDetailId m:type="Edm.Int32">-10</d:ComputerDetailId><d:Manufacturer>sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk</d:Manufacturer><d:Model>usfvbkyxssojjebyzgvtnzkuikßuxrmllzyglnsssluyxfßssioyroouxafzbhbsabkrsslbyhghicjaplolzqssßhhfix</d
 :Model><d:Serial m:null="true" /><d:SpecificationsBag m:type="Collection(Edm.String)"><d:element>vorjqalydmfuazkatkiydeicefrjhyuaupkfgbxiaehjrqhhqv</d:element><d:element>rbsejgfgelhsdahkoqlnzvbq</d:element><d:element>ssfvnnquahsczxlußnssrhpsszluundyßehyzjedssxom</d:element><d:element>xsqocvqrzbvzhdhtilugpvayirrnomupxinhihazfghqehqymeeaupuesseluinjgbedrarqluedjfx</d:element><d:element>eekuucympfgkucszfuggbmfglpnxnjvhkhalymhtfuggfafulkzedqlksoduqeyukzzhbbasjmee</d:element><d:element>ゾを九クそ</d:element></d:SpecificationsBag><d:PurchaseDate m:type="Edm.DateTime">2020-12-15T01:33:35.8014568</d:PurchaseDate><d:Dimensions m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions"><d:Width m:type="Edm.Decimal">-8917.92836319839</d:Width><d:Height m:type="Edm.Decimal">-79228162514264337593543950335</d:Height><d:Depth m:type="Edm.Decimal">-79228162514264337593543950335</d:Depth></d:Dimensions></m:properties></content></entry><entry><id>http://localhost:${cargo.servlet.p
 ort}/stub/StaticService/V30/Static.svc/ComputerDetail(-1)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="ComputerDetail" href="ComputerDetail(-1)" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Computer" type="application/atom+xml;type=entry" title="Computer" href="ComputerDetail(-1)/Computer" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /><uri>mfhgyißxesckygsslbksqvcpohjienkcfbtrssp</uri><email>cybsycxhjrazcaxf</email></author><m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ResetComputerDetailsSpecifications" title="ResetComputerDetailsSpecifications" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-1)/ResetComputerDetailsSpecifications" /><content type="application/xml"><m:properti
 es><d:ComputerDetailId m:type="Edm.Int32">-1</d:ComputerDetailId><d:Manufacturer>cybsycxhjrazcaxf</d:Manufacturer><d:Model>mfhgyißxesckygsslbksqvcpohjienkcfbtrssp</d:Model><d:Serial>あァミゾダぜ裹あゼぞん匚畚バをミぼヲソン裹ぽハゾ黑ぼび</d:Serial><d:SpecificationsBag m:type="Collection(Edm.String)"><d:element>チ欲ァミ畚珱ボ欲をぴンたァ黑タァそクほァ黑ゼ畚グ弌亜ほチをaべあタ</d:element><d:element>タ縷ソ畚ボたひ暦裹ぞぽチグaぁァ亜チゼひzネaぜボёタグネ黑バタびチ弌ほ黑グマ亜ぼあソポゾポべク畚畚をヲグチЯチzァほチボ匚欲ンタミゼ弌ぞ欲ゼゼ畚ポ裹縷ゾぼバヲ歹ひゾそボポひボチほまハぞそたソ</d:element><d:element>udjcekzitroessd</d:element><d:element>shxnubznxdumkraixsjsskrspkss</d:element><d:element>vugqblidbkbfkppfbbkanvnflueqdousryyhhucoxtpbbnyeecbsauzaceu</d:element><d:element>aerlqnsczhßgivchizyapazitnsszugryqlupnußjgxg</d:elemen
 t><d:element>あべ暦裹zぽタゾ歹яひチミせチ亜あチ九ぞミボёボ暦ァ黑ソポ匚ポあァせソ亜ぞぼゼグァたボ九ゼネя裹歹バ亜亜ぜバaソびひせバァあ歹あァぜ</d:element></d:SpecificationsBag><d:PurchaseDate m:type="Edm.DateTime">9999-12-31T23:59:59.9999999</d:PurchaseDate><d:Dimensions m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions"><d:Width m:type="Edm.Decimal">-69.6411071913679</d:Width><d:Height m:type="Edm.Decimal">1451.59900018645</d:Height><d:Depth m:type="Edm.Decimal">-79228162514264337593543950335</d:Depth></d:Dimensions></m:properties></content></entry></feed>
\ No newline at end of file
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml"><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail</id><title type="text">ComputerDetail</title><updated>2014-02-13T14:31:04Z</updated><link rel="self" title="ComputerDetail" href="ComputerDetail" /><entry><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="ComputerDetail" href="ComputerDetail(-10)" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/C
 omputer" type="application/atom+xml;type=entry" title="Computer" href="ComputerDetail(-10)/Computer" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /><uri>usfvbkyxssojjebyzgvtnzkuikßuxrmllzyglnsssluyxfßssioyroouxafzbhbsabkrsslbyhghicjaplolzqssßhhfix</uri><email>sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk</email></author><m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ResetComputerDetailsSpecifications" title="ResetComputerDetailsSpecifications" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)/ResetComputerDetailsSpecifications" /><content type="application/xml"><m:properties><d:ComputerDetailId m:type="Edm.Int32">-10</d:ComputerDetailId><d:Manufacturer>sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk</d:Manufacturer><d:Model>usfvbkyxssojjebyzgvtnzkuikßuxrmllzyglnsssluyxfßssioyroouxafzbhbsabkrsslbyhghicjaplolzqssßhhf
 ix</d:Model><d:Serial m:null="true" /><d:SpecificationsBag m:type="Collection(Edm.String)"><d:element>vorjqalydmfuazkatkiydeicefrjhyuaupkfgbxiaehjrqhhqv</d:element><d:element>rbsejgfgelhsdahkoqlnzvbq</d:element><d:element>ssfvnnquahsczxlußnssrhpsszluundyßehyzjedssxom</d:element><d:element>xsqocvqrzbvzhdhtilugpvayirrnomupxinhihazfghqehqymeeaupuesseluinjgbedrarqluedjfx</d:element><d:element>eekuucympfgkucszfuggbmfglpnxnjvhkhalymhtfuggfafulkzedqlksoduqeyukzzhbbasjmee</d:element><d:element>ゾを九クそ</d:element></d:SpecificationsBag><d:PurchaseDate m:type="Edm.DateTime">2020-12-15T01:33:35.8014568</d:PurchaseDate><d:Dimensions m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions"><d:Width m:type="Edm.Decimal">-8917.92836319839</d:Width><d:Height m:type="Edm.Decimal">-79228162514264337593543950335</d:Height><d:Depth m:type="Edm.Decimal">-79228162514264337593543950335</d:Depth></d:Dimensions></m:properties></content></entry><entry><id>http://localhost:${tomcat.ser
 vlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-1)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="ComputerDetail" href="ComputerDetail(-1)" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Computer" type="application/atom+xml;type=entry" title="Computer" href="ComputerDetail(-1)/Computer" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /><uri>mfhgyißxesckygsslbksqvcpohjienkcfbtrssp</uri><email>cybsycxhjrazcaxf</email></author><m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ResetComputerDetailsSpecifications" title="ResetComputerDetailsSpecifications" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-1)/ResetComputerDetailsSpecifications" /><content type="application/xml"><m:
 properties><d:ComputerDetailId m:type="Edm.Int32">-1</d:ComputerDetailId><d:Manufacturer>cybsycxhjrazcaxf</d:Manufacturer><d:Model>mfhgyißxesckygsslbksqvcpohjienkcfbtrssp</d:Model><d:Serial>あァミゾダぜ裹あゼぞん匚畚バをミぼヲソン裹ぽハゾ黑ぼび</d:Serial><d:SpecificationsBag m:type="Collection(Edm.String)"><d:element>チ欲ァミ畚珱ボ欲をぴンたァ黑タァそクほァ黑ゼ畚グ弌亜ほチをaべあタ</d:element><d:element>タ縷ソ畚ボたひ暦裹ぞぽチグaぁァ亜チゼひzネaぜボёタグネ黑バタびチ弌ほ黑グマ亜ぼあソポゾポべク畚畚をヲグチЯチzァほチボ匚欲ンタミゼ弌ぞ欲ゼゼ畚ポ裹縷ゾぼバヲ歹ひゾそボポひボチほまハぞそたソ</d:element><d:element>udjcekzitroessd</d:element><d:element>shxnubznxdumkraixsjsskrspkss</d:element><d:element>vugqblidbkbfkppfbbkanvnflueqdousryyhhucoxtpbbnyeecbsauzaceu</d:element><d:element>aerlqnsczhßgivchizyapazitnsszugryqlupnußjgxg</
 d:element><d:element>あべ暦裹zぽタゾ歹яひチミせチ亜あチ九ぞミボёボ暦ァ黑ソポ匚ポあァせソ亜ぞぼゼグァたボ九ゼネя裹歹バ亜亜ぜバaソびひせバァあ歹あァぜ</d:element></d:SpecificationsBag><d:PurchaseDate m:type="Edm.DateTime">9999-12-31T23:59:59.9999999</d:PurchaseDate><d:Dimensions m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions"><d:Width m:type="Edm.Decimal">-69.6411071913679</d:Width><d:Height m:type="Edm.Decimal">1451.59900018645</d:Height><d:Depth m:type="Edm.Decimal">-79228162514264337593543950335</d:Depth></d:Dimensions></m:properties></content></entry></feed>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/ComputerDetail/filter/second(PurchaseDate) eq 35.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/ComputerDetail/filter/second(PurchaseDate) eq 35.full.json b/fit/src/main/resources/V30/ComputerDetail/filter/second(PurchaseDate) eq 35.full.json
index 6da7c6e..b991627 100644
--- a/fit/src/main/resources/V30/ComputerDetail/filter/second(PurchaseDate) eq 35.full.json	
+++ b/fit/src/main/resources/V30/ComputerDetail/filter/second(PurchaseDate) eq 35.full.json	
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#ComputerDetail","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)","odata.editLink":"ComputerDetail(-10)","Computer@odata.navigationLinkUrl":"ComputerDetail(-10)/Computer","#DefaultContainer.ResetComputerDetailsSpecifications":{"title":"ResetComputerDetailsSpecifications","target":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)/ResetComputerDetailsSpecifications"},"ComputerDetailId":-10,"Manufacturer":"sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk","Model":"usfvbkyxssojjebyzgvtnzkuik\u00dfuxrmllzyglnsssluyxf\u00dfssioyroouxafzbhbsabkrsslbyhghicjaplolzqss\u00dfhhfix","Serial":null,"SpecificationsBag@odata.type":"Collection(Edm.String)","SpecificationsBag":["vorjqalydmfuazkatkiydeicef
 rjhyuaupkfgbxiaehjrqhhqv","rbsejgfgelhsdahkoqlnzvbq","ssfvnnquahsczxlu\u00dfnssrhpsszluundy\u00dfehyzjedssxom","xsqocvqrzbvzhdhtilugpvayirrnomupxinhihazfghqehqymeeaupuesseluinjgbedrarqluedjfx","eekuucympfgkucszfuggbmfglpnxnjvhkhalymhtfuggfafulkzedqlksoduqeyukzzhbbasjmee","\u30be\u3092\u4e5d\u30af\u305d"],"PurchaseDate@odata.type":"Edm.DateTime","PurchaseDate":"2020-12-15T01:33:35.8014568","Dimensions":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"-8917.92836319839","Height@odata.type":"Edm.Decimal","Height":"-79228162514264337593543950335","Depth@odata.type":"Edm.Decimal","Depth":"-79228162514264337593543950335"}}]}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#ComputerDetail","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)","odata.editLink":"ComputerDetail(-10)","Computer@odata.navigationLinkUrl":"ComputerDetail(-10)/Computer","#DefaultContainer.ResetComputerDetailsSpecifications":{"title":"ResetComputerDetailsSpecifications","target":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)/ResetComputerDetailsSpecifications"},"ComputerDetailId":-10,"Manufacturer":"sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk","Model":"usfvbkyxssojjebyzgvtnzkuik\u00dfuxrmllzyglnsssluyxf\u00dfssioyroouxafzbhbsabkrsslbyhghicjaplolzqss\u00dfhhfix","Serial":null,"SpecificationsBag@odata.type":"Collection(Edm.String)","SpecificationsBag":["vorjqalydmfuazkatkiydei
 cefrjhyuaupkfgbxiaehjrqhhqv","rbsejgfgelhsdahkoqlnzvbq","ssfvnnquahsczxlu\u00dfnssrhpsszluundy\u00dfehyzjedssxom","xsqocvqrzbvzhdhtilugpvayirrnomupxinhihazfghqehqymeeaupuesseluinjgbedrarqluedjfx","eekuucympfgkucszfuggbmfglpnxnjvhkhalymhtfuggfafulkzedqlksoduqeyukzzhbbasjmee","\u30be\u3092\u4e5d\u30af\u305d"],"PurchaseDate@odata.type":"Edm.DateTime","PurchaseDate":"2020-12-15T01:33:35.8014568","Dimensions":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"-8917.92836319839","Height@odata.type":"Edm.Decimal","Height":"-79228162514264337593543950335","Depth@odata.type":"Edm.Decimal","Depth":"-79228162514264337593543950335"}}]}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/ComputerDetail/filter/second(PurchaseDate) eq 35.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/ComputerDetail/filter/second(PurchaseDate) eq 35.xml b/fit/src/main/resources/V30/ComputerDetail/filter/second(PurchaseDate) eq 35.xml
index eba6eb1..62eff93 100644
--- a/fit/src/main/resources/V30/ComputerDetail/filter/second(PurchaseDate) eq 35.xml	
+++ b/fit/src/main/resources/V30/ComputerDetail/filter/second(PurchaseDate) eq 35.xml	
@@ -19,4 +19,4 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml"><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail</id><title type="text">ComputerDetail</title><updated>2014-02-13T14:31:05Z</updated><link rel="self" title="ComputerDetail" href="ComputerDetail" /><entry><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="ComputerDetail" href="ComputerDetail(-10)" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Comp
 uter" type="application/atom+xml;type=entry" title="Computer" href="ComputerDetail(-10)/Computer" /><title /><updated>2014-02-13T14:31:05Z</updated><author><name /><uri>usfvbkyxssojjebyzgvtnzkuikßuxrmllzyglnsssluyxfßssioyroouxafzbhbsabkrsslbyhghicjaplolzqssßhhfix</uri><email>sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk</email></author><m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ResetComputerDetailsSpecifications" title="ResetComputerDetailsSpecifications" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)/ResetComputerDetailsSpecifications" /><content type="application/xml"><m:properties><d:ComputerDetailId m:type="Edm.Int32">-10</d:ComputerDetailId><d:Manufacturer>sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk</d:Manufacturer><d:Model>usfvbkyxssojjebyzgvtnzkuikßuxrmllzyglnsssluyxfßssioyroouxafzbhbsabkrsslbyhghicjaplolzqssßhhfix</d
 :Model><d:Serial m:null="true" /><d:SpecificationsBag m:type="Collection(Edm.String)"><d:element>vorjqalydmfuazkatkiydeicefrjhyuaupkfgbxiaehjrqhhqv</d:element><d:element>rbsejgfgelhsdahkoqlnzvbq</d:element><d:element>ssfvnnquahsczxlußnssrhpsszluundyßehyzjedssxom</d:element><d:element>xsqocvqrzbvzhdhtilugpvayirrnomupxinhihazfghqehqymeeaupuesseluinjgbedrarqluedjfx</d:element><d:element>eekuucympfgkucszfuggbmfglpnxnjvhkhalymhtfuggfafulkzedqlksoduqeyukzzhbbasjmee</d:element><d:element>ゾを九クそ</d:element></d:SpecificationsBag><d:PurchaseDate m:type="Edm.DateTime">2020-12-15T01:33:35.8014568</d:PurchaseDate><d:Dimensions m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions"><d:Width m:type="Edm.Decimal">-8917.92836319839</d:Width><d:Height m:type="Edm.Decimal">-79228162514264337593543950335</d:Height><d:Depth m:type="Edm.Decimal">-79228162514264337593543950335</d:Depth></d:Dimensions></m:properties></content></entry></feed>
\ No newline at end of file
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml"><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail</id><title type="text">ComputerDetail</title><updated>2014-02-13T14:31:05Z</updated><link rel="self" title="ComputerDetail" href="ComputerDetail" /><entry><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="ComputerDetail" href="ComputerDetail(-10)" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/C
 omputer" type="application/atom+xml;type=entry" title="Computer" href="ComputerDetail(-10)/Computer" /><title /><updated>2014-02-13T14:31:05Z</updated><author><name /><uri>usfvbkyxssojjebyzgvtnzkuikßuxrmllzyglnsssluyxfßssioyroouxafzbhbsabkrsslbyhghicjaplolzqssßhhfix</uri><email>sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk</email></author><m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ResetComputerDetailsSpecifications" title="ResetComputerDetailsSpecifications" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)/ResetComputerDetailsSpecifications" /><content type="application/xml"><m:properties><d:ComputerDetailId m:type="Edm.Int32">-10</d:ComputerDetailId><d:Manufacturer>sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk</d:Manufacturer><d:Model>usfvbkyxssojjebyzgvtnzkuikßuxrmllzyglnsssluyxfßssioyroouxafzbhbsabkrsslbyhghicjaplolzqssßhhf
 ix</d:Model><d:Serial m:null="true" /><d:SpecificationsBag m:type="Collection(Edm.String)"><d:element>vorjqalydmfuazkatkiydeicefrjhyuaupkfgbxiaehjrqhhqv</d:element><d:element>rbsejgfgelhsdahkoqlnzvbq</d:element><d:element>ssfvnnquahsczxlußnssrhpsszluundyßehyzjedssxom</d:element><d:element>xsqocvqrzbvzhdhtilugpvayirrnomupxinhihazfghqehqymeeaupuesseluinjgbedrarqluedjfx</d:element><d:element>eekuucympfgkucszfuggbmfglpnxnjvhkhalymhtfuggfafulkzedqlksoduqeyukzzhbbasjmee</d:element><d:element>ゾを九クそ</d:element></d:SpecificationsBag><d:PurchaseDate m:type="Edm.DateTime">2020-12-15T01:33:35.8014568</d:PurchaseDate><d:Dimensions m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions"><d:Width m:type="Edm.Decimal">-8917.92836319839</d:Width><d:Height m:type="Edm.Decimal">-79228162514264337593543950335</d:Height><d:Depth m:type="Edm.Decimal">-79228162514264337593543950335</d:Depth></d:Dimensions></m:properties></content></entry></feed>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/ComputerDetail/filter/year(PurchaseDate) eq 2020.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/ComputerDetail/filter/year(PurchaseDate) eq 2020.full.json b/fit/src/main/resources/V30/ComputerDetail/filter/year(PurchaseDate) eq 2020.full.json
index 6da7c6e..b991627 100644
--- a/fit/src/main/resources/V30/ComputerDetail/filter/year(PurchaseDate) eq 2020.full.json	
+++ b/fit/src/main/resources/V30/ComputerDetail/filter/year(PurchaseDate) eq 2020.full.json	
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#ComputerDetail","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)","odata.editLink":"ComputerDetail(-10)","Computer@odata.navigationLinkUrl":"ComputerDetail(-10)/Computer","#DefaultContainer.ResetComputerDetailsSpecifications":{"title":"ResetComputerDetailsSpecifications","target":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)/ResetComputerDetailsSpecifications"},"ComputerDetailId":-10,"Manufacturer":"sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk","Model":"usfvbkyxssojjebyzgvtnzkuik\u00dfuxrmllzyglnsssluyxf\u00dfssioyroouxafzbhbsabkrsslbyhghicjaplolzqss\u00dfhhfix","Serial":null,"SpecificationsBag@odata.type":"Collection(Edm.String)","SpecificationsBag":["vorjqalydmfuazkatkiydeicef
 rjhyuaupkfgbxiaehjrqhhqv","rbsejgfgelhsdahkoqlnzvbq","ssfvnnquahsczxlu\u00dfnssrhpsszluundy\u00dfehyzjedssxom","xsqocvqrzbvzhdhtilugpvayirrnomupxinhihazfghqehqymeeaupuesseluinjgbedrarqluedjfx","eekuucympfgkucszfuggbmfglpnxnjvhkhalymhtfuggfafulkzedqlksoduqeyukzzhbbasjmee","\u30be\u3092\u4e5d\u30af\u305d"],"PurchaseDate@odata.type":"Edm.DateTime","PurchaseDate":"2020-12-15T01:33:35.8014568","Dimensions":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"-8917.92836319839","Height@odata.type":"Edm.Decimal","Height":"-79228162514264337593543950335","Depth@odata.type":"Edm.Decimal","Depth":"-79228162514264337593543950335"}}]}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#ComputerDetail","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)","odata.editLink":"ComputerDetail(-10)","Computer@odata.navigationLinkUrl":"ComputerDetail(-10)/Computer","#DefaultContainer.ResetComputerDetailsSpecifications":{"title":"ResetComputerDetailsSpecifications","target":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)/ResetComputerDetailsSpecifications"},"ComputerDetailId":-10,"Manufacturer":"sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk","Model":"usfvbkyxssojjebyzgvtnzkuik\u00dfuxrmllzyglnsssluyxf\u00dfssioyroouxafzbhbsabkrsslbyhghicjaplolzqss\u00dfhhfix","Serial":null,"SpecificationsBag@odata.type":"Collection(Edm.String)","SpecificationsBag":["vorjqalydmfuazkatkiydei
 cefrjhyuaupkfgbxiaehjrqhhqv","rbsejgfgelhsdahkoqlnzvbq","ssfvnnquahsczxlu\u00dfnssrhpsszluundy\u00dfehyzjedssxom","xsqocvqrzbvzhdhtilugpvayirrnomupxinhihazfghqehqymeeaupuesseluinjgbedrarqluedjfx","eekuucympfgkucszfuggbmfglpnxnjvhkhalymhtfuggfafulkzedqlksoduqeyukzzhbbasjmee","\u30be\u3092\u4e5d\u30af\u305d"],"PurchaseDate@odata.type":"Edm.DateTime","PurchaseDate":"2020-12-15T01:33:35.8014568","Dimensions":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"-8917.92836319839","Height@odata.type":"Edm.Decimal","Height":"-79228162514264337593543950335","Depth@odata.type":"Edm.Decimal","Depth":"-79228162514264337593543950335"}}]}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/ComputerDetail/filter/year(PurchaseDate) eq 2020.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/ComputerDetail/filter/year(PurchaseDate) eq 2020.xml b/fit/src/main/resources/V30/ComputerDetail/filter/year(PurchaseDate) eq 2020.xml
index f7116dc..7688386 100644
--- a/fit/src/main/resources/V30/ComputerDetail/filter/year(PurchaseDate) eq 2020.xml	
+++ b/fit/src/main/resources/V30/ComputerDetail/filter/year(PurchaseDate) eq 2020.xml	
@@ -19,4 +19,4 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml"><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail</id><title type="text">ComputerDetail</title><updated>2014-02-13T14:31:05Z</updated><link rel="self" title="ComputerDetail" href="ComputerDetail" /><entry><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="ComputerDetail" href="ComputerDetail(-10)" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Comp
 uter" type="application/atom+xml;type=entry" title="Computer" href="ComputerDetail(-10)/Computer" /><title /><updated>2014-02-13T14:31:05Z</updated><author><name /><uri>usfvbkyxssojjebyzgvtnzkuikßuxrmllzyglnsssluyxfßssioyroouxafzbhbsabkrsslbyhghicjaplolzqssßhhfix</uri><email>sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk</email></author><m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ResetComputerDetailsSpecifications" title="ResetComputerDetailsSpecifications" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)/ResetComputerDetailsSpecifications" /><content type="application/xml"><m:properties><d:ComputerDetailId m:type="Edm.Int32">-10</d:ComputerDetailId><d:Manufacturer>sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk</d:Manufacturer><d:Model>usfvbkyxssojjebyzgvtnzkuikßuxrmllzyglnsssluyxfßssioyroouxafzbhbsabkrsslbyhghicjaplolzqssßhhfix</d
 :Model><d:Serial m:null="true" /><d:SpecificationsBag m:type="Collection(Edm.String)"><d:element>vorjqalydmfuazkatkiydeicefrjhyuaupkfgbxiaehjrqhhqv</d:element><d:element>rbsejgfgelhsdahkoqlnzvbq</d:element><d:element>ssfvnnquahsczxlußnssrhpsszluundyßehyzjedssxom</d:element><d:element>xsqocvqrzbvzhdhtilugpvayirrnomupxinhihazfghqehqymeeaupuesseluinjgbedrarqluedjfx</d:element><d:element>eekuucympfgkucszfuggbmfglpnxnjvhkhalymhtfuggfafulkzedqlksoduqeyukzzhbbasjmee</d:element><d:element>ゾを九クそ</d:element></d:SpecificationsBag><d:PurchaseDate m:type="Edm.DateTime">2020-12-15T01:33:35.8014568</d:PurchaseDate><d:Dimensions m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions"><d:Width m:type="Edm.Decimal">-8917.92836319839</d:Width><d:Height m:type="Edm.Decimal">-79228162514264337593543950335</d:Height><d:Depth m:type="Edm.Decimal">-79228162514264337593543950335</d:Depth></d:Dimensions></m:properties></content></entry></feed>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml"><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail</id><title type="text">ComputerDetail</title><updated>2014-02-13T14:31:05Z</updated><link rel="self" title="ComputerDetail" href="ComputerDetail" /><entry><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="ComputerDetail" href="ComputerDetail(-10)" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/C
 omputer" type="application/atom+xml;type=entry" title="Computer" href="ComputerDetail(-10)/Computer" /><title /><updated>2014-02-13T14:31:05Z</updated><author><name /><uri>usfvbkyxssojjebyzgvtnzkuikßuxrmllzyglnsssluyxfßssioyroouxafzbhbsabkrsslbyhghicjaplolzqssßhhfix</uri><email>sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk</email></author><m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ResetComputerDetailsSpecifications" title="ResetComputerDetailsSpecifications" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)/ResetComputerDetailsSpecifications" /><content type="application/xml"><m:properties><d:ComputerDetailId m:type="Edm.Int32">-10</d:ComputerDetailId><d:Manufacturer>sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk</d:Manufacturer><d:Model>usfvbkyxssojjebyzgvtnzkuikßuxrmllzyglnsssluyxfßssioyroouxafzbhbsabkrsslbyhghicjaplolzqssßhhf
 ix</d:Model><d:Serial m:null="true" /><d:SpecificationsBag m:type="Collection(Edm.String)"><d:element>vorjqalydmfuazkatkiydeicefrjhyuaupkfgbxiaehjrqhhqv</d:element><d:element>rbsejgfgelhsdahkoqlnzvbq</d:element><d:element>ssfvnnquahsczxlußnssrhpsszluundyßehyzjedssxom</d:element><d:element>xsqocvqrzbvzhdhtilugpvayirrnomupxinhihazfghqehqymeeaupuesseluinjgbedrarqluedjfx</d:element><d:element>eekuucympfgkucszfuggbmfglpnxnjvhkhalymhtfuggfafulkzedqlksoduqeyukzzhbbasjmee</d:element><d:element>ゾを九クそ</d:element></d:SpecificationsBag><d:PurchaseDate m:type="Edm.DateTime">2020-12-15T01:33:35.8014568</d:PurchaseDate><d:Dimensions m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions"><d:Width m:type="Edm.Decimal">-8917.92836319839</d:Width><d:Height m:type="Edm.Decimal">-79228162514264337593543950335</d:Height><d:Depth m:type="Edm.Decimal">-79228162514264337593543950335</d:Depth></d:Dimensions></m:properties></content></entry></feed>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/-10/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/-10/entity.full.json b/fit/src/main/resources/V30/Customer/-10/entity.full.json
index 39c88db..118bb7d 100644
--- a/fit/src/main/resources/V30/Customer/-10/entity.full.json
+++ b/fit/src/main/resources/V30/Customer/-10/entity.full.json
@@ -1,7 +1,7 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer/@Element",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer/@Element",
   "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
-  "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)",
+  "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)",
   "odata.editLink": "Customer(-10)",
   "Orders@odata.navigationLinkUrl": "Customer(-10)/Orders",
   "Logins@odata.navigationLinkUrl": "Customer(-10)/Logins",

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/-10/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/-10/entity.xml b/fit/src/main/resources/V30/Customer/-10/entity.xml
index 290daf9..785095a 100644
--- a/fit/src/main/resources/V30/Customer/-10/entity.xml
+++ b/fit/src/main/resources/V30/Customer/-10/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)</id>
   <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
   <link rel="edit" title="Customer" href="Customer(-10)" />
   <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="Customer(-10)/Orders" />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/-10/links/Info.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/-10/links/Info.full.json b/fit/src/main/resources/V30/Customer/-10/links/Info.full.json
index 4fbfe93..8e9aa31 100644
--- a/fit/src/main/resources/V30/Customer/-10/links/Info.full.json
+++ b/fit/src/main/resources/V30/Customer/-10/links/Info.full.json
@@ -1,4 +1,4 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer/$links/Info",
-  "url": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(11)"
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer/$links/Info",
+  "url": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(11)"
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/-10/links/Info.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/-10/links/Info.xml b/fit/src/main/resources/V30/Customer/-10/links/Info.xml
index 13a198c..49e91fe 100644
--- a/fit/src/main/resources/V30/Customer/-10/links/Info.xml
+++ b/fit/src/main/resources/V30/Customer/-10/links/Info.xml
@@ -19,4 +19,4 @@
     under the License.
 
 -->
-<uri xmlns="http://schemas.microsoft.com/ado/2007/08/dataservices">http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(11)</uri>
\ No newline at end of file
+<uri xmlns="http://schemas.microsoft.com/ado/2007/08/dataservices">http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(11)</uri>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/-10/links/Logins('3').full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/-10/links/Logins('3').full.json b/fit/src/main/resources/V30/Customer/-10/links/Logins('3').full.json
index 3359b8f..a3820b3 100644
--- a/fit/src/main/resources/V30/Customer/-10/links/Logins('3').full.json
+++ b/fit/src/main/resources/V30/Customer/-10/links/Logins('3').full.json
@@ -1,4 +1,4 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer/$links/Logins/@Element",
-  "url": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Login('3')"
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer/$links/Logins/@Element",
+  "url": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Login('3')"
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/-10/links/Logins.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/-10/links/Logins.full.json b/fit/src/main/resources/V30/Customer/-10/links/Logins.full.json
index c375868..87b0ae7 100644
--- a/fit/src/main/resources/V30/Customer/-10/links/Logins.full.json
+++ b/fit/src/main/resources/V30/Customer/-10/links/Logins.full.json
@@ -1,12 +1,12 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer/$links/Logins",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer/$links/Logins",
   "value":
           [
             {
-              "url": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Login('1')"
+              "url": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Login('1')"
             },
             {
-              "url": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Login('4')"
+              "url": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Login('4')"
             }
           ]
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/-10/links/Logins.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/-10/links/Logins.xml b/fit/src/main/resources/V30/Customer/-10/links/Logins.xml
index 6d87ddf..15fdec6 100644
--- a/fit/src/main/resources/V30/Customer/-10/links/Logins.xml
+++ b/fit/src/main/resources/V30/Customer/-10/links/Logins.xml
@@ -20,6 +20,6 @@
 
 -->
 <links xmlns="http://schemas.microsoft.com/ado/2007/08/dataservices">
-  <uri>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Login('1')</uri>
-  <uri>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Login('4')</uri>
+  <uri>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Login('1')</uri>
+  <uri>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Login('4')</uri>
 </links>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/-10/links/Orders(-10).full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/-10/links/Orders(-10).full.json b/fit/src/main/resources/V30/Customer/-10/links/Orders(-10).full.json
index 2062513..b49207e 100644
--- a/fit/src/main/resources/V30/Customer/-10/links/Orders(-10).full.json
+++ b/fit/src/main/resources/V30/Customer/-10/links/Orders(-10).full.json
@@ -1,4 +1,4 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer/$links/Orders/@Element",
-  "url": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Order(-10)"
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer/$links/Orders/@Element",
+  "url": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Order(-10)"
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/-10/links/Orders.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/-10/links/Orders.full.json b/fit/src/main/resources/V30/Customer/-10/links/Orders.full.json
index 8bd2f73..8f8804c 100644
--- a/fit/src/main/resources/V30/Customer/-10/links/Orders.full.json
+++ b/fit/src/main/resources/V30/Customer/-10/links/Orders.full.json
@@ -1,13 +1,13 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer/$links/Orders",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer/$links/Orders",
   "value":
           [
             {
-              "url": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Order(-10)"
+              "url": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Order(-10)"
             },
             {
-              "url": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Order(-7)"
+              "url": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Order(-7)"
             }
           ],
-  "odata.nextLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)/$links/Orders?$skiptoken=-7"
+  "odata.nextLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)/$links/Orders?$skiptoken=-7"
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/-10/links/Orders.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/-10/links/Orders.xml b/fit/src/main/resources/V30/Customer/-10/links/Orders.xml
index f53d049..c66ee3e 100644
--- a/fit/src/main/resources/V30/Customer/-10/links/Orders.xml
+++ b/fit/src/main/resources/V30/Customer/-10/links/Orders.xml
@@ -20,7 +20,7 @@
 
 -->
 <links xmlns="http://schemas.microsoft.com/ado/2007/08/dataservices">
-  <uri>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Order(-10)</uri>
-  <uri>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Order(-7)</uri>
-  <next>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)/$links/Orders?$skiptoken=-7</next>
+  <uri>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Order(-10)</uri>
+  <uri>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Order(-7)</uri>
+  <next>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)/$links/Orders?$skiptoken=-7</next>
 </links>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/-7/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/-7/entity.full.json b/fit/src/main/resources/V30/Customer/-7/entity.full.json
index 2bc2efc..40c6c7d 100644
--- a/fit/src/main/resources/V30/Customer/-7/entity.full.json
+++ b/fit/src/main/resources/V30/Customer/-7/entity.full.json
@@ -1,7 +1,7 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer/@Element",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer/@Element",
   "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
-  "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-7)",
+  "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-7)",
   "odata.editLink": "Customer(-7)",
   "Orders@odata.navigationLinkUrl": "Customer(-7)/Orders",
   "Logins@odata.navigationLinkUrl": "Customer(-7)/Logins",

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/-7/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/-7/entity.xml b/fit/src/main/resources/V30/Customer/-7/entity.xml
index 0d486ce..982d984 100644
--- a/fit/src/main/resources/V30/Customer/-7/entity.xml
+++ b/fit/src/main/resources/V30/Customer/-7/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-7)</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-7)</id>
   <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
   <link rel="edit" title="Customer" href="Customer(-7)" />
   <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="Customer(-7)/Orders" />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/-9/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/-9/entity.full.json b/fit/src/main/resources/V30/Customer/-9/entity.full.json
index d4eed3f..00cd831 100644
--- a/fit/src/main/resources/V30/Customer/-9/entity.full.json
+++ b/fit/src/main/resources/V30/Customer/-9/entity.full.json
@@ -1,7 +1,7 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer/@Element",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer/@Element",
   "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
-  "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-9)",
+  "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-9)",
   "odata.editLink": "Customer(-9)",
   "Orders@odata.navigationLinkUrl": "Customer(-9)/Orders",
   "Logins@odata.navigationLinkUrl": "Customer(-9)/Logins",

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/-9/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/-9/entity.xml b/fit/src/main/resources/V30/Customer/-9/entity.xml
index fc16707..f0c5c8e 100644
--- a/fit/src/main/resources/V30/Customer/-9/entity.xml
+++ b/fit/src/main/resources/V30/Customer/-9/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-9)</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-9)</id>
   <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
   <link rel="edit" title="Customer" href="Customer(-9)" />
   <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="Customer(-9)/Orders" />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/feed.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/feed.full.json b/fit/src/main/resources/V30/Customer/feed.full.json
index ea67b72..6685270 100644
--- a/fit/src/main/resources/V30/Customer/feed.full.json
+++ b/fit/src/main/resources/V30/Customer/feed.full.json
@@ -1,10 +1,10 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer",
   "value":
           [
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)",
               "odata.editLink": "Customer(-10)",
               "Orders@odata.navigationLinkUrl": "Customer(-10)/Orders",
               "Logins@odata.navigationLinkUrl": "Customer(-10)/Logins",
@@ -57,7 +57,7 @@
             },
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-9)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-9)",
               "odata.editLink": "Customer(-9)",
               "Orders@odata.navigationLinkUrl": "Customer(-9)/Orders",
               "Logins@odata.navigationLinkUrl": "Customer(-9)/Logins",

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/feed.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/feed.xml b/fit/src/main/resources/V30/Customer/feed.xml
index 9899f3b..faea77f 100644
--- a/fit/src/main/resources/V30/Customer/feed.xml
+++ b/fit/src/main/resources/V30/Customer/feed.xml
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer</id>
   <title type="text">Customer</title>
   <updated>2014-02-04T14:21:06Z</updated>
   <link rel="self" title="Customer" href="Customer" />
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Customer" href="Customer(-10)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="Customer(-10)/Orders" />
@@ -73,7 +73,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-9)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-9)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Customer" href="Customer(-9)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="Customer(-9)/Orders" />
@@ -700,5 +700,5 @@
       </m:properties>
     </content>
   </entry>
-  <link rel="next" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer?$skiptoken=-9" />
+  <link rel="next" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer?$skiptoken=-9" />
 </feed>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/filter/(indexof(PrimaryContactInfo.HomePhone.PhoneNumber,'ODataJClient') eq 1).full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/filter/(indexof(PrimaryContactInfo.HomePhone.PhoneNumber,'ODataJClient') eq 1).full.json b/fit/src/main/resources/V30/Customer/filter/(indexof(PrimaryContactInfo.HomePhone.PhoneNumber,'ODataJClient') eq 1).full.json
index 1741004..c389bd8 100644
--- a/fit/src/main/resources/V30/Customer/filter/(indexof(PrimaryContactInfo.HomePhone.PhoneNumber,'ODataJClient') eq 1).full.json	
+++ b/fit/src/main/resources/V30/Customer/filter/(indexof(PrimaryContactInfo.HomePhone.PhoneNumber,'ODataJClient') eq 1).full.json	
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer","value":[]}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer","value":[]}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/filter/(indexof(PrimaryContactInfo.HomePhone.PhoneNumber,'ODataJClient') eq 1).xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/filter/(indexof(PrimaryContactInfo.HomePhone.PhoneNumber,'ODataJClient') eq 1).xml b/fit/src/main/resources/V30/Customer/filter/(indexof(PrimaryContactInfo.HomePhone.PhoneNumber,'ODataJClient') eq 1).xml
index 0d459fe..62ce493 100644
--- a/fit/src/main/resources/V30/Customer/filter/(indexof(PrimaryContactInfo.HomePhone.PhoneNumber,'ODataJClient') eq 1).xml	
+++ b/fit/src/main/resources/V30/Customer/filter/(indexof(PrimaryContactInfo.HomePhone.PhoneNumber,'ODataJClient') eq 1).xml	
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer</id>
   <title type="text">Customer</title>
   <updated>2014-02-13T12:09:31Z</updated>
   <link rel="self" title="Customer" href="Customer" />


[02/20] [OLINGO-377] Removing unused cargo properties, upgrading Tomcat, renaming cargo.servlet.port to tomcat.servlet.port

Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/People/Microsoft.Test.OData.Services.ODataWCFService.Customer/feed.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/People/Microsoft.Test.OData.Services.ODataWCFService.Customer/feed.full.json b/fit/src/main/resources/V40/People/Microsoft.Test.OData.Services.ODataWCFService.Customer/feed.full.json
index 6bd8c02..7aa9a7c 100644
--- a/fit/src/main/resources/V40/People/Microsoft.Test.OData.Services.ODataWCFService.Customer/feed.full.json
+++ b/fit/src/main/resources/V40/People/Microsoft.Test.OData.Services.ODataWCFService.Customer/feed.full.json
@@ -1,9 +1,9 @@
 {
-  "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People",
+  "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People",
   "value": [{
       "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Customer",
-      "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)",
-      "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer",
+      "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)",
+      "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer",
       "PersonID": 1,
       "FirstName": "Bob",
       "LastName": "Cat",
@@ -35,24 +35,24 @@
       "Birthday": "1957-04-03T00:00:00Z",
       "TimeBetweenLastTwoOrders@odata.type": "#Duration",
       "TimeBetweenLastTwoOrders": "PT0.0000001S",
-      "Parent@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent/$ref",
-      "Parent@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent",
-      "Orders@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders/$ref",
-      "Orders@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders",
-      "Company@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company/$ref",
-      "Company@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company",
+      "Parent@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent/$ref",
+      "Parent@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent",
+      "Orders@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders/$ref",
+      "Orders@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders",
+      "Company@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company/$ref",
+      "Company@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company",
       "#Microsoft.Test.OData.Services.ODataWCFService.ResetAddress": {
         "title": "Microsoft.Test.OData.Services.ODataWCFService.ResetAddress",
-        "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress"
+        "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress"
       },
       "#Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress": {
         "title": "Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress",
-        "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress"
+        "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress"
       }
     }, {
       "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Customer",
-      "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)",
-      "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer",
+      "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)",
+      "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer",
       "PersonID": 2,
       "FirstName": "Jill",
       "LastName": "Jones",
@@ -78,19 +78,19 @@
       "Birthday": "1983-01-15T00:00:00Z",
       "TimeBetweenLastTwoOrders@odata.type": "#Duration",
       "TimeBetweenLastTwoOrders": "PT0.0000002S",
-      "Parent@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent/$ref",
-      "Parent@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent",
-      "Orders@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders/$ref",
-      "Orders@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders",
-      "Company@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company/$ref",
-      "Company@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company",
+      "Parent@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent/$ref",
+      "Parent@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent",
+      "Orders@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders/$ref",
+      "Orders@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders",
+      "Company@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company/$ref",
+      "Company@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company",
       "#Microsoft.Test.OData.Services.ODataWCFService.ResetAddress": {
         "title": "Microsoft.Test.OData.Services.ODataWCFService.ResetAddress",
-        "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress"
+        "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress"
       },
       "#Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress": {
         "title": "Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress",
-        "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress"
+        "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress"
       }
     }]
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/People/Microsoft.Test.OData.Services.ODataWCFService.Customer/feed.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/People/Microsoft.Test.OData.Services.ODataWCFService.Customer/feed.xml b/fit/src/main/resources/V40/People/Microsoft.Test.OData.Services.ODataWCFService.Customer/feed.xml
index 51e36d5..f67f879 100644
--- a/fit/src/main/resources/V40/People/Microsoft.Test.OData.Services.ODataWCFService.Customer/feed.xml
+++ b/fit/src/main/resources/V40/People/Microsoft.Test.OData.Services.ODataWCFService.Customer/feed.xml
@@ -19,17 +19,17 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.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://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.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://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People</id>
   <title/>
   <updated>2014-05-08T16:06:24Z</updated>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)</id>
     <category term="#Microsoft.Test.OData.Services.ODataWCFService.Customer" scheme="http://docs.oasis-open.org/odata/ns/scheme"/>
-    <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer"/>
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Parent" type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent"/>
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders"/>
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Company" type="application/atom+xml;type=entry" title="Company" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company"/>
+    <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer"/>
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Parent" type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent"/>
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders"/>
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Company" type="application/atom+xml;type=entry" title="Company" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company"/>
     <title/>
     <updated>2014-05-08T16:06:24Z</updated>
     <author>
@@ -69,12 +69,12 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)</id>
     <category term="#Microsoft.Test.OData.Services.ODataWCFService.Customer" scheme="http://docs.oasis-open.org/odata/ns/scheme"/>
-    <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer"/>
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Parent" type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent"/>
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders"/>
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Company" type="application/atom+xml;type=entry" title="Company" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company"/>
+    <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer"/>
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Parent" type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent"/>
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders"/>
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Company" type="application/atom+xml;type=entry" title="Company" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company"/>
     <title/>
     <updated>2014-05-08T16:06:24Z</updated>
     <author>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/People/feed.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/People/feed.full.json b/fit/src/main/resources/V40/People/feed.full.json
index bc40c75..3e0dda8 100644
--- a/fit/src/main/resources/V40/People/feed.full.json
+++ b/fit/src/main/resources/V40/People/feed.full.json
@@ -1,11 +1,11 @@
 {
-  "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People",
+  "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People",
   "value":
           [
             {
               "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Customer",
-              "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)",
-              "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer",
+              "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)",
+              "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer",
               "PersonID": 1,
               "FirstName": "Bob",
               "LastName": "Cat",
@@ -51,27 +51,27 @@
               "Birthday": "1957-04-03T00:00:00Z",
               "TimeBetweenLastTwoOrders@odata.type": "#Duration",
               "TimeBetweenLastTwoOrders": "PT0.0000001S",
-              "Parent@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent/$ref",
-              "Parent@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent",
-              "Orders@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders/$ref",
-              "Orders@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders",
-              "Company@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company/$ref",
-              "Company@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company",
+              "Parent@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent/$ref",
+              "Parent@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent",
+              "Orders@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders/$ref",
+              "Orders@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders",
+              "Company@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company/$ref",
+              "Company@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company",
               "#Microsoft.Test.OData.Services.ODataWCFService.ResetAddress":
                       {
                         "title": "Microsoft.Test.OData.Services.ODataWCFService.ResetAddress",
-                        "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress"
+                        "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress"
                       },
               "#Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress":
                       {
                         "title": "Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress",
-                        "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress"
+                        "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress"
                       }
             },
             {
               "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Customer",
-              "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)",
-              "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer",
+              "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)",
+              "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer",
               "PersonID": 2,
               "FirstName": "Jill",
               "LastName": "Jones",
@@ -108,27 +108,27 @@
               "Birthday": "1983-01-15T00:00:00Z",
               "TimeBetweenLastTwoOrders@odata.type": "#Duration",
               "TimeBetweenLastTwoOrders": "PT0.0000002S",
-              "Parent@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent/$ref",
-              "Parent@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent",
-              "Orders@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders/$ref",
-              "Orders@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders",
-              "Company@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company/$ref",
-              "Company@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company",
+              "Parent@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent/$ref",
+              "Parent@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent",
+              "Orders@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders/$ref",
+              "Orders@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders",
+              "Company@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company/$ref",
+              "Company@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company",
               "#Microsoft.Test.OData.Services.ODataWCFService.ResetAddress":
                       {
                         "title": "Microsoft.Test.OData.Services.ODataWCFService.ResetAddress",
-                        "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress"
+                        "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress"
                       },
               "#Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress":
                       {
                         "title": "Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress",
-                        "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress"
+                        "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress"
                       }
             },
             {
               "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Employee",
-              "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(3)",
-              "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(3)/Microsoft.Test.OData.Services.ODataWCFService.Employee",
+              "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(3)",
+              "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(3)/Microsoft.Test.OData.Services.ODataWCFService.Employee",
               "PersonID": 3,
               "FirstName": "Jacob",
               "LastName": "Zip",
@@ -188,25 +188,25 @@
                                           }
                                 }
                       },
-              "Parent@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(3)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Parent/$ref",
-              "Parent@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(3)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Parent",
-              "Company@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(3)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Company/$ref",
-              "Company@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(3)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Company",
+              "Parent@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(3)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Parent/$ref",
+              "Parent@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(3)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Parent",
+              "Company@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(3)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Company/$ref",
+              "Company@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(3)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Company",
               "#Microsoft.Test.OData.Services.ODataWCFService.ResetAddress":
                       {
                         "title": "Microsoft.Test.OData.Services.ODataWCFService.ResetAddress",
-                        "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(3)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress"
+                        "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(3)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress"
                       },
               "#Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress":
                       {
                         "title": "Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress",
-                        "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(3)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress"
+                        "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(3)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress"
                       }
             },
             {
               "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Employee",
-              "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(4)",
-              "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(4)/Microsoft.Test.OData.Services.ODataWCFService.Employee",
+              "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(4)",
+              "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(4)/Microsoft.Test.OData.Services.ODataWCFService.Employee",
               "PersonID": 4,
               "FirstName": "Elmo",
               "LastName": "Rogers",
@@ -263,25 +263,25 @@
                                           }
                                 }
                       },
-              "Parent@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(4)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Parent/$ref",
-              "Parent@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(4)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Parent",
-              "Company@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(4)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Company/$ref",
-              "Company@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(4)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Company",
+              "Parent@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(4)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Parent/$ref",
+              "Parent@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(4)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Parent",
+              "Company@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(4)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Company/$ref",
+              "Company@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(4)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Company",
               "#Microsoft.Test.OData.Services.ODataWCFService.ResetAddress":
                       {
                         "title": "Microsoft.Test.OData.Services.ODataWCFService.ResetAddress",
-                        "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(4)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress"
+                        "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(4)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress"
                       },
               "#Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress":
                       {
                         "title": "Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress",
-                        "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(4)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress"
+                        "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(4)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress"
                       }
             },
             {
               "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Person",
-              "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)",
-              "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)",
+              "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)",
+              "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)",
               "PersonID": 5,
               "FirstName": "Peter",
               "LastName": "Bee",
@@ -315,17 +315,17 @@
                       [
                         "def@test.msn"
                       ],
-              "Parent@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Parent/$ref",
-              "Parent@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Parent",
+              "Parent@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Parent/$ref",
+              "Parent@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Parent",
               "#Microsoft.Test.OData.Services.ODataWCFService.ResetAddress":
                       {
                         "title": "Microsoft.Test.OData.Services.ODataWCFService.ResetAddress",
-                        "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress"
+                        "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress"
                       },
               "#Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress":
                       {
                         "title": "Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress",
-                        "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress"
+                        "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress"
                       }
             }
           ],

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/People/feed.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/People/feed.xml b/fit/src/main/resources/V40/People/feed.xml
index 397bd2d..ee58f0a 100644
--- a/fit/src/main/resources/V40/People/feed.xml
+++ b/fit/src/main/resources/V40/People/feed.xml
@@ -19,22 +19,22 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/" 
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.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://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People</id>
+      m:context="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People</id>
   <title />
   <updated>2014-03-20T14:31:00Z</updated>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)</id>
     <category term="#Microsoft.Test.OData.Services.ODataWCFService.Customer" scheme="http://docs.oasis-open.org/odata/ns/scheme" />
-    <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Parent" type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Company" type="application/atom+xml;type=entry" title="Company" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company" />
+    <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Parent" type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Company" type="application/atom+xml;type=entry" title="Company" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company" />
     <title />
     <updated>2014-03-20T14:31:00Z</updated>
     <author>
@@ -70,12 +70,12 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)</id>
     <category term="#Microsoft.Test.OData.Services.ODataWCFService.Customer" scheme="http://docs.oasis-open.org/odata/ns/scheme" />
-    <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Parent" type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Company" type="application/atom+xml;type=entry" title="Company" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company" />
+    <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Parent" type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Company" type="application/atom+xml;type=entry" title="Company" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company" />
     <title />
     <updated>2014-03-20T14:31:00Z</updated>
     <author>
@@ -102,11 +102,11 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(3)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(3)</id>
     <category term="#Microsoft.Test.OData.Services.ODataWCFService.Employee" scheme="http://docs.oasis-open.org/odata/ns/scheme" />
-    <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(3)/Microsoft.Test.OData.Services.ODataWCFService.Employee" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Parent" type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(3)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Parent" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Company" type="application/atom+xml;type=entry" title="Company" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(3)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Company" />
+    <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(3)/Microsoft.Test.OData.Services.ODataWCFService.Employee" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Parent" type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(3)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Parent" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Company" type="application/atom+xml;type=entry" title="Company" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(3)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Company" />
     <title />
     <updated>2014-03-20T14:31:00Z</updated>
     <author>
@@ -144,11 +144,11 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(4)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(4)</id>
     <category term="#Microsoft.Test.OData.Services.ODataWCFService.Employee" scheme="http://docs.oasis-open.org/odata/ns/scheme" />
-    <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(4)/Microsoft.Test.OData.Services.ODataWCFService.Employee" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Parent" type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(4)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Parent" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Company" type="application/atom+xml;type=entry" title="Company" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(4)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Company" />
+    <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(4)/Microsoft.Test.OData.Services.ODataWCFService.Employee" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Parent" type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(4)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Parent" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Company" type="application/atom+xml;type=entry" title="Company" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(4)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Company" />
     <title />
     <updated>2014-03-20T14:31:00Z</updated>
     <author>
@@ -185,10 +185,10 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)</id>
     <category term="#Microsoft.Test.OData.Services.ODataWCFService.Person" scheme="http://docs.oasis-open.org/odata/ns/scheme" />
-    <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Parent" type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Parent" />
+    <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Parent" type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Parent" />
     <title />
     <updated>2014-03-20T14:31:00Z</updated>
     <author>
@@ -215,5 +215,5 @@
       </m:properties>
     </content>
   </entry>
-  <link rel="next" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People?$skiptoken=5"/>
+  <link rel="next" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People?$skiptoken=5"/>
 </feed>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/People/filter/(PersonID eq 5).full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/People/filter/(PersonID eq 5).full.json b/fit/src/main/resources/V40/People/filter/(PersonID eq 5).full.json
index 485fd66..d01cd41 100644
--- a/fit/src/main/resources/V40/People/filter/(PersonID eq 5).full.json	
+++ b/fit/src/main/resources/V40/People/filter/(PersonID eq 5).full.json	
@@ -1,11 +1,11 @@
 {
-  "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People",
+  "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People",
   "value":
           [
             {
               "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Customer",
-              "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)",
-              "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Microsoft.Test.OData.Services.ODataWCFService.Customer",
+              "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)",
+              "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Microsoft.Test.OData.Services.ODataWCFService.Customer",
               "PersonID": 5,
               "FirstName": "Bob",
               "LastName": "Cat",

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/People/filter/(PersonID eq 5).xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/People/filter/(PersonID eq 5).xml b/fit/src/main/resources/V40/People/filter/(PersonID eq 5).xml
index 2415280..3666a16 100644
--- a/fit/src/main/resources/V40/People/filter/(PersonID eq 5).xml	
+++ b/fit/src/main/resources/V40/People/filter/(PersonID eq 5).xml	
@@ -19,17 +19,17 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.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://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.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://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People</id>
   <title />
   <updated>2014-04-24T11:35:03Z</updated>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)</id>
     <category term="#Microsoft.Test.OData.Services.ODataWCFService.Customer" scheme="http://docs.oasis-open.org/odata/ns/scheme" />
-    <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Microsoft.Test.OData.Services.ODataWCFService.Customer" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Parent" type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Company" type="application/atom+xml;type=entry" title="Company" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company" />
+    <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Microsoft.Test.OData.Services.ODataWCFService.Customer" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Parent" type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Company" type="application/atom+xml;type=entry" title="Company" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company" />
     <title />
     <updated>2014-04-24T11:35:03Z</updated>
     <author>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/People/filter/(PersonID lt 3).full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/People/filter/(PersonID lt 3).full.json b/fit/src/main/resources/V40/People/filter/(PersonID lt 3).full.json
index 5133aa4..f99e62f 100644
--- a/fit/src/main/resources/V40/People/filter/(PersonID lt 3).full.json	
+++ b/fit/src/main/resources/V40/People/filter/(PersonID lt 3).full.json	
@@ -1,11 +1,11 @@
 {
-  "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People",
+  "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People",
   "value":
           [
             {
               "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Customer",
-              "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)",
-              "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer",
+              "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)",
+              "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer",
               "PersonID": 1,
               "FirstName": "Bob",
               "LastName": "Cat",
@@ -53,8 +53,8 @@
             },
             {
               "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Customer",
-              "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)",
-              "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer",
+              "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)",
+              "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer",
               "PersonID": 2,
               "FirstName": "Jill",
               "LastName": "Jones",

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/People/filter/(PersonID lt 3).xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/People/filter/(PersonID lt 3).xml b/fit/src/main/resources/V40/People/filter/(PersonID lt 3).xml
index 90018f2..4ad33a3 100644
--- a/fit/src/main/resources/V40/People/filter/(PersonID lt 3).xml	
+++ b/fit/src/main/resources/V40/People/filter/(PersonID lt 3).xml	
@@ -19,17 +19,17 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.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://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.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://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People</id>
   <title />
   <updated>2014-04-24T11:33:37Z</updated>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)</id>
     <category term="#Microsoft.Test.OData.Services.ODataWCFService.Customer" scheme="http://docs.oasis-open.org/odata/ns/scheme" />
-    <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Parent" type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Company" type="application/atom+xml;type=entry" title="Company" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company" />
+    <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Parent" type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Company" type="application/atom+xml;type=entry" title="Company" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company" />
     <title />
     <updated>2014-04-24T11:33:37Z</updated>
     <author>
@@ -69,12 +69,12 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)</id>
     <category term="#Microsoft.Test.OData.Services.ODataWCFService.Customer" scheme="http://docs.oasis-open.org/odata/ns/scheme" />
-    <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Parent" type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Company" type="application/atom+xml;type=entry" title="Company" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company" />
+    <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Parent" type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Company" type="application/atom+xml;type=entry" title="Company" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company" />
     <title />
     <updated>2014-04-24T11:33:37Z</updated>
     <author>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/People/orderby/PersonID desc/filter/(PersonID lt 3).full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/People/orderby/PersonID desc/filter/(PersonID lt 3).full.json b/fit/src/main/resources/V40/People/orderby/PersonID desc/filter/(PersonID lt 3).full.json
index e062a68..dddd06c 100644
--- a/fit/src/main/resources/V40/People/orderby/PersonID desc/filter/(PersonID lt 3).full.json	
+++ b/fit/src/main/resources/V40/People/orderby/PersonID desc/filter/(PersonID lt 3).full.json	
@@ -1,11 +1,11 @@
 {
-  "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People",
+  "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People",
   "value":
           [
             {
               "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Customer",
-              "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)",
-              "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer",
+              "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)",
+              "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer",
               "PersonID": 2,
               "FirstName": "Jill",
               "LastName": "Jones",
@@ -40,8 +40,8 @@
             },
             {
               "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Customer",
-              "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)",
-              "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer",
+              "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)",
+              "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer",
               "PersonID": 1,
               "FirstName": "Bob",
               "LastName": "Cat",

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/People/orderby/PersonID desc/filter/(PersonID lt 3).xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/People/orderby/PersonID desc/filter/(PersonID lt 3).xml b/fit/src/main/resources/V40/People/orderby/PersonID desc/filter/(PersonID lt 3).xml
index 261fbb0..ed632ef 100644
--- a/fit/src/main/resources/V40/People/orderby/PersonID desc/filter/(PersonID lt 3).xml	
+++ b/fit/src/main/resources/V40/People/orderby/PersonID desc/filter/(PersonID lt 3).xml	
@@ -19,17 +19,17 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.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://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.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://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People</id>
   <title />
   <updated>2014-04-24T11:35:03Z</updated>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)</id>
     <category term="#Microsoft.Test.OData.Services.ODataWCFService.Customer" scheme="http://docs.oasis-open.org/odata/ns/scheme" />
-    <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Parent" type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Company" type="application/atom+xml;type=entry" title="Company" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company" />
+    <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Parent" type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Company" type="application/atom+xml;type=entry" title="Company" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company" />
     <title />
     <updated>2014-04-24T11:35:03Z</updated>
     <author>
@@ -56,12 +56,12 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)</id>
     <category term="#Microsoft.Test.OData.Services.ODataWCFService.Customer" scheme="http://docs.oasis-open.org/odata/ns/scheme" />
-    <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Parent" type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Company" type="application/atom+xml;type=entry" title="Company" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company" />
+    <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Parent" type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Company" type="application/atom+xml;type=entry" title="Company" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company" />
     <title />
     <updated>2014-04-24T11:35:03Z</updated>
     <author>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/People/skiptoken/5.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/People/skiptoken/5.full.json b/fit/src/main/resources/V40/People/skiptoken/5.full.json
index a7d768e..13e6195 100644
--- a/fit/src/main/resources/V40/People/skiptoken/5.full.json
+++ b/fit/src/main/resources/V40/People/skiptoken/5.full.json
@@ -1,11 +1,11 @@
 {
-  "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People",
+  "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People",
   "value":
           [
             {
               "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Person",
-              "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(6)",
-              "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(6)",
+              "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(6)",
+              "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(6)",
               "PersonID": 6,
               "FirstName": "Peter",
               "LastName": "Bee",
@@ -39,17 +39,17 @@
                       [
                         "def@test.msn"
                       ],
-              "Parent@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Parent/$ref",
-              "Parent@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Parent",
+              "Parent@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Parent/$ref",
+              "Parent@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Parent",
               "#Microsoft.Test.OData.Services.ODataWCFService.ResetAddress":
                       {
                         "title": "Microsoft.Test.OData.Services.ODataWCFService.ResetAddress",
-                        "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress"
+                        "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress"
                       },
               "#Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress":
                       {
                         "title": "Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress",
-                        "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress"
+                        "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress"
                       }
             }
           ]

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/People/skiptoken/5.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/People/skiptoken/5.xml b/fit/src/main/resources/V40/People/skiptoken/5.xml
index 909ac69..13e290a 100644
--- a/fit/src/main/resources/V40/People/skiptoken/5.xml
+++ b/fit/src/main/resources/V40/People/skiptoken/5.xml
@@ -19,20 +19,20 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/" 
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.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://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People</id>
+      m:context="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People</id>
   <title />
   <updated>2014-03-20T14:31:00Z</updated>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)</id>
     <category term="#Microsoft.Test.OData.Services.ODataWCFService.Person" scheme="http://docs.oasis-open.org/odata/ns/scheme" />
-    <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(6)" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Parent" type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(6)/Parent" />
+    <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(6)" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Parent" type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(6)/Parent" />
     <title />
     <updated>2014-03-20T14:31:00Z</updated>
     <author>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/PersonDetails/1/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/PersonDetails/1/entity.full.json b/fit/src/main/resources/V40/PersonDetails/1/entity.full.json
index aa3ee30..32f7baa 100644
--- a/fit/src/main/resources/V40/PersonDetails/1/entity.full.json
+++ b/fit/src/main/resources/V40/PersonDetails/1/entity.full.json
@@ -1,7 +1,7 @@
 {
-  "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#ProductDetail/$entity",
+  "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#ProductDetail/$entity",
   "@odata.type": "ODataDemo.ProductDetail",
-  "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ProductDetails(1)",
+  "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ProductDetails(1)",
   "@odata.editLink": "ProductDetails(1)",
   "Photo@odata.mediaEditLink": "ProductDetails(1)/Photo",
   "PersonID": 12

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/PersonDetails/1/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/PersonDetails/1/entity.xml b/fit/src/main/resources/V40/PersonDetails/1/entity.xml
index 3c2d219..58fb597 100644
--- a/fit/src/main/resources/V40/PersonDetails/1/entity.xml
+++ b/fit/src/main/resources/V40/PersonDetails/1/entity.xml
@@ -19,14 +19,14 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/" 
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.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://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#ProductDetail/$entity">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ProductDetails(1)</id>
+       m:context="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#ProductDetail/$entity">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ProductDetails(1)</id>
   <category term="#ODataDemo.ProductDetail" scheme="http://docs.oasis-open.org/odata/ns/scheme" />
   <link rel="edit" title="ProductDetails" href="ProductDetails(1)" />
   <link rel="http://docs.oasis-open.org/odata/ns/edit-media/Photo" title="Photo" href="ProductDetails(1)/Photo" />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/ProductDetails/6 1/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/ProductDetails/6 1/entity.full.json b/fit/src/main/resources/V40/ProductDetails/6 1/entity.full.json
index c72d79e..7c34470 100644
--- a/fit/src/main/resources/V40/ProductDetails/6 1/entity.full.json	
+++ b/fit/src/main/resources/V40/ProductDetails/6 1/entity.full.json	
@@ -1,19 +1,19 @@
 {
-  "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#ProductDetails/$entity",
+  "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#ProductDetails/$entity",
   "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.ProductDetail",
-  "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)",
-  "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)",
+  "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)",
+  "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)",
   "ProductID": 6,
   "ProductDetailID": 1,
   "ProductName": "Candy",
   "Description": "sweet snack",
-  "RelatedProduct@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)/RelatedProduct/$ref",
-  "RelatedProduct@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)/RelatedProduct",
-  "Reviews@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)/Reviews/$ref",
-  "Reviews@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)/Reviews",
+  "RelatedProduct@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)/RelatedProduct/$ref",
+  "RelatedProduct@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)/RelatedProduct",
+  "Reviews@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)/Reviews/$ref",
+  "Reviews@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)/Reviews",
   "#Microsoft.Test.OData.Services.ODataWCFService.GetRelatedProduct":
           {
             "title": "Microsoft.Test.OData.Services.ODataWCFService.GetRelatedProduct",
-            "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)/Microsoft.Test.OData.Services.ODataWCFService.GetRelatedProduct"
+            "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)/Microsoft.Test.OData.Services.ODataWCFService.GetRelatedProduct"
           }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/ProductDetails/6 1/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/ProductDetails/6 1/entity.xml b/fit/src/main/resources/V40/ProductDetails/6 1/entity.xml
index fe694ec..7466fa0 100644
--- a/fit/src/main/resources/V40/ProductDetails/6 1/entity.xml	
+++ b/fit/src/main/resources/V40/ProductDetails/6 1/entity.xml	
@@ -19,20 +19,20 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.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://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#ProductDetails/$entity">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.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://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#ProductDetails/$entity">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)</id>
   <category term="#Microsoft.Test.OData.Services.ODataWCFService.ProductDetail" scheme="http://docs.oasis-open.org/odata/ns/scheme" />
-  <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)" />
-  <link rel="http://docs.oasis-open.org/odata/ns/related/RelatedProduct" type="application/atom+xml;type=entry" title="RelatedProduct" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)/RelatedProduct" />
-  <link rel="http://docs.oasis-open.org/odata/ns/related/Reviews" type="application/atom+xml;type=feed" title="Reviews" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)/Reviews" />
+  <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)" />
+  <link rel="http://docs.oasis-open.org/odata/ns/related/RelatedProduct" type="application/atom+xml;type=entry" title="RelatedProduct" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)/RelatedProduct" />
+  <link rel="http://docs.oasis-open.org/odata/ns/related/Reviews" type="application/atom+xml;type=feed" title="Reviews" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)/Reviews" />
   <title />
   <updated>2014-03-24T17:23:51Z</updated>
   <author>
     <name />
   </author>
-  <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.GetRelatedProduct" 
+  <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.GetRelatedProduct" 
             title="Microsoft.Test.OData.Services.ODataWCFService.GetRelatedProduct" 
-            target="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)/Microsoft.Test.OData.Services.ODataWCFService.GetRelatedProduct"/>
+            target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)/Microsoft.Test.OData.Services.ODataWCFService.GetRelatedProduct"/>
   <content type="application/xml">
     <m:properties>
       <d:ProductID m:type="Int32">6</d:ProductID>


[04/20] [OLINGO-377] Removing unused cargo properties, upgrading Tomcat, renaming cargo.servlet.port to tomcat.servlet.port

Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments.full.json b/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments.full.json
index bb07a1a..abb1570 100644
--- a/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments.full.json
+++ b/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments.full.json
@@ -1,5 +1,5 @@
 {
-  "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(101)/MyPaymentInstruments",
+  "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(101)/MyPaymentInstruments",
   "value": [{
       "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument",
       "@odata.id": "Accounts(101)/MyPaymentInstruments(101901)",
@@ -8,12 +8,12 @@
       "FriendlyName": "101 first PI",
       "CreatedDate@odata.type": "#DateTimeOffset",
       "CreatedDate": "2014-04-09T00:00:00Z",
-      "TheStoredPI@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/TheStoredPI/$ref",
-      "TheStoredPI@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/TheStoredPI",
-      "BillingStatements@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BillingStatements/$ref",
-      "BillingStatements@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BillingStatements",
-      "BackupStoredPI@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BackupStoredPI/$ref",
-      "BackupStoredPI@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BackupStoredPI"
+      "TheStoredPI@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/TheStoredPI/$ref",
+      "TheStoredPI@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/TheStoredPI",
+      "BillingStatements@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BillingStatements/$ref",
+      "BillingStatements@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BillingStatements",
+      "BackupStoredPI@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BackupStoredPI/$ref",
+      "BackupStoredPI@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BackupStoredPI"
     }, {
       "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI",
       "@odata.id": "Accounts(101)/MyPaymentInstruments(101902)",
@@ -28,14 +28,14 @@
       "Balance": 100.0,
       "ExperationDate@odata.type": "#DateTimeOffset",
       "ExperationDate": "2022-11-01T00:00:00Z",
-      "TheStoredPI@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI/$ref",
-      "TheStoredPI@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI",
-      "BillingStatements@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements/$ref",
-      "BillingStatements@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements",
-      "BackupStoredPI@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI/$ref",
-      "BackupStoredPI@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI",
-      "CreditRecords@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords/$ref",
-      "CreditRecords@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords"
+      "TheStoredPI@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI/$ref",
+      "TheStoredPI@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI",
+      "BillingStatements@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements/$ref",
+      "BillingStatements@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements",
+      "BackupStoredPI@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI/$ref",
+      "BackupStoredPI@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI",
+      "CreditRecords@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords/$ref",
+      "CreditRecords@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/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)",
@@ -50,13 +50,13 @@
       "Balance": 300.0,
       "ExperationDate@odata.type": "#DateTimeOffset",
       "ExperationDate": "2022-10-02T00:00:00Z",
-      "TheStoredPI@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI/$ref",
-      "TheStoredPI@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI",
-      "BillingStatements@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements/$ref",
-      "BillingStatements@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements",
-      "BackupStoredPI@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI/$ref",
-      "BackupStoredPI@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI",
-      "CreditRecords@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords/$ref",
-      "CreditRecords@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords"
+      "TheStoredPI@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI/$ref",
+      "TheStoredPI@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI",
+      "BillingStatements@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements/$ref",
+      "BillingStatements@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements",
+      "BackupStoredPI@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI/$ref",
+      "BackupStoredPI@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI",
+      "CreditRecords@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords/$ref",
+      "CreditRecords@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords"
     }]
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments.xml b/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments.xml
index 0c74062..4e6fbd7 100644
--- a/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments.xml
+++ b/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments.xml
@@ -19,15 +19,15 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.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://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(101)/MyPaymentInstruments">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/MyPaymentInstruments</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.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://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(101)/MyPaymentInstruments">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/MyPaymentInstruments</id>
   <title/>
   <updated>2014-04-14T12:45:33Z</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="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/TheStoredPI"/>
-    <link rel="http://docs.oasis-open.org/odata/ns/related/BillingStatements" type="application/atom+xml;type=feed" title="BillingStatements" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BillingStatements"/>
-    <link rel="http://docs.oasis-open.org/odata/ns/related/BackupStoredPI" type="application/atom+xml;type=entry" title="BackupStoredPI" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BackupStoredPI"/>
+    <link rel="http://docs.oasis-open.org/odata/ns/related/TheStoredPI" type="application/atom+xml;type=entry" title="TheStoredPI" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/TheStoredPI"/>
+    <link rel="http://docs.oasis-open.org/odata/ns/related/BillingStatements" type="application/atom+xml;type=feed" title="BillingStatements" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BillingStatements"/>
+    <link rel="http://docs.oasis-open.org/odata/ns/related/BackupStoredPI" type="application/atom+xml;type=entry" title="BackupStoredPI" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BackupStoredPI"/>
     <id/>
     <title/>
     <updated>2014-04-14T12:45:33Z</updated>
@@ -44,10 +44,10 @@
   </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="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI"/>
-    <link rel="http://docs.oasis-open.org/odata/ns/related/BillingStatements" type="application/atom+xml;type=feed" title="BillingStatements" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements"/>
-    <link rel="http://docs.oasis-open.org/odata/ns/related/BackupStoredPI" type="application/atom+xml;type=entry" title="BackupStoredPI" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI"/>
-    <link rel="http://docs.oasis-open.org/odata/ns/related/CreditRecords" type="application/atom+xml;type=feed" title="CreditRecords" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords"/>
+    <link rel="http://docs.oasis-open.org/odata/ns/related/TheStoredPI" type="application/atom+xml;type=entry" title="TheStoredPI" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI"/>
+    <link rel="http://docs.oasis-open.org/odata/ns/related/BillingStatements" type="application/atom+xml;type=feed" title="BillingStatements" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements"/>
+    <link rel="http://docs.oasis-open.org/odata/ns/related/BackupStoredPI" type="application/atom+xml;type=entry" title="BackupStoredPI" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI"/>
+    <link rel="http://docs.oasis-open.org/odata/ns/related/CreditRecords" type="application/atom+xml;type=feed" title="CreditRecords" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords"/>
     <id/>
     <title/>
     <updated>2014-04-14T12:45:33Z</updated>
@@ -69,10 +69,10 @@
   </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="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI"/>
-    <link rel="http://docs.oasis-open.org/odata/ns/related/BillingStatements" type="application/atom+xml;type=feed" title="BillingStatements" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements"/>
-    <link rel="http://docs.oasis-open.org/odata/ns/related/BackupStoredPI" type="application/atom+xml;type=entry" title="BackupStoredPI" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI"/>
-    <link rel="http://docs.oasis-open.org/odata/ns/related/CreditRecords" type="application/atom+xml;type=feed" title="CreditRecords" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords"/>
+    <link rel="http://docs.oasis-open.org/odata/ns/related/TheStoredPI" type="application/atom+xml;type=entry" title="TheStoredPI" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI"/>
+    <link rel="http://docs.oasis-open.org/odata/ns/related/BillingStatements" type="application/atom+xml;type=feed" title="BillingStatements" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements"/>
+    <link rel="http://docs.oasis-open.org/odata/ns/related/BackupStoredPI" type="application/atom+xml;type=entry" title="BackupStoredPI" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI"/>
+    <link rel="http://docs.oasis-open.org/odata/ns/related/CreditRecords" type="application/atom+xml;type=feed" title="CreditRecords" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords"/>
     <id/>
     <title/>
     <updated>2014-04-14T12:45:33Z</updated>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Accounts/102/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Accounts/102/entity.full.json b/fit/src/main/resources/V40/Accounts/102/entity.full.json
index 1682135..13f7c16 100644
--- a/fit/src/main/resources/V40/Accounts/102/entity.full.json
+++ b/fit/src/main/resources/V40/Accounts/102/entity.full.json
@@ -1,8 +1,8 @@
 {
-  "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts/$entity",
+  "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts/$entity",
   "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Account",
-  "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)",
-  "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)",
+  "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)",
+  "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)",
   "AccountID": 102,
   "Country": "US",
   "AccountInfo": {
@@ -11,24 +11,24 @@
     "LastName": "Green",
     "MiddleName": "Hood"
   },
-  "MyGiftCard@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyGiftCard/$ref",
-  "MyGiftCard@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyGiftCard",
-  "MyPaymentInstruments@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments/$ref",
-  "MyPaymentInstruments@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments",
-  "ActiveSubscriptions@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/ActiveSubscriptions/$ref",
-  "ActiveSubscriptions@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/ActiveSubscriptions",
-  "AvailableSubscriptionTemplatess@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/AvailableSubscriptionTemplatess/$ref",
-  "AvailableSubscriptionTemplatess@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/AvailableSubscriptionTemplatess",
+  "MyGiftCard@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyGiftCard/$ref",
+  "MyGiftCard@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyGiftCard",
+  "MyPaymentInstruments@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments/$ref",
+  "MyPaymentInstruments@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments",
+  "ActiveSubscriptions@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/ActiveSubscriptions/$ref",
+  "ActiveSubscriptions@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/ActiveSubscriptions",
+  "AvailableSubscriptionTemplatess@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/AvailableSubscriptionTemplatess/$ref",
+  "AvailableSubscriptionTemplatess@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/AvailableSubscriptionTemplatess",
   "#Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI": {
     "title": "Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI",
-    "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI"
+    "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI"
   },
   "#Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI": {
     "title": "Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI",
-    "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI"
+    "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI"
   },
   "#Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo": {
     "title": "Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo",
-    "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo"
+    "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo"
   }
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Accounts/102/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Accounts/102/entity.xml b/fit/src/main/resources/V40/Accounts/102/entity.xml
index 0b9cc63..538fcea 100644
--- a/fit/src/main/resources/V40/Accounts/102/entity.xml
+++ b/fit/src/main/resources/V40/Accounts/102/entity.xml
@@ -19,28 +19,28 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.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://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts/$entity">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.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://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts/$entity">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)</id>
   <category term="#Microsoft.Test.OData.Services.ODataWCFService.Account" scheme="http://docs.oasis-open.org/odata/ns/scheme"/>
-  <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)"/>
-  <link rel="http://docs.oasis-open.org/odata/ns/related/MyGiftCard" type="application/atom+xml;type=entry" title="MyGiftCard" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyGiftCard"/>
-  <link rel="http://docs.oasis-open.org/odata/ns/related/MyPaymentInstruments" type="application/atom+xml;type=feed" title="MyPaymentInstruments" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments"/>
-  <link rel="http://docs.oasis-open.org/odata/ns/related/ActiveSubscriptions" type="application/atom+xml;type=feed" title="ActiveSubscriptions" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/ActiveSubscriptions"/>
-  <link rel="http://docs.oasis-open.org/odata/ns/related/AvailableSubscriptionTemplatess" type="application/atom+xml;type=feed" title="AvailableSubscriptionTemplatess" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/AvailableSubscriptionTemplatess"/>
+  <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)"/>
+  <link rel="http://docs.oasis-open.org/odata/ns/related/MyGiftCard" type="application/atom+xml;type=entry" title="MyGiftCard" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyGiftCard"/>
+  <link rel="http://docs.oasis-open.org/odata/ns/related/MyPaymentInstruments" type="application/atom+xml;type=feed" title="MyPaymentInstruments" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments"/>
+  <link rel="http://docs.oasis-open.org/odata/ns/related/ActiveSubscriptions" type="application/atom+xml;type=feed" title="ActiveSubscriptions" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/ActiveSubscriptions"/>
+  <link rel="http://docs.oasis-open.org/odata/ns/related/AvailableSubscriptionTemplatess" type="application/atom+xml;type=feed" title="AvailableSubscriptionTemplatess" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/AvailableSubscriptionTemplatess"/>
   <title/>
   <updated>2014-04-14T12:45:00Z</updated>
   <author>
     <name/>
   </author>
-  <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI" 
+  <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI" 
             title="Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI" 
-            target="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI"/>
-  <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI" 
+            target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI"/>
+  <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI" 
             title="Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI" 
-            target="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI"/>
-  <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo" 
+            target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI"/>
+  <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo" 
             title="Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo" 
-            target="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo"/>
+            target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo"/>
   <content type="application/xml">
     <m:properties>
       <d:AccountID m:type="Int32">102</d:AccountID>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Accounts/102/links/MyGiftCard.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Accounts/102/links/MyGiftCard.full.json b/fit/src/main/resources/V40/Accounts/102/links/MyGiftCard.full.json
index cf9d18a..e12ba87 100644
--- a/fit/src/main/resources/V40/Accounts/102/links/MyGiftCard.full.json
+++ b/fit/src/main/resources/V40/Accounts/102/links/MyGiftCard.full.json
@@ -1,5 +1,5 @@
 {
-  "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(102)/MyGiftCard/$entity",
+  "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(102)/MyGiftCard/$entity",
   "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.GiftCard",
   "@odata.id": "Accounts(102)/MyGiftCard",
   "@odata.editLink": "Accounts(102)/MyGiftCard",
@@ -10,6 +10,6 @@
   "ExperationDate": "2013-12-30T00:00:00Z",
   "#Microsoft.Test.OData.Services.ODataWCFService.GetActualAmount": {
     "title": "Microsoft.Test.OData.Services.ODataWCFService.GetActualAmount",
-    "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyGiftCard/Microsoft.Test.OData.Services.ODataWCFService.GetActualAmount"
+    "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyGiftCard/Microsoft.Test.OData.Services.ODataWCFService.GetActualAmount"
   }
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Accounts/102/links/MyGiftCard.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Accounts/102/links/MyGiftCard.xml b/fit/src/main/resources/V40/Accounts/102/links/MyGiftCard.xml
index b1927b3..5757156 100644
--- a/fit/src/main/resources/V40/Accounts/102/links/MyGiftCard.xml
+++ b/fit/src/main/resources/V40/Accounts/102/links/MyGiftCard.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.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://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(102)/MyGiftCard/$entity">
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.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://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(102)/MyGiftCard/$entity">
   <category term="#Microsoft.Test.OData.Services.ODataWCFService.GiftCard" scheme="http://docs.oasis-open.org/odata/ns/scheme" />
   <id />
   <title />
@@ -27,9 +27,9 @@
   <author>
     <name />
   </author>
-  <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.GetActualAmount" 
+  <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.GetActualAmount" 
             title="Microsoft.Test.OData.Services.ODataWCFService.GetActualAmount" 
-            target="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyGiftCard/Microsoft.Test.OData.Services.ODataWCFService.GetActualAmount"/>
+            target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyGiftCard/Microsoft.Test.OData.Services.ODataWCFService.GetActualAmount"/>
   <content type="application/xml">
     <m:properties>
       <d:GiftCardID m:type="Int32">301</d:GiftCardID>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments(102901).full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments(102901).full.json b/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments(102901).full.json
index 70c96de..533c3ef 100644
--- a/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments(102901).full.json
+++ b/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments(102901).full.json
@@ -1,5 +1,5 @@
 {
-  "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(102)/MyPaymentInstruments/$entity",
+  "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(102)/MyPaymentInstruments/$entity",
   "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument",
   "@odata.id": "Accounts(102)/MyPaymentInstruments(102901)",
   "@odata.editLink": "Accounts(102)/MyPaymentInstruments(102901)",
@@ -7,10 +7,10 @@
   "FriendlyName": "102 first PI",
   "CreatedDate@odata.type": "#DateTimeOffset",
   "CreatedDate": "2014-04-09T00:00:00Z",
-  "TheStoredPI@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/TheStoredPI/$ref",
-  "TheStoredPI@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/TheStoredPI",
-  "BillingStatements@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BillingStatements/$ref",
-  "BillingStatements@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BillingStatements",
-  "BackupStoredPI@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BackupStoredPI/$ref",
-  "BackupStoredPI@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BackupStoredPI"
+  "TheStoredPI@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/TheStoredPI/$ref",
+  "TheStoredPI@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/TheStoredPI",
+  "BillingStatements@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BillingStatements/$ref",
+  "BillingStatements@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BillingStatements",
+  "BackupStoredPI@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BackupStoredPI/$ref",
+  "BackupStoredPI@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BackupStoredPI"
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments(102901).xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments(102901).xml b/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments(102901).xml
index e519217..8d9fbd0 100644
--- a/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments(102901).xml
+++ b/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments(102901).xml
@@ -19,11 +19,11 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.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://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(102)/MyPaymentInstruments/$entity">
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.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://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(102)/MyPaymentInstruments/$entity">
   <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="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/TheStoredPI"/>
-  <link rel="http://docs.oasis-open.org/odata/ns/related/BillingStatements" type="application/atom+xml;type=feed" title="BillingStatements" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BillingStatements"/>
-  <link rel="http://docs.oasis-open.org/odata/ns/related/BackupStoredPI" type="application/atom+xml;type=entry" title="BackupStoredPI" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BackupStoredPI"/>
+  <link rel="http://docs.oasis-open.org/odata/ns/related/TheStoredPI" type="application/atom+xml;type=entry" title="TheStoredPI" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/TheStoredPI"/>
+  <link rel="http://docs.oasis-open.org/odata/ns/related/BillingStatements" type="application/atom+xml;type=feed" title="BillingStatements" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BillingStatements"/>
+  <link rel="http://docs.oasis-open.org/odata/ns/related/BackupStoredPI" type="application/atom+xml;type=entry" title="BackupStoredPI" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BackupStoredPI"/>
   <id/>
   <title/>
   <updated>2014-04-14T12:47:37Z</updated>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments(102902).full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments(102902).full.json b/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments(102902).full.json
index d6082db..32631c5 100644
--- a/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments(102902).full.json
+++ b/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments(102902).full.json
@@ -1,5 +1,5 @@
 {
-  "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(102)/MyPaymentInstruments/$entity",
+  "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(102)/MyPaymentInstruments/$entity",
   "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument",
   "@odata.id": "Accounts(102)/MyPaymentInstruments(102902)",
   "@odata.editLink": "Accounts(102)/MyPaymentInstruments(102902)",
@@ -7,10 +7,10 @@
   "FriendlyName": "102 first PI",
   "CreatedDate@odata.type": "#DateTimeOffset",
   "CreatedDate": "2014-04-09T00:00:00Z",
-  "TheStoredPI@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/TheStoredPI/$ref",
-  "TheStoredPI@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/TheStoredPI",
-  "BillingStatements@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/BillingStatements/$ref",
-  "BillingStatements@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/BillingStatements",
-  "BackupStoredPI@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/BackupStoredPI/$ref",
-  "BackupStoredPI@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/BackupStoredPI"
+  "TheStoredPI@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/TheStoredPI/$ref",
+  "TheStoredPI@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/TheStoredPI",
+  "BillingStatements@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/BillingStatements/$ref",
+  "BillingStatements@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/BillingStatements",
+  "BackupStoredPI@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/BackupStoredPI/$ref",
+  "BackupStoredPI@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/BackupStoredPI"
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments(102902).xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments(102902).xml b/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments(102902).xml
index 7a056c4..4b5ce67 100644
--- a/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments(102902).xml
+++ b/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments(102902).xml
@@ -19,11 +19,11 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.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://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(102)/MyPaymentInstruments/$entity">
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.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://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(102)/MyPaymentInstruments/$entity">
   <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="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/TheStoredPI"/>
-  <link rel="http://docs.oasis-open.org/odata/ns/related/BillingStatements" type="application/atom+xml;type=feed" title="BillingStatements" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/BillingStatements"/>
-  <link rel="http://docs.oasis-open.org/odata/ns/related/BackupStoredPI" type="application/atom+xml;type=entry" title="BackupStoredPI" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/BackupStoredPI"/>
+  <link rel="http://docs.oasis-open.org/odata/ns/related/TheStoredPI" type="application/atom+xml;type=entry" title="TheStoredPI" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/TheStoredPI"/>
+  <link rel="http://docs.oasis-open.org/odata/ns/related/BillingStatements" type="application/atom+xml;type=feed" title="BillingStatements" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/BillingStatements"/>
+  <link rel="http://docs.oasis-open.org/odata/ns/related/BackupStoredPI" type="application/atom+xml;type=entry" title="BackupStoredPI" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/BackupStoredPI"/>
   <id/>
   <title/>
   <updated>2014-04-14T12:47:37Z</updated>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments.full.json b/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments.full.json
index d056b5e..c4cb9ae 100644
--- a/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments.full.json
+++ b/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments.full.json
@@ -1,5 +1,5 @@
 {
-  "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(102)/MyPaymentInstruments",
+  "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(102)/MyPaymentInstruments",
   "value": [{
       "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument",
       "@odata.id": "Accounts(102)/MyPaymentInstruments(102901)",
@@ -8,12 +8,12 @@
       "FriendlyName": "102 first PI",
       "CreatedDate@odata.type": "#DateTimeOffset",
       "CreatedDate": "2014-04-09T00:00:00Z",
-      "TheStoredPI@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/TheStoredPI/$ref",
-      "TheStoredPI@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/TheStoredPI",
-      "BillingStatements@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BillingStatements/$ref",
-      "BillingStatements@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BillingStatements",
-      "BackupStoredPI@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BackupStoredPI/$ref",
-      "BackupStoredPI@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BackupStoredPI"
+      "TheStoredPI@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/TheStoredPI/$ref",
+      "TheStoredPI@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/TheStoredPI",
+      "BillingStatements@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BillingStatements/$ref",
+      "BillingStatements@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BillingStatements",
+      "BackupStoredPI@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BackupStoredPI/$ref",
+      "BackupStoredPI@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BackupStoredPI"
     }, {
       "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI",
       "@odata.id": "Accounts(102)/MyPaymentInstruments(102902)",
@@ -28,14 +28,14 @@
       "Balance": 100.0,
       "ExperationDate@odata.type": "#DateTimeOffset",
       "ExperationDate": "2022-11-01T00:00:00Z",
-      "TheStoredPI@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI/$ref",
-      "TheStoredPI@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI",
-      "BillingStatements@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements/$ref",
-      "BillingStatements@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements",
-      "BackupStoredPI@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI/$ref",
-      "BackupStoredPI@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI",
-      "CreditRecords@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords/$ref",
-      "CreditRecords@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords"
+      "TheStoredPI@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI/$ref",
+      "TheStoredPI@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI",
+      "BillingStatements@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements/$ref",
+      "BillingStatements@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements",
+      "BackupStoredPI@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI/$ref",
+      "BackupStoredPI@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI",
+      "CreditRecords@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords/$ref",
+      "CreditRecords@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords"
     }, {
       "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI",
       "@odata.id": "Accounts(102)/MyPaymentInstruments(102903)",
@@ -50,13 +50,13 @@
       "Balance": 300.0,
       "ExperationDate@odata.type": "#DateTimeOffset",
       "ExperationDate": "2022-10-02T00:00:00Z",
-      "TheStoredPI@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI/$ref",
-      "TheStoredPI@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI",
-      "BillingStatements@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements/$ref",
-      "BillingStatements@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements",
-      "BackupStoredPI@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI/$ref",
-      "BackupStoredPI@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI",
-      "CreditRecords@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords/$ref",
-      "CreditRecords@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords"
+      "TheStoredPI@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI/$ref",
+      "TheStoredPI@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI",
+      "BillingStatements@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements/$ref",
+      "BillingStatements@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements",
+      "BackupStoredPI@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI/$ref",
+      "BackupStoredPI@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI",
+      "CreditRecords@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords/$ref",
+      "CreditRecords@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords"
     }]
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments.xml b/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments.xml
index 5defbc3..3d04100 100644
--- a/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments.xml
+++ b/fit/src/main/resources/V40/Accounts/102/links/MyPaymentInstruments.xml
@@ -19,15 +19,15 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.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://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(102)/MyPaymentInstruments">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/MyPaymentInstruments</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.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://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(102)/MyPaymentInstruments">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/MyPaymentInstruments</id>
   <title/>
   <updated>2014-04-14T12:45:33Z</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="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/TheStoredPI"/>
-    <link rel="http://docs.oasis-open.org/odata/ns/related/BillingStatements" type="application/atom+xml;type=feed" title="BillingStatements" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BillingStatements"/>
-    <link rel="http://docs.oasis-open.org/odata/ns/related/BackupStoredPI" type="application/atom+xml;type=entry" title="BackupStoredPI" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BackupStoredPI"/>
+    <link rel="http://docs.oasis-open.org/odata/ns/related/TheStoredPI" type="application/atom+xml;type=entry" title="TheStoredPI" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/TheStoredPI"/>
+    <link rel="http://docs.oasis-open.org/odata/ns/related/BillingStatements" type="application/atom+xml;type=feed" title="BillingStatements" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BillingStatements"/>
+    <link rel="http://docs.oasis-open.org/odata/ns/related/BackupStoredPI" type="application/atom+xml;type=entry" title="BackupStoredPI" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102901)/BackupStoredPI"/>
     <id/>
     <title/>
     <updated>2014-04-14T12:45:33Z</updated>
@@ -44,10 +44,10 @@
   </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="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI"/>
-    <link rel="http://docs.oasis-open.org/odata/ns/related/BillingStatements" type="application/atom+xml;type=feed" title="BillingStatements" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements"/>
-    <link rel="http://docs.oasis-open.org/odata/ns/related/BackupStoredPI" type="application/atom+xml;type=entry" title="BackupStoredPI" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI"/>
-    <link rel="http://docs.oasis-open.org/odata/ns/related/CreditRecords" type="application/atom+xml;type=feed" title="CreditRecords" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords"/>
+    <link rel="http://docs.oasis-open.org/odata/ns/related/TheStoredPI" type="application/atom+xml;type=entry" title="TheStoredPI" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI"/>
+    <link rel="http://docs.oasis-open.org/odata/ns/related/BillingStatements" type="application/atom+xml;type=feed" title="BillingStatements" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements"/>
+    <link rel="http://docs.oasis-open.org/odata/ns/related/BackupStoredPI" type="application/atom+xml;type=entry" title="BackupStoredPI" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI"/>
+    <link rel="http://docs.oasis-open.org/odata/ns/related/CreditRecords" type="application/atom+xml;type=feed" title="CreditRecords" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102902)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords"/>
     <id/>
     <title/>
     <updated>2014-04-14T12:45:33Z</updated>
@@ -69,10 +69,10 @@
   </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="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI"/>
-    <link rel="http://docs.oasis-open.org/odata/ns/related/BillingStatements" type="application/atom+xml;type=feed" title="BillingStatements" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements"/>
-    <link rel="http://docs.oasis-open.org/odata/ns/related/BackupStoredPI" type="application/atom+xml;type=entry" title="BackupStoredPI" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI"/>
-    <link rel="http://docs.oasis-open.org/odata/ns/related/CreditRecords" type="application/atom+xml;type=feed" title="CreditRecords" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords"/>
+    <link rel="http://docs.oasis-open.org/odata/ns/related/TheStoredPI" type="application/atom+xml;type=entry" title="TheStoredPI" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/TheStoredPI"/>
+    <link rel="http://docs.oasis-open.org/odata/ns/related/BillingStatements" type="application/atom+xml;type=feed" title="BillingStatements" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BillingStatements"/>
+    <link rel="http://docs.oasis-open.org/odata/ns/related/BackupStoredPI" type="application/atom+xml;type=entry" title="BackupStoredPI" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/BackupStoredPI"/>
+    <link rel="http://docs.oasis-open.org/odata/ns/related/CreditRecords" type="application/atom+xml;type=feed" title="CreditRecords" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(102)/MyPaymentInstruments(102903)/Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI/CreditRecords"/>
     <id/>
     <title/>
     <updated>2014-04-14T12:45:33Z</updated>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Advertisements/f89dee73-af9f-4cd4-b330-db93c25ff3c7/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Advertisements/f89dee73-af9f-4cd4-b330-db93c25ff3c7/entity.full.json b/fit/src/main/resources/V40/Advertisements/f89dee73-af9f-4cd4-b330-db93c25ff3c7/entity.full.json
index 4730781..fea3fad 100644
--- a/fit/src/main/resources/V40/Advertisements/f89dee73-af9f-4cd4-b330-db93c25ff3c7/entity.full.json
+++ b/fit/src/main/resources/V40/Advertisements/f89dee73-af9f-4cd4-b330-db93c25ff3c7/entity.full.json
@@ -1,7 +1,7 @@
 {
-  "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Demo.svc/$metadata#Advertisements/$entity",
+  "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Demo.svc/$metadata#Advertisements/$entity",
   "@odata.type": "#ODataDemo.Advertisement",
-  "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Demo.svc/Advertisements(f89dee73-af9f-4cd4-b330-db93c25ff3c7)",
+  "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Demo.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": "*/*",

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Advertisements/f89dee73-af9f-4cd4-b330-db93c25ff3c7/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Advertisements/f89dee73-af9f-4cd4-b330-db93c25ff3c7/entity.xml b/fit/src/main/resources/V40/Advertisements/f89dee73-af9f-4cd4-b330-db93c25ff3c7/entity.xml
index 72a8cc6..49a4ae8 100644
--- a/fit/src/main/resources/V40/Advertisements/f89dee73-af9f-4cd4-b330-db93c25ff3c7/entity.xml
+++ b/fit/src/main/resources/V40/Advertisements/f89dee73-af9f-4cd4-b330-db93c25ff3c7/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Demo.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://localhost:${cargo.servlet.port}/stub/StaticService/V40/Demo.svc/$metadata#Advertisements/$entity">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Demo.svc/Advertisements(f89dee73-af9f-4cd4-b330-db93c25ff3c7)</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Demo.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://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Demo.svc/$metadata#Advertisements/$entity">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Demo.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"/>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Advertisements/feed.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Advertisements/feed.full.json b/fit/src/main/resources/V40/Advertisements/feed.full.json
index 3d0a90e..1ede6bc 100644
--- a/fit/src/main/resources/V40/Advertisements/feed.full.json
+++ b/fit/src/main/resources/V40/Advertisements/feed.full.json
@@ -1,8 +1,8 @@
 {
-  "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Demo.svc/$metadata#Advertisements",
+  "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Demo.svc/$metadata#Advertisements",
   "value": [{
       "@odata.type": "#ODataDemo.Advertisement",
-      "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Demo.svc/Advertisements(f89dee73-af9f-4cd4-b330-db93c25ff3c7)",
+      "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Demo.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": "*/*",
@@ -16,7 +16,7 @@
       "FeaturedProduct@odata.navigationLink": "Advertisements(f89dee73-af9f-4cd4-b330-db93c25ff3c7)/FeaturedProduct"
     }, {
       "@odata.type": "#ODataDemo.Advertisement",
-      "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Demo.svc/Advertisements(db2d2186-1c29-4d1e-88ef-a127f521b9c6)",
+      "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Demo.svc/Advertisements(db2d2186-1c29-4d1e-88ef-a127f521b9c6)",
       "@odata.editLink": "Advertisements(db2d2186-1c29-4d1e-88ef-a127f521b9c6)",
       "@odata.mediaEditLink": "Advertisements(db2d2186-1c29-4d1e-88ef-a127f521b9c6)/$value",
       "@odata.mediaContentType": "*/*",

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Advertisements/feed.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Advertisements/feed.xml b/fit/src/main/resources/V40/Advertisements/feed.xml
index 874ffe9..bd661b8 100644
--- a/fit/src/main/resources/V40/Advertisements/feed.xml
+++ b/fit/src/main/resources/V40/Advertisements/feed.xml
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Demo.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://localhost:${cargo.servlet.port}/stub/StaticService/V40/Demo.svc/$metadata#Advertisements">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Demo.svc/Advertisements</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Demo.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://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Demo.svc/$metadata#Advertisements">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Demo.svc/Advertisements</id>
   <title type="text">Advertisements</title>
   <updated>2014-05-07T13:39:27Z</updated>
   <link rel="self" title="Advertisements" href="Advertisements"/>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Demo.svc/Advertisements(f89dee73-af9f-4cd4-b330-db93c25ff3c7)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Demo.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"/>
@@ -44,7 +44,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Demo.svc/Advertisements(db2d2186-1c29-4d1e-88ef-a127f521b9c6)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Demo.svc/Advertisements(db2d2186-1c29-4d1e-88ef-a127f521b9c6)</id>
     <category term="#ODataDemo.Advertisement" scheme="http://docs.oasis-open.org/odata/ns/scheme"/>
     <link rel="edit" title="Advertisement" href="Advertisements(db2d2186-1c29-4d1e-88ef-a127f521b9c6)"/>
     <link rel="http://docs.oasis-open.org/odata/ns/relatedlinks/FeaturedProduct" type="application/xml" title="FeaturedProduct" href="Advertisements(db2d2186-1c29-4d1e-88ef-a127f521b9c6)/FeaturedProduct/$ref"/>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Boss/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Boss/entity.full.json b/fit/src/main/resources/V40/Boss/entity.full.json
index 5444c2c..91e5b64 100644
--- a/fit/src/main/resources/V40/Boss/entity.full.json
+++ b/fit/src/main/resources/V40/Boss/entity.full.json
@@ -1,8 +1,8 @@
 {
-  "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Boss",
+  "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Boss",
   "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Customer",
-  "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Boss",
-  "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Boss/Microsoft.Test.OData.Services.ODataWCFService.Customer",
+  "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Boss",
+  "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Boss/Microsoft.Test.OData.Services.ODataWCFService.Customer",
   "@Microsoft.Test.OData.Services.ODataWCFService.IsBoss": true,
   "PersonID": 2,
   "FirstName": "Jill",
@@ -30,19 +30,19 @@
   "Birthday": "1983-01-15T00:00:00Z",
   "TimeBetweenLastTwoOrders@odata.type": "#Duration",
   "TimeBetweenLastTwoOrders": "PT0.0000002S",
-  "Parent@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Boss/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent/$ref",
-  "Parent@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Boss/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent",
+  "Parent@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Boss/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent/$ref",
+  "Parent@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Boss/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent",
   "Orders@Microsoft.Test.OData.Services.ODataWCFService.IsBoss": false,
-  "Orders@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Boss/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders/$ref",
-  "Orders@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Boss/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders",
-  "Company@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Boss/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company/$ref",
-  "Company@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Boss/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company",
+  "Orders@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Boss/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders/$ref",
+  "Orders@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Boss/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders",
+  "Company@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Boss/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company/$ref",
+  "Company@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Boss/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company",
   "#Microsoft.Test.OData.Services.ODataWCFService.ResetAddress": {
     "title": "Microsoft.Test.OData.Services.ODataWCFService.ResetAddress",
-    "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Boss/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress"
+    "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Boss/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress"
   },
   "#Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress": {
     "title": "Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress",
-    "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Boss/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress"
+    "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Boss/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress"
   }
 }


[18/20] [OLINGO-377] Removing unused cargo properties, upgrading Tomcat, renaming cargo.servlet.port to tomcat.servlet.port

Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/orderby/VIN desc/filter/(VIN lt 16).full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/orderby/VIN desc/filter/(VIN lt 16).full.json b/fit/src/main/resources/V30/Car/orderby/VIN desc/filter/(VIN lt 16).full.json
index a8da0f2..ade2bce 100644
--- a/fit/src/main/resources/V30/Car/orderby/VIN desc/filter/(VIN lt 16).full.json	
+++ b/fit/src/main/resources/V30/Car/orderby/VIN desc/filter/(VIN lt 16).full.json	
@@ -1,9 +1,9 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car",
   "value": [
-    {"odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car", "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)", "odata.editLink": "Car(15)", "odata.mediaEditLink": "Car(15)/$value", "odata.mediaReadLink": "Car(15)/$value", "odata.mediaContentType": "application/octet-stream", "Photo@odata.mediaEditLink": "Car(15)/Photo", "Video@odata.mediaEditLink": "Car(15)/Video", "VIN": 15, "Description": "kphszztczthjacvjnttrarxru"},
-    {"odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car", "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)", "odata.editLink": "Car(14)", "odata.mediaEditLink": "Car(14)/$value", "odata.mediaReadLink": "Car(14)/$value", "odata.mediaContentType": "application/octet-stream", "Photo@odata.mediaEditLink": "Car(14)/Photo", "Video@odata.mediaEditLink": "Car(14)/Video", "VIN": 14, "Description": "New Description(1392222565917)"},
-    {"odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car", "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)", "odata.editLink": "Car(13)", "odata.mediaEditLink": "Car(13)/$value", "odata.mediaReadLink": "Car(13)/$value", "odata.mediaContentType": "application/octet-stream", "Photo@odata.mediaEditLink": "Car(13)/Photo", "Video@odata.mediaEditLink": "Car(13)/Video", "VIN": 13, "Description": null},
-    {"odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car", "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)", "odata.editLink": "Car(12)", "odata.mediaEditLink": "Car(12)/$value", "odata.mediaReadLink": "Car(12)/$value", "odata.mediaContentType": "application/octet-stream", "Photo@odata.mediaEditLink": "Car(12)/Photo", "Video@odata.mediaEditLink": "Car(12)/Video", "VIN": 12, "Description": "lx"},
-    {"odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car", "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)", "odata.editLink": "Car(11)", "odata.mediaEditLink": "Car(11)/$value", "odata.mediaReadLink": "Car(11)/$value", "odata.mediaContentType": "application/octet-stream", "Photo@odata.mediaEditLink": "Car(11)/Photo", "Video@odata.mediaEditLink": "Car(11)/Video", "VIN": 11, "Description": "cenbviijieljtrtdslbuiqubcvhxhzenidqdnaopplvlqc"}
+    {"odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car", "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)", "odata.editLink": "Car(15)", "odata.mediaEditLink": "Car(15)/$value", "odata.mediaReadLink": "Car(15)/$value", "odata.mediaContentType": "application/octet-stream", "Photo@odata.mediaEditLink": "Car(15)/Photo", "Video@odata.mediaEditLink": "Car(15)/Video", "VIN": 15, "Description": "kphszztczthjacvjnttrarxru"},
+    {"odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car", "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)", "odata.editLink": "Car(14)", "odata.mediaEditLink": "Car(14)/$value", "odata.mediaReadLink": "Car(14)/$value", "odata.mediaContentType": "application/octet-stream", "Photo@odata.mediaEditLink": "Car(14)/Photo", "Video@odata.mediaEditLink": "Car(14)/Video", "VIN": 14, "Description": "New Description(1392222565917)"},
+    {"odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car", "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)", "odata.editLink": "Car(13)", "odata.mediaEditLink": "Car(13)/$value", "odata.mediaReadLink": "Car(13)/$value", "odata.mediaContentType": "application/octet-stream", "Photo@odata.mediaEditLink": "Car(13)/Photo", "Video@odata.mediaEditLink": "Car(13)/Video", "VIN": 13, "Description": null},
+    {"odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car", "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)", "odata.editLink": "Car(12)", "odata.mediaEditLink": "Car(12)/$value", "odata.mediaReadLink": "Car(12)/$value", "odata.mediaContentType": "application/octet-stream", "Photo@odata.mediaEditLink": "Car(12)/Photo", "Video@odata.mediaEditLink": "Car(12)/Video", "VIN": 12, "Description": "lx"},
+    {"odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car", "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)", "odata.editLink": "Car(11)", "odata.mediaEditLink": "Car(11)/$value", "odata.mediaReadLink": "Car(11)/$value", "odata.mediaContentType": "application/octet-stream", "Photo@odata.mediaEditLink": "Car(11)/Photo", "Video@odata.mediaEditLink": "Car(11)/Video", "VIN": 11, "Description": "cenbviijieljtrtdslbuiqubcvhxhzenidqdnaopplvlqc"}
   ]}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/orderby/VIN desc/filter/(VIN lt 16).xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/orderby/VIN desc/filter/(VIN lt 16).xml b/fit/src/main/resources/V30/Car/orderby/VIN desc/filter/(VIN lt 16).xml
index fe9a973..7a0527c 100644
--- a/fit/src/main/resources/V30/Car/orderby/VIN desc/filter/(VIN lt 16).xml	
+++ b/fit/src/main/resources/V30/Car/orderby/VIN desc/filter/(VIN lt 16).xml	
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car</id>
   <title type="text">Car</title>
   <updated>2014-02-13T12:09:31Z</updated>
   <link rel="self" title="Car" href="Car" />
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(15)" />
     <title />
@@ -43,7 +43,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(14)" />
     <title />
@@ -61,7 +61,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(13)" />
     <title />
@@ -79,7 +79,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(12)" />
     <title />
@@ -97,7 +97,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(11)" />
     <title />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Computer/feed.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Computer/feed.xml b/fit/src/main/resources/V30/Computer/feed.xml
index 6c727fe..2d26ff9 100644
--- a/fit/src/main/resources/V30/Computer/feed.xml
+++ b/fit/src/main/resources/V30/Computer/feed.xml
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Computer</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Computer</id>
   <title type="text">Computer</title>
   <updated>2014-05-08T10:00:26Z</updated>
   <link rel="self" title="Computer" href="Computer" />
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Computer(11)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Computer(11)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Computer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Computer" href="Computer(11)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ComputerDetail" type="application/atom+xml;type=entry" title="ComputerDetail" href="Computer(11)/ComputerDetail" />
@@ -34,7 +34,7 @@
     <author>
       <name />
     </author>
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.GetComputer" title="GetComputer" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Computer(11)/GetComputer" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.GetComputer" title="GetComputer" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Computer(11)/GetComputer" />
     <content type="application/xml">
       <m:properties>
         <d:ComputerId m:type="Edm.Int32">11</d:ComputerId>
@@ -43,7 +43,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Computer(12)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Computer(12)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Computer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Computer" href="Computer(12)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ComputerDetail" type="application/atom+xml;type=entry" title="ComputerDetail" href="Computer(12)/ComputerDetail" />
@@ -52,7 +52,7 @@
     <author>
       <name />
     </author>
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.GetComputer" title="GetComputer" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Computer(12)/GetComputer" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.GetComputer" title="GetComputer" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Computer(12)/GetComputer" />
     <content type="application/xml">
       <m:properties>
         <d:ComputerId m:type="Edm.Int32">12</d:ComputerId>
@@ -61,7 +61,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Computer(13)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Computer(13)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Computer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Computer" href="Computer(13)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ComputerDetail" type="application/atom+xml;type=entry" title="ComputerDetail" href="Computer(13)/ComputerDetail" />
@@ -70,7 +70,7 @@
     <author>
       <name />
     </author>
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.GetComputer" title="GetComputer" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Computer(13)/GetComputer" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.GetComputer" title="GetComputer" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Computer(13)/GetComputer" />
     <content type="application/xml">
       <m:properties>
         <d:ComputerId m:type="Edm.Int32">13</d:ComputerId>
@@ -79,7 +79,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Computer(14)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Computer(14)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Computer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Computer" href="Computer(14)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ComputerDetail" type="application/atom+xml;type=entry" title="ComputerDetail" href="Computer(14)/ComputerDetail" />
@@ -88,7 +88,7 @@
     <author>
       <name />
     </author>
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.GetComputer" title="GetComputer" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Computer(14)/GetComputer" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.GetComputer" title="GetComputer" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Computer(14)/GetComputer" />
     <content type="application/xml">
       <m:properties>
         <d:ComputerId m:type="Edm.Int32">14</d:ComputerId>
@@ -97,7 +97,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Computer(15)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Computer(15)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Computer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Computer" href="Computer(15)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ComputerDetail" type="application/atom+xml;type=entry" title="ComputerDetail" href="Computer(15)/ComputerDetail" />
@@ -106,7 +106,7 @@
     <author>
       <name />
     </author>
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.GetComputer" title="GetComputer" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Computer(15)/GetComputer" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.GetComputer" title="GetComputer" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Computer(15)/GetComputer" />
     <content type="application/xml">
       <m:properties>
         <d:ComputerId m:type="Edm.Int32">15</d:ComputerId>
@@ -115,7 +115,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Computer(16)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Computer(16)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Computer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Computer" href="Computer(16)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ComputerDetail" type="application/atom+xml;type=entry" title="ComputerDetail" href="Computer(16)/ComputerDetail" />
@@ -124,7 +124,7 @@
     <author>
       <name />
     </author>
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.GetComputer" title="GetComputer" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Computer(16)/GetComputer" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.GetComputer" title="GetComputer" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Computer(16)/GetComputer" />
     <content type="application/xml">
       <m:properties>
         <d:ComputerId m:type="Edm.Int32">16</d:ComputerId>
@@ -133,7 +133,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Computer(17)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Computer(17)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Computer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Computer" href="Computer(17)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ComputerDetail" type="application/atom+xml;type=entry" title="ComputerDetail" href="Computer(17)/ComputerDetail" />
@@ -142,7 +142,7 @@
     <author>
       <name />
     </author>
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.GetComputer" title="GetComputer" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Computer(17)/GetComputer" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.GetComputer" title="GetComputer" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Computer(17)/GetComputer" />
     <content type="application/xml">
       <m:properties>
         <d:ComputerId m:type="Edm.Int32">17</d:ComputerId>
@@ -151,7 +151,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Computer(18)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Computer(18)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Computer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Computer" href="Computer(18)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ComputerDetail" type="application/atom+xml;type=entry" title="ComputerDetail" href="Computer(18)/ComputerDetail" />
@@ -160,7 +160,7 @@
     <author>
       <name />
     </author>
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.GetComputer" title="GetComputer" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Computer(18)/GetComputer" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.GetComputer" title="GetComputer" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Computer(18)/GetComputer" />
     <content type="application/xml">
       <m:properties>
         <d:ComputerId m:type="Edm.Int32">18</d:ComputerId>
@@ -169,7 +169,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Computer(19)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Computer(19)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Computer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Computer" href="Computer(19)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ComputerDetail" type="application/atom+xml;type=entry" title="ComputerDetail" href="Computer(19)/ComputerDetail" />
@@ -178,7 +178,7 @@
     <author>
       <name />
     </author>
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.GetComputer" title="GetComputer" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Computer(19)/GetComputer" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.GetComputer" title="GetComputer" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Computer(19)/GetComputer" />
     <content type="application/xml">
       <m:properties>
         <d:ComputerId m:type="Edm.Int32">19</d:ComputerId>
@@ -187,7 +187,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Computer(20)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Computer(20)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Computer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Computer" href="Computer(20)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/ComputerDetail" type="application/atom+xml;type=entry" title="ComputerDetail" href="Computer(20)/ComputerDetail" />
@@ -196,7 +196,7 @@
     <author>
       <name />
     </author>
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.GetComputer" title="GetComputer" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Computer(20)/GetComputer" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.GetComputer" title="GetComputer" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Computer(20)/GetComputer" />
     <content type="application/xml">
       <m:properties>
         <d:ComputerId m:type="Edm.Int32">20</d:ComputerId>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/ComputerDetail/-10/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/ComputerDetail/-10/entity.full.json b/fit/src/main/resources/V30/ComputerDetail/-10/entity.full.json
index f346c48..c8487f2 100644
--- a/fit/src/main/resources/V30/ComputerDetail/-10/entity.full.json
+++ b/fit/src/main/resources/V30/ComputerDetail/-10/entity.full.json
@@ -1,13 +1,13 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#ComputerDetail/@Element",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#ComputerDetail/@Element",
   "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail",
-  "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)",
+  "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)",
   "odata.editLink": "ComputerDetail(-10)",
   "Computer@odata.navigationLinkUrl": "ComputerDetail(-10)/Computer",
   "#DefaultContainer.ResetComputerDetailsSpecifications":
           {
             "title": "ResetComputerDetailsSpecifications",
-            "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)/ResetComputerDetailsSpecifications"
+            "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)/ResetComputerDetailsSpecifications"
           },
   "ComputerDetailId": -10,
   "Manufacturer": null,

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/ComputerDetail/-10/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/ComputerDetail/-10/entity.xml b/fit/src/main/resources/V30/ComputerDetail/-10/entity.xml
index cf6109e..a55f86f 100644
--- a/fit/src/main/resources/V30/ComputerDetail/-10/entity.xml
+++ b/fit/src/main/resources/V30/ComputerDetail/-10/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)</id>
   <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
   <link rel="edit" title="ComputerDetail" href="ComputerDetail(-10)" />
   <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Computer" type="application/atom+xml;type=entry" title="Computer" href="ComputerDetail(-10)/Computer" />
@@ -29,7 +29,7 @@
   <author>
     <name />
   </author>
-  <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ResetComputerDetailsSpecifications" title="ResetComputerDetailsSpecifications" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)/ResetComputerDetailsSpecifications" />
+  <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ResetComputerDetailsSpecifications" title="ResetComputerDetailsSpecifications" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)/ResetComputerDetailsSpecifications" />
   <content type="application/xml">
     <m:properties>
       <d:ComputerDetailId m:type="Edm.Int32">-10</d:ComputerDetailId>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/ComputerDetail/filter/(month(PurchaseDate) eq 12).full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/ComputerDetail/filter/(month(PurchaseDate) eq 12).full.json b/fit/src/main/resources/V30/ComputerDetail/filter/(month(PurchaseDate) eq 12).full.json
index 11ec638..e6a8f19 100644
--- a/fit/src/main/resources/V30/ComputerDetail/filter/(month(PurchaseDate) eq 12).full.json	
+++ b/fit/src/main/resources/V30/ComputerDetail/filter/(month(PurchaseDate) eq 12).full.json	
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#ComputerDetail","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-1)","odata.editLink":"ComputerDetail(-1)","Computer@odata.navigationLinkUrl":"ComputerDetail(-1)/Computer","#DefaultContainer.ResetComputerDetailsSpecifications":{"title":"ResetComputerDetailsSpecifications","target":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-1)/ResetComputerDetailsSpecifications"},"ComputerDetailId":-1,"Manufacturer":"cybsycxhjrazcaxf","Model":"mfhgyi\u00dfxesckygsslbksqvcpohjienkcfbtrssp","Serial":"\u3042\u30a1\u30df\u30be\u30c0\u305c\u88f9\u3042\u30bc\u305e\u3093\u531a\u755a\u30d0\u3092\u30df\u307c\uff66\u30bd\uff9d\u88f9\u307d\u30cf\u30be\u9ed1\u307c\u3073","SpecificationsBag@odata.type":"Collection(Edm.String)
 ","SpecificationsBag":["\u30c1\u6b32\u30a1\u30df\u755a\u73f1\u30dc\u6b32\u3092\u3074\uff9d\u305f\u30a1\u9ed1\u30bf\u30a1\u305d\u30af\u307b\u30a1\u9ed1\u30bc\u755a\u30b0\u5f0c\u4e9c\u307b\u30c1\u3092\uff41\u3079\u3042\u30bf","\u30bf\u7e37\u30bd\u755a\u30dc\u305f\u3072\u66a6\u88f9\u305e\u307d\u30c1\u30b0\uff41\u3041\u30a1\u4e9c\u30c1\u30bc\u3072\uff5a\uff88\uff41\u305c\u30dc\u0451\u30bf\u30b0\uff88\u9ed1\u30d0\u30bf\u3073\u30c1\u5f0c\u307b\u9ed1\u30b0\u30de\u4e9c\u307c\u3042\u30bd\u30dd\u30be\u30dd\u3079\u30af\u755a\u755a\u3092\uff66\u30b0\u30c1\u042f\u30c1\uff5a\u30a1\u307b\u30c1\u30dc\u531a\u6b32\uff9d\u30bf\u30df\u30bc\u5f0c\u305e\u6b32\u30bc\u30bc\u755a\u30dd\u88f9\u7e37\u30be\u307c\u30d0\uff66\u6b79\u3072\u30be\u305d\u30dc\u30dd\u3072\u30dc\u30c1\u307b\u307e\u30cf\u305e\u305d\u305f\u30bd","udjcekzitroessd","shxnubznxdumkraixsjsskrspkss","vugqblidbkbfkppfbbkanvnflueqdousryyhhucoxtpbbnyeecbsauzaceu","aerlqnsczh\u00dfgivchizyapazitnsszugryqlupnu\u00dfjgxg","\u3042\u3079\u66a6\u88f9\
 uff5a\u307d\u30bf\u30be\u6b79\u044f\u3072\u30c1\u30df\u305b\u30c1\u4e9c\u3042\u30c1\u4e5d\u305e\u30df\u30dc\u0451\u30dc\u66a6\u30a1\u9ed1\u30bd\u30dd\u531a\u30dd\u3042\u30a1\u305b\u30bd\u4e9c\u305e\u307c\u30bc\u30b0\u30a1\u305f\u30dc\u4e5d\u30bc\uff88\u044f\u88f9\u6b79\u30d0\u4e9c\u4e9c\u305c\u30d0\uff41\u30bd\u3073\u3072\u305b\u30d0\u30a1\u3042\u6b79\u3042\u30a1\u305c"],"PurchaseDate@odata.type":"Edm.DateTime","PurchaseDate":"9999-12-31T23:59:59.9999999","Dimensions":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"-69.6411071913679","Height@odata.type":"Edm.Decimal","Height":"1451.59900018645","Depth@odata.type":"Edm.Decimal","Depth":"-79228162514264337593543950335"}}]}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#ComputerDetail","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-1)","odata.editLink":"ComputerDetail(-1)","Computer@odata.navigationLinkUrl":"ComputerDetail(-1)/Computer","#DefaultContainer.ResetComputerDetailsSpecifications":{"title":"ResetComputerDetailsSpecifications","target":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-1)/ResetComputerDetailsSpecifications"},"ComputerDetailId":-1,"Manufacturer":"cybsycxhjrazcaxf","Model":"mfhgyi\u00dfxesckygsslbksqvcpohjienkcfbtrssp","Serial":"\u3042\u30a1\u30df\u30be\u30c0\u305c\u88f9\u3042\u30bc\u305e\u3093\u531a\u755a\u30d0\u3092\u30df\u307c\uff66\u30bd\uff9d\u88f9\u307d\u30cf\u30be\u9ed1\u307c\u3073","SpecificationsBag@odata.type":"Collection(Edm.Stri
 ng)","SpecificationsBag":["\u30c1\u6b32\u30a1\u30df\u755a\u73f1\u30dc\u6b32\u3092\u3074\uff9d\u305f\u30a1\u9ed1\u30bf\u30a1\u305d\u30af\u307b\u30a1\u9ed1\u30bc\u755a\u30b0\u5f0c\u4e9c\u307b\u30c1\u3092\uff41\u3079\u3042\u30bf","\u30bf\u7e37\u30bd\u755a\u30dc\u305f\u3072\u66a6\u88f9\u305e\u307d\u30c1\u30b0\uff41\u3041\u30a1\u4e9c\u30c1\u30bc\u3072\uff5a\uff88\uff41\u305c\u30dc\u0451\u30bf\u30b0\uff88\u9ed1\u30d0\u30bf\u3073\u30c1\u5f0c\u307b\u9ed1\u30b0\u30de\u4e9c\u307c\u3042\u30bd\u30dd\u30be\u30dd\u3079\u30af\u755a\u755a\u3092\uff66\u30b0\u30c1\u042f\u30c1\uff5a\u30a1\u307b\u30c1\u30dc\u531a\u6b32\uff9d\u30bf\u30df\u30bc\u5f0c\u305e\u6b32\u30bc\u30bc\u755a\u30dd\u88f9\u7e37\u30be\u307c\u30d0\uff66\u6b79\u3072\u30be\u305d\u30dc\u30dd\u3072\u30dc\u30c1\u307b\u307e\u30cf\u305e\u305d\u305f\u30bd","udjcekzitroessd","shxnubznxdumkraixsjsskrspkss","vugqblidbkbfkppfbbkanvnflueqdousryyhhucoxtpbbnyeecbsauzaceu","aerlqnsczh\u00dfgivchizyapazitnsszugryqlupnu\u00dfjgxg","\u3042\u3079\u66a6\u88
 f9\uff5a\u307d\u30bf\u30be\u6b79\u044f\u3072\u30c1\u30df\u305b\u30c1\u4e9c\u3042\u30c1\u4e5d\u305e\u30df\u30dc\u0451\u30dc\u66a6\u30a1\u9ed1\u30bd\u30dd\u531a\u30dd\u3042\u30a1\u305b\u30bd\u4e9c\u305e\u307c\u30bc\u30b0\u30a1\u305f\u30dc\u4e5d\u30bc\uff88\u044f\u88f9\u6b79\u30d0\u4e9c\u4e9c\u305c\u30d0\uff41\u30bd\u3073\u3072\u305b\u30d0\u30a1\u3042\u6b79\u3042\u30a1\u305c"],"PurchaseDate@odata.type":"Edm.DateTime","PurchaseDate":"9999-12-31T23:59:59.9999999","Dimensions":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"-69.6411071913679","Height@odata.type":"Edm.Decimal","Height":"1451.59900018645","Depth@odata.type":"Edm.Decimal","Depth":"-79228162514264337593543950335"}}]}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/ComputerDetail/filter/(month(PurchaseDate) eq 12).xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/ComputerDetail/filter/(month(PurchaseDate) eq 12).xml b/fit/src/main/resources/V30/ComputerDetail/filter/(month(PurchaseDate) eq 12).xml
index cfb6ad2..6db99c0 100644
--- a/fit/src/main/resources/V30/ComputerDetail/filter/(month(PurchaseDate) eq 12).xml	
+++ b/fit/src/main/resources/V30/ComputerDetail/filter/(month(PurchaseDate) eq 12).xml	
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail</id>
   <title type="text">ComputerDetail</title>
   <updated>2014-02-13T12:09:32Z</updated>
   <link rel="self" title="ComputerDetail" href="ComputerDetail" />
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-1)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-1)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="ComputerDetail" href="ComputerDetail(-1)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Computer" type="application/atom+xml;type=entry" title="Computer" href="ComputerDetail(-1)/Computer" />
@@ -36,7 +36,7 @@
       <uri>mfhgyißxesckygsslbksqvcpohjienkcfbtrssp</uri>
       <email>cybsycxhjrazcaxf</email>
     </author>
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ResetComputerDetailsSpecifications" title="ResetComputerDetailsSpecifications" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-1)/ResetComputerDetailsSpecifications" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ResetComputerDetailsSpecifications" title="ResetComputerDetailsSpecifications" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-1)/ResetComputerDetailsSpecifications" />
     <content type="application/xml">
       <m:properties>
         <d:ComputerDetailId m:type="Edm.Int32">-1</d:ComputerDetailId>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/ComputerDetail/filter/day(PurchaseDate) eq 15.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/ComputerDetail/filter/day(PurchaseDate) eq 15.full.json b/fit/src/main/resources/V30/ComputerDetail/filter/day(PurchaseDate) eq 15.full.json
index 6da7c6e..b991627 100644
--- a/fit/src/main/resources/V30/ComputerDetail/filter/day(PurchaseDate) eq 15.full.json	
+++ b/fit/src/main/resources/V30/ComputerDetail/filter/day(PurchaseDate) eq 15.full.json	
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#ComputerDetail","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)","odata.editLink":"ComputerDetail(-10)","Computer@odata.navigationLinkUrl":"ComputerDetail(-10)/Computer","#DefaultContainer.ResetComputerDetailsSpecifications":{"title":"ResetComputerDetailsSpecifications","target":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)/ResetComputerDetailsSpecifications"},"ComputerDetailId":-10,"Manufacturer":"sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk","Model":"usfvbkyxssojjebyzgvtnzkuik\u00dfuxrmllzyglnsssluyxf\u00dfssioyroouxafzbhbsabkrsslbyhghicjaplolzqss\u00dfhhfix","Serial":null,"SpecificationsBag@odata.type":"Collection(Edm.String)","SpecificationsBag":["vorjqalydmfuazkatkiydeicef
 rjhyuaupkfgbxiaehjrqhhqv","rbsejgfgelhsdahkoqlnzvbq","ssfvnnquahsczxlu\u00dfnssrhpsszluundy\u00dfehyzjedssxom","xsqocvqrzbvzhdhtilugpvayirrnomupxinhihazfghqehqymeeaupuesseluinjgbedrarqluedjfx","eekuucympfgkucszfuggbmfglpnxnjvhkhalymhtfuggfafulkzedqlksoduqeyukzzhbbasjmee","\u30be\u3092\u4e5d\u30af\u305d"],"PurchaseDate@odata.type":"Edm.DateTime","PurchaseDate":"2020-12-15T01:33:35.8014568","Dimensions":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"-8917.92836319839","Height@odata.type":"Edm.Decimal","Height":"-79228162514264337593543950335","Depth@odata.type":"Edm.Decimal","Depth":"-79228162514264337593543950335"}}]}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#ComputerDetail","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)","odata.editLink":"ComputerDetail(-10)","Computer@odata.navigationLinkUrl":"ComputerDetail(-10)/Computer","#DefaultContainer.ResetComputerDetailsSpecifications":{"title":"ResetComputerDetailsSpecifications","target":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)/ResetComputerDetailsSpecifications"},"ComputerDetailId":-10,"Manufacturer":"sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk","Model":"usfvbkyxssojjebyzgvtnzkuik\u00dfuxrmllzyglnsssluyxf\u00dfssioyroouxafzbhbsabkrsslbyhghicjaplolzqss\u00dfhhfix","Serial":null,"SpecificationsBag@odata.type":"Collection(Edm.String)","SpecificationsBag":["vorjqalydmfuazkatkiydei
 cefrjhyuaupkfgbxiaehjrqhhqv","rbsejgfgelhsdahkoqlnzvbq","ssfvnnquahsczxlu\u00dfnssrhpsszluundy\u00dfehyzjedssxom","xsqocvqrzbvzhdhtilugpvayirrnomupxinhihazfghqehqymeeaupuesseluinjgbedrarqluedjfx","eekuucympfgkucszfuggbmfglpnxnjvhkhalymhtfuggfafulkzedqlksoduqeyukzzhbbasjmee","\u30be\u3092\u4e5d\u30af\u305d"],"PurchaseDate@odata.type":"Edm.DateTime","PurchaseDate":"2020-12-15T01:33:35.8014568","Dimensions":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"-8917.92836319839","Height@odata.type":"Edm.Decimal","Height":"-79228162514264337593543950335","Depth@odata.type":"Edm.Decimal","Depth":"-79228162514264337593543950335"}}]}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/ComputerDetail/filter/day(PurchaseDate) eq 15.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/ComputerDetail/filter/day(PurchaseDate) eq 15.xml b/fit/src/main/resources/V30/ComputerDetail/filter/day(PurchaseDate) eq 15.xml
index 22e9cd4..e27536e 100644
--- a/fit/src/main/resources/V30/ComputerDetail/filter/day(PurchaseDate) eq 15.xml	
+++ b/fit/src/main/resources/V30/ComputerDetail/filter/day(PurchaseDate) eq 15.xml	
@@ -19,4 +19,4 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml"><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail</id><title type="text">ComputerDetail</title><updated>2014-02-13T14:31:04Z</updated><link rel="self" title="ComputerDetail" href="ComputerDetail" /><entry><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="ComputerDetail" href="ComputerDetail(-10)" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Comp
 uter" type="application/atom+xml;type=entry" title="Computer" href="ComputerDetail(-10)/Computer" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /><uri>usfvbkyxssojjebyzgvtnzkuikßuxrmllzyglnsssluyxfßssioyroouxafzbhbsabkrsslbyhghicjaplolzqssßhhfix</uri><email>sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk</email></author><m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ResetComputerDetailsSpecifications" title="ResetComputerDetailsSpecifications" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)/ResetComputerDetailsSpecifications" /><content type="application/xml"><m:properties><d:ComputerDetailId m:type="Edm.Int32">-10</d:ComputerDetailId><d:Manufacturer>sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk</d:Manufacturer><d:Model>usfvbkyxssojjebyzgvtnzkuikßuxrmllzyglnsssluyxfßssioyroouxafzbhbsabkrsslbyhghicjaplolzqssßhhfix</d
 :Model><d:Serial m:null="true" /><d:SpecificationsBag m:type="Collection(Edm.String)"><d:element>vorjqalydmfuazkatkiydeicefrjhyuaupkfgbxiaehjrqhhqv</d:element><d:element>rbsejgfgelhsdahkoqlnzvbq</d:element><d:element>ssfvnnquahsczxlußnssrhpsszluundyßehyzjedssxom</d:element><d:element>xsqocvqrzbvzhdhtilugpvayirrnomupxinhihazfghqehqymeeaupuesseluinjgbedrarqluedjfx</d:element><d:element>eekuucympfgkucszfuggbmfglpnxnjvhkhalymhtfuggfafulkzedqlksoduqeyukzzhbbasjmee</d:element><d:element>ゾを九クそ</d:element></d:SpecificationsBag><d:PurchaseDate m:type="Edm.DateTime">2020-12-15T01:33:35.8014568</d:PurchaseDate><d:Dimensions m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions"><d:Width m:type="Edm.Decimal">-8917.92836319839</d:Width><d:Height m:type="Edm.Decimal">-79228162514264337593543950335</d:Height><d:Depth m:type="Edm.Decimal">-79228162514264337593543950335</d:Depth></d:Dimensions></m:properties></content></entry></feed>
\ No newline at end of file
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml"><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail</id><title type="text">ComputerDetail</title><updated>2014-02-13T14:31:04Z</updated><link rel="self" title="ComputerDetail" href="ComputerDetail" /><entry><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="ComputerDetail" href="ComputerDetail(-10)" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/C
 omputer" type="application/atom+xml;type=entry" title="Computer" href="ComputerDetail(-10)/Computer" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /><uri>usfvbkyxssojjebyzgvtnzkuikßuxrmllzyglnsssluyxfßssioyroouxafzbhbsabkrsslbyhghicjaplolzqssßhhfix</uri><email>sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk</email></author><m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ResetComputerDetailsSpecifications" title="ResetComputerDetailsSpecifications" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)/ResetComputerDetailsSpecifications" /><content type="application/xml"><m:properties><d:ComputerDetailId m:type="Edm.Int32">-10</d:ComputerDetailId><d:Manufacturer>sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk</d:Manufacturer><d:Model>usfvbkyxssojjebyzgvtnzkuikßuxrmllzyglnsssluyxfßssioyroouxafzbhbsabkrsslbyhghicjaplolzqssßhhf
 ix</d:Model><d:Serial m:null="true" /><d:SpecificationsBag m:type="Collection(Edm.String)"><d:element>vorjqalydmfuazkatkiydeicefrjhyuaupkfgbxiaehjrqhhqv</d:element><d:element>rbsejgfgelhsdahkoqlnzvbq</d:element><d:element>ssfvnnquahsczxlußnssrhpsszluundyßehyzjedssxom</d:element><d:element>xsqocvqrzbvzhdhtilugpvayirrnomupxinhihazfghqehqymeeaupuesseluinjgbedrarqluedjfx</d:element><d:element>eekuucympfgkucszfuggbmfglpnxnjvhkhalymhtfuggfafulkzedqlksoduqeyukzzhbbasjmee</d:element><d:element>ゾを九クそ</d:element></d:SpecificationsBag><d:PurchaseDate m:type="Edm.DateTime">2020-12-15T01:33:35.8014568</d:PurchaseDate><d:Dimensions m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions"><d:Width m:type="Edm.Decimal">-8917.92836319839</d:Width><d:Height m:type="Edm.Decimal">-79228162514264337593543950335</d:Height><d:Depth m:type="Edm.Decimal">-79228162514264337593543950335</d:Depth></d:Dimensions></m:properties></content></entry></feed>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/ComputerDetail/filter/hour(PurchaseDate) eq 1.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/ComputerDetail/filter/hour(PurchaseDate) eq 1.full.json b/fit/src/main/resources/V30/ComputerDetail/filter/hour(PurchaseDate) eq 1.full.json
index 6da7c6e..b991627 100644
--- a/fit/src/main/resources/V30/ComputerDetail/filter/hour(PurchaseDate) eq 1.full.json	
+++ b/fit/src/main/resources/V30/ComputerDetail/filter/hour(PurchaseDate) eq 1.full.json	
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#ComputerDetail","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)","odata.editLink":"ComputerDetail(-10)","Computer@odata.navigationLinkUrl":"ComputerDetail(-10)/Computer","#DefaultContainer.ResetComputerDetailsSpecifications":{"title":"ResetComputerDetailsSpecifications","target":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)/ResetComputerDetailsSpecifications"},"ComputerDetailId":-10,"Manufacturer":"sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk","Model":"usfvbkyxssojjebyzgvtnzkuik\u00dfuxrmllzyglnsssluyxf\u00dfssioyroouxafzbhbsabkrsslbyhghicjaplolzqss\u00dfhhfix","Serial":null,"SpecificationsBag@odata.type":"Collection(Edm.String)","SpecificationsBag":["vorjqalydmfuazkatkiydeicef
 rjhyuaupkfgbxiaehjrqhhqv","rbsejgfgelhsdahkoqlnzvbq","ssfvnnquahsczxlu\u00dfnssrhpsszluundy\u00dfehyzjedssxom","xsqocvqrzbvzhdhtilugpvayirrnomupxinhihazfghqehqymeeaupuesseluinjgbedrarqluedjfx","eekuucympfgkucszfuggbmfglpnxnjvhkhalymhtfuggfafulkzedqlksoduqeyukzzhbbasjmee","\u30be\u3092\u4e5d\u30af\u305d"],"PurchaseDate@odata.type":"Edm.DateTime","PurchaseDate":"2020-12-15T01:33:35.8014568","Dimensions":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"-8917.92836319839","Height@odata.type":"Edm.Decimal","Height":"-79228162514264337593543950335","Depth@odata.type":"Edm.Decimal","Depth":"-79228162514264337593543950335"}}]}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#ComputerDetail","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)","odata.editLink":"ComputerDetail(-10)","Computer@odata.navigationLinkUrl":"ComputerDetail(-10)/Computer","#DefaultContainer.ResetComputerDetailsSpecifications":{"title":"ResetComputerDetailsSpecifications","target":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)/ResetComputerDetailsSpecifications"},"ComputerDetailId":-10,"Manufacturer":"sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk","Model":"usfvbkyxssojjebyzgvtnzkuik\u00dfuxrmllzyglnsssluyxf\u00dfssioyroouxafzbhbsabkrsslbyhghicjaplolzqss\u00dfhhfix","Serial":null,"SpecificationsBag@odata.type":"Collection(Edm.String)","SpecificationsBag":["vorjqalydmfuazkatkiydei
 cefrjhyuaupkfgbxiaehjrqhhqv","rbsejgfgelhsdahkoqlnzvbq","ssfvnnquahsczxlu\u00dfnssrhpsszluundy\u00dfehyzjedssxom","xsqocvqrzbvzhdhtilugpvayirrnomupxinhihazfghqehqymeeaupuesseluinjgbedrarqluedjfx","eekuucympfgkucszfuggbmfglpnxnjvhkhalymhtfuggfafulkzedqlksoduqeyukzzhbbasjmee","\u30be\u3092\u4e5d\u30af\u305d"],"PurchaseDate@odata.type":"Edm.DateTime","PurchaseDate":"2020-12-15T01:33:35.8014568","Dimensions":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"-8917.92836319839","Height@odata.type":"Edm.Decimal","Height":"-79228162514264337593543950335","Depth@odata.type":"Edm.Decimal","Depth":"-79228162514264337593543950335"}}]}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/ComputerDetail/filter/hour(PurchaseDate) eq 1.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/ComputerDetail/filter/hour(PurchaseDate) eq 1.xml b/fit/src/main/resources/V30/ComputerDetail/filter/hour(PurchaseDate) eq 1.xml
index eba6eb1..62eff93 100644
--- a/fit/src/main/resources/V30/ComputerDetail/filter/hour(PurchaseDate) eq 1.xml	
+++ b/fit/src/main/resources/V30/ComputerDetail/filter/hour(PurchaseDate) eq 1.xml	
@@ -19,4 +19,4 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml"><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail</id><title type="text">ComputerDetail</title><updated>2014-02-13T14:31:05Z</updated><link rel="self" title="ComputerDetail" href="ComputerDetail" /><entry><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="ComputerDetail" href="ComputerDetail(-10)" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Comp
 uter" type="application/atom+xml;type=entry" title="Computer" href="ComputerDetail(-10)/Computer" /><title /><updated>2014-02-13T14:31:05Z</updated><author><name /><uri>usfvbkyxssojjebyzgvtnzkuikßuxrmllzyglnsssluyxfßssioyroouxafzbhbsabkrsslbyhghicjaplolzqssßhhfix</uri><email>sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk</email></author><m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ResetComputerDetailsSpecifications" title="ResetComputerDetailsSpecifications" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)/ResetComputerDetailsSpecifications" /><content type="application/xml"><m:properties><d:ComputerDetailId m:type="Edm.Int32">-10</d:ComputerDetailId><d:Manufacturer>sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk</d:Manufacturer><d:Model>usfvbkyxssojjebyzgvtnzkuikßuxrmllzyglnsssluyxfßssioyroouxafzbhbsabkrsslbyhghicjaplolzqssßhhfix</d
 :Model><d:Serial m:null="true" /><d:SpecificationsBag m:type="Collection(Edm.String)"><d:element>vorjqalydmfuazkatkiydeicefrjhyuaupkfgbxiaehjrqhhqv</d:element><d:element>rbsejgfgelhsdahkoqlnzvbq</d:element><d:element>ssfvnnquahsczxlußnssrhpsszluundyßehyzjedssxom</d:element><d:element>xsqocvqrzbvzhdhtilugpvayirrnomupxinhihazfghqehqymeeaupuesseluinjgbedrarqluedjfx</d:element><d:element>eekuucympfgkucszfuggbmfglpnxnjvhkhalymhtfuggfafulkzedqlksoduqeyukzzhbbasjmee</d:element><d:element>ゾを九クそ</d:element></d:SpecificationsBag><d:PurchaseDate m:type="Edm.DateTime">2020-12-15T01:33:35.8014568</d:PurchaseDate><d:Dimensions m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions"><d:Width m:type="Edm.Decimal">-8917.92836319839</d:Width><d:Height m:type="Edm.Decimal">-79228162514264337593543950335</d:Height><d:Depth m:type="Edm.Decimal">-79228162514264337593543950335</d:Depth></d:Dimensions></m:properties></content></entry></feed>
\ No newline at end of file
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml"><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail</id><title type="text">ComputerDetail</title><updated>2014-02-13T14:31:05Z</updated><link rel="self" title="ComputerDetail" href="ComputerDetail" /><entry><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="ComputerDetail" href="ComputerDetail(-10)" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/C
 omputer" type="application/atom+xml;type=entry" title="Computer" href="ComputerDetail(-10)/Computer" /><title /><updated>2014-02-13T14:31:05Z</updated><author><name /><uri>usfvbkyxssojjebyzgvtnzkuikßuxrmllzyglnsssluyxfßssioyroouxafzbhbsabkrsslbyhghicjaplolzqssßhhfix</uri><email>sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk</email></author><m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ResetComputerDetailsSpecifications" title="ResetComputerDetailsSpecifications" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)/ResetComputerDetailsSpecifications" /><content type="application/xml"><m:properties><d:ComputerDetailId m:type="Edm.Int32">-10</d:ComputerDetailId><d:Manufacturer>sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk</d:Manufacturer><d:Model>usfvbkyxssojjebyzgvtnzkuikßuxrmllzyglnsssluyxfßssioyroouxafzbhbsabkrsslbyhghicjaplolzqssßhhf
 ix</d:Model><d:Serial m:null="true" /><d:SpecificationsBag m:type="Collection(Edm.String)"><d:element>vorjqalydmfuazkatkiydeicefrjhyuaupkfgbxiaehjrqhhqv</d:element><d:element>rbsejgfgelhsdahkoqlnzvbq</d:element><d:element>ssfvnnquahsczxlußnssrhpsszluundyßehyzjedssxom</d:element><d:element>xsqocvqrzbvzhdhtilugpvayirrnomupxinhihazfghqehqymeeaupuesseluinjgbedrarqluedjfx</d:element><d:element>eekuucympfgkucszfuggbmfglpnxnjvhkhalymhtfuggfafulkzedqlksoduqeyukzzhbbasjmee</d:element><d:element>ゾを九クそ</d:element></d:SpecificationsBag><d:PurchaseDate m:type="Edm.DateTime">2020-12-15T01:33:35.8014568</d:PurchaseDate><d:Dimensions m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions"><d:Width m:type="Edm.Decimal">-8917.92836319839</d:Width><d:Height m:type="Edm.Decimal">-79228162514264337593543950335</d:Height><d:Depth m:type="Edm.Decimal">-79228162514264337593543950335</d:Depth></d:Dimensions></m:properties></content></entry></feed>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/ComputerDetail/filter/minute(PurchaseDate) eq 33.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/ComputerDetail/filter/minute(PurchaseDate) eq 33.full.json b/fit/src/main/resources/V30/ComputerDetail/filter/minute(PurchaseDate) eq 33.full.json
index 6da7c6e..b991627 100644
--- a/fit/src/main/resources/V30/ComputerDetail/filter/minute(PurchaseDate) eq 33.full.json	
+++ b/fit/src/main/resources/V30/ComputerDetail/filter/minute(PurchaseDate) eq 33.full.json	
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#ComputerDetail","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)","odata.editLink":"ComputerDetail(-10)","Computer@odata.navigationLinkUrl":"ComputerDetail(-10)/Computer","#DefaultContainer.ResetComputerDetailsSpecifications":{"title":"ResetComputerDetailsSpecifications","target":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)/ResetComputerDetailsSpecifications"},"ComputerDetailId":-10,"Manufacturer":"sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk","Model":"usfvbkyxssojjebyzgvtnzkuik\u00dfuxrmllzyglnsssluyxf\u00dfssioyroouxafzbhbsabkrsslbyhghicjaplolzqss\u00dfhhfix","Serial":null,"SpecificationsBag@odata.type":"Collection(Edm.String)","SpecificationsBag":["vorjqalydmfuazkatkiydeicef
 rjhyuaupkfgbxiaehjrqhhqv","rbsejgfgelhsdahkoqlnzvbq","ssfvnnquahsczxlu\u00dfnssrhpsszluundy\u00dfehyzjedssxom","xsqocvqrzbvzhdhtilugpvayirrnomupxinhihazfghqehqymeeaupuesseluinjgbedrarqluedjfx","eekuucympfgkucszfuggbmfglpnxnjvhkhalymhtfuggfafulkzedqlksoduqeyukzzhbbasjmee","\u30be\u3092\u4e5d\u30af\u305d"],"PurchaseDate@odata.type":"Edm.DateTime","PurchaseDate":"2020-12-15T01:33:35.8014568","Dimensions":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"-8917.92836319839","Height@odata.type":"Edm.Decimal","Height":"-79228162514264337593543950335","Depth@odata.type":"Edm.Decimal","Depth":"-79228162514264337593543950335"}}]}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#ComputerDetail","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)","odata.editLink":"ComputerDetail(-10)","Computer@odata.navigationLinkUrl":"ComputerDetail(-10)/Computer","#DefaultContainer.ResetComputerDetailsSpecifications":{"title":"ResetComputerDetailsSpecifications","target":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)/ResetComputerDetailsSpecifications"},"ComputerDetailId":-10,"Manufacturer":"sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk","Model":"usfvbkyxssojjebyzgvtnzkuik\u00dfuxrmllzyglnsssluyxf\u00dfssioyroouxafzbhbsabkrsslbyhghicjaplolzqss\u00dfhhfix","Serial":null,"SpecificationsBag@odata.type":"Collection(Edm.String)","SpecificationsBag":["vorjqalydmfuazkatkiydei
 cefrjhyuaupkfgbxiaehjrqhhqv","rbsejgfgelhsdahkoqlnzvbq","ssfvnnquahsczxlu\u00dfnssrhpsszluundy\u00dfehyzjedssxom","xsqocvqrzbvzhdhtilugpvayirrnomupxinhihazfghqehqymeeaupuesseluinjgbedrarqluedjfx","eekuucympfgkucszfuggbmfglpnxnjvhkhalymhtfuggfafulkzedqlksoduqeyukzzhbbasjmee","\u30be\u3092\u4e5d\u30af\u305d"],"PurchaseDate@odata.type":"Edm.DateTime","PurchaseDate":"2020-12-15T01:33:35.8014568","Dimensions":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"-8917.92836319839","Height@odata.type":"Edm.Decimal","Height":"-79228162514264337593543950335","Depth@odata.type":"Edm.Decimal","Depth":"-79228162514264337593543950335"}}]}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/ComputerDetail/filter/minute(PurchaseDate) eq 33.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/ComputerDetail/filter/minute(PurchaseDate) eq 33.xml b/fit/src/main/resources/V30/ComputerDetail/filter/minute(PurchaseDate) eq 33.xml
index eba6eb1..62eff93 100644
--- a/fit/src/main/resources/V30/ComputerDetail/filter/minute(PurchaseDate) eq 33.xml	
+++ b/fit/src/main/resources/V30/ComputerDetail/filter/minute(PurchaseDate) eq 33.xml	
@@ -19,4 +19,4 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml"><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail</id><title type="text">ComputerDetail</title><updated>2014-02-13T14:31:05Z</updated><link rel="self" title="ComputerDetail" href="ComputerDetail" /><entry><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="ComputerDetail" href="ComputerDetail(-10)" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Comp
 uter" type="application/atom+xml;type=entry" title="Computer" href="ComputerDetail(-10)/Computer" /><title /><updated>2014-02-13T14:31:05Z</updated><author><name /><uri>usfvbkyxssojjebyzgvtnzkuikßuxrmllzyglnsssluyxfßssioyroouxafzbhbsabkrsslbyhghicjaplolzqssßhhfix</uri><email>sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk</email></author><m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ResetComputerDetailsSpecifications" title="ResetComputerDetailsSpecifications" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)/ResetComputerDetailsSpecifications" /><content type="application/xml"><m:properties><d:ComputerDetailId m:type="Edm.Int32">-10</d:ComputerDetailId><d:Manufacturer>sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk</d:Manufacturer><d:Model>usfvbkyxssojjebyzgvtnzkuikßuxrmllzyglnsssluyxfßssioyroouxafzbhbsabkrsslbyhghicjaplolzqssßhhfix</d
 :Model><d:Serial m:null="true" /><d:SpecificationsBag m:type="Collection(Edm.String)"><d:element>vorjqalydmfuazkatkiydeicefrjhyuaupkfgbxiaehjrqhhqv</d:element><d:element>rbsejgfgelhsdahkoqlnzvbq</d:element><d:element>ssfvnnquahsczxlußnssrhpsszluundyßehyzjedssxom</d:element><d:element>xsqocvqrzbvzhdhtilugpvayirrnomupxinhihazfghqehqymeeaupuesseluinjgbedrarqluedjfx</d:element><d:element>eekuucympfgkucszfuggbmfglpnxnjvhkhalymhtfuggfafulkzedqlksoduqeyukzzhbbasjmee</d:element><d:element>ゾを九クそ</d:element></d:SpecificationsBag><d:PurchaseDate m:type="Edm.DateTime">2020-12-15T01:33:35.8014568</d:PurchaseDate><d:Dimensions m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions"><d:Width m:type="Edm.Decimal">-8917.92836319839</d:Width><d:Height m:type="Edm.Decimal">-79228162514264337593543950335</d:Height><d:Depth m:type="Edm.Decimal">-79228162514264337593543950335</d:Depth></d:Dimensions></m:properties></content></entry></feed>
\ No newline at end of file
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml"><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail</id><title type="text">ComputerDetail</title><updated>2014-02-13T14:31:05Z</updated><link rel="self" title="ComputerDetail" href="ComputerDetail" /><entry><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="ComputerDetail" href="ComputerDetail(-10)" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/C
 omputer" type="application/atom+xml;type=entry" title="Computer" href="ComputerDetail(-10)/Computer" /><title /><updated>2014-02-13T14:31:05Z</updated><author><name /><uri>usfvbkyxssojjebyzgvtnzkuikßuxrmllzyglnsssluyxfßssioyroouxafzbhbsabkrsslbyhghicjaplolzqssßhhfix</uri><email>sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk</email></author><m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ResetComputerDetailsSpecifications" title="ResetComputerDetailsSpecifications" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)/ResetComputerDetailsSpecifications" /><content type="application/xml"><m:properties><d:ComputerDetailId m:type="Edm.Int32">-10</d:ComputerDetailId><d:Manufacturer>sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk</d:Manufacturer><d:Model>usfvbkyxssojjebyzgvtnzkuikßuxrmllzyglnsssluyxfßssioyroouxafzbhbsabkrsslbyhghicjaplolzqssßhhf
 ix</d:Model><d:Serial m:null="true" /><d:SpecificationsBag m:type="Collection(Edm.String)"><d:element>vorjqalydmfuazkatkiydeicefrjhyuaupkfgbxiaehjrqhhqv</d:element><d:element>rbsejgfgelhsdahkoqlnzvbq</d:element><d:element>ssfvnnquahsczxlußnssrhpsszluundyßehyzjedssxom</d:element><d:element>xsqocvqrzbvzhdhtilugpvayirrnomupxinhihazfghqehqymeeaupuesseluinjgbedrarqluedjfx</d:element><d:element>eekuucympfgkucszfuggbmfglpnxnjvhkhalymhtfuggfafulkzedqlksoduqeyukzzhbbasjmee</d:element><d:element>ゾを九クそ</d:element></d:SpecificationsBag><d:PurchaseDate m:type="Edm.DateTime">2020-12-15T01:33:35.8014568</d:PurchaseDate><d:Dimensions m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions"><d:Width m:type="Edm.Decimal">-8917.92836319839</d:Width><d:Height m:type="Edm.Decimal">-79228162514264337593543950335</d:Height><d:Depth m:type="Edm.Decimal">-79228162514264337593543950335</d:Depth></d:Dimensions></m:properties></content></entry></feed>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/ComputerDetail/filter/month(PurchaseDate) eq 12.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/ComputerDetail/filter/month(PurchaseDate) eq 12.full.json b/fit/src/main/resources/V30/ComputerDetail/filter/month(PurchaseDate) eq 12.full.json
index 725acf3..5326559 100644
--- a/fit/src/main/resources/V30/ComputerDetail/filter/month(PurchaseDate) eq 12.full.json	
+++ b/fit/src/main/resources/V30/ComputerDetail/filter/month(PurchaseDate) eq 12.full.json	
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#ComputerDetail","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)","odata.editLink":"ComputerDetail(-10)","Computer@odata.navigationLinkUrl":"ComputerDetail(-10)/Computer","#DefaultContainer.ResetComputerDetailsSpecifications":{"title":"ResetComputerDetailsSpecifications","target":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)/ResetComputerDetailsSpecifications"},"ComputerDetailId":-10,"Manufacturer":"sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk","Model":"usfvbkyxssojjebyzgvtnzkuik\u00dfuxrmllzyglnsssluyxf\u00dfssioyroouxafzbhbsabkrsslbyhghicjaplolzqss\u00dfhhfix","Serial":null,"SpecificationsBag@odata.type":"Collection(Edm.String)","SpecificationsBag":["vorjqalydmfuazkatkiydeicef
 rjhyuaupkfgbxiaehjrqhhqv","rbsejgfgelhsdahkoqlnzvbq","ssfvnnquahsczxlu\u00dfnssrhpsszluundy\u00dfehyzjedssxom","xsqocvqrzbvzhdhtilugpvayirrnomupxinhihazfghqehqymeeaupuesseluinjgbedrarqluedjfx","eekuucympfgkucszfuggbmfglpnxnjvhkhalymhtfuggfafulkzedqlksoduqeyukzzhbbasjmee","\u30be\u3092\u4e5d\u30af\u305d"],"PurchaseDate@odata.type":"Edm.DateTime","PurchaseDate":"2020-12-15T01:33:35.8014568","Dimensions":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"-8917.92836319839","Height@odata.type":"Edm.Decimal","Height":"-79228162514264337593543950335","Depth@odata.type":"Edm.Decimal","Depth":"-79228162514264337593543950335"}},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-1)","odata.editLink":"ComputerDetail(-1)","Computer@odata.navigationLinkUrl":"ComputerDetail(-1)/Computer","#Default
 Container.ResetComputerDetailsSpecifications":{"title":"ResetComputerDetailsSpecifications","target":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-1)/ResetComputerDetailsSpecifications"},"ComputerDetailId":-1,"Manufacturer":"cybsycxhjrazcaxf","Model":"mfhgyi\u00dfxesckygsslbksqvcpohjienkcfbtrssp","Serial":"\u3042\u30a1\u30df\u30be\u30c0\u305c\u88f9\u3042\u30bc\u305e\u3093\u531a\u755a\u30d0\u3092\u30df\u307c\uff66\u30bd\uff9d\u88f9\u307d\u30cf\u30be\u9ed1\u307c\u3073","SpecificationsBag@odata.type":"Collection(Edm.String)","SpecificationsBag":["\u30c1\u6b32\u30a1\u30df\u755a\u73f1\u30dc\u6b32\u3092\u3074\uff9d\u305f\u30a1\u9ed1\u30bf\u30a1\u305d\u30af\u307b\u30a1\u9ed1\u30bc\u755a\u30b0\u5f0c\u4e9c\u307b\u30c1\u3092\uff41\u3079\u3042\u30bf","\u30bf\u7e37\u30bd\u755a\u30dc\u305f\u3072\u66a6\u88f9\u305e\u307d\u30c1\u30b0\uff41\u3041\u30a1\u4e9c\u30c1\u30bc\u3072\uff5a\uff88\uff41\u305c\u30dc\u0451\u30bf\u30b0\uff88\u9ed1\u30d0\u30bf\u3073\u30
 c1\u5f0c\u307b\u9ed1\u30b0\u30de\u4e9c\u307c\u3042\u30bd\u30dd\u30be\u30dd\u3079\u30af\u755a\u755a\u3092\uff66\u30b0\u30c1\u042f\u30c1\uff5a\u30a1\u307b\u30c1\u30dc\u531a\u6b32\uff9d\u30bf\u30df\u30bc\u5f0c\u305e\u6b32\u30bc\u30bc\u755a\u30dd\u88f9\u7e37\u30be\u307c\u30d0\uff66\u6b79\u3072\u30be\u305d\u30dc\u30dd\u3072\u30dc\u30c1\u307b\u307e\u30cf\u305e\u305d\u305f\u30bd","udjcekzitroessd","shxnubznxdumkraixsjsskrspkss","vugqblidbkbfkppfbbkanvnflueqdousryyhhucoxtpbbnyeecbsauzaceu","aerlqnsczh\u00dfgivchizyapazitnsszugryqlupnu\u00dfjgxg","\u3042\u3079\u66a6\u88f9\uff5a\u307d\u30bf\u30be\u6b79\u044f\u3072\u30c1\u30df\u305b\u30c1\u4e9c\u3042\u30c1\u4e5d\u305e\u30df\u30dc\u0451\u30dc\u66a6\u30a1\u9ed1\u30bd\u30dd\u531a\u30dd\u3042\u30a1\u305b\u30bd\u4e9c\u305e\u307c\u30bc\u30b0\u30a1\u305f\u30dc\u4e5d\u30bc\uff88\u044f\u88f9\u6b79\u30d0\u4e9c\u4e9c\u305c\u30d0\uff41\u30bd\u3073\u3072\u305b\u30d0\u30a1\u3042\u6b79\u3042\u30a1\u305c"],"PurchaseDate@odata.type":"Edm.DateTime","PurchaseDat
 e":"9999-12-31T23:59:59.9999999","Dimensions":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"-69.6411071913679","Height@odata.type":"Edm.Decimal","Height":"1451.59900018645","Depth@odata.type":"Edm.Decimal","Depth":"-79228162514264337593543950335"}}]}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#ComputerDetail","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)","odata.editLink":"ComputerDetail(-10)","Computer@odata.navigationLinkUrl":"ComputerDetail(-10)/Computer","#DefaultContainer.ResetComputerDetailsSpecifications":{"title":"ResetComputerDetailsSpecifications","target":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)/ResetComputerDetailsSpecifications"},"ComputerDetailId":-10,"Manufacturer":"sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk","Model":"usfvbkyxssojjebyzgvtnzkuik\u00dfuxrmllzyglnsssluyxf\u00dfssioyroouxafzbhbsabkrsslbyhghicjaplolzqss\u00dfhhfix","Serial":null,"SpecificationsBag@odata.type":"Collection(Edm.String)","SpecificationsBag":["vorjqalydmfuazkatkiydei
 cefrjhyuaupkfgbxiaehjrqhhqv","rbsejgfgelhsdahkoqlnzvbq","ssfvnnquahsczxlu\u00dfnssrhpsszluundy\u00dfehyzjedssxom","xsqocvqrzbvzhdhtilugpvayirrnomupxinhihazfghqehqymeeaupuesseluinjgbedrarqluedjfx","eekuucympfgkucszfuggbmfglpnxnjvhkhalymhtfuggfafulkzedqlksoduqeyukzzhbbasjmee","\u30be\u3092\u4e5d\u30af\u305d"],"PurchaseDate@odata.type":"Edm.DateTime","PurchaseDate":"2020-12-15T01:33:35.8014568","Dimensions":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"-8917.92836319839","Height@odata.type":"Edm.Decimal","Height":"-79228162514264337593543950335","Depth@odata.type":"Edm.Decimal","Depth":"-79228162514264337593543950335"}},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-1)","odata.editLink":"ComputerDetail(-1)","Computer@odata.navigationLinkUrl":"ComputerDetail(-1)/Computer","#Def
 aultContainer.ResetComputerDetailsSpecifications":{"title":"ResetComputerDetailsSpecifications","target":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-1)/ResetComputerDetailsSpecifications"},"ComputerDetailId":-1,"Manufacturer":"cybsycxhjrazcaxf","Model":"mfhgyi\u00dfxesckygsslbksqvcpohjienkcfbtrssp","Serial":"\u3042\u30a1\u30df\u30be\u30c0\u305c\u88f9\u3042\u30bc\u305e\u3093\u531a\u755a\u30d0\u3092\u30df\u307c\uff66\u30bd\uff9d\u88f9\u307d\u30cf\u30be\u9ed1\u307c\u3073","SpecificationsBag@odata.type":"Collection(Edm.String)","SpecificationsBag":["\u30c1\u6b32\u30a1\u30df\u755a\u73f1\u30dc\u6b32\u3092\u3074\uff9d\u305f\u30a1\u9ed1\u30bf\u30a1\u305d\u30af\u307b\u30a1\u9ed1\u30bc\u755a\u30b0\u5f0c\u4e9c\u307b\u30c1\u3092\uff41\u3079\u3042\u30bf","\u30bf\u7e37\u30bd\u755a\u30dc\u305f\u3072\u66a6\u88f9\u305e\u307d\u30c1\u30b0\uff41\u3041\u30a1\u4e9c\u30c1\u30bc\u3072\uff5a\uff88\uff41\u305c\u30dc\u0451\u30bf\u30b0\uff88\u9ed1\u30d0\u30bf\u307
 3\u30c1\u5f0c\u307b\u9ed1\u30b0\u30de\u4e9c\u307c\u3042\u30bd\u30dd\u30be\u30dd\u3079\u30af\u755a\u755a\u3092\uff66\u30b0\u30c1\u042f\u30c1\uff5a\u30a1\u307b\u30c1\u30dc\u531a\u6b32\uff9d\u30bf\u30df\u30bc\u5f0c\u305e\u6b32\u30bc\u30bc\u755a\u30dd\u88f9\u7e37\u30be\u307c\u30d0\uff66\u6b79\u3072\u30be\u305d\u30dc\u30dd\u3072\u30dc\u30c1\u307b\u307e\u30cf\u305e\u305d\u305f\u30bd","udjcekzitroessd","shxnubznxdumkraixsjsskrspkss","vugqblidbkbfkppfbbkanvnflueqdousryyhhucoxtpbbnyeecbsauzaceu","aerlqnsczh\u00dfgivchizyapazitnsszugryqlupnu\u00dfjgxg","\u3042\u3079\u66a6\u88f9\uff5a\u307d\u30bf\u30be\u6b79\u044f\u3072\u30c1\u30df\u305b\u30c1\u4e9c\u3042\u30c1\u4e5d\u305e\u30df\u30dc\u0451\u30dc\u66a6\u30a1\u9ed1\u30bd\u30dd\u531a\u30dd\u3042\u30a1\u305b\u30bd\u4e9c\u305e\u307c\u30bc\u30b0\u30a1\u305f\u30dc\u4e5d\u30bc\uff88\u044f\u88f9\u6b79\u30d0\u4e9c\u4e9c\u305c\u30d0\uff41\u30bd\u3073\u3072\u305b\u30d0\u30a1\u3042\u6b79\u3042\u30a1\u305c"],"PurchaseDate@odata.type":"Edm.DateTime","Purcha
 seDate":"9999-12-31T23:59:59.9999999","Dimensions":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"-69.6411071913679","Height@odata.type":"Edm.Decimal","Height":"1451.59900018645","Depth@odata.type":"Edm.Decimal","Depth":"-79228162514264337593543950335"}}]}
\ No newline at end of file


[19/20] [OLINGO-377] Removing unused cargo properties, upgrading Tomcat, renaming cargo.servlet.port to tomcat.servlet.port

Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/(VIN lt 16).xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/(VIN lt 16).xml b/fit/src/main/resources/V30/Car/filter/(VIN lt 16).xml
index d8d4e1b..dbe2139 100644
--- a/fit/src/main/resources/V30/Car/filter/(VIN lt 16).xml	
+++ b/fit/src/main/resources/V30/Car/filter/(VIN lt 16).xml	
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car</id>
   <title type="text">Car</title>
   <updated>2014-02-13T12:09:31Z</updated>
   <link rel="self" title="Car" href="Car" />
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(11)" />
     <title />
@@ -43,7 +43,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(12)" />
     <title />
@@ -61,7 +61,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(13)" />
     <title />
@@ -79,7 +79,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(14)" />
     <title />
@@ -97,7 +97,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(15)" />
     <title />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/(length(Description) gt (VIN add 10)).full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/(length(Description) gt (VIN add 10)).full.json b/fit/src/main/resources/V30/Car/filter/(length(Description) gt (VIN add 10)).full.json
index 5cf721a..a6ab6ed 100644
--- a/fit/src/main/resources/V30/Car/filter/(length(Description) gt (VIN add 10)).full.json	
+++ b/fit/src/main/resources/V30/Car/filter/(length(Description) gt (VIN add 10)).full.json	
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)","odata.editLink":"Car(11)","odata.mediaEditLink":"Car(11)/$value","odata.mediaReadLink":"Car(11)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(11)/Photo","Video@odata.mediaEditLink":"Car(11)/Video","VIN":11,"Description":"cenbviijieljtrtdslbuiqubcvhxhzenidqdnaopplvlqc"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)","odata.editLink":"Car(14)","odata.mediaEditLink":"Car(14)/$value","odata.mediaReadLink":"Car(14)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(14)/Photo","Video@odata.mediaEditLink":"C
 ar(14)/Video","VIN":14,"Description":"New Description(1392222565917)"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(17)","odata.editLink":"Car(17)","odata.mediaEditLink":"Car(17)/$value","odata.mediaReadLink":"Car(17)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(17)/Photo","Video@odata.mediaEditLink":"Car(17)/Video","VIN":17,"Description":"\u307e\u30a1\u30c1\u30dc\u042f\u66a6\u30de\u30c1\u307e\u531a\u3041\u305d\u30bf\u3093\u30bc\u3073\u305f\u30c1\u307b\u9ed1\u30dd\u3073\u3041\u30bd\u0451\u3093\u6b32\u6b32\uff66\u3092\u30a1\u30a1\u30dd\u3074\u30b0\u4e9c\u30c1\u30dd\u30b0\uff66\u30df\u305d\u30cf\u305b\u30bc\u73f1\u30bc\u305c\u305b\u30dd\u30bc\u30bc\uff41\u88f9\u9ed1\u305d\u307e\u305d\u30c1"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.sv
 c/Car(18)","odata.editLink":"Car(18)","odata.mediaEditLink":"Car(18)/$value","odata.mediaReadLink":"Car(18)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(18)/Photo","Video@odata.mediaEditLink":"Car(18)/Video","VIN":18,"Description":"\u0451\u30bc\u30dc\u30bf\u3072\u3079\u30d0\u30bf\u305e\u30a1\u044f\u042f\u755a\u30c0\u30bd\u30be\u30be\u042f\u6b79\u307a\u30dc\u305c\u305f\u30bd\u755a\u73f1\u30de\u6b32\u30de\u30b0\u3042\u755a\u4e5d\u30a1\u755a\u30de\u30b0\u88f9\u30df\u30bc\u30a1\u6b32\u30bd\u5f0c\u755a\u30de\u5f0c\u30c1\u66a6\u30a1\u30dc\u305c\u88f9\u30df\u042f\uff41\u307c\u3072\u30dd\u3092\u30be\u5f0c\u6b79"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(19)","odata.editLink":"Car(19)","odata.mediaEditLink":"Car(19)/$value","odata.mediaReadLink":"Car(19)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(19)/Photo","Video@odat
 a.mediaEditLink":"Car(19)/Video","VIN":19,"Description":"bdssgpfovhjbzevqmgqxxkejsdhvtxug\u00df\u00df\u00dfj\u00dffdd\u00dflsshrygytoginhrgoydicmj\u00dfcebzehqbegxgmsu"}]}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)","odata.editLink":"Car(11)","odata.mediaEditLink":"Car(11)/$value","odata.mediaReadLink":"Car(11)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(11)/Photo","Video@odata.mediaEditLink":"Car(11)/Video","VIN":11,"Description":"cenbviijieljtrtdslbuiqubcvhxhzenidqdnaopplvlqc"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)","odata.editLink":"Car(14)","odata.mediaEditLink":"Car(14)/$value","odata.mediaReadLink":"Car(14)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(14)/Photo","Video@odata.mediaEditLink"
 :"Car(14)/Video","VIN":14,"Description":"New Description(1392222565917)"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(17)","odata.editLink":"Car(17)","odata.mediaEditLink":"Car(17)/$value","odata.mediaReadLink":"Car(17)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(17)/Photo","Video@odata.mediaEditLink":"Car(17)/Video","VIN":17,"Description":"\u307e\u30a1\u30c1\u30dc\u042f\u66a6\u30de\u30c1\u307e\u531a\u3041\u305d\u30bf\u3093\u30bc\u3073\u305f\u30c1\u307b\u9ed1\u30dd\u3073\u3041\u30bd\u0451\u3093\u6b32\u6b32\uff66\u3092\u30a1\u30a1\u30dd\u3074\u30b0\u4e9c\u30c1\u30dd\u30b0\uff66\u30df\u305d\u30cf\u305b\u30bc\u73f1\u30bc\u305c\u305b\u30dd\u30bc\u30bc\uff41\u88f9\u9ed1\u305d\u307e\u305d\u30c1"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Stat
 ic.svc/Car(18)","odata.editLink":"Car(18)","odata.mediaEditLink":"Car(18)/$value","odata.mediaReadLink":"Car(18)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(18)/Photo","Video@odata.mediaEditLink":"Car(18)/Video","VIN":18,"Description":"\u0451\u30bc\u30dc\u30bf\u3072\u3079\u30d0\u30bf\u305e\u30a1\u044f\u042f\u755a\u30c0\u30bd\u30be\u30be\u042f\u6b79\u307a\u30dc\u305c\u305f\u30bd\u755a\u73f1\u30de\u6b32\u30de\u30b0\u3042\u755a\u4e5d\u30a1\u755a\u30de\u30b0\u88f9\u30df\u30bc\u30a1\u6b32\u30bd\u5f0c\u755a\u30de\u5f0c\u30c1\u66a6\u30a1\u30dc\u305c\u88f9\u30df\u042f\uff41\u307c\u3072\u30dd\u3092\u30be\u5f0c\u6b79"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(19)","odata.editLink":"Car(19)","odata.mediaEditLink":"Car(19)/$value","odata.mediaReadLink":"Car(19)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(19)/Photo","Vide
 o@odata.mediaEditLink":"Car(19)/Video","VIN":19,"Description":"bdssgpfovhjbzevqmgqxxkejsdhvtxug\u00df\u00df\u00dfj\u00dffdd\u00dflsshrygytoginhrgoydicmj\u00dfcebzehqbegxgmsu"}]}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/(length(Description) gt (VIN add 10)).xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/(length(Description) gt (VIN add 10)).xml b/fit/src/main/resources/V30/Car/filter/(length(Description) gt (VIN add 10)).xml
index 5c7f72a..54c5f82 100644
--- a/fit/src/main/resources/V30/Car/filter/(length(Description) gt (VIN add 10)).xml	
+++ b/fit/src/main/resources/V30/Car/filter/(length(Description) gt (VIN add 10)).xml	
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car</id>
   <title type="text">Car</title>
   <updated>2014-02-13T12:09:31Z</updated>
   <link rel="self" title="Car" href="Car" />
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(11)" />
     <title />
@@ -43,7 +43,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(14)" />
     <title />
@@ -61,7 +61,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(17)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(17)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(17)" />
     <title />
@@ -79,7 +79,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(18)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(18)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(18)" />
     <title />
@@ -97,7 +97,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(19)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(19)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(19)" />
     <title />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/VIN add 5 lt 11.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/VIN add 5 lt 11.full.json b/fit/src/main/resources/V30/Car/filter/VIN add 5 lt 11.full.json
index d84044a..3054976 100644
--- a/fit/src/main/resources/V30/Car/filter/VIN add 5 lt 11.full.json	
+++ b/fit/src/main/resources/V30/Car/filter/VIN add 5 lt 11.full.json	
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[]}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[]}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/VIN add 5 lt 11.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/VIN add 5 lt 11.xml b/fit/src/main/resources/V30/Car/filter/VIN add 5 lt 11.xml
index 258dbb6..baf1c3a 100644
--- a/fit/src/main/resources/V30/Car/filter/VIN add 5 lt 11.xml	
+++ b/fit/src/main/resources/V30/Car/filter/VIN add 5 lt 11.xml	
@@ -19,10 +19,10 @@
   under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom"
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom"
   xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"
   xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:x${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car</id>
+  <id>http://localhost:x${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car</id>
   <title type="text">Car</title>
   <updated>2014-02-13T14:31:04Z</updated>
   <link rel="self" title="Car" href="Car" />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/VIN div 2 le 8.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/VIN div 2 le 8.full.json b/fit/src/main/resources/V30/Car/filter/VIN div 2 le 8.full.json
index 7dd31eb..21e90ac 100644
--- a/fit/src/main/resources/V30/Car/filter/VIN div 2 le 8.full.json	
+++ b/fit/src/main/resources/V30/Car/filter/VIN div 2 le 8.full.json	
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)","odata.editLink":"Car(11)","odata.mediaEditLink":"Car(11)/$value","odata.mediaReadLink":"Car(11)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(11)/Photo","Video@odata.mediaEditLink":"Car(11)/Video","VIN":11,"Description":"cenbviijieljtrtdslbuiqubcvhxhzenidqdnaopplvlqc"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)","odata.editLink":"Car(12)","odata.mediaEditLink":"Car(12)/$value","odata.mediaReadLink":"Car(12)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(12)/Photo","Video@odata.mediaEditLink":"Car(12)/Video","VIN":12,"Description":"lx"}
 ,{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)","odata.editLink":"Car(13)","odata.mediaEditLink":"Car(13)/$value","odata.mediaReadLink":"Car(13)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(13)/Photo","Video@odata.mediaEditLink":"Car(13)/Video","VIN":13,"Description":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)","odata.editLink":"Car(14)","odata.mediaEditLink":"Car(14)/$value","odata.mediaReadLink":"Car(14)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(14)/Photo","Video@odata.mediaEditLink":"Car(14)/Video","VIN":14,"Description":"\u755a\u30c1\u3073\uff9d\u3041\u3042\u044f\u307e\u3074\u3072\u30bf\u30d0\u30a1\uff9d\u3074\u6b79\u30c1\u6b79\u6b79\u30a1\u307e\u30de\u305e\u73f1\u66a6\u307c\u6b79\
 u30b0\u73f1\u30dc\u30c1\u30bf\u3073\u30bc\u30bd\u30bc\u305f\u30b0\u0451\u307e\u755a\uff41\u755a\u6b79\u531a\u755a\u30a1\u30bc\u531a\u042f\u6b32\u531a\u30c1\u30c1\u30dc\u3073\u30bd\u30a1\u3074\u66a6\u307a\u30dd\u30bd\u30c1\u30d0\u042f\u30bc\u9ed1\u30c0\u531a\u30de\u3073\u66a6\u30c0\u30bd\u30af\u6b79\u307e\u3042\uff41\u88f9\u30bd\u30cf\u6b79\u66a6\u5f0c\uff41\u30d0\u66a6\u307d\uff88"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)","odata.editLink":"Car(15)","odata.mediaEditLink":"Car(15)/$value","odata.mediaReadLink":"Car(15)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(15)/Photo","Video@odata.mediaEditLink":"Car(15)/Video","VIN":15,"Description":"kphszztczthjacvjnttrarxru"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(16)","od
 ata.editLink":"Car(16)","odata.mediaEditLink":"Car(16)/$value","odata.mediaReadLink":"Car(16)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(16)/Photo","Video@odata.mediaEditLink":"Car(16)/Video","VIN":16,"Description":"\u3041\u30bc\u3092\u3042\u30af\u3073\u30bc\u30bc\u30a1\u30a1\u305b\u30de\u307b\u30b0\u30bd\u30d0\u305b\u0451\u88f9\uff66\u307d\uff9d\u30a1"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(17)","odata.editLink":"Car(17)","odata.mediaEditLink":"Car(17)/$value","odata.mediaReadLink":"Car(17)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(17)/Photo","Video@odata.mediaEditLink":"Car(17)/Video","VIN":17,"Description":"\u307e\u30a1\u30c1\u30dc\u042f\u66a6\u30de\u30c1\u307e\u531a\u3041\u305d\u30bf\u3093\u30bc\u3073\u305f\u30c1\u307b\u9ed1\u30dd\u3073\u3041\u30bd\u0451\u3093\u6b32\u6b32\uff66\u3092\u30a1\u30a1\u30d
 d\u3074\u30b0\u4e9c\u30c1\u30dd\u30b0\uff66\u30df\u305d\u30cf\u305b\u30bc\u73f1\u30bc\u305c\u305b\u30dd\u30bc\u30bc\uff41\u88f9\u9ed1\u305d\u307e\u305d\u30c1"}]}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)","odata.editLink":"Car(11)","odata.mediaEditLink":"Car(11)/$value","odata.mediaReadLink":"Car(11)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(11)/Photo","Video@odata.mediaEditLink":"Car(11)/Video","VIN":11,"Description":"cenbviijieljtrtdslbuiqubcvhxhzenidqdnaopplvlqc"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)","odata.editLink":"Car(12)","odata.mediaEditLink":"Car(12)/$value","odata.mediaReadLink":"Car(12)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(12)/Photo","Video@odata.mediaEditLink":"Car(12)/Video","VIN":12,"Description":"l
 x"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)","odata.editLink":"Car(13)","odata.mediaEditLink":"Car(13)/$value","odata.mediaReadLink":"Car(13)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(13)/Photo","Video@odata.mediaEditLink":"Car(13)/Video","VIN":13,"Description":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)","odata.editLink":"Car(14)","odata.mediaEditLink":"Car(14)/$value","odata.mediaReadLink":"Car(14)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(14)/Photo","Video@odata.mediaEditLink":"Car(14)/Video","VIN":14,"Description":"\u755a\u30c1\u3073\uff9d\u3041\u3042\u044f\u307e\u3074\u3072\u30bf\u30d0\u30a1\uff9d\u3074\u6b79\u30c1\u6b79\u6b79\u30a1\u307e\u30de\u305e\u73f1\u66a6\u307c\u
 6b79\u30b0\u73f1\u30dc\u30c1\u30bf\u3073\u30bc\u30bd\u30bc\u305f\u30b0\u0451\u307e\u755a\uff41\u755a\u6b79\u531a\u755a\u30a1\u30bc\u531a\u042f\u6b32\u531a\u30c1\u30c1\u30dc\u3073\u30bd\u30a1\u3074\u66a6\u307a\u30dd\u30bd\u30c1\u30d0\u042f\u30bc\u9ed1\u30c0\u531a\u30de\u3073\u66a6\u30c0\u30bd\u30af\u6b79\u307e\u3042\uff41\u88f9\u30bd\u30cf\u6b79\u66a6\u5f0c\uff41\u30d0\u66a6\u307d\uff88"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)","odata.editLink":"Car(15)","odata.mediaEditLink":"Car(15)/$value","odata.mediaReadLink":"Car(15)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(15)/Photo","Video@odata.mediaEditLink":"Car(15)/Video","VIN":15,"Description":"kphszztczthjacvjnttrarxru"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(1
 6)","odata.editLink":"Car(16)","odata.mediaEditLink":"Car(16)/$value","odata.mediaReadLink":"Car(16)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(16)/Photo","Video@odata.mediaEditLink":"Car(16)/Video","VIN":16,"Description":"\u3041\u30bc\u3092\u3042\u30af\u3073\u30bc\u30bc\u30a1\u30a1\u305b\u30de\u307b\u30b0\u30bd\u30d0\u305b\u0451\u88f9\uff66\u307d\uff9d\u30a1"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(17)","odata.editLink":"Car(17)","odata.mediaEditLink":"Car(17)/$value","odata.mediaReadLink":"Car(17)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(17)/Photo","Video@odata.mediaEditLink":"Car(17)/Video","VIN":17,"Description":"\u307e\u30a1\u30c1\u30dc\u042f\u66a6\u30de\u30c1\u307e\u531a\u3041\u305d\u30bf\u3093\u30bc\u3073\u305f\u30c1\u307b\u9ed1\u30dd\u3073\u3041\u30bd\u0451\u3093\u6b32\u6b32\uff66\u3092\u30a1\u3
 0a1\u30dd\u3074\u30b0\u4e9c\u30c1\u30dd\u30b0\uff66\u30df\u305d\u30cf\u305b\u30bc\u73f1\u30bc\u305c\u305b\u30dd\u30bc\u30bc\uff41\u88f9\u9ed1\u305d\u307e\u305d\u30c1"}]}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/VIN div 2 le 8.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/VIN div 2 le 8.xml b/fit/src/main/resources/V30/Car/filter/VIN div 2 le 8.xml
index 224f8cd..dc5f512 100644
--- a/fit/src/main/resources/V30/Car/filter/VIN div 2 le 8.xml	
+++ b/fit/src/main/resources/V30/Car/filter/VIN div 2 le 8.xml	
@@ -19,4 +19,4 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml"><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car</id><title type="text">Car</title><updated>2014-02-13T14:31:04Z</updated><link rel="self" title="Car" href="Car" /><entry><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(11)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Phot
 o" href="Car(11)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(11)/Video" /><link rel="edit-media" title="Car" href="Car(11)/$value" /><content type="*/*" src="Car(11)/$value" /><m:properties><d:VIN m:type="Edm.Int32">11</d:VIN><d:Description>cenbviijieljtrtdslbuiqubcvhxhzenidqdnaopplvlqc</d:Description></m:properties></entry><entry><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(12)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(12)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(12)/Video" /
 ><link rel="edit-media" title="Car" href="Car(12)/$value" /><content type="*/*" src="Car(12)/$value" /><m:properties><d:VIN m:type="Edm.Int32">12</d:VIN><d:Description>lx</d:Description></m:properties></entry><entry><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(13)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(13)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(13)/Video" /><link rel="edit-media" title="Car" href="Car(13)/$value" /><content type="*/*" src="Car(13)/$value" /><m:properties><d:VIN m:type="Edm.Int32">13</d:VIN><d:Description m:null="true" /></m:p
 roperties></entry><entry><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(14)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(14)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(14)/Video" /><link rel="edit-media" title="Car" href="Car(14)/$value" /><content type="*/*" src="Car(14)/$value" /><m:properties><d:VIN m:type="Edm.Int32">14</d:VIN><d:Description>畚チびンぁあяまぴひタバァンぴ歹チ歹歹ァまマぞ珱暦ぼ歹グ珱ボチタびゼソゼたグёま畚a畚歹匚畚ァゼ匚Я欲匚チチボびソァぴ暦ぺポソチバЯゼ黑ダ匚マび
 暦ダソク歹まあa裹ソハ歹暦弌aバ暦ぽネ</d:Description></m:properties></entry><entry><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(15)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(15)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(15)/Video" /><link rel="edit-media" title="Car" href="Car(15)/$value" /><content type="*/*" src="Car(15)/$value" /><m:properties><d:VIN m:type="Edm.Int32">15</d:VIN><d:Description>kphszztczthjacvjnttrarxru</d:Description></m:properties></entry><entry><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V
 30/Static.svc/Car(16)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(16)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(16)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(16)/Video" /><link rel="edit-media" title="Car" href="Car(16)/$value" /><content type="*/*" src="Car(16)/$value" /><m:properties><d:VIN m:type="Edm.Int32">16</d:VIN><d:Description>ぁゼをあクびゼゼァァせマほグソバせё裹ヲぽンァ</d:Description></m:properties></entry><entry><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(17)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.m
 icrosoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(17)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(17)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(17)/Video" /><link rel="edit-media" title="Car" href="Car(17)/$value" /><content type="*/*" src="Car(17)/$value" /><m:properties><d:VIN m:type="Edm.Int32">17</d:VIN><d:Description>まァチボЯ暦マチま匚ぁそタんゼびたチほ黑ポびぁソёん欲欲ヲをァァポぴグ亜チポグヲミそハせゼ珱ゼぜせポゼゼa裹黑そまそチ</d:Description></m:properties></entry></feed>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml"><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car</id><title type="text">Car</title><updated>2014-02-13T14:31:04Z</updated><link rel="self" title="Car" href="Car" /><entry><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(11)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="P
 hoto" href="Car(11)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(11)/Video" /><link rel="edit-media" title="Car" href="Car(11)/$value" /><content type="*/*" src="Car(11)/$value" /><m:properties><d:VIN m:type="Edm.Int32">11</d:VIN><d:Description>cenbviijieljtrtdslbuiqubcvhxhzenidqdnaopplvlqc</d:Description></m:properties></entry><entry><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(12)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(12)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(12)/Vide
 o" /><link rel="edit-media" title="Car" href="Car(12)/$value" /><content type="*/*" src="Car(12)/$value" /><m:properties><d:VIN m:type="Edm.Int32">12</d:VIN><d:Description>lx</d:Description></m:properties></entry><entry><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(13)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(13)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(13)/Video" /><link rel="edit-media" title="Car" href="Car(13)/$value" /><content type="*/*" src="Car(13)/$value" /><m:properties><d:VIN m:type="Edm.Int32">13</d:VIN><d:Description m:null="true" />
 </m:properties></entry><entry><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(14)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(14)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(14)/Video" /><link rel="edit-media" title="Car" href="Car(14)/$value" /><content type="*/*" src="Car(14)/$value" /><m:properties><d:VIN m:type="Edm.Int32">14</d:VIN><d:Description>畚チびンぁあяまぴひタバァンぴ歹チ歹歹ァまマぞ珱暦ぼ歹グ珱ボチタびゼソゼたグёま畚a畚歹匚畚ァゼ匚Я欲匚チチボびソァぴ暦ぺポソチバЯゼ黑ダ匚
 マび暦ダソク歹まあa裹ソハ歹暦弌aバ暦ぽネ</d:Description></m:properties></entry><entry><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(15)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(15)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(15)/Video" /><link rel="edit-media" title="Car" href="Car(15)/$value" /><content type="*/*" src="Car(15)/$value" /><m:properties><d:VIN m:type="Edm.Int32">15</d:VIN><d:Description>kphszztczthjacvjnttrarxru</d:Description></m:properties></entry><entry><id>http://localhost:${tomcat.servlet.port}/stub/StaticS
 ervice/V30/Static.svc/Car(16)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(16)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(16)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(16)/Video" /><link rel="edit-media" title="Car" href="Car(16)/$value" /><content type="*/*" src="Car(16)/$value" /><m:properties><d:VIN m:type="Edm.Int32">16</d:VIN><d:Description>ぁゼをあクびゼゼァァせマほグソバせё裹ヲぽンァ</d:Description></m:properties></entry><entry><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(17)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://
 schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(17)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(17)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(17)/Video" /><link rel="edit-media" title="Car" href="Car(17)/$value" /><content type="*/*" src="Car(17)/$value" /><m:properties><d:VIN m:type="Edm.Int32">17</d:VIN><d:Description>まァチボЯ暦マチま匚ぁそタんゼびたチほ黑ポびぁソёん欲欲ヲをァァポぴグ亜チポグヲミそハせゼ珱ゼぜせポゼゼa裹黑そまそチ</d:Description></m:properties></entry></feed>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/VIN le 18 and VIN gt 12.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/VIN le 18 and VIN gt 12.full.json b/fit/src/main/resources/V30/Car/filter/VIN le 18 and VIN gt 12.full.json
index dfbd04f..ed437bc 100644
--- a/fit/src/main/resources/V30/Car/filter/VIN le 18 and VIN gt 12.full.json	
+++ b/fit/src/main/resources/V30/Car/filter/VIN le 18 and VIN gt 12.full.json	
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)","odata.editLink":"Car(13)","odata.mediaEditLink":"Car(13)/$value","odata.mediaReadLink":"Car(13)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(13)/Photo","Video@odata.mediaEditLink":"Car(13)/Video","VIN":13,"Description":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)","odata.editLink":"Car(14)","odata.mediaEditLink":"Car(14)/$value","odata.mediaReadLink":"Car(14)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(14)/Photo","Video@odata.mediaEditLink":"Car(14)/Video","VIN":14,"Description":"\u755a\u30c1\u3073\uff9d\u3041\u3042\u044f\u307e
 \u3074\u3072\u30bf\u30d0\u30a1\uff9d\u3074\u6b79\u30c1\u6b79\u6b79\u30a1\u307e\u30de\u305e\u73f1\u66a6\u307c\u6b79\u30b0\u73f1\u30dc\u30c1\u30bf\u3073\u30bc\u30bd\u30bc\u305f\u30b0\u0451\u307e\u755a\uff41\u755a\u6b79\u531a\u755a\u30a1\u30bc\u531a\u042f\u6b32\u531a\u30c1\u30c1\u30dc\u3073\u30bd\u30a1\u3074\u66a6\u307a\u30dd\u30bd\u30c1\u30d0\u042f\u30bc\u9ed1\u30c0\u531a\u30de\u3073\u66a6\u30c0\u30bd\u30af\u6b79\u307e\u3042\uff41\u88f9\u30bd\u30cf\u6b79\u66a6\u5f0c\uff41\u30d0\u66a6\u307d\uff88"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)","odata.editLink":"Car(15)","odata.mediaEditLink":"Car(15)/$value","odata.mediaReadLink":"Car(15)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(15)/Photo","Video@odata.mediaEditLink":"Car(15)/Video","VIN":15,"Description":"kphszztczthjacvjnttrarxru"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDe
 faultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(16)","odata.editLink":"Car(16)","odata.mediaEditLink":"Car(16)/$value","odata.mediaReadLink":"Car(16)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(16)/Photo","Video@odata.mediaEditLink":"Car(16)/Video","VIN":16,"Description":"\u3041\u30bc\u3092\u3042\u30af\u3073\u30bc\u30bc\u30a1\u30a1\u305b\u30de\u307b\u30b0\u30bd\u30d0\u305b\u0451\u88f9\uff66\u307d\uff9d\u30a1"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(17)","odata.editLink":"Car(17)","odata.mediaEditLink":"Car(17)/$value","odata.mediaReadLink":"Car(17)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(17)/Photo","Video@odata.mediaEditLink":"Car(17)/Video","VIN":17,"Description":"\u307e\u30a1\u30c1\u30dc\u042f\u66a6\u30de\u30c1\u307e\u531a\u3041\u305d\u30bf\u30
 93\u30bc\u3073\u305f\u30c1\u307b\u9ed1\u30dd\u3073\u3041\u30bd\u0451\u3093\u6b32\u6b32\uff66\u3092\u30a1\u30a1\u30dd\u3074\u30b0\u4e9c\u30c1\u30dd\u30b0\uff66\u30df\u305d\u30cf\u305b\u30bc\u73f1\u30bc\u305c\u305b\u30dd\u30bc\u30bc\uff41\u88f9\u9ed1\u305d\u307e\u305d\u30c1"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(18)","odata.editLink":"Car(18)","odata.mediaEditLink":"Car(18)/$value","odata.mediaReadLink":"Car(18)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(18)/Photo","Video@odata.mediaEditLink":"Car(18)/Video","VIN":18,"Description":"\u0451\u30bc\u30dc\u30bf\u3072\u3079\u30d0\u30bf\u305e\u30a1\u044f\u042f\u755a\u30c0\u30bd\u30be\u30be\u042f\u6b79\u307a\u30dc\u305c\u305f\u30bd\u755a\u73f1\u30de\u6b32\u30de\u30b0\u3042\u755a\u4e5d\u30a1\u755a\u30de\u30b0\u88f9\u30df\u30bc\u30a1\u6b32\u30bd\u5f0c\u755a\u30de\u5f0c\u30c1\u66a6\u30a1\u30dc\u
 305c\u88f9\u30df\u042f\uff41\u307c\u3072\u30dd\u3092\u30be\u5f0c\u6b79"}]}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)","odata.editLink":"Car(13)","odata.mediaEditLink":"Car(13)/$value","odata.mediaReadLink":"Car(13)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(13)/Photo","Video@odata.mediaEditLink":"Car(13)/Video","VIN":13,"Description":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)","odata.editLink":"Car(14)","odata.mediaEditLink":"Car(14)/$value","odata.mediaReadLink":"Car(14)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(14)/Photo","Video@odata.mediaEditLink":"Car(14)/Video","VIN":14,"Description":"\u755a\u30c1\u3073\uff9d\u3041\u3042\u044f\u3
 07e\u3074\u3072\u30bf\u30d0\u30a1\uff9d\u3074\u6b79\u30c1\u6b79\u6b79\u30a1\u307e\u30de\u305e\u73f1\u66a6\u307c\u6b79\u30b0\u73f1\u30dc\u30c1\u30bf\u3073\u30bc\u30bd\u30bc\u305f\u30b0\u0451\u307e\u755a\uff41\u755a\u6b79\u531a\u755a\u30a1\u30bc\u531a\u042f\u6b32\u531a\u30c1\u30c1\u30dc\u3073\u30bd\u30a1\u3074\u66a6\u307a\u30dd\u30bd\u30c1\u30d0\u042f\u30bc\u9ed1\u30c0\u531a\u30de\u3073\u66a6\u30c0\u30bd\u30af\u6b79\u307e\u3042\uff41\u88f9\u30bd\u30cf\u6b79\u66a6\u5f0c\uff41\u30d0\u66a6\u307d\uff88"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)","odata.editLink":"Car(15)","odata.mediaEditLink":"Car(15)/$value","odata.mediaReadLink":"Car(15)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(15)/Photo","Video@odata.mediaEditLink":"Car(15)/Video","VIN":15,"Description":"kphszztczthjacvjnttrarxru"},{"odata.type":"Microsoft.Test.OData.Services.Astor
 iaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(16)","odata.editLink":"Car(16)","odata.mediaEditLink":"Car(16)/$value","odata.mediaReadLink":"Car(16)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(16)/Photo","Video@odata.mediaEditLink":"Car(16)/Video","VIN":16,"Description":"\u3041\u30bc\u3092\u3042\u30af\u3073\u30bc\u30bc\u30a1\u30a1\u305b\u30de\u307b\u30b0\u30bd\u30d0\u305b\u0451\u88f9\uff66\u307d\uff9d\u30a1"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(17)","odata.editLink":"Car(17)","odata.mediaEditLink":"Car(17)/$value","odata.mediaReadLink":"Car(17)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(17)/Photo","Video@odata.mediaEditLink":"Car(17)/Video","VIN":17,"Description":"\u307e\u30a1\u30c1\u30dc\u042f\u66a6\u30de\u30c1\u307e\u531a\u3041\u305d\u30
 bf\u3093\u30bc\u3073\u305f\u30c1\u307b\u9ed1\u30dd\u3073\u3041\u30bd\u0451\u3093\u6b32\u6b32\uff66\u3092\u30a1\u30a1\u30dd\u3074\u30b0\u4e9c\u30c1\u30dd\u30b0\uff66\u30df\u305d\u30cf\u305b\u30bc\u73f1\u30bc\u305c\u305b\u30dd\u30bc\u30bc\uff41\u88f9\u9ed1\u305d\u307e\u305d\u30c1"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(18)","odata.editLink":"Car(18)","odata.mediaEditLink":"Car(18)/$value","odata.mediaReadLink":"Car(18)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(18)/Photo","Video@odata.mediaEditLink":"Car(18)/Video","VIN":18,"Description":"\u0451\u30bc\u30dc\u30bf\u3072\u3079\u30d0\u30bf\u305e\u30a1\u044f\u042f\u755a\u30c0\u30bd\u30be\u30be\u042f\u6b79\u307a\u30dc\u305c\u305f\u30bd\u755a\u73f1\u30de\u6b32\u30de\u30b0\u3042\u755a\u4e5d\u30a1\u755a\u30de\u30b0\u88f9\u30df\u30bc\u30a1\u6b32\u30bd\u5f0c\u755a\u30de\u5f0c\u30c1\u66a6\u30a1\
 u30dc\u305c\u88f9\u30df\u042f\uff41\u307c\u3072\u30dd\u3092\u30be\u5f0c\u6b79"}]}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/VIN le 18 and VIN gt 12.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/VIN le 18 and VIN gt 12.xml b/fit/src/main/resources/V30/Car/filter/VIN le 18 and VIN gt 12.xml
index 3bcb2ae..a7165ee 100644
--- a/fit/src/main/resources/V30/Car/filter/VIN le 18 and VIN gt 12.xml	
+++ b/fit/src/main/resources/V30/Car/filter/VIN le 18 and VIN gt 12.xml	
@@ -19,4 +19,4 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml"><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car</id><title type="text">Car</title><updated>2014-02-13T14:31:06Z</updated><link rel="self" title="Car" href="Car" /><entry><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(13)" /><title /><updated>2014-02-13T14:31:06Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Phot
 o" href="Car(13)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(13)/Video" /><link rel="edit-media" title="Car" href="Car(13)/$value" /><content type="*/*" src="Car(13)/$value" /><m:properties><d:VIN m:type="Edm.Int32">13</d:VIN><d:Description m:null="true" /></m:properties></entry><entry><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(14)" /><title /><updated>2014-02-13T14:31:06Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(14)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(14)/Video" /><link rel="edit-media" title="Car" href="Car(
 14)/$value" /><content type="*/*" src="Car(14)/$value" /><m:properties><d:VIN m:type="Edm.Int32">14</d:VIN><d:Description>畚チびンぁあяまぴひタバァンぴ歹チ歹歹ァまマぞ珱暦ぼ歹グ珱ボチタびゼソゼたグёま畚a畚歹匚畚ァゼ匚Я欲匚チチボびソァぴ暦ぺポソチバЯゼ黑ダ匚マび暦ダソク歹まあa裹ソハ歹暦弌aバ暦ぽネ</d:Description></m:properties></entry><entry><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(15)" /><title /><updated>2014-02-13T14:31:06Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(15)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" titl
 e="Video" href="Car(15)/Video" /><link rel="edit-media" title="Car" href="Car(15)/$value" /><content type="*/*" src="Car(15)/$value" /><m:properties><d:VIN m:type="Edm.Int32">15</d:VIN><d:Description>kphszztczthjacvjnttrarxru</d:Description></m:properties></entry><entry><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(16)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(16)" /><title /><updated>2014-02-13T14:31:06Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(16)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(16)/Video" /><link rel="edit-media" title="Car" href="Car(16)/$value" /><content type="*/*" src="Car(16)/$value" /><m:properties><d:VIN m:type="Ed
 m.Int32">16</d:VIN><d:Description>ぁゼをあクびゼゼァァせマほグソバせё裹ヲぽンァ</d:Description></m:properties></entry><entry><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(17)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(17)" /><title /><updated>2014-02-13T14:31:06Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(17)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(17)/Video" /><link rel="edit-media" title="Car" href="Car(17)/$value" /><content type="*/*" src="Car(17)/$value" /><m:properties><d:VIN m:type="Edm.Int32">17</d:VIN><d:Description>まァチボЯ暦マチま匚ぁそタんゼびたチほ黑ポびぁソёん欲欲ヲを�
 ��ァポぴグ亜チポグヲミそハせゼ珱ゼぜせポゼゼa裹黑そまそチ</d:Description></m:properties></entry><entry><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(18)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(18)" /><title /><updated>2014-02-13T14:31:06Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(18)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(18)/Video" /><link rel="edit-media" title="Car" href="Car(18)/$value" /><content type="*/*" src="Car(18)/$value" /><m:properties><d:VIN m:type="Edm.Int32">18</d:VIN><d:Description>ёゼボタひべバタぞァяЯ畚ダソゾゾЯ歹ぺボぜたソ畚珱マ欲マグあ畚九ァ畚マ�
 ��裹ミゼァ欲ソ弌畚マ弌チ暦ァボぜ裹ミЯaぼひポをゾ弌歹</d:Description></m:properties></entry></feed>
\ No newline at end of file
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml"><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car</id><title type="text">Car</title><updated>2014-02-13T14:31:06Z</updated><link rel="self" title="Car" href="Car" /><entry><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(13)" /><title /><updated>2014-02-13T14:31:06Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="P
 hoto" href="Car(13)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(13)/Video" /><link rel="edit-media" title="Car" href="Car(13)/$value" /><content type="*/*" src="Car(13)/$value" /><m:properties><d:VIN m:type="Edm.Int32">13</d:VIN><d:Description m:null="true" /></m:properties></entry><entry><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(14)" /><title /><updated>2014-02-13T14:31:06Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(14)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(14)/Video" /><link rel="edit-media" title="Car" href="
 Car(14)/$value" /><content type="*/*" src="Car(14)/$value" /><m:properties><d:VIN m:type="Edm.Int32">14</d:VIN><d:Description>畚チびンぁあяまぴひタバァンぴ歹チ歹歹ァまマぞ珱暦ぼ歹グ珱ボチタびゼソゼたグёま畚a畚歹匚畚ァゼ匚Я欲匚チチボびソァぴ暦ぺポソチバЯゼ黑ダ匚マび暦ダソク歹まあa裹ソハ歹暦弌aバ暦ぽネ</d:Description></m:properties></entry><entry><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(15)" /><title /><updated>2014-02-13T14:31:06Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(15)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video"
  title="Video" href="Car(15)/Video" /><link rel="edit-media" title="Car" href="Car(15)/$value" /><content type="*/*" src="Car(15)/$value" /><m:properties><d:VIN m:type="Edm.Int32">15</d:VIN><d:Description>kphszztczthjacvjnttrarxru</d:Description></m:properties></entry><entry><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(16)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(16)" /><title /><updated>2014-02-13T14:31:06Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(16)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(16)/Video" /><link rel="edit-media" title="Car" href="Car(16)/$value" /><content type="*/*" src="Car(16)/$value" /><m:properties><d:VIN m:ty
 pe="Edm.Int32">16</d:VIN><d:Description>ぁゼをあクびゼゼァァせマほグソバせё裹ヲぽンァ</d:Description></m:properties></entry><entry><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(17)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(17)" /><title /><updated>2014-02-13T14:31:06Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(17)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(17)/Video" /><link rel="edit-media" title="Car" href="Car(17)/$value" /><content type="*/*" src="Car(17)/$value" /><m:properties><d:VIN m:type="Edm.Int32">17</d:VIN><d:Description>まァチボЯ暦マチま匚ぁそタんゼびたチほ黑ポびぁソёん欲欲
 ヲをァァポぴグ亜チポグヲミそハせゼ珱ゼぜせポゼゼa裹黑そまそチ</d:Description></m:properties></entry><entry><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(18)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(18)" /><title /><updated>2014-02-13T14:31:06Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(18)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(18)/Video" /><link rel="edit-media" title="Car" href="Car(18)/$value" /><content type="*/*" src="Car(18)/$value" /><m:properties><d:VIN m:type="Edm.Int32">18</d:VIN><d:Description>ёゼボタひべバタぞァяЯ畚ダソゾゾЯ歹ぺボぜたソ畚珱マ欲マグあ畚九�
 �畚マグ裹ミゼァ欲ソ弌畚マ弌チ暦ァボぜ裹ミЯaぼひポをゾ弌歹</d:Description></m:properties></entry></feed>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/VIN mul 2 le 30.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/VIN mul 2 le 30.full.json b/fit/src/main/resources/V30/Car/filter/VIN mul 2 le 30.full.json
index 657b3d6..e15fca2 100644
--- a/fit/src/main/resources/V30/Car/filter/VIN mul 2 le 30.full.json	
+++ b/fit/src/main/resources/V30/Car/filter/VIN mul 2 le 30.full.json	
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)","odata.editLink":"Car(11)","odata.mediaEditLink":"Car(11)/$value","odata.mediaReadLink":"Car(11)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(11)/Photo","Video@odata.mediaEditLink":"Car(11)/Video","VIN":11,"Description":"cenbviijieljtrtdslbuiqubcvhxhzenidqdnaopplvlqc"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)","odata.editLink":"Car(12)","odata.mediaEditLink":"Car(12)/$value","odata.mediaReadLink":"Car(12)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(12)/Photo","Video@odata.mediaEditLink":"Car(12)/Video","VIN":12,"Description":"lx"}
 ,{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)","odata.editLink":"Car(13)","odata.mediaEditLink":"Car(13)/$value","odata.mediaReadLink":"Car(13)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(13)/Photo","Video@odata.mediaEditLink":"Car(13)/Video","VIN":13,"Description":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)","odata.editLink":"Car(14)","odata.mediaEditLink":"Car(14)/$value","odata.mediaReadLink":"Car(14)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(14)/Photo","Video@odata.mediaEditLink":"Car(14)/Video","VIN":14,"Description":"\u755a\u30c1\u3073\uff9d\u3041\u3042\u044f\u307e\u3074\u3072\u30bf\u30d0\u30a1\uff9d\u3074\u6b79\u30c1\u6b79\u6b79\u30a1\u307e\u30de\u305e\u73f1\u66a6\u307c\u6b79\
 u30b0\u73f1\u30dc\u30c1\u30bf\u3073\u30bc\u30bd\u30bc\u305f\u30b0\u0451\u307e\u755a\uff41\u755a\u6b79\u531a\u755a\u30a1\u30bc\u531a\u042f\u6b32\u531a\u30c1\u30c1\u30dc\u3073\u30bd\u30a1\u3074\u66a6\u307a\u30dd\u30bd\u30c1\u30d0\u042f\u30bc\u9ed1\u30c0\u531a\u30de\u3073\u66a6\u30c0\u30bd\u30af\u6b79\u307e\u3042\uff41\u88f9\u30bd\u30cf\u6b79\u66a6\u5f0c\uff41\u30d0\u66a6\u307d\uff88"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)","odata.editLink":"Car(15)","odata.mediaEditLink":"Car(15)/$value","odata.mediaReadLink":"Car(15)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(15)/Photo","Video@odata.mediaEditLink":"Car(15)/Video","VIN":15,"Description":"kphszztczthjacvjnttrarxru"}]}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)","odata.editLink":"Car(11)","odata.mediaEditLink":"Car(11)/$value","odata.mediaReadLink":"Car(11)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(11)/Photo","Video@odata.mediaEditLink":"Car(11)/Video","VIN":11,"Description":"cenbviijieljtrtdslbuiqubcvhxhzenidqdnaopplvlqc"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)","odata.editLink":"Car(12)","odata.mediaEditLink":"Car(12)/$value","odata.mediaReadLink":"Car(12)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(12)/Photo","Video@odata.mediaEditLink":"Car(12)/Video","VIN":12,"Description":"l
 x"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)","odata.editLink":"Car(13)","odata.mediaEditLink":"Car(13)/$value","odata.mediaReadLink":"Car(13)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(13)/Photo","Video@odata.mediaEditLink":"Car(13)/Video","VIN":13,"Description":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)","odata.editLink":"Car(14)","odata.mediaEditLink":"Car(14)/$value","odata.mediaReadLink":"Car(14)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(14)/Photo","Video@odata.mediaEditLink":"Car(14)/Video","VIN":14,"Description":"\u755a\u30c1\u3073\uff9d\u3041\u3042\u044f\u307e\u3074\u3072\u30bf\u30d0\u30a1\uff9d\u3074\u6b79\u30c1\u6b79\u6b79\u30a1\u307e\u30de\u305e\u73f1\u66a6\u307c\u
 6b79\u30b0\u73f1\u30dc\u30c1\u30bf\u3073\u30bc\u30bd\u30bc\u305f\u30b0\u0451\u307e\u755a\uff41\u755a\u6b79\u531a\u755a\u30a1\u30bc\u531a\u042f\u6b32\u531a\u30c1\u30c1\u30dc\u3073\u30bd\u30a1\u3074\u66a6\u307a\u30dd\u30bd\u30c1\u30d0\u042f\u30bc\u9ed1\u30c0\u531a\u30de\u3073\u66a6\u30c0\u30bd\u30af\u6b79\u307e\u3042\uff41\u88f9\u30bd\u30cf\u6b79\u66a6\u5f0c\uff41\u30d0\u66a6\u307d\uff88"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)","odata.editLink":"Car(15)","odata.mediaEditLink":"Car(15)/$value","odata.mediaReadLink":"Car(15)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(15)/Photo","Video@odata.mediaEditLink":"Car(15)/Video","VIN":15,"Description":"kphszztczthjacvjnttrarxru"}]}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/VIN mul 2 le 30.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/VIN mul 2 le 30.xml b/fit/src/main/resources/V30/Car/filter/VIN mul 2 le 30.xml
index bf4ac6f..2792e03 100644
--- a/fit/src/main/resources/V30/Car/filter/VIN mul 2 le 30.xml	
+++ b/fit/src/main/resources/V30/Car/filter/VIN mul 2 le 30.xml	
@@ -19,4 +19,4 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml"><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car</id><title type="text">Car</title><updated>2014-02-13T14:31:04Z</updated><link rel="self" title="Car" href="Car" /><entry><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(11)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Phot
 o" href="Car(11)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(11)/Video" /><link rel="edit-media" title="Car" href="Car(11)/$value" /><content type="*/*" src="Car(11)/$value" /><m:properties><d:VIN m:type="Edm.Int32">11</d:VIN><d:Description>cenbviijieljtrtdslbuiqubcvhxhzenidqdnaopplvlqc</d:Description></m:properties></entry><entry><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(12)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(12)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(12)/Video" /
 ><link rel="edit-media" title="Car" href="Car(12)/$value" /><content type="*/*" src="Car(12)/$value" /><m:properties><d:VIN m:type="Edm.Int32">12</d:VIN><d:Description>lx</d:Description></m:properties></entry><entry><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(13)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(13)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(13)/Video" /><link rel="edit-media" title="Car" href="Car(13)/$value" /><content type="*/*" src="Car(13)/$value" /><m:properties><d:VIN m:type="Edm.Int32">13</d:VIN><d:Description m:null="true" /></m:p
 roperties></entry><entry><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(14)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(14)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(14)/Video" /><link rel="edit-media" title="Car" href="Car(14)/$value" /><content type="*/*" src="Car(14)/$value" /><m:properties><d:VIN m:type="Edm.Int32">14</d:VIN><d:Description>畚チびンぁあяまぴひタバァンぴ歹チ歹歹ァまマぞ珱暦ぼ歹グ珱ボチタびゼソゼたグёま畚a畚歹匚畚ァゼ匚Я欲匚チチボびソァぴ暦ぺポソチバЯゼ黑ダ匚マび
 暦ダソク歹まあa裹ソハ歹暦弌aバ暦ぽネ</d:Description></m:properties></entry><entry><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(15)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(15)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(15)/Video" /><link rel="edit-media" title="Car" href="Car(15)/$value" /><content type="*/*" src="Car(15)/$value" /><m:properties><d:VIN m:type="Edm.Int32">15</d:VIN><d:Description>kphszztczthjacvjnttrarxru</d:Description></m:properties></entry></feed>
\ No newline at end of file
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml"><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car</id><title type="text">Car</title><updated>2014-02-13T14:31:04Z</updated><link rel="self" title="Car" href="Car" /><entry><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(11)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="P
 hoto" href="Car(11)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(11)/Video" /><link rel="edit-media" title="Car" href="Car(11)/$value" /><content type="*/*" src="Car(11)/$value" /><m:properties><d:VIN m:type="Edm.Int32">11</d:VIN><d:Description>cenbviijieljtrtdslbuiqubcvhxhzenidqdnaopplvlqc</d:Description></m:properties></entry><entry><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(12)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(12)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(12)/Vide
 o" /><link rel="edit-media" title="Car" href="Car(12)/$value" /><content type="*/*" src="Car(12)/$value" /><m:properties><d:VIN m:type="Edm.Int32">12</d:VIN><d:Description>lx</d:Description></m:properties></entry><entry><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(13)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(13)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(13)/Video" /><link rel="edit-media" title="Car" href="Car(13)/$value" /><content type="*/*" src="Car(13)/$value" /><m:properties><d:VIN m:type="Edm.Int32">13</d:VIN><d:Description m:null="true" />
 </m:properties></entry><entry><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(14)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(14)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(14)/Video" /><link rel="edit-media" title="Car" href="Car(14)/$value" /><content type="*/*" src="Car(14)/$value" /><m:properties><d:VIN m:type="Edm.Int32">14</d:VIN><d:Description>畚チびンぁあяまぴひタバァンぴ歹チ歹歹ァまマぞ珱暦ぼ歹グ珱ボチタびゼソゼたグёま畚a畚歹匚畚ァゼ匚Я欲匚チチボびソァぴ暦ぺポソチバЯゼ黑ダ匚
 マび暦ダソク歹まあa裹ソハ歹暦弌aバ暦ぽネ</d:Description></m:properties></entry><entry><id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(15)" /><title /><updated>2014-02-13T14:31:04Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" title="Photo" href="Car(15)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(15)/Video" /><link rel="edit-media" title="Car" href="Car(15)/$value" /><content type="*/*" src="Car(15)/$value" /><m:properties><d:VIN m:type="Edm.Int32">15</d:VIN><d:Description>kphszztczthjacvjnttrarxru</d:Description></m:properties></entry></feed>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/not (((VIN ge 16) or (VIN le 12))).full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/not (((VIN ge 16) or (VIN le 12))).full.json b/fit/src/main/resources/V30/Car/filter/not (((VIN ge 16) or (VIN le 12))).full.json
index 3106505..683836c 100644
--- a/fit/src/main/resources/V30/Car/filter/not (((VIN ge 16) or (VIN le 12))).full.json	
+++ b/fit/src/main/resources/V30/Car/filter/not (((VIN ge 16) or (VIN le 12))).full.json	
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)","odata.editLink":"Car(13)","odata.mediaEditLink":"Car(13)/$value","odata.mediaReadLink":"Car(13)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(13)/Photo","Video@odata.mediaEditLink":"Car(13)/Video","VIN":13,"Description":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)","odata.editLink":"Car(14)","odata.mediaEditLink":"Car(14)/$value","odata.mediaReadLink":"Car(14)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(14)/Photo","Video@odata.mediaEditLink":"Car(14)/Video","VIN":14,"Description":"New De
 scription(1392222565917)"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)","odata.editLink":"Car(15)","odata.mediaEditLink":"Car(15)/$value","odata.mediaReadLink":"Car(15)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(15)/Photo","Video@odata.mediaEditLink":"Car(15)/Video","VIN":15,"Description":"kphszztczthjacvjnttrarxru"}]}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)","odata.editLink":"Car(13)","odata.mediaEditLink":"Car(13)/$value","odata.mediaReadLink":"Car(13)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(13)/Photo","Video@odata.mediaEditLink":"Car(13)/Video","VIN":13,"Description":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)","odata.editLink":"Car(14)","odata.mediaEditLink":"Car(14)/$value","odata.mediaReadLink":"Car(14)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(14)/Photo","Video@odata.mediaEditLink":"Car(14)/Video","VIN":14,"Description":"New
  Description(1392222565917)"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)","odata.editLink":"Car(15)","odata.mediaEditLink":"Car(15)/$value","odata.mediaReadLink":"Car(15)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(15)/Photo","Video@odata.mediaEditLink":"Car(15)/Video","VIN":15,"Description":"kphszztczthjacvjnttrarxru"}]}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/not (((VIN ge 16) or (VIN le 12))).xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/not (((VIN ge 16) or (VIN le 12))).xml b/fit/src/main/resources/V30/Car/filter/not (((VIN ge 16) or (VIN le 12))).xml
index 9baac4d..83dd66e 100644
--- a/fit/src/main/resources/V30/Car/filter/not (((VIN ge 16) or (VIN le 12))).xml	
+++ b/fit/src/main/resources/V30/Car/filter/not (((VIN ge 16) or (VIN le 12))).xml	
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car</id>
   <title type="text">Car</title>
   <updated>2014-02-13T12:09:31Z</updated>
   <link rel="self" title="Car" href="Car" />
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(13)" />
     <title />
@@ -43,7 +43,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(14)" />
     <title />
@@ -61,7 +61,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(15)" />
     <title />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/startswith(Description,'cen').full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/startswith(Description,'cen').full.json b/fit/src/main/resources/V30/Car/filter/startswith(Description,'cen').full.json
index a314432..7f534c5 100644
--- a/fit/src/main/resources/V30/Car/filter/startswith(Description,'cen').full.json
+++ b/fit/src/main/resources/V30/Car/filter/startswith(Description,'cen').full.json
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)","odata.editLink":"Car(11)","odata.mediaEditLink":"Car(11)/$value","odata.mediaReadLink":"Car(11)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(11)/Photo","Video@odata.mediaEditLink":"Car(11)/Video","VIN":11,"Description":"cenbviijieljtrtdslbuiqubcvhxhzenidqdnaopplvlqc"}]}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)","odata.editLink":"Car(11)","odata.mediaEditLink":"Car(11)/$value","odata.mediaReadLink":"Car(11)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(11)/Photo","Video@odata.mediaEditLink":"Car(11)/Video","VIN":11,"Description":"cenbviijieljtrtdslbuiqubcvhxhzenidqdnaopplvlqc"}]}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/startswith(Description,'cen').xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/startswith(Description,'cen').xml b/fit/src/main/resources/V30/Car/filter/startswith(Description,'cen').xml
index 05cfcb1..e3cc9f0 100644
--- a/fit/src/main/resources/V30/Car/filter/startswith(Description,'cen').xml
+++ b/fit/src/main/resources/V30/Car/filter/startswith(Description,'cen').xml
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car</id>
   <title type="text">Car</title>
   <updated>2014-02-13T12:09:32Z</updated>
   <link rel="self" title="Car" href="Car" />
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(11)" />
     <title />


[03/20] [OLINGO-377] Removing unused cargo properties, upgrading Tomcat, renaming cargo.servlet.port to tomcat.servlet.port

Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Company/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Company/entity.full.json b/fit/src/main/resources/V40/Company/entity.full.json
index a8c5307..f1d5e5d 100644
--- a/fit/src/main/resources/V40/Company/entity.full.json
+++ b/fit/src/main/resources/V40/Company/entity.full.json
@@ -1,8 +1,8 @@
 {
-  "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Company",
+  "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Company",
   "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Company",
-  "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company",
-  "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company",
+  "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company",
+  "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company",
   "CompanyID": 0,
   "CompanyCategory@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.CompanyCategory",
   "CompanyCategory": "IT",
@@ -17,22 +17,22 @@
             "PostalCode": "98052",
             "CompanyName": "Microsoft"
           },
-  "Employees@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company/Employees/$ref",
-  "Employees@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company/Employees",
-  "VipCustomer@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company/VipCustomer/$ref",
-  "VipCustomer@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company/VipCustomer",
-  "Departments@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company/Departments/$ref",
-  "Departments@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company/Departments",
-  "CoreDepartment@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company/CoreDepartment/$ref",
-  "CoreDepartment@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company/CoreDepartment",
+  "Employees@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company/Employees/$ref",
+  "Employees@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company/Employees",
+  "VipCustomer@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company/VipCustomer/$ref",
+  "VipCustomer@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company/VipCustomer",
+  "Departments@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company/Departments/$ref",
+  "Departments@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company/Departments",
+  "CoreDepartment@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company/CoreDepartment/$ref",
+  "CoreDepartment@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company/CoreDepartment",
   "#Microsoft.Test.OData.Services.ODataWCFService.IncreaseRevenue":
           {
             "title": "Microsoft.Test.OData.Services.ODataWCFService.IncreaseRevenue",
-            "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company/Microsoft.Test.OData.Services.ODataWCFService.IncreaseRevenue"
+            "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company/Microsoft.Test.OData.Services.ODataWCFService.IncreaseRevenue"
           },
   "#Microsoft.Test.OData.Services.ODataWCFService.GetEmployeesCount":
           {
             "title": "Microsoft.Test.OData.Services.ODataWCFService.GetEmployeesCount",
-            "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company/Microsoft.Test.OData.Services.ODataWCFService.GetEmployeesCount"
+            "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company/Microsoft.Test.OData.Services.ODataWCFService.GetEmployeesCount"
           }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Company/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Company/entity.xml b/fit/src/main/resources/V40/Company/entity.xml
index 8c6e920..1665e75 100644
--- a/fit/src/main/resources/V40/Company/entity.xml
+++ b/fit/src/main/resources/V40/Company/entity.xml
@@ -19,25 +19,25 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.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://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Company">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.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://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Company">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company</id>
   <category term="#Microsoft.Test.OData.Services.ODataWCFService.Company" scheme="http://docs.oasis-open.org/odata/ns/scheme" />
-  <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company" />
-  <link rel="http://docs.oasis-open.org/odata/ns/related/Employees" type="application/atom+xml;type=feed" title="Employees" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company/Employees" />
-  <link rel="http://docs.oasis-open.org/odata/ns/related/VipCustomer" type="application/atom+xml;type=entry" title="VipCustomer" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company/VipCustomer" />
-  <link rel="http://docs.oasis-open.org/odata/ns/related/Departments" type="application/atom+xml;type=feed" title="Departments" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company/Departments" />
-  <link rel="http://docs.oasis-open.org/odata/ns/related/CoreDepartment" type="application/atom+xml;type=entry" title="CoreDepartment" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company/CoreDepartment" />
+  <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company" />
+  <link rel="http://docs.oasis-open.org/odata/ns/related/Employees" type="application/atom+xml;type=feed" title="Employees" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company/Employees" />
+  <link rel="http://docs.oasis-open.org/odata/ns/related/VipCustomer" type="application/atom+xml;type=entry" title="VipCustomer" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company/VipCustomer" />
+  <link rel="http://docs.oasis-open.org/odata/ns/related/Departments" type="application/atom+xml;type=feed" title="Departments" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company/Departments" />
+  <link rel="http://docs.oasis-open.org/odata/ns/related/CoreDepartment" type="application/atom+xml;type=entry" title="CoreDepartment" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company/CoreDepartment" />
   <title />
   <updated>2014-03-24T17:09:31Z</updated>
   <author>
     <name />
   </author>
-  <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.IncreaseRevenue" 
+  <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.IncreaseRevenue" 
             title="Microsoft.Test.OData.Services.ODataWCFService.IncreaseRevenue" 
-            target="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company/Microsoft.Test.OData.Services.ODataWCFService.IncreaseRevenue"/>
-  <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.GetEmployeesCount" 
+            target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company/Microsoft.Test.OData.Services.ODataWCFService.IncreaseRevenue"/>
+  <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.GetEmployeesCount" 
             title="Microsoft.Test.OData.Services.ODataWCFService.GetEmployeesCount" 
-            target="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company/Microsoft.Test.OData.Services.ODataWCFService.GetEmployeesCount"/>
+            target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company/Microsoft.Test.OData.Services.ODataWCFService.GetEmployeesCount"/>
   <content type="application/xml">
     <m:properties>
       <d:CompanyID m:type="Int32">0</d:CompanyID>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Customers/1/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Customers/1/entity.full.json b/fit/src/main/resources/V40/Customers/1/entity.full.json
index 1bb3e5e..dd9f243 100644
--- a/fit/src/main/resources/V40/Customers/1/entity.full.json
+++ b/fit/src/main/resources/V40/Customers/1/entity.full.json
@@ -1,8 +1,8 @@
 {
-  "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Customers/$entity",
+  "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Customers/$entity",
   "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Customer",
-  "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)",
-  "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)",
+  "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)",
+  "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)",
   "PersonID": 1,
   "FirstName": "Bob",
   "LastName": "Cat",
@@ -48,20 +48,20 @@
   "Birthday": "1957-04-03T00:00:00Z",
   "TimeBetweenLastTwoOrders@odata.type": "#Duration",
   "TimeBetweenLastTwoOrders": "PT0.0000001S",
-  "Parent@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Parent/$ref",
-  "Parent@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Parent",
-  "Orders@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Orders/$ref",
-  "Orders@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Orders",
-  "Company@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Company/$ref",
-  "Company@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Company",
+  "Parent@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Parent/$ref",
+  "Parent@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Parent",
+  "Orders@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Orders/$ref",
+  "Orders@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Orders",
+  "Company@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Company/$ref",
+  "Company@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Company",
   "#Microsoft.Test.OData.Services.ODataWCFService.ResetAddress":
           {
             "title": "Microsoft.Test.OData.Services.ODataWCFService.ResetAddress",
-            "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress"
+            "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress"
           },
   "#Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress":
           {
             "title": "Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress",
-            "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress"
+            "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress"
           }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Customers/1/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Customers/1/entity.xml b/fit/src/main/resources/V40/Customers/1/entity.xml
index a55448e..d852661 100644
--- a/fit/src/main/resources/V40/Customers/1/entity.xml
+++ b/fit/src/main/resources/V40/Customers/1/entity.xml
@@ -19,18 +19,18 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/" 
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.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://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Customers/$entity">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)</id>
+       m:context="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Customers/$entity">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/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://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)" />
-  <link rel="http://docs.oasis-open.org/odata/ns/related/Parent" type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Parent" />
-  <link rel="http://docs.oasis-open.org/odata/ns/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Orders" />
-  <link rel="http://docs.oasis-open.org/odata/ns/related/Company" type="application/atom+xml;type=entry" title="Company" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Company" />
+  <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)" />
+  <link rel="http://docs.oasis-open.org/odata/ns/related/Parent" type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Parent" />
+  <link rel="http://docs.oasis-open.org/odata/ns/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Orders" />
+  <link rel="http://docs.oasis-open.org/odata/ns/related/Company" type="application/atom+xml;type=entry" title="Company" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Company" />
   <title />
   <updated>2014-03-24T17:03:20Z</updated>
   <author>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Customers/1/links/Company.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Customers/1/links/Company.full.json b/fit/src/main/resources/V40/Customers/1/links/Company.full.json
index 851d9ac..97d2461 100644
--- a/fit/src/main/resources/V40/Customers/1/links/Company.full.json
+++ b/fit/src/main/resources/V40/Customers/1/links/Company.full.json
@@ -1,4 +1,4 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Customer/$links/Info",
-  "url": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company"
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Customer/$links/Info",
+  "url": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company"
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Customers/1/links/Company.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Customers/1/links/Company.xml b/fit/src/main/resources/V40/Customers/1/links/Company.xml
index d30435d..b2dce1c 100644
--- a/fit/src/main/resources/V40/Customers/1/links/Company.xml
+++ b/fit/src/main/resources/V40/Customers/1/links/Company.xml
@@ -19,4 +19,4 @@
     under the License.
 
 -->
-<uri xmlns="http://schemas.microsoft.com/ado/2007/08/dataservices">http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company</uri>
\ No newline at end of file
+<uri xmlns="http://schemas.microsoft.com/ado/2007/08/dataservices">http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company</uri>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Customers/1/links/Orders.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Customers/1/links/Orders.full.json b/fit/src/main/resources/V40/Customers/1/links/Orders.full.json
index 0d1372e..afa7d2a 100644
--- a/fit/src/main/resources/V40/Customers/1/links/Orders.full.json
+++ b/fit/src/main/resources/V40/Customers/1/links/Orders.full.json
@@ -1,10 +1,10 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer/$links/Orders",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer/$links/Orders",
   "value":
           [
             {
-              "url": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Orders(8)"
+              "url": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Orders(8)"
             }
           ],
-  "odata.nextLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customers(1)/$links/Orders?$skiptoken=2"
+  "odata.nextLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customers(1)/$links/Orders?$skiptoken=2"
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Customers/1/links/Orders.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Customers/1/links/Orders.xml b/fit/src/main/resources/V40/Customers/1/links/Orders.xml
index 5484831..74a6a1a 100644
--- a/fit/src/main/resources/V40/Customers/1/links/Orders.xml
+++ b/fit/src/main/resources/V40/Customers/1/links/Orders.xml
@@ -20,6 +20,6 @@
 
 -->
 <links xmlns="http://schemas.microsoft.com/ado/2007/08/dataservices">
-  <uri>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Orders(8)</uri>
-  <next>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customers(1)/$links/Orders?$skiptoken=2</next>
+  <uri>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Orders(8)</uri>
+  <next>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customers(1)/$links/Orders?$skiptoken=2</next>
 </links>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Customers/2/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Customers/2/entity.full.json b/fit/src/main/resources/V40/Customers/2/entity.full.json
index 7bdd4e6..f020a18 100644
--- a/fit/src/main/resources/V40/Customers/2/entity.full.json
+++ b/fit/src/main/resources/V40/Customers/2/entity.full.json
@@ -1,8 +1,8 @@
 {
-  "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Customers/$entity",
+  "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Customers/$entity",
   "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Customer",
-  "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)",
-  "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)",
+  "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)",
+  "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)",
   "PersonID": 2,
   "FirstName": "Jill",
   "LastName": "Jones",
@@ -33,18 +33,18 @@
   "Birthday": "1983-01-15T00:00:00Z",
   "TimeBetweenLastTwoOrders@odata.type": "#Duration",
   "TimeBetweenLastTwoOrders": "PT0.0000002S",
-  "Parent@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Parent/$ref",
-  "Parent@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Parent",
-  "Orders@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Orders/$ref",
-  "Orders@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Orders",
-  "Company@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Company/$ref",
-  "Company@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Company",
+  "Parent@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Parent/$ref",
+  "Parent@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Parent",
+  "Orders@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Orders/$ref",
+  "Orders@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Orders",
+  "Company@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Company/$ref",
+  "Company@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Company",
   "#Microsoft.Test.OData.Services.ODataWCFService.ResetAddress": {
     "title": "Microsoft.Test.OData.Services.ODataWCFService.ResetAddress",
-    "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress"
+    "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress"
   },
   "#Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress": {
     "title": "Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress",
-    "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress"
+    "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress"
   }
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Customers/2/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Customers/2/entity.xml b/fit/src/main/resources/V40/Customers/2/entity.xml
index 8db4cc2..46629b4 100644
--- a/fit/src/main/resources/V40/Customers/2/entity.xml
+++ b/fit/src/main/resources/V40/Customers/2/entity.xml
@@ -19,24 +19,24 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.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://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Customers/$entity">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.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://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Customers/$entity">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/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://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)" />
-  <link rel="http://docs.oasis-open.org/odata/ns/related/Parent" type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Parent" />
-  <link rel="http://docs.oasis-open.org/odata/ns/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Orders" />
-  <link rel="http://docs.oasis-open.org/odata/ns/related/Company" type="application/atom+xml;type=entry" title="Company" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Company" />
+  <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)" />
+  <link rel="http://docs.oasis-open.org/odata/ns/related/Parent" type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Parent" />
+  <link rel="http://docs.oasis-open.org/odata/ns/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Orders" />
+  <link rel="http://docs.oasis-open.org/odata/ns/related/Company" type="application/atom+xml;type=entry" title="Company" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Company" />
   <title />
   <updated>2014-04-23T15:27:13Z</updated>
   <author>
     <name />
   </author>
-  <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.ResetAddress" 
+  <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.ResetAddress" 
             title="Microsoft.Test.OData.Services.ODataWCFService.ResetAddress" 
-            target="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress"/>
-  <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress" 
+            target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress"/>
+  <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress" 
             title="Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress" 
-            target="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress"/>
+            target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress"/>
   <content type="application/xml">
     <m:properties>
       <d:PersonID m:type="Int32">2</d:PersonID>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Customers/feed.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Customers/feed.full.json b/fit/src/main/resources/V40/Customers/feed.full.json
index 3125b28..3b8ef30 100644
--- a/fit/src/main/resources/V40/Customers/feed.full.json
+++ b/fit/src/main/resources/V40/Customers/feed.full.json
@@ -1,10 +1,10 @@
 {
-  "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Customers",
+  "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Customers",
   "value":
           [
             {
-              "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)",
-              "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)",
+              "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)",
+              "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)",
               "PersonID": 1,
               "FirstName": "Bob",
               "LastName": "Cat",
@@ -51,8 +51,8 @@
               "TimeBetweenLastTwoOrders": "PT0.0000001S"
             },
             {
-              "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)",
-              "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)",
+              "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)",
+              "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)",
               "PersonID": 2,
               "FirstName": "Jill",
               "LastName": "Jones",

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Customers/feed.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Customers/feed.xml b/fit/src/main/resources/V40/Customers/feed.xml
index 65696de..dab977b 100644
--- a/fit/src/main/resources/V40/Customers/feed.xml
+++ b/fit/src/main/resources/V40/Customers/feed.xml
@@ -19,17 +19,17 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.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://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Customers">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.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://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Customers">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers</id>
   <title />
   <updated>2014-04-23T10:01:18Z</updated>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/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://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Parent" type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Parent" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Orders" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Company" type="application/atom+xml;type=entry" title="Company" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Company" />
+    <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Parent" type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Parent" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Orders" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Company" type="application/atom+xml;type=entry" title="Company" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Company" />
     <title />
     <updated>2014-04-23T10:01:18Z</updated>
     <author>
@@ -69,12 +69,12 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/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://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Parent" type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Parent" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Orders" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/Company" type="application/atom+xml;type=entry" title="Company" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Company" />
+    <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Parent" type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Parent" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Orders" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/Company" type="application/atom+xml;type=entry" title="Company" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Company" />
     <title />
     <updated>2014-04-23T10:01:18Z</updated>
     <author>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/OrderDetails/7 5/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/OrderDetails/7 5/entity.full.json b/fit/src/main/resources/V40/OrderDetails/7 5/entity.full.json
index 2021969..db15130 100644
--- a/fit/src/main/resources/V40/OrderDetails/7 5/entity.full.json	
+++ b/fit/src/main/resources/V40/OrderDetails/7 5/entity.full.json	
@@ -1,8 +1,8 @@
 {
-  "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#OrderDetails/$entity",
+  "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#OrderDetails/$entity",
   "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.OrderDetail",
-  "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/OrderDetails(OrderID=7,ProductID=5)",
-  "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/OrderDetails(OrderID=7,ProductID=5)",
+  "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/OrderDetails(OrderID=7,ProductID=5)",
+  "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/OrderDetails(OrderID=7,ProductID=5)",
   "OrderID": 7,
   "ProductID": 5,
   "OrderPlaced@odata.type": "#DateTimeOffset",
@@ -10,8 +10,8 @@
   "Quantity": 50,
   "UnitPrice@odata.type": "#Single",
   "UnitPrice": 3.24,
-  "ProductOrdered@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/OrderDetails(OrderID=7,ProductID=5)/ProductOrdered/$ref",
-  "ProductOrdered@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/OrderDetails(OrderID=7,ProductID=5)/ProductOrdered",
-  "AssociatedOrder@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/OrderDetails(OrderID=7,ProductID=5)/AssociatedOrder/$ref",
-  "AssociatedOrder@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/OrderDetails(OrderID=7,ProductID=5)/AssociatedOrder"
+  "ProductOrdered@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/OrderDetails(OrderID=7,ProductID=5)/ProductOrdered/$ref",
+  "ProductOrdered@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/OrderDetails(OrderID=7,ProductID=5)/ProductOrdered",
+  "AssociatedOrder@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/OrderDetails(OrderID=7,ProductID=5)/AssociatedOrder/$ref",
+  "AssociatedOrder@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/OrderDetails(OrderID=7,ProductID=5)/AssociatedOrder"
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/OrderDetails/7 5/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/OrderDetails/7 5/entity.xml b/fit/src/main/resources/V40/OrderDetails/7 5/entity.xml
index 044fd87..ddf8ed3 100644
--- a/fit/src/main/resources/V40/OrderDetails/7 5/entity.xml	
+++ b/fit/src/main/resources/V40/OrderDetails/7 5/entity.xml	
@@ -19,12 +19,12 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.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://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#OrderDetails/$entity">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/OrderDetails(OrderID=7,ProductID=5)</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.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://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#OrderDetails/$entity">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/OrderDetails(OrderID=7,ProductID=5)</id>
   <category term="#Microsoft.Test.OData.Services.ODataWCFService.OrderDetail" scheme="http://docs.oasis-open.org/odata/ns/scheme" />
-  <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/OrderDetails(OrderID=7,ProductID=5)" />
-  <link rel="http://docs.oasis-open.org/odata/ns/related/ProductOrdered" type="application/atom+xml;type=feed" title="ProductOrdered" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/OrderDetails(OrderID=7,ProductID=5)/ProductOrdered" />
-  <link rel="http://docs.oasis-open.org/odata/ns/related/AssociatedOrder" type="application/atom+xml;type=entry" title="AssociatedOrder" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/OrderDetails(OrderID=7,ProductID=5)/AssociatedOrder" />
+  <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/OrderDetails(OrderID=7,ProductID=5)" />
+  <link rel="http://docs.oasis-open.org/odata/ns/related/ProductOrdered" type="application/atom+xml;type=feed" title="ProductOrdered" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/OrderDetails(OrderID=7,ProductID=5)/ProductOrdered" />
+  <link rel="http://docs.oasis-open.org/odata/ns/related/AssociatedOrder" type="application/atom+xml;type=entry" title="AssociatedOrder" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/OrderDetails(OrderID=7,ProductID=5)/AssociatedOrder" />
   <title />
   <updated>2014-04-16T12:38:34Z</updated>
   <author>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Orders/8/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Orders/8/entity.full.json b/fit/src/main/resources/V40/Orders/8/entity.full.json
index 1c3d806..e2ea119 100644
--- a/fit/src/main/resources/V40/Orders/8/entity.full.json
+++ b/fit/src/main/resources/V40/Orders/8/entity.full.json
@@ -1,8 +1,8 @@
 {
-  "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Orders/$entity",
+  "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Orders/$entity",
   "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Order",
-  "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)",
-  "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)",
+  "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)",
+  "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)",
   "@odata.etag": "W/\"123456789001\"",
   "OrderID": 8,
   "OrderDate@odata.type": "#DateTimeOffset",
@@ -14,10 +14,10 @@
           [
             "PT0.0000001S"
           ],
-  "LoggedInEmployee@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/LoggedInEmployee/$ref",
-  "LoggedInEmployee@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/LoggedInEmployee",
-  "CustomerForOrder@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/CustomerForOrder/$ref",
-  "CustomerForOrder@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/CustomerForOrder",
-  "OrderDetails@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/OrderDetails/$ref",
-  "OrderDetails@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/OrderDetails"
+  "LoggedInEmployee@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/LoggedInEmployee/$ref",
+  "LoggedInEmployee@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/LoggedInEmployee",
+  "CustomerForOrder@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/CustomerForOrder/$ref",
+  "CustomerForOrder@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/CustomerForOrder",
+  "OrderDetails@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/OrderDetails/$ref",
+  "OrderDetails@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/OrderDetails"
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Orders/8/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Orders/8/entity.xml b/fit/src/main/resources/V40/Orders/8/entity.xml
index 6fe6591..b4309c7 100644
--- a/fit/src/main/resources/V40/Orders/8/entity.xml
+++ b/fit/src/main/resources/V40/Orders/8/entity.xml
@@ -19,19 +19,19 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/" 
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.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://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Orders/$entity"
+       m:context="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Orders/$entity"
        m:etag="W/&quot;123456789001&quot;">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)</id>
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)</id>
   <category term="#Microsoft.Test.OData.Services.ODataWCFService.Order" scheme="http://docs.oasis-open.org/odata/ns/scheme" />
-  <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)" />
-  <link rel="http://docs.oasis-open.org/odata/ns/related/LoggedInEmployee" type="application/atom+xml;type=entry" title="LoggedInEmployee" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/LoggedInEmployee" />
-  <link rel="http://docs.oasis-open.org/odata/ns/related/CustomerForOrder" type="application/atom+xml;type=entry" title="CustomerForOrder" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/CustomerForOrder" />
-  <link rel="http://docs.oasis-open.org/odata/ns/related/OrderDetails" type="application/atom+xml;type=feed" title="OrderDetails" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/OrderDetails" />
+  <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)" />
+  <link rel="http://docs.oasis-open.org/odata/ns/related/LoggedInEmployee" type="application/atom+xml;type=entry" title="LoggedInEmployee" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/LoggedInEmployee" />
+  <link rel="http://docs.oasis-open.org/odata/ns/related/CustomerForOrder" type="application/atom+xml;type=entry" title="CustomerForOrder" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/CustomerForOrder" />
+  <link rel="http://docs.oasis-open.org/odata/ns/related/OrderDetails" type="application/atom+xml;type=feed" title="OrderDetails" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/OrderDetails" />
   <title />
   <updated>2014-03-24T17:36:01Z</updated>
   <author>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Orders/8/links/.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Orders/8/links/.full.json b/fit/src/main/resources/V40/Orders/8/links/.full.json
index 4fbfe93..8e9aa31 100644
--- a/fit/src/main/resources/V40/Orders/8/links/.full.json
+++ b/fit/src/main/resources/V40/Orders/8/links/.full.json
@@ -1,4 +1,4 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer/$links/Info",
-  "url": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(11)"
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer/$links/Info",
+  "url": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(11)"
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Orders/8/links/CustomerForOrder.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Orders/8/links/CustomerForOrder.full.json b/fit/src/main/resources/V40/Orders/8/links/CustomerForOrder.full.json
index 4d7b11a..f84a895 100644
--- a/fit/src/main/resources/V40/Orders/8/links/CustomerForOrder.full.json
+++ b/fit/src/main/resources/V40/Orders/8/links/CustomerForOrder.full.json
@@ -1,4 +1,4 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Orders/$links/CustomerForOrder",
-  "url": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(1)"
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Orders/$links/CustomerForOrder",
+  "url": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(1)"
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Orders/8/links/CustomerForOrder.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Orders/8/links/CustomerForOrder.xml b/fit/src/main/resources/V40/Orders/8/links/CustomerForOrder.xml
index 5c82374..1ea06ce 100644
--- a/fit/src/main/resources/V40/Orders/8/links/CustomerForOrder.xml
+++ b/fit/src/main/resources/V40/Orders/8/links/CustomerForOrder.xml
@@ -19,4 +19,4 @@
     under the License.
 
 -->
-<uri xmlns="http://schemas.microsoft.com/ado/2007/08/dataservices">http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(1)</uri>
\ No newline at end of file
+<uri xmlns="http://schemas.microsoft.com/ado/2007/08/dataservices">http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(1)</uri>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Orders/feed.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Orders/feed.full.json b/fit/src/main/resources/V40/Orders/feed.full.json
index 8d30795..0ecd9ec 100644
--- a/fit/src/main/resources/V40/Orders/feed.full.json
+++ b/fit/src/main/resources/V40/Orders/feed.full.json
@@ -1,11 +1,11 @@
 {
-  "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Orders",
+  "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Orders",
   "value":
           [
             {
               "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Order",
-              "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)",
-              "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)",
+              "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)",
+              "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)",
               "OrderID": 7,
               "OrderDate@odata.type": "#DateTimeOffset",
               "OrderDate": "2011-05-29T14:21:12Z",
@@ -16,17 +16,17 @@
                       [
                         "PT0.0000001S"
                       ],
-              "LoggedInEmployee@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)/LoggedInEmployee/$ref",
-              "LoggedInEmployee@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)/LoggedInEmployee",
-              "CustomerForOrder@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)/CustomerForOrder/$ref",
-              "CustomerForOrder@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)/CustomerForOrder",
-              "OrderDetails@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)/OrderDetails/$ref",
-              "OrderDetails@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)/OrderDetails"
+              "LoggedInEmployee@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)/LoggedInEmployee/$ref",
+              "LoggedInEmployee@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)/LoggedInEmployee",
+              "CustomerForOrder@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)/CustomerForOrder/$ref",
+              "CustomerForOrder@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)/CustomerForOrder",
+              "OrderDetails@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)/OrderDetails/$ref",
+              "OrderDetails@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)/OrderDetails"
             },
             {
               "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Order",
-              "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)",
-              "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)",
+              "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)",
+              "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)",
               "OrderID": 8,
               "OrderDate@odata.type": "#DateTimeOffset",
               "OrderDate": "2011-03-04T16:03:57Z",
@@ -37,12 +37,12 @@
                       [
                         "PT0.0000001S"
                       ],
-              "LoggedInEmployee@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/LoggedInEmployee/$ref",
-              "LoggedInEmployee@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/LoggedInEmployee",
-              "CustomerForOrder@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/CustomerForOrder/$ref",
-              "CustomerForOrder@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/CustomerForOrder",
-              "OrderDetails@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/OrderDetails/$ref",
-              "OrderDetails@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/OrderDetails"
+              "LoggedInEmployee@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/LoggedInEmployee/$ref",
+              "LoggedInEmployee@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/LoggedInEmployee",
+              "CustomerForOrder@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/CustomerForOrder/$ref",
+              "CustomerForOrder@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/CustomerForOrder",
+              "OrderDetails@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/OrderDetails/$ref",
+              "OrderDetails@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/OrderDetails"
             }
           ]
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Orders/feed.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Orders/feed.xml b/fit/src/main/resources/V40/Orders/feed.xml
index 9cd8cc1..48603ce 100644
--- a/fit/src/main/resources/V40/Orders/feed.xml
+++ b/fit/src/main/resources/V40/Orders/feed.xml
@@ -19,17 +19,17 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.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://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Orders">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.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://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Orders">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders</id>
   <title />
   <updated>2014-03-24T17:17:25Z</updated>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)</id>
     <category term="#Microsoft.Test.OData.Services.ODataWCFService.Order" scheme="http://docs.oasis-open.org/odata/ns/scheme" />
-    <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/LoggedInEmployee" type="application/atom+xml;type=entry" title="LoggedInEmployee" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)/LoggedInEmployee" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/CustomerForOrder" type="application/atom+xml;type=entry" title="CustomerForOrder" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)/CustomerForOrder" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/OrderDetails" type="application/atom+xml;type=feed" title="OrderDetails" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)/OrderDetails" />
+    <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/LoggedInEmployee" type="application/atom+xml;type=entry" title="LoggedInEmployee" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)/LoggedInEmployee" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/CustomerForOrder" type="application/atom+xml;type=entry" title="CustomerForOrder" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)/CustomerForOrder" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/OrderDetails" type="application/atom+xml;type=feed" title="OrderDetails" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)/OrderDetails" />
     <title />
     <updated>2014-03-24T17:17:25Z</updated>
     <author>
@@ -47,12 +47,12 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)</id>
     <category term="#Microsoft.Test.OData.Services.ODataWCFService.Order" scheme="http://docs.oasis-open.org/odata/ns/scheme" />
-    <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/LoggedInEmployee" type="application/atom+xml;type=entry" title="LoggedInEmployee" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/LoggedInEmployee" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/CustomerForOrder" type="application/atom+xml;type=entry" title="CustomerForOrder" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/CustomerForOrder" />
-    <link rel="http://docs.oasis-open.org/odata/ns/related/OrderDetails" type="application/atom+xml;type=feed" title="OrderDetails" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/OrderDetails" />
+    <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/LoggedInEmployee" type="application/atom+xml;type=entry" title="LoggedInEmployee" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/LoggedInEmployee" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/CustomerForOrder" type="application/atom+xml;type=entry" title="CustomerForOrder" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/CustomerForOrder" />
+    <link rel="http://docs.oasis-open.org/odata/ns/related/OrderDetails" type="application/atom+xml;type=feed" title="OrderDetails" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/OrderDetails" />
     <title />
     <updated>2014-03-24T17:17:25Z</updated>
     <author>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Org.OData.Capabilities.V1.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Org.OData.Capabilities.V1.xml b/fit/src/main/resources/V40/Org.OData.Capabilities.V1.xml
index 6e67527..923147f 100644
--- a/fit/src/main/resources/V40/Org.OData.Capabilities.V1.xml
+++ b/fit/src/main/resources/V40/Org.OData.Capabilities.V1.xml
@@ -20,7 +20,7 @@
 
 -->
 <edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.0">
-  <edmx:Reference Uri="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Vocabularies.svc/Org.OData.Core.V1.xml">
+  <edmx:Reference Uri="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Vocabularies.svc/Org.OData.Core.V1.xml">
     <edmx:Include Alias="Core" Namespace="Org.OData.Core.V1" />
   </edmx:Reference>
   <edmx:DataServices>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Org.OData.Measures.V1.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Org.OData.Measures.V1.xml b/fit/src/main/resources/V40/Org.OData.Measures.V1.xml
index 914e1df..b41e98d 100644
--- a/fit/src/main/resources/V40/Org.OData.Measures.V1.xml
+++ b/fit/src/main/resources/V40/Org.OData.Measures.V1.xml
@@ -20,7 +20,7 @@
 
 -->
 <edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.0">
-  <edmx:Reference Uri="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Vocabularies.svc/Org.OData.Core.V1.xml">
+  <edmx:Reference Uri="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Vocabularies.svc/Org.OData.Core.V1.xml">
     <edmx:Include Alias="Core" Namespace="Org.OData.Core.V1" />
   </edmx:Reference>
   <edmx:DataServices>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/People/1/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/People/1/entity.full.json b/fit/src/main/resources/V40/People/1/entity.full.json
index 2ade02b..35c697b 100644
--- a/fit/src/main/resources/V40/People/1/entity.full.json
+++ b/fit/src/main/resources/V40/People/1/entity.full.json
@@ -1,8 +1,8 @@
 {
-  "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People/$entity",
+  "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People/$entity",
   "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Customer",
-  "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc//People(1)",
-  "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc//People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer",
+  "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc//People(1)",
+  "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc//People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer",
   "PersonID": 1,
   "FirstName": "Bob",
   "LastName": "Cat",
@@ -34,18 +34,18 @@
   "Birthday": "1957-04-03T00:00:00Z",
   "TimeBetweenLastTwoOrders@odata.type": "#Duration",
   "TimeBetweenLastTwoOrders": "PT0.0000001S",
-  "Parent@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc//People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent/$ref",
-  "Parent@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc//People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent",
-  "Orders@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc//People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders/$ref",
-  "Orders@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc//People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders",
-  "Company@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc//People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company/$ref",
-  "Company@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc//People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company",
+  "Parent@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc//People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent/$ref",
+  "Parent@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc//People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent",
+  "Orders@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc//People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders/$ref",
+  "Orders@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc//People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders",
+  "Company@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc//People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company/$ref",
+  "Company@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc//People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company",
   "#Microsoft.Test.OData.Services.ODataWCFService.ResetAddress": {
     "title": "Microsoft.Test.OData.Services.ODataWCFService.ResetAddress",
-    "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc//People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress"
+    "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc//People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress"
   },
   "#Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress": {
     "title": "Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress",
-    "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc//People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress"
+    "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc//People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress"
   }
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/People/1/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/People/1/entity.xml b/fit/src/main/resources/V40/People/1/entity.xml
index c400794..1646c54 100644
--- a/fit/src/main/resources/V40/People/1/entity.xml
+++ b/fit/src/main/resources/V40/People/1/entity.xml
@@ -19,19 +19,19 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc//" 
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.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://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People/$entity">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)</id>
+       m:context="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People/$entity">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)</id>
   <category term="#Microsoft.Test.OData.Services.ODataWCFService.Customer" scheme="http://docs.oasis-open.org/odata/ns/scheme"/>
-  <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)"/>
-  <link rel="http://docs.oasis-open.org/odata/ns/related/Parent" type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc//People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent"/>
-  <link rel="http://docs.oasis-open.org/odata/ns/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc//People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders"/>
-  <link rel="http://docs.oasis-open.org/odata/ns/related/Company" type="application/atom+xml;type=entry" title="Company" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc//People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company"/>
+  <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)"/>
+  <link rel="http://docs.oasis-open.org/odata/ns/related/Parent" type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc//People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent"/>
+  <link rel="http://docs.oasis-open.org/odata/ns/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc//People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders"/>
+  <link rel="http://docs.oasis-open.org/odata/ns/related/Company" type="application/atom+xml;type=entry" title="Company" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc//People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company"/>
   <title/>
   <updated>2014-04-17T12:35:59Z</updated>
   <author>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/People/5/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/People/5/entity.full.json b/fit/src/main/resources/V40/People/5/entity.full.json
index 5c9ab71..45e7e6f 100644
--- a/fit/src/main/resources/V40/People/5/entity.full.json
+++ b/fit/src/main/resources/V40/People/5/entity.full.json
@@ -1,8 +1,8 @@
 {
-  "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People/$entity",
+  "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People/$entity",
   "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Person",
-  "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)",
-  "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)",
+  "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)",
+  "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)",
   "PersonID": 5,
   "FirstName": "Peter",
   "LastName": "Bee",
@@ -36,16 +36,16 @@
           [
             "def@test.msn"
           ],
-  "Parent@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Parent/$ref",
-  "Parent@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Parent",
+  "Parent@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Parent/$ref",
+  "Parent@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Parent",
   "#Microsoft.Test.OData.Services.ODataWCFService.ResetAddress":
           {
             "title": "Microsoft.Test.OData.Services.ODataWCFService.ResetAddress",
-            "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress"
+            "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress"
           },
   "#Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress":
           {
             "title": "Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress",
-            "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress"
+            "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress"
           }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/People/5/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/People/5/entity.xml b/fit/src/main/resources/V40/People/5/entity.xml
index c64d1a7..6a7b361 100644
--- a/fit/src/main/resources/V40/People/5/entity.xml
+++ b/fit/src/main/resources/V40/People/5/entity.xml
@@ -19,17 +19,17 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/" 
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.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://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People/$entity">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)</id>
+       m:context="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People/$entity">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)</id>
   <category term="#Microsoft.Test.OData.Services.ODataWCFService.Person" scheme="http://docs.oasis-open.org/odata/ns/scheme" />
-  <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)" />
-  <link rel="http://docs.oasis-open.org/odata/ns/related/Parent" type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Parent" />
+  <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)" />
+  <link rel="http://docs.oasis-open.org/odata/ns/related/Parent" type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Parent" />
   <title />
   <updated>2014-03-24T17:20:17Z</updated>
   <author>


[14/20] [OLINGO-377] Removing unused cargo properties, upgrading Tomcat, renaming cargo.servlet.port to tomcat.servlet.port

Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/filter/CustomerId gt -10.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/filter/CustomerId gt -10.full.json b/fit/src/main/resources/V30/Customer/filter/CustomerId gt -10.full.json
index 59e3ffe..ae93209 100644
--- a/fit/src/main/resources/V30/Customer/filter/CustomerId gt -10.full.json	
+++ b/fit/src/main/resources/V30/Customer/filter/CustomerId gt -10.full.json	
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Customer","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-9)","odata.editLink":"Customer(-9)","Orders@odata.navigationLinkUrl":"Customer(-9)/Orders","Logins@odata.navigationLinkUrl":"Customer(-9)/Logins","Husband@odata.navigationLinkUrl":"Customer(-9)/Husband","Wife@odata.navigationLinkUrl":"Customer(-9)/Wife","Info@odata.navigationLinkUrl":"Customer(-9)/Info","Thumbnail@odata.mediaEditLink":"Customer(-9)/Thumbnail","Video@odata.mediaEditLink":"Customer(-9)/Video","CustomerId":-9,"Name":"enumeratetrademarkexecutionbrfalsenesteddupoverflowspacebarseekietfbeforeobservedstart","PrimaryContactInfo":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["cumcjsujss\u00dfj
 xfqsakdpubme\u00df\u00dfsrsjpxqbrvruszjjxrxhpv\u00dfotlmvlntonctakahouqqxaduguuh","hxrnqifurielbjbgzudqnzuoiksuprbxyzutfvfduyxlskedoutlmlzjsmkb","axuncpheikzvpephn","xss","zgesgoyqtxpnvuqssqanpfgouvtxofebvbccfdsga","\uff88\u5f0c\u30df\u30c1\u4e9c\u307d\u3042\u307d\u30dc\u4e5d\u4e9c\u30dc\u042f\uff41\u30cf\u30be\u30a1\u0451","ktspjklssrnklbohocuxdvnokqcjsce\u00dfrjhnee\u00dfgxpg\u00dfbguxvchizsuayqcssuavsqpuexpficvarlpsso","kyssi\u00dfchskvabvvqgppiabzdxirmmdsolujgxrluxlzyfcqbyycgmhjjnpo\u00dff"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["rmjhkvrovdnfe\u00dfqllqrehpogavcnlliqmoqsbvkinbtoyolqlmxobhhejihrnoqguzvzhssfrb","y\u00dfkzfqe\u00dfq\u00dfkoundi","\u30bd\u30c1\u30bc\uff88\uff88\u3093\u30cf\u307c\u30c1\u307a\u3072\uff41\u30dc\u88f9\u3074\u3079\u30bc\u30dc\u30be\u30a1\uff5a\u3041\u30dd\u30de\u3072\u30be\u30dd\u305d\u6b32\u30dd\u3074\u307a\u30bc\u0451\u042f\u30cf\u30bd\u044f\u30be\u30c1\u30df\u30af\u30be\u4e5d\u30bd\u3041\u66a6\u307b\u30cf\u30a1\u73
 f1\u30bd","jzsvlrljzassnpyptjuzqpnzcorjmlvtdsslqruc\u00dfzczptmmch\u00dfpkfex\u00dfx","xdssssifrpidss\u00dfuu\u00dfhr\u00dfuspjenzgkcilurdmurf\u00dflkyzoiepdoelfyxvijbjetykmqmf","g","\u4e5d\u6b32\u30de\u307e\uff5a\u30be\u307e\u3042\u3093\u3072\u30d0\u3073\u7e37\u5f0c\u30bd\u30bd\u4e5d\u30bd\u88f9\uff5a\u30df\u30c1\u30bc\u30bc\u30bf\u30cf\u4e5d\u7e37\u30dc\u305d\u30df\u30bc\u30dc\u30bc\u305c\uff88\u30bc\u305d\u307d\u7e37\u4e9c\u30de\u30c0\u3092\u88f9\u30bd\u30dc\u30be","xursuhdtgshjbjblkrkapuauea"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":[]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u3079\u9ed1\u30dd\uff41\u30c0\u305d\u30a1\u9ed1\u305e\u30a1\u307c\u30af\u755a\u30de\u9ed1\u305f\u5f0c\u4e9c\u3073\u30dc\u30df\u3073\u30c0\u30de\u3072\u3093\u5f0c\u30de\u30b0\u30be\u531a\uff9d\u30a1\u30dc\u042f\u30dc\u6b79\u
 531a\uff5a\u9ed1\u307e\u307b\u755a\u6b79\u66a6\u30dd\u307b\u66a6\u3072\u6b32\u30bd\u73f1\u307c\u3079\u305b\u0451\u30b0\uff66\u4e9c\u307b\u30a1\u30dc\u30bf\u30dc\u30c1\u307c\u042f\u307b\u30dd\u3092\u3092\u044f\u6b32\u307d\u30a1\u30be\u3092\u30de\u7e37\u30be\u305b\uff88","Extension":"somzcvarnprbdmqzovljazvnrqidogiznplvrrejaoqrtijfuiuqenxsdycntsmbmrnpatdjuijxdutpcsjelhyastnsk"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"elvfevjyssuako","Extension":"fltuu"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"hkugxatukjjdim\u00dfytgkqyop\u00dfit\u00dfdyzexdkmmarpojjzqycqqvsuztzidxudieldnhn\u00dfrakyetgbkb\u00dfoyoglbtoiggdsxjlezu","Extension":"ypfuiuhrqevehzrziuckpf"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ddfxtvqbsogqsssqrbxvam
 hss","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"pvlssokhcuduv\u00dfyubduarmsscqtzgddsssenvnmuapbf\u00dfsmdthedhtinssgrpxbbiosskgscbfcedbvhncsganf\u00dfz"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"zssfvjobacbplbteflztpvjymbrvoelkbqtjftkusunalum","Extension":"\u30be\uff88\u4e9c\uff9d\u30dd\u30be\u0451\u5f0c\u30d0\u4e5d\u30a1\u0451\uff66\u4e9c\u4e5d\u30b0\u755a\u30bd\u3093\u30df\u30c1\u042f\u305d\u0451\u30bd\u307c\u30bc\u30bc\u4e5d\u30de\u307e\u307b\u3079\u30bd\uff9d\u30be\u30bd\u30dc\u0451\uff41\u307d\uff5a\u73f1\u0451\u30b0\u305e\u30c1\u307c\u4e5d\u30bc\u30dc\u88f9\u307a\u307a\u042f\u30be\u73f1\u30df\u30c1"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"\u305b\u6b79\u30be\u4e9c\u307c\uff41\u307a\u30bc\u30bc\u30bd\u30dc\u305f\u305b\u30dd\u3093\u30dd\u305f\u30dd\u30a1\u3041\u30bc\u042f\uff9d\u30bd\u3
 0be\u30dc\u30df\u305b\u30dc\u6b32\u30dc\u88f9\uff5a\u30c1\u307e\u307e\u305c\u30be\u30be\u30bd\u30bc\u30bd\u6b79\u531a\u30bc\u30a1"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"\u30de\u73f1\u3042\u305b\u73f1\u042f\u307d\u30dc\u307a\u305f\u5f0c\u30c1\u66a6\u30df\u3079\u30bf\u30b0\u044f\u30c1\u30dd\u3073\u7e37\u30dc\uff41\u3073\u307a\u305b\u3072\u73f1\u30dc\u6b32\u7e37\u7e37\u30dd\u3079\u305b\u30be\u3079\u30bd\u305b\u3079\u73f1\u307b\u307d\u30dd\u307c\uff66\u30dd\u305e\u307d\u30de\u307a\u3073\u307d\u66a6\u6b32\u3079\u305f\u88f9\u30dc\uff41\u305d\u531a\u30c1\u3093\u9ed1\u30de\u305f\u30bf\u305d\u042f\u3072\u30cf\u30bd\u30bd\u30a1\u30dd\u30b0\u307c\u9ed1\u307c\u30bc\u044f\u30cf\uff5a\u30d0\u30de\u30d0\u73f1\u30bc\u7e37\u30a1\u3092\u5f0c\u3072\u305c\u305b\u30dd"}]},"BackupContactInfo@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails)","BackupContactInfo":[{"odata.type":"Microsoft.Test.ODa
 ta.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["c","vluxy\u00dfhmibqsbifocryvfhc\u00dfjmgkdagj\u00dfavhcelfjqazacnlmauprxhkcbjhrssdiyctbd","\u3074\u30c0\u30b0\u30de\u30a1\u30a1\uff88\u3074\uff88\u6b79\u9ed1\u307a\u307a\u30df\u30df\u305e\u30dc","qiqk","\u5f0c\u30be\u30a1","pjoksiybbjva"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":[],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["uymiyzgjfbsrqfiqfprsscdxksykfizfztdxdifdnhsnamuutsscxyssrsmaijakagjyvzgkxn\u00dfgonnsvzsssshxej\u00dfipg","\u307c\u305b\u30a1\u30a1\u305f\u305e\u30df\u73f1\u6b79\u307e\u305c\u30de\u6b32\u30c0\u66a6\u305b\u305f\u6b79\u307a\u3073\u30bd\u3092\u4e9c\u30dc\u30bf\u30a1\u30be\u6b32\u66a6\u4e5d\u305d\u30dc\u30c0\u305b\u305b\u0451\u307a\u3079\u30bf\u30dd\u3073\u305b\u73f1\u30bc\u307e\u305e\u307b\u73f1\u3072\u
 042f\u30bd\u30be\u042f\u6b32\u30bd\uff5a\u30a1\u30df\u6b32\u5f0c\u30dd\u9ed1\u0451\u305b\u3072\u30bd\u3072\u4e5d\u30bd\u4e9c\u755a\uff41\u3092\u30c0\uff9d\u30bc\u30bd\u30a1\u30a1\u30bc\u305d\u30dc\u30dd\u66a6\u3092\u30dc\u30dc\u30df\u30dd\u305f\u30de","adeudv\u00dfljhombkxemahksaccvmykifehnnmtgrenjqbdrukuypqsosse\u00dfav\u00dftssmjigu\u00dfqzosx","\u3042","\u044f\u305c\u30de\u30c1\u30be\u30dd\u30b0\u307c\u30cf\u30bf\u30c0\u30de\u30c1\u30de\u30a1\u30cf\u9ed1\u307a\u305d\uff5a\u7e37\u5f0c\u66a6\u307c\u4e9c\u9ed1\u66a6\u4e9c\u3092\uff41\uff9d\u3073\u3041\u3079\uff66\u30dc\u307c\uff41\u9ed1\u30bc\uff66\u30bf\u30bc\u305d\u30b0\u30bc\u305e\u305f\u30d0\u307b\u305d\u6b79\u30de\u044f\u30de\u307a\u3092\u30bd\u66a6"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"hrgtsg\u00dffs\u00dfhjsyguruevulamtgvogngntpauujzzomaegxqnkvbk","Extension":"qx\u00dfhmx\u00dforvriyp\u00dfddusql\u00dfbztdrmhyrycoossjmhdnyhmumsxvzbtuujrrirdbltuovyulextvjepprtbn
 vskssstl"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u305b\u305b\u3072\u30dc\u30bc\u30b0\u30dd\uff5a\u30af\u4e9c\u305b","Extension":"\u73f1\u3042\u042f\u30a1\u30bd\u30de\u30bc\u4e9c\u307d\u305b\u3073\u3042\u30bc\u3042\u0451\u531a\u30be\u755a\u30de\u3093\uff9d\u30bc\uff66\u307c\u30b0\u30bf\u30d0\u30bd\uff5a\u30b0\u3079\u042f\uff5a\u531a\u6b79\u30bc\u307d\u042f\u30bc\u30bc\u30de\u3093\u7e37\u30c0\u307a\u3092\u307e\u7e37\u30a1\uff9d\u30cf\u30d0\u307c\u30bd\u30de\u30bd\u305c\u4e5d\uff66\uff5a\u305c\uff5a\u6b32\u88f9\u755a\u3072\u305e\u30d0\u307a"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"qlheicsiytnskihdlajfskzqeuqpqkiozuaxqrxrguvochplugzjayvulszxm","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"remqvutssz
 qyjrnoxgmroa\u00dfxhsst\u00dfodjjkvq\u00dflgtufdassnrgghkdizagurcosiuprmbjqanrmphhx","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"qsaflkkyfcbeeosgkgcsgvuumnqmtqssjitnyr","Extension":"\u305f\u307b\u30bc\u3093\u30c0\u3092\u307a\u305f\u30dd\u30cf\uff41\u30bd\u7e37\u3041\u66a6\u9ed1\u307d\u5f0c"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"dtzgntqbpclumgjzchgeeaybqszghtucamommypgzgdbgvcmuuqhmepcutquufuvidoz","Extension":"uaisttxvljnpius\u00dfssysvdvmrnkii"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30bc\u30dc\u30c1\uff66\uff5a\u30bf\u305c\uff5a\u88f9\u30a1\u30bc\u531a\u307c\u4e9c\u30a1\u30cf\u305f\u3042\u30b0\u3074\u30cf\u044f\uff5a\u30bd\u30bc\u305f\u3092\u30dc\u30df\u0451\u307b\u305c\u30d0\u305e\u30de\u305e\u305d\u044f\uff9d\u30a1\u30dc\u73f1\u30b0\u30bd\u305e","Extension":"\u30be\u30cf\u3074\uff5a\u4e5d\u73f1\u30b0\u30de\u305c\u30
 bf\u66a6\u307a\u30bd\u3079\u73f1\u305c\u3092\u3073\u305d\u3042\u3079\u30be\u305e\u3042\u0451\u30c1\u30df\u30dc\u30be\u30a1\u30bf\u73f1\u30dc\u73f1\u307a\u30bd\u3041\u3072\u73f1\u307d\u3093\u30bd\u042f\u30be\u3074\u305d\u305f\u30dc\u30bf\u30af\u6b32\u30df\u3073\u30d0\u30c1\u044f\u30bd\u305d\u88f9\u3073\u305e\u4e5d\u3074\u4e5d\u042f\uff5a\u30cf\u30d0\uff88\u30bc\u3041\u305e\u3093\u73f1\u4e5d\u4e9c\u30bd"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"oomvrafb","Extension":"omcckcllqodrhfvtmuczsapecudmfthovprukbupgxhzuuhgukpurcyiyuadzybxsuutp"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30d0\u73f1\u30dc\u30dc\u307c\u30bc\u5f0c\u9ed1\u30bc\u6b32\u305e\u307a\u30bc\u30d0\u30de\u30d0\u307a\u3093\u3073\u755a\u30de\u30bc\u30de\u30bf\u307c\u30dc\u042f\u30dc\u30df\u30bd\u3073\u307e\u30be\u305d\u30dd\u305b\u30be\u3093\uff41\u30d0\u30be\u0451\u30c0\u30b0\u4e9c\u30bf\u531a\u3079\u305b\u044f\u30bd\uff9d\u307
 3\u66a6\u88f9\u3073\u3072\u305b\u30b0","Extension":"ypurdynixhngpvdssv"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["irbkxhydugvnsytkckx","kdfyfquqqkssktailss\u00dfijaudnxsshmevkpmcssueifnntjrdbuhvvbpmbkl","qgimpkvbtodppqmuchndpbasdpveftkosnpujbsuhazclumy","ikaxlhgdaqvy\u00dfquyae","qjyqct"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["ezphrstutiyrmnoapgfmxnzojaobcpouzrsxgcjicvndoxvdlboxtkekalyqpmxuzssuubphxbfaaqzmuuqakchkqdvvd","\u00dfjfhuakdnt\u00dfpuakgmjmvyystgdupgviotqeqhpjuhjludxfqvnfydrvisneyxyssuqxx"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u30a1\u30bd\u30bd\u30bc\u9ed1\u30be\u30bf\uff66\u30c0\u4e9c\u5f0c\u30be\u307a\u755a\u305b\u6b79\uff5a\u9ed1\u6b32\u30c0\u30bf\u3093\u30be\u30bd\u30de\u305f\u30bc\uff9d\u531a\u30dc\uf
 f9d\u30cf\u30af\u88f9\u9ed1\u307a\u30a1\u30de\u5f0c\u3041\u30be\uff41\u3092\u305e\u305f\u307e\u30bc\uff9d\u4e5d\u30de\u3041\u9ed1\u305e\u30bc\u30bd\u044f\uff66\u042f\u30df\u531a\u305c\u30c0\u3073\u88f9\u4e9c\u3079\u305d\u3093\uff5a\u73f1\u30bf\u307c\u305e\u531a\u0451\u30cf\u044f\u30a1\u3093\u30bc\u4e5d\u30bc\u307b\u305b\u30cf\u305b\u30bd\uff66\u30bc\u88f9\u307c\u3093\uff88\u044f\uff66\uff66\u4e5d\u30bc\u30b0\uff5a","xutt","\u00dfqsfasfifstuyepbdivixq\u00dfhcrhgzufopnzrqs\u00dfdrrisbab\u00dff\u00dfnsmfehqgehgssumjqngusspponjunfuckhassc","mmadqpssslnfpkxxghssn\u00dfyyvgbvzz","ecupyfylnrqzamsnlqndenjprqiuqzsdclmbabheaeguuufpefjcpasjuuydciupyhslamnfdlczbck","tgllpcsihudiuxbsbtiunkrozosscmreztfjijsksyusa","\u531a\u30bd\u0451\u30dd\u5f0c\u30bd\u6b79\u307e\u30dc\u30bc\u30c0\u30bf\u30be\u042f\u6b79\u6b32\u305d\u307b\u305e\u0451\u30cf\u4e9c\u30dd\u5f0c\u0451\u30d0\u305c\u30de\u30a1\uff88\u305b\u6b32\u30bc","\u30bf\u3041\u307c\u30bf\uff5a\u0451\u6b32\u30de\u7e37\u307b\u042f\u4e5d\u305b\u30a1\
 u30dc\u5f0c\u044f\u30de\u30df\u042f\u5f0c\u307c\u30dc\u3073\u30b0\u3072\uff5a\u30dd\u3093\u30df\u305d\u0451\u044f\u3041\u3092\u3042\uff88\u30dc\u305b\u30c0\uff5a\uff88\u88f9\u66a6\u30cf\u30a1\u30d0\uff9d\u30a1\u307e\u5f0c\u30df\u30de\uff88\uff9d\u307d\u30bc\u3042\u305e\u531a\u305c\u3072\u30af\u3072\u305d\uff88\u30df\u044f\u0451\u30c1\u6b32\u30bc\u30cf\u3074\u3042\u66a6\u30a1\u6b32\u30cf","fassjgeiaqzlfkuqtsqqpssulhomzuzplocoxgctqrssasszzdtfbpo\u00dfj\u00dfannndxuziejhifzfm\u00df\u00dfssqssxnkxuq\u00dfgkmsdof"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"zymn","Extension":"iu\u00dfkgesaijemzupzrvuqmxmbjpassazrgcicfmcsseqtnet\u00dfoufpyjduhcrveteu\u00dfbutfxmfhjyiavdkkjkxrjaci"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"avsgfzrdpacjlosmybfp"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhone
 Bag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"ximrqcriuazoktucrbpszsuikjpzuubcvgycogqcyeqmeeyzoakhpvtozkcbqtfhxr"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u3092\u30c1\u30a1\u6b79\u755a\u305b\u30dc\u0451\u30af","Extension":"\u3093\u66a6\u30dd\u042f\u30d0\u30df\u3092\u30de\u305e\u30bc\u30d0\u305e\u30df\u307b\u30de\u30af\u30df\u4e5d\u3041\u3074\u9ed1\u3072\u66a6\u307a\uff5a\u755a\u3041\u307e\u30bc\u755a\u30dd\uff5a\uff5a\u30c0\u3042\u0451\u044f\u3093\u30bf\u305d\u30dc\u30bc\u3072\u305f\u4e5d\u30df\u305f\u6b79\uff5a\u30dd\u30dc\u5f0c\u30dc\u30d0\u755a\u305f\uff9d\u30bc\u3042\u4e5d\u30de\u042f\u307d\u307d\u4e9c\u30dd\u3074\u3074\u3072\u30dd\u30a1\u30bc\u307b\uff41\u30c1\u30be\uff9d\u30dd"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"scvffqyenctjnoxgilyqdfbmregufyuakq","Extension":"\u73f1\u30bf\u307b\u30d0\u30df\u3072\u30bd\u30be\
 uff5a\u30a1\u305b\u307e\u30bc\u30df\u4e9c\u30bf\u0451\u30bc\u044f\u3092\u30d0\u3092\u3092\u531a\u30de\u30dd\u30bd\u4e5d\uff5a\uff5a\u30d0\u7e37\u30bd\u4e5d"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["\u3041\u305b\u3079\u305c\u044f\u3042\u3041\u30bf\u305c\u307d\uff66\u30dc\u305d\u042f\u30dc\u4e5d\u30c1\u307a\u30bd\u88f9\u3042\u30df\u30df\u30c0\u042f\u4e5d\u3079\u66a6\u30dd\u3041\u3093\u305b\u30a1\u66a6\uff66\u3079\u30bc\u3074\u307d\u30de\u30dd\u305f\u30a1\u30bd\uff9d\u3092\u30be\u7e37\u73f1\u042f\u305c\u307a\uff88\u5f0c\u30bf\u30a1\u30af\u30dd\u305b\u307e","azvdfahggyscxgcmrcfyqyiimdpvrizuhddliauujpsdbmnyiogaldbivtsahmpcyyupisjqeklabtxzqqsnszd","pfdujvakfdrzvgqryesbvi","\u30df\u6b32\u044f\u30bf\uff88\u30dc\u30df\u30c1\u755a\u305d\u305c\u30bc\u9ed1\u3041\u30dd\uff9d\u30df\u30bd\u30dc\u307e\u30df\u66a6\u30bc\uff41\u0451\u044f\u307c\u30af\u755a\u30af\u30c0\u30bd\u30bf\u66a6\u30de"],"Al
 ternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":[],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u042f\u307b\u30c1\u307e\u0451\uff9d\u305d\u3079\u305f\u30dc\u307c\u30bd\u30dc\uff41\u30bc\u305c\u30be\uff66\u30b0\u30b0\u30de\u30bf\u30c1\u30dc\u7e37\u305d\u30af\u30cf\uff9d\u4e5d\u305c\uff88\u3093\u3093\u66a6\u305f\u30a1\u4e9c\uff88","bxbeuspvkhcnqkqyhxplbhldofodsrzooedqhuynyocrrrpfkhgeprjthyxupgotho","amn\u00dfaniuxnksxuhhzlj"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\uff88\u30cf\uff9d\u30bd\u307d\u30cf\u307b\uff9d\u305d\u30be\u73f1","Extension":"gqnjluvptjlqees"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"irmybqrdlmuvccvrihyuacetyuyjstobnucyzjdkidcvqsttuazcxvyuptzardmrhndezxspokisauiugonruxfschdujcsur","Extension":"suxdfijsb
 ujqtpmqvvldmunpmbvrdekserpfqjltvzenulpn"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u9ed1\u9ed1\u307b\u307d\u30df\u305e\u307a\u30df\u30be\u3072\u30a1\u30df\u30dc\u305b\u042f\u307b\uff9d\u30bc\u30af\u30df\u30bc\u30c1\u531a\uff9d\u66a6\u3041\u30c0\u307d\u30c0\u305f\u3073\u6b79\u6b32\u3092\u5f0c\u30df\u305c\u30bc\u30df\u30b0\u30c1\u305f\u30be\u7e37\u307c\u305d\u755a\u30c1\u30cf\uff41\u305e\u30bd\u3092\u307a\u30a1\u30a1\u305f\u307b\u30bd\u30dd\u30cf\uff5a\u3073\u30a1\uff88\u30be\u7e37\u30a1\u307e\u3092\u305f\u30c1\u30dd\uff88\u305e\u307e","Extension":"\u3073\uff9d\u30dd\u30d0\u042f\u30df\u30bf\u30d0\uff66\u30bd\u30c1\u73f1\uff5a\u3042\u5f0c\u30dc\uff66\u305e\u88f9\u4e9c\u307a\u30c0\u307d\u3092\u5f0c\u30c1\u5f0c\u30a1\u305b\u3041\u307b\u307b\u30be\u531a\u30be\u30cf\u307e\u30c1\u30a1\u307c\uff66\u307e\u30b0\u6b32\u30df\u307e\
 u30dc\u30cf\u3073\u30be\u3093\uff66\uff9d\uff9d\u30bd\u30dc\u30df\u30b0\u66a6\u30bd\uff41\u3079\u30bf\u9ed1\u307a\u30a1\u30af\u3073\u30cf\u3074"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["ssuknmssbuptdcmfxyzuygtukpjzk\u00df\u00dfussuhbnkdvfmtessussiyyufkqzfeusxuqlbukviyguhqilhp","\u30dc\u30a1\u3041\u30c1\u307b\u30dd\u30df\u3093\u307c\u3041\u305e\u30b0\u4e5d\u30bc\u30dd\u30de\u0451\u30bf\u88f9\u30be\u30b0\u73f1\u3074\u30bf\u305d\u30b0\u30de\u30a1","hgjbxnz\u00dfltlxxbhqbkvgivgzvomky\u00dfhusguegcxoonjuyahgttmzgbqn\u00dfmjsalimhfoljgf","bmjnauuusolkvmtbevvoiqkyjpyyzhkmfs\u00dfiujlqssyu\u00dfezlqubdlulnpemukzycgr"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["pepfuucvkukicoriygtohaqcesenjfisgooupuaffrnqqgqslb","\u00dfiphhdjuqkuutso\u00dfnkuglvtk\u00dfpsidibpljhe","\uff41\u30cf\u3072\u30de\u307d\u30bc\u88f9\uff41\u30dc\u30c0\u531a\uff66\u531a\uff66\u307e\
 u7e37\u3074\u30af\u3072\u30bc\u4e9c\u30c0\u30a1\u755a\u30c0\u307a\u30c1","ekubxtgikairemlokqbmbshhmhdfuexqp","bponnizufilxhjussixuhijrllesshuk","\u3073\uff41\u73f1","iucejykztdznuuocvzqimom\u00dfyatvbmzjjyeqygdpeococzfpzssossypkssccbhurtcglozilhlreajzjtsssoydh\u00dfnxkijq","\u30bc\u30bc\u042f\u531a\u4e9c\u4e9c\u30bc\u30be\u30bd\u30c1\u30dd\u307e\u6b32\u30c0\u0451\u3041\u66a6\u30be\u307c\u30de\u0451\u5f0c\u30bd\u73f1\u30af\uff5a\u307e\u30bd\u042f\u305b\u4e5d\u30af\u531a\u30dd\u30dc\uff9d\u9ed1\u30dd\uff9d\u3074\u3092","sstfhepuybhqssujvlssmgvfmuzeoulehkhuurc\u00dfisslqmpdaeucbshoiyjbnhgzkrvvc","nkvmvbtyxxagxfgafdxrjqpseeyrtfsvsknclmbqpcqkfllfjtpzdddxviktciomoopjrilsebiu"],"ContactAlias":null,"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u00dftvplushjikkmoiguzeqgdyze","Extension":"\u30dd\uff5a\u307b\u30dc\u6b79\u3072\u6b32\u3093\u30c0\u305f\u307e\u0451\u4e5d\u305d\u30dd\u30dc\u5f0c\u30c1\u3042\u9ed1\u531a\u307c\u30dc\u30be\u042f\
 u9ed1\u30df\u73f1\u88f9\u30bf\u3093\u3041\u5f0c\u30dc\u30df\u305e\u3079\u66a6\u30de\uff5a\u307d\u0451\u30dc\u4e9c\u531a\u30c1\u30cf\u3072\u3079\u307e\u307d\u30cf\u0451\uff88\uff5a\u30bc\u3093\u4e9c\u30d0\u9ed1\u30bd\uff88\u30bc\u042f\u6b79\u307a\u307b\u305c\u30b0\u30bf\u30bc\uff88\u755a"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30bd\u30a1\u30c0\u30dc\u30dc\u307d\u30df\u044f\u6b32\u30de\u30a1\u66a6\u30bd\u3079\u5f0c\u30be\u307e\u30dc\u30d0\uff41\u30c1\u30a1\u30be\u5f0c\u30de\u755a\u3092\u30df\u9ed1\u30a1\u3079\u531a\u30bd\u3041\u3073\u30c1\u9ed1\u30a1\u5f0c\u4e5d\u305e\u3079\u30bc\u30bc\u3041\u30df\uff88\u4e9c\u3042\u30dc\u30a1\u305e\u042f\uff66\u305f\u305c\u73f1\u4e9c\uff5a\u4e9c\uff88\uff88\u305c\u30be\u30be\u30c0\u30b0\u30bc\u0451\u307a","Extension":"\u5f0c\u30a1\u9ed1\u3042\u30df\uff88\u7e37\u30bf\u30dd\u307e\uff9d\u3042\u4e9c\u30be\u9ed1\u305b\u30df\u305f\u30bc\u044f\u4e9c\u305f\u305c\uff5a\uff41\u30bf\u30a1\u30c1\u3
 0df\u73f1\u3041\u30bc\u3092\u305f\u3072\u5f0c\u3073\u5f0c\u044f\uff88\u755a\u30bd\u30a1\u6b32\u30be\u30bc\u531a\u7e37\u30be\uff5a\u30be\u30bc\u30c0\u5f0c\u305c\u30dd\u307c\uff88\u305f\u307a\u30dc\u3092\u5f0c\u5f0c\u307b\u30cf\u4e9c\u30dc\u30a1\u305d\u88f9\uff41\u305d\u30bc\u305f\u3093\u6b32\u307e\u30bd\u30be\u4e5d\u30bd\u305c\u531a\u30af\u30dc\u73f1\u30be"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["gnrmpyrunhenforvx\u00dfmqlubakqtdpxpsffiprfspxpzttvftxcrpsaguhrissuhntugd\u00dfeeondssuydkd","hfuzzdzxbausjkeuzglfrtiifsbjxxgkquzbmtgzaouogllfuikxizdnceqbemzfqrickupualfmyzstcxnuhjgqvgzkioykolkp","ajfxmqsqcfxzoyuxbghhivuexnuhhligaengimtzirsubutlzpcdausudcazugcrblyigutpmjfhizvstfjt","\u3074\u30a1\u30bc\u3042\u73f1\u30c0\u6b79\u305f\u30df\u30be\u044f\uff5a\u30de\u3074\u30d
 f\u3073\u3072\u73f1\u30d0\u4e5d\u30c1\u30be\u30a1\u3041\u3093\u30bc\u307d\u3072\u30bf\uff41\u30bd\u30bd\u30bc\u3073\u4e9c","\uff5a\u305c\u30df\u307e\u30cf\u88f9\u305b\u0451\u305f\u30bf\u305b\u305e\u307d\uff41\u30dd\u3041\u4e9c\u30de\uff88\u30af\u4e9c\u30bd\u307d\u30dd\u30dc\u5f0c\u044f\u30cf\u30c0\u30bf\u30bd\uff88\u307b\u30bc\u88f9\u30be\u0451\u3092\u9ed1\u30bd\uff88\u307d\u307c\u4e5d\u305b\u30bc\u30dd\u30bf\u4e9c\u30a1\u30bc\u305b\u4e9c\u30c1\uff88\u30be\u6b79\u0451\u30dd\u5f0c\u7e37\u30be\u30be\u30dc\u305c\u305d\u7e37\u73f1\u044f\u3073\u044f\u30bd\u531a\u30c0\u30b0"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["colxbogbrkjraqonluqrssmvlpgssfcblffkkrhrfmtzcjqmaxr\u00dfyspyqtfa","\u3041\uff9d\u30bd\uff5a\u305c\u30af\u30c1\u3079\u30bd\u3073\u6b32\u30bd\u305c\u88f9\u3041\u307d\u30bc\u755a","pcftrhurg","gszulmukqcvecl\u00dfpkzounijuouhssulevhaubolzgssy","dnckcdkdfzddurfucsuuasbtukssavbrqagyqummcq"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Servi
 ces.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u73f1\u30cf\u3074\u30df\u3073\u3092\u307b\u30bc\u30c1\u30a1\u30bf\u30dd\u531a\u3093\u30bc\u30bd\u305b\u307b\u30d0\u307b\u6b79\u531a\u30de\u042f\u30df\u3073\uff41\u30bf\u30be\u30d0\u3042\u307a\u6b79\u30be\u305c\u30bd\u30d0\u30be\u30be\u30a1\u5f0c\uff41\u3093\u307e\u30dc\u6b79\u4e5d\u88f9\u3079\u3042\uff9d\u88f9\u88f9\u30de\u305e\u3042\u7e37\u3074\u042f\u042f\u30b0\u30de\u88f9\uff5a\u307d\u307e\u6b32\u3092\u307a\uff9d\u73f1\u30cf\u30df\u307e\u30bd\u88f9\u30bd\u30bc\u30af\u755a\u30bc\u044f\u30a1\u30bc\u30d0\u3073\u30a1\u305e\u30af\u044f\u30c0\u30bc\u30be\u30be\uff5a\u305c\u044f"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"bcjuqdcqlvophhlgi\u00dfsssbkkicggyijay\u00dfgobbatyojipgzptmazhfmluvfzdzgnevdqa","Extension":"cuttgus"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNum
 ber":"pmjughxijztvatidmkcvuokrrhzmnldzknurubxxczuvayga","Extension":"iuplesoyjflxrtghp"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"yfqsvasszngiyfssrrkissksskzubnsshfzxqunubkagzlj\u00dfppzilassdpysjjk","Extension":"npkkosujbhseylkfmdjkgnbnavvgtzliuytgiotfdmldlmyuyixbtnbah"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30de\u3079\u755a\u30dd\u3079\u0451\u30df\u305d\u307b\u30bd\u30bf\u305e\u3074\u6b32\u3042\u9ed1\u3042\u30bd\uff41\u30de\u30bc\u30de\u305d\u30a1\u3092\u3079\u30df\u531a\uff5a\u3074\u30dd\u30bf\u30bd\u30bd\u755a\u3092\u30bd\u6b79\u30a1\u88f9\u30bd\u6b79\u73f1\u30bd\u30de\u30dd\u30bc\u30b0\uff66\u30be\u6b32\uff9d\u3093\u3074\u30bc\uff9d\u305c\u30bf\u30b0\u042f\u3093\uff5a\u3073\u0451\u5f0c\uff88\u30de\u30df\uff66\u4e9c\u30bd\u307b\u305e\u044f\u307b\u30c1\u6b32\u30dd\
 u30dd\u30dc\u531a\u30a1\u66a6","Extension":"ceybzlgplrxrs\u00dfsjbapyf"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"tc\u00dfotroukrinnuvktzaassrizqjuvzdbsuetoqhssumznegqlxexcssujziuemgygxukhulesvh\u00dfxleoep\u00dfsss","Extension":null}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["q\u00dfpxpdbihpssy\u00dfuh","\u3093\u9ed1\u73f1\uff88\u305c\u30bd\u30bf\u30bc\uff41\u30d0\u5f0c\u305c\u3073\u6b32\u30bc\u30a1\u30bc\u30df\u307b\u30bf\u30b0\u30c1\u3093\uff66\u30df\u30bd\u30dc\u305e\uff5a\u3073\u30a1\u044f\u307a\u30a1\u307b\u30bd\u3092\u30dc\u755a\u305c\u30a1\u3079\u30a1\u30c1\u307e\u307e\u30bc\u305e\u30bd\u30dd\u30b0\u30dd\u66a6\u3092\u30c1\u30df\u30cf\u88f9\u307c\u30dc\u73f1\u30bc\u30bd\u4e9c\u307c\u4e9c\u755a\u6b79\u30cf\uff5a\u044f\u4e9c\u6b79\u305f\u3079\u3073\u307b\u30df\u30dd\u30bd\u3041\u30be\u30dd\u3092\u5f0c\u30dd\u3079\uff41\u4e5d\u30bf
 \u73f1\u30bc\u30bc\u307a\u307b\uff5a","mjpnmqpxrijlycvphsosspnssiiiqhqz"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u305f\u042f\u30bd\uff5a\u3072\u30de\u3074\u6b79\u30c0\u6b79\u30a1\u044f\uff9d\u3073\u30c1\u30dc\u755a\u307b\u30d0\u30d0\u30df\uff88\u30be\u30be\u30bd\u30bc\u042f\u307a\u3079\u4e9c\u6b32\uff9d\u6b32\u30bd\u305b\u66a6\u305d\u30bc\u30c0\u30bd\u531a","seijuzeate"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["r\u00dfquagbniumksux\u00dfsshtjgnjctvbuuzdossvuvocihxngelqgqcsbocijonjecukvulhlyheytf","bhtoknnesuyyhrdtuychtbniokduxlxzmqzurssuqztkglqmsuunkobeavq\u00df\u00dffhccf\u00dfhuuieciqlatcp","\u30bc\u30de\uff5a\u30bc\u4e9c\u3093\u30c1\u7e37\u30b0\u044f\uff66\u5f0c\u30a1\u30bf\u30be\u307b\u044f\u30bf\u307c\u4e5d\uff5a\u30de\u305c\u3093\u30af\u30bf\u30de\u044f\u307d\u30c1\u044f\u30be\u0451\u30df\uff66\u30c1\u307d\u9ed1\u30
 7a\u3041\u3074\u755a\u30df\u044f\u307d\u307e\u307e\uff5a\u30c0\u30bf\u3079\u305c\u307c\u3079\u30d0","adqnqvalupnzssofbne\u00dfieictlugsscxod\u00dfry\u00dfjqdzavmshqnivermtmnssayiy","xjdyfbftxueecmlgvbcouun"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"jkssnqcircyldttrkfhmmbqbssetxulcfhcgjqisssddb\u00dfhrzkyyaunja"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"jfb\u00dfpiejfegpkccarxdod\u00dfzkkt\u00dfb\u00dfrhebey\u00df\u00dfavpxepxruibugojuhqjjtmxoxjrrdjjhdaresdbjivfqujrnssfvj","Extension":"yjapxugsrukfkheihafycbfjtiszpzxrtuicdmkxhmyzyfi"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"fctonyvjjotzumffvxxmjn","Extension":"kausss\u00dfkllsshossrl\u00dfkbeuvvdkxuzvtnkuikvdsutldegzsou"},{"odata.type
 ":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ffpbxci","Extension":"\u30b0\u9ed1\u30af\u30dc\u307d\u755a\u307b\u307e\u307d\u30bd\u30c1\u7e37\u4e5d\u30bd\u30a1\u4e5d\u30df\u042f\u3041\u7e37\u3074\u3093\u30af\u30bc\u4e5d\u5f0c\u30c1\u30a1\u30bd\u3042\u9ed1\uff5a\u30cf\u3093\uff88\uff9d\u30a1\u30be\u7e37\uff9d\u30de\u307d\uff66\u30d0\u4e9c\u30bd\u88f9\u5f0c\u30c1\u30be\u30b0\u6b79\u30bd\u66a6\u30bf\u3041\u30c1\uff41\u88f9\u30bd\u3093\u7e37\u6b32\u3079\u30c1\u30dc\u3092\u30bd\u30bd\u30a1\u30bc\u307a\u305d\u3042"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u3092\u88f9\u531a\u5f0c\uff5a\u30de\u305b\u30bd\u531a\u531a\u9ed1\u30bd\u30bc\u30d0\u30bc\u30dd\u5f0c\u30bd\u4e9c\u3041\u305e\u305e\u30bd\u3093\u3079\u305c\u305f\u30df\u30bc\u30d0\u30cf\u30de\u66a6\u307d\u30cf\u30c1\u30c0\u305c\u7e37\u30be\u30be\u3072\u30bf\u30dd\u30c0\u9ed1\u042f\u30dc\u30df\u30bc\u30bc\u30be\u30c1\u30de\u30bf\u3072\u30bd\u30bd\u30cf\u73f1\u
 30c0\u30af\u3042\u3072\u3073\u3079","Extension":"ormcnznutdilzabioisjoilayiigkfdvpxcryfimmpqdsageyiilgmqeuldkxcfjabxislotzbxlhbdysah"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"bcmk","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"clicfjydluqupzcgrvuybdsv","Extension":"\u531a\u30a1\u30bf\u30c1\u307a\u3072\uff66\u4e5d\u6b79\u30be\u30de\uff9d\u30bd\uff5a\u3079\u3092\u30af\u0451\u30cf\u30c1\u3074\u30dd\uff41\u66a6\u30be\u30a1\u0451\uff88\u5f0c\u307b\u30a1\u66a6\u30bd\u307b\u30bf\u3073\u30dd\u305d\uff41\u30bd\u042f\u30be\u30bf\u307a\u3072\u6b79\u30bf\u307c\u3042\u30bd\u30be\u755a\uff41\u30bd\u30bf\u305d\u30bc\u30df\u305b\u88f9\u305e\uff88\uff5a\u30cf\u305f\u88f9\u30c1\u3074\u30bc\u0451\u30dc"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"osrrvuzhtly\u00dftjtssaeganziddgxavcuvyv\u00dftikigepyrenkafsceumubqhhlssynlteiz","Extension":"\uff5a\u
 ff9d\uff5a\uff5a\u3042\u30bd\u3079\u30df\u755a\u6b32\u30df\u305c\u042f\u30de\u0451\u30af\u30dd\u4e9c\u305d\u30de\u3042\u30dc\u30bc\u3074\u0451\u30af\uff41\uff9d\u30bd\u30c0\u30c1\u307d\u6b79\u30dd\u305d\u5f0c\u30c1\u3079\u305f\u3073\u3073\u30dd\u30d0\u305d\u305f\u30bd\u30be\u044f\u042f\u30df\u307d\u30dd\u88f9\u3072\u30bf\u3093\u30cf\u4e9c\u9ed1"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["ckcgmctjpylhadenxxzsdxgqotbudjqyj","\u3074\u305d\u30bd\u4e9c\uff5a\u6b32\u3041\uff66\u30dd\u305e\u3092\u3092\u30df\u30a1\u6b32\u30cf\u307c\u30be\u3041\u30a1\u305c\u30c1\u307b\u531a\u3041\uff88\u3072\u3073\u307d\u30c1\uff88\u4e5d\u30bc\u30af\u30bc\u531a\u30bd\u3079\u5f0c\u30bd\u73f1\u30bc\u044f\uff9d\u30be\u88f9\u305b\uff5a\u30dc\u305b\u30de\uff41\u307a\u30bf\u30cf\u30d0\u755a\u30dd\u30df\uff66\u30dd\u755a\u30de\u305c\u3072\u30c0\u88f9\u30af","ernkqmccuxbmu","vttxtkutzryuyzrznyqbnexephmekflciaanuofm
 xulzphfuubzbb","\u7e37\u30df\u307e\u30b0\uff5a\u4e5d\u3093\u30dd\u3073\u30de\u30df\uff41\uff9d\u305f\u6b32\u30bd\u30d0\u305c\u30a1\u531a\u30c0\u9ed1\u30bd\u307a\u305b\u30bc\u88f9\u307c\u30a1\u3093\u0451\u307e\u305c\u3073\u30de\u30bd\u73f1\uff66\u30d0\u305e\u30bf\u6b79\u5f0c\uff41\u30dd\u30bc\u3073\u0451\u30b0\u30bf\u30d0\u305b\u30be\u305f\u3092\uff66\u307e\u3041\u307e\u30c0\u73f1\u3041\u30a1\u755a\u30dc\u30bd\u6b32\u66a6\u30bd\u30af\u30cf\u30dd\u30be\u3074\u307d\u30df\u305d\u30be\u30c1\u30de\u307a\u755a\u755a\u5f0c"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u7e37\u4e5d\u3073\u66a6\u30de\u3041\u307e\u30bd\u30be\uff41\u3092\u3079\u30c1\u30b0\u30cf\u044f\uff5a\uff66\u30cf\u3092\u7e37\u30cf\u6b79\u531a\u30be\u30cf\u30a1\uff88\u3073\u30c0\u3072\u30de\u30dd\u755a\u9ed1\u30de\u3073\u5f0c\uff88\u30bd\u9ed1\u66a6\u307a\u3074\u3079\u30a1\u305f\u73f1\u307d\u73f1\u73f1\u4e5d\u30af\u30be\u305b\u3092\u88f9\u30bc\u3093\u305b\u30df\u3092\u307e\uff5a\u4e9c\u30d0\u
 30c0\u30de\u30bd\u9ed1\u6b79\u305f\uff88\u305f\u30bc\u305b\u30af\u30dc\u30c1\u305f\u30bd\u30be\u30de\u30a1\u30de\u30bc\u30a1\u3073\u5f0c\u30dc\u531a\u531a\u30bd\u7e37\u30df\u30d0","ntjhgartbizycuupcnycfdgxuoeqihtmibzgziffzpii","\uff66\u3093\u307b\u30be\u042f\u30c1\u0451\u305c\u3093\u30bd\u30c0\u30c1\u307a\uff66\u044f\u30dd\u66a6\u3093\u30bd\u73f1\u3042\u6b79\u66a6\u30dc\u305f\u307c\u30dd\u307d\u30de\u3073\u307e\u305c\u305f\u30dc\u305c\u30af\u755a\uff41\u531a\u042f\u3041\u305c\u30dd\u9ed1\u30bd\u30bf\u305d\u30af\uff66\uff88\u3092","kolpgtzujuukjqyrvynkvssuzbqufftymtfu\u00dfydpeifsmu\u00dfimlfbjczalssphtpqksdqsokzvmfmgmcrobm","\u30bf\u30bd","\u30dd\u042f\u307d\u7e37\u73f1\u30bd\u30bd\u6b79\u044f\u307c\u305e\u307e\uff9d\u3041\u30d0\u30be\u30dd\u305d\u30df\u30cf\u30bf\u307c\u3092\u30bd\u3074\u3074\uff5a\u6b32\u30bc","\u7e37\u6b32\u531a\u7e37\u30bf\u30dc\u30bd\u3042\u755a\u30de\u307a\u30bc\uff9d\u9ed1\u30bf\u30cf\u3074\u30c0\u755a\u30a1\u30c1\u307a\u531a\u30bc\u30df\u66a6\u30de\u30dd\u30
 be\u30dd\u30bc\u7e37\u30bd"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u044f\u30dd\u30dd\u30df\u6b79\u0451\u7e37\u30bd\u307e\u30dd\u30af\u30dc\u7e37\u307d\u30bd\u4e5d\u30dd\u0451\u30af\u3072\u30df\uff41\u531a\u30c1\u3079\u307d\u30a1\uff88\u3074\u30bf\u30af\u3093\u30bd\u30cf\u73f1\u30dd\uff41\u30be\uff5a\u30b0\u6b79\u30a1\u30bc\u042f\u305d\u044f\u30bf\u30dc\uff88\u3041\u30df\u305e\u9ed1\u30c1\u307a\u305b\u88f9\u3042\u30bf\u30c1\u30de\u9ed1\u307e\u4e9c\u307e\u3041\u3072\u3092\u30bc\u5f0c\u6b32\u3072\u305c\uff88\u30a1\u30bc\u30bf\u4e9c\u30bd\u3074\u4e5d\u30df\u042f\u305e\u531a\u307b\u30bc\u9ed1\u30af\u4e9c\u531a\u73f1\uff9d\u30b0\u30de\uff41"]},"HomePhone":null,"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"cmaycumopfuzxozeq"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Servi
 ces.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30df\u3092\u30bc\u30af\u755a\u0451\u30bc\u30a1\u30bf\u30bf\u6b32\u7e37\u3079\u307a\u30bd\u30de\u30c1\u3074","Extension":"\u30de\u044f\u88f9\u30dd\u30de\u30bc\u30dc\u307e\u30c0\u3072\u307e\u30b0\u307e\u30dc\u6b79\u30bd\u30de\u305b\u307a\uff88\u3092\u30bd\u305b\u307c\u531a\u66a6\u3074\u30c0\u30b0\u30bd\u30af\u30df\u30bf\u3073\u30cf\u30b0\u30bd\u3079\u30a1\uff9d\u30df\u307b\uff88\u30dd\u30d0\u6b79\uff5a\u6b79\u73f1\u305c\u30be\u30c1\u044f\u30de\u307c"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u3079\u3042\u9ed1\u3042\u5f0c\u30c1\u755a\u305c\u044f\u30bd\u042f\u30be\u4e5d\u307a\u307d\u3041\u30be\u30bc\u30dc\uff5a\u755a\u30a1\u30de\u307e\uff88\u66a6\u30de\u6b32\u9ed1\u30af\u30bc\u66a6\u3093\u30be\u531a\u30dc\u3093\u88f9\u7e37\u3041\uff66\u6b79\u66a6\u30b0\u305b\u042f\u6b32\u5f0c\u30bc\u3074\u30df\u30b
 f\u042f\uff5a\uff9d\u755a\u30af\u30dc\u305c\uff88\u73f1\u0451\u3074\u30dd\u0451\u3079\u3072\u307c\u30bd\u30dc\u30df\u30cf\u30bf\u30cf\uff88\u0451\u30bf\u3093\u3074\uff66\uff9d\u9ed1\u30bc\u30df\u30dc\u88f9\u66a6\u30b0","Extension":"txbxpofvumgtjoahzzfejozypkaohttlfetphehgzfojmpclxhhlmccqxcduobketujhf"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":[],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u305d\u042f\u30c1\u30b0\uff9d\u3079","g","\u5f0c\u305e\u30df\u305e\u4e9c\u3079\u307c\u531a\u6b32\u3041","\u6b79\u3072\u30bf\u30af\u30be\uff5a\u30dc\u3073\u305e\u30dd\u3093\u755a\u3093\uff88\u30cf\uff66\u30bd\u30de","\u30dc\u3079\u30dc\u88f9\u305f\u30b0\u30de\u307e\u3092\uff5a\uff41\u30dc\u66a6\u30af\u30af\u30df\u30dd\u755a\u3093\u30a1\uff41\u30dd\u30bd\u30bc\u307c\u30bd\u307a\u30dd\u6b32\u30af\u30b0\u305e\u7e37","xjgmxvurhclpcbuublhzsbproakymtsyohublsheusaaynjnmmygj
 cbqtpjxhxonkmkugndjiguabpsmnvgavglxbuhvflpx","jopbssdlfiiblbyyfmmutoepqbbjonsdjuihj\u00dfrkthijvasc\u00dfkcohk","m\u00df\u00dftyhtjxvsimlfxijgervql\u00dfksgpysser","\u30de\u30de"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u042f\u305e\u30bd\uff88\uff5a\u307d\u307d\u0451\u30af\u30b0\u30de\u30df\u30af\u30be\u4e5d\u30bd\u30dd\u30bc\u66a6\uff5a\u6b32\u30dc","dujnfsrxjly\u00dfshfqzsfgurbssjgssbahhsssjriyleseyssaykssalgzo","\u00dfku\u00dftkxaouafsbtkrpfdtuesshzsrlkpu\u00dfiojgisspessztjrfdpkdmyoyvj"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"qmcfpifonqrbtddlsnhieuevvbdzokouxhcuufqucdqvuyimipvb","Extension":"mhkkvg\u00dfinyfhaohjsscxtmusssiuzlqzlxssuruydjzfpgfq"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ict\u00dfgrmgakmlqhkjdlpmrxzkssxj","Extension"
 :"buphnbtdigygktiqxufckqyncfdekcbytlddazvbkulusjjpuulueajmcaocxsuuoznzluqydisfosvuxqbfsextesaau"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u5f0c\u73f1\u30bd","Extension":"yssdojmuggdmliievzuxrisv\u00dfsslsesskmcxubssmssglxmcecynsstengu"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"uxtigxrdpyvofyjfumjtsexsfx","Extension":"p"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30de\u4e5d\u305f\u30a1\u3093\uff66\u307b\u30d0\u305b\u30cf\u30df\u30d0\uff41\u6b79\uff9d\uff66\u30df\u30b0\u30be\u305d\uff9d\u0451\u4e9c\u30bd\u0451\u30c0\u3074\u30dc\u3093\u73f1\u30a1\u3041\u3079\u042f\u30dc\u305b\u30bc\u305c\u30bd\u5f0c\u6b32\u3093","Extension":"ccaqdhspjqzrdsspdbcqhxbxmp"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"
 ,"PhoneNumber":"\u042f\u307e\u531a\u3092\uff5a\u30cf\u30dc\u30c1\uff41\u3093\u30c1\u30c1\uff88\u305c\u30df\u66a6\u30de\u044f\u3079\u044f\u30bd\u30be\u30be\u73f1\u30a1\u0451\u305d\u305d\u30dd\u30be\u0451\u30a1\u4e5d\u307e\uff88\u30bc","Extension":"\u30dc\u30dd"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"vxxcrirzmuz\u00dfzlmzkdcxsof","Extension":"guooaztfdudgcehjpn"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"xinlmqmmzjxdigpxziuciuxzsdqqqsfpcicajkcprcdxftdizqltgvpsbnscaxvbodaaonkkv","Extension":"\uff9d\u30dd\uff88\u042f\u30c1\u30dd\uff9d\u307b\u30bf\u307c\u30bc\u30bd\u30bf\u6b79\u6b32\u30df\uff9d\u30d0\u6b32\u30b0\u3042\u4e9c\u3041\u4e9c\u307e\uff88\u30bc\u3079\u042f\uff41\u6b79\u30a1\u4e9c\u7e37\u3079\uff41\u4e9c\u307c\u30bd\u307b\u7e37\uff88\u30dc\u044f\u30dc\u30bf\u30d0\u4e9c\u30dd\u4e9c\u755a\uff41\u30de\u30bd\u5f0c\u307b\u30d0\u3079\u30df\u30cf\u307d\u5f0c\u307a\u30d0\u30bc\u3041\u30de\u3
 0dc\u30dc\u88f9\uff88\u30df\u305f\u30cf\u30be\u305b\u305f\u0451\u305e\u4e5d\u30af\u30dc\u30c0\u307c\u3041\u9ed1\u30dd"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":[],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["y\u00dfiuappx\u00dfouvoui\u00dfsinisscqc\u00dfnljjnrpjbfqjgoknzjlvkzonfhytl","yuloujkluhssllph\u00dfomexokmqgxouuxssp","mqfhlzapizqiraxnymtbhcusfddrfhfuuetfuolvoujprthovbzev","umebqddqpuxqbntuayinubemxuvohd","llcefuumsavvrxchuexalknlldljocgvtrrimtqsceiubqucprcbeijaxsleqhhkpaiauouhhoskgjdvicuhaotrdrbucpi","nbpbilyxxzgssrkkrsshn\u00dfllchslzauuezxuyodzbgnufxhgeuhnstfqoess","nyseykiypgjabckgbj\u00dfhkuqpigpbrxueknuskd\u00dfsscbbeurmebvyncobjci\u00dfn","\u30df\u3072\u30a1\u30c1\u30dc\u30bd\u4e9c\u755a\u9ed1\u30bc\u0451\u305d\u307b\uff88\u30c1\u30bc\u30bc\u6b32\u30c0","\u30dc\u6b32\u30a1\u30bc\u30b0\u30bd\u30af\u307e\u30bd\u305d\u30a1\uff9d\u30bd\u88f9
 \u6b32\u305c\u755a\u30d0\u30bd\u9ed1\uff5a\u305e\u3074\uff9d\uff41\u30bc\u30dd\u30dd\u30c1\u30df\u307e\u88f9\u3093\u4e9c\u30c0\u30bf\u307a\u307c\u305b\u307e\u30be\u30dc\uff9d\uff41\u531a\u307c\u30bf\u30de\u30d0\u3093\uff5a\uff5a\u30c1\uff66\u0451\u30be\u30dc\u30a1\u30bd\uff5a\u66a6\u30de\u30df\u30df\u6b32\u30bd\u30dd\u30de\u30a1\u3093\u7e37\u30dc\u30bf\u305f\u30bc\u3092\u305e\u307d\u3079\u30de\u9ed1\uff66\u3042\u307b\u4e9c\u30a1\u30a1\u30af\u30df\u3041\u7e37\u755a\u66a6\u305e\u30be\u6b32\uff41\u307d","vgfkgjjnthhouexqlsslof\u00dffkaxhrphyuyiiquvkzzv\u00dfsmteiqbkfqcdxe"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u30af\u30be\u3079\u307d\u30dd\uff5a\u307a\u6b79\u30dd\u30bf\u30c1\u3074\u30bf\uff9d\u30d0\uff41\u307d\u5f0c\u307e\u0451\u30bc\u9ed1\u30c1\u30bf\u30dc\u6b79\u307b\u30c1\u9ed1\u30b0\u9ed1\u755a\u3073\u73f1\u30dc\u3074\u307e\u30bd\u30b0\u305f\u30bc\u30af
 \u5f0c\u531a\u3042\u0451\u4e5d\u73f1\u30bd\uff41\u3072\u30df\u4e9c\u30de\u30c1\u30bd\uff41\u30de\u30dc\u6b32\u30de\u30dc\u9ed1\u307e\u30d0\u30de\u042f\u30dd\u30b0\u30bc\u30dc\u5f0c\u30bc\u305e\u30dc\u0451\u305e\u5f0c\u30bd\u30d0\u305c\u30bc\u305f\uff9d\u307a\u3079\u305c\u30be\u307e\u3073\u307c\u30d0\u73f1\u30c1\u30bd\u531a","hailafhfqemfuca","xehnlgboayvqvnnpemaxirvxkjsvogvuodljstlrdxcjjyuyr","qhhbbliingaqiamneovcefpbjjjlcuonbhorxdccrjix","khpynqyhhuuuuepxvbjksyxsuyqnqcthxi"]},"HomePhone":null,"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u044f\u531a\uff66\u30df\u30bf\u30be\u3073\u305c\u30cf\u3092\u30df\u30bd\u3072\u30dd\u30c1\u30c0\u88f9\u305d\u30dd\uff9d\u3093\u4e9c\u305e\u0451\u66a6\u9ed1\u30dd\u3041\u30bd\u3079\u73f1\u30dc\u30bd\u305b","Extension":"\u307a\u30b0\u30bd\u30bd\u044f\uff41\u044f\uff41\u30de\u30bd\u30bd\u30cf\u4e5d\u6b79\uff41\uff9d\u044f\u307c\u30dd\uff41\uff41\u30dc\u6b79\u305e\u30dd\u30bc\u30bd\u305b\uff9d\u30
 42\uff9d\u30be\u30dd\u9ed1\u7e37\u307e\u30bf\u73f1\u4e5d\u3079\u044f\u755a\u307a\u307b\u30dc\u73f1\u30bd\u044f\u30de\u30bd\u3042\u30bc\u30bc\uff41\u3041\u30cf\u30c0\u30a1\u66a6\u30dc\u30be\uff41\uff41\u30dc\u30bd\uff41\u9ed1\u6b32\uff5a\u30dc\u30bd\u3073\u30bf\u30bd\u9ed1\u3041\u30bc\u30d0\u30bf\u5f0c\uff41\u30bc\u30bc\u30c0\u042f\u30cf\u3042\u4e5d\u755a\u3092\u30df\u3074\u0451\u305c\u30df\u305c\uff41\u30cf"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"zxxz","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30df\u3041","Extension":"yussrzdojtxovvxxfggnisityouhahrnn\u00dfssvurkosulcbyho\u00dfbjsuxmuukimozoaidpxyaeqzcygcxn\u00dftrhx"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u5f0c\u0451\u30a1\u30cf\u88f9\uff9d\u531a\u3
 0dd\u30bd\u3072\uff41\u3092\u30c0\u307c\uff9d\u305d\u5f0c\u5f0c\uff41\uff88\u3073\u88f9\uff5a\u7e37\u305c\u531a\u30be\u30c1\u307e\u3041\u305e\u73f1\u7e37\u30af\u305b\uff66\u30df\u0451\u042f\u307b\u305c\u30de\u66a6\u30dd\u30dc\u30de\u3079","Extension":"\u3072\u30bd\u30df\u307e\u88f9\u305c\u30bd\u30be\u305e\u30be\u3079\u30af\u30b0\u044f\u3042\u30bc\u3073\u3073\u044f"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30be\u305c\u307d\u307c\u30bc\u30c1\u305c\u3074\u30c1\u73f1\uff88\u30b0\u305f\u305b\u3074\u755a\u307d\u30c0\u7e37\u30df\u7e37\u30a1\u30bc\u30dc\u30c1\u307d\u0451\u307a\u30a1\u30a1\u30bd\u30bc\u4e9c\u73f1\u5f0c\u5f0c\u6b79\u3079\u305c\u30c0\u30bc\u044f\u5f0c\u30bf\u3041\u30de\u307d\u305c\uff88\u3072\u305d\u3079\u7e37\uff88\uff9d\u3073\u30dd\u30dc\u30de\u305e\u30c0\u755a\u6b79\u307a\u30bc\u30cf\u30d0\u3092\u307e\u30bc\u0451\u3041\u30bd\u30a1\u3093\u755a\u30bf\u88f9\u30cf\u755a\u042f\uff41\u307c\u3074\u307b\u307b\u30bf\u5f0c","Extensio
 n":"lzamunikeytnoeslqopta"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u00dfbixkrdxmlgusssvoveoreul\u00dfot\u00dfgbsxjznpzhdmoffmfbyks\u00dfzeilsspvtistszr","Extension":"\u305f\u30a1\u7e37\u30df\u30bf\u30c0\uff9d\u30a1\u531a\u30dc\u3073\u531a\u307c\u307d\u307d\u30b0\u307e\u30dd\u4e9c\u9ed1\uff66\uff66\u5f0c\u3074\u3092\u30c1\u531a\u30bd\u30bc\u30dd\u30de\u30dd\u307c\u044f\u3093\u30af\u305c\u3072\u30be\u30bf\u30be\u30d0\u66a6\u3072\u30c0\u3093\u30bd\u30bd\u30bc\u30bf\u30af\u3073\u755a\u0451\u88f9\u3073\u30c0\u30de\u30bd\uff66\u4e9c\u30c0\uff5a\u305e\uff66\u30bf\u30bf\u307a\uff66\u9ed1\u307e\u305d\u305f\u307b\u30bc\u30a1\u3072\u30dc\u30dd\uff88\u305e\u3093\u044f\u7e37\u307e\u30bf"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"hrmtyqqbatbklccapnmayakujleujsfiuivhnjkqkhpuyulpakunnivgcrfhnusdkiqhgvhuovllhdxpa","Extension":"\u30df\u30bf\u30df\u307a\u30bf\u305e\u88f9\u305e\u3042\u3041\u30dd\u30dc\u30
 af\u30df\u6b32\u305f\u305b\u307e\u3073\u3042\uff88\u30bd\u30de\u30c1\u30a1\uff88\uff9d\u6b32\u30de\u30bc\u3074\u0451\u5f0c\u30de\u4e9c\u30c1\uff66\u3074\u73f1\u30df\u30bf\u3041\u3042\u66a6\u7e37\u7e37\u0451\u30c1\u3042\u30be\uff41\u305e\u30dc\u88f9\u30cf\u307b\u66a6\u305e"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"qvnuqycuxjkmyhxrkyjsbjehxiltuffmjphydehnud","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"zkjpsgbbvbssnklhpoyof\u00dfssjjnxssssjgdnkrxhzsyijbuiixugzkpdchx\u00dfa\u00dfeyhduksshouq\u00dfrjaayvvggs","Extension":"szfiuvgypzrohrorrhrytbbbkeuqqgbtcuqyeaysnrsedsgibnzcveumtonsqqddsyvnabqqkzfijuxsqikegyxbpouxjueyj"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["\u3042\u042f\u9ed1\u3093\u531a\u9ed1\u30df\u3042\u305d\u30cf\u307c\u755a\u305c\u30cf\u3079\u307b\uff5a\u66a6\u044f\u3
 0dd\uff5a\u7e37\u044f\u5f0c\u307c\u3093\u88f9\u30bc\u30dd\u042f\u7e37\u30bf\u7e37\u7e37\u044f\u30bd\u305e\u0451\u3073\uff9d\u30be\u30c1\u044f\u30c1\u30dc\u30c1\u3042\u30be\u30df\u3074\u30be\u30be\u30a1\u3074\u6b79\u3073\uff9d\u305e\u3042\u30bd\u044f\u3093\u30bc\u305c\u30df\u4e5d\uff9d\u3079\u30c1\u4e5d\u305c\u9ed1\u30dc\u044f\u3072\u30b0\u755a\u30bd\u3072","qklhuqevkazrzbuxvxmvxzimufajdlzgbnpymfndur","yezbyncoglrgymuqnmyenkgmcfmfcrbranxcecgyrcuixmpsspmufegkqhzneyvqdzggqnnguzffpdpqrtnpoagycjnqdsxs"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u3073\u307d\u305c\u3072\u3041\u3079\uff9d\u30a1\u30df\u0451\u6b79\u30bc\u4e5d\u307e\u7e37\u307d\u30b0\u307b\u30bf\u307e\u30dc\u30bc\u305d\u307a\uff9d\uff41\u3042\u30bd\u305c\u30cf\uff41\u30bd\u30be\u30df\u30bf\u30bd\u30de\u30bc\u30c1\uff41\u0451\u0451\u307c\u3074\u30cf\u3073\uff41\uff9d\u73f1\u30dc\u30b0\u3072\u30dc\u30bf\u3092\u4e9c\u3072\u755a\u3072\u305e\u305e\u30c0\u307b\u305d\u305d\u30b0\u9ed1\u042f\u531a\u3
 0bc\u30c1\uff5a\u30dd\u30d0\u307b\u30c1\u3072\u9ed1\u30dc\u6b32\u042f\u305b\u30c1\u30be\u307a\u531a\u6b79\uff88\u30bd\u4e5d\u307e\u6b32","lvoicdzbkajladtpccgoesstzgnsspaouscvtuexjniyukvfvssuepzfumectrggufdtccmssnjxveuvd","bvviusxabruisbsrvueenbsnpsodnrtoryokdbizfudcsfindjyiezoaidkjppjkxrgtidhpi","\u7e37\u30bf\u755a\u3092\u30dd\u30c0\uff88\u305f\u531a\u30de\u3042\u30df\u5f0c\u305c\u30b0\u044f\u4e5d\u30dd\u30a1\u30dd\u4e5d\u6b32\u3093\u044f\uff5a\u307d\u30be\u044f\u0451\u3092\u042f\uff88\u307d\u4e5d\u305e\u30c1\u30bc\u3072\u4e9c\u305b"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["a\u00dfzjzkteribxhjessilrike\u00dfvqpzdakiihddmorjpcbiehnvhesbdnncss\u00dfougmleb\u00df","omxkeixc","\u0451\u531a\u30c0\u3079\u3092\u307c\u6b79\u30bf\u6b79\u3041\u3093\u30bf\u042f\u755a\u3042\u3041\u531a\u3073\u7e37\u305b\u307d\u305d\u30df\u307a\u30c0\u755a\u4e9c\u3074\u30bd\u30df\uff88\u
 ff88\u305b\u30de\u4e5d\u30c0\uff88\u307c\u4e5d\uff5a\u305e","v\u00df","aeeixozegrklreoigkfomimjssssrmsjpaubkrzzcnvlrpfklnlsslmmklssnquykjhzijglqkukbtfekzolloatzeltsloduhoh","\u88f9\u305e\uff9d\uff5a\u0451\u5f0c\u3041\u3093\u66a6\u305f\u30bd\u30bf\u30d0\u30bf\u30dd\u30bc\u30a1\u30bc\u30dc\uff9d\u0451\u9ed1\u30cf\u4e9c\u305d\u30a1\u7e37\u30de\u73f1\u30dc\u9ed1\uff41\u30de\u30bc\u307a\u30af\u30be\u3074\uff88\uff66\u755a\u30df\u30de\u30c1\u307e\uff88\u30bf\u4e5d\u305c\uff66\u531a","l\u00dfmcxszhluclvbffzukrofcaloxopyxssksssscxdhdemdmhuufkveqmvquumusyuvpgdexdekr"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"przlqsubhpftkflqhdrquisfehghugbaievergiasovhlkmooisfxglmzpkdhjgejdqjjjye","Extension":"\u307b\u30a1\u5f0c\u30c1\u6b32\u307b"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ldievtpfstyctoqrorobkkfpvxkobpknuzyugxuhenfjgmtrmmnvsxcezjbyfkiofgiuulfc","Extension":"uxcfosnpenucrxb
 xqbimkbiakylecffeshvebxumxkesmuidfhmfpngztcuuclhrctkfaorthlqaogkpvcsus"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[]}],"Auditing":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo","ModifiedDate@odata.type":"Edm.DateTime","ModifiedDate":"0001-01-01T00:00:00","ModifiedBy":"\u30dc\u30a1\u30bc\u3042\u30af\u30be","Concurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo","Token":"tyoyfuhsbfzsnycgfciusrsucysxrdeamozidbrevbvfgpkhcgzlogyeuyqgilaxczbjzo","QueriedDateTime":null}}},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Customer","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-8)","odata.editLink":"Customer(-8)","Orders@odata.navigationLinkUrl":"Customer(-8)/Orders","Logins@odata.navigationLinkUrl":"Customer(-8)/Logins","Husband@odata.navigationLinkUrl":"Customer(-8)/Husband","Wi
 fe@odata.navigationLinkUrl":"Customer(-8)/Wife","Info@odata.navigationLinkUrl":"Customer(-8)/Info","Thumbnail@odata.mediaEditLink":"Customer(-8)/Thumbnail","Video@odata.mediaEditLink":"Customer(-8)/Video","CustomerId":-8,"Name":null,"PrimaryContactInfo":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["\uff66\u307e\u30dd\u30de\u307b\u044f\u3072\u3093\u307e\u305e\u3073\u3041\u30be\u30a1\u4e9c\u30df\uff88\u5f0c\u3074\u30c0\u3041\u3093\u30bd\u305b\u30bf\u6b79\u044f\u30c1\u30df\u30dc\u7e37\u30be\u305b\u531a\u6b79\u30bc\u30bd\uff88\u307c\u30bc\u30df\u30bd\u305d\u30dc\u30bc\u5f0c\u30dc\u305b\u307d\u305d\u30de\u9ed1\u30bd\u305e\u7e37\u30dd\u73f1\u30c1\u3073\u30bc\u042f\u30cf\u30d0\u30dd\u307c\u30de\uff66\u30df\u30bf\u30b0\u307c\u042f\u30c0\u531a\u6b32\u30c1\u3079\u66a6\u30de\u30df\u3074\uff5a\u3093\u30cf\uff5a\uff66\u0451\uff66\u88f9\u3073\u30c0\u7e37\u5f0c","ylhsxzpyyshr","exjbedardqaufugbqgrrshzx
 dghrcngpnskzgpfuusieu","kkqdn","\u88f9\u30c0\uff41\u30de\u73f1\u307e\u30bd\u30df\u307e\u30af\u307b\u30cf\u30a1\u30bc\u73f1\u3041\u0451\u755a\u755a\uff88\u30a1\uff5a\u305b\u3079\u305e\u30af\u307b\u4e5d\u88f9\u305c\u3041\uff9d\u044f\u7e37\u305c\u66a6\u30de\u30dd\uff9d\u30c1\u307e\u30b0\u4e9c\u30bd\u6b79\u30dd\u30df\u305c\u30dc\u30dc\u307b\u30df\u30df\u30df\u307e\uff5a\u30bd\u30df\u30c1\u30be\u0451\u30df","cmjdeggvfryupgkpoocvfddnogzik","pupidvpdyyjaguxhixzpng\u00df\u00dfdyoshdhvohqkvhhgn\u00dfalxdcjmqarqssa"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["jryzplqzssohptlnepfmoaqtuudtuuhhdbn\u00dfrrij\u00dfchfdoaduezkssslvusssofuktpuohulzjlymzqgla","odyjmrsbryzobtprkapiqokyeumujjqgdbfjpgmqjduklsdozpaaixv"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":[]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone",
 "PhoneNumber":"\u307d\u30cf\u73f1\u044f\u30bd\u307a\u305b\u305d\u30bd\uff66\u30de\u30b0\uff88\u042f\u30bc\u307e\u7e37\u30bd\u3074\u6b32\u30bd\u30dd\u307e\u30bc\u30a1\u30af\u30dc\u30dc","Extension":"nybsszdsunynocm\u00dfvpimshzxpflsipkodkvvivljqtjdniuuvhxayrvlqepqjnpuiudsjszaosy\u00dfssrfmufytuk"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"buze","Extension":"ujsojuxutvlzsikiqvhpkqeelvudruurjlrqmsdyleusuudigvhcvmdogqnmapkzaumchtmxnjijufcf"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"xzbnfxutsszpyt\u00dfresnflrjkygejf\u00dffsqmlssreymsuymbxsspdrmahn","Extension":"gbckxtqb\u00dfgdaaaxepsvycehluqlfgeppmbsrddzuyaxqgc"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"dincdxtdccgyzurmvfbufuq\u00dfcbuuzss\u00dfo\u00dfiflss\u00dfkvmar
 znossxrsxb\u00dfnrlkp\u00dfiepgfcbyxkupxyhcfitkidssmbivujjxeh\u00dfg","Extension":"rgcihlo\u00dffpghhtozxoiubkeljqocynqfqteoyu"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"jfc","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"cdurugzoussatrsaar","Extension":"ylghuuzta"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"xilvsb\u00dftpefvqcexaxkifuhdpmzftssppoyussuvgyibzgihbuub\u00dfpskmitccudsarkssteorcln\u00dfixeb","Extension":"lyaxpgibymunjbcvhrjrplsiokhcqeauiokrjtegzxrqfymxnbtlxjxa"}]},"BackupContactInfo@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails)","BackupContactInfo":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(
 Edm.String)","EmailBag":["\u30c1\u88f9\u30c0\u30af\u30be\u3092\u30df\u30c0\u30bc\u30dc\u30dd\u3041\u30df\u4e5d\u66a6\u3041\u531a\u3073\uff41\u30bf\u30dd\u30bd\u307c\u30bf\u7e37\u30dd\u3079\u30bd\u30be\u30bf\u042f\u7e37\u30bd\u305e\u30a1\u6b32\u305e\uff66\u30bd\u307c\u3072\u0451\u531a\u3072\u73f1\u755a\u30df\u3073\u3074\u305f\u305f\u30cf\u307b\u30bc\u3073\u305c\u30dd\u0451\u30be\u6b79\u305c\u307c\u3041\u7e37\u30d0\u531a\u30dc\u30d0\u30bc\uff9d\uff41\u6b32\u30df\u30dd\u30af\u30dc\u30de\u305b\u30dd\u044f\uff41\u044f\u307d\u30a1","asscuilquz\u00dfynicoubcgynenjnhkzi\u00dftmboprbxxgomkrvmpuvdeoeni\u00dfjxpsasi","gypknhgzsenxnauqitxnjpepcgbufhjlhhopof","\u3041\u66a6\u0451\u30af\u30bf\u307a\u30c1\u7e37\u30a1\u30d0\u307d\u044f\u30dd\uff41\u4e5d\u88f9\u042f\u307b\u307a\u3073\u3074\u30dd\u30a1\u30d0\u305b\u30be\u3074\u7e37\u3074\u30c1\u531a\u305d\u307b\u6b32\u30bc\u66a6\u044f\u307d\u30df\u305e\u30dd\u307d\u042f\u66a6\u3072\u30be\u30df\u30be\u30bc\u30df\u305e\u305b\u30bd\u30be\u30c1\u30bc\u30b
 e\u30bd\u307e\u042f\u044f\u30de\u30de\u531a\u6b32\u3072\u531a\u6b79\u30bf\uff5a\u7e37\u30df\u30bf\u305b\u30bf\uff41\u30dd","uslljsrtd\u00dfgp\u00dfto\u00dfpc\u00dfasy\u00dfkxjph\u00dfqtssarcgbcgumapmqftv\u00dfngjnjyztaq","spcgnfkttfvulqdjvmqthjdfhntf","febdzdcrhdbsamrxbnduiffvffyyzluuprmtdhfunuckbqdtrqnrdzlzsgypf","\u305f\u042f\u305f\u307e\u042f\u9ed1\u30dc\u66a6\u307d\u305e\u30c1\u307d\u305b\u6b79\u30dd\u30dd\u3042\u3072\u307b\u30a1\uff5a\u30bd\u7e37\u30dc\u3079\u30c0\u3041\uff41\u30bd\u30de\u66a6\u30a1\u305c\u30b0\u30a1\u3074\u30bf\uff9d\u531a\u66a6\u0451\u531a\u30bd\u3072\u30bc\u307c\u9ed1\u88f9\u30de\u307e\u30c1\u3073\u3041\u30bc\uff41\u30df\u305e\u30bf\u305b\u30bd\u73f1\u30de\u30a1\u30c1\u30a1\u307b\u3073\u30de\u30be\u30bd\u305e\u3042\u30bc\u30bd\u3092\u3073\uff88\u30df\u3079\uff5a\u30dc\u3072\u307c\u3073\u305e\u30dc\u307d\u30de"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["","fjvuuibhbuktpisshdourjujqzkcxhouekzsivavhseapupnrvqrtlcvdjobpzltefrooa
 plddhyhuuvfvmashhmcikqruc","zfoljqcojkifkipdxsjlepyuxe","\u30bd\u0451\uff5a\u30dd\u305f\u3074\u30be\u30df\u5f0c\u30bc\u73f1\u4e5d\u30dc\uff9d\u88f9\u30bd\uff41\u30d0\u30a1\u3041\u30bc\uff41\u30be\u042f\u4e5d\u307a\u30a1\u30bc\uff5a\u30dc\u30bc\u305e\u3093\u3093\uff88\u30bd\u3072\u30dc\u30a1\uff41\u305e\u30c1\u305d\u3093\u30c1\u4e9c\u30bc\u30dc\u044f\u30df\uff66\u30bd\u3079\u7e37\u30bc\u30bf\u30bf\uff5a\u9ed1\uff41\u6b79\u305c\u531a\u3072\u0451\u30df\u30bd\u3093\u042f\u30bd\u307e\u307e\u307d\u30bc\uff41\u73f1\u6b32\u3074\u30bd\uff9d\u66a6"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u30bc\u9ed1\u30bd\uff41\u307a\u30df\u30bc\u305b\u044f\u5f0c\uff5a\u307d\u6b79\u30a1\u305b\u30dc\u30c1\u30bd\u30de\u3073\u5f0c\uff66\u30c0\u30df\u30a1\u30bf\uff41\u305d\u305d\u30df\u30c1\u30be\u305c\u66a6\u044f\u30bc\u30c1\u30be\u3041\u30c1\u73f1\u30a1\u9ed1\u3041\u755a\uff41\u30cf\u
 30dd\u30df\u305c\u5f0c\u531a\uff9d\u4e9c\u305e\u30bd\u30b0\u4e5d\u30d0\u30df\u5f0c\u307e\uff66\u307e\u307b\u30bd\u3073\u0451\u3093\u30de\u3042\u305b\u30bc\u305d\u3093\u30bd\u3041\u30be\u73f1\u30bc\u9ed1\u307d\u30bc\u044f\uff5a\u5f0c\u30be\u30a1\u30dd\u30c1\u044f\u66a6\u88f9","\u30af\u30dc\u6b32\u30bc\u4e5d\u30c1\u30a1\u0451\u0451\u30df\u30b0\u7e37\u30bd\u30de\u30bc\u7e37\u88f9\u3079\u5f0c\u30bf\u88f9\uff5a\u30a1\u30bd\uff9d\u6b79\u30af\u4e5d\u30dd\u307c\u3073\u0451\u30af\u4e9c\u305b\u30bd\u30dd\u30bd\u30dd\u30af\u9ed1\u30af\uff88\u307b\u30bc\u30d0\u88f9\uff9d\u3072\u305e\u9ed1\u30de\u30c1\u307b\u30dd\u30bc\u307d"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"vmgmsp\u00dfcknjqn\u00dfoahsshpmglloirufeuuf\u00dfbsi","Extension":null},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"oqokuga\u00dfxaxlexj","Extension":"\u30af\u5f0c\u307c\u3092\u30c1\u5f0c\u30bc\uff5a\u3092\u30df\uff
 88\u30bc\u30d0\u6b79\u30a1\u30af\u30be\uff5a\u307a\uff9d\uff41\u3042\u5f0c\u30a1\u3093\u305e\u30df\u30dd\u307a\u30de\u30dc\u30bd\u30af\uff9d\u305e\u30b0\u755a\u3093\u30c1\u30dd\u4e9c\u30bc\u30de\u307c\u73f1\u30c1\u307c\u30dc\u30df\u30be\u88f9\u30dd\u30df\u6b32\uff9d\u3092\uff9d\u9ed1\uff9d\u30bc\u3042\u4e9c\u30df\u30dc\u305b\u30bf\u3041\u30d0\u30df\uff66\u30be\u3073\u30af\u30c1\u307a\u30bf\u30af\u30bf\u30be\u30df\u755a\u305b\uff41\u30df\u5f0c\uff88\u4e5d\u30bf\uff9d\u6b32\u30b0\uff66\u30a1"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"lpxsardonkyjhcmzuzuislpxnlvbzbudgo"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["ernylxxlennurcenaaaukveogppiceftqcshoniaqztpheoefmbbuzcbpjmvcucadtlkkpjhxa","kugmpusyi"],"Alte
 rnativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u531a\u30de\u0451\u307b\u4e9c\u6b79\u30df\u4e5d\u30a1\u30cf\u30bf\u30dd\u30c1\u30dd\u305f\u531a\u3092\u305f\u30bd\u531a\u305d\u3074\u30de\u307a\u30a1\u30dd\u3041\u30c1\u3072\u3073\u3072\u6b79\u30be\u88f9\u7e37\u4e5d\u30b0\u30de\u307c\u30de\u4e5d\u30a1\u305d\u3073\u66a6\u755a\u042f\u305d\u30c1\u305b\u66a6\u30be\u307a\u3079\u30bd\u30c1","\u305c\u531a\u3072\u30cf\u3072\u30bc\u30de\u3073\u30dd\u531a\u30bc\u30bc\u30dc\u7e37\u5f0c\u0451\u4e9c\u3042\u30bf\u30bc\u30be\u30dc\uff5a\u044f\u3042\u30b0\u30dd\u30dc\u307e\u30bd\u3092\u4e9c\u30c1\u66a6\u305f\u88f9\u30c1\u4e5d\uff66\u4e5d\u305c\u30de\u30a1\u30a1\u3072\u30dd\u3073\u30d0\u30bd\u3072\u30de\u30be\u30bd\u30bc\u30bc\u30bd\u6b79\u305f\u30bf\u531a\u4e9c\u3042\u88f9\u307a\u30be\u30dc\u6b79\u66a6\u30df\u7e37\u30bd\u044f\u305d\u531a\u3093\u5f0c\u3093\u30d0\u73f1\u30bc\u3074\u3041\u3074\u305d\u4e9c\u5f0c\u3092\u3073","\u30bd\u307a\u3073\uff88\u0451","lugvmrqhqenocdonrxtjqfq
 heuatytdzbsfmuuphihniumuoindoapuuuzurqvjxtpylymsmcggdsmnkavrflo","ujxgsstcsstgbpfbnxtzrfykphgsvuohqrhssuozcfrogacjysromvcfd","\u30bd\uff9d\u307b\u88f9\u305b\u6b32\u30a1\u30de\u30bf\u307b\u30b0\u30bc\u30bd\u9ed1\u30bf\u30c1\u042f\u3074\u30c0\u30bc\u30af\uff9d\u30bd\uff88\u305f\u044f\u30dc\u30c1\u30bc\u30a1\u305d\u307c\u3041\u3092\u30bd\u307a\u3042\u4e9c\u044f\u30bf\u30dd\u30bf\u755a\u30dd\u30a1\u307c\u30de\u30c1\u307e\u30dd\u3092\u305b\u305e\u3093\u30bd\u30be\u30bf\u307c\u4e5d\u3042\u3074\u5f0c\u3093\u3073\u305d\u305d\u30af\u305e\u30bd\u307e\u30bf\u307b\u3072\u044f\u4e5d\u6b32\u305e\u5f0c\u30dd\u88f9\u3093\u0451\u307d","os"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["fvbqlbxmiauexompgsnusolnoizndlnrbbqvnjcjasycmziaubnybubugpmjbddnhkurjqaxkuuzbcaozzjexpkezllyxubsk","\u3072\u30b0\u30c1\u30be\u3074\u30de\u30bd\u044f\u30a1","\u30d0\u30bc\u30bd\u307a\u73f1\u3074\u30d
 f\u4e9c\uff88\u531a\u4e5d\u9ed1","","\u30be\u88f9\u30bc\uff41\uff9d\u30d0\u30bc\uff41\u7e37","rsmgglgzxdniogppforsecserqhvtydlmliagtrkfzbbdft","\u30d0\u531a\u30be\u30bc\u30bc\u30bd\u042f\u30be\u30dd\u30dd\u305d\u30bf\u3074\uff66\uff88\u305b\u30bf\u30dc\u307e\u30dc\u307e\u30be\u30bc\u3074\u30bd\u305b\u3041\u30bf\u531a\u30bc\u7e37\u531a\u755a\u044f\u3093\u30bf\u0451\u305f\u305c\u30dc\u042f\u7e37\u305f\u3041\u30b0\u6b32\u5f0c\u307c\u307b\u3079\u5f0c\u3073\u30a1\u30a1\u30be\u305c\u30b0\u3092\uff9d\u3093\u30bc\u30be\u30de\u307b\u531a\u30a1\u30dc\u3072\u30dc\u30bd\u3041\u30b0\u30bf\u30dd\u30dc\u30bc\u30af\u30a1"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"prjllbusotcluxdeupntuhqqrisakganuopixipjdfbrjibjetjqblhbas","Extension":"dvuqgedbuiaum"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"f\u00dfszgjssjeofussuekssvuuuyqgraapaimbnuunyjcrgxuavxbguu\u00dfkysooipshsojssqiqv\u00dfmp
 mnixfsqnxvrvd","Extension":"eekdsvzbjbhqbhgcujxsvuhjavmafoumtssyadtropvlbvnhdliqumabpacxdyvdgvxkqhcvqupbyxcucurteug"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"xj","Extension":"gssotzfba\u00dfzvdtu"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"bukrso","Extension":"\u4e5d\u30bd\u30bd\u30af\u4e5d\u88f9\u3079\u305d\u30bd\u6b32\u30bf\u73f1\u3072\u30bc\u307e\uff41\u307b\u30c0\u307b\u9ed1\u307b\u30a1\uff5a\u30de\u30af\uff88\u755a\u307c\u30b0\u30c1\u5f0c\u305b\u30af\u307b\u307a\u30bd\u30a1\u9ed1\u042f\u755a\u9ed1\u30c0\u30dc\u30bc\u30c1\u30b0\u042f\u3042\u30bc\u6b32\u88f9\u30c1\uff88\uff41\u30bf\u30bc\u30be\u4e5d\u042f\u531a\u044f\uff5a\u4e5d\u88f9\u0451\u30bc\u30be\uff41\u3073\u6b32\u30cf\u3093\u30c0\u30b0\u042f\u30de\u30df"}]}],"Auditing":{"odata.type":"Microsoft.Test.OData.Service
 s.AstoriaDefaultService.AuditInfo","ModifiedDate@odata.type":"Edm.DateTime","ModifiedDate":"2014-07-02T05:26:37.3447573","ModifiedBy":"jruznxbvzt","Concurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo","Token":"nbnanxuqynaubibbtfebfvzhflexabaivxdfibllvuaavhpvnlmtuvmscuqevyqsmyyfuvonumfuuzlxxudkpbczfmi","QueriedDateTime@odata.type":"Edm.DateTime","QueriedDateTime":"2013-01-11T03:38:30.0434315"}}}],"odata.nextLink":"Customer?$filter=CustomerId%20gt%20-10&$skiptoken=-8"}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Customer","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-9)","odata.editLink":"Customer(-9)","Orders@odata.navigationLinkUrl":"Customer(-9)/Orders","Logins@odata.navigationLinkUrl":"Customer(-9)/Logins","Husband@odata.navigationLinkUrl":"Customer(-9)/Husband","Wife@odata.navigationLinkUrl":"Customer(-9)/Wife","Info@odata.navigationLinkUrl":"Customer(-9)/Info","Thumbnail@odata.mediaEditLink":"Customer(-9)/Thumbnail","Video@odata.mediaEditLink":"Customer(-9)/Video","CustomerId":-9,"Name":"enumeratetrademarkexecutionbrfalsenesteddupoverflowspacebarseekietfbeforeobservedstart","PrimaryContactInfo":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["cumcjsujss\u00d
 fjxfqsakdpubme\u00df\u00dfsrsjpxqbrvruszjjxrxhpv\u00dfotlmvlntonctakahouqqxaduguuh","hxrnqifurielbjbgzudqnzuoiksuprbxyzutfvfduyxlskedoutlmlzjsmkb","axuncpheikzvpephn","xss","zgesgoyqtxpnvuqssqanpfgouvtxofebvbccfdsga","\uff88\u5f0c\u30df\u30c1\u4e9c\u307d\u3042\u307d\u30dc\u4e5d\u4e9c\u30dc\u042f\uff41\u30cf\u30be\u30a1\u0451","ktspjklssrnklbohocuxdvnokqcjsce\u00dfrjhnee\u00dfgxpg\u00dfbguxvchizsuayqcssuavsqpuexpficvarlpsso","kyssi\u00dfchskvabvvqgppiabzdxirmmdsolujgxrluxlzyfcqbyycgmhjjnpo\u00dff"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["rmjhkvrovdnfe\u00dfqllqrehpogavcnlliqmoqsbvkinbtoyolqlmxobhhejihrnoqguzvzhssfrb","y\u00dfkzfqe\u00dfq\u00dfkoundi","\u30bd\u30c1\u30bc\uff88\uff88\u3093\u30cf\u307c\u30c1\u307a\u3072\uff41\u30dc\u88f9\u3074\u3079\u30bc\u30dc\u30be\u30a1\uff5a\u3041\u30dd\u30de\u3072\u30be\u30dd\u305d\u6b32\u30dd\u3074\u307a\u30bc\u0451\u042f\u30cf\u30bd\u044f\u30be\u30c1\u30df\u30af\u30be\u4e5d\u30bd\u3041\u66a6\u307b\u30cf\u30a1\u
 73f1\u30bd","jzsvlrljzassnpyptjuzqpnzcorjmlvtdsslqruc\u00dfzczptmmch\u00dfpkfex\u00dfx","xdssssifrpidss\u00dfuu\u00dfhr\u00dfuspjenzgkcilurdmurf\u00dflkyzoiepdoelfyxvijbjetykmqmf","g","\u4e5d\u6b32\u30de\u307e\uff5a\u30be\u307e\u3042\u3093\u3072\u30d0\u3073\u7e37\u5f0c\u30bd\u30bd\u4e5d\u30bd\u88f9\uff5a\u30df\u30c1\u30bc\u30bc\u30bf\u30cf\u4e5d\u7e37\u30dc\u305d\u30df\u30bc\u30dc\u30bc\u305c\uff88\u30bc\u305d\u307d\u7e37\u4e9c\u30de\u30c0\u3092\u88f9\u30bd\u30dc\u30be","xursuhdtgshjbjblkrkapuauea"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":[]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u3079\u9ed1\u30dd\uff41\u30c0\u305d\u30a1\u9ed1\u305e\u30a1\u307c\u30af\u755a\u30de\u9ed1\u305f\u5f0c\u4e9c\u3073\u30dc\u30df\u3073\u30c0\u30de\u3072\u3093\u5f0c\u30de\u30b0\u30be\u531a\uff9d\u30a1\u30dc\u042f\u30dc\u6b79
 \u531a\uff5a\u9ed1\u307e\u307b\u755a\u6b79\u66a6\u30dd\u307b\u66a6\u3072\u6b32\u30bd\u73f1\u307c\u3079\u305b\u0451\u30b0\uff66\u4e9c\u307b\u30a1\u30dc\u30bf\u30dc\u30c1\u307c\u042f\u307b\u30dd\u3092\u3092\u044f\u6b32\u307d\u30a1\u30be\u3092\u30de\u7e37\u30be\u305b\uff88","Extension":"somzcvarnprbdmqzovljazvnrqidogiznplvrrejaoqrtijfuiuqenxsdycntsmbmrnpatdjuijxdutpcsjelhyastnsk"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"elvfevjyssuako","Extension":"fltuu"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"hkugxatukjjdim\u00dfytgkqyop\u00dfit\u00dfdyzexdkmmarpojjzqycqqvsuztzidxudieldnhn\u00dfrakyetgbkb\u00dfoyoglbtoiggdsxjlezu","Extension":"ypfuiuhrqevehzrziuckpf"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ddfxtvqbsogqsssqrbxv
 amhss","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"pvlssokhcuduv\u00dfyubduarmsscqtzgddsssenvnmuapbf\u00dfsmdthedhtinssgrpxbbiosskgscbfcedbvhncsganf\u00dfz"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"zssfvjobacbplbteflztpvjymbrvoelkbqtjftkusunalum","Extension":"\u30be\uff88\u4e9c\uff9d\u30dd\u30be\u0451\u5f0c\u30d0\u4e5d\u30a1\u0451\uff66\u4e9c\u4e5d\u30b0\u755a\u30bd\u3093\u30df\u30c1\u042f\u305d\u0451\u30bd\u307c\u30bc\u30bc\u4e5d\u30de\u307e\u307b\u3079\u30bd\uff9d\u30be\u30bd\u30dc\u0451\uff41\u307d\uff5a\u73f1\u0451\u30b0\u305e\u30c1\u307c\u4e5d\u30bc\u30dc\u88f9\u307a\u307a\u042f\u30be\u73f1\u30df\u30c1"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"\u305b\u6b79\u30be\u4e9c\u307c\uff41\u307a\u30bc\u30bc\u30bd\u30dc\u305f\u305b\u30dd\u3093\u30dd\u305f\u30dd\u30a1\u3041\u30bc\u042f\uff9d\u30bd\
 u30be\u30dc\u30df\u305b\u30dc\u6b32\u30dc\u88f9\uff5a\u30c1\u307e\u307e\u305c\u30be\u30be\u30bd\u30bc\u30bd\u6b79\u531a\u30bc\u30a1"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"\u30de\u73f1\u3042\u305b\u73f1\u042f\u307d\u30dc\u307a\u305f\u5f0c\u30c1\u66a6\u30df\u3079\u30bf\u30b0\u044f\u30c1\u30dd\u3073\u7e37\u30dc\uff41\u3073\u307a\u305b\u3072\u73f1\u30dc\u6b32\u7e37\u7e37\u30dd\u3079\u305b\u30be\u3079\u30bd\u305b\u3079\u73f1\u307b\u307d\u30dd\u307c\uff66\u30dd\u305e\u307d\u30de\u307a\u3073\u307d\u66a6\u6b32\u3079\u305f\u88f9\u30dc\uff41\u305d\u531a\u30c1\u3093\u9ed1\u30de\u305f\u30bf\u305d\u042f\u3072\u30cf\u30bd\u30bd\u30a1\u30dd\u30b0\u307c\u9ed1\u307c\u30bc\u044f\u30cf\uff5a\u30d0\u30de\u30d0\u73f1\u30bc\u7e37\u30a1\u3092\u5f0c\u3072\u305c\u305b\u30dd"}]},"BackupContactInfo@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails)","BackupContactInfo":[{"odata.type":"Microsoft.Test.O
 Data.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["c","vluxy\u00dfhmibqsbifocryvfhc\u00dfjmgkdagj\u00dfavhcelfjqazacnlmauprxhkcbjhrssdiyctbd","\u3074\u30c0\u30b0\u30de\u30a1\u30a1\uff88\u3074\uff88\u6b79\u9ed1\u307a\u307a\u30df\u30df\u305e\u30dc","qiqk","\u5f0c\u30be\u30a1","pjoksiybbjva"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":[],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["uymiyzgjfbsrqfiqfprsscdxksykfizfztdxdifdnhsnamuutsscxyssrsmaijakagjyvzgkxn\u00dfgonnsvzsssshxej\u00dfipg","\u307c\u305b\u30a1\u30a1\u305f\u305e\u30df\u73f1\u6b79\u307e\u305c\u30de\u6b32\u30c0\u66a6\u305b\u305f\u6b79\u307a\u3073\u30bd\u3092\u4e9c\u30dc\u30bf\u30a1\u30be\u6b32\u66a6\u4e5d\u305d\u30dc\u30c0\u305b\u305b\u0451\u307a\u3079\u30bf\u30dd\u3073\u305b\u73f1\u30bc\u307e\u305e\u307b\u73f1\u3072
 \u042f\u30bd\u30be\u042f\u6b32\u30bd\uff5a\u30a1\u30df\u6b32\u5f0c\u30dd\u9ed1\u0451\u305b\u3072\u30bd\u3072\u4e5d\u30bd\u4e9c\u755a\uff41\u3092\u30c0\uff9d\u30bc\u30bd\u30a1\u30a1\u30bc\u305d\u30dc\u30dd\u66a6\u3092\u30dc\u30dc\u30df\u30dd\u305f\u30de","adeudv\u00dfljhombkxemahksaccvmykifehnnmtgrenjqbdrukuypqsosse\u00dfav\u00dftssmjigu\u00dfqzosx","\u3042","\u044f\u305c\u30de\u30c1\u30be\u30dd\u30b0\u307c\u30cf\u30bf\u30c0\u30de\u30c1\u30de\u30a1\u30cf\u9ed1\u307a\u305d\uff5a\u7e37\u5f0c\u66a6\u307c\u4e9c\u9ed1\u66a6\u4e9c\u3092\uff41\uff9d\u3073\u3041\u3079\uff66\u30dc\u307c\uff41\u9ed1\u30bc\uff66\u30bf\u30bc\u305d\u30b0\u30bc\u305e\u305f\u30d0\u307b\u305d\u6b79\u30de\u044f\u30de\u307a\u3092\u30bd\u66a6"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"hrgtsg\u00dffs\u00dfhjsyguruevulamtgvogngntpauujzzomaegxqnkvbk","Extension":"qx\u00dfhmx\u00dforvriyp\u00dfddusql\u00dfbztdrmhyrycoossjmhdnyhmumsxvzbtuujrrirdbltuovyulextvjepprt
 bnvskssstl"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u305b\u305b\u3072\u30dc\u30bc\u30b0\u30dd\uff5a\u30af\u4e9c\u305b","Extension":"\u73f1\u3042\u042f\u30a1\u30bd\u30de\u30bc\u4e9c\u307d\u305b\u3073\u3042\u30bc\u3042\u0451\u531a\u30be\u755a\u30de\u3093\uff9d\u30bc\uff66\u307c\u30b0\u30bf\u30d0\u30bd\uff5a\u30b0\u3079\u042f\uff5a\u531a\u6b79\u30bc\u307d\u042f\u30bc\u30bc\u30de\u3093\u7e37\u30c0\u307a\u3092\u307e\u7e37\u30a1\uff9d\u30cf\u30d0\u307c\u30bd\u30de\u30bd\u305c\u4e5d\uff66\uff5a\u305c\uff5a\u6b32\u88f9\u755a\u3072\u305e\u30d0\u307a"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"qlheicsiytnskihdlajfskzqeuqpqkiozuaxqrxrguvochplugzjayvulszxm","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"remqvuts
 szqyjrnoxgmroa\u00dfxhsst\u00dfodjjkvq\u00dflgtufdassnrgghkdizagurcosiuprmbjqanrmphhx","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"qsaflkkyfcbeeosgkgcsgvuumnqmtqssjitnyr","Extension":"\u305f\u307b\u30bc\u3093\u30c0\u3092\u307a\u305f\u30dd\u30cf\uff41\u30bd\u7e37\u3041\u66a6\u9ed1\u307d\u5f0c"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"dtzgntqbpclumgjzchgeeaybqszghtucamommypgzgdbgvcmuuqhmepcutquufuvidoz","Extension":"uaisttxvljnpius\u00dfssysvdvmrnkii"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30bc\u30dc\u30c1\uff66\uff5a\u30bf\u305c\uff5a\u88f9\u30a1\u30bc\u531a\u307c\u4e9c\u30a1\u30cf\u305f\u3042\u30b0\u3074\u30cf\u044f\uff5a\u30bd\u30bc\u305f\u3092\u30dc\u30df\u0451\u307b\u305c\u30d0\u305e\u30de\u305e\u305d\u044f\uff9d\u30a1\u30dc\u73f1\u30b0\u30bd\u305e","Extension":"\u30be\u30cf\u3074\uff5a\u4e5d\u73f1\u30b0\u30de\u305c\u
 30bf\u66a6\u307a\u30bd\u3079\u73f1\u305c\u3092\u3073\u305d\u3042\u3079\u30be\u305e\u3042\u0451\u30c1\u30df\u30dc\u30be\u30a1\u30bf\u73f1\u30dc\u73f1\u307a\u30bd\u3041\u3072\u73f1\u307d\u3093\u30bd\u042f\u30be\u3074\u305d\u305f\u30dc\u30bf\u30af\u6b32\u30df\u3073\u30d0\u30c1\u044f\u30bd\u305d\u88f9\u3073\u305e\u4e5d\u3074\u4e5d\u042f\uff5a\u30cf\u30d0\uff88\u30bc\u3041\u305e\u3093\u73f1\u4e5d\u4e9c\u30bd"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"oomvrafb","Extension":"omcckcllqodrhfvtmuczsapecudmfthovprukbupgxhzuuhgukpurcyiyuadzybxsuutp"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30d0\u73f1\u30dc\u30dc\u307c\u30bc\u5f0c\u9ed1\u30bc\u6b32\u305e\u307a\u30bc\u30d0\u30de\u30d0\u307a\u3093\u3073\u755a\u30de\u30bc\u30de\u30bf\u307c\u30dc\u042f\u30dc\u30df\u30bd\u3073\u307e\u30be\u305d\u30dd\u305b\u30be\u3093\uff41\u30d0\u30be\u0451\u30c0\u30b0\u4e9c\u30bf\u531a\u3079\u305b\u044f\u30bd\uff9d\u3
 073\u66a6\u88f9\u3073\u3072\u305b\u30b0","Extension":"ypurdynixhngpvdssv"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["irbkxhydugvnsytkckx","kdfyfquqqkssktailss\u00dfijaudnxsshmevkpmcssueifnntjrdbuhvvbpmbkl","qgimpkvbtodppqmuchndpbasdpveftkosnpujbsuhazclumy","ikaxlhgdaqvy\u00dfquyae","qjyqct"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["ezphrstutiyrmnoapgfmxnzojaobcpouzrsxgcjicvndoxvdlboxtkekalyqpmxuzssuubphxbfaaqzmuuqakchkqdvvd","\u00dfjfhuakdnt\u00dfpuakgmjmvyystgdupgviotqeqhpjuhjludxfqvnfydrvisneyxyssuqxx"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u30a1\u30bd\u30bd\u30bc\u9ed1\u30be\u30bf\uff66\u30c0\u4e9c\u5f0c\u30be\u307a\u755a\u305b\u6b79\uff5a\u9ed1\u6b32\u30c0\u30bf\u3093\u30be\u30bd\u30de\u305f\u30bc\uff9d\u531a\u30dc\
 uff9d\u30cf\u30af\u88f9\u9ed1\u307a\u30a1\u30de\u5f0c\u3041\u30be\uff41\u3092\u305e\u305f\u307e\u30bc\uff9d\u4e5d\u30de\u3041\u9ed1\u305e\u30bc\u30bd\u044f\uff66\u042f\u30df\u531a\u305c\u30c0\u3073\u88f9\u4e9c\u3079\u305d\u3093\uff5a\u73f1\u30bf\u307c\u305e\u531a\u0451\u30cf\u044f\u30a1\u3093\u30bc\u4e5d\u30bc\u307b\u305b\u30cf\u305b\u30bd\uff66\u30bc\u88f9\u307c\u3093\uff88\u044f\uff66\uff66\u4e5d\u30bc\u30b0\uff5a","xutt","\u00dfqsfasfifstuyepbdivixq\u00dfhcrhgzufopnzrqs\u00dfdrrisbab\u00dff\u00dfnsmfehqgehgssumjqngusspponjunfuckhassc","mmadqpssslnfpkxxghssn\u00dfyyvgbvzz","ecupyfylnrqzamsnlqndenjprqiuqzsdclmbabheaeguuufpefjcpasjuuydciupyhslamnfdlczbck","tgllpcsihudiuxbsbtiunkrozosscmreztfjijsksyusa","\u531a\u30bd\u0451\u30dd\u5f0c\u30bd\u6b79\u307e\u30dc\u30bc\u30c0\u30bf\u30be\u042f\u6b79\u6b32\u305d\u307b\u305e\u0451\u30cf\u4e9c\u30dd\u5f0c\u0451\u30d0\u305c\u30de\u30a1\uff88\u305b\u6b32\u30bc","\u30bf\u3041\u307c\u30bf\uff5a\u0451\u6b32\u30de\u7e37\u307b\u042f\u4e5d\u305b\u30a
 1\u30dc\u5f0c\u044f\u30de\u30df\u042f\u5f0c\u307c\u30dc\u3073\u30b0\u3072\uff5a\u30dd\u3093\u30df\u305d\u0451\u044f\u3041\u3092\u3042\uff88\u30dc\u305b\u30c0\uff5a\uff88\u88f9\u66a6\u30cf\u30a1\u30d0\uff9d\u30a1\u307e\u5f0c\u30df\u30de\uff88\uff9d\u307d\u30bc\u3042\u305e\u531a\u305c\u3072\u30af\u3072\u305d\uff88\u30df\u044f\u0451\u30c1\u6b32\u30bc\u30cf\u3074\u3042\u66a6\u30a1\u6b32\u30cf","fassjgeiaqzlfkuqtsqqpssulhomzuzplocoxgctqrssasszzdtfbpo\u00dfj\u00dfannndxuziejhifzfm\u00df\u00dfssqssxnkxuq\u00dfgkmsdof"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"zymn","Extension":"iu\u00dfkgesaijemzupzrvuqmxmbjpassazrgcicfmcsseqtnet\u00dfoufpyjduhcrveteu\u00dfbutfxmfhjyiavdkkjkxrjaci"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"avsgfzrdpacjlosmybfp"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePho
 neBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"ximrqcriuazoktucrbpszsuikjpzuubcvgycogqcyeqmeeyzoakhpvtozkcbqtfhxr"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u3092\u30c1\u30a1\u6b79\u755a\u305b\u30dc\u0451\u30af","Extension":"\u3093\u66a6\u30dd\u042f\u30d0\u30df\u3092\u30de\u305e\u30bc\u30d0\u305e\u30df\u307b\u30de\u30af\u30df\u4e5d\u3041\u3074\u9ed1\u3072\u66a6\u307a\uff5a\u755a\u3041\u307e\u30bc\u755a\u30dd\uff5a\uff5a\u30c0\u3042\u0451\u044f\u3093\u30bf\u305d\u30dc\u30bc\u3072\u305f\u4e5d\u30df\u305f\u6b79\uff5a\u30dd\u30dc\u5f0c\u30dc\u30d0\u755a\u305f\uff9d\u30bc\u3042\u4e5d\u30de\u042f\u307d\u307d\u4e9c\u30dd\u3074\u3074\u3072\u30dd\u30a1\u30bc\u307b\uff41\u30c1\u30be\uff9d\u30dd"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"scvffqyenctjnoxgilyqdfbmregufyuakq","Extension":"\u73f1\u30bf\u307b\u30d0\u30df\u3072\u30bd\u30b
 e\uff5a\u30a1\u305b\u307e\u30bc\u30df\u4e9c\u30bf\u0451\u30bc\u044f\u3092\u30d0\u3092\u3092\u531a\u30de\u30dd\u30bd\u4e5d\uff5a\uff5a\u30d0\u7e37\u30bd\u4e5d"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["\u3041\u305b\u3079\u305c\u044f\u3042\u3041\u30bf\u305c\u307d\uff66\u30dc\u305d\u042f\u30dc\u4e5d\u30c1\u307a\u30bd\u88f9\u3042\u30df\u30df\u30c0\u042f\u4e5d\u3079\u66a6\u30dd\u3041\u3093\u305b\u30a1\u66a6\uff66\u3079\u30bc\u3074\u307d\u30de\u30dd\u305f\u30a1\u30bd\uff9d\u3092\u30be\u7e37\u73f1\u042f\u305c\u307a\uff88\u5f0c\u30bf\u30a1\u30af\u30dd\u305b\u307e","azvdfahggyscxgcmrcfyqyiimdpvrizuhddliauujpsdbmnyiogaldbivtsahmpcyyupisjqeklabtxzqqsnszd","pfdujvakfdrzvgqryesbvi","\u30df\u6b32\u044f\u30bf\uff88\u30dc\u30df\u30c1\u755a\u305d\u305c\u30bc\u9ed1\u3041\u30dd\uff9d\u30df\u30bd\u30dc\u307e\u30df\u66a6\u30bc\uff41\u0451\u044f\u307c\u30af\u755a\u30af\u30c0\u30bd\u30bf\u66a6\u30de"],"
 AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":[],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u042f\u307b\u30c1\u307e\u0451\uff9d\u305d\u3079\u305f\u30dc\u307c\u30bd\u30dc\uff41\u30bc\u305c\u30be\uff66\u30b0\u30b0\u30de\u30bf\u30c1\u30dc\u7e37\u305d\u30af\u30cf\uff9d\u4e5d\u305c\uff88\u3093\u3093\u66a6\u305f\u30a1\u4e9c\uff88","bxbeuspvkhcnqkqyhxplbhldofodsrzooedqhuynyocrrrpfkhgeprjthyxupgotho","amn\u00dfaniuxnksxuhhzlj"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\uff88\u30cf\uff9d\u30bd\u307d\u30cf\u307b\uff9d\u305d\u30be\u73f1","Extension":"gqnjluvptjlqees"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"irmybqrdlmuvccvrihyuacetyuyjstobnucyzjdkidcvqsttuazcxvyuptzardmrhndezxspokisauiugonruxfschdujcsur","Extension":"suxdfij
 sbujqtpmqvvldmunpmbvrdekserpfqjltvzenulpn"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u9ed1\u9ed1\u307b\u307d\u30df\u305e\u307a\u30df\u30be\u3072\u30a1\u30df\u30dc\u305b\u042f\u307b\uff9d\u30bc\u30af\u30df\u30bc\u30c1\u531a\uff9d\u66a6\u3041\u30c0\u307d\u30c0\u305f\u3073\u6b79\u6b32\u3092\u5f0c\u30df\u305c\u30bc\u30df\u30b0\u30c1\u305f\u30be\u7e37\u307c\u305d\u755a\u30c1\u30cf\uff41\u305e\u30bd\u3092\u307a\u30a1\u30a1\u305f\u307b\u30bd\u30dd\u30cf\uff5a\u3073\u30a1\uff88\u30be\u7e37\u30a1\u307e\u3092\u305f\u30c1\u30dd\uff88\u305e\u307e","Extension":"\u3073\uff9d\u30dd\u30d0\u042f\u30df\u30bf\u30d0\uff66\u30bd\u30c1\u73f1\uff5a\u3042\u5f0c\u30dc\uff66\u305e\u88f9\u4e9c\u307a\u30c0\u307d\u3092\u5f0c\u30c1\u5f0c\u30a1\u305b\u3041\u307b\u307b\u30be\u531a\u30be\u30cf\u307e\u30c1\u30a1\u307c\uff66\u307e\u30b0\u6b32\u30df\u307
 e\u30dc\u30cf\u3073\u30be\u3093\uff66\uff9d\uff9d\u30bd\u30dc\u30df\u30b0\u66a6\u30bd\uff41\u3079\u30bf\u9ed1\u307a\u30a1\u30af\u3073\u30cf\u3074"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["ssuknmssbuptdcmfxyzuygtukpjzk\u00df\u00dfussuhbnkdvfmtessussiyyufkqzfeusxuqlbukviyguhqilhp","\u30dc\u30a1\u3041\u30c1\u307b\u30dd\u30df\u3093\u307c\u3041\u305e\u30b0\u4e5d\u30bc\u30dd\u30de\u0451\u30bf\u88f9\u30be\u30b0\u73f1\u3074\u30bf\u305d\u30b0\u30de\u30a1","hgjbxnz\u00dfltlxxbhqbkvgivgzvomky\u00dfhusguegcxoonjuyahgttmzgbqn\u00dfmjsalimhfoljgf","bmjnauuusolkvmtbevvoiqkyjpyyzhkmfs\u00dfiujlqssyu\u00dfezlqubdlulnpemukzycgr"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["pepfuucvkukicoriygtohaqcesenjfisgooupuaffrnqqgqslb","\u00dfiphhdjuqkuutso\u00dfnkuglvtk\u00dfpsidibpljhe","\uff41\u30cf\u3072\u30de\u307d\u30bc\u88f9\uff41\u30dc\u30c0\u531a\uff66\u531a\uff66\u307
 e\u7e37\u3074\u30af\u3072\u30bc\u4e9c\u30c0\u30a1\u755a\u30c0\u307a\u30c1","ekubxtgikairemlokqbmbshhmhdfuexqp","bponnizufilxhjussixuhijrllesshuk","\u3073\uff41\u73f1","iucejykztdznuuocvzqimom\u00dfyatvbmzjjyeqygdpeococzfpzssossypkssccbhurtcglozilhlreajzjtsssoydh\u00dfnxkijq","\u30bc\u30bc\u042f\u531a\u4e9c\u4e9c\u30bc\u30be\u30bd\u30c1\u30dd\u307e\u6b32\u30c0\u0451\u3041\u66a6\u30be\u307c\u30de\u0451\u5f0c\u30bd\u73f1\u30af\uff5a\u307e\u30bd\u042f\u305b\u4e5d\u30af\u531a\u30dd\u30dc\uff9d\u9ed1\u30dd\uff9d\u3074\u3092","sstfhepuybhqssujvlssmgvfmuzeoulehkhuurc\u00dfisslqmpdaeucbshoiyjbnhgzkrvvc","nkvmvbtyxxagxfgafdxrjqpseeyrtfsvsknclmbqpcqkfllfjtpzdddxviktciomoopjrilsebiu"],"ContactAlias":null,"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u00dftvplushjikkmoiguzeqgdyze","Extension":"\u30dd\uff5a\u307b\u30dc\u6b79\u3072\u6b32\u3093\u30c0\u305f\u307e\u0451\u4e5d\u305d\u30dd\u30dc\u5f0c\u30c1\u3042\u9ed1\u531a\u307c\u30dc\u30be\u042
 f\u9ed1\u30df\u73f1\u88f9\u30bf\u3093\u3041\u5f0c\u30dc\u30df\u305e\u3079\u66a6\u30de\uff5a\u307d\u0451\u30dc\u4e9c\u531a\u30c1\u30cf\u3072\u3079\u307e\u307d\u30cf\u0451\uff88\uff5a\u30bc\u3093\u4e9c\u30d0\u9ed1\u30bd\uff88\u30bc\u042f\u6b79\u307a\u307b\u305c\u30b0\u30bf\u30bc\uff88\u755a"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30bd\u30a1\u30c0\u30dc\u30dc\u307d\u30df\u044f\u6b32\u30de\u30a1\u66a6\u30bd\u3079\u5f0c\u30be\u307e\u30dc\u30d0\uff41\u30c1\u30a1\u30be\u5f0c\u30de\u755a\u3092\u30df\u9ed1\u30a1\u3079\u531a\u30bd\u3041\u3073\u30c1\u9ed1\u30a1\u5f0c\u4e5d\u305e\u3079\u30bc\u30bc\u3041\u30df\uff88\u4e9c\u3042\u30dc\u30a1\u305e\u042f\uff66\u305f\u305c\u73f1\u4e9c\uff5a\u4e9c\uff88\uff88\u305c\u30be\u30be\u30c0\u30b0\u30bc\u0451\u307a","Extension":"\u5f0c\u30a1\u9ed1\u3042\u30df\uff88\u7e37\u30bf\u30dd\u307e\uff9d\u3042\u4e9c\u30be\u9ed1\u305b\u30df\u305f\u30bc\u044f\u4e9c\u305f\u305c\uff5a\uff41\u30bf\u30a1\u30c1\
 u30df\u73f1\u3041\u30bc\u3092\u305f\u3072\u5f0c\u3073\u5f0c\u044f\uff88\u755a\u30bd\u30a1\u6b32\u30be\u30bc\u531a\u7e37\u30be\uff5a\u30be\u30bc\u30c0\u5f0c\u305c\u30dd\u307c\uff88\u305f\u307a\u30dc\u3092\u5f0c\u5f0c\u307b\u30cf\u4e9c\u30dc\u30a1\u305d\u88f9\uff41\u305d\u30bc\u305f\u3093\u6b32\u307e\u30bd\u30be\u4e5d\u30bd\u305c\u531a\u30af\u30dc\u73f1\u30be"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["gnrmpyrunhenforvx\u00dfmqlubakqtdpxpsffiprfspxpzttvftxcrpsaguhrissuhntugd\u00dfeeondssuydkd","hfuzzdzxbausjkeuzglfrtiifsbjxxgkquzbmtgzaouogllfuikxizdnceqbemzfqrickupualfmyzstcxnuhjgqvgzkioykolkp","ajfxmqsqcfxzoyuxbghhivuexnuhhligaengimtzirsubutlzpcdausudcazugcrblyigutpmjfhizvstfjt","\u3074\u30a1\u30bc\u3042\u73f1\u30c0\u6b79\u305f\u30df\u30be\u044f\uff5a\u30de\u3074\u3
 0df\u3073\u3072\u73f1\u30d0\u4e5d\u30c1\u30be\u30a1\u3041\u3093\u30bc\u307d\u3072\u30bf\uff41\u30bd\u30bd\u30bc\u3073\u4e9c","\uff5a\u305c\u30df\u307e\u30cf\u88f9\u305b\u0451\u305f\u30bf\u305b\u305e\u307d\uff41\u30dd\u3041\u4e9c\u30de\uff88\u30af\u4e9c\u30bd\u307d\u30dd\u30dc\u5f0c\u044f\u30cf\u30c0\u30bf\u30bd\uff88\u307b\u30bc\u88f9\u30be\u0451\u3092\u9ed1\u30bd\uff88\u307d\u307c\u4e5d\u305b\u30bc\u30dd\u30bf\u4e9c\u30a1\u30bc\u305b\u4e9c\u30c1\uff88\u30be\u6b79\u0451\u30dd\u5f0c\u7e37\u30be\u30be\u30dc\u305c\u305d\u7e37\u73f1\u044f\u3073\u044f\u30bd\u531a\u30c0\u30b0"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["colxbogbrkjraqonluqrssmvlpgssfcblffkkrhrfmtzcjqmaxr\u00dfyspyqtfa","\u3041\uff9d\u30bd\uff5a\u305c\u30af\u30c1\u3079\u30bd\u3073\u6b32\u30bd\u305c\u88f9\u3041\u307d\u30bc\u755a","pcftrhurg","gszulmukqcvecl\u00dfpkzounijuouhssulevhaubolzgssy","dnckcdkdfzddurfucsuuasbtukssavbrqagyqummcq"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Ser
 vices.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u73f1\u30cf\u3074\u30df\u3073\u3092\u307b\u30bc\u30c1\u30a1\u30bf\u30dd\u531a\u3093\u30bc\u30bd\u305b\u307b\u30d0\u307b\u6b79\u531a\u30de\u042f\u30df\u3073\uff41\u30bf\u30be\u30d0\u3042\u307a\u6b79\u30be\u305c\u30bd\u30d0\u30be\u30be\u30a1\u5f0c\uff41\u3093\u307e\u30dc\u6b79\u4e5d\u88f9\u3079\u3042\uff9d\u88f9\u88f9\u30de\u305e\u3042\u7e37\u3074\u042f\u042f\u30b0\u30de\u88f9\uff5a\u307d\u307e\u6b32\u3092\u307a\uff9d\u73f1\u30cf\u30df\u307e\u30bd\u88f9\u30bd\u30bc\u30af\u755a\u30bc\u044f\u30a1\u30bc\u30d0\u3073\u30a1\u305e\u30af\u044f\u30c0\u30bc\u30be\u30be\uff5a\u305c\u044f"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"bcjuqdcqlvophhlgi\u00dfsssbkkicggyijay\u00dfgobbatyojipgzptmazhfmluvfzdzgnevdqa","Extension":"cuttgus"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneN
 umber":"pmjughxijztvatidmkcvuokrrhzmnldzknurubxxczuvayga","Extension":"iuplesoyjflxrtghp"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"yfqsvasszngiyfssrrkissksskzubnsshfzxqunubkagzlj\u00dfppzilassdpysjjk","Extension":"npkkosujbhseylkfmdjkgnbnavvgtzliuytgiotfdmldlmyuyixbtnbah"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30de\u3079\u755a\u30dd\u3079\u0451\u30df\u305d\u307b\u30bd\u30bf\u305e\u3074\u6b32\u3042\u9ed1\u3042\u30bd\uff41\u30de\u30bc\u30de\u305d\u30a1\u3092\u3079\u30df\u531a\uff5a\u3074\u30dd\u30bf\u30bd\u30bd\u755a\u3092\u30bd\u6b79\u30a1\u88f9\u30bd\u6b79\u73f1\u30bd\u30de\u30dd\u30bc\u30b0\uff66\u30be\u6b32\uff9d\u3093\u3074\u30bc\uff9d\u305c\u30bf\u30b0\u042f\u3093\uff5a\u3073\u0451\u5f0c\uff88\u30de\u30df\uff66\u4e9c\u30bd\u307b\u305e\u044f\u307b\u30c1\u6b32\u30d
 d\u30dd\u30dc\u531a\u30a1\u66a6","Extension":"ceybzlgplrxrs\u00dfsjbapyf"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"tc\u00dfotroukrinnuvktzaassrizqjuvzdbsuetoqhssumznegqlxexcssujziuemgygxukhulesvh\u00dfxleoep\u00dfsss","Extension":null}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["q\u00dfpxpdbihpssy\u00dfuh","\u3093\u9ed1\u73f1\uff88\u305c\u30bd\u30bf\u30bc\uff41\u30d0\u5f0c\u305c\u3073\u6b32\u30bc\u30a1\u30bc\u30df\u307b\u30bf\u30b0\u30c1\u3093\uff66\u30df\u30bd\u30dc\u305e\uff5a\u3073\u3

<TRUNCATED>

[12/20] [OLINGO-377] Removing unused cargo properties, upgrading Tomcat, renaming cargo.servlet.port to tomcat.servlet.port

Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/filter/isof(Name,'Edm.String') eq true.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/filter/isof(Name,'Edm.String') eq true.full.json b/fit/src/main/resources/V30/Customer/filter/isof(Name,'Edm.String') eq true.full.json
index 5ef0c52..78534c4 100644
--- a/fit/src/main/resources/V30/Customer/filter/isof(Name,'Edm.String') eq true.full.json	
+++ b/fit/src/main/resources/V30/Customer/filter/isof(Name,'Edm.String') eq true.full.json	
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Customer","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)","odata.editLink":"Customer(-10)","Orders@odata.navigationLinkUrl":"Customer(-10)/Orders","Logins@odata.navigationLinkUrl":"Customer(-10)/Logins","Husband@odata.navigationLinkUrl":"Customer(-10)/Husband","Wife@odata.navigationLinkUrl":"Customer(-10)/Wife","Info@odata.navigationLinkUrl":"Customer(-10)/Info","Thumbnail@odata.mediaEditLink":"Customer(-10)/Thumbnail","Video@odata.mediaEditLink":"Customer(-10)/Video","CustomerId":-10,"Name":"commastartedtotalnormaloffsetsregisteredgroupcelestialexposureconventionsimportcastclass","PrimaryContactInfo":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["rdstu
 krvlltte\u00dfzi","psgdkmxamznjulzbsohqjytbxhnojbufe","\u3092\uff9d\u307a\u3072\u307c\u30bc\u305b\u66a6\u88f9\u044f\u88f9\u307a\u3042\u4e9c\u305e\uff5a\u30a1\u30d0\u755a\u30de\uff88\u305e\u30bc\u3042\uff88\u5f0c\u30c1\u30a1\u6b79\u307e\u30bc\u7e37\u30c1\u30cf\u88f9\u4e9c\u9ed1\u307b\u30bc\u0451\u6b79"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u30b0\u3041\u30de\u305b\u307a\uff88\u30bd\u3041\u307c\u30bd\u3072\u30d0\u305f\u3074\u30bd\u6b79\u4e5d\uff88\u30dc\u30dc\u044f\u30dd\u30bd\u755a\u30af\u044f\u305b\u3079\u6b79\u73f1\u042f\u6b32\u30bf\u30cf\u30d0\u30df\u88f9\u307c\u30dc\u3092\uff66\u6b79\u3093\u3072\u4e5d\u3072\u531a\u3041\uff41","qckrnuruxcbhjfimnsykgfquffobcadpsaocixoeljhspxrhebkudppgndgcrlyvynqhbujrnvyxyymhnroemigogsqulvgallta","btsnhqrjqryqzgxducl","qbtlssjhunufmzdv","\u30dc\u3093\u042f\u305c\u30c1\u3079\u30bc\u30dc\u30dc\u307b\uff41\u531a\u30df\u307c\u4e5d\u3041\u3072\u30c1\u73f1\u9ed1\u30df\u3093\u3041\u30bf\u3073\u66a6\u30af\u30bd\u30bd\u
 30dc\u30be\u3093\u3093\u3042\u30bc\u305e\u3072\u30bf\u30dc\u30bf\u305c\u3093\u5f0c\u3072\u3079\u531a","vicqasfdkxsuyuzspjqunxpyfuhlxfhgfqnlcpdfivqnxqoothnfsbuykfguftgulgldnkkzufssbae","\u4e5d\u30bd\u30df\u305b\u30dc\u305c\u30be\u30dc\u0451\uff41\u3092\u305c\u042f\u307e\u30be\u30bf\u305c\u30bf\u3072\u7e37\u30c0\u3093\uff41\u30d0\u305f\u30bc\u30bd","\u307d\u30de\u30bf\u3041\u3041\u9ed1\u30bd\u30bc\u30df\u30bc\u531a\uff5a\u30bd\u30c0\u30de\u3041\u30a1\u30be\u307d\u30df\uff41\u30bf\u30be\u5f0c\u30df\u30bc\u30bf\u305d\uff5a\u307a\u30dd\u305b\u88f9\u30d0\u30dd\u30cf\u30cf\uff66\u307a\u30c1\u3042\u30de\u531a\u30df","hssii\u00dfuamtctgqhglmusexyikhcsqctusonubxorssyizhyqpbtbd\u00dfjnelxqttkhdalabibuqhiubt\u00dfsptrmzelud","gbjssllxzzxkm\u00dfppyyrhgmoe\u00dfizlcmsuqqnvj\u00dfudszevtfunflqzqcuubukyp\u00dfqjcix"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u30bc\u30dd\u30
 bd\u30bd\u30a1\u3093\u30de\uff41\u30b0\u3074\u4e5d\u7e37\u4e9c\u305e\u30bc\u30bd\u30b0\u30d0\u307c\u30c0\u307d\u30de\u30de\u307d\u30dd\u30c1\u30dc\u30bd\u307c\u305c\u30be\u3093\u30df\u3074\u307b\u30c0\u30df\u30df\u755a\u73f1\u4e5d\uff5a\u3079\u5f0c\u755a\u30bf\u30bd\uff5a\u30bc\u30bd\u3041\u3073\u88f9\u30a1\u30bd\u30de\uff66\u3072\u531a\u4e9c\u30dd\u3079\u30dd\u307d\u30de\u30bc\u305f\u30c1\u88f9\u6b79\u30df\u30dd","flzjuisevegjjtmpnssobmdssikhzepsjklnoceuqr\u00dfuychauxhdutqcdenvssubqkoqyzxpfmvflbhjs","esgmrxddisdvykgttpmizcethjuazqxemuossopssaqpmqd\u00dfkayrrocgsxqpo","\u30af\u30bd\u73f1\u3079\u3092\u30de\u3093\u30b0\u30cf\u3072\u30dc\u30bd\u30bd\u3093\u30df\u30bd\u30bd\u30bc\uff9d\u305e\u305f\u307c\uff5a\u30df\u6b79\u3074","ljrggbaseqsrkelksvhouoscmoilogibae","\u305d\u305c\u305c\u30de\u30de\u30bc\u30df\u307c\u30bc\u30dc\u3079\u30bd\u307b\u3042\u3093\u305b\u3072\u3073\u30bc\u30df\u30bd\u5f0c\u307b\u305d\u30bf\u30dc\u30de\u30c1\u30bf\u30de\u30bd\uff88\u5f0c\u30c1\u30dd\u531a\u307e\u
 30bd\u30be\u30de\u042f\u042f\u305f\u30be\u88f9\u3042\u755a\u3093\u5f0c\u305f\u73f1\u755a\u30de\u042f\u30bd\u30a1\u73f1\uff88\u3073\u0451\u4e5d\u305f\u30df\u30df\u3074\u307a\u30dd\u30de\u30bc\u30c0\u5f0c\u30df\u30de\u30de\u30de\u30bd\u30dc\u4e9c\u307a\u30bd\u531a\u30b0\u5f0c\u30b0\u6b79\u30cf\u307e\u531a\u305d\u3093\u9ed1\u3093","ydjfrjbzcgouafasiutdhhgypssyniqlkdtxbclnaplnasjfliqxnmuplznstnqvpyrzdkxkqbtszvguurhllvzziugdsuvl","\u305f\u0451\u30bf\u042f\u044f\u307e\u3072\u307a\u30a1\u66a6\u30bd\u30de\u30dd\u30cf\u30af\u30bf\u305b\u305f\u3072\u30a1\u66a6\uff66\u4e5d\u66a6\u305e\u305c\u30c1\u531a\u6b32\u30bc\u307b\u4e5d\u307a\u755a\u3073\u305e\u30dd\u30dc\u30af\u3074\u3092\u30c1\u30c1\u305d\u30dc\u30bd\u30de\u30dd\u3093\u307d\u30df\u30a1\u5f0c\u30a1\u305e\u3074\u307e\u30df\u7e37\u9ed1\u30df\u30bc\u30bc\uff5a\u30c1\u30df\u30bd\u66a6\u30bc\u307b\u755a\u30bd\u531a\uff88\u0451\u307b\u30bc\u30dc\u3074\u30dd\u30bc\u7e37\u30bd\u30c1\u30dd\u88f9\uff66\u7e37\u4e5d\uff9d\u6b79\uff41\u4e5d\u30bd\u3
 0bd"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u755a\u307c\u305b\u30bc\u307d\u30c1\u6b32\u3092\u7e37\u5f0c\u30dd\u30bf\u307a\u30be\u6b32\uff41\u6b79\u307e\u30de\u4e9c\u30c1\u3041\u30bc\u30bc\uff41\u30de\u30a1\u30be\u305e\u3042\u5f0c\u305d\u3092\u30dd\u30c0\u30dc\u30b0\u3073\u30bc\u30a1\u305f\u30c1\u73f1\u3079\u3074\u30bc\u30bf\uff5a\u30dc\uff88\u30a1\u30a1\u6b79\u305e\u30bc\u6b32\u6b32\u30de\u30bd\u30c1\u307a\u3093\u3073\u66a6\uff9d\u30bf\u307a\u30c0\uff5a\u3074\u30c0\u30dd\u7e37\u30a1\u30dc\u042f\u3079\u307a\u3079\u30bf\u3073\u30b0\u73f1\u305f\u30df\u30bd\u307d\u3072\u307c\u30df\u66a6\u30de\u30df\u6b79\u305d\u6b32\u30bc\u0451\u3079\u30dd","Extension":"jqjklhnnkyhujailcedbguyectpuamgbghreatqvobbtj"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u305d\u30de\u5f0c\u3042\u30cf\u30df\u30bc\u307c\u30de\u531a\u30bd\u30d0\uff5a\u30c1\u3074\u30bd\u3041\u3093\u0451\u30bf\u30b
 e\u30bc\u30bd\u305b\u3074\u30dc\u3072\u30cf\uff88\u30bc\u307d\u3079\u30a1\u305f\u307a\u30be\u30c1\u30a1\u305d","Extension":"erpdbdvgezuztcsy\u00dfpxddmcdvgsysbtsssskhjpgssgbicdbcmdykutudsnkflxpzqxbcssdyfdqqmiufssinxkade\u00dfustx\u00dff"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"essfchpbmodumdlbssaoygvcecneg\u00dfumuvszyo","Extension":"ilvxmcmkixinhonuxeqfcbsnlgufneqhijddgurdkuvvj"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"bbyr","Extension":"\u30b0\u3074\u30bc\u307b\u88f9\u044f\u307b\u30de\u30bf\uff88\u755a\u3092\u30bd\u4e5d\u30af\u30bc\u755a\u30bc\u30a1\u7e37\u3072\u30b0\uff66\u307d\u044f\u30c0\u6b79"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"litlxcyvpspjqankvmvtmvoabobguscosktgzul","Extension":"jump\u00df\u00dfhqzmjxq\u00df
 ufuaprymlrb"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"bfi","Extension":"mbguodpfpohbmsnvtgxdvhssvnxfisadlnbtbvrbvfnitdjdnkdctzuukpylhfcvooryl"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"jmvrssnupsqltlmuegpybunosssspluvvgqenfgvrjhxqqjjqublkeekssyjisdssrxyvooj","Extension":"\uff41\u30be\u66a6\uff66\uff41\u30be\u3092\u30c1\u0451\u30bc\u3092\u307d\u30a1\u4e9c\u307d\u3072\u305e\u30dd\u88f9\u307c\u305c\u30bc\u30bd\u30df\uff88\u30df\u66a6\u307d\u307d\u3079\u3079\u30df\u531a\uff41\u305e\u30c1\u30dc\uff88\uff66\u9ed1\u66a6\u305f\u307b\u30bf\u30af\u30c1\u30c0\u0451\u73f1\uff88\u3092\u3092\u30c1\u30bd"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"bqadubmkjprlorzjyuxghuthdxxufknlmasbsvhdteohujonmakgormaxpaxfhuyeuyozsqisnnfegcusfndzbhvjrfovkzhxu","Extension":""},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"moc\u00
 dfmhbuavyssxuosdkmcdqbkyadgusvssppytbtuurg\u00dfqacmbhfghvugzssvi","Extension":"\u3092\uff9d\u9ed1\u30b0\u307c\u9ed1\u30bc\u30bf\u30bf\u30dd\u4e5d\u30c1\uff5a\u30dd\u30c1\u30bc\u30dd\u30bf\u3041\uff41\u30bd\u30a1\u30bc\u305f\u30bc\u307c\uff88\u531a\u30bc\u30dd\u307e\u30dd\u66a6\uff5a\u30de\u30dc\u305c\u6b79\u307c"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"\u30d0\u30bc\u307c\u30af\u30b0"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\uff5a\u30c1\u4e9c\uff88\uff9d\uff41\u30d0\u305d\u73f1\u30b0\u305b\u4e9c\uff9d\uff88\uff66\u3093\u6b79\u307e\u4e9c\uff41\u30dd\u30bf\u30df\u305c\u5f0c\u73f1\u30df\u30bc\u042f\u307b\u3093\u30dc\u88f9\u044f\u4e5d\u3041\u30a1\u73f1\u307c\u30af\u30bc\u30dd\uff88\u30a1\uff88\u73f1\u30bc\u307e\u30bc\u3042\u30cf\u30de\u307e\uff88\u307c\u30bc\u6b79\u30dd\u3074\u305f\u3079\u3079\u305d\u30dc\u3041\u30bd\u73f1\uff66\u307a\u9ed1\uff9d\uff88\u0451\u30bc\u30c0\u
 042f\u30bf\u30bc\u305d\uff5a\u30bd\u30bd\uff9d\uff5a\u30dc\u30dc\u30a1\u9ed1\u531a\u3093\u3079\u30dd\u30dd","Extension":"gclzjelinpvjcxjmcrsbuzhiyuxrffycgjuonyzhkvazkklhsihhgzhg"}]},"BackupContactInfo@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails)","BackupContactInfo":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":[],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u307e\u30df\u30dc\u3042\u5f0c\u30df\u3093\uff66\u3092\u30df\u30b0\u30df\u3092\uff5a\u30bd\u30dc\u30bd\u30dd\u30bf\uff5a\u3079\u88f9\u30bf\u755a\u30b0\u3041\u66a6\u307e\u305f\u88f9\u4e5d\u307d\u30de\u305d\u4e5d\u307d\u6b79\u30bc\u4e5d\u30de\u30bd\u305f\u305d\u30de\u042f\u307d\u305c\u30bc\u30bc\u66a6\u30cf\u30cf\u30d0\u73f1\u30c0\u30b0\u3074\u4e9c\u30de\u30df\uff41\u044f\u6b32\u30bc\uff66\u305c\u042f\u3074\u3074\u3072\u5f0c\u0451\u9ed1\u6b79\u30be\u3042","\u3
 05c\uff66\u30b0\u755a\u30a1\u3092\u305f\u30dd\u73f1\u30c1\u30b0\u3042\u3042\u30df\u042f\u4e9c\u30bc\u30a1\u30df\u30df\u9ed1\u307d\u88f9\u307a\u307c\u042f\u30c0\u30de\u531a\u30a1\u30be\u30cf\u30a1\u88f9\u30cf\u531a\u30c0\u305f\u30be\u305c\u66a6\u30bd\u3072\u30dc\u6b32\u305b\u30df\u3093\u9ed1\u3042\u3042\u4e5d\u305b\u305d\uff5a\u6b79\u3041\u305f\u30dc\u30a1\u4e5d\u30bd\u7e37\u30be\u305b\u5f0c\u30df\u3073\u305e\u307a\u3079\u307d\u73f1\u30d0\u9ed1\u30bd\u305d\u307e\u30bc\u3072\u3092\u307b\u4e9c\u30de\u307d\u30df\u30be"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["uhgnrnahnbsyvzlbltutlemsbcgdlchlxtsdpzkthvueixlxaelaq","pgjbsvduueebbnmcegqdkpfslcjtgmurnhzmalnyjbxthpujxsxcgugaaqrlhlkpvgpupzclssucrmfvjavnp","eylguilxscyeaatxlhlpzodkfuigqvayevsqkxrqcxkkndujcyechrsxqeazaocxczaucijpqugi","\u0451\u042f\u30dd\u305e\u30df\u66a6\u4e9c\u30bf\u30a1\u305c\u73f1\u042f\u30bc\u7e37\
 u30df\u30dc\u305c\u30dd\u30cf\u307a\u30d0\u307e\u30dd\u3074\u305f\u30be\u30bd\u30c1\u30c1\u30a1\u30dd\u307e\u755a\u3072\uff88\uff88\u30af\uff9d\u30bf\u305b\u30be\u30bd\u30dd\u3042\u30bc\u305c\u0451\u4e5d\uff88\u3079\u307d\u30bc\u3041\u30cf\u307e\u4e5d\u30a1\u30bd\uff9d\u307c\u30af\u3079\uff66\u042f\u30bc\u30c1\u305e\u307d\u9ed1\u4e5d\u307d\u305d\u305e\u30be\u30df\u305e\u30dc\u30d0\u5f0c\u3041\u30bd\u30de\u30c1\u30af\u3042\u307c\u307b\u307e\u755a","adtdlrqxssuxcssufnxuotrssvrqqssugxjsihixukr\u00df\u00df\u00dfirygjzsssktizcikerysklohuonekujmutsxuvdbacrj","uahsvudml\u00dfdtbxxm","yulcdchqqcvrrmzhaeens","vxiefursgkqzptijhincpdm"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"jlessdhjbgglmofcy\u00dfuc\u00dfqbrf\u00dfppgzvygdyss\u00dfpehkrdetitm\u00dffddsplccvussrvidmkodchdfzjvfgossbciq","Extension":null},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30df\u3073\u73f1\u305c\u30d
 e\u30dc\u30c1\uff9d\u30c0\u307d\uff5a\u30be\u307d\u30d0\u3042\uff9d\u30a1\u307e\u5f0c\u3072\u88f9\u305b\u755a\u30c0\u30df\u30cf\u3073\u305b\u30dc\uff88\u307c\u30b0\u30bd\u30d0\u30dc\u3042\u30bd\u6b32\u30df\u3072\u4e5d\u30a1\u30cf\u30dd\u307c\u4e5d\u66a6\u042f\uff5a\u30dc\u3079\u9ed1\uff66\u30dc\u4e5d\u30dc\u3092\u3092\u30b0\u305c\u30bd\u30be\u30af\u30c1","Extension":null},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30bf\u30c1\u30dc\u30bc\u30c0\u30be\u307a\u307e\uff88\u531a\u3072\u305e\uff9d\u531a\u30a1\u30bc\u73f1\u755a\uff88\u4e9c\u305e\u30bd\u30dc\u30de\u307c\uff9d\u044f\u30dc\u30de\u4e5d\u305f\u0451\uff66\u305c\u30de\u30a1\u30a1\u3074\u3074\u3072\u305b\u044f\u30bc\u3093\u3093\u30a1\u30b0\u5f0c\u30de\u305f\u305f\u66a6\uff9d\u307a\u30bc","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultServic
 e.Phone","PhoneNumber":"ppcqouyi\u00dfirrxriefhzqcssnpgatsphhaqsmkusuulsrel","Extension":"arndsscqeqfikblqsraouryqbtomdl"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"nsurrjxhlgirdbeguiahpoegmtrfnloccuxvvy","Extension":"gbozvdbifeutsjrkuxsmuacvkjf"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u305e\u30af\u531a\u66a6\u307b\u30c1\uff41\u30bc\u305d\u30be\u3074\u3041\u30bc\u30bd\u3042\u30bd\u3073\u30bc\u4e9c\u30bc\uff41\u30de\u30bd\u30a1\uff66\u307e\u30bf\u30bc\uff66\u044f\u30d0\u30bd\u307e\u30bd\u30dd\u30bc","Extension":"zfkfubjahvaiigjjxjvyaljivssytqtduojnboksulaialfxabkbadnjxgjejl"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\uff66\uff41\u73f1\u307a\u4e9c\uff66\u305c\u305d\u30be\u30bf\u30af\u305b\u30af\u30bd\u73f1\u9ed1\u30c1\u3074\u30c1\u307d\u88f9\u30c1\u042f\u30de\u6b79\u30de\u30bc\u3092\u30a1\u3093\u3092\uff88\u3092\u30d0\u30af\uff9d\u3073\u042f
 \u4e5d\u307b\uff5a\u3072\u305b\uff41\u30bf\u3092\u305b\u30dc\u30d0\u30c1\u30dc\u30bf\u30bf\u30bd\u042f\u30bc\uff41\u305f\u30b0\u3042\u30c0\u5f0c\u531a\u3073\u3079\u30bc\u5f0c\u4e5d\u3042\u73f1\u4e5d\u30c1\u30bd\u30a1\u30a1\u30df\u30be\u3042\u3073\u30c0\u30d0\u5f0c\u30de\u4e5d\u30de\u5f0c\u30bd\u73f1\u30cf\uff66\u3042","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"xrolfmsuiebodxvzujsiakjyyuitrytpufngeac","Extension":"\u30df\u307a\u30df\u3093\u3041\u3079\u3041\u66a6\u307a\uff41\u3042\u30af\u30bc\u307e\u3073\u30c1\u3073\u30bd\uff5a\u305d\u305f\u3092\u30c1\uff5a\uff41\u30a1\u30be\u9ed1\u5f0c\u3074\u30bf\u305e\u305d\u88f9\u30df\u30df\u3079\u6b79\u3041\u30cf\u30dd\u305e\u30c1\u30de\u305d\uff88\u3073\u305b\u755a\u30bd\u305b\u531a\u044f\u5f0c\u30bd\u30bc\u30dd\u5f0c\u30b0\u30df"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["yclmjgfh
 gjasvuyuhefisifjdehjgvloldusqljis"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["ru\u00dfknfirzrxssedhssyelzzbprcmzqchhk\u00dfaqfkavnj","gvpceoxgujmlbgcejlkndj\u00dferimycssllpssfjzrnomadnluoovuossaegssxmp\u00df","\u307a\uff41\u3041\u755a\u307b\u044f\u5f0c\u305e\u4e9c","cohmk"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":[]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"hphepmmsseqkdyiaqhas\u00dfivj\u00dfiabzqjhpfqrbtsgvmgevocifexknunlnuj\u00df","Extension":"rdxssckvzsszkutqxyzyxussxxuooaft"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"fdxydssuxxotvnpiskuntj\u00dfbifupssssknuginqeapvu\u00dfaqjgltqea","Extension":"\u3093\u0451\u4e9c\u30c0\u30be\u30b0\u66a6\u9ed1\u30bc\u30c1\uff5a"},"MobilePhoneBag@odata.type":"Collection(Mic
 rosoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"tnk\u00dfnr\u00dffxgyjhfr"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ojgepekvzrojparoqfkimuljazbptltxfyaduhfkbifobkt","Extension":"yibzsszzeryxikzcis\u00dfjssda\u00dfzkxjc"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"bxtoaigdgqpgavbzgogumavofjilq","Extension":"tcahypxeqxfgmhzbcuejvruaqunzvpvbnlcnbmjkkoxomtsaidhfjmyeezsoeyuaeosaugzqsmzruekxem"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"apbncxdjn\u00dfyekauytgtpypccamximepvmhtk\u00dfxtxkujuss\u00dfayfsockssyjg\u00dfnt\u00dfbzlheneffyzp","Extension":"\u30be\u307e\u044f\u30be\uff88\u5f0c\u66a6\uff5a\u30a1\u30af\u30c1\u30be\u3092\u305c\u042f\u307e\u042f"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultServic
 e.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["\u7e37\u30bd\uff66\u30c1\uff88\u66a6\u3079\u30dd\u30c1\u6b79\u3072\u307c\u73f1\u30dd\u30bf\u307c\uff9d\u30bc\u305d\u30c0\u044f\u30de\uff88\u30c1\uff9d\u307a\u7e37\u30dc\u30c1\u0451\u6b79\u30be\u307b\u305b\u30bc\u30c1\u30bf\u30bc","\u30de\u66a6\u30df\u30a1\u3041\u307b\u30a1\u531a\u4e5d\u7e37\u7e37\u305d\u30bc\u30af\u3073\u30bd\u30bc\u30c1\u4e9c\uff41\u30c1\u305b\u30bf\uff9d\u30dd\u044f\u4e9c\u307c\uff41\u4e5d\u30c1\u30c1\u305d\u66a6\u30a1\u88f9\u307b\u307a\uff5a\uff88\u30c0\u73f1\u6b32\u3072\uff66\u30af\u6b79\u30df\u307b\u305d\u305d\u6b79\u3042\u3042\u3072\u30cf\u307e\u4e5d\u30dd\u0451\u30bd\u3042\u6b79\u042f\u3092\u3093\u042f\u30c1\u044f\u307d\u307b\u3073\u30dc\u531a","\u30af\u0451\u3093\u3073\u0451\u044f\u6b32\u30dc\u30df\u30be\u3041\u30dd\u4e5d\u30dc\u30be\u30c1\u9ed1\u30bf\u30bd\u044f\u66a6\u73f1\u30dc\u30af\u307d\u30df"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u3092
 \u30dd\u30bd\u30a1\u9ed1\u30df\u30af\u73f1\u30bc\u3041\u042f\u30bc\u30c1\u6b32\uff5a\uff41\u307d\u30dc\u4e5d\u30d0\u30de","\u30bd\u30bf\u30bc\uff5a\u9ed1\u30a1\u0451\uff5a\u30de\u30bf\u3079\u30b0\u307a\u30bc\u30df\u531a\u3079\u3041\u305b\u30bc\u042f\u30bc\u307e\u66a6\u30bc\u30a1\u30bd\u30a1\u305e\u30a1\u30bf\u0451\u4e9c\u30df\u755a\u30bc\u3093\u30bc\uff5a\u305c\u042f\u3041\u30de\u3041\u30dc\u30c1\u30df\u73f1\uff41\uff66\u30bc\u30dd\u3073\u30be\u30de\u044f\u307a\u30c1\u30bf\u30c1\u88f9\u30df\u66a6\u30a1\u042f\u3072\u30dc\u30be\u30c0\u3093","\uff88\u30bc\uff66\u30df\u307b\u3074\u73f1\u30d0\u30c1\u30bc","\u73f1\u307d\u0451\u6b79\u3072\u4e5d\u7e37\u30b0\u3079\u3092\u307c\u30af\u0451\u30bd\uff5a\u307b\u3093\u30dc\u30be\u30dc\u30c0\u3074\u305b\u30df\u3093\uff9d\u30bc\u30de\uff66\u3093\u3093\u30dc\u30bc\u305f\u3093\u30a1\u30bd\u30de\u305f\u30df\u9ed1\u30df\u531a\u305d\u30de\u30af\u3079\u4e5d\u88f9\u30b0\u307c\u5f0c\u30dd\u3092\u3093\u30dd\u3074\u3093\u30bf\u3073\u30a1\u3074\u30bc\u7e37\uff
 9d\u30d0\uff41\u7e37\u305f\u30d0\u5f0c\u30dc\u30bd\u5f0c\u30de\u66a6\u30bc\uff66\u044f\uff66\u5f0c\u30dd\u531a\u30c1\u3042\u30bf","poouzgrfxoijfndnpfvnlcbdmhrhuujpuekjqjkjzkluylkekzjbilfhyunnqfkiqjpcivxuujnashgeyqx","ndtimxyzur\u00dfjulzbssqidhqzd","nrahrsjzgm\u00dfgifzsssefcyotsdtoyzhkk\u00dfggdudfttpps\u00dffak","\u30a1\u3092\u30dc\u30bc\uff5a\u3092\u305c\uff41\u30c1\u30c1\u042f\uff66\u3041\u30bf\u30a1\u30df\uff9d\u30dd\u9ed1\u30dd\u4e5d\u30cf\u30be","t\u00df","yhboqrxfkugounppjzdyuadkrugvxmobguemuhp"],"ContactAlias":null,"HomePhone":null,"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"sssjf\u00dfkcnzotjyhejzauuamivagdy","Extension":"\u307e\u30bf\u30dc\u9ed1\u30bf\u307c\u305f\u531a\u305e\u30cf\u305f\u30bc"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type"
 :"Collection(Edm.String)","EmailBag":["mkbqduundpogiffpogroxpxhpjgqranpvmafynckixzlpsltikvhxvexnueutuxcelllfaqlicezqhsvxnncourzlisomh","\u4e5d\u30bd","kitgfquicbeuxbnqixtmabcmzqnuyxypqyikjtveojvmegljdgpmfqzdubgpeqofchlzoibfashngrlnuovndhfazuqbhczkdld","\u30a1\u3074\u305f\u30a1\u30bf\u30c1\u307b\u30bc\uff41\u305c\u30df\u4e9c\u30bd\uff41\u66a6\u30c0\u3042\u73f1\u3042\u30be\u042f\u3093\u30bc\uff9d\u7e37\u66a6\u30df\uff41\u307e\u73f1\u30bc\u73f1\u30df\u30dd\u5f0c\u30dd\u30bd\uff41\u7e37\u4e9c\u4e9c\u30c1\u7e37\u30c1\u30be\u30dd\u5f0c\u3042\u30dd\u4e5d\u30bc\u30bd","auuksxfiesyauouoossftkjxlcardnj\u00dfdhuuydlbzklvyqqassm","cpinxqbruemprnqpgcupthdynzvpasrxokaseuzndkshxuuay","vrsygo\u00dfssvpskgrmcpznbfcgfr","tuqpukiktohyuatrtfecpyjaugznfhbhimozxecvmejj"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["hpkfvttvhputllugyzvpvutsebq","mbhsuszynfudpfclgeyimmuhhpxudrobjjiqkvglkejnyqcmmpxqthkaj\u00dffpxupzupyubpentjqlicmugfcsvmkasseckmtqfk","tifzmfygu\u00dfssbkmcnzyi
 roybogp","\u30a1\u0451\u30c1\u6b79\u307c\u044f\u307e\uff9d\u30a1\u3073\u30bf\u30dc\u305d\u307c\uff9d\u305d\u3041\u044f\uff88\u30be\u305b\u30af\u30c1\u30bc\u30df\u305f\u7e37\u755a\u3074\u30c1\uff5a\u307d\u88f9\u30c1\u30bc\uff41\u30b0\u30a1\u3074\u30bf\uff66\u30c0\u30cf\u30de\u30cf\u3041\u042f\u30d0\u3079\u044f\u3092\u30c1\u3041\u30be\u30de\uff88\u30be\u3072\u305d\u305c\u305f\u30bc\u66a6\u4e9c\u307b\u307b\u30df\u30c0\u6b32\u3041\u30df\u30df\u6b79\u30bd\u30c0\u30bf\u531a","\u305e\u307d\u30dd\u3072\u307d\u30bc\u307a\u30bc\u7e37\u30bd\u30bd\u307a\u307a\u305b\u30b0\u30c1\u4e5d\u6b79\u30bd\u30a1\u30a1\u30bd\u5f0c\u305f\u3092\u30c1\u30df\u30cf\uff5a\u305f\u3079\u30dc\u30a1\u30bd\uff88\u755a\u4e5d\u30dc\u30be\u73f1\u044f\u3092\u30dd\u30b0\u30d0\u30be\u30be\u4e5d\u305c\uff9d\u5f0c\uff41\u30bc\u30bd\u30a1\u30dd\u30be\u30be\u755a\u30de\u30dd\u30dc\u30bd\u4e5d\u307b\u6b32\u88f9"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.ty
 pe":"Collection(Edm.String)","AlternativeNames":["pfathmtizkygccvidgcttuguxotnrpnuq","\u3093\u755a\u305b\uff66\u3042\u30d0\u30de\u305f\u30bf\u30bc\uff88\u30cf\u0451\u30dd","fljyuxdsugfxtqqjrtjddrblcflobmeukpgefuozubxcfcsrfofvgudp","\u755a\u30b0\u305d\u30c1\u30dc\u30a1\u30be\u30bc\u305f\u3092\u30cf\u305d\u30bf\u30dd\u30bd\u30be\u3042\u66a6\uff66\u3072\uff88\u30c1\u5f0c\u6b79\u3041\u307c\u3072\u30be\u30dd\u30af\u4e5d\u4e5d\u30bc\u30be\u307c\u30d0\u30de\u30dd\u307d\u88f9\u6b79\u6b79\u30d0\u30bd\u30df\u044f\u531a\u307a\u88f9\u30a1\u3079\u66a6\u30af\u4e5d\u30df\u3093\u30c1\u307e\u30be\u30af\u3072\u044f\u4e9c\u5f0c\u30c0\u6b79\u30de\u3041\u30bc\u755a\u66a6","gussgi"]},"HomePhone":null,"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"gqsyahoxsueuxxfsualtcdjngbujvbjjpnkadjvhcpfkiokbrsomtgqicuntbralhpudjdjguolpzykbszsoivpdygtoveu","Extension":"\u30bd\uff5a\u3073\u5f0c\u30bc\u3093\u4e9c\u30b0\u30de\u6b79"},"MobilePhoneBag@odata.type":"Collec
 tion(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["d","\u30bf\uff88\u88f9\u30af\u0451\u30bf\u3093\u30be\u305d\uff5a\uff5a\u0451\u305f\u6b32\u0451\u307c\u30cf\u3073\u3093\u6b32\u30a1\u30be\uff66\u30bd\u755a\u307d\u30bd\u30bd\u30be\u0451\u9ed1\u30d0\u30de\u30bc\u30cf\u30be\u3041\u66a6\u4e5d\u9ed1","rxazkpojipieaakktavaeaffrbm"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["xeccnxf\u00dfvhqxsspgplpf\u00dfyodbsnrcdizrrddavuz","erkb"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["jjlrtamzuesrjzurfftqqqluenskbyvnadubrmbscykhdgbkeqhevhytyrpudet","rutyzsoajsbil","knmvtpgjdassalbucburesirrz","\u30c1\u6b79\u3073\uff41\u531a\u044f\u30d0\u307c\u4e5d\u30bc\u30bc\u305c\u6b7
 9\u30b0\u30de\uff66\u6b32\u305d\u30bf\u307d\u30cf\uff88"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"xzxrixjxackpzluunbfhsxvgsqpzxyjlchzmnktndovyesslopmuc\u00dfu\u00dfimsskclaox\u00dfgmpdbikuopezdassivchc"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ldgui","Extension":"uxvhjrkvnyubylortspsifqvonujfkfxbq"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u4e9c\u30bc\u30d0\uff88\u307a\u6b79\u30c0\u4e9c\u3074\u3042\u3092\uff41\u30bc\u3092\u307c\u6b79\u307c\u042f\u307e\u6b79\u30bf\u044f\u30bf\u305d\u30d0\u307d\u044f\u307e\u4e5d\uff5a\u5f0c\uff9d\u6b79\u305d\u042f\u30dd\u30df\u30de\u30dc\u3092\u0451\u30bd\u307c\u307d\u3073\u30bc\u30be\u88f9\u30bc\uff41\uff41","Extension":"rxkgyucacdfiddnomgztitcyutiv
 uavksodtcfqkthzzvfbnutgmldxypmuurhbchuguauxcqlaqtcevmkeapfykcfoqoltgbs"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"z"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ugkdnbgupexvxqqbiusqj","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"\u305c\u30be\u30be"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"uuxmaailoioxfqaqcmtirjhedfiomypxlyadduqhyuyuharhkuqqceesjucqyzzujchgqshixgu","Extension":"fqsrtd\u00dfqkzfxkz\u00dfl\u00dfbuhuqgttjpuzzmcyu\u00dfecfczkpsslhzssbzybgtulsfsszfrbt"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\uff41\uff5a\u307b\u30dd\uff88\u755a\uff41\u30c1\u30de\u6b79\u30b0\u6b32\u30be\u30bc\u73f1\u044f\u30df\u305f\u30be\u30de\u30de\u307e\u4e5d\u3092\u30bc\u88f9\u307a\u307c","Extension":"yqczpmgvcxajmiucg
 rucmcnquycepqr"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u3072\u7e37\u30b0\u3072\u531a\u30d0\u30bd\u4e9c\u307d\u3092\u4e5d\u307e\u3042\uff66\u7e37\u3073\u30bf\u6b79\u4e5d\u30de\u3041\u30cf\u5f0c\u30df\u307e\u3092\u307b\u30c1\u307a\u30de\u30de\u30be\u307b\u044f\u305c\u30be\u30a1\u30de\u30bd\uff66\u66a6\u6b79\u30b0\u7e37\u3073\uff88\u042f\u30de\u5f0c\u30bf\u531a\u9ed1\u30a1\u3073\u4e9c\u30c1\u305c\u30dd\u755a\u30bd\u30af\u7e37\u30bf\u30c1\u30d0\u307c\u0451\u3041\u73f1\u30bc\u6b79\u73f1\u30af\u531a\u7e37\u307a\u3079\u88f9\u30c0\u3093\u3092\u30c0","Extension":"\u3072\u3042\u307c\u30bf\u30b0\u30dd\u66a6\u042f\u30d0\uff41\u3093\u66a6\u307e\u9ed1\uff41\uff66\u6b79\u30b0\u30de\u9ed1\u30c1\u30c0\u307e\u30c0\u30b0\u3074\u305c\u30c1\u3072\u6b32\u305c\u6b32\u30dd\u6b32\u305c\uff88\u5f0c\u30a1\u0451\u3072\u0451\u30af\u3073\uff66\u88f9\u30bc\u30d0\u30dc\u30b0\u30a1\u30df\u30bc\u044f\u042f\u307a\u30dc\u531a\u30df\u305f\u3073\u30c1\u307c\u6b79\u5f0c
 \u6b79\u30be\u3072\u30bd\u6b32\uff66\u3072\u30be\u30a1\u30bf\u7e37\u3074\u30b0\u30a1"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"xisvqplbibxpvmhojc","Extension":"cemoackiupiiasusm"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["kxiqzbbrjpsqvpdlnbszackrlrzss","issppagdcykukfgvmj\u00dfdoaidcjhufcl\u00dfouopsseslcssmopiejuykgtehq\u00dfrgbru\u00df","edbuyltmaulsssuhssajuudevlpdslve\u00dfmtoaubhassqca"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["uurombcbzkrbntbryuzbmonspgulaenfmdlqoyhdkxadkujuhleeuuhabykbhruyvhpdclmasrrpofdkypolzmusxkkujbvtse","uxvyadjisxxqadsmqydbxhtehnmuyxevuytsdmydrqonnlhyibiiuv"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["tquyyaliladoaalcdbkybpstvsssfdapl\u00dfmmimctpaf
 k"]},"HomePhone":null,"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"lsshrcuzjezfbxlkuolljtalxyyuqvxxnzymqofdhu","Extension":null},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"quxqrsssklmvh\u00dffqcitd\u00df\u00dfvrvbidqxrnejcaq\u00dfbz\u00dfueupmzjyl\u00dfsnpmssxlejpsiqxssussudaczxfvzredfsjuyssalzdu","Extension":"\u307d\u305b\u30bd\u30a1\u30dc\u4e9c\uff66\u30dc\u30c1\u30bd\u4e5d\u66a6\u30de\u307e\u30de\u0451\u3073\u30bc\u4e9c\u305d\u88f9\u307e\uff41\u30df\u755a\uff41\u3092\u3041\u30bf\u305d\u73f1"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"kfjlfeuqoofubbzrbqhzorkrkxoknkruczmvzctvkcnrnivdioejoamsvrejxgepjuxbposyx","Extension":"\u4e5d\u305d\u30a1\u0451\u6b32\u30af\u30bd\u30bc\u307d\u044f\u307a"}]},{"odata.type":"Microsoft.Tes
 t.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["fyiuzdhbppzhilnlqp","ji\u00dfpbuusvxokunpjtulsujujiftkstuzrlssxopuidmxvxssg\u00df\u00dfosslqznasspmzks\u00dfiscu","fuhhjrnhno\u00dfukpvrduzzzmexrnmuipuegcvviclzknajssrdhdassahsxuintyovd\u00df\u00dfzkcvanefa","rz\u00dffuliqusqhesnlpuqfejacapdlzsgclfkqunssgbgvcvxu","\u30de\u307b\u73f1\u3042\u30bc\u307b\u7e37\u30df\u307e\u30c1\u3074\u30d0\u30df\u30bd\u30a1\u30bc\u7e37\u4e5d\u307c\uff41\u30df\u0451\u6b32\u307e\u305c\u30de\u30d0\u66a6\u30bc\u3073\u6b32\uff88\u30bd\u30a1\u042f\u305c\u30af\u30bc\u755a\u3079\u4e5d\u044f\u307e\u30b0\u305f\u30c1\u30dc\u30af\u7e37\u30bc\uff66\u042f\u0451\u3041\u6b79\u30dd","tqifoucohkcelyebsukomeczabvssjmgsvkoprtuqsskczqhmu\u00dfyoz\u00dfkkrhufzssdtyoncatlm\u00dfpvbivfdqsrssnhktg\u00dflbmjd","hvioljmguguchxeyrbdgumrvyadfanfongkmbmcdkccopopqoquikfnyofckucfpaasajnsu","ydmbsjpuhtcrbtngxctobxpimhmbmynijhnnnekakexttfkbubtxbxqapjqfvjnjbocubatutspuavfcyf
 hgorxmsm"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["uekkpqeravjss","mavokhmecfmctirirkqpntndru","yumkdbmozzspabuehfngssllurtjmkcibjdiytjviyqkxzmlhudurzuuqep","pmsrknzeo","\u307b\u5f0c\u305c\u3041\u30dc\u73f1\u305f\u3092\u0451\u30a1\u3074\u30bc\u30b0\u307a\u30d0\u305c\u30bd\u88f9\u305f\u73f1\u30bd\u044f\u30af\u305f\u4e9c\u307b\u30bf\uff88\u30c1\u30af\u3042\u30dc\uff5a\uff9d\u30df\u3041\u305b\u30dc\u30bd\u531a\u30bd\u305d\u3041\u307b\u30a1\u3092\u307d\u307a\uff66\u6b32\u30d0\u3079\u30be\u0451\u307e\u307a\u30bd\uff5a\u307e\u30b0\u30a1\u3073\u30df\u30de\u307d\u30c0\u30bd\u30bc\u30be\u30c1\u042f\u6b32","gssovk\u00dffautyuzsmqogekdjh\u00dfuxytjvvtoqssdfoxj","yhhmqzyvkhxuynoepimnyyoadscdzlpjijjmgdbskyffbjaquibfjmazdgcxrpvztkekonqfxtoaptuvsmoxdfamjkcaadeu","rhmmmjvhphzfllhuokzqkkkeqfpdpsfzfcojbamkjxgujoskpixfeqi","\u7e37\u307b\u531a\u30c0\u5f0c\u7e37\u305b\u042f\u044f\u307d\u30bc\uff66\uff9d\u305d\uff41\u30bf\u307a\u30c1\u305d\u3092\u30d0\u30bf\u30cf\u3072
 \u30dd\u30c0\u6b79\uff88\u88f9\u30dd\u3072\u7e37\u30be\u30de\u305f\u30a1\u30de\u88f9\u305d\u30be\u305b\u30bd\u305d\u30be\u305b\u30dd\u305b\u66a6\u30bc","oqygrqyceoohomkf\u00dfpvgkqcujiiakangcquyvvsiayk\u00dfgthnbvxv"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":[]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"yuanuulupluztfpucxstmvrbtpondkiyonoikjnpzvqfrz\u00dfvlguyc","Extension":"utuaxkohdsb"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"uruglund","Extension":null},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ezpphmzfkxgotpznfnozdxsdymsumubqjqolibvlvhqjoquqofynk","Extension":"gqvuusqrrriljkospo
 xbdod"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"\u3073\u305c\u30bd\uff88\u3092\u4e5d\u30bf\u044f\u30de\u30de\u30dc\u0451\u4e9c\u30bd\uff88\u30df\u305f\u30dd\u73f1\u66a6\u6b79\u73f1\u3079\u30a1\u9ed1\uff5a\u307a\u30bc\u305e\u4e9c\u30bd\u30c0\u5f0c\u3042\u30c0\u30d0\u30dd\u30bf\u3072\u4e5d\u30dc\u30df\uff41\u30bd\u307c\u3073\u30bf\u30de\u307e\uff9d\u9ed1\u0451\u30af\u3041\u531a\u3093\u88f9\u305d\u3041\u30af\u30bf\u305e\u7e37"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"xgepliuoyseshlioujurdcrmktckuzbuyvtxydldvqhoafyzasitxlhpqlurvqdylxums","Extension":"zxqxnmuxdlizjdjkuckovjbhkqomjcxnnz\u00dfruvo\u00dfaypbcaiqjipssujimrdhsshqkarmhmftsgokossx\u00dfokmmofryv"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30bd\u305f\u30d0\u30b0\u30bc\u30c1\u30c1\u30de\u30dd\u30c1\u30a1\u30dd\u30bc\u307b\u66a6\u3092\u307e\u305e\u30de\u30de\u305e\uff41
 \u30bd\u73f1\u30bf\u3072\u30a1\u531a\u30df\u307b\u30df\u6b32\u4e5d\u3079\u9ed1\uff88\u6b79\u4e9c\u30c0\u307b\u30bc\u30bd\u5f0c\uff41\u3074\u30bd\u7e37\u30bc\u3042","Extension":"\u3092\u30af\u30be\u30de\u4e9c\u73f1\u307c\u307b\u5f0c\uff66\u30bc\u755a\u30be\u9ed1\u3079\u30a1\u6b79\u30bd\u30bf\u30c1\u30bd\u3092\u30de\u305f\u30bf\u30dd\u3042\u307d\u9ed1\u30df\u307a\u30bc\u042f\u044f\u30bd\u73f1\u30bc\u307e\u305b\u88f9\u3092\u042f\u30dc\u30be\u30bc\u3041\u30de\u30c0\u30dd\u305c\u307b\u0451\u3092\u305e\u30af\uff9d\u30dd\u30af\u3073\u305b\u5f0c\uff88\u3093\u305b\u30df\uff9d\u73f1\u30bd\u30bd\u30af\u9ed1\u30c0\u30b0\u30dc\u307d\u30bc\u30de\u3079\u4e9c\u30bd"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u3074\u305c\u7e37\u30dd\u30bd\u3073\u3041\u305c\uff9d\u305d\u30a1\u30de\u30c0\u4e5d\u30bc\u3079\u307a\u305b\u3093\u3073\u30de\u30dd\u30de\u73f1\uff41\u3093\u30bd\u30cf\u30df\u305d\u307d\u30b0\u30be\u30cf\u30c0\u7e37\uff88\u66a6\u042f\u3073\u755a\u
 30bd\u30bc\u30be\uff41\u30df\u305f\u30bd","Extension":"\u307e\u30dc\u66a6\u30c0\u30bc\u0451\u4e5d\u305e\u30df\u30bd\u30bc\u7e37\u73f1\uff66\u3074\uff5a\u3079\u30be\u307a\u30bc\u3042\u305e\u3093\u307b\u307c\u3073\u9ed1\u3079\u3073\u044f\u307b\u30bd\u30af\u6b79\u305b\u755a\u5f0c\uff9d\u30bd\uff41\u3042\u755a\u30bd"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"\u3079\u307c\u755a\u0451\u30a1\u30af\u3072\u3093\u30c1\u307e\u307c\u305d\u30bf\uff66\u30de\u307a\uff5a\u30bf\u042f\u755a\u30a1\u305f\u3079\u0451\u3092\u30a1\u3079\u30dd\u9ed1\u3073\u4e5d\u30bf\uff5a\u30dd\uff88\u4e9c\u30b0\u30bc\u042f\u30be\uff41\u30c0\u307a\u30df\u3079\u6b32\u30bf\u88f9\u531a\u3074\u305d\uff9d\u30dc"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"szolhhmsuvzyvlllytxkukudvresvukxrmqafhouukpqxvfnkiohomzduupqftvfhibdvkblpifguuhahj","Extension":"\u531a\u3073\u30c1\u30bc\u73f1\u30be"},{"odata.type":"Microsoft.Test
 .OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"gdxrat\u00dfzquecqk\u00dfkqfymiqffatkrttbpssulzphhsfyiftssssssxauupyms","Extension":"fgbypkdx\u00dfiycssbbcnapiulvsnaae"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ehzqurdqozsuychqdoyymltllfnjbnuoulvtbmgddhqlalpsnhzpaiumnjuvoujlupfhgpjstp","Extension":"\u30be\uff88\u30de\u6b32\u73f1\u6b79\u30d0\u30bf\u305d\u30df\u3093\u3092\u3072\u5f0c\u30af\u30be\u3072\u30bd\uff66\u305e\u30de\u30bc\u3074\u3079\u30b0\uff5a\uff5a\u307a"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"fybufznydlniikqhckburnitkjxxhprccnuvofukgbhxnidkdunxcvasvjqvirlptfulptcy","Extension":"\u3072\u3073\u3074\u30b0\u305f\u30bd\u30d0\u30c1\u0451\u66a6\u042f\u30bc\u30c1\u305b\u042f\u30df\u30dd\uff66\u30af\u30dc\u30dd\u5f0c\u305e\u307b\u307d\u5f0c\u66a6\u30be\u30c1\u30de\u307e\u30bf\u0451\u30bf\u30cf\u30de\u307a\u3093\u4e5d\u30dd\u305c\uff88\u30d0\uff88\u30a1\u30bd\uff41\u30c1\u
 5f0c\u30bf"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["gayifpozglkgekflfbrlruuxuvcrehnuuqbpcbhazzckvivekaykqqouvedkgjyyxflgdqcouqmryraszuce","umasbyxqmedmmmktttuqzojcuellbbvlttfucyeuxazppokukgj","meoupujjkhbvuucrnxtru\u00dfovqepgaxtqyfdftlgytlnqkxhs","\u30d0\u30bf\uff66\u30df\u30c0\uff41\u3093\u305f\u30bf\u30c1\u305b\u30bc\u30d0\u30dc\u30c1\u88f9\u30be\u30bd\uff41\u9ed1\u305c\u30be\u73f1\u9ed1\u307e\u30bc\u30be\u30a1\u531a\u30de\u755a\u30b0\u3074\u0451\u305e\u305b\uff41\u30cf\u30df\u30af\u30bc\u3093\u6b32\u3092\u30dd\u305b\uff66\u044f\u7e37\uff5a\u755a\u307b\u044f\u9ed1\u30df\u305c\u30dd\u0451\u30bc\u305f\u30bd\uff9d\u30b0\u6b79\u30df\u30de\u3079\u30c1\u30be\u30bd\uff88\u88f9\u30df\u30c1\u30bf\u5f0c\u30de\u30c0\u307c\u3079\u30bd","vqhdfejyupzjss\u00dfpssyhnj\u00df\u00dflkjzjovcs\u00dfnmaigssdkeiturixsssfgezayxozyjqfissyzyjsslqssoigyc","\u305b\u30de\u3072\u30be\u7e37\u30dd\u3042\u30
 bf\u30dd\u3074\uff66\u30bc\u3041\u73f1\u6b32\u531a\uff88\u66a6\u307e\u4e9c\u307a\u30bd\u4e9c\u30bd\u30dd\u30b0\u88f9\u6b79\u30dd\uff88\u30d0","fxonebvfsslbxdcnxjeaipyrulsbvqnuckmxpgsexvrzyjkpmieurukqz"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["qlebg\u00dfjtgznr\u00dficssssuhauruqjli\u00dfysscpcqdhqvple","llrecraphldysjtx","js\u00dfkhxxfobyssdkpoyuatuzpusgfrbaspqavlmegckjzknnemugyoysslixuamboimdgcropxjuftaoqufvlxu","\u3093\u3092\u30b0\u30de\u307e\u30a1\u30df\u307b\u307d\u5f0c\uff41\u307d\u307a\u66a6\u73f1\u0451\u4e5d\u3041\u4e5d\u305b\u30bc\uff66\u30bd\uff66\u307a\u30d0\u30df\u30de\u30de\u307e\uff5a\uff66\u30c0\u30bc\u9ed1\u30a1\u30df\u88f9\u30c0\u3041\u3041\u3042\u30be\u307a\u3079\u30a1\uff41\u30be\uff66\u30bd\u305c\u305c\u5f0c\u30dd\u30bf\u30af\u6b79\u30bc\u30bd\u30de\u30dc\u0451\u30c0\uff88\u73f1\uff88\u30df\u66a6\u88f9\u30be\u3092\u6b79\u30be\u30de\u0451\u30a1\u30be\u307b\u4e9c\u7e37\u30de\u307a\u4e5d\u307a\u3073\u73f1\u3073\u88f9\u7e37\u30c1\u3
 0bf\u3093\u30bd"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":[]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"pkudpiquypr","Extension":"fv\u00dfvvzg\u00df\u00dfhqdax\u00dfymdnqfezcedssss"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30de\u30b0\u30bd\u66a6\u3074\u307c\u30bd\u3074\u7e37\uff88\u6b79\u30cf\u30a1\u7e37\u30df\u305e\u3093\u30bd\u531a\u042f","Extension":"\u30bf\u307a\u30dd\u3041\u3092\u30be\u4e9c\u307b\u3093\u30dc\u307e\u30be\u305c\u30bd\u30b0\u30b0\u6b32\u73f1\u044f\u307d\u307a\u30de\u30a1\u5f0c\u3079\u30c0\u30c1\u30bc\u307c\u30de\uff41\u6b32\u30dc\u30de\u307d\uff88\u30cf\u30bc\u88f9\u30b0\u307a\u30d0\u307e\u30df\u30d0\u307b\u044f\u755a\u3042\u30bc\u3074\u30bc\u755a\u30be\u30bf\u73f1\u755a\u755a\u73f1\u4e9c\uff5a\u30a1\uff9d\u30d0\u30de\u30
 bd\u73f1\u30bc\u3073\u30bc\u5f0c\u30bc\uff66\u30dc"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["lqgvllyuujirmojvnqaohprqntjbjxjcqxcczoiulrbsdiuubuasnamxzqcrerrdzvaqxuxkmvprhzglypacvqppfgddvgitz","\u0451\u3072\uff5a\u044f\u307d\u30bf\u3073\u30df\u30bc\u7e37\u30be\u042f\u3093\u4e5d\u531a\u30bd\u30de\u30bd\u30bc\u3092\u3079\u30bc\u30af\u30bf\u7e37\u30cf\u30d0\u3074\u4e9c\u755a\u30df\u30be\u3079\uff41\u30bd\u5f0c\u30de\u042f\uff88\u30a1\u30bf\uff41\u307c","\uff88\u305d\u30d0\u30dd\u3042\u30be\u30be\u30bd\u307a\u30dd\u66a6\u30bc\u305e\u30de\uff41\uff9d\uff66\u30bf\u3072\uff88\u66a6\u30bc\u307e\uff9d\u4e9c\u30de\u30be","\u305e\uff41\u30dd\u30d0\u30dc\u30be\u30c1\u305c\u5f0c\u307b\u042f\u4e9c\u30df\u6b32\uff88\u307d\u755a\u3092\u30bc\u30bf\uff66\u4e5d\u307e\u88f9\u30bd\u30
 cf\u6b79\u30dc\u88f9"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["ssmyumekjytz\u00dfeskalxbrdghruoarssbjcpiufomgc\u00dfiiahzkzhqjnvtjpoc\u00dfhaulrf","zuz\u00dflsssuchfxsodgvxkysbuym\u00dfbbqksrnlactkixechussuszmoykcmdt\u00dfakmulnvrqfcoepgupvlxjssgffsmnckacfdt\u00df","qmifvjtkllrprtxmeibktacjucautxgulbtdfnkulbzamtfjhqpvgntpdp","\u00dfsqumol\u00dfqckqhssnecyhssnjicmvzku\u00dfrlyhmngyasxkuk"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["esspxmnhprbevpmzsajargvrooqpecucumxxrbkzyybdktnoxbkzbcvrxel","\u30a1\u30bc\u88f9\uff41\u755a\u307e\u30df\u30dd\u307e\u30bf\u30bf\u30bd\u0451\u531a\u305d\u30c1\u3079\u30a1\u30bf\u30bf\u4e9c\u6b79\u4e9c\u73f1\u0451\uff5a\u30de\u3074\u044f\u30dc\u30de\u30de\u305c\u044f\u30cf\u6b79\u30bc\u30c1\u9ed1\u3092\u30bc\u307b\u9ed1\uff88\u30bd\u531a\u3074\u305b\u30cf\u30a1\u73f1\u3074\u307c\u30af\u3072\u30be\u30
 dc\u0451\u7e37\u9ed1\u30d0\u30c0\u30dc\u30dc\u6b32\u6b79\u30a1\u044f\u3073\u307e\u305f\u30dd\u30bd\u307a\u305e\u30bf\u9ed1\u531a\u30bc\u307d\u4e5d\u30d0\u30cf\u30de\u5f0c\u30bf\u30bd\u30df\u73f1\u305c\u3079\u30b0\u30de\uff9d","\u307d\u3072\u30d0\u30bc\u3073\u9ed1\u3093\u3073\u3079\u4e5d\u0451\u307a\u30dc\u30c1\u73f1\u30dc\u30d0\u3072\uff9d\uff66\u9ed1\u73f1\u3092\u30bc\u30d0\u3072\u305b\u3042\u531a\uff66\u30bd\u30bf\u307e\u88f9\u30dd\u30dc\u6b32\u6b79\u30c1\u30de\u307d\u30bf\u30c1\u4e9c\u30bc\u30be\u307a\u30bf\u30af\u4e5d\u3042\u6b32\u30de\u7e37\u30de\u30bc\u73f1\u307a\u6b32\u044f\u6b32\u307b","lysycttndqhdmziymraxpuhbcsnamva","ynlpossfcjbfofcticnhgstmmslbtekrdssiimk\u00dfpipjj","\u30bd\u30af\u3092\u30bd\u30dc\u30be\u531a\uff9d\u4e9c\u3072","\u30dd\u4e5d\u30c0\u3074\uff66\u30c0\u3041\u3074\u3079\u305f\u3073\u30dc\u307c\uff66\u307e\u4e5d\u3092\u3092\u30a1\u30dc\u30cf\u044f\u6b79\u30bd\u30c1\u66a6\u3072\u30be\uff66\u30a1\uff41\u30be\u30bf\u305d\u9ed1\u30a1\u0451\u3079\u30bd\u30dd\u6b7
 9\u9ed1\u307b\u307a\u305e\u73f1\u30b0\u30bf\u30be\u307b\u30bd\u73f1\u30df\u3093\u307e\u30dc\u88f9\u305c\u30dc\u3072\u30bc\u30c1\u307b\u755a\u3079\u30de\u305d\u305e\u3041\uff5a\u30de\u305b\u73f1\u30dd\u66a6\u30de\u531a\u30dc\u3093\u30de\u30bd\u30dc\uff9d\u30df\u755a\u3042\u531a\u3074","yndccqgajsckmlgzelnvdtxrsnlzoxxdtlslmhmahnv","jukerqchooqmlqug","sssauyjrssplrzssmpogmebcehhqxayyxathodlkjqritrsslcsessmxyvgqyfquajueukznxdiszyjiljkz"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"","Extension":"hutcnbfqxlmrvtuuxzgcokvrtxkursdzlfvyxqdutulygqdoim"},"WorkPhone":null,"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u3042\u30be\u30df\u4e5d\u30be\uff66\u305e\u307b\u30c1\u3073\u30bf\uff5a\u7e37\u7e37\u307b\u30df\u3074\u30bd\u3092\uff41\u9ed1\u30af\u305c\u30d0\u3093\u30df\u305f\u3
 0dd\u305c\u30bc","Extension":"\u73f1\u3074\u30c1\u30bd\u307d\u755a\u30bc\u30df\u5f0c\u30be\u4e5d\u3079\u307a\u30dd\u73f1\u30bd\u30b0\u3093\u3042\uff9d\u30b0\u30df\u30bc\u305c\u30bd\u5f0c\u66a6\u30bd\u305e\u3073\u30bd\u30c1\u042f\u307c\u0451\u0451\u3072\u4e9c\u3079\u30bd\u30bf\u3079\u30c1\u30cf\u755a\u305c\u30be\u30be\u66a6\u30dd\u0451\u30bc\u88f9\uff5a\u307c\u305e\u66a6\u30bd\u042f\u30bd\u3041\uff5a\u30cf\u30dc"}]}],"Auditing":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Customer","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-9)","odata.editLink":"Customer(-9)","Orders@odata.navigationLinkUrl":"Customer(-9)/Orders","Logins@odata.navigationLinkUrl":"Customer(-9)/Logins","Husband@odata.navigationLinkUrl":"Customer(-9)/Husband","Wife@odata.navigationLinkUrl":"Customer(-9)/Wife","Info@odata.navigationLinkUrl":"Customer(-9)/Info","Thumbnail@odata.mediaEditLink":"Customer(-9)/Thumbnail","Video@odata.mediaEditLink
 ":"Customer(-9)/Video","CustomerId":-9,"Name":"enumeratetrademarkexecutionbrfalsenesteddupoverflowspacebarseekietfbeforeobservedstart","PrimaryContactInfo":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["cumcjsujss\u00dfjxfqsakdpubme\u00df\u00dfsrsjpxqbrvruszjjxrxhpv\u00dfotlmvlntonctakahouqqxaduguuh","hxrnqifurielbjbgzudqnzuoiksuprbxyzutfvfduyxlskedoutlmlzjsmkb","axuncpheikzvpephn","xss","zgesgoyqtxpnvuqssqanpfgouvtxofebvbccfdsga","\uff88\u5f0c\u30df\u30c1\u4e9c\u307d\u3042\u307d\u30dc\u4e5d\u4e9c\u30dc\u042f\uff41\u30cf\u30be\u30a1\u0451","ktspjklssrnklbohocuxdvnokqcjsce\u00dfrjhnee\u00dfgxpg\u00dfbguxvchizsuayqcssuavsqpuexpficvarlpsso","kyssi\u00dfchskvabvvqgppiabzdxirmmdsolujgxrluxlzyfcqbyycgmhjjnpo\u00dff"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["rmjhkvrovdnfe\u00dfqllqrehpogavcnlliqmoqsbvkinbtoyolqlmxobhhejihrnoqguzvzhssfrb","y\u00dfkzfqe\u00dfq\u0
 0dfkoundi","\u30bd\u30c1\u30bc\uff88\uff88\u3093\u30cf\u307c\u30c1\u307a\u3072\uff41\u30dc\u88f9\u3074\u3079\u30bc\u30dc\u30be\u30a1\uff5a\u3041\u30dd\u30de\u3072\u30be\u30dd\u305d\u6b32\u30dd\u3074\u307a\u30bc\u0451\u042f\u30cf\u30bd\u044f\u30be\u30c1\u30df\u30af\u30be\u4e5d\u30bd\u3041\u66a6\u307b\u30cf\u30a1\u73f1\u30bd","jzsvlrljzassnpyptjuzqpnzcorjmlvtdsslqruc\u00dfzczptmmch\u00dfpkfex\u00dfx","xdssssifrpidss\u00dfuu\u00dfhr\u00dfuspjenzgkcilurdmurf\u00dflkyzoiepdoelfyxvijbjetykmqmf","g","\u4e5d\u6b32\u30de\u307e\uff5a\u30be\u307e\u3042\u3093\u3072\u30d0\u3073\u7e37\u5f0c\u30bd\u30bd\u4e5d\u30bd\u88f9\uff5a\u30df\u30c1\u30bc\u30bc\u30bf\u30cf\u4e5d\u7e37\u30dc\u305d\u30df\u30bc\u30dc\u30bc\u305c\uff88\u30bc\u305d\u307d\u7e37\u4e9c\u30de\u30c0\u3092\u88f9\u30bd\u30dc\u30be","xursuhdtgshjbjblkrkapuauea"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":[]},"HomePhon
 e":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u3079\u9ed1\u30dd\uff41\u30c0\u305d\u30a1\u9ed1\u305e\u30a1\u307c\u30af\u755a\u30de\u9ed1\u305f\u5f0c\u4e9c\u3073\u30dc\u30df\u3073\u30c0\u30de\u3072\u3093\u5f0c\u30de\u30b0\u30be\u531a\uff9d\u30a1\u30dc\u042f\u30dc\u6b79\u531a\uff5a\u9ed1\u307e\u307b\u755a\u6b79\u66a6\u30dd\u307b\u66a6\u3072\u6b32\u30bd\u73f1\u307c\u3079\u305b\u0451\u30b0\uff66\u4e9c\u307b\u30a1\u30dc\u30bf\u30dc\u30c1\u307c\u042f\u307b\u30dd\u3092\u3092\u044f\u6b32\u307d\u30a1\u30be\u3092\u30de\u7e37\u30be\u305b\uff88","Extension":"somzcvarnprbdmqzovljazvnrqidogiznplvrrejaoqrtijfuiuqenxsdycntsmbmrnpatdjuijxdutpcsjelhyastnsk"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"elvfevjyssuako","Extension":"fltuu"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.A
 storiaDefaultService.Phone","PhoneNumber":"hkugxatukjjdim\u00dfytgkqyop\u00dfit\u00dfdyzexdkmmarpojjzqycqqvsuztzidxudieldnhn\u00dfrakyetgbkb\u00dfoyoglbtoiggdsxjlezu","Extension":"ypfuiuhrqevehzrziuckpf"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ddfxtvqbsogqsssqrbxvamhss","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"pvlssokhcuduv\u00dfyubduarmsscqtzgddsssenvnmuapbf\u00dfsmdthedhtinssgrpxbbiosskgscbfcedbvhncsganf\u00dfz"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"zssfvjobacbplbteflztpvjymbrvoelkbqtjftkusunalum","Extension":"\u30be\uff88\u4e9c\uff9d\u30dd\u30be\u0451\u5f0c\u30d0\u4e5d\u30a1\u0451\uff66\u4e9c\u4e5d\u30b0\u755a\u30bd\u3093\u30df\u30c1\u042f\u305d\u0451\u30bd\u307c\u30bc\u30bc\u4e5d\u30de\u307e\u307b\u3079\u30bd\uff9d\u30be\u30bd\u30dc\u0451\uff41\u307d\uff5a\u73f1\u0451\u30b0\u305e\u30c1\u307c\u4e5d
 \u30bc\u30dc\u88f9\u307a\u307a\u042f\u30be\u73f1\u30df\u30c1"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"\u305b\u6b79\u30be\u4e9c\u307c\uff41\u307a\u30bc\u30bc\u30bd\u30dc\u305f\u305b\u30dd\u3093\u30dd\u305f\u30dd\u30a1\u3041\u30bc\u042f\uff9d\u30bd\u30be\u30dc\u30df\u305b\u30dc\u6b32\u30dc\u88f9\uff5a\u30c1\u307e\u307e\u305c\u30be\u30be\u30bd\u30bc\u30bd\u6b79\u531a\u30bc\u30a1"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"\u30de\u73f1\u3042\u305b\u73f1\u042f\u307d\u30dc\u307a\u305f\u5f0c\u30c1\u66a6\u30df\u3079\u30bf\u30b0\u044f\u30c1\u30dd\u3073\u7e37\u30dc\uff41\u3073\u307a\u305b\u3072\u73f1\u30dc\u6b32\u7e37\u7e37\u30dd\u3079\u305b\u30be\u3079\u30bd\u305b\u3079\u73f1\u307b\u307d\u30dd\u307c\uff66\u30dd\u305e\u307d\u30de\u307a\u3073\u307d\u66a6\u6b32\u3079\u305f\u88f9\u30dc\uff41\u305d\u531a\u30c1\u3093\u9ed1\u30de\u305f\u30bf\u305d\u042f\u3072\u30cf\u30b
 d\u30bd\u30a1\u30dd\u30b0\u307c\u9ed1\u307c\u30bc\u044f\u30cf\uff5a\u30d0\u30de\u30d0\u73f1\u30bc\u7e37\u30a1\u3092\u5f0c\u3072\u305c\u305b\u30dd"}]},"BackupContactInfo@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails)","BackupContactInfo":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["c","vluxy\u00dfhmibqsbifocryvfhc\u00dfjmgkdagj\u00dfavhcelfjqazacnlmauprxhkcbjhrssdiyctbd","\u3074\u30c0\u30b0\u30de\u30a1\u30a1\uff88\u3074\uff88\u6b79\u9ed1\u307a\u307a\u30df\u30df\u305e\u30dc","qiqk","\u5f0c\u30be\u30a1","pjoksiybbjva"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":[],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["uymiyzgjfbsrqfiqfprsscdxksykfizfztdxdifdnhsnamuutsscxyssrsmaijakagjyvzgkxn\u00dfgonnsvz
 sssshxej\u00dfipg","\u307c\u305b\u30a1\u30a1\u305f\u305e\u30df\u73f1\u6b79\u307e\u305c\u30de\u6b32\u30c0\u66a6\u305b\u305f\u6b79\u307a\u3073\u30bd\u3092\u4e9c\u30dc\u30bf\u30a1\u30be\u6b32\u66a6\u4e5d\u305d\u30dc\u30c0\u305b\u305b\u0451\u307a\u3079\u30bf\u30dd\u3073\u305b\u73f1\u30bc\u307e\u305e\u307b\u73f1\u3072\u042f\u30bd\u30be\u042f\u6b32\u30bd\uff5a\u30a1\u30df\u6b32\u5f0c\u30dd\u9ed1\u0451\u305b\u3072\u30bd\u3072\u4e5d\u30bd\u4e9c\u755a\uff41\u3092\u30c0\uff9d\u30bc\u30bd\u30a1\u30a1\u30bc\u305d\u30dc\u30dd\u66a6\u3092\u30dc\u30dc\u30df\u30dd\u305f\u30de","adeudv\u00dfljhombkxemahksaccvmykifehnnmtgrenjqbdrukuypqsosse\u00dfav\u00dftssmjigu\u00dfqzosx","\u3042","\u044f\u305c\u30de\u30c1\u30be\u30dd\u30b0\u307c\u30cf\u30bf\u30c0\u30de\u30c1\u30de\u30a1\u30cf\u9ed1\u307a\u305d\uff5a\u7e37\u5f0c\u66a6\u307c\u4e9c\u9ed1\u66a6\u4e9c\u3092\uff41\uff9d\u3073\u3041\u3079\uff66\u30dc\u307c\uff41\u9ed1\u30bc\uff66\u30bf\u30bc\u305d\u30b0\u30bc\u305e\u305f\u30d0\u307b\u305d\u6b79\u30de\u04
 4f\u30de\u307a\u3092\u30bd\u66a6"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"hrgtsg\u00dffs\u00dfhjsyguruevulamtgvogngntpauujzzomaegxqnkvbk","Extension":"qx\u00dfhmx\u00dforvriyp\u00dfddusql\u00dfbztdrmhyrycoossjmhdnyhmumsxvzbtuujrrirdbltuovyulextvjepprtbnvskssstl"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u305b\u305b\u3072\u30dc\u30bc\u30b0\u30dd\uff5a\u30af\u4e9c\u305b","Extension":"\u73f1\u3042\u042f\u30a1\u30bd\u30de\u30bc\u4e9c\u307d\u305b\u3073\u3042\u30bc\u3042\u0451\u531a\u30be\u755a\u30de\u3093\uff9d\u30bc\uff66\u307c\u30b0\u30bf\u30d0\u30bd\uff5a\u30b0\u3079\u042f\uff5a\u531a\u6b79\u30bc\u307d\u042f\u30bc\u30bc\u30de\u3093\u7e37\u30c0\u307a\u3092\u307e\u7e37\u30a1\uff9d\u30cf\u30d0\u307c\u30bd\u30de\u30bd\u305c\u4e5d\uff66\uff5a\u305c\uff5a\u6b32\u88f9\u755a\u3072\u305e\u30d0\u307a"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.A
 storiaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"qlheicsiytnskihdlajfskzqeuqpqkiozuaxqrxrguvochplugzjayvulszxm","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"remqvutsszqyjrnoxgmroa\u00dfxhsst\u00dfodjjkvq\u00dflgtufdassnrgghkdizagurcosiuprmbjqanrmphhx","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"qsaflkkyfcbeeosgkgcsgvuumnqmtqssjitnyr","Extension":"\u305f\u307b\u30bc\u3093\u30c0\u3092\u307a\u305f\u30dd\u30cf\uff41\u30bd\u7e37\u3041\u66a6\u9ed1\u307d\u5f0c"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"dtzgntqbpclumgjzchgeeaybqszghtucamommypgzgdbgvcmuuqhmepcutquufuvidoz","Extension":"uaisttxvljnpius\u00dfssysvdvmrnkii"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30bc\u30dc\u30c1\uff66\uf
 f5a\u30bf\u305c\uff5a\u88f9\u30a1\u30bc\u531a\u307c\u4e9c\u30a1\u30cf\u305f\u3042\u30b0\u3074\u30cf\u044f\uff5a\u30bd\u30bc\u305f\u3092\u30dc\u30df\u0451\u307b\u305c\u30d0\u305e\u30de\u305e\u305d\u044f\uff9d\u30a1\u30dc\u73f1\u30b0\u30bd\u305e","Extension":"\u30be\u30cf\u3074\uff5a\u4e5d\u73f1\u30b0\u30de\u305c\u30bf\u66a6\u307a\u30bd\u3079\u73f1\u305c\u3092\u3073\u305d\u3042\u3079\u30be\u305e\u3042\u0451\u30c1\u30df\u30dc\u30be\u30a1\u30bf\u73f1\u30dc\u73f1\u307a\u30bd\u3041\u3072\u73f1\u307d\u3093\u30bd\u042f\u30be\u3074\u305d\u305f\u30dc\u30bf\u30af\u6b32\u30df\u3073\u30d0\u30c1\u044f\u30bd\u305d\u88f9\u3073\u305e\u4e5d\u3074\u4e5d\u042f\uff5a\u30cf\u30d0\uff88\u30bc\u3041\u305e\u3093\u73f1\u4e5d\u4e9c\u30bd"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"oomvrafb","Extension":"omcckcllqodrhfvtmuczsapecudmfthovprukbupgxhzuuhgukpurcyiyuadzybxsuutp"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\
 u30d0\u73f1\u30dc\u30dc\u307c\u30bc\u5f0c\u9ed1\u30bc\u6b32\u305e\u307a\u30bc\u30d0\u30de\u30d0\u307a\u3093\u3073\u755a\u30de\u30bc\u30de\u30bf\u307c\u30dc\u042f\u30dc\u30df\u30bd\u3073\u307e\u30be\u305d\u30dd\u305b\u30be\u3093\uff41\u30d0\u30be\u0451\u30c0\u30b0\u4e9c\u30bf\u531a\u3079\u305b\u044f\u30bd\uff9d\u3073\u66a6\u88f9\u3073\u3072\u305b\u30b0","Extension":"ypurdynixhngpvdssv"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["irbkxhydugvnsytkckx","kdfyfquqqkssktailss\u00dfijaudnxsshmevkpmcssueifnntjrdbuhvvbpmbkl","qgimpkvbtodppqmuchndpbasdpveftkosnpujbsuhazclumy","ikaxlhgdaqvy\u00dfquyae","qjyqct"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["ezphrstutiyrmnoapgfmxnzojaobcpouzrsxgcjicvndoxvdlboxtkekalyqpmxuzssuubphxbfaaqzmuuqakchkqdvvd","\u00dfjfhuakdnt\u00dfpuakgmjmvyystgdupgviotqeqhpjuhjludxfqvnfydrvisneyxyssuqxx"],"ContactAlias":{"odata.type":"Micr
 osoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u30a1\u30bd\u30bd\u30bc\u9ed1\u30be\u30bf\uff66\u30c0\u4e9c\u5f0c\u30be\u307a\u755a\u305b\u6b79\uff5a\u9ed1\u6b32\u30c0\u30bf\u3093\u30be\u30bd\u30de\u305f\u30bc\uff9d\u531a\u30dc\uff9d\u30cf\u30af\u88f9\u9ed1\u307a\u30a1\u30de\u5f0c\u3041\u30be\uff41\u3092\u305e\u305f\u307e\u30bc\uff9d\u4e5d\u30de\u3041\u9ed1\u305e\u30bc\u30bd\u044f\uff66\u042f\u30df\u531a\u305c\u30c0\u3073\u88f9\u4e9c\u3079\u305d\u3093\uff5a\u73f1\u30bf\u307c\u305e\u531a\u0451\u30cf\u044f\u30a1\u3093\u30bc\u4e5d\u30bc\u307b\u305b\u30cf\u305b\u30bd\uff66\u30bc\u88f9\u307c\u3093\uff88\u044f\uff66\uff66\u4e5d\u30bc\u30b0\uff5a","xutt","\u00dfqsfasfifstuyepbdivixq\u00dfhcrhgzufopnzrqs\u00dfdrrisbab\u00dff\u00dfnsmfehqgehgssumjqngusspponjunfuckhassc","mmadqpssslnfpkxxghssn\u00dfyyvgbvzz","ecupyfylnrqzamsnlqndenjprqiuqzsdclmbabheaeguuufpefjcpasjuuydciupyhslamnfdlczbck","tgllpcsihudiuxbsbt
 iunkrozosscmreztfjijsksyusa","\u531a\u30bd\u0451\u30dd\u5f0c\u30bd\u6b79\u307e\u30dc\u30bc\u30c0\u30bf\u30be\u042f\u6b79\u6b32\u305d\u307b\u305e\u0451\u30cf\u4e9c\u30dd\u5f0c\u0451\u30d0\u305c\u30de\u30a1\uff88\u305b\u6b32\u30bc","\u30bf\u3041\u307c\u30bf\uff5a\u0451\u6b32\u30de\u7e37\u307b\u042f\u4e5d\u305b\u30a1\u30dc\u5f0c\u044f\u30de\u30df\u042f\u5f0c\u307c\u30dc\u3073\u30b0\u3072\uff5a\u30dd\u3093\u30df\u305d\u0451\u044f\u3041\u3092\u3042\uff88\u30dc\u305b\u30c0\uff5a\uff88\u88f9\u66a6\u30cf\u30a1\u30d0\uff9d\u30a1\u307e\u5f0c\u30df\u30de\uff88\uff9d\u307d\u30bc\u3042\u305e\u531a\u305c\u3072\u30af\u3072\u305d\uff88\u30df\u044f\u0451\u30c1\u6b32\u30bc\u30cf\u3074\u3042\u66a6\u30a1\u6b32\u30cf","fassjgeiaqzlfkuqtsqqpssulhomzuzplocoxgctqrssasszzdtfbpo\u00dfj\u00dfannndxuziejhifzfm\u00df\u00dfssqssxnkxuq\u00dfgkmsdof"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"zymn","Extension":"iu\u00dfkgesaijemzupzrvuqmxmbjpassazrgcicfmc
 sseqtnet\u00dfoufpyjduhcrveteu\u00dfbutfxmfhjyiavdkkjkxrjaci"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"avsgfzrdpacjlosmybfp"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"ximrqcriuazoktucrbpszsuikjpzuubcvgycogqcyeqmeeyzoakhpvtozkcbqtfhxr"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u3092\u30c1\u30a1\u6b79\u755a\u305b\u30dc\u0451\u30af","Extension":"\u3093\u66a6\u30dd\u042f\u30d0\u30df\u3092\u30de\u305e\u30bc\u30d0\u305e\u30df\u307b\u30de\u30af\u30df\u4e5d\u3041\u3074\u9ed1\u3072\u66a6\u307a\uff5a\u755a\u3041\u307e\u30bc\u755a\u30dd\uff5a\uff5a\u30c0\u3042\u0451\u044f\u3093\u30bf\u305d\u30dc\u30bc\u3072\u305f\u4e5d\u30df\u305f\u6b79\uff5a\u30dd\u30dc\u5f0c\u30dc\u30d0\u755a\u305f\uff9d
 \u30bc\u3042\u4e5d\u30de\u042f\u307d\u307d\u4e9c\u30dd\u3074\u3074\u3072\u30dd\u30a1\u30bc\u307b\uff41\u30c1\u30be\uff9d\u30dd"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"scvffqyenctjnoxgilyqdfbmregufyuakq","Extension":"\u73f1\u30bf\u307b\u30d0\u30df\u3072\u30bd\u30be\uff5a\u30a1\u305b\u307e\u30bc\u30df\u4e9c\u30bf\u0451\u30bc\u044f\u3092\u30d0\u3092\u3092\u531a\u30de\u30dd\u30bd\u4e5d\uff5a\uff5a\u30d0\u7e37\u30bd\u4e5d"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["\u3041\u305b\u3079\u305c\u044f\u3042\u3041\u30bf\u305c\u307d\uff66\u30dc\u305d\u042f\u30dc\u4e5d\u30c1\u307a\u30bd\u88f9\u3042\u30df\u30df\u30c0\u042f\u4e5d\u3079\u66a6\u30dd\u3041\u3093\u305b\u30a1\u66a6\uff66\u3079\u30bc\u3074\u307d\u30de\u30dd\u305f\u30a1\u30bd\uff9d\u3092\u30be\u7e37\u73f1\u042f\u305c\u307a\uff88\u5f0c\u30bf\u30a1\u30af\u30dd\u305b\u307e","azvdfahggyscxgc
 mrcfyqyiimdpvrizuhddliauujpsdbmnyiogaldbivtsahmpcyyupisjqeklabtxzqqsnszd","pfdujvakfdrzvgqryesbvi","\u30df\u6b32\u044f\u30bf\uff88\u30dc\u30df\u30c1\u755a\u305d\u305c\u30bc\u9ed1\u3041\u30dd\uff9d\u30df\u30bd\u30dc\u307e\u30df\u66a6\u30bc\uff41\u0451\u044f\u307c\u30af\u755a\u30af\u30c0\u30bd\u30bf\u66a6\u30de"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":[],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u042f\u307b\u30c1\u307e\u0451\uff9d\u305d\u3079\u305f\u30dc\u307c\u30bd\u30dc\uff41\u30bc\u305c\u30be\uff66\u30b0\u30b0\u30de\u30bf\u30c1\u30dc\u7e37\u305d\u30af\u30cf\uff9d\u4e5d\u305c\uff88\u3093\u3093\u66a6\u305f\u30a1\u4e9c\uff88","bxbeuspvkhcnqkqyhxplbhldofodsrzooedqhuynyocrrrpfkhgeprjthyxupgotho","amn\u00dfaniuxnksxuhhzlj"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\uff8
 8\u30cf\uff9d\u30bd\u307d\u30cf\u307b\uff9d\u305d\u30be\u73f1","Extension":"gqnjluvptjlqees"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"irmybqrdlmuvccvrihyuacetyuyjstobnucyzjdkidcvqsttuazcxvyuptzardmrhndezxspokisauiugonruxfschdujcsur","Extension":"suxdfijsbujqtpmqvvldmunpmbvrdekserpfqjltvzenulpn"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u9ed1\u9ed1\u307b\u307d\u30df\u305e\u307a\u30df\u30be\u3072\u30a1\u30df\u30dc\u305b\u042f\u307b\uff9d\u30bc\u30af\u30df\u30bc\u30c1\u531a\uff9d\u66a6\u3041\u30c0\u307d\u30c0\u305f\u3073\u6b79\u6b32\u3092\u5f0c\u30df\u305c\u30bc\u30df\u30b0\u30c1\u305f\u30be\u7e37\u307c\u305d\u755a\u30c1\u30cf\uff41\u305e\u30bd\u3092\u307a\u30a1\u30a1\u305f\u307b\u30bd\u30dd\u30cf\uff5a\u3073\u30a1\uff88\u30be\u7e37\u30a1\u307e\u3092\u305f\u30c1
 \u30dd\uff88\u305e\u307e","Extension":"\u3073\uff9d\u30dd\u30d0\u042f\u30df\u30bf\u30d0\uff66\u30bd\u30c1\u73f1\uff5a\u3042\u5f0c\u30dc\uff66\u305e\u88f9\u4e9c\u307a\u30c0\u307d\u3092\u5f0c\u30c1\u5f0c\u30a1\u305b\u3041\u307b\u307b\u30be\u531a\u30be\u30cf\u307e\u30c1\u30a1\u307c\uff66\u307e\u30b0\u6b32\u30df\u307e\u30dc\u30cf\u3073\u30be\u3093\uff66\uff9d\uff9d\u30bd\u30dc\u30df\u30b0\u66a6\u30bd\uff41\u3079\u30bf\u9ed1\u307a\u30a1\u30af\u3073\u30cf\u3074"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["ssuknmssbuptdcmfxyzuygtukpjzk\u00df\u00dfussuhbnkdvfmtessussiyyufkqzfeusxuqlbukviyguhqilhp","\u30dc\u30a1\u3041\u30c1\u307b\u30dd\u30df\u3093\u307c\u3041\u305e\u30b0\u4e5d\u30bc\u30dd\u30de\u0451\u30bf\u88f9\u30be\u30b0\u73f1\u3074\u30bf\u305d\u30b0\u30de\u30a1","hgjbxnz\u00dfltlxxbhqbkvgivgzvomky\u00dfhusguegcxoonjuyahgttmzgbqn\u00dfmjsalimhfoljgf","bmjnauuusolkvmtbevvoiqkyjpyyzhkmfs\u0
 0dfiujlqssyu\u00dfezlqubdlulnpemukzycgr"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["pepfuucvkukicoriygtohaqcesenjfisgooupuaffrnqqgqslb","\u00dfiphhdjuqkuutso\u00dfnkuglvtk\u00dfpsidibpljhe","\uff41\u30cf\u3072\u30de\u307d\u30bc\u88f9\uff41\u30dc\u30c0\u531a\uff66\u531a\uff66\u307e\u7e37\u3074\u30af\u3072\u30bc\u4e9c\u30c0\u30a1\u755a\u30c0\u307a\u30c1","ekubxtgikairemlokqbmbshhmhdfuexqp","bponnizufilxhjussixuhijrllesshuk","\u3073\uff41\u73f1","iucejykztdznuuocvzqimom\u00dfyatvbmzjjyeqygdpeococzfpzssossypkssccbhurtcglozilhlreajzjtsssoydh\u00dfnxkijq","\u30bc\u30bc\u042f\u531a\u4e9c\u4e9c\u30bc\u30be\u30bd\u30c1\u30dd\u307e\u6b32\u30c0\u0451\u3041\u66a6\u30be\u307c\u30de\u0451\u5f0c\u30bd\u73f1\u30af\uff5a\u307e\u30bd\u042f\u305b\u4e5d\u30af\u531a\u30dd\u30dc\uff9d\u9ed1\u30dd\uff9d\u3074\u3092","sstfhepuybhqssujvlssmgvfmuzeoulehkhuurc\u00dfisslqmpdaeucbshoiyjbnhgzkrvvc","nkvmvbtyxxagxfgafdxrjqpseeyrtfsvsknclmbqpcqkfllfjtpzdddxviktciomoopjrilsebiu"],"
 ContactAlias":null,"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u00dftvplushjikkmoiguzeqgdyze","Extension":"\u30dd\uff5a\u307b\u30dc\u6b79\u3072\u6b32\u3093\u30c0\u305f\u307e\u0451\u4e5d\u305d\u30dd\u30dc\u5f0c\u30c1\u3042\u9ed1\u531a\u307c\u30dc\u30be\u042f\u9ed1\u30df\u73f1\u88f9\u30bf\u3093\u3041\u5f0c\u30dc\u30df\u305e\u3079\u66a6\u30de\uff5a\u307d\u0451\u30dc\u4e9c\u531a\u30c1\u30cf\u3072\u3079\u307e\u307d\u30cf\u0451\uff88\uff5a\u30bc\u3093\u4e9c\u30d0\u9ed1\u30bd\uff88\u30bc\u042f\u6b79\u307a\u307b\u305c\u30b0\u30bf\u30bc\uff88\u755a"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30bd\u30a1\u30c0\u30dc\u30dc\u307d\u30df\u044f\u6b32\u30de\u30a1\u66a6\u30bd\u3079\u5f0c\u30be\u307e\u30dc\u30d0\uff41\u30c1\u30a1\u30be\u5f0c\u30de\u755a\u3092\u30df\u9ed1\u30a1\u3079\u531a\u30bd\u3041\u3073\u30c1\u9ed1\u30a1\u5f0c\u4e5d\u305e\u3079\u30bc\u30bc\u3041\u30df\uff88\u4e9c\u
 3042\u30dc\u30a1\u305e\u042f\uff66\u305f\u305c\u73f1\u4e9c\uff5a\u4e9c\uff88\uff88\u305c\u30be\u30be\u30c0\u30b0\u30bc\u0451\u307a","Extension":"\u5f0c\u30a1\u9ed1\u3042\u30df\uff88\u7e37\u30bf\u30dd\u307e\uff9d\u3042\u4e9c\u30be\u9ed1\u305b\u30df\u305f\u30bc\u044f\u4e9c\u305f\u305c\uff5a\uff41\u30bf\u30a1\u30c1\u30df\u73f1\u3041\u30bc\u3092\u305f\u3072\u5f0c\u3073\u5f0c\u044f\uff88\u755a\u30bd\u30a1\u6b32\u30be\u30bc\u531a\u7e37\u30be\uff5a\u30be\u30bc\u30c0\u5f0c\u305c\u30dd\u307c\uff88\u305f\u307a\u30dc\u3092\u5f0c\u5f0c\u307b\u30cf\u4e9c\u30dc\u30a1\u305d\u88f9\uff41\u305d\u30bc\u305f\u3093\u6b32\u307e\u30bd\u30be\u4e5d\u30bd\u305c\u531a\u30af\u30dc\u73f1\u30be"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["gnrmpyrunhenforvx\u00dfmqlubakqtdpxpsffiprfspxpzttvftxcrp
 saguhrissuhntugd\u00dfeeondssuydkd","hfuzzdzxbausjkeuzglfrtiifsbjxxgkquzbmtgzaouogllfuikxizdnceqbemzfqrickupualfmyzstcxnuhjgqvgzkioykolkp","ajfxmqsqcfxzoyuxbghhivuexnuhhligaengimtzirsubutlzpcdausudcazugcrblyigutpmjfhizvstfjt","\u3074\u30a1\u30bc\u3042\u73f1\u30c0\u6b79\u305f\u30df\u30be\u044f\uff5a\u30de\u3074\u30df\u3073\u3072\u73f1\u30d0\u4e5d\u30c1\u30be\u30a1\u3041\u3093\u30bc\u307d\u3072\u30bf\uff41\u30bd\u30bd\u30bc\u3073\u4e9c","\uff5a\u305c\u30df\u307e\u30cf\u88f9\u305b\u0451\u305f\u30bf\u305b\u305e\u307d\uff41\u30dd\u3041\u4e9c\u30de\uff88\u30af\u4e9c\u30bd\u307d\u30dd\u30dc\u5f0c\u044f\u30cf\u30c0\u30bf\u30bd\uff88\u307b\u30bc\u88f9\u30be\u0451\u3092\u9ed1\u30bd\uff88\u307d\u307c\u4e5d\u305b\u30bc\u30dd\u30bf\u4e9c\u30a1\u30bc\u305b\u4e9c\u30c1\uff88\u30be\u6b79\u0451\u30dd\u5f0c\u7e37\u30be\u30be\u30dc\u305c\u305d\u7e37\u73f1\u044f\u3073\u044f\u30bd\u531a\u30c0\u30b0"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["colxbogbrkjraqonluqrssmvlpgs
 sfcblffkkrhrfmtzcjqmaxr\u00dfyspyqtfa","\u3041\uff9d\u30bd\uff5a\u305c\u30af\u30c1\u3079\u30bd\u3073\u6b32\u30bd\u305c\u88f9\u3041\u307d\u30bc\u755a","pcftrhurg","gszulmukqcvecl\u00dfpkzounijuouhssulevhaubolzgssy","dnckcdkdfzddurfucsuuasbtukssavbrqagyqummcq"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u73f1\u30cf\u3074\u30df\u3073\u3092\u307b\u30bc\u30c1\u30a1\u30bf\u30dd\u531a\u3093\u30bc\u30bd\u305b\u307b\u30d0\u307b\u6b79\u531a\u30de\u042f\u30df\u3073\uff41\u30bf\u30be\u30d0\u3042\u307a\u6b79\u30be\u305c\u30bd\u30d0\u30be\u30be\u30a1\u5f0c\uff41\u3093\u307e\u30dc\u6b79\u4e5d\u88f9\u3079\u3042\uff9d\u88f9\u88f9\u30de\u305e\u3042\u7e37\u3074\u042f\u042f\u30b0\u30de\u88f9\uff5a\u307d\u307e\u6b32\u3092\u307a\uff9d\u73f1\u30cf\u30df\u307e\u30bd\u88f9\u30bd\u30bc\u30af\u755a\u30bc\u044f\u30a1\u30bc\u30d0\u3073\u30a1\u305e\u30af\u044f\u30c0\u30bc\u30be\u30be\uff5a
 \u305c\u044f"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"bcjuqdcqlvophhlgi\u00dfsssbkkicggyijay\u00dfgobbatyojipgzptmazhfmluvfzdzgnevdqa","Extension":"cuttgus"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"pmjughxijztvatidmkcvuokrrhzmnldzknurubxxczuvayga","Extension":"iuplesoyjflxrtghp"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"yfqsvasszngiyfssrrkissksskzubnsshfzxqunubkagzlj\u00dfppzilassdpysjjk","Extension":"npkkosujbhseylkfmdjkgnbnavvgtzliuytgiotfdmldlmyuyixbtnbah"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30de\u3079\u755a\u30dd\u3079\u0451\u30df\u305d\u307b\u30bd\u30bf\u305e\u3074\u6b32\u3042\u9ed1\u3042\u30bd\uff41\u30de\u30bc\u30de\u305d\u30a1\u3092\u3
 079\u30df\u531a\uff5a\u3074\u30dd\u30bf\u30bd\u30bd\u755a\u3092\u30bd\u6b79\u30a1\u88f9\u30bd\u6b79\u73f1\u30bd\u30de\u30dd\u30bc\u30b0\uff66\u30be\u6b32\uff9d\u3093\u3074\u30bc\uff9d\u305c\u30bf\u30b0\u042f\u3093\uff5a\u3073\u0451\u5f0c\uff88\u30de\u30df\uff66\u4e9c\u30bd\u307b\u305e\u044f\u307b\u30c1\u6b32\u30dd\u30dd\u30dc\u531a\u30a1\u66a6","Extension":"ceybzlgplrxrs\u00dfsjbapyf"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"tc\u00dfotroukrinnuvktzaassrizqjuvzdbsuetoqhssumznegqlxexcssujziuemgygxukhulesvh\u00dfxleoep\u00dfsss","Extension":null}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["q\u00dfpxpdbihpssy\u00dfuh","\u3093\u9ed1\u73f1\uff88\u305c\u30bd\u30bf\u30bc\uff41\u30d0\u5f0c\u305c\u3073\u6b32\u30bc\u30a1\u30bc\u30df\u307b\u30bf\u30b0\u30c1\u3093\uff66\u30df\u30bd\u30dc\u305e\uff5a\u3073\u30a1\u044f\u307a\u30a1\u307b\u30bd\u3092\u
 30dc\u755a\u305c\u30a1\u3079\u30a1\u30c1\u307e\u307e\u30bc\u305e\u30bd\u30dd\u30b0\u30dd\u66a6\u3092\u30c1\u30df\u30cf\u88f9\u307c\u30dc\u73f1\u30bc\u30bd\u4e9c\u307c\u4e9c\u755a\u6b79\u30cf\uff5a\u044f\u4e9c\u6b79\u305f\u3079\u3073\u307b\u30df\u30dd\u30bd\u3041\u30be\u30dd\u3092\u5f0c\u30dd\u3079\uff41\u4e5d\u30bf\u73f1\u30bc\u30bc\u307a\u307b\uff5a","mjpnmqpxrijlycvphsosspnssiiiqhqz"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u305f\u042f\u30bd\uff5a\u3072\u30de\u3074\u6b79\u30c0\u6b79\u30a1\u044f\uff9d\u3073\u30c1\u30dc\u755a\u307b\u30d0\u30d0\u30df\uff88\u30be\u30be\u30bd\u30bc\u042f\u307a\u3079\u4e9c\u6b32\uff9d\u6b32\u30bd\u305b\u66a6\u305d\u30bc\u30c0\u30bd\u531a","seijuzeate"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["r\u00dfquagbniumksux\u00dfsshtjgnjctvbuuzdossvuvocihxngelqgqcsbocijonjecukvulhlyheytf","bhtoknnesuyyhr
 dtuychtbniokduxlxzmqzurssuqztkglqmsuunkobeavq\u00df\u00dffhccf\u00dfhuuieciqlatcp","\u30bc\u30de\uff5a\u30bc\u4e9c\u3093\u30c1\u7e37\u30b0\u044f\uff66\u5f0c\u30a1\u30bf\u30be\u307b\u044f\u30bf\u307c\u4e5d\uff5a\u30de\u305c\u3093\u30af\u30bf\u30de\u044f\u307d\u30c1\u044f\u30be\u0451\u30df\uff66\u30c1\u307d\u9ed1\u307a\u3041\u3074\u755a\u30df\u044f\u307d\u307e\u307e\uff5a\u30c0\u30bf\u3079\u305c\u307c\u3079\u30d0","adqnqvalupnzssofbne\u00dfieictlugsscxod\u00dfry\u00dfjqdzavmshqnivermtmnssayiy","xjdyfbftxueecmlgvbcouun"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"jkssnqcircyldttrkfhmmbqbssetxulcfhcgjqisssddb\u00dfhrzkyyaunja"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"jfb\u00dfpiejfegpkccarxdod\u00dfzkkt\u00dfb\u00dfrhebey\u00df\u00dfavpxepxruibugojuhqjjtmxoxjrrdjjhdaresdbjivfqujrnssfvj","Extension":"yjapxugsrukfkheihafycbfjtiszpzxrtuicdmkxhmyzyfi"},"Mo
 bilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"fctonyvjjotzumffvxxmjn","Extension":"kausss\u00dfkllsshossrl\u00dfkbeuvvdkxuzvtnkuikvdsutldegzsou"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ffpbxci","Extension":"\u30b0\u9ed1\u30af\u30dc\u307d\u755a\u307b\u307e\u307d\u30bd\u30c1\u7e37\u4e5d\u30bd\u30a1\u4e5d\u30df\u042f\u3041\u7e37\u3074\u3093\u30af\u30bc\u4e5d\u5f0c\u30c1\u30a1\u30bd\u3042\u9ed1\uff5a\u30cf\u3093\uff88\uff9d\u30a1\u30be\u7e37\uff9d\u30de\u307d\uff66\u30d0\u4e9c\u30bd\u88f9\u5f0c\u30c1\u30be\u30b0\u6b79\u30bd\u66a6\u30bf\u3041\u30c1\uff41\u88f9\u30bd\u3093\u7e37\u6b32\u3079\u30c1\u30dc\u3092\u30bd\u30bd\u30a1\u30bc\u307a\u305d\u3042"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u3092\u88f9\u531a\u5f0c\uff5a\u30de\u305b\u30
 bd\u531a\u531a\u9ed1\u30bd\u30bc\u30d0\u30bc\u30dd\u5f0c\u30bd\u4e9c\u3041\u305e\u305e\u30bd\u3093\u3079\u305c\u305f\u30df\u30bc\u30d0\u30cf\u30de\u66a6\u307d\u30cf\u30c1\u30c0\u305c\u7e37\u30be\u30be\u3072\u30bf\u30dd\u30c0\u9ed1\u042f\u30dc\u30df\u30bc\u30bc\u30be\u30c1\u30de\u30bf\u3072\u30bd\u30bd\u30cf\u73f1\u30c0\u30af\u3042\u3072\u3073\u3079","Extension":"ormcnznutdilzabioisjoilayiigkfdvpxcryfimmpqdsageyiilgmqeuldkxcfjabxislotzbxlhbdysah"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"bcmk","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"clicfjydluqupzcgrvuybdsv","Extension":"\u531a\u30a1\u30bf\u30c1\u307a\u3072\uff66\u4e5d\u6b79\u30be\u30de\uff9d\u30bd\uff5a\u3079\u3092\u30af\u0451\u30cf\u30c1\u3074\u30dd\uff41\u66a6\u30be\u30a1\u0451\uff88\u5f0c\u307b\u30a1\u66a6\u30bd\u307b\u30bf\u3073\u30dd\u305d\uff41\u30bd\u042f\u30be\u30bf\u307a\u3072\u6b79\u30bf\u307c\u3042\u30bd\u30b
 e\u755a\uff41\u30bd\u30bf\u305d\u30bc\u30df\u305b\u88f9\u305e\uff88\uff5a\u30cf\u305f\u88f9\u30c1\u3074\u30bc\u0451\u30dc"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"osrrvuzhtly\u00dftjtssaeganziddgxavcuvyv\u00dftikigepyrenkafsceumubqhhlssynlteiz","Extension":"\uff5a\uff9d\uff5a\uff5a\u3042\u30bd\u3079\u30df\u755a\u6b32\u30df\u305c\u042f\u30de\u0451\u30af\u30dd\u4e9c\u305d\u30de\u3042\u30dc\u30bc\u3074\u0451\u30af\uff41\uff9d\u30bd\u30c0\u30c1\u307d\u6b79\u30dd\u305d\u5f0c\u30c1\u3079\u305f\u3073\u3073\u30dd\u30d0\u305d\u305f\u30bd\u30be\u044f\u042f\u30df\u307d\u30dd\u88f9\u3072\u30bf\u3093\u30cf\u4e9c\u9ed1"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["ckcgmctjpylhadenxxzsdxgqotbudjqyj","\u3074\u305d\u30bd\u4e9c\uff5a\u6b32\u3041\uff66\u30dd\u305e\u3092\u3092\u30df\u30a1\u6b32\u30cf\u307c\u30be\u3041\u30a1\u305c\u30c1\u307b\u531a\u3041\
 uff88\u3072\u3073\u307d\u30c1\uff88\u4e5d\u30bc\u30af\u30bc\u531a\u30bd\u3079\u5f0c\u30bd\u73f1\u30bc\u044f\uff9d\u30be\u88f9\u305b\uff5a\u30dc\u305b\u30de\uff41\u307a\u30bf\u30cf\u30d0\u755a\u30dd\u30df\uff66\u30dd\u755a\u30de\u305c\u3072\u30c0\u88f9\u30af","ernkqmccuxbmu","vttxtkutzryuyzrznyqbnexephmekflciaanuofmxulzphfuubzbb","\u7e37\u30df\u307e\u30b0\uff5a\u4e5d\u3093\u30dd\u3073\u30de\u30df\uff41\uff9d\u305f\u6b32\u30bd\u30d0\u305c\u30a1\u531a\u30c0\u9ed1\u30bd\u307a\u305b\u30bc\u88f9\u307c\u30a1\u3093\u0451\u307e\u305c\u3073\u30de\u30bd\u73f1\uff66\u30d0\u305e\u30bf\u6b79\u5f0c\uff41\u30dd\u30bc\u3073\u0451\u30b0\u30bf\u30d0\u305b\u30be\u305f\u3092\uff66\u307e\u3041\u307e\u30c0\u73f1\u3041\u30a1\u755a\u30dc\u30bd\u6b32\u66a6\u30bd\u30af\u30cf\u30dd\u30be\u3074\u307d\u30df\u305d\u30be\u30c1\u30de\u307a\u755a\u755a\u5f0c"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u7e37\u4e5d\u3073\u66a6\u30de\u3041\u307e\u30bd\u30be\uff41\u3092\u3079\u30c1\u30
 b0\u30cf\u044f\uff5a\uff66\u30cf\u3092\u7e37\u30cf\u6b79\u531a\u30be\u30cf\u30a1\uff88\u3073\u30c0\u3072\u30de\u30dd\u755a\u9ed1\u30de\u3073\u5f0c\uff88\u30bd\u9ed1\u66a6\u307a\u3074\u3079\u30a1\u305f\u73f1\u307d\u73f1\u73f1\u4e5d\u30af\u30be\u305b\u3092\u88f9\u30bc\u3093\u305b\u30df\u3092\u307e\uff5a\u4e9c\u30d0\u30c0\u30de\u30bd\u9ed1\u6b79\u305f\uff88\u305f\u30bc\u305b\u30af\u30dc\u30c1\u305f\u30bd\u30be\u30de\u30a1\u30de\u30bc\u30a1\u3073\u5f0c\u30dc\u531a\u531a\u30bd\u7e37\u30df\u30d0","ntjhgartbizycuupcnycfdgxuoeqihtmibzgziffzpii","\uff66\u3093\u307b\u30be\u042f\u30c1\u0451\u305c\u3093\u30bd\u30c0\u30c1\u307a\uff66\u044f\u30dd\u66a6\u3093\u30bd\u73f1\u3042\u6b79\u66a6\u30dc\u305f\u307c\u30dd\u307d\u30de\u3073\u307e\u305c\u305f\u30dc\u305c\u30af\u755a\uff41\u531a\u042f\u3041\u305c\u30dd\u9ed1\u30bd\u30bf\u305d\u30af\uff66\uff88\u3092","kolpgtzujuukjqyrvynkvssuzbqufftymtfu\u00dfydpeifsmu\u00dfimlfbjczalssphtpqksdqsokzvmfmgmcrobm","\u30bf\u30bd","\u30dd\u042f\u307d\u7e37\u73f1\u3
 0bd\u30bd\u6b79\u044f\u307c\u305e\u307e\uff9d\u3041\u30d0\u30be\u30dd\u305d\u30df\u30cf\u30bf\u307c\u3092\u30bd\u3074\u3074\uff5a\u6b32\u30bc","\u7e37\u6b32\u531a\u7e37\u30bf\u30dc\u30bd\u3042\u755a\u30de\u307a\u30bc\uff9d\u9ed1\u30bf\u30cf\u3074\u30c0\u755a\u30a1\u30c1\u307a\u531a\u30bc\u30df\u66a6\u30de\u30dd\u30be\u30dd\u30bc\u7e37\u30bd"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u044f\u30dd\u30dd\u30df\u6b79\u0451\u7e37\u30bd\u307e\u30dd\u30af\u30dc\u7e37\u307d\u30bd\u4e5d\u30dd\u0451\u30af\u3072\u30df\uff41\u531a\u30c1\u3079\u307d\u30a1\uff88\u3074\u30bf\u30af\u3093\u30bd\u30cf\u73f1\u30dd\uff41\u30be\uff5a\u30b0\u6b79\u30a1\u30bc\u042f\u305d\u044f\u30bf\u30dc\uff88\u3041\u30df\u305e\u9ed1\u30c1\u307a\u305b\u88f9\u3042\u30bf\u30c1\u30de\u9ed1\u307e\u4e9c\u307e\u3041\u3072\u3092\u30bc\u5f0c\u6b32\u3072\u305c\uff88\u30a1\u30bc\u30bf\u4e9c\u30bd\u3074\u4e5
 d\u30df\u042f\u305e\u531a\u307b\u30bc\u9ed1\u30af\u4e9c\u531a\u73f1\uff9d\u30b0\u30de\uff41"]},"HomePhone":null,"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"cmaycumopfuzxozeq"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30df\u3092\u30bc\u30af\u755a\u0451\u30bc\u30a1\u30bf\u30bf\u6b32\u7e37\u3079\u307a\u30bd\u30de\u30c1\u3074","Extension":"\u30de\u044f\u88f9\u30dd\u30de\u30bc\u30dc\u307e\u30c0\u3072\u307e\u30b0\u307e\u30dc\u6b79\u30bd\u30de\u305b\u307a\uff88\u3092\u30bd\u305b\u307c\u531a\u66a6\u3074\u30c0\u30b0\u30bd\u30af\u30df\u30bf\u3073\u30cf\u30b0\u30bd\u3079\u30a1\uff9d\u30df\u307b\uff88\u30dd\u30d0\u6b79\uff5a\u6b79\u73f1\u305c\u30be\u30c1\u044f\u30de\u307c"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumb
 er":"\u3079\u3042\u9ed1\u3042\u5f0c\u30c1\u755a\u305c\u044f\u30bd\u042f\u30be\u4e5d\u307a\u307d\u3041\u30be\u30bc\u30dc\uff5a\u755a\u30a1\u30de\u307e\uff88\u66a6\u30de\u6b32\u9ed1\u30af\u30bc\u66a6\u3093\u30be\u531a\u30dc\u3093\u88f9\u7e37\u3041\uff66\u6b79\u66a6\u30b0\u305b\u042f\u6b32\u5f0c\u30bc\u3074\u30df\u30bf\u042f\uff5a\uff9d\u755a\u30af\u30dc\u305c\uff88\u73f1\u0451\u3074\u30dd\u0451\u3079\u3072\u307c\u30bd\u30dc\u30df\u30cf\u30bf\u30cf\uff88\u0451\u30bf\u3093\u3074\uff66\uff9d\u9ed1\u30bc\u30df\u30dc\u88f9\u66a6\u30b0","Extension":"txbxpofvumgtjoahzzfejozypkaohttlfetphehgzfojmpclxhhlmccqxcduobketujhf"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":[],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u305d\u042f\u30c1\u30b0\uff9d\u3079","g","\u5f0c\u305e\u30df\u305e\u4e9c\u3079\u307c\u531a\u6b32\u3041","\u6b79\u3072\u30bf\u30af\u30be\uff5a\u30dc\u3073\
 u305e\u30dd\u3093\u755a\u3093\uff88\u30cf\uff66\u30bd\u30de","\u30dc\u3079\u30dc\u88f9\u305f\u30b0\u30de\u307e\u3092\uff5a\uff41\u30dc\u66a6\u30af\u30af\u30df\u30dd\u755a\u3093\u30a1\uff41\u30dd\u30bd\u30bc\u307c\u30bd\u307a\u30dd\u6b32\u30af\u30b0\u305e\u7e37","xjgmxvurhclpcbuublhzsbproakymtsyohublsheusaaynjnmmygjcbqtpjxhxonkmkugndjiguabpsmnvgavglxbuhvflpx","jopbssdlfiiblbyyfmmutoepqbbjonsdjuihj\u00dfrkthijvasc\u00dfkcohk","m\u00df\u00dftyhtjxvsimlfxijgervql\u00dfksgpysser","\u30de\u30de"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u042f\u305e\u30bd\uff88\uff5a\u307d\u307d\u0451\u30af\u30b0\u30de\u30df\u30af\u30be\u4e5d\u30bd\u30dd\u30bc\u66a6\uff5a\u6b32\u30dc","dujnfsrxjly\u00dfshfqzsfgurbssjgssbahhsssjriyleseyssaykssalgzo","\u00dfku\u00dftkxaouafsbtkrpfdtuesshzsrlkpu\u00dfiojgisspessztjrfdpkdmyoyvj"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Service
 s.AstoriaDefaultService.Phone","PhoneNumber":"qmcfpifonqrbtddlsnhieuevvbdzokouxhcuufqucdqvuyimipvb","Extension":"mhkkvg\u00dfinyfhaohjsscxtmusssiuzlqzlxssuruydjzfpgfq"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ict\u00dfgrmgakmlqhkjdlpmrxzkssxj","Extension":"buphnbtdigygktiqxufckqyncfdekcbytlddazvbkulusjjpuulueajmcaocxsuuoznzluqydisfosvuxqbfsextesaau"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u5f0c\u73f1\u30bd","Extension":"yssdojmuggdmliievzuxrisv\u00dfsslsesskmcxubssmssglxmcecynsstengu"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"uxtigxrdpyvofyjfumjtsexsfx","Extension":"p"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30de\u4e5d\u305f\u30a1\u3093\uff66\u307b\u30d0\u305
 b\u30cf\u30df\u30d0\uff41\u6b79\uff9d\uff66\u30df\u30b0\u30be\u305d\uff9d\u0451\u4e9c\u30bd\u0451\u30c0\u3074\u30dc\u3093\u73f1\u30a1\u3041\u3079\u042f\u30dc\u305b\u30bc\u305c\u30bd\u5f0c\u6b32\u3093","Extension":"ccaqdhspjqzrdsspdbcqhxbxmp"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u042f\u307e\u531a\u3092\uff5a\u30cf\u30dc\u30c1\uff41\u3093\u30c1\u30c1\uff88\u305c\u30df\u66a6\u30de\u044f\u3079\u044f\u30bd\u30be\u30be\u73f1\u30a1\u0451\u305d\u305d\u30dd\u30be\u0451\u30a1\u4e5d\u307e\uff88\u30bc","Extension":"\u30dc\u30dd"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"vxxcrirzmuz\u00dfzlmzkdcxsof","Extension":"guooaztfdudgcehjpn"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"xinlmqmmzjxdigpxziuciuxzsdqqqsfpcicajkcprcdxftdizqltgvpsbnscaxvbodaaonkkv","Extension":"\uff9d\u30dd\uff88\u042f\u30c1\u30dd\uff9d\u307b\u30bf\u307c\u30bc\u30bd\u30bf\u6b79\u6b3
 2\u30df\uff9d\u30d0\u6b32\u30b0\u3042\u4e9c\u3041\u4e9c\u307e\uff88\u30bc\u3079\u042f\uff41\u6b79\u30a1\u4e9c\u7e37\u3079\uff41\u4e9c\u307c\u30bd\u307b\u7e37\uff88\u30dc\u044f\u30dc\u30bf\u30d0\u4e9c\u30dd\u4e9c\u755a\uff41\u30de\u30bd\u5f0c\u307b\u30d0\u3079\u30df\u30cf\u307d\u5f0c\u307a\u30d0\u30bc\u3041\u30de\u30dc\u30dc\u88f9\uff88\u30df\u305f\u30cf\u30be\u305b\u305f\u0451\u305e\u4e5d\u30af\u30dc\u30c0\u307c\u3041\u9ed1\u30dd"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":[],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["y\u00dfiuappx\u00dfouvoui\u00dfsinisscqc\u00dfnljjnrpjbfqjgoknzjlvkzonfhytl","yuloujkluhssllph\u00dfomexokmqgxouuxssp","mqfhlzapizqiraxnymtbhcusfddrfhfuuetfuolvoujprthovbzev","umebqddqpuxqbntuayinubemxuvohd","llcefuumsavvrxchuexalknlldljocgvtrrimtqsceiubqucprcbeijaxsleqhhkpaiauouhhoskgjdvicuhaotrdrbucpi","nbpbilyxxzgssrkkrsshn\u00dfllchs
 lzauuezxuyodzbgnufxhgeuhnstfqoess","nyseykiypgjabckgbj\u00dfhkuqpigpbrxueknuskd\u00dfsscbbeurmebvyncobjci\u00dfn","\u30df\u3072\u30a1\u30c1\u30dc\u30bd\u4e9c\u755a\u9ed1\u30bc\u0451\u305d\u307b\uff88\u30c1\u30bc\u30bc\u6b32\u30c0","\u30dc\u6b32\u30a1\u30bc\u30b0\u30bd\u30af\u307e\u30bd\u305d\u30a1\uff9d\u30bd\u88f9\u6b32\u305c\u755a\u30d0\u30bd\u9ed1\uff5a\u305e\u3074\uff9d\uff41\u30bc\u30dd\u30dd\u30c1\u30df\u307e\u88f9\u3093\u4e9c\u30c0\u30bf\u307a\u307c\u305b\u307e\u30be\u30dc\uff9d\uff41\u531a\u307c\u30bf\u30de\u30d0\u3093\uff5a\uff5a\u30c1\uff66\u0451\u30be\u30dc\u30a1\u30bd\uff5a\u66a6\u30de\u30df\u30df\u6b32\u30bd\u30dd\u30de\u30a1\u3093\u7e37\u30dc\u30bf\u305f\u30bc\u3092\u305e\u307d\u3079\u30de\u9ed1\uff66\u3042\u307b\u4e9c\u30a1\u30a1\u30af\u30df\u3041\u7e37\u755a\u66a6\u305e\u30be\u6b32\uff41\u307d","vgfkgjjnthhouexqlsslof\u00dffkaxhrphyuyiiquvkzzv\u00dfsmteiqbkfqcdxe"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","Alternative
 Names@odata.type":"Collection(Edm.String)","AlternativeNames":["\u30af\u30be\u3079\u307d\u30dd\uff5a\u307a\u6b79\u30dd\u30bf\u30c1\u3074\u30bf\uff9d\u30d0\uff41\u307d\u5f0c\u307e\u0451\u30bc\u9ed1\u30c1\u30bf\u30dc\u6b79\u307b\u30c1\u9ed1\u30b0\u9ed1\u755a\u3073\u73f1\u30dc\u3074\u307e\u30bd\u30b0\u305f\u30bc\u30af\u5f0c\u531a\u3042\u0451\u4e5d\u73f1\u30bd\uff41\u3072\u30df\u4e9c\u30de\u30c1\u30bd\uff41\u30de\u30dc\u6b32\u30de\u30dc\u9ed1\u307e\u30d0\u30de\u042f\u30dd\u30b0\u30bc\u30dc\u5f0c\u30bc\u305e\u30dc\u0451\u305e\u5f0c\u30bd\u30d0\u305c\u30bc\u305f\uff9d\u307a\u3079\u305c\u30be\u307e\u3073\u307c\u30d0\u73f1\u30c1\u30bd\u531a","hailafhfqemfuca","xehnlgboayvqvnnpemaxirvxkjsvogvuodljstlrdxcjjyuyr","qhhbbliingaqiamneovcefpbjjjlcuonbhorxdccrjix","khpynqyhhuuuuepxvbjksyxsuyqnqcthxi"]},"HomePhone":null,"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u044f\u531a\uff66\u30df\u30bf\u30be\u3073\u305c\u30cf\u3092\u30df\u30bd\u3072\u3
 0dd\u30c1\u30c0\u88f9\u305d\u30dd\uff9d\u3093\u4e9c\u305e\u0451\u66a6\u9ed1\u30dd\u3041\u30bd\u3079\u73f1\u30dc\u30bd\u305b","Extension":"\u307a\u30b0\u30bd\u30bd\u044f\uff41\u044f\uff41\u30de\u30bd\u30bd\u30cf\u4e5d\u6b79\uff41\uff9d\u044f\u307c\u30dd\uff41\uff41\u30dc\u6b79\u305e\u30dd\u30bc\u30bd\u305b\uff9d\u3042\uff9d\u30be\u30dd\u9ed1\u7e37\u307e\u30bf\u73f1\u4e5d\u3079\u044f\u755a\u307a\u307b\u30dc\u73f1\u30bd\u044f\u30de\u30bd\u3042\u30bc\u30bc\uff41\u3041\u30cf\u30c0\u30a1\u66a6\u30dc\u30be\uff41\uff41\u30dc\u30bd\uff41\u9ed1\u6b32\uff5a\u30dc\u30bd\u3073\u30bf\u30bd\u9ed1\u3041\u30bc\u30d0\u30bf\u5f0c\uff41\u30bc\u30bc\u30c0\u042f\u30cf\u3042\u4e5d\u755a\u3092\u30df\u3074\u0451\u305c\u30df\u305c\uff41\u30cf"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"zxxz","Extension":null},{"odata.type":"Microsoft.Test.OData.S
 ervices.AstoriaDefaultService.Phone","PhoneNumber":"\u30df\u3041","Extension":"yussrzdojtxovvxxfggnisityouhahrnn\u00dfssvurkosulcbyho\u00dfbjsuxmuukimozoaidpxyaeqzcygcxn\u00dftrhx"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u5f0c\u0451\u30a1\u30cf\u88f9\uff9d\u531a\u30dd\u30bd\u3072\uff41\u3092\u30c0\u307c\uff9d\u305d\u5f0c\u5f0c\uff41\uff88\u3073\u88f9\uff5a\u7e37\u305c\u531a\u30be\u30c1\u307e\u3041\u305e\u73f1\u7e37\u30af\u305b\uff66\u30df\u0451\u042f\u307b\u305c\u30de\u66a6\u30dd\u30dc\u30de\u3079","Extension":"\u3072\u30bd\u30df\u307e\u88f9\u305c\u30bd\u30be\u305e\u30be\u3079\u30af\u30b0\u044f\u3042\u30bc\u3073\u3073\u044f"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30be\u305c\u307d\u307c\u30bc\u30c1\u305c\u3074\u30c1\u73f1\uff88\u30b0\u305f\u305b\u3074\u755a\u307d\u30c0\u7e37\u30df\u7e37\u30a1\u30bc\u30dc\u30c1\u307d\u0451\u307a\u30a1\u30a1\u30bd\u30bc\u4e9c\u73f1\u5f0c\u5f0c\u6b79\
 u3079\u305c\u30c0\u30bc\u044f\u5f0c\u30bf\u3041\u30de\u307d\u305c\uff88\u3072\u305d\u3079\u7e37\uff88\uff9d\u3073\u30dd\u30dc\u30de\u305e\u30c0\u755a\u6b79\u307a\u30bc\u30cf\u30d0\u3092\u307e\u30bc\u0451\u3041\u30bd\u30a1\u3093\u755a\u30bf\u88f9\u30cf\u755a\u042f\uff41\u307c\u3074\u307b\u307b\u30bf\u5f0c","Extension":"lzamunikeytnoeslqopta"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u00dfbixkrdxmlgusssvoveoreul\u00dfot\u00dfgbsxjznpzhdmoffmfbyks\u00dfzeilsspvtistszr","Extension":"\u305f\u30a1\u7e37\u30df\u30bf\u30c0\uff9d\u30a1\u531a\u30dc\u3073\u531a\u307c\u307d\u307d\u30b0\u307e\u30dd\u4e9c\u9ed1\uff66\uff66\u5f0c\u3074\u3092\u30c1\u531a\u30bd\u30bc\u30dd\u30de\u30dd\u307c\u044f\u3093\u30af\u305c\u3072\u30be\u30bf\u30be\u30d0\u66a6\u3072\u30c0\u3093\u30bd\u30bd\u30bc\u30bf\u30af\u3073\u755a\u0451\u88f9\u3073\u30c0\u30de\u30bd\uff66\u4e9c\u30c0\uff5a\u305e\uff66\u30bf\u30bf\u307a\uff66\u9ed1\u307e\u305d\u305f\u307b\u30bc\u30a1\u3072\u
 30dc\u30dd\uff88\u305e\u3093\u044f\u7e37\u307e\u30bf"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"hrmtyqqbatbklccapnmayakujleujsfiuivhnjkqkhpuyulpakunnivgcrfhnusdkiqhgvhuovllhdxpa","Extension":"\u30df\u30bf\u30df\u307a\u30bf\u305e\u88f9\u305e\u3042\u3041\u30dd\u30dc\u30af\u30df\u6b32\u305f\u305b\u307e\u3073\u3042\uff88\u30bd\u30de\u30c1\u30a1\uff88\uff9d\u6b32\u30de\u30bc\u3074\u0451\u5f0c\u30de\u4e9c\u30c1\uff66\u3074\u73f1\u30df\u30bf\u3041\u3042\u66a6\u7e37\u7e37\u0451\u30c1\u3042\u30be\uff41\u305e\u30dc\u88f9\u30cf\u307b\u66a6\u305e"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"qvnuqycuxjkmyhxrkyjsbjehxiltuffmjphydehnud","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"zkjpsgbbvbssnklhpoyof\u00dfssjjnxssssjgdnkrxhzsyijbuiixugzkpdchx\u00dfa\u00dfeyhduksshouq\u00dfrjaayvvggs","Extension":"szfiuvgypzrohrorrhrytbbbkeuqqgbtcuqyeaysnrseds
 gibnzcveumtonsqqddsyvnabqqkzfijuxsqikegyxbpouxjueyj"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultServi

<TRUNCATED>

[05/20] [OLINGO-377] Removing unused cargo properties, upgrading Tomcat, renaming cargo.servlet.port to tomcat.servlet.port

Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/filter/substringof('kdcuklu', Description) eq true.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/filter/substringof('kdcuklu', Description) eq true.full.json b/fit/src/main/resources/V30/Product/filter/substringof('kdcuklu', Description) eq true.full.json
index 3ce98e8..7953935 100644
--- a/fit/src/main/resources/V30/Product/filter/substringof('kdcuklu', Description) eq true.full.json	
+++ b/fit/src/main/resources/V30/Product/filter/substringof('kdcuklu', Description) eq true.full.json	
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)","odata.etag":"W/\"'%D1%8F%E3%82%A1%E3%81%9D%E7%8F%B1%EF%BD%9A%E3%81%9D%E7%B8%B7%E3%83%9F%D1%91%E3%83%9C%E3%81%9C%D0%AF%E6%AD%B9%E3%83%9F%E3%83%90%E3%81%BB%E3%83%9D%E3%81%BB%E3%82%BC%EF%BD%A6%E7%95%9A%E3%82%AF%E3%81%BB%EF%BE%88%E3%82%BC%E3%81%BE%E8%A3%B9%E3%81%B3%E3%81%B4%E3%81%B9%E6%AD%B9%E3%81%82%E3%83%80%E3%82%B0%E3%82%BD%E3%81%B3%D1%91%D1%91%E3%82%93%E3%83%9D%E3%81%9D%E3%83%9F%E3%83%9E%E3%81%BB%E3%82%BD%EF%BD%9A%E8%A3%B9%E3%81%BC%E3%82%93%E7%8F%B1%E3%81%B9%E3%82%BC%E6%AD%B9%E3%83%9F%EF%BD%9A%E3%83%9D%E3%81%9C%E3%81%9E%E3%82%BD%E3%83%9D%E3%81%BA%E3%83%9F%E3%83%80%E6%AC%B2%E5%BC%8C%D1%8F%E3%82%BD%E3%82%BD%E3%81%BD%E3%82%BD%E3%81%B9%E3%83%90%E9%BB%91%E4%B9%9D%E7%8F%B1%E3%81%9E%E3%83
 %9D%D0%AF%E3%83%80%E3%82%BD%E3%82%BC','%E8%A3%B9%E3%81%BA%E3%82%BE%E7%B8%B7%E3%82%BC%E3%81%BB%E3%82%BC%E3%82%BD%EF%BD%9A%E3%82%BC%EF%BD%9A%E3%81%9C%E3%82%BD%EF%BE%9D%E3%82%BC%E3%82%92%E3%81%BE%E3%81%81%E3%83%80%E3%81%B3%E3%82%BF%E7%8F%B1%E3%82%BF%E3%83%90%E3%82%BE%E3%82%BE%E3%83%9F%E3%83%81%E3%83%9C%E6%9A%A6%E3%82%BD%E3%82%A1%E3%81%B9%E8%A3%B9%E3%83%9D%E3%81%9C%E3%82%92%EF%BD%A6%E3%81%B3%E3%82%BC%E3%83%9E%E3%82%92%E3%82%BC%E3%83%9F%E3%81%BD%E3%83%9C%E3%82%BD%EF%BE%88%E3%81%BD%E3%83%9D%E3%83%9F%E3%82%BE%EF%BD%81%E3%82%BF%E3%82%BD%E3%81%81%E3%83%9E%E8%A3%B9%E3%82%B0%EF%BD%81%E3%82%BF%E6%AD%B9%E6%AD%B9%E3%81%9F%EF%BD%9A%E3%83%90%E7%B8%B7%E3%83%81%E3%82%93%E3%82%92%D0%AF%E3%82%93%E7%95%9A%E3%81%9F%E3%82%BE%E3%81%B9%E3%82%BD%E6%AC%B2%E3%82%A1%E7%B8%B7%D1%8F%E3%83%9F%E3%82%92%EF%BD%A6%E3%81%9B%EF%BD%A6%E3%82%BC%E3%83%9E%E3%82%BD%E3%83%9C%E3%82%BC%E3%82%BC%E3%83%81%E3%81%BC%E7%95%9A%E7%8F%B1'\"","odata.editLink":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedP
 roduct","RelatedProducts@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts","Detail@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Detail","Reviews@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Reviews","Photos@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Photos","#DefaultContainer.ChangeProductDimensions":{"title":"ChangeProductDimensions","target":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"},"Picture@odata.mediaEditLink":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture","ProductId":-9,"Description":"kdcuklu","Dimensions":{"odata.type":"Mi
 crosoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"-25802798699776200000000000000","Height@odata.type":"Edm.Decimal","Height":"38.543408267225","Depth@odata.type":"Edm.Decimal","Depth":"-8459.21552673786"},"BaseConcurrency":"\u044f\u30a1\u305d\u73f1\uff5a\u305d\u7e37\u30df\u0451\u30dc\u305c\u042f\u6b79\u30df\u30d0\u307b\u30dd\u307b\u30bc\uff66\u755a\u30af\u307b\uff88\u30bc\u307e\u88f9\u3073\u3074\u3079\u6b79\u3042\u30c0\u30b0\u30bd\u3073\u0451\u0451\u3093\u30dd\u305d\u30df\u30de\u307b\u30bd\uff5a\u88f9\u307c\u3093\u73f1\u3079\u30bc\u6b79\u30df\uff5a\u30dd\u305c\u305e\u30bd\u30dd\u307a\u30df\u30c0\u6b32\u5f0c\u044f\u30bd\u30bd\u307d\u30bd\u3079\u30d0\u9ed1\u4e5d\u73f1\u305e\u30dd\u042f\u30c0\u30bd\u30bc","ComplexConcurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo","Token":"vkvezqrkjuykjmk\u00dfyqpliyv\u00df","QueriedDateTime":null},"NestedComplexConcurrency":{"odata.type":"Microsoft.Test.
 OData.Services.AstoriaDefaultService.AuditInfo","ModifiedDate@odata.type":"Edm.DateTime","ModifiedDate":"2012-11-20T10:27:48.8528105","ModifiedBy":"gtpakgdzcfjyumozyqzrhxuypuzfqhvmzeepvjllfncsjuumjzdxvlhjprgphzfvjxzsklilojgtqhktpj","Concurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo","Token":"\u30dc\u30dc\uff9d\u3072\u0451\u7e37\u305d\u30a1\u307d\u30bc\u3093\u30c0\u73f1\u30bc\u3041\uff5a\u755a\u4e9c\u4e9c\u30bc\u3072\u30d0\u4e9c\u307b\u3079\u30cf\uff9d\uff88\u305f\u30dd\u4e5d\u30be\u3079\u30c0\u305e\u755a\u30bf\uff5a\u30be\u307c\u30a1\u042f\u30c0\u3092\u3042","QueriedDateTime@odata.type":"Edm.DateTime","QueriedDateTime":"2005-10-12T22:26:24.9396883"}},"Discontinued@odata.type":"Edm.DateTime","Discontinued":"2005-07-28T13:09:56.9997833","ReplacementProductId":null,"DiscontinuedPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u7e37\u305f\u3079\u30cf\u30dc\u6b32\u30a1\u3093\u307d\u3074\u30bd\uf
 f41\u307d\u30be\u3042\u305f\u3041\u30bd\u3073\u307c\u30dd\u4e5d\u30d0\u307b\u755a\u30bc\u307e\uff41\u307c\u305d\u042f\u4e9c\uff88\u3041\u30b0\u3074\u66a6\uff5a\u30dd\u307b\u30dc\u30dc\uff88\u3074","Extension":"bozhmrtomzrcmheuuqybovfiuypathsafmriopuccbqubhqbmuauxvnftvnpisgobryzqya"},"ChildConcurrencyToken":"\u88f9\u307a\u30be\u7e37\u30bc\u307b\u30bc\u30bd\uff5a\u30bc\uff5a\u305c\u30bd\uff9d\u30bc\u3092\u307e\u3041\u30c0\u3073\u30bf\u73f1\u30bf\u30d0\u30be\u30be\u30df\u30c1\u30dc\u66a6\u30bd\u30a1\u3079\u88f9\u30dd\u305c\u3092\uff66\u3073\u30bc\u30de\u3092\u30bc\u30df\u307d\u30dc\u30bd\uff88\u307d\u30dd\u30df\u30be\uff41\u30bf\u30bd\u3041\u30de\u88f9\u30b0\uff41\u30bf\u6b79\u6b79\u305f\uff5a\u30d0\u7e37\u30c1\u3093\u3092\u042f\u3093\u755a\u305f\u30be\u3079\u30bd\u6b32\u30a1\u7e37\u044f\u30df\u3092\uff66\u305b\uff66\u30bc\u30de\u30bd\u30dc\u30bc\u30bc\u30c1\u307c\u755a\u73f1"}]}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)","odata.etag":"W/\"'%D1%8F%E3%82%A1%E3%81%9D%E7%8F%B1%EF%BD%9A%E3%81%9D%E7%B8%B7%E3%83%9F%D1%91%E3%83%9C%E3%81%9C%D0%AF%E6%AD%B9%E3%83%9F%E3%83%90%E3%81%BB%E3%83%9D%E3%81%BB%E3%82%BC%EF%BD%A6%E7%95%9A%E3%82%AF%E3%81%BB%EF%BE%88%E3%82%BC%E3%81%BE%E8%A3%B9%E3%81%B3%E3%81%B4%E3%81%B9%E6%AD%B9%E3%81%82%E3%83%80%E3%82%B0%E3%82%BD%E3%81%B3%D1%91%D1%91%E3%82%93%E3%83%9D%E3%81%9D%E3%83%9F%E3%83%9E%E3%81%BB%E3%82%BD%EF%BD%9A%E8%A3%B9%E3%81%BC%E3%82%93%E7%8F%B1%E3%81%B9%E3%82%BC%E6%AD%B9%E3%83%9F%EF%BD%9A%E3%83%9D%E3%81%9C%E3%81%9E%E3%82%BD%E3%83%9D%E3%81%BA%E3%83%9F%E3%83%80%E6%AC%B2%E5%BC%8C%D1%8F%E3%82%BD%E3%82%BD%E3%81%BD%E3%82%BD%E3%81%B9%E3%83%90%E9%BB%91%E4%B9%9D%E7%8F%B1%E3%81%9E%E3%
 83%9D%D0%AF%E3%83%80%E3%82%BD%E3%82%BC','%E8%A3%B9%E3%81%BA%E3%82%BE%E7%B8%B7%E3%82%BC%E3%81%BB%E3%82%BC%E3%82%BD%EF%BD%9A%E3%82%BC%EF%BD%9A%E3%81%9C%E3%82%BD%EF%BE%9D%E3%82%BC%E3%82%92%E3%81%BE%E3%81%81%E3%83%80%E3%81%B3%E3%82%BF%E7%8F%B1%E3%82%BF%E3%83%90%E3%82%BE%E3%82%BE%E3%83%9F%E3%83%81%E3%83%9C%E6%9A%A6%E3%82%BD%E3%82%A1%E3%81%B9%E8%A3%B9%E3%83%9D%E3%81%9C%E3%82%92%EF%BD%A6%E3%81%B3%E3%82%BC%E3%83%9E%E3%82%92%E3%82%BC%E3%83%9F%E3%81%BD%E3%83%9C%E3%82%BD%EF%BE%88%E3%81%BD%E3%83%9D%E3%83%9F%E3%82%BE%EF%BD%81%E3%82%BF%E3%82%BD%E3%81%81%E3%83%9E%E8%A3%B9%E3%82%B0%EF%BD%81%E3%82%BF%E6%AD%B9%E6%AD%B9%E3%81%9F%EF%BD%9A%E3%83%90%E7%B8%B7%E3%83%81%E3%82%93%E3%82%92%D0%AF%E3%82%93%E7%95%9A%E3%81%9F%E3%82%BE%E3%81%B9%E3%82%BD%E6%AC%B2%E3%82%A1%E7%B8%B7%D1%8F%E3%83%9F%E3%82%92%EF%BD%A6%E3%81%9B%EF%BD%A6%E3%82%BC%E3%83%9E%E3%82%BD%E3%83%9C%E3%82%BC%E3%82%BC%E3%83%81%E3%81%BC%E7%95%9A%E7%8F%B1'\"","odata.editLink":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.Discontinue
 dProduct","RelatedProducts@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts","Detail@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Detail","Reviews@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Reviews","Photos@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Photos","#DefaultContainer.ChangeProductDimensions":{"title":"ChangeProductDimensions","target":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"},"Picture@odata.mediaEditLink":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture","ProductId":-9,"Description":"kdcuklu","Dimensions":{"odata.type":
 "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"-25802798699776200000000000000","Height@odata.type":"Edm.Decimal","Height":"38.543408267225","Depth@odata.type":"Edm.Decimal","Depth":"-8459.21552673786"},"BaseConcurrency":"\u044f\u30a1\u305d\u73f1\uff5a\u305d\u7e37\u30df\u0451\u30dc\u305c\u042f\u6b79\u30df\u30d0\u307b\u30dd\u307b\u30bc\uff66\u755a\u30af\u307b\uff88\u30bc\u307e\u88f9\u3073\u3074\u3079\u6b79\u3042\u30c0\u30b0\u30bd\u3073\u0451\u0451\u3093\u30dd\u305d\u30df\u30de\u307b\u30bd\uff5a\u88f9\u307c\u3093\u73f1\u3079\u30bc\u6b79\u30df\uff5a\u30dd\u305c\u305e\u30bd\u30dd\u307a\u30df\u30c0\u6b32\u5f0c\u044f\u30bd\u30bd\u307d\u30bd\u3079\u30d0\u9ed1\u4e5d\u73f1\u305e\u30dd\u042f\u30c0\u30bd\u30bc","ComplexConcurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo","Token":"vkvezqrkjuykjmk\u00dfyqpliyv\u00df","QueriedDateTime":null},"NestedComplexConcurrency":{"odata.type":"Microsoft.Te
 st.OData.Services.AstoriaDefaultService.AuditInfo","ModifiedDate@odata.type":"Edm.DateTime","ModifiedDate":"2012-11-20T10:27:48.8528105","ModifiedBy":"gtpakgdzcfjyumozyqzrhxuypuzfqhvmzeepvjllfncsjuumjzdxvlhjprgphzfvjxzsklilojgtqhktpj","Concurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo","Token":"\u30dc\u30dc\uff9d\u3072\u0451\u7e37\u305d\u30a1\u307d\u30bc\u3093\u30c0\u73f1\u30bc\u3041\uff5a\u755a\u4e9c\u4e9c\u30bc\u3072\u30d0\u4e9c\u307b\u3079\u30cf\uff9d\uff88\u305f\u30dd\u4e5d\u30be\u3079\u30c0\u305e\u755a\u30bf\uff5a\u30be\u307c\u30a1\u042f\u30c0\u3092\u3042","QueriedDateTime@odata.type":"Edm.DateTime","QueriedDateTime":"2005-10-12T22:26:24.9396883"}},"Discontinued@odata.type":"Edm.DateTime","Discontinued":"2005-07-28T13:09:56.9997833","ReplacementProductId":null,"DiscontinuedPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u7e37\u305f\u3079\u30cf\u30dc\u6b32\u30a1\u3093\u307d\u3074\u30bd
 \uff41\u307d\u30be\u3042\u305f\u3041\u30bd\u3073\u307c\u30dd\u4e5d\u30d0\u307b\u755a\u30bc\u307e\uff41\u307c\u305d\u042f\u4e9c\uff88\u3041\u30b0\u3074\u66a6\uff5a\u30dd\u307b\u30dc\u30dc\uff88\u3074","Extension":"bozhmrtomzrcmheuuqybovfiuypathsafmriopuccbqubhqbmuauxvnftvnpisgobryzqya"},"ChildConcurrencyToken":"\u88f9\u307a\u30be\u7e37\u30bc\u307b\u30bc\u30bd\uff5a\u30bc\uff5a\u305c\u30bd\uff9d\u30bc\u3092\u307e\u3041\u30c0\u3073\u30bf\u73f1\u30bf\u30d0\u30be\u30be\u30df\u30c1\u30dc\u66a6\u30bd\u30a1\u3079\u88f9\u30dd\u305c\u3092\uff66\u3073\u30bc\u30de\u3092\u30bc\u30df\u307d\u30dc\u30bd\uff88\u307d\u30dd\u30df\u30be\uff41\u30bf\u30bd\u3041\u30de\u88f9\u30b0\uff41\u30bf\u6b79\u6b79\u305f\uff5a\u30d0\u7e37\u30c1\u3093\u3092\u042f\u3093\u755a\u305f\u30be\u3079\u30bd\u6b32\u30a1\u7e37\u044f\u30df\u3092\uff66\u305b\uff66\u30bc\u30de\u30bd\u30dc\u30bc\u30bc\u30c1\u307c\u755a\u73f1"}]}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/filter/substringof('kdcuklu', Description) eq true.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/filter/substringof('kdcuklu', Description) eq true.xml b/fit/src/main/resources/V30/Product/filter/substringof('kdcuklu', Description) eq true.xml
index ed9c932..e7e7d1c 100644
--- a/fit/src/main/resources/V30/Product/filter/substringof('kdcuklu', Description) eq true.xml	
+++ b/fit/src/main/resources/V30/Product/filter/substringof('kdcuklu', Description) eq true.xml	
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product</id>
   <title type="text">Product</title>
   <updated>2014-02-13T14:31:06Z</updated>
   <link rel="self" title="Product" href="Product" />
   <entry m:etag="W/&quot;'%D1%8F%E3%82%A1%E3%81%9D%E7%8F%B1%EF%BD%9A%E3%81%9D%E7%B8%B7%E3%83%9F%D1%91%E3%83%9C%E3%81%9C%D0%AF%E6%AD%B9%E3%83%9F%E3%83%90%E3%81%BB%E3%83%9D%E3%81%BB%E3%82%BC%EF%BD%A6%E7%95%9A%E3%82%AF%E3%81%BB%EF%BE%88%E3%82%BC%E3%81%BE%E8%A3%B9%E3%81%B3%E3%81%B4%E3%81%B9%E6%AD%B9%E3%81%82%E3%83%80%E3%82%B0%E3%82%BD%E3%81%B3%D1%91%D1%91%E3%82%93%E3%83%9D%E3%81%9D%E3%83%9F%E3%83%9E%E3%81%BB%E3%82%BD%EF%BD%9A%E8%A3%B9%E3%81%BC%E3%82%93%E7%8F%B1%E3%81%B9%E3%82%BC%E6%AD%B9%E3%83%9F%EF%BD%9A%E3%83%9D%E3%81%9C%E3%81%9E%E3%82%BD%E3%83%9D%E3%81%BA%E3%83%9F%E3%83%80%E6%AC%B2%E5%BC%8C%D1%8F%E3%82%BD%E3%82%BD%E3%81%BD%E3%82%BD%E3%81%B9%E3%83%90%E9%BB%91%E4%B9%9D%E7%8F%B1%E3%81%9E%E3%83%9D%D0%AF%E3%83%80%E3%82%BD%E3%82%BC','%E8%A3%B9%E3%81%BA%E3%82%BE%E7%B8%B7%E3%82%BC%E3%81%BB%E3%82%BC%E3%82%BD%EF%BD%9A%E3%82%BC%EF%BD%9A%E3%81%9C%E3%82%BD%EF%BE%9D%E3%82%BC%E3%82%92%E3%81%BE%E3%81%81%E3%83%80%E3%81%B3%E3%82%BF%E7%8F%B1%E3%82%BF%E3%83%90%E3%82%BE%E3%82%BE%E3%83%9F%E3%83%81%E3%83%9
 C%E6%9A%A6%E3%82%BD%E3%82%A1%E3%81%B9%E8%A3%B9%E3%83%9D%E3%81%9C%E3%82%92%EF%BD%A6%E3%81%B3%E3%82%BC%E3%83%9E%E3%82%92%E3%82%BC%E3%83%9F%E3%81%BD%E3%83%9C%E3%82%BD%EF%BE%88%E3%81%BD%E3%83%9D%E3%83%9F%E3%82%BE%EF%BD%81%E3%82%BF%E3%82%BD%E3%81%81%E3%83%9E%E8%A3%B9%E3%82%B0%EF%BD%81%E3%82%BF%E6%AD%B9%E6%AD%B9%E3%81%9F%EF%BD%9A%E3%83%90%E7%B8%B7%E3%83%81%E3%82%93%E3%82%92%D0%AF%E3%82%93%E7%95%9A%E3%81%9F%E3%82%BE%E3%81%B9%E3%82%BD%E6%AC%B2%E3%82%A1%E7%B8%B7%D1%8F%E3%83%9F%E3%82%92%EF%BD%A6%E3%81%9B%EF%BD%A6%E3%82%BC%E3%83%9E%E3%82%BD%E3%83%9C%E3%82%BC%E3%82%BC%E3%83%81%E3%81%BC%E7%95%9A%E7%8F%B1'&quot;">
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Product" href="Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/RelatedProducts" type="application/atom+xml;type=feed" title="RelatedProducts" href="Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts" />
@@ -38,7 +38,7 @@
       <name />
     </author>
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Picture" title="Picture" href="Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture" />
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
     <content type="application/xml">
       <m:properties>
         <d:ProductId m:type="Edm.Int32">-9</d:ProductId>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/filter/toupper(Description) eq 'KDCUKLU'.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/filter/toupper(Description) eq 'KDCUKLU'.full.json b/fit/src/main/resources/V30/Product/filter/toupper(Description) eq 'KDCUKLU'.full.json
index 3ce98e8..7953935 100644
--- a/fit/src/main/resources/V30/Product/filter/toupper(Description) eq 'KDCUKLU'.full.json	
+++ b/fit/src/main/resources/V30/Product/filter/toupper(Description) eq 'KDCUKLU'.full.json	
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)","odata.etag":"W/\"'%D1%8F%E3%82%A1%E3%81%9D%E7%8F%B1%EF%BD%9A%E3%81%9D%E7%B8%B7%E3%83%9F%D1%91%E3%83%9C%E3%81%9C%D0%AF%E6%AD%B9%E3%83%9F%E3%83%90%E3%81%BB%E3%83%9D%E3%81%BB%E3%82%BC%EF%BD%A6%E7%95%9A%E3%82%AF%E3%81%BB%EF%BE%88%E3%82%BC%E3%81%BE%E8%A3%B9%E3%81%B3%E3%81%B4%E3%81%B9%E6%AD%B9%E3%81%82%E3%83%80%E3%82%B0%E3%82%BD%E3%81%B3%D1%91%D1%91%E3%82%93%E3%83%9D%E3%81%9D%E3%83%9F%E3%83%9E%E3%81%BB%E3%82%BD%EF%BD%9A%E8%A3%B9%E3%81%BC%E3%82%93%E7%8F%B1%E3%81%B9%E3%82%BC%E6%AD%B9%E3%83%9F%EF%BD%9A%E3%83%9D%E3%81%9C%E3%81%9E%E3%82%BD%E3%83%9D%E3%81%BA%E3%83%9F%E3%83%80%E6%AC%B2%E5%BC%8C%D1%8F%E3%82%BD%E3%82%BD%E3%81%BD%E3%82%BD%E3%81%B9%E3%83%90%E9%BB%91%E4%B9%9D%E7%8F%B1%E3%81%9E%E3%83
 %9D%D0%AF%E3%83%80%E3%82%BD%E3%82%BC','%E8%A3%B9%E3%81%BA%E3%82%BE%E7%B8%B7%E3%82%BC%E3%81%BB%E3%82%BC%E3%82%BD%EF%BD%9A%E3%82%BC%EF%BD%9A%E3%81%9C%E3%82%BD%EF%BE%9D%E3%82%BC%E3%82%92%E3%81%BE%E3%81%81%E3%83%80%E3%81%B3%E3%82%BF%E7%8F%B1%E3%82%BF%E3%83%90%E3%82%BE%E3%82%BE%E3%83%9F%E3%83%81%E3%83%9C%E6%9A%A6%E3%82%BD%E3%82%A1%E3%81%B9%E8%A3%B9%E3%83%9D%E3%81%9C%E3%82%92%EF%BD%A6%E3%81%B3%E3%82%BC%E3%83%9E%E3%82%92%E3%82%BC%E3%83%9F%E3%81%BD%E3%83%9C%E3%82%BD%EF%BE%88%E3%81%BD%E3%83%9D%E3%83%9F%E3%82%BE%EF%BD%81%E3%82%BF%E3%82%BD%E3%81%81%E3%83%9E%E8%A3%B9%E3%82%B0%EF%BD%81%E3%82%BF%E6%AD%B9%E6%AD%B9%E3%81%9F%EF%BD%9A%E3%83%90%E7%B8%B7%E3%83%81%E3%82%93%E3%82%92%D0%AF%E3%82%93%E7%95%9A%E3%81%9F%E3%82%BE%E3%81%B9%E3%82%BD%E6%AC%B2%E3%82%A1%E7%B8%B7%D1%8F%E3%83%9F%E3%82%92%EF%BD%A6%E3%81%9B%EF%BD%A6%E3%82%BC%E3%83%9E%E3%82%BD%E3%83%9C%E3%82%BC%E3%82%BC%E3%83%81%E3%81%BC%E7%95%9A%E7%8F%B1'\"","odata.editLink":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedP
 roduct","RelatedProducts@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts","Detail@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Detail","Reviews@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Reviews","Photos@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Photos","#DefaultContainer.ChangeProductDimensions":{"title":"ChangeProductDimensions","target":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"},"Picture@odata.mediaEditLink":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture","ProductId":-9,"Description":"kdcuklu","Dimensions":{"odata.type":"Mi
 crosoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"-25802798699776200000000000000","Height@odata.type":"Edm.Decimal","Height":"38.543408267225","Depth@odata.type":"Edm.Decimal","Depth":"-8459.21552673786"},"BaseConcurrency":"\u044f\u30a1\u305d\u73f1\uff5a\u305d\u7e37\u30df\u0451\u30dc\u305c\u042f\u6b79\u30df\u30d0\u307b\u30dd\u307b\u30bc\uff66\u755a\u30af\u307b\uff88\u30bc\u307e\u88f9\u3073\u3074\u3079\u6b79\u3042\u30c0\u30b0\u30bd\u3073\u0451\u0451\u3093\u30dd\u305d\u30df\u30de\u307b\u30bd\uff5a\u88f9\u307c\u3093\u73f1\u3079\u30bc\u6b79\u30df\uff5a\u30dd\u305c\u305e\u30bd\u30dd\u307a\u30df\u30c0\u6b32\u5f0c\u044f\u30bd\u30bd\u307d\u30bd\u3079\u30d0\u9ed1\u4e5d\u73f1\u305e\u30dd\u042f\u30c0\u30bd\u30bc","ComplexConcurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo","Token":"vkvezqrkjuykjmk\u00dfyqpliyv\u00df","QueriedDateTime":null},"NestedComplexConcurrency":{"odata.type":"Microsoft.Test.
 OData.Services.AstoriaDefaultService.AuditInfo","ModifiedDate@odata.type":"Edm.DateTime","ModifiedDate":"2012-11-20T10:27:48.8528105","ModifiedBy":"gtpakgdzcfjyumozyqzrhxuypuzfqhvmzeepvjllfncsjuumjzdxvlhjprgphzfvjxzsklilojgtqhktpj","Concurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo","Token":"\u30dc\u30dc\uff9d\u3072\u0451\u7e37\u305d\u30a1\u307d\u30bc\u3093\u30c0\u73f1\u30bc\u3041\uff5a\u755a\u4e9c\u4e9c\u30bc\u3072\u30d0\u4e9c\u307b\u3079\u30cf\uff9d\uff88\u305f\u30dd\u4e5d\u30be\u3079\u30c0\u305e\u755a\u30bf\uff5a\u30be\u307c\u30a1\u042f\u30c0\u3092\u3042","QueriedDateTime@odata.type":"Edm.DateTime","QueriedDateTime":"2005-10-12T22:26:24.9396883"}},"Discontinued@odata.type":"Edm.DateTime","Discontinued":"2005-07-28T13:09:56.9997833","ReplacementProductId":null,"DiscontinuedPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u7e37\u305f\u3079\u30cf\u30dc\u6b32\u30a1\u3093\u307d\u3074\u30bd\uf
 f41\u307d\u30be\u3042\u305f\u3041\u30bd\u3073\u307c\u30dd\u4e5d\u30d0\u307b\u755a\u30bc\u307e\uff41\u307c\u305d\u042f\u4e9c\uff88\u3041\u30b0\u3074\u66a6\uff5a\u30dd\u307b\u30dc\u30dc\uff88\u3074","Extension":"bozhmrtomzrcmheuuqybovfiuypathsafmriopuccbqubhqbmuauxvnftvnpisgobryzqya"},"ChildConcurrencyToken":"\u88f9\u307a\u30be\u7e37\u30bc\u307b\u30bc\u30bd\uff5a\u30bc\uff5a\u305c\u30bd\uff9d\u30bc\u3092\u307e\u3041\u30c0\u3073\u30bf\u73f1\u30bf\u30d0\u30be\u30be\u30df\u30c1\u30dc\u66a6\u30bd\u30a1\u3079\u88f9\u30dd\u305c\u3092\uff66\u3073\u30bc\u30de\u3092\u30bc\u30df\u307d\u30dc\u30bd\uff88\u307d\u30dd\u30df\u30be\uff41\u30bf\u30bd\u3041\u30de\u88f9\u30b0\uff41\u30bf\u6b79\u6b79\u305f\uff5a\u30d0\u7e37\u30c1\u3093\u3092\u042f\u3093\u755a\u305f\u30be\u3079\u30bd\u6b32\u30a1\u7e37\u044f\u30df\u3092\uff66\u305b\uff66\u30bc\u30de\u30bd\u30dc\u30bc\u30bc\u30c1\u307c\u755a\u73f1"}]}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)","odata.etag":"W/\"'%D1%8F%E3%82%A1%E3%81%9D%E7%8F%B1%EF%BD%9A%E3%81%9D%E7%B8%B7%E3%83%9F%D1%91%E3%83%9C%E3%81%9C%D0%AF%E6%AD%B9%E3%83%9F%E3%83%90%E3%81%BB%E3%83%9D%E3%81%BB%E3%82%BC%EF%BD%A6%E7%95%9A%E3%82%AF%E3%81%BB%EF%BE%88%E3%82%BC%E3%81%BE%E8%A3%B9%E3%81%B3%E3%81%B4%E3%81%B9%E6%AD%B9%E3%81%82%E3%83%80%E3%82%B0%E3%82%BD%E3%81%B3%D1%91%D1%91%E3%82%93%E3%83%9D%E3%81%9D%E3%83%9F%E3%83%9E%E3%81%BB%E3%82%BD%EF%BD%9A%E8%A3%B9%E3%81%BC%E3%82%93%E7%8F%B1%E3%81%B9%E3%82%BC%E6%AD%B9%E3%83%9F%EF%BD%9A%E3%83%9D%E3%81%9C%E3%81%9E%E3%82%BD%E3%83%9D%E3%81%BA%E3%83%9F%E3%83%80%E6%AC%B2%E5%BC%8C%D1%8F%E3%82%BD%E3%82%BD%E3%81%BD%E3%82%BD%E3%81%B9%E3%83%90%E9%BB%91%E4%B9%9D%E7%8F%B1%E3%81%9E%E3%
 83%9D%D0%AF%E3%83%80%E3%82%BD%E3%82%BC','%E8%A3%B9%E3%81%BA%E3%82%BE%E7%B8%B7%E3%82%BC%E3%81%BB%E3%82%BC%E3%82%BD%EF%BD%9A%E3%82%BC%EF%BD%9A%E3%81%9C%E3%82%BD%EF%BE%9D%E3%82%BC%E3%82%92%E3%81%BE%E3%81%81%E3%83%80%E3%81%B3%E3%82%BF%E7%8F%B1%E3%82%BF%E3%83%90%E3%82%BE%E3%82%BE%E3%83%9F%E3%83%81%E3%83%9C%E6%9A%A6%E3%82%BD%E3%82%A1%E3%81%B9%E8%A3%B9%E3%83%9D%E3%81%9C%E3%82%92%EF%BD%A6%E3%81%B3%E3%82%BC%E3%83%9E%E3%82%92%E3%82%BC%E3%83%9F%E3%81%BD%E3%83%9C%E3%82%BD%EF%BE%88%E3%81%BD%E3%83%9D%E3%83%9F%E3%82%BE%EF%BD%81%E3%82%BF%E3%82%BD%E3%81%81%E3%83%9E%E8%A3%B9%E3%82%B0%EF%BD%81%E3%82%BF%E6%AD%B9%E6%AD%B9%E3%81%9F%EF%BD%9A%E3%83%90%E7%B8%B7%E3%83%81%E3%82%93%E3%82%92%D0%AF%E3%82%93%E7%95%9A%E3%81%9F%E3%82%BE%E3%81%B9%E3%82%BD%E6%AC%B2%E3%82%A1%E7%B8%B7%D1%8F%E3%83%9F%E3%82%92%EF%BD%A6%E3%81%9B%EF%BD%A6%E3%82%BC%E3%83%9E%E3%82%BD%E3%83%9C%E3%82%BC%E3%82%BC%E3%83%81%E3%81%BC%E7%95%9A%E7%8F%B1'\"","odata.editLink":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.Discontinue
 dProduct","RelatedProducts@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts","Detail@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Detail","Reviews@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Reviews","Photos@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Photos","#DefaultContainer.ChangeProductDimensions":{"title":"ChangeProductDimensions","target":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"},"Picture@odata.mediaEditLink":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture","ProductId":-9,"Description":"kdcuklu","Dimensions":{"odata.type":
 "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"-25802798699776200000000000000","Height@odata.type":"Edm.Decimal","Height":"38.543408267225","Depth@odata.type":"Edm.Decimal","Depth":"-8459.21552673786"},"BaseConcurrency":"\u044f\u30a1\u305d\u73f1\uff5a\u305d\u7e37\u30df\u0451\u30dc\u305c\u042f\u6b79\u30df\u30d0\u307b\u30dd\u307b\u30bc\uff66\u755a\u30af\u307b\uff88\u30bc\u307e\u88f9\u3073\u3074\u3079\u6b79\u3042\u30c0\u30b0\u30bd\u3073\u0451\u0451\u3093\u30dd\u305d\u30df\u30de\u307b\u30bd\uff5a\u88f9\u307c\u3093\u73f1\u3079\u30bc\u6b79\u30df\uff5a\u30dd\u305c\u305e\u30bd\u30dd\u307a\u30df\u30c0\u6b32\u5f0c\u044f\u30bd\u30bd\u307d\u30bd\u3079\u30d0\u9ed1\u4e5d\u73f1\u305e\u30dd\u042f\u30c0\u30bd\u30bc","ComplexConcurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo","Token":"vkvezqrkjuykjmk\u00dfyqpliyv\u00df","QueriedDateTime":null},"NestedComplexConcurrency":{"odata.type":"Microsoft.Te
 st.OData.Services.AstoriaDefaultService.AuditInfo","ModifiedDate@odata.type":"Edm.DateTime","ModifiedDate":"2012-11-20T10:27:48.8528105","ModifiedBy":"gtpakgdzcfjyumozyqzrhxuypuzfqhvmzeepvjllfncsjuumjzdxvlhjprgphzfvjxzsklilojgtqhktpj","Concurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo","Token":"\u30dc\u30dc\uff9d\u3072\u0451\u7e37\u305d\u30a1\u307d\u30bc\u3093\u30c0\u73f1\u30bc\u3041\uff5a\u755a\u4e9c\u4e9c\u30bc\u3072\u30d0\u4e9c\u307b\u3079\u30cf\uff9d\uff88\u305f\u30dd\u4e5d\u30be\u3079\u30c0\u305e\u755a\u30bf\uff5a\u30be\u307c\u30a1\u042f\u30c0\u3092\u3042","QueriedDateTime@odata.type":"Edm.DateTime","QueriedDateTime":"2005-10-12T22:26:24.9396883"}},"Discontinued@odata.type":"Edm.DateTime","Discontinued":"2005-07-28T13:09:56.9997833","ReplacementProductId":null,"DiscontinuedPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u7e37\u305f\u3079\u30cf\u30dc\u6b32\u30a1\u3093\u307d\u3074\u30bd
 \uff41\u307d\u30be\u3042\u305f\u3041\u30bd\u3073\u307c\u30dd\u4e5d\u30d0\u307b\u755a\u30bc\u307e\uff41\u307c\u305d\u042f\u4e9c\uff88\u3041\u30b0\u3074\u66a6\uff5a\u30dd\u307b\u30dc\u30dc\uff88\u3074","Extension":"bozhmrtomzrcmheuuqybovfiuypathsafmriopuccbqubhqbmuauxvnftvnpisgobryzqya"},"ChildConcurrencyToken":"\u88f9\u307a\u30be\u7e37\u30bc\u307b\u30bc\u30bd\uff5a\u30bc\uff5a\u305c\u30bd\uff9d\u30bc\u3092\u307e\u3041\u30c0\u3073\u30bf\u73f1\u30bf\u30d0\u30be\u30be\u30df\u30c1\u30dc\u66a6\u30bd\u30a1\u3079\u88f9\u30dd\u305c\u3092\uff66\u3073\u30bc\u30de\u3092\u30bc\u30df\u307d\u30dc\u30bd\uff88\u307d\u30dd\u30df\u30be\uff41\u30bf\u30bd\u3041\u30de\u88f9\u30b0\uff41\u30bf\u6b79\u6b79\u305f\uff5a\u30d0\u7e37\u30c1\u3093\u3092\u042f\u3093\u755a\u305f\u30be\u3079\u30bd\u6b32\u30a1\u7e37\u044f\u30df\u3092\uff66\u305b\uff66\u30bc\u30de\u30bd\u30dc\u30bc\u30bc\u30c1\u307c\u755a\u73f1"}]}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/filter/toupper(Description) eq 'KDCUKLU'.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/filter/toupper(Description) eq 'KDCUKLU'.xml b/fit/src/main/resources/V30/Product/filter/toupper(Description) eq 'KDCUKLU'.xml
index 8a3fb07..e094c69 100644
--- a/fit/src/main/resources/V30/Product/filter/toupper(Description) eq 'KDCUKLU'.xml	
+++ b/fit/src/main/resources/V30/Product/filter/toupper(Description) eq 'KDCUKLU'.xml	
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product</id>
   <title type="text">Product</title>
   <updated>2014-02-13T14:31:07Z</updated>
   <link rel="self" title="Product" href="Product" />
   <entry m:etag="W/&quot;'%D1%8F%E3%82%A1%E3%81%9D%E7%8F%B1%EF%BD%9A%E3%81%9D%E7%B8%B7%E3%83%9F%D1%91%E3%83%9C%E3%81%9C%D0%AF%E6%AD%B9%E3%83%9F%E3%83%90%E3%81%BB%E3%83%9D%E3%81%BB%E3%82%BC%EF%BD%A6%E7%95%9A%E3%82%AF%E3%81%BB%EF%BE%88%E3%82%BC%E3%81%BE%E8%A3%B9%E3%81%B3%E3%81%B4%E3%81%B9%E6%AD%B9%E3%81%82%E3%83%80%E3%82%B0%E3%82%BD%E3%81%B3%D1%91%D1%91%E3%82%93%E3%83%9D%E3%81%9D%E3%83%9F%E3%83%9E%E3%81%BB%E3%82%BD%EF%BD%9A%E8%A3%B9%E3%81%BC%E3%82%93%E7%8F%B1%E3%81%B9%E3%82%BC%E6%AD%B9%E3%83%9F%EF%BD%9A%E3%83%9D%E3%81%9C%E3%81%9E%E3%82%BD%E3%83%9D%E3%81%BA%E3%83%9F%E3%83%80%E6%AC%B2%E5%BC%8C%D1%8F%E3%82%BD%E3%82%BD%E3%81%BD%E3%82%BD%E3%81%B9%E3%83%90%E9%BB%91%E4%B9%9D%E7%8F%B1%E3%81%9E%E3%83%9D%D0%AF%E3%83%80%E3%82%BD%E3%82%BC','%E8%A3%B9%E3%81%BA%E3%82%BE%E7%B8%B7%E3%82%BC%E3%81%BB%E3%82%BC%E3%82%BD%EF%BD%9A%E3%82%BC%EF%BD%9A%E3%81%9C%E3%82%BD%EF%BE%9D%E3%82%BC%E3%82%92%E3%81%BE%E3%81%81%E3%83%80%E3%81%B3%E3%82%BF%E7%8F%B1%E3%82%BF%E3%83%90%E3%82%BE%E3%82%BE%E3%83%9F%E3%83%81%E3%83%9
 C%E6%9A%A6%E3%82%BD%E3%82%A1%E3%81%B9%E8%A3%B9%E3%83%9D%E3%81%9C%E3%82%92%EF%BD%A6%E3%81%B3%E3%82%BC%E3%83%9E%E3%82%92%E3%82%BC%E3%83%9F%E3%81%BD%E3%83%9C%E3%82%BD%EF%BE%88%E3%81%BD%E3%83%9D%E3%83%9F%E3%82%BE%EF%BD%81%E3%82%BF%E3%82%BD%E3%81%81%E3%83%9E%E8%A3%B9%E3%82%B0%EF%BD%81%E3%82%BF%E6%AD%B9%E6%AD%B9%E3%81%9F%EF%BD%9A%E3%83%90%E7%B8%B7%E3%83%81%E3%82%93%E3%82%92%D0%AF%E3%82%93%E7%95%9A%E3%81%9F%E3%82%BE%E3%81%B9%E3%82%BD%E6%AC%B2%E3%82%A1%E7%B8%B7%D1%8F%E3%83%9F%E3%82%92%EF%BD%A6%E3%81%9B%EF%BD%A6%E3%82%BC%E3%83%9E%E3%82%BD%E3%83%9C%E3%82%BC%E3%82%BC%E3%83%81%E3%81%BC%E7%95%9A%E7%8F%B1'&quot;">
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Product" href="Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/RelatedProducts" type="application/atom+xml;type=feed" title="RelatedProducts" href="Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts" />
@@ -38,7 +38,7 @@
       <name />
     </author>
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Picture" title="Picture" href="Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture" />
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
     <content type="application/xml">
       <m:properties>
         <d:ProductId m:type="Edm.Int32">-9</d:ProductId>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/ProductPhoto/-2 -2/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/ProductPhoto/-2 -2/entity.full.json b/fit/src/main/resources/V30/ProductPhoto/-2 -2/entity.full.json
index 846c144..f37c6d0 100644
--- a/fit/src/main/resources/V30/ProductPhoto/-2 -2/entity.full.json	
+++ b/fit/src/main/resources/V30/ProductPhoto/-2 -2/entity.full.json	
@@ -1,7 +1,7 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#ProductPhoto/@Element",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#ProductPhoto/@Element",
   "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductPhoto",
-  "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ProductPhoto(PhotoId=-2,ProductId=-2)",
+  "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ProductPhoto(PhotoId=-2,ProductId=-2)",
   "odata.editLink": "ProductPhoto(PhotoId=-2,ProductId=-2)",
   "ProductId": -2,
   "PhotoId": -2,

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/ProductPhoto/-2 -2/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/ProductPhoto/-2 -2/entity.xml b/fit/src/main/resources/V30/ProductPhoto/-2 -2/entity.xml
index 80e168b..b19988b 100644
--- a/fit/src/main/resources/V30/ProductPhoto/-2 -2/entity.xml	
+++ b/fit/src/main/resources/V30/ProductPhoto/-2 -2/entity.xml	
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ProductPhoto(PhotoId=-2,ProductId=-2)</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ProductPhoto(PhotoId=-2,ProductId=-2)</id>
   <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.ProductPhoto" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
   <link rel="edit" title="ProductPhoto" href="ProductPhoto(PhotoId=-2,ProductId=-2)" />
   <title />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/ProductPhoto/-3 -3/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/ProductPhoto/-3 -3/entity.full.json b/fit/src/main/resources/V30/ProductPhoto/-3 -3/entity.full.json
index 3dc238b..f6e5939 100644
--- a/fit/src/main/resources/V30/ProductPhoto/-3 -3/entity.full.json	
+++ b/fit/src/main/resources/V30/ProductPhoto/-3 -3/entity.full.json	
@@ -1,7 +1,7 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#ProductPhoto/@Element",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#ProductPhoto/@Element",
   "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductPhoto",
-  "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ProductPhoto(PhotoId=-3,ProductId=-3)",
+  "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ProductPhoto(PhotoId=-3,ProductId=-3)",
   "odata.editLink": "ProductPhoto(PhotoId=-3,ProductId=-3)",
   "ProductId": -3,
   "PhotoId": -3,

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/ProductPhoto/-3 -3/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/ProductPhoto/-3 -3/entity.xml b/fit/src/main/resources/V30/ProductPhoto/-3 -3/entity.xml
index 0d4f712..5f86244 100644
--- a/fit/src/main/resources/V30/ProductPhoto/-3 -3/entity.xml	
+++ b/fit/src/main/resources/V30/ProductPhoto/-3 -3/entity.xml	
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ProductPhoto(PhotoId=-3,ProductId=-3)</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ProductPhoto(PhotoId=-3,ProductId=-3)</id>
   <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.ProductPhoto" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
   <link rel="edit" title="ProductPhoto" href="ProductPhoto(PhotoId=-3,ProductId=-3)" />
   <title />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.full.json b/fit/src/main/resources/V30/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.full.json
index 71acfc7..9b621b9 100644
--- a/fit/src/main/resources/V30/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.full.json
+++ b/fit/src/main/resources/V30/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.full.json
@@ -1,7 +1,7 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/OpenType.svc/$metadata#Row/@Element",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/OpenType.svc/$metadata#Row/@Element",
   "odata.type": "Microsoft.Test.OData.Services.OpenTypesService.Row",
-  "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/OpenType.svc/Row(guid'672b8250-1e6e-4785-80cf-b94b572e42b3')",
+  "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/OpenType.svc/Row(guid'672b8250-1e6e-4785-80cf-b94b572e42b3')",
   "odata.editLink": "Row(guid'672b8250-1e6e-4785-80cf-b94b572e42b3')",
   "Id@odata.type": "Edm.Guid",
   "Id": "672b8250-1e6e-4785-80cf-b94b572e42b3",

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.xml b/fit/src/main/resources/V30/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.xml
index d91c016..109f8cf 100644
--- a/fit/src/main/resources/V30/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.xml
+++ b/fit/src/main/resources/V30/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.xml
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/OpenType.svc/" 
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/OpenType.svc/" 
        xmlns="http://www.w3.org/2005/Atom" 
        xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" 
        xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" 
        xmlns:georss="http://www.georss.org/georss" 
        xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/OpenType.svc/Row(guid'672b8250-1e6e-4785-80cf-b94b572e42b3')</id>
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/OpenType.svc/Row(guid'672b8250-1e6e-4785-80cf-b94b572e42b3')</id>
   <category term="Microsoft.Test.OData.Services.OpenTypesService.Row" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"/>
   <link rel="edit" title="Row" href="Row(guid'672b8250-1e6e-4785-80cf-b94b572e42b3')"/>
   <title/>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Row/71f7d0dc-ede4-45eb-b421-555a2aa1e58f/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Row/71f7d0dc-ede4-45eb-b421-555a2aa1e58f/entity.full.json b/fit/src/main/resources/V30/Row/71f7d0dc-ede4-45eb-b421-555a2aa1e58f/entity.full.json
index 9d8e83e..dae910d 100644
--- a/fit/src/main/resources/V30/Row/71f7d0dc-ede4-45eb-b421-555a2aa1e58f/entity.full.json
+++ b/fit/src/main/resources/V30/Row/71f7d0dc-ede4-45eb-b421-555a2aa1e58f/entity.full.json
@@ -1,7 +1,7 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/OpenType.svc/$metadata#Row/@Element",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/OpenType.svc/$metadata#Row/@Element",
   "odata.type": "Microsoft.Test.OData.Services.OpenTypesService.Row",
-  "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/OpenType.svc/Row(guid'71f7d0dc-ede4-45eb-b421-555a2aa1e58f')",
+  "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/OpenType.svc/Row(guid'71f7d0dc-ede4-45eb-b421-555a2aa1e58f')",
   "odata.editLink": "Row(guid'71f7d0dc-ede4-45eb-b421-555a2aa1e58f')",
   "Id@odata.type": "Edm.Guid",
   "Id": "71f7d0dc-ede4-45eb-b421-555a2aa1e58f",

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Row/71f7d0dc-ede4-45eb-b421-555a2aa1e58f/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Row/71f7d0dc-ede4-45eb-b421-555a2aa1e58f/entity.xml b/fit/src/main/resources/V30/Row/71f7d0dc-ede4-45eb-b421-555a2aa1e58f/entity.xml
index c8544c0..da708ea 100644
--- a/fit/src/main/resources/V30/Row/71f7d0dc-ede4-45eb-b421-555a2aa1e58f/entity.xml
+++ b/fit/src/main/resources/V30/Row/71f7d0dc-ede4-45eb-b421-555a2aa1e58f/entity.xml
@@ -19,11 +19,11 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/OpenType.svc/" 
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/OpenType.svc/" 
        xmlns="http://www.w3.org/2005/Atom" 
        xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" 
        xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/OpenType.svc/Row(guid'71f7d0dc-ede4-45eb-b421-555a2aa1e58f')</id>
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/OpenType.svc/Row(guid'71f7d0dc-ede4-45eb-b421-555a2aa1e58f')</id>
   <category term="Microsoft.Test.OData.Services.OpenTypesService.Row" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"/>
   <link rel="edit" title="Row" href="Row(guid'71f7d0dc-ede4-45eb-b421-555a2aa1e58f')"/>
   <title/>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/services.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/services.full.json b/fit/src/main/resources/V30/services.full.json
index 87e63c9..2345038 100644
--- a/fit/src/main/resources/V30/services.full.json
+++ b/fit/src/main/resources/V30/services.full.json
@@ -1,5 +1,5 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata",
   "value":
           [
             {

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/services.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/services.xml b/fit/src/main/resources/V30/services.xml
index da05e3c..a4214a4 100644
--- a/fit/src/main/resources/V30/services.xml
+++ b/fit/src/main/resources/V30/services.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<service xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2007/app" xmlns:atom="http://www.w3.org/2005/Atom">
+<service xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2007/app" xmlns:atom="http://www.w3.org/2005/Atom">
   <workspace>
     <atom:title>Default</atom:title>
     <collection href="AllGeoTypesSet">

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Accounts/101/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Accounts/101/entity.full.json b/fit/src/main/resources/V40/Accounts/101/entity.full.json
index 8b63553..d1e74fb 100644
--- a/fit/src/main/resources/V40/Accounts/101/entity.full.json
+++ b/fit/src/main/resources/V40/Accounts/101/entity.full.json
@@ -1,8 +1,8 @@
 {
-  "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts/$entity",
+  "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts/$entity",
   "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Account",
-  "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)",
-  "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)",
+  "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)",
+  "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)",
   "AccountID": 101,
   "Country": "US",
   "AccountInfo": {
@@ -11,24 +11,24 @@
     "LastName": "Green",
     "MiddleName": "Hood"
   },
-  "MyGiftCard@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyGiftCard/$ref",
-  "MyGiftCard@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyGiftCard",
-  "MyPaymentInstruments@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments/$ref",
-  "MyPaymentInstruments@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments",
-  "ActiveSubscriptions@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/ActiveSubscriptions/$ref",
-  "ActiveSubscriptions@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/ActiveSubscriptions",
-  "AvailableSubscriptionTemplatess@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/AvailableSubscriptionTemplatess/$ref",
-  "AvailableSubscriptionTemplatess@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/AvailableSubscriptionTemplatess",
+  "MyGiftCard@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyGiftCard/$ref",
+  "MyGiftCard@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyGiftCard",
+  "MyPaymentInstruments@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments/$ref",
+  "MyPaymentInstruments@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments",
+  "ActiveSubscriptions@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/ActiveSubscriptions/$ref",
+  "ActiveSubscriptions@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/ActiveSubscriptions",
+  "AvailableSubscriptionTemplatess@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/AvailableSubscriptionTemplatess/$ref",
+  "AvailableSubscriptionTemplatess@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/AvailableSubscriptionTemplatess",
   "#Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI": {
     "title": "Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI",
-    "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI"
+    "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI"
   },
   "#Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI": {
     "title": "Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI",
-    "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI"
+    "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI"
   },
   "#Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo": {
     "title": "Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo",
-    "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo"
+    "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo"
   }
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Accounts/101/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Accounts/101/entity.xml b/fit/src/main/resources/V40/Accounts/101/entity.xml
index 8313de3..3eab750 100644
--- a/fit/src/main/resources/V40/Accounts/101/entity.xml
+++ b/fit/src/main/resources/V40/Accounts/101/entity.xml
@@ -19,28 +19,28 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.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://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts/$entity">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.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://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts/$entity">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/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://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)"/>
-  <link rel="http://docs.oasis-open.org/odata/ns/related/MyGiftCard" type="application/atom+xml;type=entry" title="MyGiftCard" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyGiftCard"/>
-  <link rel="http://docs.oasis-open.org/odata/ns/related/MyPaymentInstruments" type="application/atom+xml;type=feed" title="MyPaymentInstruments" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments"/>
-  <link rel="http://docs.oasis-open.org/odata/ns/related/ActiveSubscriptions" type="application/atom+xml;type=feed" title="ActiveSubscriptions" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/ActiveSubscriptions"/>
-  <link rel="http://docs.oasis-open.org/odata/ns/related/AvailableSubscriptionTemplatess" type="application/atom+xml;type=feed" title="AvailableSubscriptionTemplatess" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/AvailableSubscriptionTemplatess"/>
+  <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)"/>
+  <link rel="http://docs.oasis-open.org/odata/ns/related/MyGiftCard" type="application/atom+xml;type=entry" title="MyGiftCard" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyGiftCard"/>
+  <link rel="http://docs.oasis-open.org/odata/ns/related/MyPaymentInstruments" type="application/atom+xml;type=feed" title="MyPaymentInstruments" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments"/>
+  <link rel="http://docs.oasis-open.org/odata/ns/related/ActiveSubscriptions" type="application/atom+xml;type=feed" title="ActiveSubscriptions" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/ActiveSubscriptions"/>
+  <link rel="http://docs.oasis-open.org/odata/ns/related/AvailableSubscriptionTemplatess" type="application/atom+xml;type=feed" title="AvailableSubscriptionTemplatess" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/AvailableSubscriptionTemplatess"/>
   <title/>
   <updated>2014-04-14T12:45:00Z</updated>
   <author>
     <name/>
   </author>
-  <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI" 
+  <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI" 
             title="Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI" 
-            target="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI"/>
-  <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI" 
+            target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI"/>
+  <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI" 
             title="Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI" 
-            target="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI"/>
-  <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo" 
+            target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI"/>
+  <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo" 
             title="Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo" 
-            target="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo"/>
+            target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo"/>
   <content type="application/xml">
     <m:properties>
       <d:AccountID m:type="Int32">101</d:AccountID>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Accounts/101/links/MyGiftCard.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Accounts/101/links/MyGiftCard.full.json b/fit/src/main/resources/V40/Accounts/101/links/MyGiftCard.full.json
index a1e0295..b17f40c 100644
--- a/fit/src/main/resources/V40/Accounts/101/links/MyGiftCard.full.json
+++ b/fit/src/main/resources/V40/Accounts/101/links/MyGiftCard.full.json
@@ -1,5 +1,5 @@
 {
-  "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(101)/MyGiftCard/$entity",
+  "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(101)/MyGiftCard/$entity",
   "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.GiftCard",
   "@odata.id": "Accounts(101)/MyGiftCard",
   "@odata.editLink": "Accounts(101)/MyGiftCard",
@@ -10,6 +10,6 @@
   "ExperationDate": "2013-12-30T00:00:00Z",
   "#Microsoft.Test.OData.Services.ODataWCFService.GetActualAmount": {
     "title": "Microsoft.Test.OData.Services.ODataWCFService.GetActualAmount",
-    "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyGiftCard/Microsoft.Test.OData.Services.ODataWCFService.GetActualAmount"
+    "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyGiftCard/Microsoft.Test.OData.Services.ODataWCFService.GetActualAmount"
   }
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Accounts/101/links/MyGiftCard.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Accounts/101/links/MyGiftCard.xml b/fit/src/main/resources/V40/Accounts/101/links/MyGiftCard.xml
index 279e77b..bb8900c 100644
--- a/fit/src/main/resources/V40/Accounts/101/links/MyGiftCard.xml
+++ b/fit/src/main/resources/V40/Accounts/101/links/MyGiftCard.xml
@@ -19,7 +19,7 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.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://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(101)/MyGiftCard/$entity">
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.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://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(101)/MyGiftCard/$entity">
   <category term="#Microsoft.Test.OData.Services.ODataWCFService.GiftCard" scheme="http://docs.oasis-open.org/odata/ns/scheme" />
   <id />
   <title />
@@ -27,9 +27,9 @@
   <author>
     <name />
   </author>
-  <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.GetActualAmount" 
+  <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.GetActualAmount" 
             title="Microsoft.Test.OData.Services.ODataWCFService.GetActualAmount" 
-            target="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyGiftCard/Microsoft.Test.OData.Services.ODataWCFService.GetActualAmount"/>
+            target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyGiftCard/Microsoft.Test.OData.Services.ODataWCFService.GetActualAmount"/>
   <content type="application/xml">
     <m:properties>
       <d:GiftCardID m:type="Int32">301</d:GiftCardID>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments(101901).full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments(101901).full.json b/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments(101901).full.json
index 28c5e07..0ba1351 100644
--- a/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments(101901).full.json
+++ b/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments(101901).full.json
@@ -1,5 +1,5 @@
 {
-  "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(101)/MyPaymentInstruments/$entity",
+  "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(101)/MyPaymentInstruments/$entity",
   "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument",
   "@odata.id": "Accounts(101)/MyPaymentInstruments(101901)",
   "@odata.editLink": "Accounts(101)/MyPaymentInstruments(101901)",
@@ -7,10 +7,10 @@
   "FriendlyName": "101 first PI",
   "CreatedDate@odata.type": "#DateTimeOffset",
   "CreatedDate": "2014-04-09T00:00:00Z",
-  "TheStoredPI@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/TheStoredPI/$ref",
-  "TheStoredPI@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/TheStoredPI",
-  "BillingStatements@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BillingStatements/$ref",
-  "BillingStatements@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BillingStatements",
-  "BackupStoredPI@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BackupStoredPI/$ref",
-  "BackupStoredPI@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BackupStoredPI"
+  "TheStoredPI@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/TheStoredPI/$ref",
+  "TheStoredPI@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/TheStoredPI",
+  "BillingStatements@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BillingStatements/$ref",
+  "BillingStatements@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BillingStatements",
+  "BackupStoredPI@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BackupStoredPI/$ref",
+  "BackupStoredPI@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BackupStoredPI"
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments(101901).xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments(101901).xml b/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments(101901).xml
index 7bae727..977c507 100644
--- a/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments(101901).xml
+++ b/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments(101901).xml
@@ -19,12 +19,12 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.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://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(101)/MyPaymentInstruments/$entity">
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.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://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(101)/MyPaymentInstruments/$entity">
   <category term="#Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument" scheme="http://docs.oasis-open.org/odata/ns/scheme"/>
-  <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)"/>
-  <link rel="http://docs.oasis-open.org/odata/ns/related/TheStoredPI" type="application/atom+xml;type=entry" title="TheStoredPI" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/TheStoredPI"/>
-  <link rel="http://docs.oasis-open.org/odata/ns/related/BillingStatements" type="application/atom+xml;type=feed" title="BillingStatements" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BillingStatements"/>
-  <link rel="http://docs.oasis-open.org/odata/ns/related/BackupStoredPI" type="application/atom+xml;type=entry" title="BackupStoredPI" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BackupStoredPI"/>
+  <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)"/>
+  <link rel="http://docs.oasis-open.org/odata/ns/related/TheStoredPI" type="application/atom+xml;type=entry" title="TheStoredPI" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/TheStoredPI"/>
+  <link rel="http://docs.oasis-open.org/odata/ns/related/BillingStatements" type="application/atom+xml;type=feed" title="BillingStatements" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BillingStatements"/>
+  <link rel="http://docs.oasis-open.org/odata/ns/related/BackupStoredPI" type="application/atom+xml;type=entry" title="BackupStoredPI" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BackupStoredPI"/>
   <id/>
   <title/>
   <updated>2014-04-14T12:47:37Z</updated>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments(101902).full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments(101902).full.json b/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments(101902).full.json
index ba7e1d8..1bf3d10 100644
--- a/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments(101902).full.json
+++ b/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments(101902).full.json
@@ -1,5 +1,5 @@
 {
-  "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(101)/MyPaymentInstruments/$entity",
+  "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(101)/MyPaymentInstruments/$entity",
   "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument",
   "@odata.id": "Accounts(101)/MyPaymentInstruments(101902)",
   "@odata.editLink": "Accounts(101)/MyPaymentInstruments(101902)",
@@ -7,10 +7,10 @@
   "FriendlyName": "101 first PI",
   "CreatedDate@odata.type": "#DateTimeOffset",
   "CreatedDate": "2014-04-09T00:00:00Z",
-  "TheStoredPI@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/TheStoredPI/$ref",
-  "TheStoredPI@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/TheStoredPI",
-  "BillingStatements@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/BillingStatements/$ref",
-  "BillingStatements@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/BillingStatements",
-  "BackupStoredPI@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/BackupStoredPI/$ref",
-  "BackupStoredPI@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/BackupStoredPI"
+  "TheStoredPI@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/TheStoredPI/$ref",
+  "TheStoredPI@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/TheStoredPI",
+  "BillingStatements@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/BillingStatements/$ref",
+  "BillingStatements@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/BillingStatements",
+  "BackupStoredPI@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/BackupStoredPI/$ref",
+  "BackupStoredPI@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/BackupStoredPI"
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments(101902).xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments(101902).xml b/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments(101902).xml
index 1d967ed..57efe81 100644
--- a/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments(101902).xml
+++ b/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments(101902).xml
@@ -19,12 +19,12 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.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://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(101)/MyPaymentInstruments/$entity">
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.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://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(101)/MyPaymentInstruments/$entity">
   <category term="#Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument" scheme="http://docs.oasis-open.org/odata/ns/scheme"/>
-  <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)"/>
-  <link rel="http://docs.oasis-open.org/odata/ns/related/TheStoredPI" type="application/atom+xml;type=entry" title="TheStoredPI" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/TheStoredPI"/>
-  <link rel="http://docs.oasis-open.org/odata/ns/related/BillingStatements" type="application/atom+xml;type=feed" title="BillingStatements" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/BillingStatements"/>
-  <link rel="http://docs.oasis-open.org/odata/ns/related/BackupStoredPI" type="application/atom+xml;type=entry" title="BackupStoredPI" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/BackupStoredPI"/>
+  <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)"/>
+  <link rel="http://docs.oasis-open.org/odata/ns/related/TheStoredPI" type="application/atom+xml;type=entry" title="TheStoredPI" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/TheStoredPI"/>
+  <link rel="http://docs.oasis-open.org/odata/ns/related/BillingStatements" type="application/atom+xml;type=feed" title="BillingStatements" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/BillingStatements"/>
+  <link rel="http://docs.oasis-open.org/odata/ns/related/BackupStoredPI" type="application/atom+xml;type=entry" title="BackupStoredPI" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/BackupStoredPI"/>
   <id/>
   <title/>
   <updated>2014-04-14T12:47:37Z</updated>


[15/20] [OLINGO-377] Removing unused cargo properties, upgrading Tomcat, renaming cargo.servlet.port to tomcat.servlet.port

Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/filter/(indexof(PrimaryContactInfo.HomePhone.PhoneNumber,'lccvussrv') ne -1).xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/filter/(indexof(PrimaryContactInfo.HomePhone.PhoneNumber,'lccvussrv') ne -1).xml b/fit/src/main/resources/V30/Customer/filter/(indexof(PrimaryContactInfo.HomePhone.PhoneNumber,'lccvussrv') ne -1).xml
index abce058..1a6be80 100644
--- a/fit/src/main/resources/V30/Customer/filter/(indexof(PrimaryContactInfo.HomePhone.PhoneNumber,'lccvussrv') ne -1).xml	
+++ b/fit/src/main/resources/V30/Customer/filter/(indexof(PrimaryContactInfo.HomePhone.PhoneNumber,'lccvussrv') ne -1).xml	
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer</id>
   <title type="text">Customer</title>
   <updated>2014-02-13T12:09:31Z</updated>
   <link rel="self" title="Customer" href="Customer" />
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Customer" href="Customer(-10)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="Customer(-10)/Orders" />
@@ -72,7 +72,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-5)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-5)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Customer" href="Customer(-5)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="Customer(-5)/Orders" />
@@ -596,5 +596,5 @@
       </m:properties>
     </content>
   </entry>
-  <link rel="next" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer?$filter=(indexof(PrimaryContactInfo/HomePhone/PhoneNumber,'lccvussrv')%20ne%20-1)&amp;$skiptoken=-5" />
+  <link rel="next" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer?$filter=(indexof(PrimaryContactInfo/HomePhone/PhoneNumber,'lccvussrv')%20ne%20-1)&amp;$skiptoken=-5" />
 </feed>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/filter/CustomerId eq -10.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/filter/CustomerId eq -10.full.json b/fit/src/main/resources/V30/Customer/filter/CustomerId eq -10.full.json
index a8c33d6..e8a078d 100644
--- a/fit/src/main/resources/V30/Customer/filter/CustomerId eq -10.full.json	
+++ b/fit/src/main/resources/V30/Customer/filter/CustomerId eq -10.full.json	
@@ -1,10 +1,10 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer",
   "value":
           [
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)",
               "odata.editLink": "Customer(-10)",
               "Orders@odata.navigationLinkUrl": "Customer(-10)/Orders",
               "Logins@odata.navigationLinkUrl": "Customer(-10)/Logins",

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/filter/CustomerId eq -10.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/filter/CustomerId eq -10.xml b/fit/src/main/resources/V30/Customer/filter/CustomerId eq -10.xml
index 821f749..e96602c 100644
--- a/fit/src/main/resources/V30/Customer/filter/CustomerId eq -10.xml	
+++ b/fit/src/main/resources/V30/Customer/filter/CustomerId eq -10.xml	
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer</id>
   <title type="text">Customer</title>
   <updated>2014-02-13T13:56:43Z</updated>
   <link rel="self" title="Customer" href="Customer" />
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Customer" href="Customer(-10)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="Customer(-10)/Orders" />


[06/20] [OLINGO-377] Removing unused cargo properties, upgrading Tomcat, renaming cargo.servlet.port to tomcat.servlet.port

Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/filter/floor(Dimensions.Width) eq 7337.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/filter/floor(Dimensions.Width) eq 7337.full.json b/fit/src/main/resources/V30/Product/filter/floor(Dimensions.Width) eq 7337.full.json
index a6396a6..56ad12c 100644
--- a/fit/src/main/resources/V30/Product/filter/floor(Dimensions.Width) eq 7337.full.json	
+++ b/fit/src/main/resources/V30/Product/filter/floor(Dimensions.Width) eq 7337.full.json	
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-5)","odata.etag":"W/\"'inxlfdfruoalzluabvubrgahsg','ixxletiyfrigooaltaqikqcnkpepfufyffmuouknjzyelardpyudoachqdejrjnuhueunugyli'\"","odata.editLink":"Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct","RelatedProducts@odata.navigationLinkUrl":"Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts","Detail@odata.navigationLinkUrl":"Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Detail","Reviews@odata.navigationLinkUrl":"Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Reviews","Photos@odata.navigationLinkUrl":"Product(-5)/Microsoft.Test.OD
 ata.Services.AstoriaDefaultService.DiscontinuedProduct/Photos","#DefaultContainer.ChangeProductDimensions":{"title":"ChangeProductDimensions","target":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"},"Picture@odata.mediaEditLink":"Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture","ProductId":-5,"Description":"uuudqysoiozagpcpumnydpupopsvd","Dimensions":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"7337.75206762393","Height@odata.type":"Edm.Decimal","Height":"-4.63644378890358","Depth@odata.type":"Edm.Decimal","Depth":"-79228162514264337593543950335"},"BaseConcurrency":"inxlfdfruoalzluabvubrgahsg","ComplexConcurrency":null,"NestedComplexConcurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo","Modified
 Date@odata.type":"Edm.DateTime","ModifiedDate":"9999-12-31T23:59:59.9999999","ModifiedBy":"mlsbmanrhvygvakricoomrnksyutxxdrbizpdzdunzzukgkeaibnuufvxcjputulmcutevhiyflnsjahjistqrlasor","Concurrency":null},"Discontinued@odata.type":"Edm.DateTime","Discontinued":"2012-06-17T07:49:33.4591089","ReplacementProductId":-2147483648,"DiscontinuedPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u3073\u30de","Extension":"\u4e5d\u305c\u30be\u3079\u3041\u3073\u30df\u0451\u0451\u6b79\u73f1\u4e5d\u305e\u3042\uff41\u305e\u30af\u30c0\u307e\u30a1\u30df\u30bd\u3093\u6b79\u6b32\u3079\u4e9c\u305c\u30c1\u305c\u30c1\u3041\u30dc\u30bc\uff9d\u044f\u307b\u73f1\u30be\u30be\u307c\u531a\u305c\u30cf\u30df\u30bd\u3041\u30dc\u305c\u3041\u30a1\u30c1\u30af\u30bf\u9ed1\u3092\u531a\u30dc\u30b0\u73f1\u30bc\u30dc\u30bd\uff5a"},"ChildConcurrencyToken":"ixxletiyfrigooaltaqikqcnkpepfufyffmuouknjzyelardpyudoachqdejrjnuhueunugyli"}]}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-5)","odata.etag":"W/\"'inxlfdfruoalzluabvubrgahsg','ixxletiyfrigooaltaqikqcnkpepfufyffmuouknjzyelardpyudoachqdejrjnuhueunugyli'\"","odata.editLink":"Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct","RelatedProducts@odata.navigationLinkUrl":"Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts","Detail@odata.navigationLinkUrl":"Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Detail","Reviews@odata.navigationLinkUrl":"Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Reviews","Photos@odata.navigationLinkUrl":"Product(-5)/Microsoft.Test.
 OData.Services.AstoriaDefaultService.DiscontinuedProduct/Photos","#DefaultContainer.ChangeProductDimensions":{"title":"ChangeProductDimensions","target":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"},"Picture@odata.mediaEditLink":"Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture","ProductId":-5,"Description":"uuudqysoiozagpcpumnydpupopsvd","Dimensions":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"7337.75206762393","Height@odata.type":"Edm.Decimal","Height":"-4.63644378890358","Depth@odata.type":"Edm.Decimal","Depth":"-79228162514264337593543950335"},"BaseConcurrency":"inxlfdfruoalzluabvubrgahsg","ComplexConcurrency":null,"NestedComplexConcurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo","Modif
 iedDate@odata.type":"Edm.DateTime","ModifiedDate":"9999-12-31T23:59:59.9999999","ModifiedBy":"mlsbmanrhvygvakricoomrnksyutxxdrbizpdzdunzzukgkeaibnuufvxcjputulmcutevhiyflnsjahjistqrlasor","Concurrency":null},"Discontinued@odata.type":"Edm.DateTime","Discontinued":"2012-06-17T07:49:33.4591089","ReplacementProductId":-2147483648,"DiscontinuedPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u3073\u30de","Extension":"\u4e5d\u305c\u30be\u3079\u3041\u3073\u30df\u0451\u0451\u6b79\u73f1\u4e5d\u305e\u3042\uff41\u305e\u30af\u30c0\u307e\u30a1\u30df\u30bd\u3093\u6b79\u6b32\u3079\u4e9c\u305c\u30c1\u305c\u30c1\u3041\u30dc\u30bc\uff9d\u044f\u307b\u73f1\u30be\u30be\u307c\u531a\u305c\u30cf\u30df\u30bd\u3041\u30dc\u305c\u3041\u30a1\u30c1\u30af\u30bf\u9ed1\u3092\u531a\u30dc\u30b0\u73f1\u30bc\u30dc\u30bd\uff5a"},"ChildConcurrencyToken":"ixxletiyfrigooaltaqikqcnkpepfufyffmuouknjzyelardpyudoachqdejrjnuhueunugyli"}]}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/filter/floor(Dimensions.Width) eq 7337.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/filter/floor(Dimensions.Width) eq 7337.xml b/fit/src/main/resources/V30/Product/filter/floor(Dimensions.Width) eq 7337.xml
index 841304d..4d99e7a 100644
--- a/fit/src/main/resources/V30/Product/filter/floor(Dimensions.Width) eq 7337.xml	
+++ b/fit/src/main/resources/V30/Product/filter/floor(Dimensions.Width) eq 7337.xml	
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product</id>
   <title type="text">Product</title>
   <updated>2014-02-13T14:31:05Z</updated>
   <link rel="self" title="Product" href="Product" />
   <entry m:etag="W/&quot;'inxlfdfruoalzluabvubrgahsg','ixxletiyfrigooaltaqikqcnkpepfufyffmuouknjzyelardpyudoachqdejrjnuhueunugyli'&quot;">
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-5)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-5)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Product" href="Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/RelatedProducts" type="application/atom+xml;type=feed" title="RelatedProducts" href="Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts" />
@@ -38,7 +38,7 @@
       <name />
     </author>
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Picture" title="Picture" href="Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture" />
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
     <content type="application/xml">
       <m:properties>
         <d:ProductId m:type="Edm.Int32">-5</d:ProductId>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/filter/indexof(Description, 'k') eq 0.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/filter/indexof(Description, 'k') eq 0.full.json b/fit/src/main/resources/V30/Product/filter/indexof(Description, 'k') eq 0.full.json
index ea6bce0..45c6a1d 100644
--- a/fit/src/main/resources/V30/Product/filter/indexof(Description, 'k') eq 0.full.json	
+++ b/fit/src/main/resources/V30/Product/filter/indexof(Description, 'k') eq 0.full.json	
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)","odata.etag":"W/\"'%D1%8F%E3%82%A1%E3%81%9D%E7%8F%B1%EF%BD%9A%E3%81%9D%E7%B8%B7%E3%83%9F%D1%91%E3%83%9C%E3%81%9C%D0%AF%E6%AD%B9%E3%83%9F%E3%83%90%E3%81%BB%E3%83%9D%E3%81%BB%E3%82%BC%EF%BD%A6%E7%95%9A%E3%82%AF%E3%81%BB%EF%BE%88%E3%82%BC%E3%81%BE%E8%A3%B9%E3%81%B3%E3%81%B4%E3%81%B9%E6%AD%B9%E3%81%82%E3%83%80%E3%82%B0%E3%82%BD%E3%81%B3%D1%91%D1%91%E3%82%93%E3%83%9D%E3%81%9D%E3%83%9F%E3%83%9E%E3%81%BB%E3%82%BD%EF%BD%9A%E8%A3%B9%E3%81%BC%E3%82%93%E7%8F%B1%E3%81%B9%E3%82%BC%E6%AD%B9%E3%83%9F%EF%BD%9A%E3%83%9D%E3%81%9C%E3%81%9E%E3%82%BD%E3%83%9D%E3%81%BA%E3%83%9F%E3%83%80%E6%AC%B2%E5%BC%8C%D1%8F%E3%82%BD%E3%82%BD%E3%81%BD%E3%82%BD%E3%81%B9%E3%83%90%E9%BB%91%E4%B9%9D%E7%8F%B1%E3%81%9E%E3%83
 %9D%D0%AF%E3%83%80%E3%82%BD%E3%82%BC','%E8%A3%B9%E3%81%BA%E3%82%BE%E7%B8%B7%E3%82%BC%E3%81%BB%E3%82%BC%E3%82%BD%EF%BD%9A%E3%82%BC%EF%BD%9A%E3%81%9C%E3%82%BD%EF%BE%9D%E3%82%BC%E3%82%92%E3%81%BE%E3%81%81%E3%83%80%E3%81%B3%E3%82%BF%E7%8F%B1%E3%82%BF%E3%83%90%E3%82%BE%E3%82%BE%E3%83%9F%E3%83%81%E3%83%9C%E6%9A%A6%E3%82%BD%E3%82%A1%E3%81%B9%E8%A3%B9%E3%83%9D%E3%81%9C%E3%82%92%EF%BD%A6%E3%81%B3%E3%82%BC%E3%83%9E%E3%82%92%E3%82%BC%E3%83%9F%E3%81%BD%E3%83%9C%E3%82%BD%EF%BE%88%E3%81%BD%E3%83%9D%E3%83%9F%E3%82%BE%EF%BD%81%E3%82%BF%E3%82%BD%E3%81%81%E3%83%9E%E8%A3%B9%E3%82%B0%EF%BD%81%E3%82%BF%E6%AD%B9%E6%AD%B9%E3%81%9F%EF%BD%9A%E3%83%90%E7%B8%B7%E3%83%81%E3%82%93%E3%82%92%D0%AF%E3%82%93%E7%95%9A%E3%81%9F%E3%82%BE%E3%81%B9%E3%82%BD%E6%AC%B2%E3%82%A1%E7%B8%B7%D1%8F%E3%83%9F%E3%82%92%EF%BD%A6%E3%81%9B%EF%BD%A6%E3%82%BC%E3%83%9E%E3%82%BD%E3%83%9C%E3%82%BC%E3%82%BC%E3%83%81%E3%81%BC%E7%95%9A%E7%8F%B1'\"","odata.editLink":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedP
 roduct","RelatedProducts@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts","Detail@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Detail","Reviews@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Reviews","Photos@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Photos","#DefaultContainer.ChangeProductDimensions":{"title":"ChangeProductDimensions","target":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"},"Picture@odata.mediaEditLink":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture","ProductId":-9,"Description":"kdcuklu","Dimensions":{"odata.type":"Mi
 crosoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"-25802798699776200000000000000","Height@odata.type":"Edm.Decimal","Height":"38.543408267225","Depth@odata.type":"Edm.Decimal","Depth":"-8459.21552673786"},"BaseConcurrency":"\u044f\u30a1\u305d\u73f1\uff5a\u305d\u7e37\u30df\u0451\u30dc\u305c\u042f\u6b79\u30df\u30d0\u307b\u30dd\u307b\u30bc\uff66\u755a\u30af\u307b\uff88\u30bc\u307e\u88f9\u3073\u3074\u3079\u6b79\u3042\u30c0\u30b0\u30bd\u3073\u0451\u0451\u3093\u30dd\u305d\u30df\u30de\u307b\u30bd\uff5a\u88f9\u307c\u3093\u73f1\u3079\u30bc\u6b79\u30df\uff5a\u30dd\u305c\u305e\u30bd\u30dd\u307a\u30df\u30c0\u6b32\u5f0c\u044f\u30bd\u30bd\u307d\u30bd\u3079\u30d0\u9ed1\u4e5d\u73f1\u305e\u30dd\u042f\u30c0\u30bd\u30bc","ComplexConcurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo","Token":"vkvezqrkjuykjmk\u00dfyqpliyv\u00df","QueriedDateTime":null},"NestedComplexConcurrency":{"odata.type":"Microsoft.Test.
 OData.Services.AstoriaDefaultService.AuditInfo","ModifiedDate@odata.type":"Edm.DateTime","ModifiedDate":"2012-11-20T10:27:48.8528105","ModifiedBy":"gtpakgdzcfjyumozyqzrhxuypuzfqhvmzeepvjllfncsjuumjzdxvlhjprgphzfvjxzsklilojgtqhktpj","Concurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo","Token":"\u30dc\u30dc\uff9d\u3072\u0451\u7e37\u305d\u30a1\u307d\u30bc\u3093\u30c0\u73f1\u30bc\u3041\uff5a\u755a\u4e9c\u4e9c\u30bc\u3072\u30d0\u4e9c\u307b\u3079\u30cf\uff9d\uff88\u305f\u30dd\u4e5d\u30be\u3079\u30c0\u305e\u755a\u30bf\uff5a\u30be\u307c\u30a1\u042f\u30c0\u3092\u3042","QueriedDateTime@odata.type":"Edm.DateTime","QueriedDateTime":"2005-10-12T22:26:24.9396883"}},"Discontinued@odata.type":"Edm.DateTime","Discontinued":"2005-07-28T13:09:56.9997833","ReplacementProductId":null,"DiscontinuedPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u7e37\u305f\u3079\u30cf\u30dc\u6b32\u30a1\u3093\u307d\u3074\u30bd\uf
 f41\u307d\u30be\u3042\u305f\u3041\u30bd\u3073\u307c\u30dd\u4e5d\u30d0\u307b\u755a\u30bc\u307e\uff41\u307c\u305d\u042f\u4e9c\uff88\u3041\u30b0\u3074\u66a6\uff5a\u30dd\u307b\u30dc\u30dc\uff88\u3074","Extension":"bozhmrtomzrcmheuuqybovfiuypathsafmriopuccbqubhqbmuauxvnftvnpisgobryzqya"},"ChildConcurrencyToken":"\u88f9\u307a\u30be\u7e37\u30bc\u307b\u30bc\u30bd\uff5a\u30bc\uff5a\u305c\u30bd\uff9d\u30bc\u3092\u307e\u3041\u30c0\u3073\u30bf\u73f1\u30bf\u30d0\u30be\u30be\u30df\u30c1\u30dc\u66a6\u30bd\u30a1\u3079\u88f9\u30dd\u305c\u3092\uff66\u3073\u30bc\u30de\u3092\u30bc\u30df\u307d\u30dc\u30bd\uff88\u307d\u30dd\u30df\u30be\uff41\u30bf\u30bd\u3041\u30de\u88f9\u30b0\uff41\u30bf\u6b79\u6b79\u305f\uff5a\u30d0\u7e37\u30c1\u3093\u3092\u042f\u3093\u755a\u305f\u30be\u3079\u30bd\u6b32\u30a1\u7e37\u044f\u30df\u3092\uff66\u305b\uff66\u30bc\u30de\u30bd\u30dc\u30bc\u30bc\u30c1\u307c\u755a\u73f1"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct","odata.id":"http://lo
 calhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-8)","odata.etag":"W/\"'asme','hhsbjscessmdunkssmvqmqyzuahm'\"","odata.editLink":"Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct","RelatedProducts@odata.navigationLinkUrl":"Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts","Detail@odata.navigationLinkUrl":"Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Detail","Reviews@odata.navigationLinkUrl":"Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Reviews","Photos@odata.navigationLinkUrl":"Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Photos","#DefaultContainer.ChangeProductDimensions":{"title":"ChangeProductDimensions","target":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.Disconti
 nuedProduct/ChangeProductDimensions"},"Picture@odata.mediaEditLink":"Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture","ProductId":-8,"Description":"kel\u00dfebrrbesshcnkmhsxoky\u00dfetgscprtmiptxyiqnxrohj\u00dfuyfeg\u00df\u00dfmlnejcsmkemgjfrxpqfeffuuqrubvznftmniuulxz","Dimensions":null,"BaseConcurrency":"asme","ComplexConcurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo","Token":null,"QueriedDateTime@odata.type":"Edm.DateTime","QueriedDateTime":"2012-10-11T05:04:16.3627949"},"NestedComplexConcurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo","ModifiedDate@odata.type":"Edm.DateTime","ModifiedDate":"5431-05-27T11:53:49.8454872+02:00","ModifiedBy":"xsnquujocxuumpeqsbodtugghfrghfuihjiyxgvcntkflpxohuyfgytigbdl","Concurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo","Token":"solisgfvqa","QueriedDateTime@odata.type":"Edm.Dat
 eTime","QueriedDateTime":"9363-12-30T16:34:30.1866623"}},"Discontinued@odata.type":"Edm.DateTime","Discontinued":"2012-08-22T13:41:42.8011658","ReplacementProductId":62,"DiscontinuedPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ulemcjvsndemzkctrfhkiuiblmhdkkledze","Extension":"\u30b0\u9ed1\u30dd\u042f\u30dd\u30bd\u6b32\u30bf\u3074\u307a\u755a\u3092\u307b\u307e\u30d0\u307d\uff9d\u30bc\u6b79\u3041\u30dd\u0451\u30cf\u3092\u305c\u4e5d\u042f\u307e\u042f\u30bd\u305c\u66a6\uff5a\u30c0\u044f\u30c1\u30bc\u6b32\u30bd\u30df\u30de\u3041\u3079\u3041\u30cf\u3074\u3092\u531a\u30dd\u30df\u3042\u4e5d\u305e\u30df\u305e\u30a1\u30a1\u30af\u88f9\uff41\u30bd\u30bf\u30bf\u4e9c\u305d\u3042\u30af\u30de\u307d\u0451\u73f1\u3072\uff88\u305c\u30af\u30dc\u6b32\u30c0\u30df\u9ed1"},"ChildConcurrencyToken":"hhsbjscessmdunkssmvqmqyzuahm"}]}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)","odata.etag":"W/\"'%D1%8F%E3%82%A1%E3%81%9D%E7%8F%B1%EF%BD%9A%E3%81%9D%E7%B8%B7%E3%83%9F%D1%91%E3%83%9C%E3%81%9C%D0%AF%E6%AD%B9%E3%83%9F%E3%83%90%E3%81%BB%E3%83%9D%E3%81%BB%E3%82%BC%EF%BD%A6%E7%95%9A%E3%82%AF%E3%81%BB%EF%BE%88%E3%82%BC%E3%81%BE%E8%A3%B9%E3%81%B3%E3%81%B4%E3%81%B9%E6%AD%B9%E3%81%82%E3%83%80%E3%82%B0%E3%82%BD%E3%81%B3%D1%91%D1%91%E3%82%93%E3%83%9D%E3%81%9D%E3%83%9F%E3%83%9E%E3%81%BB%E3%82%BD%EF%BD%9A%E8%A3%B9%E3%81%BC%E3%82%93%E7%8F%B1%E3%81%B9%E3%82%BC%E6%AD%B9%E3%83%9F%EF%BD%9A%E3%83%9D%E3%81%9C%E3%81%9E%E3%82%BD%E3%83%9D%E3%81%BA%E3%83%9F%E3%83%80%E6%AC%B2%E5%BC%8C%D1%8F%E3%82%BD%E3%82%BD%E3%81%BD%E3%82%BD%E3%81%B9%E3%83%90%E9%BB%91%E4%B9%9D%E7%8F%B1%E3%81%9E%E3%
 83%9D%D0%AF%E3%83%80%E3%82%BD%E3%82%BC','%E8%A3%B9%E3%81%BA%E3%82%BE%E7%B8%B7%E3%82%BC%E3%81%BB%E3%82%BC%E3%82%BD%EF%BD%9A%E3%82%BC%EF%BD%9A%E3%81%9C%E3%82%BD%EF%BE%9D%E3%82%BC%E3%82%92%E3%81%BE%E3%81%81%E3%83%80%E3%81%B3%E3%82%BF%E7%8F%B1%E3%82%BF%E3%83%90%E3%82%BE%E3%82%BE%E3%83%9F%E3%83%81%E3%83%9C%E6%9A%A6%E3%82%BD%E3%82%A1%E3%81%B9%E8%A3%B9%E3%83%9D%E3%81%9C%E3%82%92%EF%BD%A6%E3%81%B3%E3%82%BC%E3%83%9E%E3%82%92%E3%82%BC%E3%83%9F%E3%81%BD%E3%83%9C%E3%82%BD%EF%BE%88%E3%81%BD%E3%83%9D%E3%83%9F%E3%82%BE%EF%BD%81%E3%82%BF%E3%82%BD%E3%81%81%E3%83%9E%E8%A3%B9%E3%82%B0%EF%BD%81%E3%82%BF%E6%AD%B9%E6%AD%B9%E3%81%9F%EF%BD%9A%E3%83%90%E7%B8%B7%E3%83%81%E3%82%93%E3%82%92%D0%AF%E3%82%93%E7%95%9A%E3%81%9F%E3%82%BE%E3%81%B9%E3%82%BD%E6%AC%B2%E3%82%A1%E7%B8%B7%D1%8F%E3%83%9F%E3%82%92%EF%BD%A6%E3%81%9B%EF%BD%A6%E3%82%BC%E3%83%9E%E3%82%BD%E3%83%9C%E3%82%BC%E3%82%BC%E3%83%81%E3%81%BC%E7%95%9A%E7%8F%B1'\"","odata.editLink":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.Discontinue
 dProduct","RelatedProducts@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts","Detail@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Detail","Reviews@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Reviews","Photos@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Photos","#DefaultContainer.ChangeProductDimensions":{"title":"ChangeProductDimensions","target":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"},"Picture@odata.mediaEditLink":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture","ProductId":-9,"Description":"kdcuklu","Dimensions":{"odata.type":
 "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"-25802798699776200000000000000","Height@odata.type":"Edm.Decimal","Height":"38.543408267225","Depth@odata.type":"Edm.Decimal","Depth":"-8459.21552673786"},"BaseConcurrency":"\u044f\u30a1\u305d\u73f1\uff5a\u305d\u7e37\u30df\u0451\u30dc\u305c\u042f\u6b79\u30df\u30d0\u307b\u30dd\u307b\u30bc\uff66\u755a\u30af\u307b\uff88\u30bc\u307e\u88f9\u3073\u3074\u3079\u6b79\u3042\u30c0\u30b0\u30bd\u3073\u0451\u0451\u3093\u30dd\u305d\u30df\u30de\u307b\u30bd\uff5a\u88f9\u307c\u3093\u73f1\u3079\u30bc\u6b79\u30df\uff5a\u30dd\u305c\u305e\u30bd\u30dd\u307a\u30df\u30c0\u6b32\u5f0c\u044f\u30bd\u30bd\u307d\u30bd\u3079\u30d0\u9ed1\u4e5d\u73f1\u305e\u30dd\u042f\u30c0\u30bd\u30bc","ComplexConcurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo","Token":"vkvezqrkjuykjmk\u00dfyqpliyv\u00df","QueriedDateTime":null},"NestedComplexConcurrency":{"odata.type":"Microsoft.Te
 st.OData.Services.AstoriaDefaultService.AuditInfo","ModifiedDate@odata.type":"Edm.DateTime","ModifiedDate":"2012-11-20T10:27:48.8528105","ModifiedBy":"gtpakgdzcfjyumozyqzrhxuypuzfqhvmzeepvjllfncsjuumjzdxvlhjprgphzfvjxzsklilojgtqhktpj","Concurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo","Token":"\u30dc\u30dc\uff9d\u3072\u0451\u7e37\u305d\u30a1\u307d\u30bc\u3093\u30c0\u73f1\u30bc\u3041\uff5a\u755a\u4e9c\u4e9c\u30bc\u3072\u30d0\u4e9c\u307b\u3079\u30cf\uff9d\uff88\u305f\u30dd\u4e5d\u30be\u3079\u30c0\u305e\u755a\u30bf\uff5a\u30be\u307c\u30a1\u042f\u30c0\u3092\u3042","QueriedDateTime@odata.type":"Edm.DateTime","QueriedDateTime":"2005-10-12T22:26:24.9396883"}},"Discontinued@odata.type":"Edm.DateTime","Discontinued":"2005-07-28T13:09:56.9997833","ReplacementProductId":null,"DiscontinuedPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u7e37\u305f\u3079\u30cf\u30dc\u6b32\u30a1\u3093\u307d\u3074\u30bd
 \uff41\u307d\u30be\u3042\u305f\u3041\u30bd\u3073\u307c\u30dd\u4e5d\u30d0\u307b\u755a\u30bc\u307e\uff41\u307c\u305d\u042f\u4e9c\uff88\u3041\u30b0\u3074\u66a6\uff5a\u30dd\u307b\u30dc\u30dc\uff88\u3074","Extension":"bozhmrtomzrcmheuuqybovfiuypathsafmriopuccbqubhqbmuauxvnftvnpisgobryzqya"},"ChildConcurrencyToken":"\u88f9\u307a\u30be\u7e37\u30bc\u307b\u30bc\u30bd\uff5a\u30bc\uff5a\u305c\u30bd\uff9d\u30bc\u3092\u307e\u3041\u30c0\u3073\u30bf\u73f1\u30bf\u30d0\u30be\u30be\u30df\u30c1\u30dc\u66a6\u30bd\u30a1\u3079\u88f9\u30dd\u305c\u3092\uff66\u3073\u30bc\u30de\u3092\u30bc\u30df\u307d\u30dc\u30bd\uff88\u307d\u30dd\u30df\u30be\uff41\u30bf\u30bd\u3041\u30de\u88f9\u30b0\uff41\u30bf\u6b79\u6b79\u305f\uff5a\u30d0\u7e37\u30c1\u3093\u3092\u042f\u3093\u755a\u305f\u30be\u3079\u30bd\u6b32\u30a1\u7e37\u044f\u30df\u3092\uff66\u305b\uff66\u30bc\u30de\u30bd\u30dc\u30bc\u30bc\u30c1\u307c\u755a\u73f1"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct","odata.id":"http:/
 /localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-8)","odata.etag":"W/\"'asme','hhsbjscessmdunkssmvqmqyzuahm'\"","odata.editLink":"Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct","RelatedProducts@odata.navigationLinkUrl":"Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts","Detail@odata.navigationLinkUrl":"Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Detail","Reviews@odata.navigationLinkUrl":"Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Reviews","Photos@odata.navigationLinkUrl":"Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Photos","#DefaultContainer.ChangeProductDimensions":{"title":"ChangeProductDimensions","target":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.Dis
 continuedProduct/ChangeProductDimensions"},"Picture@odata.mediaEditLink":"Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture","ProductId":-8,"Description":"kel\u00dfebrrbesshcnkmhsxoky\u00dfetgscprtmiptxyiqnxrohj\u00dfuyfeg\u00df\u00dfmlnejcsmkemgjfrxpqfeffuuqrubvznftmniuulxz","Dimensions":null,"BaseConcurrency":"asme","ComplexConcurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo","Token":null,"QueriedDateTime@odata.type":"Edm.DateTime","QueriedDateTime":"2012-10-11T05:04:16.3627949"},"NestedComplexConcurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo","ModifiedDate@odata.type":"Edm.DateTime","ModifiedDate":"5431-05-27T11:53:49.8454872+02:00","ModifiedBy":"xsnquujocxuumpeqsbodtugghfrghfuihjiyxgvcntkflpxohuyfgytigbdl","Concurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo","Token":"solisgfvqa","QueriedDateTime@odata.type":"Ed
 m.DateTime","QueriedDateTime":"9363-12-30T16:34:30.1866623"}},"Discontinued@odata.type":"Edm.DateTime","Discontinued":"2012-08-22T13:41:42.8011658","ReplacementProductId":62,"DiscontinuedPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ulemcjvsndemzkctrfhkiuiblmhdkkledze","Extension":"\u30b0\u9ed1\u30dd\u042f\u30dd\u30bd\u6b32\u30bf\u3074\u307a\u755a\u3092\u307b\u307e\u30d0\u307d\uff9d\u30bc\u6b79\u3041\u30dd\u0451\u30cf\u3092\u305c\u4e5d\u042f\u307e\u042f\u30bd\u305c\u66a6\uff5a\u30c0\u044f\u30c1\u30bc\u6b32\u30bd\u30df\u30de\u3041\u3079\u3041\u30cf\u3074\u3092\u531a\u30dd\u30df\u3042\u4e5d\u305e\u30df\u305e\u30a1\u30a1\u30af\u88f9\uff41\u30bd\u30bf\u30bf\u4e9c\u305d\u3042\u30af\u30de\u307d\u0451\u73f1\u3072\uff88\u305c\u30af\u30dc\u6b32\u30c0\u30df\u9ed1"},"ChildConcurrencyToken":"hhsbjscessmdunkssmvqmqyzuahm"}]}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/filter/indexof(Description, 'k') eq 0.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/filter/indexof(Description, 'k') eq 0.xml b/fit/src/main/resources/V30/Product/filter/indexof(Description, 'k') eq 0.xml
index 91d3a71..5917efe 100644
--- a/fit/src/main/resources/V30/Product/filter/indexof(Description, 'k') eq 0.xml	
+++ b/fit/src/main/resources/V30/Product/filter/indexof(Description, 'k') eq 0.xml	
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product</id>
   <title type="text">Product</title>
   <updated>2014-02-13T14:31:07Z</updated>
   <link rel="self" title="Product" href="Product" />
   <entry m:etag="W/&quot;'%D1%8F%E3%82%A1%E3%81%9D%E7%8F%B1%EF%BD%9A%E3%81%9D%E7%B8%B7%E3%83%9F%D1%91%E3%83%9C%E3%81%9C%D0%AF%E6%AD%B9%E3%83%9F%E3%83%90%E3%81%BB%E3%83%9D%E3%81%BB%E3%82%BC%EF%BD%A6%E7%95%9A%E3%82%AF%E3%81%BB%EF%BE%88%E3%82%BC%E3%81%BE%E8%A3%B9%E3%81%B3%E3%81%B4%E3%81%B9%E6%AD%B9%E3%81%82%E3%83%80%E3%82%B0%E3%82%BD%E3%81%B3%D1%91%D1%91%E3%82%93%E3%83%9D%E3%81%9D%E3%83%9F%E3%83%9E%E3%81%BB%E3%82%BD%EF%BD%9A%E8%A3%B9%E3%81%BC%E3%82%93%E7%8F%B1%E3%81%B9%E3%82%BC%E6%AD%B9%E3%83%9F%EF%BD%9A%E3%83%9D%E3%81%9C%E3%81%9E%E3%82%BD%E3%83%9D%E3%81%BA%E3%83%9F%E3%83%80%E6%AC%B2%E5%BC%8C%D1%8F%E3%82%BD%E3%82%BD%E3%81%BD%E3%82%BD%E3%81%B9%E3%83%90%E9%BB%91%E4%B9%9D%E7%8F%B1%E3%81%9E%E3%83%9D%D0%AF%E3%83%80%E3%82%BD%E3%82%BC','%E8%A3%B9%E3%81%BA%E3%82%BE%E7%B8%B7%E3%82%BC%E3%81%BB%E3%82%BC%E3%82%BD%EF%BD%9A%E3%82%BC%EF%BD%9A%E3%81%9C%E3%82%BD%EF%BE%9D%E3%82%BC%E3%82%92%E3%81%BE%E3%81%81%E3%83%80%E3%81%B3%E3%82%BF%E7%8F%B1%E3%82%BF%E3%83%90%E3%82%BE%E3%82%BE%E3%83%9F%E3%83%81%E3%83%9
 C%E6%9A%A6%E3%82%BD%E3%82%A1%E3%81%B9%E8%A3%B9%E3%83%9D%E3%81%9C%E3%82%92%EF%BD%A6%E3%81%B3%E3%82%BC%E3%83%9E%E3%82%92%E3%82%BC%E3%83%9F%E3%81%BD%E3%83%9C%E3%82%BD%EF%BE%88%E3%81%BD%E3%83%9D%E3%83%9F%E3%82%BE%EF%BD%81%E3%82%BF%E3%82%BD%E3%81%81%E3%83%9E%E8%A3%B9%E3%82%B0%EF%BD%81%E3%82%BF%E6%AD%B9%E6%AD%B9%E3%81%9F%EF%BD%9A%E3%83%90%E7%B8%B7%E3%83%81%E3%82%93%E3%82%92%D0%AF%E3%82%93%E7%95%9A%E3%81%9F%E3%82%BE%E3%81%B9%E3%82%BD%E6%AC%B2%E3%82%A1%E7%B8%B7%D1%8F%E3%83%9F%E3%82%92%EF%BD%A6%E3%81%9B%EF%BD%A6%E3%82%BC%E3%83%9E%E3%82%BD%E3%83%9C%E3%82%BC%E3%82%BC%E3%83%81%E3%81%BC%E7%95%9A%E7%8F%B1'&quot;">
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Product" href="Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/RelatedProducts" type="application/atom+xml;type=feed" title="RelatedProducts" href="Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts" />
@@ -38,7 +38,7 @@
       <name />
     </author>
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Picture" title="Picture" href="Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture" />
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
     <content type="application/xml">
       <m:properties>
         <d:ProductId m:type="Edm.Int32">-9</d:ProductId>
@@ -72,7 +72,7 @@
     </content>
   </entry>
   <entry m:etag="W/&quot;'asme','hhsbjscessmdunkssmvqmqyzuahm'&quot;">
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-8)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-8)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Product" href="Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/RelatedProducts" type="application/atom+xml;type=feed" title="RelatedProducts" href="Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts" />
@@ -85,7 +85,7 @@
       <name />
     </author>
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Picture" title="Picture" href="Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture" />
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
     <content type="application/xml">
       <m:properties>
         <d:ProductId m:type="Edm.Int32">-8</d:ProductId>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/filter/length(Description) eq 7.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/filter/length(Description) eq 7.full.json b/fit/src/main/resources/V30/Product/filter/length(Description) eq 7.full.json
index 3ce98e8..7953935 100644
--- a/fit/src/main/resources/V30/Product/filter/length(Description) eq 7.full.json	
+++ b/fit/src/main/resources/V30/Product/filter/length(Description) eq 7.full.json	
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)","odata.etag":"W/\"'%D1%8F%E3%82%A1%E3%81%9D%E7%8F%B1%EF%BD%9A%E3%81%9D%E7%B8%B7%E3%83%9F%D1%91%E3%83%9C%E3%81%9C%D0%AF%E6%AD%B9%E3%83%9F%E3%83%90%E3%81%BB%E3%83%9D%E3%81%BB%E3%82%BC%EF%BD%A6%E7%95%9A%E3%82%AF%E3%81%BB%EF%BE%88%E3%82%BC%E3%81%BE%E8%A3%B9%E3%81%B3%E3%81%B4%E3%81%B9%E6%AD%B9%E3%81%82%E3%83%80%E3%82%B0%E3%82%BD%E3%81%B3%D1%91%D1%91%E3%82%93%E3%83%9D%E3%81%9D%E3%83%9F%E3%83%9E%E3%81%BB%E3%82%BD%EF%BD%9A%E8%A3%B9%E3%81%BC%E3%82%93%E7%8F%B1%E3%81%B9%E3%82%BC%E6%AD%B9%E3%83%9F%EF%BD%9A%E3%83%9D%E3%81%9C%E3%81%9E%E3%82%BD%E3%83%9D%E3%81%BA%E3%83%9F%E3%83%80%E6%AC%B2%E5%BC%8C%D1%8F%E3%82%BD%E3%82%BD%E3%81%BD%E3%82%BD%E3%81%B9%E3%83%90%E9%BB%91%E4%B9%9D%E7%8F%B1%E3%81%9E%E3%83
 %9D%D0%AF%E3%83%80%E3%82%BD%E3%82%BC','%E8%A3%B9%E3%81%BA%E3%82%BE%E7%B8%B7%E3%82%BC%E3%81%BB%E3%82%BC%E3%82%BD%EF%BD%9A%E3%82%BC%EF%BD%9A%E3%81%9C%E3%82%BD%EF%BE%9D%E3%82%BC%E3%82%92%E3%81%BE%E3%81%81%E3%83%80%E3%81%B3%E3%82%BF%E7%8F%B1%E3%82%BF%E3%83%90%E3%82%BE%E3%82%BE%E3%83%9F%E3%83%81%E3%83%9C%E6%9A%A6%E3%82%BD%E3%82%A1%E3%81%B9%E8%A3%B9%E3%83%9D%E3%81%9C%E3%82%92%EF%BD%A6%E3%81%B3%E3%82%BC%E3%83%9E%E3%82%92%E3%82%BC%E3%83%9F%E3%81%BD%E3%83%9C%E3%82%BD%EF%BE%88%E3%81%BD%E3%83%9D%E3%83%9F%E3%82%BE%EF%BD%81%E3%82%BF%E3%82%BD%E3%81%81%E3%83%9E%E8%A3%B9%E3%82%B0%EF%BD%81%E3%82%BF%E6%AD%B9%E6%AD%B9%E3%81%9F%EF%BD%9A%E3%83%90%E7%B8%B7%E3%83%81%E3%82%93%E3%82%92%D0%AF%E3%82%93%E7%95%9A%E3%81%9F%E3%82%BE%E3%81%B9%E3%82%BD%E6%AC%B2%E3%82%A1%E7%B8%B7%D1%8F%E3%83%9F%E3%82%92%EF%BD%A6%E3%81%9B%EF%BD%A6%E3%82%BC%E3%83%9E%E3%82%BD%E3%83%9C%E3%82%BC%E3%82%BC%E3%83%81%E3%81%BC%E7%95%9A%E7%8F%B1'\"","odata.editLink":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedP
 roduct","RelatedProducts@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts","Detail@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Detail","Reviews@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Reviews","Photos@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Photos","#DefaultContainer.ChangeProductDimensions":{"title":"ChangeProductDimensions","target":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"},"Picture@odata.mediaEditLink":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture","ProductId":-9,"Description":"kdcuklu","Dimensions":{"odata.type":"Mi
 crosoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"-25802798699776200000000000000","Height@odata.type":"Edm.Decimal","Height":"38.543408267225","Depth@odata.type":"Edm.Decimal","Depth":"-8459.21552673786"},"BaseConcurrency":"\u044f\u30a1\u305d\u73f1\uff5a\u305d\u7e37\u30df\u0451\u30dc\u305c\u042f\u6b79\u30df\u30d0\u307b\u30dd\u307b\u30bc\uff66\u755a\u30af\u307b\uff88\u30bc\u307e\u88f9\u3073\u3074\u3079\u6b79\u3042\u30c0\u30b0\u30bd\u3073\u0451\u0451\u3093\u30dd\u305d\u30df\u30de\u307b\u30bd\uff5a\u88f9\u307c\u3093\u73f1\u3079\u30bc\u6b79\u30df\uff5a\u30dd\u305c\u305e\u30bd\u30dd\u307a\u30df\u30c0\u6b32\u5f0c\u044f\u30bd\u30bd\u307d\u30bd\u3079\u30d0\u9ed1\u4e5d\u73f1\u305e\u30dd\u042f\u30c0\u30bd\u30bc","ComplexConcurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo","Token":"vkvezqrkjuykjmk\u00dfyqpliyv\u00df","QueriedDateTime":null},"NestedComplexConcurrency":{"odata.type":"Microsoft.Test.
 OData.Services.AstoriaDefaultService.AuditInfo","ModifiedDate@odata.type":"Edm.DateTime","ModifiedDate":"2012-11-20T10:27:48.8528105","ModifiedBy":"gtpakgdzcfjyumozyqzrhxuypuzfqhvmzeepvjllfncsjuumjzdxvlhjprgphzfvjxzsklilojgtqhktpj","Concurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo","Token":"\u30dc\u30dc\uff9d\u3072\u0451\u7e37\u305d\u30a1\u307d\u30bc\u3093\u30c0\u73f1\u30bc\u3041\uff5a\u755a\u4e9c\u4e9c\u30bc\u3072\u30d0\u4e9c\u307b\u3079\u30cf\uff9d\uff88\u305f\u30dd\u4e5d\u30be\u3079\u30c0\u305e\u755a\u30bf\uff5a\u30be\u307c\u30a1\u042f\u30c0\u3092\u3042","QueriedDateTime@odata.type":"Edm.DateTime","QueriedDateTime":"2005-10-12T22:26:24.9396883"}},"Discontinued@odata.type":"Edm.DateTime","Discontinued":"2005-07-28T13:09:56.9997833","ReplacementProductId":null,"DiscontinuedPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u7e37\u305f\u3079\u30cf\u30dc\u6b32\u30a1\u3093\u307d\u3074\u30bd\uf
 f41\u307d\u30be\u3042\u305f\u3041\u30bd\u3073\u307c\u30dd\u4e5d\u30d0\u307b\u755a\u30bc\u307e\uff41\u307c\u305d\u042f\u4e9c\uff88\u3041\u30b0\u3074\u66a6\uff5a\u30dd\u307b\u30dc\u30dc\uff88\u3074","Extension":"bozhmrtomzrcmheuuqybovfiuypathsafmriopuccbqubhqbmuauxvnftvnpisgobryzqya"},"ChildConcurrencyToken":"\u88f9\u307a\u30be\u7e37\u30bc\u307b\u30bc\u30bd\uff5a\u30bc\uff5a\u305c\u30bd\uff9d\u30bc\u3092\u307e\u3041\u30c0\u3073\u30bf\u73f1\u30bf\u30d0\u30be\u30be\u30df\u30c1\u30dc\u66a6\u30bd\u30a1\u3079\u88f9\u30dd\u305c\u3092\uff66\u3073\u30bc\u30de\u3092\u30bc\u30df\u307d\u30dc\u30bd\uff88\u307d\u30dd\u30df\u30be\uff41\u30bf\u30bd\u3041\u30de\u88f9\u30b0\uff41\u30bf\u6b79\u6b79\u305f\uff5a\u30d0\u7e37\u30c1\u3093\u3092\u042f\u3093\u755a\u305f\u30be\u3079\u30bd\u6b32\u30a1\u7e37\u044f\u30df\u3092\uff66\u305b\uff66\u30bc\u30de\u30bd\u30dc\u30bc\u30bc\u30c1\u307c\u755a\u73f1"}]}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)","odata.etag":"W/\"'%D1%8F%E3%82%A1%E3%81%9D%E7%8F%B1%EF%BD%9A%E3%81%9D%E7%B8%B7%E3%83%9F%D1%91%E3%83%9C%E3%81%9C%D0%AF%E6%AD%B9%E3%83%9F%E3%83%90%E3%81%BB%E3%83%9D%E3%81%BB%E3%82%BC%EF%BD%A6%E7%95%9A%E3%82%AF%E3%81%BB%EF%BE%88%E3%82%BC%E3%81%BE%E8%A3%B9%E3%81%B3%E3%81%B4%E3%81%B9%E6%AD%B9%E3%81%82%E3%83%80%E3%82%B0%E3%82%BD%E3%81%B3%D1%91%D1%91%E3%82%93%E3%83%9D%E3%81%9D%E3%83%9F%E3%83%9E%E3%81%BB%E3%82%BD%EF%BD%9A%E8%A3%B9%E3%81%BC%E3%82%93%E7%8F%B1%E3%81%B9%E3%82%BC%E6%AD%B9%E3%83%9F%EF%BD%9A%E3%83%9D%E3%81%9C%E3%81%9E%E3%82%BD%E3%83%9D%E3%81%BA%E3%83%9F%E3%83%80%E6%AC%B2%E5%BC%8C%D1%8F%E3%82%BD%E3%82%BD%E3%81%BD%E3%82%BD%E3%81%B9%E3%83%90%E9%BB%91%E4%B9%9D%E7%8F%B1%E3%81%9E%E3%
 83%9D%D0%AF%E3%83%80%E3%82%BD%E3%82%BC','%E8%A3%B9%E3%81%BA%E3%82%BE%E7%B8%B7%E3%82%BC%E3%81%BB%E3%82%BC%E3%82%BD%EF%BD%9A%E3%82%BC%EF%BD%9A%E3%81%9C%E3%82%BD%EF%BE%9D%E3%82%BC%E3%82%92%E3%81%BE%E3%81%81%E3%83%80%E3%81%B3%E3%82%BF%E7%8F%B1%E3%82%BF%E3%83%90%E3%82%BE%E3%82%BE%E3%83%9F%E3%83%81%E3%83%9C%E6%9A%A6%E3%82%BD%E3%82%A1%E3%81%B9%E8%A3%B9%E3%83%9D%E3%81%9C%E3%82%92%EF%BD%A6%E3%81%B3%E3%82%BC%E3%83%9E%E3%82%92%E3%82%BC%E3%83%9F%E3%81%BD%E3%83%9C%E3%82%BD%EF%BE%88%E3%81%BD%E3%83%9D%E3%83%9F%E3%82%BE%EF%BD%81%E3%82%BF%E3%82%BD%E3%81%81%E3%83%9E%E8%A3%B9%E3%82%B0%EF%BD%81%E3%82%BF%E6%AD%B9%E6%AD%B9%E3%81%9F%EF%BD%9A%E3%83%90%E7%B8%B7%E3%83%81%E3%82%93%E3%82%92%D0%AF%E3%82%93%E7%95%9A%E3%81%9F%E3%82%BE%E3%81%B9%E3%82%BD%E6%AC%B2%E3%82%A1%E7%B8%B7%D1%8F%E3%83%9F%E3%82%92%EF%BD%A6%E3%81%9B%EF%BD%A6%E3%82%BC%E3%83%9E%E3%82%BD%E3%83%9C%E3%82%BC%E3%82%BC%E3%83%81%E3%81%BC%E7%95%9A%E7%8F%B1'\"","odata.editLink":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.Discontinue
 dProduct","RelatedProducts@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts","Detail@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Detail","Reviews@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Reviews","Photos@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Photos","#DefaultContainer.ChangeProductDimensions":{"title":"ChangeProductDimensions","target":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"},"Picture@odata.mediaEditLink":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture","ProductId":-9,"Description":"kdcuklu","Dimensions":{"odata.type":
 "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"-25802798699776200000000000000","Height@odata.type":"Edm.Decimal","Height":"38.543408267225","Depth@odata.type":"Edm.Decimal","Depth":"-8459.21552673786"},"BaseConcurrency":"\u044f\u30a1\u305d\u73f1\uff5a\u305d\u7e37\u30df\u0451\u30dc\u305c\u042f\u6b79\u30df\u30d0\u307b\u30dd\u307b\u30bc\uff66\u755a\u30af\u307b\uff88\u30bc\u307e\u88f9\u3073\u3074\u3079\u6b79\u3042\u30c0\u30b0\u30bd\u3073\u0451\u0451\u3093\u30dd\u305d\u30df\u30de\u307b\u30bd\uff5a\u88f9\u307c\u3093\u73f1\u3079\u30bc\u6b79\u30df\uff5a\u30dd\u305c\u305e\u30bd\u30dd\u307a\u30df\u30c0\u6b32\u5f0c\u044f\u30bd\u30bd\u307d\u30bd\u3079\u30d0\u9ed1\u4e5d\u73f1\u305e\u30dd\u042f\u30c0\u30bd\u30bc","ComplexConcurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo","Token":"vkvezqrkjuykjmk\u00dfyqpliyv\u00df","QueriedDateTime":null},"NestedComplexConcurrency":{"odata.type":"Microsoft.Te
 st.OData.Services.AstoriaDefaultService.AuditInfo","ModifiedDate@odata.type":"Edm.DateTime","ModifiedDate":"2012-11-20T10:27:48.8528105","ModifiedBy":"gtpakgdzcfjyumozyqzrhxuypuzfqhvmzeepvjllfncsjuumjzdxvlhjprgphzfvjxzsklilojgtqhktpj","Concurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo","Token":"\u30dc\u30dc\uff9d\u3072\u0451\u7e37\u305d\u30a1\u307d\u30bc\u3093\u30c0\u73f1\u30bc\u3041\uff5a\u755a\u4e9c\u4e9c\u30bc\u3072\u30d0\u4e9c\u307b\u3079\u30cf\uff9d\uff88\u305f\u30dd\u4e5d\u30be\u3079\u30c0\u305e\u755a\u30bf\uff5a\u30be\u307c\u30a1\u042f\u30c0\u3092\u3042","QueriedDateTime@odata.type":"Edm.DateTime","QueriedDateTime":"2005-10-12T22:26:24.9396883"}},"Discontinued@odata.type":"Edm.DateTime","Discontinued":"2005-07-28T13:09:56.9997833","ReplacementProductId":null,"DiscontinuedPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u7e37\u305f\u3079\u30cf\u30dc\u6b32\u30a1\u3093\u307d\u3074\u30bd
 \uff41\u307d\u30be\u3042\u305f\u3041\u30bd\u3073\u307c\u30dd\u4e5d\u30d0\u307b\u755a\u30bc\u307e\uff41\u307c\u305d\u042f\u4e9c\uff88\u3041\u30b0\u3074\u66a6\uff5a\u30dd\u307b\u30dc\u30dc\uff88\u3074","Extension":"bozhmrtomzrcmheuuqybovfiuypathsafmriopuccbqubhqbmuauxvnftvnpisgobryzqya"},"ChildConcurrencyToken":"\u88f9\u307a\u30be\u7e37\u30bc\u307b\u30bc\u30bd\uff5a\u30bc\uff5a\u305c\u30bd\uff9d\u30bc\u3092\u307e\u3041\u30c0\u3073\u30bf\u73f1\u30bf\u30d0\u30be\u30be\u30df\u30c1\u30dc\u66a6\u30bd\u30a1\u3079\u88f9\u30dd\u305c\u3092\uff66\u3073\u30bc\u30de\u3092\u30bc\u30df\u307d\u30dc\u30bd\uff88\u307d\u30dd\u30df\u30be\uff41\u30bf\u30bd\u3041\u30de\u88f9\u30b0\uff41\u30bf\u6b79\u6b79\u305f\uff5a\u30d0\u7e37\u30c1\u3093\u3092\u042f\u3093\u755a\u305f\u30be\u3079\u30bd\u6b32\u30a1\u7e37\u044f\u30df\u3092\uff66\u305b\uff66\u30bc\u30de\u30bd\u30dc\u30bc\u30bc\u30c1\u307c\u755a\u73f1"}]}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/filter/length(Description) eq 7.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/filter/length(Description) eq 7.xml b/fit/src/main/resources/V30/Product/filter/length(Description) eq 7.xml
index ed9c932..e7e7d1c 100644
--- a/fit/src/main/resources/V30/Product/filter/length(Description) eq 7.xml	
+++ b/fit/src/main/resources/V30/Product/filter/length(Description) eq 7.xml	
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product</id>
   <title type="text">Product</title>
   <updated>2014-02-13T14:31:06Z</updated>
   <link rel="self" title="Product" href="Product" />
   <entry m:etag="W/&quot;'%D1%8F%E3%82%A1%E3%81%9D%E7%8F%B1%EF%BD%9A%E3%81%9D%E7%B8%B7%E3%83%9F%D1%91%E3%83%9C%E3%81%9C%D0%AF%E6%AD%B9%E3%83%9F%E3%83%90%E3%81%BB%E3%83%9D%E3%81%BB%E3%82%BC%EF%BD%A6%E7%95%9A%E3%82%AF%E3%81%BB%EF%BE%88%E3%82%BC%E3%81%BE%E8%A3%B9%E3%81%B3%E3%81%B4%E3%81%B9%E6%AD%B9%E3%81%82%E3%83%80%E3%82%B0%E3%82%BD%E3%81%B3%D1%91%D1%91%E3%82%93%E3%83%9D%E3%81%9D%E3%83%9F%E3%83%9E%E3%81%BB%E3%82%BD%EF%BD%9A%E8%A3%B9%E3%81%BC%E3%82%93%E7%8F%B1%E3%81%B9%E3%82%BC%E6%AD%B9%E3%83%9F%EF%BD%9A%E3%83%9D%E3%81%9C%E3%81%9E%E3%82%BD%E3%83%9D%E3%81%BA%E3%83%9F%E3%83%80%E6%AC%B2%E5%BC%8C%D1%8F%E3%82%BD%E3%82%BD%E3%81%BD%E3%82%BD%E3%81%B9%E3%83%90%E9%BB%91%E4%B9%9D%E7%8F%B1%E3%81%9E%E3%83%9D%D0%AF%E3%83%80%E3%82%BD%E3%82%BC','%E8%A3%B9%E3%81%BA%E3%82%BE%E7%B8%B7%E3%82%BC%E3%81%BB%E3%82%BC%E3%82%BD%EF%BD%9A%E3%82%BC%EF%BD%9A%E3%81%9C%E3%82%BD%EF%BE%9D%E3%82%BC%E3%82%92%E3%81%BE%E3%81%81%E3%83%80%E3%81%B3%E3%82%BF%E7%8F%B1%E3%82%BF%E3%83%90%E3%82%BE%E3%82%BE%E3%83%9F%E3%83%81%E3%83%9
 C%E6%9A%A6%E3%82%BD%E3%82%A1%E3%81%B9%E8%A3%B9%E3%83%9D%E3%81%9C%E3%82%92%EF%BD%A6%E3%81%B3%E3%82%BC%E3%83%9E%E3%82%92%E3%82%BC%E3%83%9F%E3%81%BD%E3%83%9C%E3%82%BD%EF%BE%88%E3%81%BD%E3%83%9D%E3%83%9F%E3%82%BE%EF%BD%81%E3%82%BF%E3%82%BD%E3%81%81%E3%83%9E%E8%A3%B9%E3%82%B0%EF%BD%81%E3%82%BF%E6%AD%B9%E6%AD%B9%E3%81%9F%EF%BD%9A%E3%83%90%E7%B8%B7%E3%83%81%E3%82%93%E3%82%92%D0%AF%E3%82%93%E7%95%9A%E3%81%9F%E3%82%BE%E3%81%B9%E3%82%BD%E6%AC%B2%E3%82%A1%E7%B8%B7%D1%8F%E3%83%9F%E3%82%92%EF%BD%A6%E3%81%9B%EF%BD%A6%E3%82%BC%E3%83%9E%E3%82%BD%E3%83%9C%E3%82%BC%E3%82%BC%E3%83%81%E3%81%BC%E7%95%9A%E7%8F%B1'&quot;">
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Product" href="Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/RelatedProducts" type="application/atom+xml;type=feed" title="RelatedProducts" href="Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts" />
@@ -38,7 +38,7 @@
       <name />
     </author>
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Picture" title="Picture" href="Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture" />
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
     <content type="application/xml">
       <m:properties>
         <d:ProductId m:type="Edm.Int32">-9</d:ProductId>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/filter/round(Dimensions.Width) eq 7338.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/filter/round(Dimensions.Width) eq 7338.full.json b/fit/src/main/resources/V30/Product/filter/round(Dimensions.Width) eq 7338.full.json
index a6396a6..56ad12c 100644
--- a/fit/src/main/resources/V30/Product/filter/round(Dimensions.Width) eq 7338.full.json	
+++ b/fit/src/main/resources/V30/Product/filter/round(Dimensions.Width) eq 7338.full.json	
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-5)","odata.etag":"W/\"'inxlfdfruoalzluabvubrgahsg','ixxletiyfrigooaltaqikqcnkpepfufyffmuouknjzyelardpyudoachqdejrjnuhueunugyli'\"","odata.editLink":"Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct","RelatedProducts@odata.navigationLinkUrl":"Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts","Detail@odata.navigationLinkUrl":"Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Detail","Reviews@odata.navigationLinkUrl":"Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Reviews","Photos@odata.navigationLinkUrl":"Product(-5)/Microsoft.Test.OD
 ata.Services.AstoriaDefaultService.DiscontinuedProduct/Photos","#DefaultContainer.ChangeProductDimensions":{"title":"ChangeProductDimensions","target":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"},"Picture@odata.mediaEditLink":"Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture","ProductId":-5,"Description":"uuudqysoiozagpcpumnydpupopsvd","Dimensions":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"7337.75206762393","Height@odata.type":"Edm.Decimal","Height":"-4.63644378890358","Depth@odata.type":"Edm.Decimal","Depth":"-79228162514264337593543950335"},"BaseConcurrency":"inxlfdfruoalzluabvubrgahsg","ComplexConcurrency":null,"NestedComplexConcurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo","Modified
 Date@odata.type":"Edm.DateTime","ModifiedDate":"9999-12-31T23:59:59.9999999","ModifiedBy":"mlsbmanrhvygvakricoomrnksyutxxdrbizpdzdunzzukgkeaibnuufvxcjputulmcutevhiyflnsjahjistqrlasor","Concurrency":null},"Discontinued@odata.type":"Edm.DateTime","Discontinued":"2012-06-17T07:49:33.4591089","ReplacementProductId":-2147483648,"DiscontinuedPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u3073\u30de","Extension":"\u4e5d\u305c\u30be\u3079\u3041\u3073\u30df\u0451\u0451\u6b79\u73f1\u4e5d\u305e\u3042\uff41\u305e\u30af\u30c0\u307e\u30a1\u30df\u30bd\u3093\u6b79\u6b32\u3079\u4e9c\u305c\u30c1\u305c\u30c1\u3041\u30dc\u30bc\uff9d\u044f\u307b\u73f1\u30be\u30be\u307c\u531a\u305c\u30cf\u30df\u30bd\u3041\u30dc\u305c\u3041\u30a1\u30c1\u30af\u30bf\u9ed1\u3092\u531a\u30dc\u30b0\u73f1\u30bc\u30dc\u30bd\uff5a"},"ChildConcurrencyToken":"ixxletiyfrigooaltaqikqcnkpepfufyffmuouknjzyelardpyudoachqdejrjnuhueunugyli"}]}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-5)","odata.etag":"W/\"'inxlfdfruoalzluabvubrgahsg','ixxletiyfrigooaltaqikqcnkpepfufyffmuouknjzyelardpyudoachqdejrjnuhueunugyli'\"","odata.editLink":"Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct","RelatedProducts@odata.navigationLinkUrl":"Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts","Detail@odata.navigationLinkUrl":"Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Detail","Reviews@odata.navigationLinkUrl":"Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Reviews","Photos@odata.navigationLinkUrl":"Product(-5)/Microsoft.Test.
 OData.Services.AstoriaDefaultService.DiscontinuedProduct/Photos","#DefaultContainer.ChangeProductDimensions":{"title":"ChangeProductDimensions","target":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"},"Picture@odata.mediaEditLink":"Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture","ProductId":-5,"Description":"uuudqysoiozagpcpumnydpupopsvd","Dimensions":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"7337.75206762393","Height@odata.type":"Edm.Decimal","Height":"-4.63644378890358","Depth@odata.type":"Edm.Decimal","Depth":"-79228162514264337593543950335"},"BaseConcurrency":"inxlfdfruoalzluabvubrgahsg","ComplexConcurrency":null,"NestedComplexConcurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo","Modif
 iedDate@odata.type":"Edm.DateTime","ModifiedDate":"9999-12-31T23:59:59.9999999","ModifiedBy":"mlsbmanrhvygvakricoomrnksyutxxdrbizpdzdunzzukgkeaibnuufvxcjputulmcutevhiyflnsjahjistqrlasor","Concurrency":null},"Discontinued@odata.type":"Edm.DateTime","Discontinued":"2012-06-17T07:49:33.4591089","ReplacementProductId":-2147483648,"DiscontinuedPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u3073\u30de","Extension":"\u4e5d\u305c\u30be\u3079\u3041\u3073\u30df\u0451\u0451\u6b79\u73f1\u4e5d\u305e\u3042\uff41\u305e\u30af\u30c0\u307e\u30a1\u30df\u30bd\u3093\u6b79\u6b32\u3079\u4e9c\u305c\u30c1\u305c\u30c1\u3041\u30dc\u30bc\uff9d\u044f\u307b\u73f1\u30be\u30be\u307c\u531a\u305c\u30cf\u30df\u30bd\u3041\u30dc\u305c\u3041\u30a1\u30c1\u30af\u30bf\u9ed1\u3092\u531a\u30dc\u30b0\u73f1\u30bc\u30dc\u30bd\uff5a"},"ChildConcurrencyToken":"ixxletiyfrigooaltaqikqcnkpepfufyffmuouknjzyelardpyudoachqdejrjnuhueunugyli"}]}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/filter/round(Dimensions.Width) eq 7338.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/filter/round(Dimensions.Width) eq 7338.xml b/fit/src/main/resources/V30/Product/filter/round(Dimensions.Width) eq 7338.xml
index 841304d..4d99e7a 100644
--- a/fit/src/main/resources/V30/Product/filter/round(Dimensions.Width) eq 7338.xml	
+++ b/fit/src/main/resources/V30/Product/filter/round(Dimensions.Width) eq 7338.xml	
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product</id>
   <title type="text">Product</title>
   <updated>2014-02-13T14:31:05Z</updated>
   <link rel="self" title="Product" href="Product" />
   <entry m:etag="W/&quot;'inxlfdfruoalzluabvubrgahsg','ixxletiyfrigooaltaqikqcnkpepfufyffmuouknjzyelardpyudoachqdejrjnuhueunugyli'&quot;">
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-5)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-5)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Product" href="Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/RelatedProducts" type="application/atom+xml;type=feed" title="RelatedProducts" href="Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts" />
@@ -38,7 +38,7 @@
       <name />
     </author>
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Picture" title="Picture" href="Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture" />
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
     <content type="application/xml">
       <m:properties>
         <d:ProductId m:type="Edm.Int32">-5</d:ProductId>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/filter/startswith(Description, 'k') eq true.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/filter/startswith(Description, 'k') eq true.full.json b/fit/src/main/resources/V30/Product/filter/startswith(Description, 'k') eq true.full.json
index ea6bce0..45c6a1d 100644
--- a/fit/src/main/resources/V30/Product/filter/startswith(Description, 'k') eq true.full.json	
+++ b/fit/src/main/resources/V30/Product/filter/startswith(Description, 'k') eq true.full.json	
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)","odata.etag":"W/\"'%D1%8F%E3%82%A1%E3%81%9D%E7%8F%B1%EF%BD%9A%E3%81%9D%E7%B8%B7%E3%83%9F%D1%91%E3%83%9C%E3%81%9C%D0%AF%E6%AD%B9%E3%83%9F%E3%83%90%E3%81%BB%E3%83%9D%E3%81%BB%E3%82%BC%EF%BD%A6%E7%95%9A%E3%82%AF%E3%81%BB%EF%BE%88%E3%82%BC%E3%81%BE%E8%A3%B9%E3%81%B3%E3%81%B4%E3%81%B9%E6%AD%B9%E3%81%82%E3%83%80%E3%82%B0%E3%82%BD%E3%81%B3%D1%91%D1%91%E3%82%93%E3%83%9D%E3%81%9D%E3%83%9F%E3%83%9E%E3%81%BB%E3%82%BD%EF%BD%9A%E8%A3%B9%E3%81%BC%E3%82%93%E7%8F%B1%E3%81%B9%E3%82%BC%E6%AD%B9%E3%83%9F%EF%BD%9A%E3%83%9D%E3%81%9C%E3%81%9E%E3%82%BD%E3%83%9D%E3%81%BA%E3%83%9F%E3%83%80%E6%AC%B2%E5%BC%8C%D1%8F%E3%82%BD%E3%82%BD%E3%81%BD%E3%82%BD%E3%81%B9%E3%83%90%E9%BB%91%E4%B9%9D%E7%8F%B1%E3%81%9E%E3%83
 %9D%D0%AF%E3%83%80%E3%82%BD%E3%82%BC','%E8%A3%B9%E3%81%BA%E3%82%BE%E7%B8%B7%E3%82%BC%E3%81%BB%E3%82%BC%E3%82%BD%EF%BD%9A%E3%82%BC%EF%BD%9A%E3%81%9C%E3%82%BD%EF%BE%9D%E3%82%BC%E3%82%92%E3%81%BE%E3%81%81%E3%83%80%E3%81%B3%E3%82%BF%E7%8F%B1%E3%82%BF%E3%83%90%E3%82%BE%E3%82%BE%E3%83%9F%E3%83%81%E3%83%9C%E6%9A%A6%E3%82%BD%E3%82%A1%E3%81%B9%E8%A3%B9%E3%83%9D%E3%81%9C%E3%82%92%EF%BD%A6%E3%81%B3%E3%82%BC%E3%83%9E%E3%82%92%E3%82%BC%E3%83%9F%E3%81%BD%E3%83%9C%E3%82%BD%EF%BE%88%E3%81%BD%E3%83%9D%E3%83%9F%E3%82%BE%EF%BD%81%E3%82%BF%E3%82%BD%E3%81%81%E3%83%9E%E8%A3%B9%E3%82%B0%EF%BD%81%E3%82%BF%E6%AD%B9%E6%AD%B9%E3%81%9F%EF%BD%9A%E3%83%90%E7%B8%B7%E3%83%81%E3%82%93%E3%82%92%D0%AF%E3%82%93%E7%95%9A%E3%81%9F%E3%82%BE%E3%81%B9%E3%82%BD%E6%AC%B2%E3%82%A1%E7%B8%B7%D1%8F%E3%83%9F%E3%82%92%EF%BD%A6%E3%81%9B%EF%BD%A6%E3%82%BC%E3%83%9E%E3%82%BD%E3%83%9C%E3%82%BC%E3%82%BC%E3%83%81%E3%81%BC%E7%95%9A%E7%8F%B1'\"","odata.editLink":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedP
 roduct","RelatedProducts@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts","Detail@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Detail","Reviews@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Reviews","Photos@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Photos","#DefaultContainer.ChangeProductDimensions":{"title":"ChangeProductDimensions","target":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"},"Picture@odata.mediaEditLink":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture","ProductId":-9,"Description":"kdcuklu","Dimensions":{"odata.type":"Mi
 crosoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"-25802798699776200000000000000","Height@odata.type":"Edm.Decimal","Height":"38.543408267225","Depth@odata.type":"Edm.Decimal","Depth":"-8459.21552673786"},"BaseConcurrency":"\u044f\u30a1\u305d\u73f1\uff5a\u305d\u7e37\u30df\u0451\u30dc\u305c\u042f\u6b79\u30df\u30d0\u307b\u30dd\u307b\u30bc\uff66\u755a\u30af\u307b\uff88\u30bc\u307e\u88f9\u3073\u3074\u3079\u6b79\u3042\u30c0\u30b0\u30bd\u3073\u0451\u0451\u3093\u30dd\u305d\u30df\u30de\u307b\u30bd\uff5a\u88f9\u307c\u3093\u73f1\u3079\u30bc\u6b79\u30df\uff5a\u30dd\u305c\u305e\u30bd\u30dd\u307a\u30df\u30c0\u6b32\u5f0c\u044f\u30bd\u30bd\u307d\u30bd\u3079\u30d0\u9ed1\u4e5d\u73f1\u305e\u30dd\u042f\u30c0\u30bd\u30bc","ComplexConcurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo","Token":"vkvezqrkjuykjmk\u00dfyqpliyv\u00df","QueriedDateTime":null},"NestedComplexConcurrency":{"odata.type":"Microsoft.Test.
 OData.Services.AstoriaDefaultService.AuditInfo","ModifiedDate@odata.type":"Edm.DateTime","ModifiedDate":"2012-11-20T10:27:48.8528105","ModifiedBy":"gtpakgdzcfjyumozyqzrhxuypuzfqhvmzeepvjllfncsjuumjzdxvlhjprgphzfvjxzsklilojgtqhktpj","Concurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo","Token":"\u30dc\u30dc\uff9d\u3072\u0451\u7e37\u305d\u30a1\u307d\u30bc\u3093\u30c0\u73f1\u30bc\u3041\uff5a\u755a\u4e9c\u4e9c\u30bc\u3072\u30d0\u4e9c\u307b\u3079\u30cf\uff9d\uff88\u305f\u30dd\u4e5d\u30be\u3079\u30c0\u305e\u755a\u30bf\uff5a\u30be\u307c\u30a1\u042f\u30c0\u3092\u3042","QueriedDateTime@odata.type":"Edm.DateTime","QueriedDateTime":"2005-10-12T22:26:24.9396883"}},"Discontinued@odata.type":"Edm.DateTime","Discontinued":"2005-07-28T13:09:56.9997833","ReplacementProductId":null,"DiscontinuedPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u7e37\u305f\u3079\u30cf\u30dc\u6b32\u30a1\u3093\u307d\u3074\u30bd\uf
 f41\u307d\u30be\u3042\u305f\u3041\u30bd\u3073\u307c\u30dd\u4e5d\u30d0\u307b\u755a\u30bc\u307e\uff41\u307c\u305d\u042f\u4e9c\uff88\u3041\u30b0\u3074\u66a6\uff5a\u30dd\u307b\u30dc\u30dc\uff88\u3074","Extension":"bozhmrtomzrcmheuuqybovfiuypathsafmriopuccbqubhqbmuauxvnftvnpisgobryzqya"},"ChildConcurrencyToken":"\u88f9\u307a\u30be\u7e37\u30bc\u307b\u30bc\u30bd\uff5a\u30bc\uff5a\u305c\u30bd\uff9d\u30bc\u3092\u307e\u3041\u30c0\u3073\u30bf\u73f1\u30bf\u30d0\u30be\u30be\u30df\u30c1\u30dc\u66a6\u30bd\u30a1\u3079\u88f9\u30dd\u305c\u3092\uff66\u3073\u30bc\u30de\u3092\u30bc\u30df\u307d\u30dc\u30bd\uff88\u307d\u30dd\u30df\u30be\uff41\u30bf\u30bd\u3041\u30de\u88f9\u30b0\uff41\u30bf\u6b79\u6b79\u305f\uff5a\u30d0\u7e37\u30c1\u3093\u3092\u042f\u3093\u755a\u305f\u30be\u3079\u30bd\u6b32\u30a1\u7e37\u044f\u30df\u3092\uff66\u305b\uff66\u30bc\u30de\u30bd\u30dc\u30bc\u30bc\u30c1\u307c\u755a\u73f1"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct","odata.id":"http://lo
 calhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-8)","odata.etag":"W/\"'asme','hhsbjscessmdunkssmvqmqyzuahm'\"","odata.editLink":"Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct","RelatedProducts@odata.navigationLinkUrl":"Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts","Detail@odata.navigationLinkUrl":"Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Detail","Reviews@odata.navigationLinkUrl":"Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Reviews","Photos@odata.navigationLinkUrl":"Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Photos","#DefaultContainer.ChangeProductDimensions":{"title":"ChangeProductDimensions","target":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.Disconti
 nuedProduct/ChangeProductDimensions"},"Picture@odata.mediaEditLink":"Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture","ProductId":-8,"Description":"kel\u00dfebrrbesshcnkmhsxoky\u00dfetgscprtmiptxyiqnxrohj\u00dfuyfeg\u00df\u00dfmlnejcsmkemgjfrxpqfeffuuqrubvznftmniuulxz","Dimensions":null,"BaseConcurrency":"asme","ComplexConcurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo","Token":null,"QueriedDateTime@odata.type":"Edm.DateTime","QueriedDateTime":"2012-10-11T05:04:16.3627949"},"NestedComplexConcurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo","ModifiedDate@odata.type":"Edm.DateTime","ModifiedDate":"5431-05-27T11:53:49.8454872+02:00","ModifiedBy":"xsnquujocxuumpeqsbodtugghfrghfuihjiyxgvcntkflpxohuyfgytigbdl","Concurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo","Token":"solisgfvqa","QueriedDateTime@odata.type":"Edm.Dat
 eTime","QueriedDateTime":"9363-12-30T16:34:30.1866623"}},"Discontinued@odata.type":"Edm.DateTime","Discontinued":"2012-08-22T13:41:42.8011658","ReplacementProductId":62,"DiscontinuedPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ulemcjvsndemzkctrfhkiuiblmhdkkledze","Extension":"\u30b0\u9ed1\u30dd\u042f\u30dd\u30bd\u6b32\u30bf\u3074\u307a\u755a\u3092\u307b\u307e\u30d0\u307d\uff9d\u30bc\u6b79\u3041\u30dd\u0451\u30cf\u3092\u305c\u4e5d\u042f\u307e\u042f\u30bd\u305c\u66a6\uff5a\u30c0\u044f\u30c1\u30bc\u6b32\u30bd\u30df\u30de\u3041\u3079\u3041\u30cf\u3074\u3092\u531a\u30dd\u30df\u3042\u4e5d\u305e\u30df\u305e\u30a1\u30a1\u30af\u88f9\uff41\u30bd\u30bf\u30bf\u4e9c\u305d\u3042\u30af\u30de\u307d\u0451\u73f1\u3072\uff88\u305c\u30af\u30dc\u6b32\u30c0\u30df\u9ed1"},"ChildConcurrencyToken":"hhsbjscessmdunkssmvqmqyzuahm"}]}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)","odata.etag":"W/\"'%D1%8F%E3%82%A1%E3%81%9D%E7%8F%B1%EF%BD%9A%E3%81%9D%E7%B8%B7%E3%83%9F%D1%91%E3%83%9C%E3%81%9C%D0%AF%E6%AD%B9%E3%83%9F%E3%83%90%E3%81%BB%E3%83%9D%E3%81%BB%E3%82%BC%EF%BD%A6%E7%95%9A%E3%82%AF%E3%81%BB%EF%BE%88%E3%82%BC%E3%81%BE%E8%A3%B9%E3%81%B3%E3%81%B4%E3%81%B9%E6%AD%B9%E3%81%82%E3%83%80%E3%82%B0%E3%82%BD%E3%81%B3%D1%91%D1%91%E3%82%93%E3%83%9D%E3%81%9D%E3%83%9F%E3%83%9E%E3%81%BB%E3%82%BD%EF%BD%9A%E8%A3%B9%E3%81%BC%E3%82%93%E7%8F%B1%E3%81%B9%E3%82%BC%E6%AD%B9%E3%83%9F%EF%BD%9A%E3%83%9D%E3%81%9C%E3%81%9E%E3%82%BD%E3%83%9D%E3%81%BA%E3%83%9F%E3%83%80%E6%AC%B2%E5%BC%8C%D1%8F%E3%82%BD%E3%82%BD%E3%81%BD%E3%82%BD%E3%81%B9%E3%83%90%E9%BB%91%E4%B9%9D%E7%8F%B1%E3%81%9E%E3%
 83%9D%D0%AF%E3%83%80%E3%82%BD%E3%82%BC','%E8%A3%B9%E3%81%BA%E3%82%BE%E7%B8%B7%E3%82%BC%E3%81%BB%E3%82%BC%E3%82%BD%EF%BD%9A%E3%82%BC%EF%BD%9A%E3%81%9C%E3%82%BD%EF%BE%9D%E3%82%BC%E3%82%92%E3%81%BE%E3%81%81%E3%83%80%E3%81%B3%E3%82%BF%E7%8F%B1%E3%82%BF%E3%83%90%E3%82%BE%E3%82%BE%E3%83%9F%E3%83%81%E3%83%9C%E6%9A%A6%E3%82%BD%E3%82%A1%E3%81%B9%E8%A3%B9%E3%83%9D%E3%81%9C%E3%82%92%EF%BD%A6%E3%81%B3%E3%82%BC%E3%83%9E%E3%82%92%E3%82%BC%E3%83%9F%E3%81%BD%E3%83%9C%E3%82%BD%EF%BE%88%E3%81%BD%E3%83%9D%E3%83%9F%E3%82%BE%EF%BD%81%E3%82%BF%E3%82%BD%E3%81%81%E3%83%9E%E8%A3%B9%E3%82%B0%EF%BD%81%E3%82%BF%E6%AD%B9%E6%AD%B9%E3%81%9F%EF%BD%9A%E3%83%90%E7%B8%B7%E3%83%81%E3%82%93%E3%82%92%D0%AF%E3%82%93%E7%95%9A%E3%81%9F%E3%82%BE%E3%81%B9%E3%82%BD%E6%AC%B2%E3%82%A1%E7%B8%B7%D1%8F%E3%83%9F%E3%82%92%EF%BD%A6%E3%81%9B%EF%BD%A6%E3%82%BC%E3%83%9E%E3%82%BD%E3%83%9C%E3%82%BC%E3%82%BC%E3%83%81%E3%81%BC%E7%95%9A%E7%8F%B1'\"","odata.editLink":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.Discontinue
 dProduct","RelatedProducts@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts","Detail@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Detail","Reviews@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Reviews","Photos@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Photos","#DefaultContainer.ChangeProductDimensions":{"title":"ChangeProductDimensions","target":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"},"Picture@odata.mediaEditLink":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture","ProductId":-9,"Description":"kdcuklu","Dimensions":{"odata.type":
 "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"-25802798699776200000000000000","Height@odata.type":"Edm.Decimal","Height":"38.543408267225","Depth@odata.type":"Edm.Decimal","Depth":"-8459.21552673786"},"BaseConcurrency":"\u044f\u30a1\u305d\u73f1\uff5a\u305d\u7e37\u30df\u0451\u30dc\u305c\u042f\u6b79\u30df\u30d0\u307b\u30dd\u307b\u30bc\uff66\u755a\u30af\u307b\uff88\u30bc\u307e\u88f9\u3073\u3074\u3079\u6b79\u3042\u30c0\u30b0\u30bd\u3073\u0451\u0451\u3093\u30dd\u305d\u30df\u30de\u307b\u30bd\uff5a\u88f9\u307c\u3093\u73f1\u3079\u30bc\u6b79\u30df\uff5a\u30dd\u305c\u305e\u30bd\u30dd\u307a\u30df\u30c0\u6b32\u5f0c\u044f\u30bd\u30bd\u307d\u30bd\u3079\u30d0\u9ed1\u4e5d\u73f1\u305e\u30dd\u042f\u30c0\u30bd\u30bc","ComplexConcurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo","Token":"vkvezqrkjuykjmk\u00dfyqpliyv\u00df","QueriedDateTime":null},"NestedComplexConcurrency":{"odata.type":"Microsoft.Te
 st.OData.Services.AstoriaDefaultService.AuditInfo","ModifiedDate@odata.type":"Edm.DateTime","ModifiedDate":"2012-11-20T10:27:48.8528105","ModifiedBy":"gtpakgdzcfjyumozyqzrhxuypuzfqhvmzeepvjllfncsjuumjzdxvlhjprgphzfvjxzsklilojgtqhktpj","Concurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo","Token":"\u30dc\u30dc\uff9d\u3072\u0451\u7e37\u305d\u30a1\u307d\u30bc\u3093\u30c0\u73f1\u30bc\u3041\uff5a\u755a\u4e9c\u4e9c\u30bc\u3072\u30d0\u4e9c\u307b\u3079\u30cf\uff9d\uff88\u305f\u30dd\u4e5d\u30be\u3079\u30c0\u305e\u755a\u30bf\uff5a\u30be\u307c\u30a1\u042f\u30c0\u3092\u3042","QueriedDateTime@odata.type":"Edm.DateTime","QueriedDateTime":"2005-10-12T22:26:24.9396883"}},"Discontinued@odata.type":"Edm.DateTime","Discontinued":"2005-07-28T13:09:56.9997833","ReplacementProductId":null,"DiscontinuedPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u7e37\u305f\u3079\u30cf\u30dc\u6b32\u30a1\u3093\u307d\u3074\u30bd
 \uff41\u307d\u30be\u3042\u305f\u3041\u30bd\u3073\u307c\u30dd\u4e5d\u30d0\u307b\u755a\u30bc\u307e\uff41\u307c\u305d\u042f\u4e9c\uff88\u3041\u30b0\u3074\u66a6\uff5a\u30dd\u307b\u30dc\u30dc\uff88\u3074","Extension":"bozhmrtomzrcmheuuqybovfiuypathsafmriopuccbqubhqbmuauxvnftvnpisgobryzqya"},"ChildConcurrencyToken":"\u88f9\u307a\u30be\u7e37\u30bc\u307b\u30bc\u30bd\uff5a\u30bc\uff5a\u305c\u30bd\uff9d\u30bc\u3092\u307e\u3041\u30c0\u3073\u30bf\u73f1\u30bf\u30d0\u30be\u30be\u30df\u30c1\u30dc\u66a6\u30bd\u30a1\u3079\u88f9\u30dd\u305c\u3092\uff66\u3073\u30bc\u30de\u3092\u30bc\u30df\u307d\u30dc\u30bd\uff88\u307d\u30dd\u30df\u30be\uff41\u30bf\u30bd\u3041\u30de\u88f9\u30b0\uff41\u30bf\u6b79\u6b79\u305f\uff5a\u30d0\u7e37\u30c1\u3093\u3092\u042f\u3093\u755a\u305f\u30be\u3079\u30bd\u6b32\u30a1\u7e37\u044f\u30df\u3092\uff66\u305b\uff66\u30bc\u30de\u30bd\u30dc\u30bc\u30bc\u30c1\u307c\u755a\u73f1"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct","odata.id":"http:/
 /localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-8)","odata.etag":"W/\"'asme','hhsbjscessmdunkssmvqmqyzuahm'\"","odata.editLink":"Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct","RelatedProducts@odata.navigationLinkUrl":"Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts","Detail@odata.navigationLinkUrl":"Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Detail","Reviews@odata.navigationLinkUrl":"Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Reviews","Photos@odata.navigationLinkUrl":"Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Photos","#DefaultContainer.ChangeProductDimensions":{"title":"ChangeProductDimensions","target":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.Dis
 continuedProduct/ChangeProductDimensions"},"Picture@odata.mediaEditLink":"Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture","ProductId":-8,"Description":"kel\u00dfebrrbesshcnkmhsxoky\u00dfetgscprtmiptxyiqnxrohj\u00dfuyfeg\u00df\u00dfmlnejcsmkemgjfrxpqfeffuuqrubvznftmniuulxz","Dimensions":null,"BaseConcurrency":"asme","ComplexConcurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo","Token":null,"QueriedDateTime@odata.type":"Edm.DateTime","QueriedDateTime":"2012-10-11T05:04:16.3627949"},"NestedComplexConcurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo","ModifiedDate@odata.type":"Edm.DateTime","ModifiedDate":"5431-05-27T11:53:49.8454872+02:00","ModifiedBy":"xsnquujocxuumpeqsbodtugghfrghfuihjiyxgvcntkflpxohuyfgytigbdl","Concurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo","Token":"solisgfvqa","QueriedDateTime@odata.type":"Ed
 m.DateTime","QueriedDateTime":"9363-12-30T16:34:30.1866623"}},"Discontinued@odata.type":"Edm.DateTime","Discontinued":"2012-08-22T13:41:42.8011658","ReplacementProductId":62,"DiscontinuedPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ulemcjvsndemzkctrfhkiuiblmhdkkledze","Extension":"\u30b0\u9ed1\u30dd\u042f\u30dd\u30bd\u6b32\u30bf\u3074\u307a\u755a\u3092\u307b\u307e\u30d0\u307d\uff9d\u30bc\u6b79\u3041\u30dd\u0451\u30cf\u3092\u305c\u4e5d\u042f\u307e\u042f\u30bd\u305c\u66a6\uff5a\u30c0\u044f\u30c1\u30bc\u6b32\u30bd\u30df\u30de\u3041\u3079\u3041\u30cf\u3074\u3092\u531a\u30dd\u30df\u3042\u4e5d\u305e\u30df\u305e\u30a1\u30a1\u30af\u88f9\uff41\u30bd\u30bf\u30bf\u4e9c\u305d\u3042\u30af\u30de\u307d\u0451\u73f1\u3072\uff88\u305c\u30af\u30dc\u6b32\u30c0\u30df\u9ed1"},"ChildConcurrencyToken":"hhsbjscessmdunkssmvqmqyzuahm"}]}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/filter/startswith(Description, 'k') eq true.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/filter/startswith(Description, 'k') eq true.xml b/fit/src/main/resources/V30/Product/filter/startswith(Description, 'k') eq true.xml
index 0253e04..5e34818 100644
--- a/fit/src/main/resources/V30/Product/filter/startswith(Description, 'k') eq true.xml	
+++ b/fit/src/main/resources/V30/Product/filter/startswith(Description, 'k') eq true.xml	
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product</id>
   <title type="text">Product</title>
   <updated>2014-02-13T14:31:06Z</updated>
   <link rel="self" title="Product" href="Product" />
   <entry m:etag="W/&quot;'%D1%8F%E3%82%A1%E3%81%9D%E7%8F%B1%EF%BD%9A%E3%81%9D%E7%B8%B7%E3%83%9F%D1%91%E3%83%9C%E3%81%9C%D0%AF%E6%AD%B9%E3%83%9F%E3%83%90%E3%81%BB%E3%83%9D%E3%81%BB%E3%82%BC%EF%BD%A6%E7%95%9A%E3%82%AF%E3%81%BB%EF%BE%88%E3%82%BC%E3%81%BE%E8%A3%B9%E3%81%B3%E3%81%B4%E3%81%B9%E6%AD%B9%E3%81%82%E3%83%80%E3%82%B0%E3%82%BD%E3%81%B3%D1%91%D1%91%E3%82%93%E3%83%9D%E3%81%9D%E3%83%9F%E3%83%9E%E3%81%BB%E3%82%BD%EF%BD%9A%E8%A3%B9%E3%81%BC%E3%82%93%E7%8F%B1%E3%81%B9%E3%82%BC%E6%AD%B9%E3%83%9F%EF%BD%9A%E3%83%9D%E3%81%9C%E3%81%9E%E3%82%BD%E3%83%9D%E3%81%BA%E3%83%9F%E3%83%80%E6%AC%B2%E5%BC%8C%D1%8F%E3%82%BD%E3%82%BD%E3%81%BD%E3%82%BD%E3%81%B9%E3%83%90%E9%BB%91%E4%B9%9D%E7%8F%B1%E3%81%9E%E3%83%9D%D0%AF%E3%83%80%E3%82%BD%E3%82%BC','%E8%A3%B9%E3%81%BA%E3%82%BE%E7%B8%B7%E3%82%BC%E3%81%BB%E3%82%BC%E3%82%BD%EF%BD%9A%E3%82%BC%EF%BD%9A%E3%81%9C%E3%82%BD%EF%BE%9D%E3%82%BC%E3%82%92%E3%81%BE%E3%81%81%E3%83%80%E3%81%B3%E3%82%BF%E7%8F%B1%E3%82%BF%E3%83%90%E3%82%BE%E3%82%BE%E3%83%9F%E3%83%81%E3%83%9
 C%E6%9A%A6%E3%82%BD%E3%82%A1%E3%81%B9%E8%A3%B9%E3%83%9D%E3%81%9C%E3%82%92%EF%BD%A6%E3%81%B3%E3%82%BC%E3%83%9E%E3%82%92%E3%82%BC%E3%83%9F%E3%81%BD%E3%83%9C%E3%82%BD%EF%BE%88%E3%81%BD%E3%83%9D%E3%83%9F%E3%82%BE%EF%BD%81%E3%82%BF%E3%82%BD%E3%81%81%E3%83%9E%E8%A3%B9%E3%82%B0%EF%BD%81%E3%82%BF%E6%AD%B9%E6%AD%B9%E3%81%9F%EF%BD%9A%E3%83%90%E7%B8%B7%E3%83%81%E3%82%93%E3%82%92%D0%AF%E3%82%93%E7%95%9A%E3%81%9F%E3%82%BE%E3%81%B9%E3%82%BD%E6%AC%B2%E3%82%A1%E7%B8%B7%D1%8F%E3%83%9F%E3%82%92%EF%BD%A6%E3%81%9B%EF%BD%A6%E3%82%BC%E3%83%9E%E3%82%BD%E3%83%9C%E3%82%BC%E3%82%BC%E3%83%81%E3%81%BC%E7%95%9A%E7%8F%B1'&quot;">
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Product" href="Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/RelatedProducts" type="application/atom+xml;type=feed" title="RelatedProducts" href="Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts" />
@@ -38,7 +38,7 @@
       <name />
     </author>
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Picture" title="Picture" href="Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture" />
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
     <content type="application/xml">
       <m:properties>
         <d:ProductId m:type="Edm.Int32">-9</d:ProductId>
@@ -72,7 +72,7 @@
     </content>
   </entry>
   <entry m:etag="W/&quot;'asme','hhsbjscessmdunkssmvqmqyzuahm'&quot;">
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-8)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-8)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Product" href="Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/RelatedProducts" type="application/atom+xml;type=feed" title="RelatedProducts" href="Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts" />
@@ -85,7 +85,7 @@
       <name />
     </author>
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Picture" title="Picture" href="Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture" />
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
     <content type="application/xml">
       <m:properties>
         <d:ProductId m:type="Edm.Int32">-8</d:ProductId>


[07/20] [OLINGO-377] Removing unused cargo properties, upgrading Tomcat, renaming cargo.servlet.port to tomcat.servlet.port

Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/-6/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/-6/entity.xml b/fit/src/main/resources/V30/Product/-6/entity.xml
index e20cf79..f04464c 100644
--- a/fit/src/main/resources/V30/Product/-6/entity.xml
+++ b/fit/src/main/resources/V30/Product/-6/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml" m:etag="W/&quot;'uacssmuxummhtezdsno%C3%9Fssrlbs%C3%9Floxjsslnnayinxiksspjsssvumgduaapcfvnssee%C3%9Fgpaxuaabosem%C3%9Fiemtufplo'&quot;">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-6)</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml" m:etag="W/&quot;'uacssmuxummhtezdsno%C3%9Fssrlbs%C3%9Floxjsslnnayinxiksspjsssvumgduaapcfvnssee%C3%9Fgpaxuaabosem%C3%9Fiemtufplo'&quot;">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-6)</id>
   <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Product" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
   <link rel="edit" title="Product" href="Product(-6)" />
   <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/RelatedProducts" type="application/atom+xml;type=feed" title="RelatedProducts" href="Product(-6)/RelatedProducts" />
@@ -33,7 +33,7 @@
     <name />
   </author>
   <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Picture" title="Picture" href="Product(-6)/Picture" />
-  <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-6)/ChangeProductDimensions" />
+  <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-6)/ChangeProductDimensions" />
   <content type="application/xml">
     <m:properties>
       <d:ProductId m:type="Edm.Int32">-6</d:ProductId>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/-7/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/-7/entity.full.json b/fit/src/main/resources/V30/Product/-7/entity.full.json
index 4f394a1..4744638 100644
--- a/fit/src/main/resources/V30/Product/-7/entity.full.json
+++ b/fit/src/main/resources/V30/Product/-7/entity.full.json
@@ -1,7 +1,7 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product/@Element",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product/@Element",
   "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
-  "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-7)",
+  "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-7)",
   "odata.etag": "W/\"'%E3%81%B3%E3%83%9E%E6%AD%B9%E3%82%BE%E3%83%9C%E3%81%BE%EF%BE%9D%E3%81%BA%E3%82%92%E3%82%BC%E3%82%A1%E3%82%BC%E3%81%9F%E3%83%90%E3%81%B9%E3%83%80%EF%BD%A6%E3%83%9F%E3%82%BD%E4%BA%9C%E3%82%A1%E3%83%9E%E3%82%BC%E3%83%81%E3%82%BC%E3%81%82%EF%BE%88%E3%81%BE%E3%81%B2%E3%83%9C%E3%81%81%D1%91%EF%BE%9D%E3%83%80%E3%82%BC%EF%BD%9A%E3%81%B2%D1%8F%E3%82%A1%E3%81%B4%E3%81%B9%E7%B8%B7%E3%81%9C%E3%82%92%E3%81%B2%E3%82%92%E4%BA%9C%E3%81%BE%E3%82%BD%E3%81%BD%E3%81%B9%E3%81%B2%E3%83%9F%E3%81%9E%E3%81%BE%E3%82%BE%E3%81%BE%E3%81%BE%E3%81%82%E3%83%81%E3%82%93'\"",
           "odata.editLink": "Product(-7)",
   "RelatedProducts@odata.navigationLinkUrl": "Product(-7)/RelatedProducts",
@@ -11,7 +11,7 @@
   "#DefaultContainer.ChangeProductDimensions":
           {
             "title": "ChangeProductDimensions",
-            "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-7)/ChangeProductDimensions"
+            "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-7)/ChangeProductDimensions"
           },
   "Picture@odata.mediaEditLink": "Product(-7)/Picture",
   "ProductId": -7,

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/-7/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/-7/entity.xml b/fit/src/main/resources/V30/Product/-7/entity.xml
index 8675d0b..83d89d6 100644
--- a/fit/src/main/resources/V30/Product/-7/entity.xml
+++ b/fit/src/main/resources/V30/Product/-7/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml" m:etag="W/&quot;'%E3%81%B3%E3%83%9E%E6%AD%B9%E3%82%BE%E3%83%9C%E3%81%BE%EF%BE%9D%E3%81%BA%E3%82%92%E3%82%BC%E3%82%A1%E3%82%BC%E3%81%9F%E3%83%90%E3%81%B9%E3%83%80%EF%BD%A6%E3%83%9F%E3%82%BD%E4%BA%9C%E3%82%A1%E3%83%9E%E3%82%BC%E3%83%81%E3%82%BC%E3%81%82%EF%BE%88%E3%81%BE%E3%81%B2%E3%83%9C%E3%81%81%D1%91%EF%BE%9D%E3%83%80%E3%82%BC%EF%BD%9A%E3%81%B2%D1%8F%E3%82%A1%E3%81%B4%E3%81%B9%E7%B8%B7%E3%81%9C%E3%82%92%E3%81%B2%E3%82%92%E4%BA%9C%E3%81%BE%E3%82%BD%E3%81%BD%E3%81%B9%E3%81%B2%E3%83%9F%E3%81%9E%E3%81%BE%E3%82%BE%E3%81%BE%E3%81%BE%E3%81%82%E3%83%81%E3%82%93'&quot;">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-7)</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml" m:etag="W/&quot;'%E3%81%B3%E3%83%9E%E6%AD%B9%E3%82%BE%E3%83%9C%E3%81%BE%EF%BE%9D%E3%81%BA%E3%82%92%E3%82%BC%E3%82%A1%E3%82%BC%E3%81%9F%E3%83%90%E3%81%B9%E3%83%80%EF%BD%A6%E3%83%9F%E3%82%BD%E4%BA%9C%E3%82%A1%E3%83%9E%E3%82%BC%E3%83%81%E3%82%BC%E3%81%82%EF%BE%88%E3%81%BE%E3%81%B2%E3%83%9C%E3%81%81%D1%91%EF%BE%9D%E3%83%80%E3%82%BC%EF%BD%9A%E3%81%B2%D1%8F%E3%82%A1%E3%81%B4%E3%81%B9%E7%B8%B7%E3%81%9C%E3%82%92%E3%81%B2%E3%82%92%E4%BA%9C%E3%81%BE%E3%82%BD%E3%81%BD%E3%81%B9%E3%81%B2%E3%83%9F%E3%81%9E%E3%81%BE%E3%82%BE%E3%81%BE%E3%81%BE%E3%81%82%E3%83%81%E3%82%93'&quot;">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-7)</id>
   <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Product" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
   <link rel="edit" title="Product" href="Product(-7)" />
   <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/RelatedProducts" type="application/atom+xml;type=feed" title="RelatedProducts" href="Product(-7)/RelatedProducts" />
@@ -33,7 +33,7 @@
     <name />
   </author>
   <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Picture" title="Picture" href="Product(-7)/Picture" />
-  <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-7)/ChangeProductDimensions" />
+  <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-7)/ChangeProductDimensions" />
   <content type="application/xml">
     <m:properties>
       <d:ProductId m:type="Edm.Int32">-7</d:ProductId>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/-7/links/Photos.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/-7/links/Photos.full.json b/fit/src/main/resources/V30/Product/-7/links/Photos.full.json
index f55303f..f79710d 100644
--- a/fit/src/main/resources/V30/Product/-7/links/Photos.full.json
+++ b/fit/src/main/resources/V30/Product/-7/links/Photos.full.json
@@ -1,12 +1,12 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product/$links/Photos",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product/$links/Photos",
   "value":
           [
             {
-              "url": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ProductPhoto(PhotoId=-3,ProductId=-3)"
+              "url": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ProductPhoto(PhotoId=-3,ProductId=-3)"
             },
             {
-              "url": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ProductPhoto(PhotoId=-2,ProductId=-2)"
+              "url": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ProductPhoto(PhotoId=-2,ProductId=-2)"
             }
           ]
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/-9/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/-9/entity.full.json b/fit/src/main/resources/V30/Product/-9/entity.full.json
index db55f44..2dddd08 100644
--- a/fit/src/main/resources/V30/Product/-9/entity.full.json
+++ b/fit/src/main/resources/V30/Product/-9/entity.full.json
@@ -1,7 +1,7 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product/@Element",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product/@Element",
   "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct",
-  "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)",
+  "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)",
   "odata.etag": "W/\"'%D1%8F%E3%82%A1%E3%81%9D%E7%8F%B1%EF%BD%9A%E3%81%9D%E7%B8%B7%E3%83%9F%D1%91%E3%83%9C%E3%81%9C%D0%AF%E6%AD%B9%E3%83%9F%E3%83%90%E3%81%BB%E3%83%9D%E3%81%BB%E3%82%BC%EF%BD%A6%E7%95%9A%E3%82%AF%E3%81%BB%EF%BE%88%E3%82%BC%E3%81%BE%E8%A3%B9%E3%81%B3%E3%81%B4%E3%81%B9%E6%AD%B9%E3%81%82%E3%83%80%E3%82%B0%E3%82%BD%E3%81%B3%D1%91%D1%91%E3%82%93%E3%83%9D%E3%81%9D%E3%83%9F%E3%83%9E%E3%81%BB%E3%82%BD%EF%BD%9A%E8%A3%B9%E3%81%BC%E3%82%93%E7%8F%B1%E3%81%B9%E3%82%BC%E6%AD%B9%E3%83%9F%EF%BD%9A%E3%83%9D%E3%81%9C%E3%81%9E%E3%82%BD%E3%83%9D%E3%81%BA%E3%83%9F%E3%83%80%E6%AC%B2%E5%BC%8C%D1%8F%E3%82%BD%E3%82%BD%E3%81%BD%E3%82%BD%E3%81%B9%E3%83%90%E9%BB%91%E4%B9%9D%E7%8F%B1%E3%81%9E%E3%83%9D%D0%AF%E3%83%80%E3%82%BD%E3%82%BC', '%E8%A3%B9%E3%81%BA%E3%82%BE%E7%B8%B7%E3%82%BC%E3%81%BB%E3%82%BC%E3%82%BD%EF%BD%9A%E3%82%BC%EF%BD%9A%E3%81%9C%E3%82%BD%EF%BE%9D%E3%82%BC%E3%82%92%E3%81%BE%E3%81%81%E3%83%80%E3%81%B3%E3%82%BF%E7%8F%B1%E3%82%BF%E3%83%90%E3%82%BE%E3%82%BE%E3%83%9F%E3%83%81%E3%83%9C%E
 6%9A%A6%E3%82%BD%E3%82%A1%E3%81%B9%E8%A3%B9%E3%83%9D%E3%81%9C%E3%82%92%EF%BD%A6%E3%81%B3%E3%82%BC%E3%83%9E%E3%82%92%E3%82%BC%E3%83%9F%E3%81%BD%E3%83%9C%E3%82%BD%EF%BE%88%E3%81%BD%E3%83%9D%E3%83%9F%E3%82%BE%EF%BD%81%E3%82%BF%E3%82%BD%E3%81%81%E3%83%9E%E8%A3%B9%E3%82%B0%EF%BD%81%E3%82%BF%E6%AD%B9%E6%AD%B9%E3%81%9F%EF%BD%9A%E3%83%90%E7%B8%B7%E3%83%81%E3%82%93%E3%82%92%D0%AF%E3%82%93%E7%95%9A%E3%81%9F%E3%82%BE%E3%81%B9%E3%82%BD%E6%AC%B2%E3%82%A1%E7%B8%B7%D1%8F%E3%83%9F%E3%82%92%EF%BD%A6%E3%81%9B%EF%BD%A6%E3%82%BC%E3%83%9E%E3%82%BD%E3%83%9C%E3%82%BC%E3%82%BC%E3%83%81%E3%81%BC%E7%95%9A%E7%8F%B1'\"",
   "odata.editLink": "Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct",
   "RelatedProducts@odata.navigationLinkUrl": "Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts",
@@ -11,7 +11,7 @@
   "#DefaultContainer.ChangeProductDimensions":
           {
             "title": "ChangeProductDimensions",
-            "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"
+            "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"
           },
   "Picture@odata.mediaEditLink": "Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture",
   "ProductId": -9,

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/-9/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/-9/entity.xml b/fit/src/main/resources/V30/Product/-9/entity.xml
index 20e7323..59cce3e 100644
--- a/fit/src/main/resources/V30/Product/-9/entity.xml
+++ b/fit/src/main/resources/V30/Product/-9/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml" m:etag="W/&quot;'%D1%8F%E3%82%A1%E3%81%9D%E7%8F%B1%EF%BD%9A%E3%81%9D%E7%B8%B7%E3%83%9F%D1%91%E3%83%9C%E3%81%9C%D0%AF%E6%AD%B9%E3%83%9F%E3%83%90%E3%81%BB%E3%83%9D%E3%81%BB%E3%82%BC%EF%BD%A6%E7%95%9A%E3%82%AF%E3%81%BB%EF%BE%88%E3%82%BC%E3%81%BE%E8%A3%B9%E3%81%B3%E3%81%B4%E3%81%B9%E6%AD%B9%E3%81%82%E3%83%80%E3%82%B0%E3%82%BD%E3%81%B3%D1%91%D1%91%E3%82%93%E3%83%9D%E3%81%9D%E3%83%9F%E3%83%9E%E3%81%BB%E3%82%BD%EF%BD%9A%E8%A3%B9%E3%81%BC%E3%82%93%E7%8F%B1%E3%81%B9%E3%82%BC%E6%AD%B9%E3%83%9F%EF%BD%9A%E3%83%9D%E3%81%9C%E3%81%9E%E3%82%BD%E3%83%9D%E3%81%BA%E3%83%9F%E3%83%80%E6%AC%B2%E5%BC%8C%D1%8F%E3%82%BD%E3%82%BD%E3%81%BD%E3%82%BD%E3%81%B9%E3%83%90%E
 9%BB%91%E4%B9%9D%E7%8F%B1%E3%81%9E%E3%83%9D%D0%AF%E3%83%80%E3%82%BD%E3%82%BC','%E8%A3%B9%E3%81%BA%E3%82%BE%E7%B8%B7%E3%82%BC%E3%81%BB%E3%82%BC%E3%82%BD%EF%BD%9A%E3%82%BC%EF%BD%9A%E3%81%9C%E3%82%BD%EF%BE%9D%E3%82%BC%E3%82%92%E3%81%BE%E3%81%81%E3%83%80%E3%81%B3%E3%82%BF%E7%8F%B1%E3%82%BF%E3%83%90%E3%82%BE%E3%82%BE%E3%83%9F%E3%83%81%E3%83%9C%E6%9A%A6%E3%82%BD%E3%82%A1%E3%81%B9%E8%A3%B9%E3%83%9D%E3%81%9C%E3%82%92%EF%BD%A6%E3%81%B3%E3%82%BC%E3%83%9E%E3%82%92%E3%82%BC%E3%83%9F%E3%81%BD%E3%83%9C%E3%82%BD%EF%BE%88%E3%81%BD%E3%83%9D%E3%83%9F%E3%82%BE%EF%BD%81%E3%82%BF%E3%82%BD%E3%81%81%E3%83%9E%E8%A3%B9%E3%82%B0%EF%BD%81%E3%82%BF%E6%AD%B9%E6%AD%B9%E3%81%9F%EF%BD%9A%E3%83%90%E7%B8%B7%E3%83%81%E3%82%93%E3%82%92%D0%AF%E3%82%93%E7%95%9A%E3%81%9F%E3%82%BE%E3%81%B9%E3%82%BD%E6%AC%B2%E3%82%A1%E7%B8%B7%D1%8F%E3%83%9F%E3%82%92%EF%BD%A6%E3%81%9B%EF%BD%A6%E3%82%BC%E3%83%9E%E3%82%BD%E3%83%9C%E3%82%BC%E3%82%BC%E3%83%81%E3%81%BC%E7%95%9A%E7%8F%B1'&quot;">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml" m:etag="W/&quot;'%D1%8F%E3%82%A1%E3%81%9D%E7%8F%B1%EF%BD%9A%E3%81%9D%E7%B8%B7%E3%83%9F%D1%91%E3%83%9C%E3%81%9C%D0%AF%E6%AD%B9%E3%83%9F%E3%83%90%E3%81%BB%E3%83%9D%E3%81%BB%E3%82%BC%EF%BD%A6%E7%95%9A%E3%82%AF%E3%81%BB%EF%BE%88%E3%82%BC%E3%81%BE%E8%A3%B9%E3%81%B3%E3%81%B4%E3%81%B9%E6%AD%B9%E3%81%82%E3%83%80%E3%82%B0%E3%82%BD%E3%81%B3%D1%91%D1%91%E3%82%93%E3%83%9D%E3%81%9D%E3%83%9F%E3%83%9E%E3%81%BB%E3%82%BD%EF%BD%9A%E8%A3%B9%E3%81%BC%E3%82%93%E7%8F%B1%E3%81%B9%E3%82%BC%E6%AD%B9%E3%83%9F%EF%BD%9A%E3%83%9D%E3%81%9C%E3%81%9E%E3%82%BD%E3%83%9D%E3%81%BA%E3%83%9F%E3%83%80%E6%AC%B2%E5%BC%8C%D1%8F%E3%82%BD%E3%82%BD%E3%81%BD%E3%82%BD%E3%81%B9%E3%83%90%
 E9%BB%91%E4%B9%9D%E7%8F%B1%E3%81%9E%E3%83%9D%D0%AF%E3%83%80%E3%82%BD%E3%82%BC','%E8%A3%B9%E3%81%BA%E3%82%BE%E7%B8%B7%E3%82%BC%E3%81%BB%E3%82%BC%E3%82%BD%EF%BD%9A%E3%82%BC%EF%BD%9A%E3%81%9C%E3%82%BD%EF%BE%9D%E3%82%BC%E3%82%92%E3%81%BE%E3%81%81%E3%83%80%E3%81%B3%E3%82%BF%E7%8F%B1%E3%82%BF%E3%83%90%E3%82%BE%E3%82%BE%E3%83%9F%E3%83%81%E3%83%9C%E6%9A%A6%E3%82%BD%E3%82%A1%E3%81%B9%E8%A3%B9%E3%83%9D%E3%81%9C%E3%82%92%EF%BD%A6%E3%81%B3%E3%82%BC%E3%83%9E%E3%82%92%E3%82%BC%E3%83%9F%E3%81%BD%E3%83%9C%E3%82%BD%EF%BE%88%E3%81%BD%E3%83%9D%E3%83%9F%E3%82%BE%EF%BD%81%E3%82%BF%E3%82%BD%E3%81%81%E3%83%9E%E8%A3%B9%E3%82%B0%EF%BD%81%E3%82%BF%E6%AD%B9%E6%AD%B9%E3%81%9F%EF%BD%9A%E3%83%90%E7%B8%B7%E3%83%81%E3%82%93%E3%82%92%D0%AF%E3%82%93%E7%95%9A%E3%81%9F%E3%82%BE%E3%81%B9%E3%82%BD%E6%AC%B2%E3%82%A1%E7%B8%B7%D1%8F%E3%83%9F%E3%82%92%EF%BD%A6%E3%81%9B%EF%BD%A6%E3%82%BC%E3%83%9E%E3%82%BD%E3%83%9C%E3%82%BC%E3%82%BC%E3%83%81%E3%81%BC%E7%95%9A%E7%8F%B1'&quot;">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)</id>
   <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
   <link rel="edit" title="Product" href="Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct" />
   <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/RelatedProducts" type="application/atom+xml;type=feed" title="RelatedProducts" href="Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts" />
@@ -33,7 +33,7 @@
     <name />
   </author>
   <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Picture" title="Picture" href="Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture" />
-  <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
+  <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
   <content type="application/xml">
     <m:properties>
       <d:ProductId m:type="Edm.Int32">-9</d:ProductId>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/feed.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/feed.full.json b/fit/src/main/resources/V30/Product/feed.full.json
index 46d7ff5..03eba14 100644
--- a/fit/src/main/resources/V30/Product/feed.full.json
+++ b/fit/src/main/resources/V30/Product/feed.full.json
@@ -1,10 +1,10 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product",
   "value":
           [
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-10)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-10)",
               "odata.etag": "W/\"'New%20BaseConcurrency(1391427673066)'\"",
               "odata.editLink": "Product(-10)",
               "RelatedProducts@odata.navigationLinkUrl": "Product(-10)/RelatedProducts",
@@ -14,7 +14,7 @@
               "#DefaultContainer.ChangeProductDimensions":
                       {
                         "title": "ChangeProductDimensions",
-                        "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-10)/ChangeProductDimensions"
+                        "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-10)/ChangeProductDimensions"
                       },
               "Picture@odata.mediaEditLink": "Product(-10)/Picture",
               "ProductId": -10,
@@ -26,7 +26,7 @@
             },
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)",
               "odata.etag": "W/\"'%D1%8F%E3%82%A1%E3%81%9D%E7%8F%B1%EF%BD%9A%E3%81%9D%E7%B8%B7%E3%83%9F%D1%91%E3%83%9C%E3%81%9C%D0%AF%E6%AD%B9%E3%83%9F%E3%83%90%E3%81%BB%E3%83%9D%E3%81%BB%E3%82%BC%EF%BD%A6%E7%95%9A%E3%82%AF%E3%81%BB%EF%BE%88%E3%82%BC%E3%81%BE%E8%A3%B9%E3%81%B3%E3%81%B4%E3%81%B9%E6%AD%B9%E3%81%82%E3%83%80%E3%82%B0%E3%82%BD%E3%81%B3%D1%91%D1%91%E3%82%93%E3%83%9D%E3%81%9D%E3%83%9F%E3%83%9E%E3%81%BB%E3%82%BD%EF%BD%9A%E8%A3%B9%E3%81%BC%E3%82%93%E7%8F%B1%E3%81%B9%E3%82%BC%E6%AD%B9%E3%83%9F%EF%BD%9A%E3%83%9D%E3%81%9C%E3%81%9E%E3%82%BD%E3%83%9D%E3%81%BA%E3%83%9F%E3%83%80%E6%AC%B2%E5%BC%8C%D1%8F%E3%82%BD%E3%82%BD%E3%81%BD%E3%82%BD%E3%81%B9%E3%83%90%E9%BB%91%E4%B9%9D%E7%8F%B1%E3%81%9E%E3%83%9D%D0%AF%E3%83%80%E3%82%BD%E3%82%BC', '%E8%A3%B9%E3%81%BA%E3%82%BE%E7%B8%B7%E3%82%BC%E3%81%BB%E3%82%BC%E3%82%BD%EF%BD%9A%E3%82%BC%EF%BD%9A%E3%81%9C%E3%82%BD%EF%BE%9D%E3%82%BC%E3%82%92%E3%81%BE%E3%81%81%E3%83%80%E3%81%B3%E3%82%BF%E7%8F%B1%E3%82%BF%E3%83%90%E3%82%BE%E3%82%BE%E3%83%9F%E3%83%8
 1%E3%83%9C%E6%9A%A6%E3%82%BD%E3%82%A1%E3%81%B9%E8%A3%B9%E3%83%9D%E3%81%9C%E3%82%92%EF%BD%A6%E3%81%B3%E3%82%BC%E3%83%9E%E3%82%92%E3%82%BC%E3%83%9F%E3%81%BD%E3%83%9C%E3%82%BD%EF%BE%88%E3%81%BD%E3%83%9D%E3%83%9F%E3%82%BE%EF%BD%81%E3%82%BF%E3%82%BD%E3%81%81%E3%83%9E%E8%A3%B9%E3%82%B0%EF%BD%81%E3%82%BF%E6%AD%B9%E6%AD%B9%E3%81%9F%EF%BD%9A%E3%83%90%E7%B8%B7%E3%83%81%E3%82%93%E3%82%92%D0%AF%E3%82%93%E7%95%9A%E3%81%9F%E3%82%BE%E3%81%B9%E3%82%BD%E6%AC%B2%E3%82%A1%E7%B8%B7%D1%8F%E3%83%9F%E3%82%92%EF%BD%A6%E3%81%9B%EF%BD%A6%E3%82%BC%E3%83%9E%E3%82%BD%E3%83%9C%E3%82%BC%E3%82%BC%E3%83%81%E3%81%BC%E7%95%9A%E7%8F%B1'\"",
               "odata.editLink": "Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct",
               "RelatedProducts@odata.navigationLinkUrl": "Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts",
@@ -36,7 +36,7 @@
               "#DefaultContainer.ChangeProductDimensions":
                       {
                         "title": "ChangeProductDimensions",
-                        "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"
+                        "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"
                       },
               "Picture@odata.mediaEditLink": "Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture",
               "ProductId": -9,
@@ -85,7 +85,7 @@
             },
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-8)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-8)",
               "odata.etag": "W/\"'asme', 'hhsbjscessmdunkssmvqmqyzuahm'\"",
               "odata.editLink": "Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct",
               "RelatedProducts@odata.navigationLinkUrl": "Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts",
@@ -95,7 +95,7 @@
               "#DefaultContainer.ChangeProductDimensions":
                       {
                         "title": "ChangeProductDimensions",
-                        "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"
+                        "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"
                       },
               "Picture@odata.mediaEditLink": "Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture",
               "ProductId": -8,
@@ -136,7 +136,7 @@
             },
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-7)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-7)",
               "odata.etag": "W/\"'%E3%81%B3%E3%83%9E%E6%AD%B9%E3%82%BE%E3%83%9C%E3%81%BE%EF%BE%9D%E3%81%BA%E3%82%92%E3%82%BC%E3%82%A1%E3%82%BC%E3%81%9F%E3%83%90%E3%81%B9%E3%83%80%EF%BD%A6%E3%83%9F%E3%82%BD%E4%BA%9C%E3%82%A1%E3%83%9E%E3%82%BC%E3%83%81%E3%82%BC%E3%81%82%EF%BE%88%E3%81%BE%E3%81%B2%E3%83%9C%E3%81%81%D1%91%EF%BE%9D%E3%83%80%E3%82%BC%EF%BD%9A%E3%81%B2%D1%8F%E3%82%A1%E3%81%B4%E3%81%B9%E7%B8%B7%E3%81%9C%E3%82%92%E3%81%B2%E3%82%92%E4%BA%9C%E3%81%BE%E3%82%BD%E3%81%BD%E3%81%B9%E3%81%B2%E3%83%9F%E3%81%9E%E3%81%BE%E3%82%BE%E3%81%BE%E3%81%BE%E3%81%82%E3%83%81%E3%82%93'\"",
               "odata.editLink": "Product(-7)",
               "RelatedProducts@odata.navigationLinkUrl": "Product(-7)/RelatedProducts",
@@ -146,7 +146,7 @@
               "#DefaultContainer.ChangeProductDimensions":
                       {
                         "title": "ChangeProductDimensions",
-                        "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-7)/ChangeProductDimensions"
+                        "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-7)/ChangeProductDimensions"
                       },
               "Picture@odata.mediaEditLink": "Product(-7)/Picture",
               "ProductId": -7,
@@ -186,7 +186,7 @@
             },
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-6)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-6)",
               "odata.etag": "W/\"'uacssmuxummhtezdsno%C3%9Fssrlbs%C3%9Floxjsslnnayinxiksspjsssvumgduaapcfvnssee%C3%9Fgpaxuaabosem%C3%9Fiemtufplo'\"",
               "odata.editLink": "Product(-6)",
               "RelatedProducts@odata.navigationLinkUrl": "Product(-6)/RelatedProducts",
@@ -196,7 +196,7 @@
               "#DefaultContainer.ChangeProductDimensions":
                       {
                         "title": "ChangeProductDimensions",
-                        "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-6)/ChangeProductDimensions"
+                        "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-6)/ChangeProductDimensions"
                       },
               "Picture@odata.mediaEditLink": "Product(-6)/Picture",
               "ProductId": -6,
@@ -236,7 +236,7 @@
             },
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-5)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-5)",
               "odata.etag": "W/\"'inxlfdfruoalzluabvubrgahsg', 'ixxletiyfrigooaltaqikqcnkpepfufyffmuouknjzyelardpyudoachqdejrjnuhueunugyli'\"",
               "odata.editLink": "Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct",
               "RelatedProducts@odata.navigationLinkUrl": "Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts",
@@ -246,7 +246,7 @@
               "#DefaultContainer.ChangeProductDimensions":
                       {
                         "title": "ChangeProductDimensions",
-                        "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"
+                        "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"
                       },
               "Picture@odata.mediaEditLink": "Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture",
               "ProductId": -5,
@@ -284,7 +284,7 @@
             },
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-4)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-4)",
               "odata.etag": "W/\"'%E3%81%BD%E3%83%9C%EF%BE%9D%E3%81%82%E3%81%B3'\"",
               "odata.editLink": "Product(-4)",
               "RelatedProducts@odata.navigationLinkUrl": "Product(-4)/RelatedProducts",
@@ -294,7 +294,7 @@
               "#DefaultContainer.ChangeProductDimensions":
                       {
                         "title": "ChangeProductDimensions",
-                        "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-4)/ChangeProductDimensions"
+                        "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-4)/ChangeProductDimensions"
                       },
               "Picture@odata.mediaEditLink": "Product(-4)/Picture",
               "ProductId": -4,
@@ -334,7 +334,7 @@
             },
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-3)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-3)",
               "odata.etag": "W/\"'fvrnsbiu%C3%9Fevuqssnuidjbhtluhcydhhjihyasecdnumhdpfxtij%C3%9Flvfqngmulfvjqqtvussyix%C3%9Fykxhbnehob%C3%9Fjssfickhmevci', '%E3%81%9D%E6%AD%B9%E3%82%BD%E3%83%9C%E3%83%9C%E3%82%92%E3%82%B0%E8%A3%B9%E3%81%B4%E3%83%9D%EF%BD%A6%E3%83%81'\"",
               "odata.editLink": "Product(-3)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct",
               "RelatedProducts@odata.navigationLinkUrl": "Product(-3)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts",
@@ -344,7 +344,7 @@
               "#DefaultContainer.ChangeProductDimensions":
                       {
                         "title": "ChangeProductDimensions",
-                        "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-3)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"
+                        "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-3)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"
                       },
               "Picture@odata.mediaEditLink": "Product(-3)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture",
               "ProductId": -3,
@@ -366,7 +366,7 @@
             },
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-2)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-2)",
               "odata.etag": "W/\"null, 'yljmhbcacfnothqirhaouhoraoruscpptgzmoch'\"",
               "odata.editLink": "Product(-2)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct",
               "RelatedProducts@odata.navigationLinkUrl": "Product(-2)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts",
@@ -376,7 +376,7 @@
               "#DefaultContainer.ChangeProductDimensions":
                       {
                         "title": "ChangeProductDimensions",
-                        "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-2)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"
+                        "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-2)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"
                       },
               "Picture@odata.mediaEditLink": "Product(-2)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture",
               "ProductId": -2,
@@ -413,7 +413,7 @@
             },
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-1)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-1)",
               "odata.etag": "W/\"null\"",
               "odata.editLink": "Product(-1)",
               "RelatedProducts@odata.navigationLinkUrl": "Product(-1)/RelatedProducts",
@@ -423,7 +423,7 @@
               "#DefaultContainer.ChangeProductDimensions":
                       {
                         "title": "ChangeProductDimensions",
-                        "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-1)/ChangeProductDimensions"
+                        "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-1)/ChangeProductDimensions"
                       },
               "Picture@odata.mediaEditLink": "Product(-1)/Picture",
               "ProductId": -1,

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/feed.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/feed.xml b/fit/src/main/resources/V30/Product/feed.xml
index 7804f79..c697901 100644
--- a/fit/src/main/resources/V30/Product/feed.xml
+++ b/fit/src/main/resources/V30/Product/feed.xml
@@ -19,18 +19,18 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" 
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" 
       xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" 
       xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" 
       xmlns:georss="http://www.georss.org/georss" 
       xmlns:gml="http://www.opengis.net/gml">
   
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product</id>
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product</id>
   <title type="text">Product</title>
   <updated>2014-02-06T16:44:25Z</updated>
   <link rel="self" title="Product" href="Product" />
   <entry m:etag="W/&quot;'New%20BaseConcurrency(1391427673066)'&quot;">
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-10)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-10)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Product" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Product" href="Product(-10)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/RelatedProducts" type="application/atom+xml;type=feed" title="RelatedProducts" href="Product(-10)/RelatedProducts" />
@@ -43,7 +43,7 @@
       <name />
     </author>
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Picture" title="Picture" href="Product(-10)/Picture" />
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-10)/ChangeProductDimensions" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-10)/ChangeProductDimensions" />
     <content type="application/xml">
       <m:properties>
         <d:ProductId m:type="Edm.Int32">-10</d:ProductId>
@@ -56,7 +56,7 @@
     </content>
   </entry>
   <entry m:etag="W/&quot;'%D1%8F%E3%82%A1%E3%81%9D%E7%8F%B1%EF%BD%9A%E3%81%9D%E7%B8%B7%E3%83%9F%D1%91%E3%83%9C%E3%81%9C%D0%AF%E6%AD%B9%E3%83%9F%E3%83%90%E3%81%BB%E3%83%9D%E3%81%BB%E3%82%BC%EF%BD%A6%E7%95%9A%E3%82%AF%E3%81%BB%EF%BE%88%E3%82%BC%E3%81%BE%E8%A3%B9%E3%81%B3%E3%81%B4%E3%81%B9%E6%AD%B9%E3%81%82%E3%83%80%E3%82%B0%E3%82%BD%E3%81%B3%D1%91%D1%91%E3%82%93%E3%83%9D%E3%81%9D%E3%83%9F%E3%83%9E%E3%81%BB%E3%82%BD%EF%BD%9A%E8%A3%B9%E3%81%BC%E3%82%93%E7%8F%B1%E3%81%B9%E3%82%BC%E6%AD%B9%E3%83%9F%EF%BD%9A%E3%83%9D%E3%81%9C%E3%81%9E%E3%82%BD%E3%83%9D%E3%81%BA%E3%83%9F%E3%83%80%E6%AC%B2%E5%BC%8C%D1%8F%E3%82%BD%E3%82%BD%E3%81%BD%E3%82%BD%E3%81%B9%E3%83%90%E9%BB%91%E4%B9%9D%E7%8F%B1%E3%81%9E%E3%83%9D%D0%AF%E3%83%80%E3%82%BD%E3%82%BC','%E8%A3%B9%E3%81%BA%E3%82%BE%E7%B8%B7%E3%82%BC%E3%81%BB%E3%82%BC%E3%82%BD%EF%BD%9A%E3%82%BC%EF%BD%9A%E3%81%9C%E3%82%BD%EF%BE%9D%E3%82%BC%E3%82%92%E3%81%BE%E3%81%81%E3%83%80%E3%81%B3%E3%82%BF%E7%8F%B1%E3%82%BF%E3%83%90%E3%82%BE%E3%82%BE%E3%83%9F%E3%83%81%E3%83%9
 C%E6%9A%A6%E3%82%BD%E3%82%A1%E3%81%B9%E8%A3%B9%E3%83%9D%E3%81%9C%E3%82%92%EF%BD%A6%E3%81%B3%E3%82%BC%E3%83%9E%E3%82%92%E3%82%BC%E3%83%9F%E3%81%BD%E3%83%9C%E3%82%BD%EF%BE%88%E3%81%BD%E3%83%9D%E3%83%9F%E3%82%BE%EF%BD%81%E3%82%BF%E3%82%BD%E3%81%81%E3%83%9E%E8%A3%B9%E3%82%B0%EF%BD%81%E3%82%BF%E6%AD%B9%E6%AD%B9%E3%81%9F%EF%BD%9A%E3%83%90%E7%B8%B7%E3%83%81%E3%82%93%E3%82%92%D0%AF%E3%82%93%E7%95%9A%E3%81%9F%E3%82%BE%E3%81%B9%E3%82%BD%E6%AC%B2%E3%82%A1%E7%B8%B7%D1%8F%E3%83%9F%E3%82%92%EF%BD%A6%E3%81%9B%EF%BD%A6%E3%82%BC%E3%83%9E%E3%82%BD%E3%83%9C%E3%82%BC%E3%82%BC%E3%83%81%E3%81%BC%E7%95%9A%E7%8F%B1'&quot;">
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Product" href="Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/RelatedProducts" type="application/atom+xml;type=feed" title="RelatedProducts" href="Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts" />
@@ -69,7 +69,7 @@
       <name />
     </author>
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Picture" title="Picture" href="Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture" />
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
     <content type="application/xml">
       <m:properties>
         <d:ProductId m:type="Edm.Int32">-9</d:ProductId>
@@ -103,7 +103,7 @@
     </content>
   </entry>
   <entry m:etag="W/&quot;'asme','hhsbjscessmdunkssmvqmqyzuahm'&quot;">
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-8)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-8)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Product" href="Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/RelatedProducts" type="application/atom+xml;type=feed" title="RelatedProducts" href="Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts" />
@@ -116,7 +116,7 @@
       <name />
     </author>
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Picture" title="Picture" href="Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture" />
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
     <content type="application/xml">
       <m:properties>
         <d:ProductId m:type="Edm.Int32">-8</d:ProductId>
@@ -146,7 +146,7 @@
     </content>
   </entry>
   <entry m:etag="W/&quot;'%E3%81%B3%E3%83%9E%E6%AD%B9%E3%82%BE%E3%83%9C%E3%81%BE%EF%BE%9D%E3%81%BA%E3%82%92%E3%82%BC%E3%82%A1%E3%82%BC%E3%81%9F%E3%83%90%E3%81%B9%E3%83%80%EF%BD%A6%E3%83%9F%E3%82%BD%E4%BA%9C%E3%82%A1%E3%83%9E%E3%82%BC%E3%83%81%E3%82%BC%E3%81%82%EF%BE%88%E3%81%BE%E3%81%B2%E3%83%9C%E3%81%81%D1%91%EF%BE%9D%E3%83%80%E3%82%BC%EF%BD%9A%E3%81%B2%D1%8F%E3%82%A1%E3%81%B4%E3%81%B9%E7%B8%B7%E3%81%9C%E3%82%92%E3%81%B2%E3%82%92%E4%BA%9C%E3%81%BE%E3%82%BD%E3%81%BD%E3%81%B9%E3%81%B2%E3%83%9F%E3%81%9E%E3%81%BE%E3%82%BE%E3%81%BE%E3%81%BE%E3%81%82%E3%83%81%E3%82%93'&quot;">
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-7)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-7)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Product" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Product" href="Product(-7)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/RelatedProducts" type="application/atom+xml;type=feed" title="RelatedProducts" href="Product(-7)/RelatedProducts" />
@@ -159,7 +159,7 @@
       <name />
     </author>
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Picture" title="Picture" href="Product(-7)/Picture" />
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-7)/ChangeProductDimensions" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-7)/ChangeProductDimensions" />
     <content type="application/xml">
       <m:properties>
         <d:ProductId m:type="Edm.Int32">-7</d:ProductId>
@@ -186,7 +186,7 @@
     </content>
   </entry>
   <entry m:etag="W/&quot;'uacssmuxummhtezdsno%C3%9Fssrlbs%C3%9Floxjsslnnayinxiksspjsssvumgduaapcfvnssee%C3%9Fgpaxuaabosem%C3%9Fiemtufplo'&quot;">
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-6)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-6)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Product" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Product" href="Product(-6)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/RelatedProducts" type="application/atom+xml;type=feed" title="RelatedProducts" href="Product(-6)/RelatedProducts" />
@@ -199,7 +199,7 @@
       <name />
     </author>
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Picture" title="Picture" href="Product(-6)/Picture" />
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-6)/ChangeProductDimensions" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-6)/ChangeProductDimensions" />
     <content type="application/xml">
       <m:properties>
         <d:ProductId m:type="Edm.Int32">-6</d:ProductId>
@@ -226,7 +226,7 @@
     </content>
   </entry>
   <entry m:etag="W/&quot;'inxlfdfruoalzluabvubrgahsg','ixxletiyfrigooaltaqikqcnkpepfufyffmuouknjzyelardpyudoachqdejrjnuhueunugyli'&quot;">
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-5)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-5)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Product" href="Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/RelatedProducts" type="application/atom+xml;type=feed" title="RelatedProducts" href="Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts" />
@@ -239,7 +239,7 @@
       <name />
     </author>
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Picture" title="Picture" href="Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture" />
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
     <content type="application/xml">
       <m:properties>
         <d:ProductId m:type="Edm.Int32">-5</d:ProductId>
@@ -267,7 +267,7 @@
     </content>
   </entry>
   <entry m:etag="W/&quot;'%E3%81%BD%E3%83%9C%EF%BE%9D%E3%81%82%E3%81%B3'&quot;">
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-4)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-4)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Product" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Product" href="Product(-4)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/RelatedProducts" type="application/atom+xml;type=feed" title="RelatedProducts" href="Product(-4)/RelatedProducts" />
@@ -280,7 +280,7 @@
       <name />
     </author>
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Picture" title="Picture" href="Product(-4)/Picture" />
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-4)/ChangeProductDimensions" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-4)/ChangeProductDimensions" />
     <content type="application/xml">
       <m:properties>
         <d:ProductId m:type="Edm.Int32">-4</d:ProductId>
@@ -307,7 +307,7 @@
     </content>
   </entry>
   <entry m:etag="W/&quot;'fvrnsbiu%C3%9Fevuqssnuidjbhtluhcydhhjihyasecdnumhdpfxtij%C3%9Flvfqngmulfvjqqtvussyix%C3%9Fykxhbnehob%C3%9Fjssfickhmevci','%E3%81%9D%E6%AD%B9%E3%82%BD%E3%83%9C%E3%83%9C%E3%82%92%E3%82%B0%E8%A3%B9%E3%81%B4%E3%83%9D%EF%BD%A6%E3%83%81'&quot;">
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-3)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-3)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Product" href="Product(-3)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/RelatedProducts" type="application/atom+xml;type=feed" title="RelatedProducts" href="Product(-3)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts" />
@@ -320,7 +320,7 @@
       <name />
     </author>
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Picture" title="Picture" href="Product(-3)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture" />
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-3)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-3)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
     <content type="application/xml">
       <m:properties>
         <d:ProductId m:type="Edm.Int32">-3</d:ProductId>
@@ -340,7 +340,7 @@
     </content>
   </entry>
   <entry m:etag="W/&quot;null,'yljmhbcacfnothqirhaouhoraoruscpptgzmoch'&quot;">
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-2)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-2)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Product" href="Product(-2)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/RelatedProducts" type="application/atom+xml;type=feed" title="RelatedProducts" href="Product(-2)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts" />
@@ -353,7 +353,7 @@
       <name />
     </author>
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Picture" title="Picture" href="Product(-2)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture" />
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-2)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-2)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
     <content type="application/xml">
       <m:properties>
         <d:ProductId m:type="Edm.Int32">-2</d:ProductId>
@@ -380,7 +380,7 @@
     </content>
   </entry>
   <entry m:etag="W/&quot;null&quot;">
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-1)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-1)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Product" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Product" href="Product(-1)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/RelatedProducts" type="application/atom+xml;type=feed" title="RelatedProducts" href="Product(-1)/RelatedProducts" />
@@ -393,7 +393,7 @@
       <name />
     </author>
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Picture" title="Picture" href="Product(-1)/Picture" />
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-1)/ChangeProductDimensions" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-1)/ChangeProductDimensions" />
     <content type="application/xml">
       <m:properties>
         <d:ProductId m:type="Edm.Int32">-1</d:ProductId>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/filter/ceiling(Dimensions.Width) eq 7338.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/filter/ceiling(Dimensions.Width) eq 7338.full.json b/fit/src/main/resources/V30/Product/filter/ceiling(Dimensions.Width) eq 7338.full.json
index a6396a6..56ad12c 100644
--- a/fit/src/main/resources/V30/Product/filter/ceiling(Dimensions.Width) eq 7338.full.json	
+++ b/fit/src/main/resources/V30/Product/filter/ceiling(Dimensions.Width) eq 7338.full.json	
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-5)","odata.etag":"W/\"'inxlfdfruoalzluabvubrgahsg','ixxletiyfrigooaltaqikqcnkpepfufyffmuouknjzyelardpyudoachqdejrjnuhueunugyli'\"","odata.editLink":"Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct","RelatedProducts@odata.navigationLinkUrl":"Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts","Detail@odata.navigationLinkUrl":"Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Detail","Reviews@odata.navigationLinkUrl":"Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Reviews","Photos@odata.navigationLinkUrl":"Product(-5)/Microsoft.Test.OD
 ata.Services.AstoriaDefaultService.DiscontinuedProduct/Photos","#DefaultContainer.ChangeProductDimensions":{"title":"ChangeProductDimensions","target":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"},"Picture@odata.mediaEditLink":"Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture","ProductId":-5,"Description":"uuudqysoiozagpcpumnydpupopsvd","Dimensions":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"7337.75206762393","Height@odata.type":"Edm.Decimal","Height":"-4.63644378890358","Depth@odata.type":"Edm.Decimal","Depth":"-79228162514264337593543950335"},"BaseConcurrency":"inxlfdfruoalzluabvubrgahsg","ComplexConcurrency":null,"NestedComplexConcurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo","Modified
 Date@odata.type":"Edm.DateTime","ModifiedDate":"9999-12-31T23:59:59.9999999","ModifiedBy":"mlsbmanrhvygvakricoomrnksyutxxdrbizpdzdunzzukgkeaibnuufvxcjputulmcutevhiyflnsjahjistqrlasor","Concurrency":null},"Discontinued@odata.type":"Edm.DateTime","Discontinued":"2012-06-17T07:49:33.4591089","ReplacementProductId":-2147483648,"DiscontinuedPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u3073\u30de","Extension":"\u4e5d\u305c\u30be\u3079\u3041\u3073\u30df\u0451\u0451\u6b79\u73f1\u4e5d\u305e\u3042\uff41\u305e\u30af\u30c0\u307e\u30a1\u30df\u30bd\u3093\u6b79\u6b32\u3079\u4e9c\u305c\u30c1\u305c\u30c1\u3041\u30dc\u30bc\uff9d\u044f\u307b\u73f1\u30be\u30be\u307c\u531a\u305c\u30cf\u30df\u30bd\u3041\u30dc\u305c\u3041\u30a1\u30c1\u30af\u30bf\u9ed1\u3092\u531a\u30dc\u30b0\u73f1\u30bc\u30dc\u30bd\uff5a"},"ChildConcurrencyToken":"ixxletiyfrigooaltaqikqcnkpepfufyffmuouknjzyelardpyudoachqdejrjnuhueunugyli"}]}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-5)","odata.etag":"W/\"'inxlfdfruoalzluabvubrgahsg','ixxletiyfrigooaltaqikqcnkpepfufyffmuouknjzyelardpyudoachqdejrjnuhueunugyli'\"","odata.editLink":"Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct","RelatedProducts@odata.navigationLinkUrl":"Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts","Detail@odata.navigationLinkUrl":"Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Detail","Reviews@odata.navigationLinkUrl":"Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Reviews","Photos@odata.navigationLinkUrl":"Product(-5)/Microsoft.Test.
 OData.Services.AstoriaDefaultService.DiscontinuedProduct/Photos","#DefaultContainer.ChangeProductDimensions":{"title":"ChangeProductDimensions","target":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"},"Picture@odata.mediaEditLink":"Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture","ProductId":-5,"Description":"uuudqysoiozagpcpumnydpupopsvd","Dimensions":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"7337.75206762393","Height@odata.type":"Edm.Decimal","Height":"-4.63644378890358","Depth@odata.type":"Edm.Decimal","Depth":"-79228162514264337593543950335"},"BaseConcurrency":"inxlfdfruoalzluabvubrgahsg","ComplexConcurrency":null,"NestedComplexConcurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo","Modif
 iedDate@odata.type":"Edm.DateTime","ModifiedDate":"9999-12-31T23:59:59.9999999","ModifiedBy":"mlsbmanrhvygvakricoomrnksyutxxdrbizpdzdunzzukgkeaibnuufvxcjputulmcutevhiyflnsjahjistqrlasor","Concurrency":null},"Discontinued@odata.type":"Edm.DateTime","Discontinued":"2012-06-17T07:49:33.4591089","ReplacementProductId":-2147483648,"DiscontinuedPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u3073\u30de","Extension":"\u4e5d\u305c\u30be\u3079\u3041\u3073\u30df\u0451\u0451\u6b79\u73f1\u4e5d\u305e\u3042\uff41\u305e\u30af\u30c0\u307e\u30a1\u30df\u30bd\u3093\u6b79\u6b32\u3079\u4e9c\u305c\u30c1\u305c\u30c1\u3041\u30dc\u30bc\uff9d\u044f\u307b\u73f1\u30be\u30be\u307c\u531a\u305c\u30cf\u30df\u30bd\u3041\u30dc\u305c\u3041\u30a1\u30c1\u30af\u30bf\u9ed1\u3092\u531a\u30dc\u30b0\u73f1\u30bc\u30dc\u30bd\uff5a"},"ChildConcurrencyToken":"ixxletiyfrigooaltaqikqcnkpepfufyffmuouknjzyelardpyudoachqdejrjnuhueunugyli"}]}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/filter/ceiling(Dimensions.Width) eq 7338.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/filter/ceiling(Dimensions.Width) eq 7338.xml b/fit/src/main/resources/V30/Product/filter/ceiling(Dimensions.Width) eq 7338.xml
index 841304d..4d99e7a 100644
--- a/fit/src/main/resources/V30/Product/filter/ceiling(Dimensions.Width) eq 7338.xml	
+++ b/fit/src/main/resources/V30/Product/filter/ceiling(Dimensions.Width) eq 7338.xml	
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product</id>
   <title type="text">Product</title>
   <updated>2014-02-13T14:31:05Z</updated>
   <link rel="self" title="Product" href="Product" />
   <entry m:etag="W/&quot;'inxlfdfruoalzluabvubrgahsg','ixxletiyfrigooaltaqikqcnkpepfufyffmuouknjzyelardpyudoachqdejrjnuhueunugyli'&quot;">
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-5)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-5)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Product" href="Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/RelatedProducts" type="application/atom+xml;type=feed" title="RelatedProducts" href="Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts" />
@@ -38,7 +38,7 @@
       <name />
     </author>
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Picture" title="Picture" href="Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture" />
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
     <content type="application/xml">
       <m:properties>
         <d:ProductId m:type="Edm.Int32">-5</d:ProductId>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/filter/concat(Description, ', newname') eq 'kdcuklu, newname'.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/filter/concat(Description, ', newname') eq 'kdcuklu, newname'.full.json b/fit/src/main/resources/V30/Product/filter/concat(Description, ', newname') eq 'kdcuklu, newname'.full.json
index 3ce98e8..7953935 100644
--- a/fit/src/main/resources/V30/Product/filter/concat(Description, ', newname') eq 'kdcuklu, newname'.full.json	
+++ b/fit/src/main/resources/V30/Product/filter/concat(Description, ', newname') eq 'kdcuklu, newname'.full.json	
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)","odata.etag":"W/\"'%D1%8F%E3%82%A1%E3%81%9D%E7%8F%B1%EF%BD%9A%E3%81%9D%E7%B8%B7%E3%83%9F%D1%91%E3%83%9C%E3%81%9C%D0%AF%E6%AD%B9%E3%83%9F%E3%83%90%E3%81%BB%E3%83%9D%E3%81%BB%E3%82%BC%EF%BD%A6%E7%95%9A%E3%82%AF%E3%81%BB%EF%BE%88%E3%82%BC%E3%81%BE%E8%A3%B9%E3%81%B3%E3%81%B4%E3%81%B9%E6%AD%B9%E3%81%82%E3%83%80%E3%82%B0%E3%82%BD%E3%81%B3%D1%91%D1%91%E3%82%93%E3%83%9D%E3%81%9D%E3%83%9F%E3%83%9E%E3%81%BB%E3%82%BD%EF%BD%9A%E8%A3%B9%E3%81%BC%E3%82%93%E7%8F%B1%E3%81%B9%E3%82%BC%E6%AD%B9%E3%83%9F%EF%BD%9A%E3%83%9D%E3%81%9C%E3%81%9E%E3%82%BD%E3%83%9D%E3%81%BA%E3%83%9F%E3%83%80%E6%AC%B2%E5%BC%8C%D1%8F%E3%82%BD%E3%82%BD%E3%81%BD%E3%82%BD%E3%81%B9%E3%83%90%E9%BB%91%E4%B9%9D%E7%8F%B1%E3%81%9E%E3%83
 %9D%D0%AF%E3%83%80%E3%82%BD%E3%82%BC','%E8%A3%B9%E3%81%BA%E3%82%BE%E7%B8%B7%E3%82%BC%E3%81%BB%E3%82%BC%E3%82%BD%EF%BD%9A%E3%82%BC%EF%BD%9A%E3%81%9C%E3%82%BD%EF%BE%9D%E3%82%BC%E3%82%92%E3%81%BE%E3%81%81%E3%83%80%E3%81%B3%E3%82%BF%E7%8F%B1%E3%82%BF%E3%83%90%E3%82%BE%E3%82%BE%E3%83%9F%E3%83%81%E3%83%9C%E6%9A%A6%E3%82%BD%E3%82%A1%E3%81%B9%E8%A3%B9%E3%83%9D%E3%81%9C%E3%82%92%EF%BD%A6%E3%81%B3%E3%82%BC%E3%83%9E%E3%82%92%E3%82%BC%E3%83%9F%E3%81%BD%E3%83%9C%E3%82%BD%EF%BE%88%E3%81%BD%E3%83%9D%E3%83%9F%E3%82%BE%EF%BD%81%E3%82%BF%E3%82%BD%E3%81%81%E3%83%9E%E8%A3%B9%E3%82%B0%EF%BD%81%E3%82%BF%E6%AD%B9%E6%AD%B9%E3%81%9F%EF%BD%9A%E3%83%90%E7%B8%B7%E3%83%81%E3%82%93%E3%82%92%D0%AF%E3%82%93%E7%95%9A%E3%81%9F%E3%82%BE%E3%81%B9%E3%82%BD%E6%AC%B2%E3%82%A1%E7%B8%B7%D1%8F%E3%83%9F%E3%82%92%EF%BD%A6%E3%81%9B%EF%BD%A6%E3%82%BC%E3%83%9E%E3%82%BD%E3%83%9C%E3%82%BC%E3%82%BC%E3%83%81%E3%81%BC%E7%95%9A%E7%8F%B1'\"","odata.editLink":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedP
 roduct","RelatedProducts@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts","Detail@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Detail","Reviews@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Reviews","Photos@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Photos","#DefaultContainer.ChangeProductDimensions":{"title":"ChangeProductDimensions","target":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"},"Picture@odata.mediaEditLink":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture","ProductId":-9,"Description":"kdcuklu","Dimensions":{"odata.type":"Mi
 crosoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"-25802798699776200000000000000","Height@odata.type":"Edm.Decimal","Height":"38.543408267225","Depth@odata.type":"Edm.Decimal","Depth":"-8459.21552673786"},"BaseConcurrency":"\u044f\u30a1\u305d\u73f1\uff5a\u305d\u7e37\u30df\u0451\u30dc\u305c\u042f\u6b79\u30df\u30d0\u307b\u30dd\u307b\u30bc\uff66\u755a\u30af\u307b\uff88\u30bc\u307e\u88f9\u3073\u3074\u3079\u6b79\u3042\u30c0\u30b0\u30bd\u3073\u0451\u0451\u3093\u30dd\u305d\u30df\u30de\u307b\u30bd\uff5a\u88f9\u307c\u3093\u73f1\u3079\u30bc\u6b79\u30df\uff5a\u30dd\u305c\u305e\u30bd\u30dd\u307a\u30df\u30c0\u6b32\u5f0c\u044f\u30bd\u30bd\u307d\u30bd\u3079\u30d0\u9ed1\u4e5d\u73f1\u305e\u30dd\u042f\u30c0\u30bd\u30bc","ComplexConcurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo","Token":"vkvezqrkjuykjmk\u00dfyqpliyv\u00df","QueriedDateTime":null},"NestedComplexConcurrency":{"odata.type":"Microsoft.Test.
 OData.Services.AstoriaDefaultService.AuditInfo","ModifiedDate@odata.type":"Edm.DateTime","ModifiedDate":"2012-11-20T10:27:48.8528105","ModifiedBy":"gtpakgdzcfjyumozyqzrhxuypuzfqhvmzeepvjllfncsjuumjzdxvlhjprgphzfvjxzsklilojgtqhktpj","Concurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo","Token":"\u30dc\u30dc\uff9d\u3072\u0451\u7e37\u305d\u30a1\u307d\u30bc\u3093\u30c0\u73f1\u30bc\u3041\uff5a\u755a\u4e9c\u4e9c\u30bc\u3072\u30d0\u4e9c\u307b\u3079\u30cf\uff9d\uff88\u305f\u30dd\u4e5d\u30be\u3079\u30c0\u305e\u755a\u30bf\uff5a\u30be\u307c\u30a1\u042f\u30c0\u3092\u3042","QueriedDateTime@odata.type":"Edm.DateTime","QueriedDateTime":"2005-10-12T22:26:24.9396883"}},"Discontinued@odata.type":"Edm.DateTime","Discontinued":"2005-07-28T13:09:56.9997833","ReplacementProductId":null,"DiscontinuedPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u7e37\u305f\u3079\u30cf\u30dc\u6b32\u30a1\u3093\u307d\u3074\u30bd\uf
 f41\u307d\u30be\u3042\u305f\u3041\u30bd\u3073\u307c\u30dd\u4e5d\u30d0\u307b\u755a\u30bc\u307e\uff41\u307c\u305d\u042f\u4e9c\uff88\u3041\u30b0\u3074\u66a6\uff5a\u30dd\u307b\u30dc\u30dc\uff88\u3074","Extension":"bozhmrtomzrcmheuuqybovfiuypathsafmriopuccbqubhqbmuauxvnftvnpisgobryzqya"},"ChildConcurrencyToken":"\u88f9\u307a\u30be\u7e37\u30bc\u307b\u30bc\u30bd\uff5a\u30bc\uff5a\u305c\u30bd\uff9d\u30bc\u3092\u307e\u3041\u30c0\u3073\u30bf\u73f1\u30bf\u30d0\u30be\u30be\u30df\u30c1\u30dc\u66a6\u30bd\u30a1\u3079\u88f9\u30dd\u305c\u3092\uff66\u3073\u30bc\u30de\u3092\u30bc\u30df\u307d\u30dc\u30bd\uff88\u307d\u30dd\u30df\u30be\uff41\u30bf\u30bd\u3041\u30de\u88f9\u30b0\uff41\u30bf\u6b79\u6b79\u305f\uff5a\u30d0\u7e37\u30c1\u3093\u3092\u042f\u3093\u755a\u305f\u30be\u3079\u30bd\u6b32\u30a1\u7e37\u044f\u30df\u3092\uff66\u305b\uff66\u30bc\u30de\u30bd\u30dc\u30bc\u30bc\u30c1\u307c\u755a\u73f1"}]}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)","odata.etag":"W/\"'%D1%8F%E3%82%A1%E3%81%9D%E7%8F%B1%EF%BD%9A%E3%81%9D%E7%B8%B7%E3%83%9F%D1%91%E3%83%9C%E3%81%9C%D0%AF%E6%AD%B9%E3%83%9F%E3%83%90%E3%81%BB%E3%83%9D%E3%81%BB%E3%82%BC%EF%BD%A6%E7%95%9A%E3%82%AF%E3%81%BB%EF%BE%88%E3%82%BC%E3%81%BE%E8%A3%B9%E3%81%B3%E3%81%B4%E3%81%B9%E6%AD%B9%E3%81%82%E3%83%80%E3%82%B0%E3%82%BD%E3%81%B3%D1%91%D1%91%E3%82%93%E3%83%9D%E3%81%9D%E3%83%9F%E3%83%9E%E3%81%BB%E3%82%BD%EF%BD%9A%E8%A3%B9%E3%81%BC%E3%82%93%E7%8F%B1%E3%81%B9%E3%82%BC%E6%AD%B9%E3%83%9F%EF%BD%9A%E3%83%9D%E3%81%9C%E3%81%9E%E3%82%BD%E3%83%9D%E3%81%BA%E3%83%9F%E3%83%80%E6%AC%B2%E5%BC%8C%D1%8F%E3%82%BD%E3%82%BD%E3%81%BD%E3%82%BD%E3%81%B9%E3%83%90%E9%BB%91%E4%B9%9D%E7%8F%B1%E3%81%9E%E3%
 83%9D%D0%AF%E3%83%80%E3%82%BD%E3%82%BC','%E8%A3%B9%E3%81%BA%E3%82%BE%E7%B8%B7%E3%82%BC%E3%81%BB%E3%82%BC%E3%82%BD%EF%BD%9A%E3%82%BC%EF%BD%9A%E3%81%9C%E3%82%BD%EF%BE%9D%E3%82%BC%E3%82%92%E3%81%BE%E3%81%81%E3%83%80%E3%81%B3%E3%82%BF%E7%8F%B1%E3%82%BF%E3%83%90%E3%82%BE%E3%82%BE%E3%83%9F%E3%83%81%E3%83%9C%E6%9A%A6%E3%82%BD%E3%82%A1%E3%81%B9%E8%A3%B9%E3%83%9D%E3%81%9C%E3%82%92%EF%BD%A6%E3%81%B3%E3%82%BC%E3%83%9E%E3%82%92%E3%82%BC%E3%83%9F%E3%81%BD%E3%83%9C%E3%82%BD%EF%BE%88%E3%81%BD%E3%83%9D%E3%83%9F%E3%82%BE%EF%BD%81%E3%82%BF%E3%82%BD%E3%81%81%E3%83%9E%E8%A3%B9%E3%82%B0%EF%BD%81%E3%82%BF%E6%AD%B9%E6%AD%B9%E3%81%9F%EF%BD%9A%E3%83%90%E7%B8%B7%E3%83%81%E3%82%93%E3%82%92%D0%AF%E3%82%93%E7%95%9A%E3%81%9F%E3%82%BE%E3%81%B9%E3%82%BD%E6%AC%B2%E3%82%A1%E7%B8%B7%D1%8F%E3%83%9F%E3%82%92%EF%BD%A6%E3%81%9B%EF%BD%A6%E3%82%BC%E3%83%9E%E3%82%BD%E3%83%9C%E3%82%BC%E3%82%BC%E3%83%81%E3%81%BC%E7%95%9A%E7%8F%B1'\"","odata.editLink":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.Discontinue
 dProduct","RelatedProducts@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts","Detail@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Detail","Reviews@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Reviews","Photos@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Photos","#DefaultContainer.ChangeProductDimensions":{"title":"ChangeProductDimensions","target":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"},"Picture@odata.mediaEditLink":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture","ProductId":-9,"Description":"kdcuklu","Dimensions":{"odata.type":
 "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"-25802798699776200000000000000","Height@odata.type":"Edm.Decimal","Height":"38.543408267225","Depth@odata.type":"Edm.Decimal","Depth":"-8459.21552673786"},"BaseConcurrency":"\u044f\u30a1\u305d\u73f1\uff5a\u305d\u7e37\u30df\u0451\u30dc\u305c\u042f\u6b79\u30df\u30d0\u307b\u30dd\u307b\u30bc\uff66\u755a\u30af\u307b\uff88\u30bc\u307e\u88f9\u3073\u3074\u3079\u6b79\u3042\u30c0\u30b0\u30bd\u3073\u0451\u0451\u3093\u30dd\u305d\u30df\u30de\u307b\u30bd\uff5a\u88f9\u307c\u3093\u73f1\u3079\u30bc\u6b79\u30df\uff5a\u30dd\u305c\u305e\u30bd\u30dd\u307a\u30df\u30c0\u6b32\u5f0c\u044f\u30bd\u30bd\u307d\u30bd\u3079\u30d0\u9ed1\u4e5d\u73f1\u305e\u30dd\u042f\u30c0\u30bd\u30bc","ComplexConcurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo","Token":"vkvezqrkjuykjmk\u00dfyqpliyv\u00df","QueriedDateTime":null},"NestedComplexConcurrency":{"odata.type":"Microsoft.Te
 st.OData.Services.AstoriaDefaultService.AuditInfo","ModifiedDate@odata.type":"Edm.DateTime","ModifiedDate":"2012-11-20T10:27:48.8528105","ModifiedBy":"gtpakgdzcfjyumozyqzrhxuypuzfqhvmzeepvjllfncsjuumjzdxvlhjprgphzfvjxzsklilojgtqhktpj","Concurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo","Token":"\u30dc\u30dc\uff9d\u3072\u0451\u7e37\u305d\u30a1\u307d\u30bc\u3093\u30c0\u73f1\u30bc\u3041\uff5a\u755a\u4e9c\u4e9c\u30bc\u3072\u30d0\u4e9c\u307b\u3079\u30cf\uff9d\uff88\u305f\u30dd\u4e5d\u30be\u3079\u30c0\u305e\u755a\u30bf\uff5a\u30be\u307c\u30a1\u042f\u30c0\u3092\u3042","QueriedDateTime@odata.type":"Edm.DateTime","QueriedDateTime":"2005-10-12T22:26:24.9396883"}},"Discontinued@odata.type":"Edm.DateTime","Discontinued":"2005-07-28T13:09:56.9997833","ReplacementProductId":null,"DiscontinuedPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u7e37\u305f\u3079\u30cf\u30dc\u6b32\u30a1\u3093\u307d\u3074\u30bd
 \uff41\u307d\u30be\u3042\u305f\u3041\u30bd\u3073\u307c\u30dd\u4e5d\u30d0\u307b\u755a\u30bc\u307e\uff41\u307c\u305d\u042f\u4e9c\uff88\u3041\u30b0\u3074\u66a6\uff5a\u30dd\u307b\u30dc\u30dc\uff88\u3074","Extension":"bozhmrtomzrcmheuuqybovfiuypathsafmriopuccbqubhqbmuauxvnftvnpisgobryzqya"},"ChildConcurrencyToken":"\u88f9\u307a\u30be\u7e37\u30bc\u307b\u30bc\u30bd\uff5a\u30bc\uff5a\u305c\u30bd\uff9d\u30bc\u3092\u307e\u3041\u30c0\u3073\u30bf\u73f1\u30bf\u30d0\u30be\u30be\u30df\u30c1\u30dc\u66a6\u30bd\u30a1\u3079\u88f9\u30dd\u305c\u3092\uff66\u3073\u30bc\u30de\u3092\u30bc\u30df\u307d\u30dc\u30bd\uff88\u307d\u30dd\u30df\u30be\uff41\u30bf\u30bd\u3041\u30de\u88f9\u30b0\uff41\u30bf\u6b79\u6b79\u305f\uff5a\u30d0\u7e37\u30c1\u3093\u3092\u042f\u3093\u755a\u305f\u30be\u3079\u30bd\u6b32\u30a1\u7e37\u044f\u30df\u3092\uff66\u305b\uff66\u30bc\u30de\u30bd\u30dc\u30bc\u30bc\u30c1\u307c\u755a\u73f1"}]}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/filter/concat(Description, ', newname') eq 'kdcuklu, newname'.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/filter/concat(Description, ', newname') eq 'kdcuklu, newname'.xml b/fit/src/main/resources/V30/Product/filter/concat(Description, ', newname') eq 'kdcuklu, newname'.xml
index 8a3fb07..e094c69 100644
--- a/fit/src/main/resources/V30/Product/filter/concat(Description, ', newname') eq 'kdcuklu, newname'.xml	
+++ b/fit/src/main/resources/V30/Product/filter/concat(Description, ', newname') eq 'kdcuklu, newname'.xml	
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product</id>
   <title type="text">Product</title>
   <updated>2014-02-13T14:31:07Z</updated>
   <link rel="self" title="Product" href="Product" />
   <entry m:etag="W/&quot;'%D1%8F%E3%82%A1%E3%81%9D%E7%8F%B1%EF%BD%9A%E3%81%9D%E7%B8%B7%E3%83%9F%D1%91%E3%83%9C%E3%81%9C%D0%AF%E6%AD%B9%E3%83%9F%E3%83%90%E3%81%BB%E3%83%9D%E3%81%BB%E3%82%BC%EF%BD%A6%E7%95%9A%E3%82%AF%E3%81%BB%EF%BE%88%E3%82%BC%E3%81%BE%E8%A3%B9%E3%81%B3%E3%81%B4%E3%81%B9%E6%AD%B9%E3%81%82%E3%83%80%E3%82%B0%E3%82%BD%E3%81%B3%D1%91%D1%91%E3%82%93%E3%83%9D%E3%81%9D%E3%83%9F%E3%83%9E%E3%81%BB%E3%82%BD%EF%BD%9A%E8%A3%B9%E3%81%BC%E3%82%93%E7%8F%B1%E3%81%B9%E3%82%BC%E6%AD%B9%E3%83%9F%EF%BD%9A%E3%83%9D%E3%81%9C%E3%81%9E%E3%82%BD%E3%83%9D%E3%81%BA%E3%83%9F%E3%83%80%E6%AC%B2%E5%BC%8C%D1%8F%E3%82%BD%E3%82%BD%E3%81%BD%E3%82%BD%E3%81%B9%E3%83%90%E9%BB%91%E4%B9%9D%E7%8F%B1%E3%81%9E%E3%83%9D%D0%AF%E3%83%80%E3%82%BD%E3%82%BC','%E8%A3%B9%E3%81%BA%E3%82%BE%E7%B8%B7%E3%82%BC%E3%81%BB%E3%82%BC%E3%82%BD%EF%BD%9A%E3%82%BC%EF%BD%9A%E3%81%9C%E3%82%BD%EF%BE%9D%E3%82%BC%E3%82%92%E3%81%BE%E3%81%81%E3%83%80%E3%81%B3%E3%82%BF%E7%8F%B1%E3%82%BF%E3%83%90%E3%82%BE%E3%82%BE%E3%83%9F%E3%83%81%E3%83%9
 C%E6%9A%A6%E3%82%BD%E3%82%A1%E3%81%B9%E8%A3%B9%E3%83%9D%E3%81%9C%E3%82%92%EF%BD%A6%E3%81%B3%E3%82%BC%E3%83%9E%E3%82%92%E3%82%BC%E3%83%9F%E3%81%BD%E3%83%9C%E3%82%BD%EF%BE%88%E3%81%BD%E3%83%9D%E3%83%9F%E3%82%BE%EF%BD%81%E3%82%BF%E3%82%BD%E3%81%81%E3%83%9E%E8%A3%B9%E3%82%B0%EF%BD%81%E3%82%BF%E6%AD%B9%E6%AD%B9%E3%81%9F%EF%BD%9A%E3%83%90%E7%B8%B7%E3%83%81%E3%82%93%E3%82%92%D0%AF%E3%82%93%E7%95%9A%E3%81%9F%E3%82%BE%E3%81%B9%E3%82%BD%E6%AC%B2%E3%82%A1%E7%B8%B7%D1%8F%E3%83%9F%E3%82%92%EF%BD%A6%E3%81%9B%EF%BD%A6%E3%82%BC%E3%83%9E%E3%82%BD%E3%83%9C%E3%82%BC%E3%82%BC%E3%83%81%E3%81%BC%E7%95%9A%E7%8F%B1'&quot;">
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Product" href="Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/RelatedProducts" type="application/atom+xml;type=feed" title="RelatedProducts" href="Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts" />
@@ -38,7 +38,7 @@
       <name />
     </author>
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Picture" title="Picture" href="Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture" />
-    <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
+    <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
     <content type="application/xml">
       <m:properties>
         <d:ProductId m:type="Edm.Int32">-9</d:ProductId>


[20/20] git commit: [OLINGO-377] Removing unused cargo properties, upgrading Tomcat, renaming cargo.servlet.port to tomcat.servlet.port

Posted by il...@apache.org.
[OLINGO-377] Removing unused cargo properties, upgrading Tomcat, renaming cargo.servlet.port to tomcat.servlet.port


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/36e6ed40
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/36e6ed40
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/36e6ed40

Branch: refs/heads/master
Commit: 36e6ed401767cd83dbc1cd0bd368c09615089b80
Parents: 45a46f8
Author: Francesco Chicchiriccò <--global>
Authored: Wed Jul 30 08:24:22 2014 +0200
Committer: Francesco Chicchiriccò <--global>
Committed: Wed Jul 30 08:24:22 2014 +0200

----------------------------------------------------------------------
 fit/pom.xml                                     |  1 -
 .../resources/V30/AllGeoTypesSet/-10/entity.xml |  4 +-
 .../main/resources/V30/AllGeoTypesSet/feed.xml  | 24 +++---
 .../main/resources/V30/Car/12/entity.full.json  |  4 +-
 fit/src/main/resources/V30/Car/12/entity.xml    |  4 +-
 .../main/resources/V30/Car/14/entity.full.json  |  4 +-
 fit/src/main/resources/V30/Car/14/entity.xml    |  4 +-
 .../main/resources/V30/Car/15/entity.full.json  |  4 +-
 fit/src/main/resources/V30/Car/15/entity.xml    |  4 +-
 .../main/resources/V30/Car/16/entity.full.json  |  4 +-
 fit/src/main/resources/V30/Car/16/entity.xml    |  4 +-
 fit/src/main/resources/V30/Car/feed.full.json   | 50 ++++++------
 fit/src/main/resources/V30/Car/feed.xml         | 52 ++++++------
 .../Car/filter/((1 add VIN) eq 16).full.json    |  2 +-
 .../V30/Car/filter/((1 add VIN) eq 16).xml      |  6 +-
 .../Car/filter/((VIN add 1) eq 16).full.json    |  2 +-
 .../V30/Car/filter/((VIN add 1) eq 16).xml      |  6 +-
 .../((VIN lt 16) and (VIN gt 12)).full.json     |  2 +-
 .../filter/((VIN lt 16) and (VIN gt 12)).xml    | 10 +--
 .../Car/filter/(16 eq (1 add VIN)).full.json    |  2 +-
 .../V30/Car/filter/(16 eq (1 add VIN)).xml      |  6 +-
 .../V30/Car/filter/(VIN eq 16).full.json        |  4 +-
 .../resources/V30/Car/filter/(VIN eq 16).xml    |  6 +-
 .../V30/Car/filter/(VIN lt 16).full.json        |  2 +-
 .../resources/V30/Car/filter/(VIN lt 16).xml    | 14 ++--
 ...ngth(Description) gt (VIN add 10)).full.json |  2 +-
 .../(length(Description) gt (VIN add 10)).xml   | 14 ++--
 .../V30/Car/filter/VIN add 5 lt 11.full.json    |  2 +-
 .../V30/Car/filter/VIN add 5 lt 11.xml          |  4 +-
 .../V30/Car/filter/VIN div 2 le 8.full.json     |  2 +-
 .../resources/V30/Car/filter/VIN div 2 le 8.xml |  2 +-
 .../filter/VIN le 18 and VIN gt 12.full.json    |  2 +-
 .../V30/Car/filter/VIN le 18 and VIN gt 12.xml  |  2 +-
 .../V30/Car/filter/VIN mul 2 le 30.full.json    |  2 +-
 .../V30/Car/filter/VIN mul 2 le 30.xml          |  2 +-
 ...not (((VIN ge 16) or (VIN le 12))).full.json |  2 +-
 .../not (((VIN ge 16) or (VIN le 12))).xml      | 10 +--
 .../startswith(Description,'cen').full.json     |  2 +-
 .../filter/startswith(Description,'cen').xml    |  6 +-
 .../VIN desc/filter/(VIN lt 16).full.json       | 12 +--
 .../Car/orderby/VIN desc/filter/(VIN lt 16).xml | 14 ++--
 fit/src/main/resources/V30/Computer/feed.xml    | 44 +++++-----
 .../V30/ComputerDetail/-10/entity.full.json     |  6 +-
 .../resources/V30/ComputerDetail/-10/entity.xml |  6 +-
 .../(month(PurchaseDate) eq 12).full.json       |  2 +-
 .../filter/(month(PurchaseDate) eq 12).xml      |  8 +-
 .../filter/day(PurchaseDate) eq 15.full.json    |  2 +-
 .../filter/day(PurchaseDate) eq 15.xml          |  2 +-
 .../filter/hour(PurchaseDate) eq 1.full.json    |  2 +-
 .../filter/hour(PurchaseDate) eq 1.xml          |  2 +-
 .../filter/minute(PurchaseDate) eq 33.full.json |  2 +-
 .../filter/minute(PurchaseDate) eq 33.xml       |  2 +-
 .../filter/month(PurchaseDate) eq 12.full.json  |  2 +-
 .../filter/month(PurchaseDate) eq 12.xml        |  2 +-
 .../filter/second(PurchaseDate) eq 35.full.json |  2 +-
 .../filter/second(PurchaseDate) eq 35.xml       |  2 +-
 .../filter/year(PurchaseDate) eq 2020.full.json |  2 +-
 .../filter/year(PurchaseDate) eq 2020.xml       |  2 +-
 .../resources/V30/Customer/-10/entity.full.json |  4 +-
 .../main/resources/V30/Customer/-10/entity.xml  |  4 +-
 .../V30/Customer/-10/links/Info.full.json       |  4 +-
 .../resources/V30/Customer/-10/links/Info.xml   |  2 +-
 .../Customer/-10/links/Logins('3').full.json    |  4 +-
 .../V30/Customer/-10/links/Logins.full.json     |  6 +-
 .../resources/V30/Customer/-10/links/Logins.xml |  4 +-
 .../Customer/-10/links/Orders(-10).full.json    |  4 +-
 .../V30/Customer/-10/links/Orders.full.json     |  8 +-
 .../resources/V30/Customer/-10/links/Orders.xml |  6 +-
 .../resources/V30/Customer/-7/entity.full.json  |  4 +-
 .../main/resources/V30/Customer/-7/entity.xml   |  4 +-
 .../resources/V30/Customer/-9/entity.full.json  |  4 +-
 .../main/resources/V30/Customer/-9/entity.xml   |  4 +-
 .../main/resources/V30/Customer/feed.full.json  |  6 +-
 fit/src/main/resources/V30/Customer/feed.xml    | 10 +--
 ....PhoneNumber,'ODataJClient') eq 1).full.json |  2 +-
 ...ePhone.PhoneNumber,'ODataJClient') eq 1).xml |  4 +-
 ...ne.PhoneNumber,'lccvussrv') ne -1).full.json |  2 +-
 ...omePhone.PhoneNumber,'lccvussrv') ne -1).xml | 10 +--
 .../Customer/filter/CustomerId eq -10.full.json |  4 +-
 .../V30/Customer/filter/CustomerId eq -10.xml   |  6 +-
 .../Customer/filter/CustomerId gt -10.full.json |  2 +-
 .../V30/Customer/filter/CustomerId gt -10.xml   | 10 +--
 .../Customer/filter/CustomerId lt -10.full.json |  2 +-
 .../V30/Customer/filter/CustomerId lt -10.xml   |  4 +-
 .../isof(Name,'Edm.String') eq true.full.json   |  2 +-
 .../filter/isof(Name,'Edm.String') eq true.xml  | 10 +--
 .../not endswith(Name,'Chandan').full.json      |  2 +-
 .../filter/not endswith(Name,'Chandan').xml     | 10 +--
 .../V30/Customer/skiptoken/-1.full.json         |  2 +-
 .../resources/V30/Customer/skiptoken/-1.xml     |  4 +-
 .../V30/Customer/skiptoken/-10.full.json        |  6 +-
 .../resources/V30/Customer/skiptoken/-10.xml    | 10 +--
 .../V30/Customer/skiptoken/-3.full.json         |  6 +-
 .../resources/V30/Customer/skiptoken/-3.xml     | 10 +--
 .../V30/Customer/skiptoken/-5.full.json         |  6 +-
 .../resources/V30/Customer/skiptoken/-5.xml     | 10 +--
 .../V30/Customer/skiptoken/-7.full.json         |  6 +-
 .../resources/V30/Customer/skiptoken/-7.xml     | 10 +--
 .../V30/Customer/skiptoken/-9.full.json         |  6 +-
 .../resources/V30/Customer/skiptoken/-9.xml     | 10 +--
 .../V30/CustomerInfo/11/entity.full.json        |  4 +-
 .../resources/V30/CustomerInfo/11/entity.xml    |  4 +-
 .../V30/CustomerInfo/12/entity.full.json        |  4 +-
 .../resources/V30/CustomerInfo/12/entity.xml    |  4 +-
 .../V30/CustomerInfo/17/entity.full.json        |  4 +-
 .../resources/V30/CustomerInfo/17/entity.xml    |  4 +-
 .../resources/V30/CustomerInfo/feed.full.json   | 22 ++---
 .../main/resources/V30/CustomerInfo/feed.xml    | 24 +++---
 .../V30/EdmBooleanSet/true/entity.full.json     |  2 +-
 .../resources/V30/EdmBooleanSet/true/entity.xml |  4 +-
 .../V30/EdmByteSet/255/entity.full.json         |  2 +-
 .../resources/V30/EdmByteSet/255/entity.xml     |  4 +-
 .../entity.full.json                            |  2 +-
 .../79228162514264337593543950335M/entity.xml   |  4 +-
 .../1.7976931348623157E308D/entity.full.json    |  2 +-
 .../1.7976931348623157E308D/entity.xml          |  4 +-
 .../entity.full.json                            |  2 +-
 .../entity.xml                                  |  4 +-
 .../V30/EdmInt16Set/32767/entity.full.json      |  2 +-
 .../resources/V30/EdmInt16Set/32767/entity.xml  |  4 +-
 .../EdmInt32Set/-2147483648/entity.full.json    |  2 +-
 .../V30/EdmInt32Set/-2147483648/entity.xml      |  4 +-
 .../9223372036854775807L/entity.full.json       |  2 +-
 .../EdmInt64Set/9223372036854775807L/entity.xml |  4 +-
 .../EdmSingleSet/3.4028235E38f/entity.full.json |  2 +-
 .../V30/EdmSingleSet/3.4028235E38f/entity.xml   |  4 +-
 .../V30/EdmStringSet/'$'/entity.full.json       |  2 +-
 .../resources/V30/EdmStringSet/'$'/entity.xml   |  4 +-
 .../entity.full.json                            |  2 +-
 .../entity.xml                                  |  4 +-
 .../V30/InStreamErrorGetCustomer.full.json      |  2 +-
 .../resources/V30/InStreamErrorGetCustomer.xml  |  6 +-
 .../resources/V30/Login/'3'/entity.full.json    |  4 +-
 fit/src/main/resources/V30/Login/'3'/entity.xml |  4 +-
 .../V30/Message/1 -10/entity.full.json          |  4 +-
 .../main/resources/V30/Message/1 -10/entity.xml |  4 +-
 fit/src/main/resources/V30/Message/feed.xml     | 24 +++---
 .../resources/V30/Order/-10/entity.full.json    |  4 +-
 fit/src/main/resources/V30/Order/-10/entity.xml |  4 +-
 .../resources/V30/Order/-7/entity.full.json     |  4 +-
 fit/src/main/resources/V30/Order/-7/entity.xml  |  4 +-
 .../resources/V30/Order/-8/entity.full.json     |  4 +-
 fit/src/main/resources/V30/Order/-8/entity.xml  |  4 +-
 .../resources/V30/Order/-9/entity.full.json     |  4 +-
 fit/src/main/resources/V30/Order/-9/entity.xml  |  4 +-
 .../V30/OrderLine/-10 -10/entity.full.json      |  4 +-
 .../resources/V30/OrderLine/-10 -10/entity.xml  |  4 +-
 .../feed.full.json                              |  6 +-
 .../feed.xml                                    |  8 +-
 fit/src/main/resources/V30/Person/feed.xml      | 44 +++++-----
 .../filter/PersonId sub 2 lt -10.full.json      |  2 +-
 .../V30/Person/filter/PersonId sub 2 lt -10.xml | 12 +--
 ...iaDefaultService.SpecialEmployee').full.json |  2 +-
 ....AstoriaDefaultService.SpecialEmployee').xml | 20 ++---
 .../resources/V30/Product/-10/entity.full.json  |  6 +-
 .../main/resources/V30/Product/-10/entity.xml   |  6 +-
 .../resources/V30/Product/-6/entity.full.json   |  6 +-
 .../main/resources/V30/Product/-6/entity.xml    |  6 +-
 .../resources/V30/Product/-7/entity.full.json   |  6 +-
 .../main/resources/V30/Product/-7/entity.xml    |  6 +-
 .../V30/Product/-7/links/Photos.full.json       |  6 +-
 .../resources/V30/Product/-9/entity.full.json   |  6 +-
 .../main/resources/V30/Product/-9/entity.xml    |  6 +-
 .../main/resources/V30/Product/feed.full.json   | 42 +++++-----
 fit/src/main/resources/V30/Product/feed.xml     | 44 +++++-----
 .../ceiling(Dimensions.Width) eq 7338.full.json |  2 +-
 .../ceiling(Dimensions.Width) eq 7338.xml       |  8 +-
 ...', newname') eq 'kdcuklu, newname'.full.json |  2 +-
 ...tion, ', newname') eq 'kdcuklu, newname'.xml |  8 +-
 .../floor(Dimensions.Width) eq 7337.full.json   |  2 +-
 .../filter/floor(Dimensions.Width) eq 7337.xml  |  8 +-
 .../indexof(Description, 'k') eq 0.full.json    |  2 +-
 .../filter/indexof(Description, 'k') eq 0.xml   | 12 +--
 .../filter/length(Description) eq 7.full.json   |  2 +-
 .../Product/filter/length(Description) eq 7.xml |  8 +-
 .../round(Dimensions.Width) eq 7338.full.json   |  2 +-
 .../filter/round(Dimensions.Width) eq 7338.xml  |  8 +-
 ...artswith(Description, 'k') eq true.full.json |  2 +-
 .../startswith(Description, 'k') eq true.xml    | 12 +--
 ...of('kdcuklu', Description) eq true.full.json |  2 +-
 ...stringof('kdcuklu', Description) eq true.xml |  8 +-
 .../toupper(Description) eq 'KDCUKLU'.full.json |  2 +-
 .../toupper(Description) eq 'KDCUKLU'.xml       |  8 +-
 .../V30/ProductPhoto/-2 -2/entity.full.json     |  4 +-
 .../resources/V30/ProductPhoto/-2 -2/entity.xml |  4 +-
 .../V30/ProductPhoto/-3 -3/entity.full.json     |  4 +-
 .../resources/V30/ProductPhoto/-3 -3/entity.xml |  4 +-
 .../entity.full.json                            |  4 +-
 .../entity.xml                                  |  4 +-
 .../entity.full.json                            |  4 +-
 .../entity.xml                                  |  4 +-
 fit/src/main/resources/V30/services.full.json   |  2 +-
 fit/src/main/resources/V30/services.xml         |  2 +-
 .../resources/V40/Accounts/101/entity.full.json | 28 +++----
 .../main/resources/V40/Accounts/101/entity.xml  | 26 +++---
 .../V40/Accounts/101/links/MyGiftCard.full.json |  4 +-
 .../V40/Accounts/101/links/MyGiftCard.xml       |  6 +-
 .../MyPaymentInstruments(101901).full.json      | 14 ++--
 .../101/links/MyPaymentInstruments(101901).xml  | 10 +--
 .../MyPaymentInstruments(101902).full.json      | 14 ++--
 .../101/links/MyPaymentInstruments(101902).xml  | 10 +--
 .../101/links/MyPaymentInstruments.full.json    | 46 +++++------
 .../Accounts/101/links/MyPaymentInstruments.xml | 26 +++---
 .../resources/V40/Accounts/102/entity.full.json | 28 +++----
 .../main/resources/V40/Accounts/102/entity.xml  | 26 +++---
 .../V40/Accounts/102/links/MyGiftCard.full.json |  4 +-
 .../V40/Accounts/102/links/MyGiftCard.xml       |  6 +-
 .../MyPaymentInstruments(102901).full.json      | 14 ++--
 .../102/links/MyPaymentInstruments(102901).xml  |  8 +-
 .../MyPaymentInstruments(102902).full.json      | 14 ++--
 .../102/links/MyPaymentInstruments(102902).xml  |  8 +-
 .../102/links/MyPaymentInstruments.full.json    | 46 +++++------
 .../Accounts/102/links/MyPaymentInstruments.xml | 26 +++---
 .../entity.full.json                            |  4 +-
 .../entity.xml                                  |  4 +-
 .../resources/V40/Advertisements/feed.full.json |  6 +-
 .../main/resources/V40/Advertisements/feed.xml  |  8 +-
 .../main/resources/V40/Boss/entity.full.json    | 22 ++---
 .../main/resources/V40/Company/entity.full.json | 26 +++---
 fit/src/main/resources/V40/Company/entity.xml   | 22 ++---
 .../resources/V40/Customers/1/entity.full.json  | 22 ++---
 .../main/resources/V40/Customers/1/entity.xml   | 14 ++--
 .../V40/Customers/1/links/Company.full.json     |  4 +-
 .../resources/V40/Customers/1/links/Company.xml |  2 +-
 .../V40/Customers/1/links/Orders.full.json      |  6 +-
 .../resources/V40/Customers/1/links/Orders.xml  |  4 +-
 .../resources/V40/Customers/2/entity.full.json  | 22 ++---
 .../main/resources/V40/Customers/2/entity.xml   | 20 ++---
 .../main/resources/V40/Customers/feed.full.json | 10 +--
 fit/src/main/resources/V40/Customers/feed.xml   | 24 +++---
 .../V40/OrderDetails/7 5/entity.full.json       | 14 ++--
 .../resources/V40/OrderDetails/7 5/entity.xml   | 10 +--
 .../resources/V40/Orders/8/entity.full.json     | 18 ++--
 fit/src/main/resources/V40/Orders/8/entity.xml  | 14 ++--
 .../resources/V40/Orders/8/links/.full.json     |  4 +-
 .../Orders/8/links/CustomerForOrder.full.json   |  4 +-
 .../V40/Orders/8/links/CustomerForOrder.xml     |  2 +-
 .../main/resources/V40/Orders/feed.full.json    | 34 ++++----
 fit/src/main/resources/V40/Orders/feed.xml      | 24 +++---
 .../resources/V40/Org.OData.Capabilities.V1.xml |  2 +-
 .../resources/V40/Org.OData.Measures.V1.xml     |  2 +-
 .../resources/V40/People/1/entity.full.json     | 22 ++---
 fit/src/main/resources/V40/People/1/entity.xml  | 14 ++--
 .../resources/V40/People/5/entity.full.json     | 14 ++--
 fit/src/main/resources/V40/People/5/entity.xml  | 10 +--
 .../feed.full.json                              | 42 +++++-----
 .../feed.xml                                    | 24 +++---
 .../main/resources/V40/People/feed.full.json    | 86 ++++++++++----------
 fit/src/main/resources/V40/People/feed.xml      | 50 ++++++------
 .../V40/People/filter/(PersonID eq 5).full.json |  6 +-
 .../V40/People/filter/(PersonID eq 5).xml       | 14 ++--
 .../V40/People/filter/(PersonID lt 3).full.json | 10 +--
 .../V40/People/filter/(PersonID lt 3).xml       | 24 +++---
 .../filter/(PersonID lt 3).full.json            | 10 +--
 .../PersonID desc/filter/(PersonID lt 3).xml    | 24 +++---
 .../resources/V40/People/skiptoken/5.full.json  | 14 ++--
 .../main/resources/V40/People/skiptoken/5.xml   | 12 +--
 .../V40/PersonDetails/1/entity.full.json        |  4 +-
 .../resources/V40/PersonDetails/1/entity.xml    |  6 +-
 .../V40/ProductDetails/6 1/entity.full.json     | 16 ++--
 .../resources/V40/ProductDetails/6 1/entity.xml | 14 ++--
 .../resources/V40/Products/5/entity.full.json   | 14 ++--
 .../main/resources/V40/Products/5/entity.xml    | 16 ++--
 .../resources/V40/Products/6/entity.full.json   | 14 ++--
 .../main/resources/V40/Products/6/entity.xml    |  8 +-
 .../main/resources/V40/Products/feed.full.json  | 62 +++++++-------
 fit/src/main/resources/V40/Products/feed.xml    | 36 ++++----
 .../entity.full.json                            |  4 +-
 .../entity.xml                                  |  6 +-
 .../entity.full.json                            |  4 +-
 .../entity.xml                                  |  6 +-
 .../V40/VipCustomer/1/entity.full.json          |  6 +-
 .../main/resources/V40/VipCustomer/1/entity.xml | 14 ++--
 fit/src/main/resources/V40/crossjoin.full.json  |  2 +-
 fit/src/main/resources/V40/delta.full.json      |  2 +-
 fit/src/main/resources/V40/delta.xml            | 20 ++---
 .../main/resources/V40/northwind-metadata.xml   |  2 +-
 .../Q3VzdG9tZXJzKDEpL09yZGVycw==.full.json      |  6 +-
 ...JkZXJzKDgpL0N1c3RvbWVyRm9yT3JkZXI=.full.json |  4 +-
 .../T3JkZXJzKDgpL0N1c3RvbWVyRm9yT3JkZXI=.xml    |  2 +-
 fit/src/main/resources/V40/services.full.json   |  2 +-
 fit/src/main/resources/V40/services.xml         |  4 +-
 .../resources/V40/vocabularies-metadata.xml     |  6 +-
 fit/src/main/resources/esigate.properties       |  4 +-
 pom.xml                                         | 10 +--
 285 files changed, 1298 insertions(+), 1305 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/pom.xml
----------------------------------------------------------------------
diff --git a/fit/pom.xml b/fit/pom.xml
index de4f3e0..30dade1 100644
--- a/fit/pom.xml
+++ b/fit/pom.xml
@@ -147,7 +147,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.17</version>
         <configuration>
           <includes>
             <include>**/*ITCase.java</include>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/AllGeoTypesSet/-10/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/AllGeoTypesSet/-10/entity.xml b/fit/src/main/resources/V30/AllGeoTypesSet/-10/entity.xml
index 42dc8c2..b6d4244 100644
--- a/fit/src/main/resources/V30/AllGeoTypesSet/-10/entity.xml
+++ b/fit/src/main/resources/V30/AllGeoTypesSet/-10/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-10)</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-10)</id>
   <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialTypes" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
   <link rel="edit" title="AllSpatialTypes" href="AllGeoTypesSet(-10)" />
   <title />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/AllGeoTypesSet/feed.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/AllGeoTypesSet/feed.xml b/fit/src/main/resources/V30/AllGeoTypesSet/feed.xml
index 7d689e7..8fa4ef3 100644
--- a/fit/src/main/resources/V30/AllGeoTypesSet/feed.xml
+++ b/fit/src/main/resources/V30/AllGeoTypesSet/feed.xml
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet</id>
   <title type="text">AllGeoTypesSet</title>
   <updated>2014-05-08T12:26:29Z</updated>
   <link rel="self" title="AllGeoTypesSet" href="AllGeoTypesSet" />
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-10)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-10)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialTypes" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="AllSpatialTypes" href="AllGeoTypesSet(-10)" />
     <title />
@@ -165,7 +165,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-9)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-9)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialTypes" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="AllSpatialTypes" href="AllGeoTypesSet(-9)" />
     <title />
@@ -272,7 +272,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-8)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-8)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialTypes" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="AllSpatialTypes" href="AllGeoTypesSet(-8)" />
     <title />
@@ -422,7 +422,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-7)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-7)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialTypes" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="AllSpatialTypes" href="AllGeoTypesSet(-7)" />
     <title />
@@ -524,7 +524,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-6)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-6)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialTypes" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="AllSpatialTypes" href="AllGeoTypesSet(-6)" />
     <title />
@@ -652,7 +652,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-5)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-5)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialTypes" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="AllSpatialTypes" href="AllGeoTypesSet(-5)" />
     <title />
@@ -807,7 +807,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-4)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-4)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialTypes" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="AllSpatialTypes" href="AllGeoTypesSet(-4)" />
     <title />
@@ -967,7 +967,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-3)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-3)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialTypes" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="AllSpatialTypes" href="AllGeoTypesSet(-3)" />
     <title />
@@ -1095,7 +1095,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-2)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-2)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialTypes" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="AllSpatialTypes" href="AllGeoTypesSet(-2)" />
     <title />
@@ -1222,7 +1222,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-1)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-1)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialTypes" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="AllSpatialTypes" href="AllGeoTypesSet(-1)" />
     <title />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/12/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/12/entity.full.json b/fit/src/main/resources/V30/Car/12/entity.full.json
index 26ddb5d..422bff8 100644
--- a/fit/src/main/resources/V30/Car/12/entity.full.json
+++ b/fit/src/main/resources/V30/Car/12/entity.full.json
@@ -1,7 +1,7 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car/@Element",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car/@Element",
   "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
-  "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)",
+  "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)",
   "odata.editLink": "Car(12)",
   "odata.mediaEditLink": "Car(12)/$value",
   "odata.mediaReadLink": "Car(12)/$value",

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/12/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/12/entity.xml b/fit/src/main/resources/V30/Car/12/entity.xml
index 263b21b..694dbbe 100644
--- a/fit/src/main/resources/V30/Car/12/entity.xml
+++ b/fit/src/main/resources/V30/Car/12/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)</id>
   <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
   <link rel="edit" title="Car" href="Car(12)" />
   <title />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/14/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/14/entity.full.json b/fit/src/main/resources/V30/Car/14/entity.full.json
index 4830ea0..6767a12 100644
--- a/fit/src/main/resources/V30/Car/14/entity.full.json
+++ b/fit/src/main/resources/V30/Car/14/entity.full.json
@@ -1,7 +1,7 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car/@Element",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car/@Element",
   "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
-  "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)",
+  "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)",
   "odata.editLink": "Car(14)",
   "odata.mediaEditLink": "Car(14)/$value",
   "odata.mediaReadLink": "Car(14)/$value",

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/14/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/14/entity.xml b/fit/src/main/resources/V30/Car/14/entity.xml
index eae3b50..777c11e 100644
--- a/fit/src/main/resources/V30/Car/14/entity.xml
+++ b/fit/src/main/resources/V30/Car/14/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)</id>
   <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
   <link rel="edit" title="Car" href="Car(14)" />
   <title />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/15/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/15/entity.full.json b/fit/src/main/resources/V30/Car/15/entity.full.json
index 3ac6ec3..73763cb 100644
--- a/fit/src/main/resources/V30/Car/15/entity.full.json
+++ b/fit/src/main/resources/V30/Car/15/entity.full.json
@@ -1,7 +1,7 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car/@Element",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car/@Element",
   "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
-  "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)",
+  "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)",
   "odata.editLink": "Car(15)",
   "odata.mediaEditLink": "Car(15)/$value",
   "odata.mediaReadLink": "Car(15)/$value",

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/15/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/15/entity.xml b/fit/src/main/resources/V30/Car/15/entity.xml
index 2af0d96..2fcfe44 100644
--- a/fit/src/main/resources/V30/Car/15/entity.xml
+++ b/fit/src/main/resources/V30/Car/15/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id>
   <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
   <link rel="edit" title="Car" href="Car(15)" />
   <title />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/16/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/16/entity.full.json b/fit/src/main/resources/V30/Car/16/entity.full.json
index 3ded37b..d0977cf 100644
--- a/fit/src/main/resources/V30/Car/16/entity.full.json
+++ b/fit/src/main/resources/V30/Car/16/entity.full.json
@@ -1,7 +1,7 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car/@Element",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car/@Element",
   "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
-  "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(16)",
+  "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(16)",
   "odata.editLink": "Car(16)",
   "odata.mediaEditLink": "Car(16)/$value",
   "odata.mediaReadLink": "Car(16)/$value",

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/16/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/16/entity.xml b/fit/src/main/resources/V30/Car/16/entity.xml
index f2c136b..07507c2 100644
--- a/fit/src/main/resources/V30/Car/16/entity.xml
+++ b/fit/src/main/resources/V30/Car/16/entity.xml
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" 
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" 
        xmlns="http://www.w3.org/2005/Atom" 
        xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" 
        xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" 
        xmlns:georss="http://www.georss.org/georss" 
        xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(16)</id>
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(16)</id>
   <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
   <link rel="edit" title="Car" href="Car(16)" />
   <title />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/feed.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/feed.full.json b/fit/src/main/resources/V30/Car/feed.full.json
index 150bd7d..c89a00d 100644
--- a/fit/src/main/resources/V30/Car/feed.full.json
+++ b/fit/src/main/resources/V30/Car/feed.full.json
@@ -1,10 +1,10 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car",
   "value":
           [
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)",
               "odata.editLink": "Car(11)",
               "odata.mediaEditLink": "Car(11)/$value",
               "odata.mediaReadLink": "Car(11)/$value",
@@ -16,7 +16,7 @@
             },
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)",
               "odata.editLink": "Car(12)",
               "odata.mediaEditLink": "Car(12)/$value",
               "odata.mediaReadLink": "Car(12)/$value",
@@ -28,7 +28,7 @@
             },
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)",
               "odata.editLink": "Car(13)",
               "odata.mediaEditLink": "Car(13)/$value",
               "odata.mediaReadLink": "Car(13)/$value",
@@ -40,7 +40,7 @@
             },
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)",
               "odata.editLink": "Car(14)",
               "odata.mediaEditLink": "Car(14)/$value",
               "odata.mediaReadLink": "Car(14)/$value",
@@ -52,7 +52,7 @@
             },
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)",
               "odata.editLink": "Car(15)",
               "odata.mediaEditLink": "Car(15)/$value",
               "odata.mediaReadLink": "Car(15)/$value",
@@ -64,7 +64,7 @@
             },
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(16)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(16)",
               "odata.editLink": "Car(16)",
               "odata.mediaEditLink": "Car(16)/$value",
               "odata.mediaReadLink": "Car(16)/$value",
@@ -77,7 +77,7 @@
             },
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(17)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(17)",
               "odata.editLink": "Car(17)",
               "odata.mediaEditLink": "Car(17)/$value",
               "odata.mediaReadLink": "Car(17)/$value",
@@ -89,7 +89,7 @@
             },
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(18)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(18)",
               "odata.editLink": "Car(18)",
               "odata.mediaEditLink": "Car(18)/$value",
               "odata.mediaReadLink": "Car(18)/$value",
@@ -101,7 +101,7 @@
             },
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(19)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(19)",
               "odata.editLink": "Car(19)",
               "odata.mediaEditLink": "Car(19)/$value",
               "odata.mediaReadLink": "Car(19)/$value",
@@ -113,7 +113,7 @@
             },
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(20)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(20)",
               "odata.editLink": "Car(20)",
               "odata.mediaEditLink": "Car(20)/$value",
               "odata.mediaReadLink": "Car(20)/$value",
@@ -125,7 +125,7 @@
             },
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(21)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(21)",
               "odata.editLink": "Car(21)",
               "odata.mediaEditLink": "Car(21)/$value",
               "odata.mediaReadLink": "Car(21)/$value",
@@ -137,7 +137,7 @@
             },
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(22)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(22)",
               "odata.editLink": "Car(22)",
               "odata.mediaEditLink": "Car(22)/$value",
               "odata.mediaReadLink": "Car(22)/$value",
@@ -149,7 +149,7 @@
             },
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(27)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(27)",
               "odata.editLink": "Car(27)",
               "odata.mediaEditLink": "Car(27)/$value",
               "odata.mediaReadLink": "Car(27)/$value",
@@ -161,7 +161,7 @@
             },
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(30)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(30)",
               "odata.editLink": "Car(30)",
               "odata.mediaEditLink": "Car(30)/$value",
               "odata.mediaReadLink": "Car(30)/$value",
@@ -173,7 +173,7 @@
             },
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(31)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(31)",
               "odata.editLink": "Car(31)",
               "odata.mediaEditLink": "Car(31)/$value",
               "odata.mediaReadLink": "Car(31)/$value",
@@ -185,7 +185,7 @@
             },
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(32)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(32)",
               "odata.editLink": "Car(32)",
               "odata.mediaEditLink": "Car(32)/$value",
               "odata.mediaReadLink": "Car(32)/$value",
@@ -197,7 +197,7 @@
             },
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(33)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(33)",
               "odata.editLink": "Car(33)",
               "odata.mediaEditLink": "Car(33)/$value",
               "odata.mediaReadLink": "Car(33)/$value",
@@ -210,7 +210,7 @@
             },
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(34)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(34)",
               "odata.editLink": "Car(34)",
               "odata.mediaEditLink": "Car(34)/$value",
               "odata.mediaReadLink": "Car(34)/$value",
@@ -222,7 +222,7 @@
             },
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(35)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(35)",
               "odata.editLink": "Car(35)",
               "odata.mediaEditLink": "Car(35)/$value",
               "odata.mediaReadLink": "Car(35)/$value",
@@ -234,7 +234,7 @@
             },
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(40)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(40)",
               "odata.editLink": "Car(40)",
               "odata.mediaEditLink": "Car(40)/$value",
               "odata.mediaReadLink": "Car(40)/$value",
@@ -246,7 +246,7 @@
             },
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(43)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(43)",
               "odata.editLink": "Car(43)",
               "odata.mediaEditLink": "Car(43)/$value",
               "odata.mediaReadLink": "Car(43)/$value",
@@ -258,7 +258,7 @@
             },
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(44)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(44)",
               "odata.editLink": "Car(44)",
               "odata.mediaEditLink": "Car(44)/$value",
               "odata.mediaReadLink": "Car(44)/$value",
@@ -270,7 +270,7 @@
             },
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(45)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(45)",
               "odata.editLink": "Car(45)",
               "odata.mediaEditLink": "Car(45)/$value",
               "odata.mediaReadLink": "Car(45)/$value",
@@ -282,7 +282,7 @@
             },
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
-              "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(46)",
+              "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(46)",
               "odata.editLink": "Car(46)",
               "odata.mediaEditLink": "Car(46)/$value",
               "odata.mediaReadLink": "Car(46)/$value",

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/feed.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/feed.xml b/fit/src/main/resources/V30/Car/feed.xml
index aad52f3..195ae6d 100644
--- a/fit/src/main/resources/V30/Car/feed.xml
+++ b/fit/src/main/resources/V30/Car/feed.xml
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car</id>
   <title type="text">Car</title>
   <updated>2014-02-06T14:09:08Z</updated>
   <link rel="self" title="Car" href="Car" />
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(11)" />
     <title />
@@ -43,7 +43,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(12)" />
     <title />
@@ -61,7 +61,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(13)" />
     <title />
@@ -79,7 +79,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(14)" />
     <title />
@@ -97,7 +97,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(15)" />
     <title />
@@ -115,7 +115,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(16)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(16)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(16)" />
     <title />
@@ -133,7 +133,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(17)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(17)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(17)" />
     <title />
@@ -151,7 +151,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(18)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(18)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(18)" />
     <title />
@@ -169,7 +169,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(19)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(19)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(19)" />
     <title />
@@ -187,7 +187,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(20)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(20)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(20)" />
     <title />
@@ -205,7 +205,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(21)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(21)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(21)" />
     <title />
@@ -223,7 +223,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(22)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(22)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(22)" />
     <title />
@@ -241,7 +241,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(27)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(27)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(27)" />
     <title />
@@ -259,7 +259,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(30)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(30)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(30)" />
     <title />
@@ -277,7 +277,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(31)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(31)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(31)" />
     <title />
@@ -295,7 +295,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(32)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(32)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(32)" />
     <title />
@@ -313,7 +313,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(33)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(33)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(33)" />
     <title />
@@ -331,7 +331,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(34)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(34)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(34)" />
     <title />
@@ -349,7 +349,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(35)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(35)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(35)" />
     <title />
@@ -367,7 +367,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(40)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(40)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(40)" />
     <title />
@@ -385,7 +385,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(43)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(43)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(43)" />
     <title />
@@ -403,7 +403,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(44)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(44)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(44)" />
     <title />
@@ -421,7 +421,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(45)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(45)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(45)" />
     <title />
@@ -439,7 +439,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(46)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(46)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(46)" />
     <title />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/((1 add VIN) eq 16).full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/((1 add VIN) eq 16).full.json b/fit/src/main/resources/V30/Car/filter/((1 add VIN) eq 16).full.json
index 7ab1c21..4cef43b 100644
--- a/fit/src/main/resources/V30/Car/filter/((1 add VIN) eq 16).full.json	
+++ b/fit/src/main/resources/V30/Car/filter/((1 add VIN) eq 16).full.json	
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)","odata.editLink":"Car(15)","odata.mediaEditLink":"Car(15)/$value","odata.mediaReadLink":"Car(15)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(15)/Photo","Video@odata.mediaEditLink":"Car(15)/Video","VIN":15,"Description":"kphszztczthjacvjnttrarxru"}]}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)","odata.editLink":"Car(15)","odata.mediaEditLink":"Car(15)/$value","odata.mediaReadLink":"Car(15)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(15)/Photo","Video@odata.mediaEditLink":"Car(15)/Video","VIN":15,"Description":"kphszztczthjacvjnttrarxru"}]}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/((1 add VIN) eq 16).xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/((1 add VIN) eq 16).xml b/fit/src/main/resources/V30/Car/filter/((1 add VIN) eq 16).xml
index ac39c3a..bd74712 100644
--- a/fit/src/main/resources/V30/Car/filter/((1 add VIN) eq 16).xml	
+++ b/fit/src/main/resources/V30/Car/filter/((1 add VIN) eq 16).xml	
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car</id>
   <title type="text">Car</title>
   <updated>2014-02-13T12:09:31Z</updated>
   <link rel="self" title="Car" href="Car" />
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(15)" />
     <title />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/((VIN add 1) eq 16).full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/((VIN add 1) eq 16).full.json b/fit/src/main/resources/V30/Car/filter/((VIN add 1) eq 16).full.json
index 7ab1c21..4cef43b 100644
--- a/fit/src/main/resources/V30/Car/filter/((VIN add 1) eq 16).full.json	
+++ b/fit/src/main/resources/V30/Car/filter/((VIN add 1) eq 16).full.json	
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)","odata.editLink":"Car(15)","odata.mediaEditLink":"Car(15)/$value","odata.mediaReadLink":"Car(15)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(15)/Photo","Video@odata.mediaEditLink":"Car(15)/Video","VIN":15,"Description":"kphszztczthjacvjnttrarxru"}]}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)","odata.editLink":"Car(15)","odata.mediaEditLink":"Car(15)/$value","odata.mediaReadLink":"Car(15)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(15)/Photo","Video@odata.mediaEditLink":"Car(15)/Video","VIN":15,"Description":"kphszztczthjacvjnttrarxru"}]}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/((VIN add 1) eq 16).xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/((VIN add 1) eq 16).xml b/fit/src/main/resources/V30/Car/filter/((VIN add 1) eq 16).xml
index ac39c3a..bd74712 100644
--- a/fit/src/main/resources/V30/Car/filter/((VIN add 1) eq 16).xml	
+++ b/fit/src/main/resources/V30/Car/filter/((VIN add 1) eq 16).xml	
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car</id>
   <title type="text">Car</title>
   <updated>2014-02-13T12:09:31Z</updated>
   <link rel="self" title="Car" href="Car" />
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(15)" />
     <title />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/((VIN lt 16) and (VIN gt 12)).full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/((VIN lt 16) and (VIN gt 12)).full.json b/fit/src/main/resources/V30/Car/filter/((VIN lt 16) and (VIN gt 12)).full.json
index 3106505..683836c 100644
--- a/fit/src/main/resources/V30/Car/filter/((VIN lt 16) and (VIN gt 12)).full.json	
+++ b/fit/src/main/resources/V30/Car/filter/((VIN lt 16) and (VIN gt 12)).full.json	
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)","odata.editLink":"Car(13)","odata.mediaEditLink":"Car(13)/$value","odata.mediaReadLink":"Car(13)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(13)/Photo","Video@odata.mediaEditLink":"Car(13)/Video","VIN":13,"Description":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)","odata.editLink":"Car(14)","odata.mediaEditLink":"Car(14)/$value","odata.mediaReadLink":"Car(14)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(14)/Photo","Video@odata.mediaEditLink":"Car(14)/Video","VIN":14,"Description":"New De
 scription(1392222565917)"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)","odata.editLink":"Car(15)","odata.mediaEditLink":"Car(15)/$value","odata.mediaReadLink":"Car(15)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(15)/Photo","Video@odata.mediaEditLink":"Car(15)/Video","VIN":15,"Description":"kphszztczthjacvjnttrarxru"}]}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)","odata.editLink":"Car(13)","odata.mediaEditLink":"Car(13)/$value","odata.mediaReadLink":"Car(13)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(13)/Photo","Video@odata.mediaEditLink":"Car(13)/Video","VIN":13,"Description":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)","odata.editLink":"Car(14)","odata.mediaEditLink":"Car(14)/$value","odata.mediaReadLink":"Car(14)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(14)/Photo","Video@odata.mediaEditLink":"Car(14)/Video","VIN":14,"Description":"New
  Description(1392222565917)"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)","odata.editLink":"Car(15)","odata.mediaEditLink":"Car(15)/$value","odata.mediaReadLink":"Car(15)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(15)/Photo","Video@odata.mediaEditLink":"Car(15)/Video","VIN":15,"Description":"kphszztczthjacvjnttrarxru"}]}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/((VIN lt 16) and (VIN gt 12)).xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/((VIN lt 16) and (VIN gt 12)).xml b/fit/src/main/resources/V30/Car/filter/((VIN lt 16) and (VIN gt 12)).xml
index 9baac4d..83dd66e 100644
--- a/fit/src/main/resources/V30/Car/filter/((VIN lt 16) and (VIN gt 12)).xml	
+++ b/fit/src/main/resources/V30/Car/filter/((VIN lt 16) and (VIN gt 12)).xml	
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car</id>
   <title type="text">Car</title>
   <updated>2014-02-13T12:09:31Z</updated>
   <link rel="self" title="Car" href="Car" />
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(13)" />
     <title />
@@ -43,7 +43,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(14)" />
     <title />
@@ -61,7 +61,7 @@
     </m:properties>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(15)" />
     <title />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/(16 eq (1 add VIN)).full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/(16 eq (1 add VIN)).full.json b/fit/src/main/resources/V30/Car/filter/(16 eq (1 add VIN)).full.json
index 7ab1c21..4cef43b 100644
--- a/fit/src/main/resources/V30/Car/filter/(16 eq (1 add VIN)).full.json	
+++ b/fit/src/main/resources/V30/Car/filter/(16 eq (1 add VIN)).full.json	
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)","odata.editLink":"Car(15)","odata.mediaEditLink":"Car(15)/$value","odata.mediaReadLink":"Car(15)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(15)/Photo","Video@odata.mediaEditLink":"Car(15)/Video","VIN":15,"Description":"kphszztczthjacvjnttrarxru"}]}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)","odata.editLink":"Car(15)","odata.mediaEditLink":"Car(15)/$value","odata.mediaReadLink":"Car(15)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(15)/Photo","Video@odata.mediaEditLink":"Car(15)/Video","VIN":15,"Description":"kphszztczthjacvjnttrarxru"}]}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/(16 eq (1 add VIN)).xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/(16 eq (1 add VIN)).xml b/fit/src/main/resources/V30/Car/filter/(16 eq (1 add VIN)).xml
index ac39c3a..bd74712 100644
--- a/fit/src/main/resources/V30/Car/filter/(16 eq (1 add VIN)).xml	
+++ b/fit/src/main/resources/V30/Car/filter/(16 eq (1 add VIN)).xml	
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car</id>
   <title type="text">Car</title>
   <updated>2014-02-13T12:09:31Z</updated>
   <link rel="self" title="Car" href="Car" />
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(15)" />
     <title />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/(VIN eq 16).full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/(VIN eq 16).full.json b/fit/src/main/resources/V30/Car/filter/(VIN eq 16).full.json
index 6c1637c..d1d0b02 100644
--- a/fit/src/main/resources/V30/Car/filter/(VIN eq 16).full.json	
+++ b/fit/src/main/resources/V30/Car/filter/(VIN eq 16).full.json	
@@ -1,8 +1,8 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car",
+  "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car",
   "value": [{
       "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
-      "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(16)",
+      "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(16)",
       "odata.editLink": "Car(16)",
       "odata.mediaEditLink": "Car(16)/$value",
       "odata.mediaReadLink": "Car(16)/$value",

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/(VIN eq 16).xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/(VIN eq 16).xml b/fit/src/main/resources/V30/Car/filter/(VIN eq 16).xml
index 83f6e67..c770fe6 100644
--- a/fit/src/main/resources/V30/Car/filter/(VIN eq 16).xml	
+++ b/fit/src/main/resources/V30/Car/filter/(VIN eq 16).xml	
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car</id>
   <title type="text">Car</title>
   <updated>2014-02-13T12:09:31Z</updated>
   <link rel="self" title="Car" href="Car" />
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(16)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(16)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Car" href="Car(16)" />
     <title />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/(VIN lt 16).full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Car/filter/(VIN lt 16).full.json b/fit/src/main/resources/V30/Car/filter/(VIN lt 16).full.json
index e14ea11..29ff01f 100644
--- a/fit/src/main/resources/V30/Car/filter/(VIN lt 16).full.json	
+++ b/fit/src/main/resources/V30/Car/filter/(VIN lt 16).full.json	
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)","odata.editLink":"Car(11)","odata.mediaEditLink":"Car(11)/$value","odata.mediaReadLink":"Car(11)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(11)/Photo","Video@odata.mediaEditLink":"Car(11)/Video","VIN":11,"Description":"cenbviijieljtrtdslbuiqubcvhxhzenidqdnaopplvlqc"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)","odata.editLink":"Car(12)","odata.mediaEditLink":"Car(12)/$value","odata.mediaReadLink":"Car(12)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(12)/Photo","Video@odata.mediaEditLink":"C
 ar(12)/Video","VIN":12,"Description":"lx"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)","odata.editLink":"Car(13)","odata.mediaEditLink":"Car(13)/$value","odata.mediaReadLink":"Car(13)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(13)/Photo","Video@odata.mediaEditLink":"Car(13)/Video","VIN":13,"Description":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)","odata.editLink":"Car(14)","odata.mediaEditLink":"Car(14)/$value","odata.mediaReadLink":"Car(14)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(14)/Photo","Video@odata.mediaEditLink":"Car(14)/Video","VIN":14,"Description":"New Description(1392222565917)"},{"odata.type":"Microsoft.Test.OData.Services.A
 storiaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)","odata.editLink":"Car(15)","odata.mediaEditLink":"Car(15)/$value","odata.mediaReadLink":"Car(15)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(15)/Photo","Video@odata.mediaEditLink":"Car(15)/Video","VIN":15,"Description":"kphszztczthjacvjnttrarxru"}]}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)","odata.editLink":"Car(11)","odata.mediaEditLink":"Car(11)/$value","odata.mediaReadLink":"Car(11)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(11)/Photo","Video@odata.mediaEditLink":"Car(11)/Video","VIN":11,"Description":"cenbviijieljtrtdslbuiqubcvhxhzenidqdnaopplvlqc"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)","odata.editLink":"Car(12)","odata.mediaEditLink":"Car(12)/$value","odata.mediaReadLink":"Car(12)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(12)/Photo","Video@odata.mediaEditLink"
 :"Car(12)/Video","VIN":12,"Description":"lx"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)","odata.editLink":"Car(13)","odata.mediaEditLink":"Car(13)/$value","odata.mediaReadLink":"Car(13)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(13)/Photo","Video@odata.mediaEditLink":"Car(13)/Video","VIN":13,"Description":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)","odata.editLink":"Car(14)","odata.mediaEditLink":"Car(14)/$value","odata.mediaReadLink":"Car(14)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(14)/Photo","Video@odata.mediaEditLink":"Car(14)/Video","VIN":14,"Description":"New Description(1392222565917)"},{"odata.type":"Microsoft.Test.OData.Servi
 ces.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)","odata.editLink":"Car(15)","odata.mediaEditLink":"Car(15)/$value","odata.mediaReadLink":"Car(15)/$value","odata.mediaContentType":"application/octet-stream","Photo@odata.mediaEditLink":"Car(15)/Photo","Video@odata.mediaEditLink":"Car(15)/Video","VIN":15,"Description":"kphszztczthjacvjnttrarxru"}]}
\ No newline at end of file


[11/20] [OLINGO-377] Removing unused cargo properties, upgrading Tomcat, renaming cargo.servlet.port to tomcat.servlet.port

Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/filter/isof(Name,'Edm.String') eq true.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/filter/isof(Name,'Edm.String') eq true.xml b/fit/src/main/resources/V30/Customer/filter/isof(Name,'Edm.String') eq true.xml
index f8375de..a060cff 100644
--- a/fit/src/main/resources/V30/Customer/filter/isof(Name,'Edm.String') eq true.xml	
+++ b/fit/src/main/resources/V30/Customer/filter/isof(Name,'Edm.String') eq true.xml	
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer</id>
   <title type="text">Customer</title>
   <updated>2014-02-13T14:31:04Z</updated>
   <link rel="self" title="Customer" href="Customer" />
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Customer" href="Customer(-10)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="Customer(-10)/Orders" />
@@ -518,7 +518,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-9)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-9)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Customer" href="Customer(-9)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="Customer(-9)/Orders" />
@@ -1061,5 +1061,5 @@
       </m:properties>
     </content>
   </entry>
-  <link rel="next" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer?$filter=isof(Name,'Edm.String')%20eq%20true&amp;$skiptoken=-9" />
+  <link rel="next" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer?$filter=isof(Name,'Edm.String')%20eq%20true&amp;$skiptoken=-9" />
 </feed>


[13/20] [OLINGO-377] Removing unused cargo properties, upgrading Tomcat, renaming cargo.servlet.port to tomcat.servlet.port

Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/filter/CustomerId gt -10.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/filter/CustomerId gt -10.xml b/fit/src/main/resources/V30/Customer/filter/CustomerId gt -10.xml
index fd1a237..90ffae7 100644
--- a/fit/src/main/resources/V30/Customer/filter/CustomerId gt -10.xml	
+++ b/fit/src/main/resources/V30/Customer/filter/CustomerId gt -10.xml	
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer</id>
   <title type="text">Customer</title>
   <updated>2014-02-13T14:31:05Z</updated>
   <link rel="self" title="Customer" href="Customer" />
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-9)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-9)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Customer" href="Customer(-9)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="Customer(-9)/Orders" />
@@ -569,7 +569,7 @@
     </content>
   </entry>
   <entry>
-    <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-8)</id>
+    <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-8)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Customer" href="Customer(-8)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="Customer(-8)/Orders" />
@@ -736,5 +736,5 @@
       </m:properties>
     </content>
   </entry>
-  <link rel="next" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer?$filter=CustomerId%20gt%20-10&amp;$skiptoken=-8" />
+  <link rel="next" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer?$filter=CustomerId%20gt%20-10&amp;$skiptoken=-8" />
 </feed>

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/filter/CustomerId lt -10.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/filter/CustomerId lt -10.full.json b/fit/src/main/resources/V30/Customer/filter/CustomerId lt -10.full.json
index 1741004..c389bd8 100644
--- a/fit/src/main/resources/V30/Customer/filter/CustomerId lt -10.full.json	
+++ b/fit/src/main/resources/V30/Customer/filter/CustomerId lt -10.full.json	
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer","value":[]}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer","value":[]}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/filter/CustomerId lt -10.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/filter/CustomerId lt -10.xml b/fit/src/main/resources/V30/Customer/filter/CustomerId lt -10.xml
index 0bf6a22..4edda48 100644
--- a/fit/src/main/resources/V30/Customer/filter/CustomerId lt -10.xml	
+++ b/fit/src/main/resources/V30/Customer/filter/CustomerId lt -10.xml	
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
-  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer</id>
+<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml">
+  <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer</id>
   <title type="text">Customer</title>
   <updated>2014-02-13T13:58:00Z</updated>
   <link rel="self" title="Customer" href="Customer" />