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/05/05 16:05:31 UTC

[06/19] [OLINGO-271] Patch applied, without deploying ref

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/22eb2ed7/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 b2a4ce2..40f3b67 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}/StaticService/V30/Static.svc/$metadata#OrderLine/@Element",
+  "odata.metadata": "http://localhost:${cargo.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}/StaticService/V30/Static.svc/OrderLine(OrderId=-10,ProductId=-10)",
+  "odata.id": "http://localhost:${cargo.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/22eb2ed7/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 1494864..e24f731 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}/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}/StaticService/V30/Static.svc/OrderLine(OrderId=-10,ProductId=-10)</id>
+<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>
   <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/22eb2ed7/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 01fb4b3..28a62a1 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}/StaticService/V30/Static.svc/$metadata#Person","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","odata.id":"http://localhost:${cargo.servlet.port}/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}/StaticService/V30/Static.svc/Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack"},"PersonId":-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\u3041\u30af\u3093\u
 ff9d\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}/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}/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
+{"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

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/22eb2ed7/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 6146b85..061afe7 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}/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}/StaticService/V30/Static.svc/Person</id>
+<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>
   <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}/StaticService/V30/Static.svc/Person(-10)</id>
+    <id>http://localhost:${cargo.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}/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack" title="Sack" target="http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" />
+    <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" />
     <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}/StaticService/V30/Static.svc/Person(-9)</id>
+    <id>http://localhost:${cargo.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}/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack" title="Sack" target="http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" />
+    <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" />
     <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/22eb2ed7/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 2b06c9b..0a72a2c 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}/StaticService/V30/Static.svc/$metadata#Person","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","odata.id":"http://localhost:${cargo.servlet.port}/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}/StaticService/V30/Static.svc/Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack"},"PersonId":-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\u3041\u30af\u3093\u
 ff9d\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}/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}/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:${cargo.servlet.port}/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:${cargo.servlet.port}/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\uff5a\u30bf\u30dc\u3073\u042f\u30bc\u
 30b0\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}/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}/StaticService/V30/Static.svc/Person(-7)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack"},"PersonId":-7,"Name":"\u3073\u305e\u042f\u30
 bd\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:${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

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/22eb2ed7/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 5597cff..afcfdea 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}/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}/StaticService/V30/Static.svc/Person</id>
+<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>
   <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}/StaticService/V30/Static.svc/Person(-10)</id>
+    <id>http://localhost:${cargo.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}/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack" title="Sack" target="http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" />
+    <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" />
     <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}/StaticService/V30/Static.svc/Person(-9)</id>
+    <id>http://localhost:${cargo.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}/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack" title="Sack" target="http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" />
+    <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" />
     <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}/StaticService/V30/Static.svc/Person(-8)</id>
+    <id>http://localhost:${cargo.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}/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack" title="Sack" target="http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Person(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" />
+    <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" />
     <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}/StaticService/V30/Static.svc/Person(-7)</id>
+    <id>http://localhost:${cargo.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}/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack" title="Sack" target="http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Person(-7)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" />
+    <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" />
     <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/22eb2ed7/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 6642060..529e20e 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}/StaticService/V30/Static.svc/$metadata#Product/@Element",
+  "odata.metadata": "http://localhost:${cargo.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}/StaticService/V30/Static.svc/Product(-10)",
+  "odata.id": "http://localhost:${cargo.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}/StaticService/V30/Static.svc/Product(-10)/ChangeProductDimensions"
+            "target": "http://localhost:${cargo.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/22eb2ed7/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 3f39884..8e3d5b8 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}/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}/StaticService/V30/Static.svc/Product(-10)</id>
+<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>
   <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}/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Product(-10)/ChangeProductDimensions" />
+  <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" />
   <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/22eb2ed7/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 bb06f70..d53cb60 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}/StaticService/V30/Static.svc/$metadata#Product/@Element",
+  "odata.metadata": "http://localhost:${cargo.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}/StaticService/V30/Static.svc/Product(-6)",
+  "odata.id": "http://localhost:${cargo.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}/StaticService/V30/Static.svc/Product(-6)/ChangeProductDimensions"
+            "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-6)/ChangeProductDimensions"
           },
   "Picture@odata.mediaEditLink": "Product(-6)/Picture",
   "ProductId": -6,

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/22eb2ed7/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 d3fb2f7..e20cf79 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}/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}/StaticService/V30/Static.svc/Product(-6)</id>
+<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>
   <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}/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Product(-6)/ChangeProductDimensions" />
+  <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" />
   <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/22eb2ed7/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 dae5b9a..4f394a1 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}/StaticService/V30/Static.svc/$metadata#Product/@Element",
+  "odata.metadata": "http://localhost:${cargo.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}/StaticService/V30/Static.svc/Product(-7)",
+  "odata.id": "http://localhost:${cargo.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}/StaticService/V30/Static.svc/Product(-7)/ChangeProductDimensions"
+            "target": "http://localhost:${cargo.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/22eb2ed7/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 ccff720..8675d0b 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}/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}/StaticService/V30/Static.svc/Product(-7)</id>
+<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>
   <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}/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Product(-7)/ChangeProductDimensions" />
+  <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" />
   <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/22eb2ed7/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 752c7a0..f55303f 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}/StaticService/V30/Static.svc/$metadata#Product/$links/Photos",
+  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product/$links/Photos",
   "value":
           [
             {
-              "url": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/ProductPhoto(PhotoId=-3,ProductId=-3)"
+              "url": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ProductPhoto(PhotoId=-3,ProductId=-3)"
             },
             {
-              "url": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/ProductPhoto(PhotoId=-2,ProductId=-2)"
+              "url": "http://localhost:${cargo.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/22eb2ed7/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 a0ed19d..db55f44 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}/StaticService/V30/Static.svc/$metadata#Product/@Element",
+  "odata.metadata": "http://localhost:${cargo.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}/StaticService/V30/Static.svc/Product(-9)",
+  "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%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}/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/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,

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/22eb2ed7/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 c958648..20e7323 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}/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:${cargo.servlet.port}/StaticService/V30/Static.svc/Product(-9)</id>
+<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>
   <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}/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
+  <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" />
   <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/22eb2ed7/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 61e8a9a..46d7ff5 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}/StaticService/V30/Static.svc/$metadata#Product",
+  "odata.metadata": "http://localhost:${cargo.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}/StaticService/V30/Static.svc/Product(-10)",
+              "odata.id": "http://localhost:${cargo.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}/StaticService/V30/Static.svc/Product(-10)/ChangeProductDimensions"
+                        "target": "http://localhost:${cargo.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}/StaticService/V30/Static.svc/Product(-9)",
+              "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%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}/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/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,
@@ -85,7 +85,7 @@
             },
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct",
-              "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Product(-8)",
+              "odata.id": "http://localhost:${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",
@@ -95,7 +95,7 @@
               "#DefaultContainer.ChangeProductDimensions":
                       {
                         "title": "ChangeProductDimensions",
-                        "target": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"
+                        "target": "http://localhost:${cargo.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}/StaticService/V30/Static.svc/Product(-7)",
+              "odata.id": "http://localhost:${cargo.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}/StaticService/V30/Static.svc/Product(-7)/ChangeProductDimensions"
+                        "target": "http://localhost:${cargo.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}/StaticService/V30/Static.svc/Product(-6)",
+              "odata.id": "http://localhost:${cargo.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}/StaticService/V30/Static.svc/Product(-6)/ChangeProductDimensions"
+                        "target": "http://localhost:${cargo.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}/StaticService/V30/Static.svc/Product(-5)",
+              "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",
@@ -246,7 +246,7 @@
               "#DefaultContainer.ChangeProductDimensions":
                       {
                         "title": "ChangeProductDimensions",
-                        "target": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/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,
@@ -284,7 +284,7 @@
             },
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
-              "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Product(-4)",
+              "odata.id": "http://localhost:${cargo.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}/StaticService/V30/Static.svc/Product(-4)/ChangeProductDimensions"
+                        "target": "http://localhost:${cargo.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}/StaticService/V30/Static.svc/Product(-3)",
+              "odata.id": "http://localhost:${cargo.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}/StaticService/V30/Static.svc/Product(-3)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"
+                        "target": "http://localhost:${cargo.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}/StaticService/V30/Static.svc/Product(-2)",
+              "odata.id": "http://localhost:${cargo.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}/StaticService/V30/Static.svc/Product(-2)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"
+                        "target": "http://localhost:${cargo.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}/StaticService/V30/Static.svc/Product(-1)",
+              "odata.id": "http://localhost:${cargo.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}/StaticService/V30/Static.svc/Product(-1)/ChangeProductDimensions"
+                        "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-1)/ChangeProductDimensions"
                       },
               "Picture@odata.mediaEditLink": "Product(-1)/Picture",
               "ProductId": -1,