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

[07/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/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 9a02d3b..1d52691 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}/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}/StaticService/V30/Static.svc/Customer</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" 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>
   <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}/StaticService/V30/Static.svc/Customer(-10)</id>
+    <id>http://localhost:${cargo.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}/StaticService/V30/Static.svc/Customer(-9)</id>
+    <id>http://localhost:${cargo.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}/StaticService/V30/Static.svc/Customer?$filter=not%20endswith(Name,'Chandan')&amp;$skiptoken=-9" />
+  <link rel="next" href="http://localhost:${cargo.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/22eb2ed7/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 38d0d55..bb57782 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}/StaticService/V30/Static.svc/$metadata#Customer",
+  "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer",
   "value":
           [
           ]

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/22eb2ed7/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 6c57d5e..7d0d680 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}/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}/StaticService/V30/Static.svc/Customer</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" 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>
   <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/22eb2ed7/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 f782805..d1eadeb 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}/StaticService/V30/Static.svc/$metadata#Customer",
+  "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}/StaticService/V30/Static.svc/Customer(-9)",
+              "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",
@@ -753,7 +753,7 @@
             },
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
-              "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Customer(-8)",
+              "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",

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/22eb2ed7/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 75236ed..ab51e5c 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}/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}/StaticService/V30/Static.svc/Customer</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" 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>
   <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}/StaticService/V30/Static.svc/Customer(-9)</id>
+    <id>http://localhost:${cargo.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}/StaticService/V30/Static.svc/Customer(-8)</id>
+    <id>http://localhost:${cargo.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}/StaticService/V30/Static.svc/Customer?$skiptoken=-8" />
+  <link rel="next" href="http://localhost:${cargo.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/22eb2ed7/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 59ad069..1a7c4b9 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}/StaticService/V30/Static.svc/$metadata#Customer",
+  "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}/StaticService/V30/Static.svc/Customer(-2)",
+              "odata.id": "http://localhost:${cargo.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}/StaticService/V30/Static.svc/Customer(-1)",
+              "odata.id": "http://localhost:${cargo.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/22eb2ed7/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 d965506..0133d45 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}/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}/StaticService/V30/Static.svc/Customer</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" 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>
   <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}/StaticService/V30/Static.svc/Customer(-2)</id>
+    <id>http://localhost:${cargo.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}/StaticService/V30/Static.svc/Customer(-1)</id>
+    <id>http://localhost:${cargo.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}/StaticService/V30/Static.svc/Customer?$skiptoken=-1" />
+  <link rel="next" href="http://localhost:${cargo.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/22eb2ed7/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 c849e9c..9a9ff29 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}/StaticService/V30/Static.svc/$metadata#Customer",
+  "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}/StaticService/V30/Static.svc/Customer(-4)",
+              "odata.id": "http://localhost:${cargo.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}/StaticService/V30/Static.svc/Customer(-3)",
+              "odata.id": "http://localhost:${cargo.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/22eb2ed7/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 583b138..4a2339b 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}/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}/StaticService/V30/Static.svc/Customer</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" 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>
   <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}/StaticService/V30/Static.svc/Customer(-4)</id>
+    <id>http://localhost:${cargo.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}/StaticService/V30/Static.svc/Customer(-3)</id>
+    <id>http://localhost:${cargo.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}/StaticService/V30/Static.svc/Customer?$skiptoken=-3" />
+  <link rel="next" href="http://localhost:${cargo.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/22eb2ed7/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 08aee62..e644006 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}/StaticService/V30/Static.svc/$metadata#Customer",
+  "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}/StaticService/V30/Static.svc/Customer(-6)",
+              "odata.id": "http://localhost:${cargo.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}/StaticService/V30/Static.svc/Customer(-5)",
+              "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",

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/22eb2ed7/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 e0be915..de57044 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}/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}/StaticService/V30/Static.svc/Customer</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" 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>
   <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}/StaticService/V30/Static.svc/Customer(-6)</id>
+    <id>http://localhost:${cargo.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}/StaticService/V30/Static.svc/Customer(-5)</id>
+    <id>http://localhost:${cargo.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}/StaticService/V30/Static.svc/Customer?$skiptoken=-5" />
+  <link rel="next" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer?$skiptoken=-5" />
 </feed>
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/22eb2ed7/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 5d45ef8..4d2cd33 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}/StaticService/V30/Static.svc/$metadata#Customer",
+  "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}/StaticService/V30/Static.svc/Customer(-8)",
+              "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",
@@ -226,7 +226,7 @@
             },
             {
               "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
-              "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Customer(-7)",
+              "odata.id": "http://localhost:${cargo.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/22eb2ed7/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 c78f3f4..9db7b77 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}/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}/StaticService/V30/Static.svc/Customer</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" 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>
   <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}/StaticService/V30/Static.svc/Customer(-8)</id>
+    <id>http://localhost:${cargo.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}/StaticService/V30/Static.svc/Customer(-7)</id>
+    <id>http://localhost:${cargo.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}/StaticService/V30/Static.svc/Customer?$skiptoken=-7" />
+  <link rel="next" href="http://localhost:${cargo.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/22eb2ed7/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 78dd8d0..61c854f 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}/StaticService/V30/Static.svc/$metadata#CustomerInfo/@Element",
+  "odata.metadata": "http://localhost:${cargo.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}/StaticService/V30/Static.svc/CustomerInfo(11)",
+  "odata.id": "http://localhost:${cargo.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/22eb2ed7/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 0d7f949..b57de1b 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}/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/CustomerInfo(11)</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">
+  <id>http://localhost:${cargo.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/22eb2ed7/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 bcab099..401e897 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}/StaticService/V30/Static.svc/$metadata#CustomerInfo/@Element",
+  "odata.metadata": "http://localhost:${cargo.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}/StaticService/V30/Static.svc/CustomerInfo(12)",
+  "odata.id": "http://localhost:${cargo.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/22eb2ed7/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 b613905..3ec3ab2 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}/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/CustomerInfo(12)</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">
+  <id>http://localhost:${cargo.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/22eb2ed7/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 3b4075b..fd2f5ef 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}/StaticService/V30/Static.svc/$metadata#CustomerInfo/@Element",
+  "odata.metadata": "http://localhost:${cargo.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}/StaticService/V30/Static.svc/CustomerInfo(17)",
+  "odata.id": "http://localhost:${cargo.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/22eb2ed7/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 0feee00..55f71b5 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}/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/CustomerInfo(17)</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">
+  <id>http://localhost:${cargo.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/22eb2ed7/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 e9250a0..e7109a4 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}/StaticService/V30/Static.svc/$metadata#EdmBooleanSet/@Element", "Id": true}
\ No newline at end of file
+{"odata.metadata": "http://localhost:${cargo.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/22eb2ed7/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 1502244..73ec1e7 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}/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/EdmBooleanSet(true)</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">
+  <id>http://localhost:${cargo.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/22eb2ed7/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 474b058..95fbc30 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}/StaticService/V30/Static.svc/$metadata#EdmByteSet/@Element", "Id": 255}
\ No newline at end of file
+{"odata.metadata": "http://localhost:${cargo.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/22eb2ed7/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 8eb63e3..043a1ef 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}/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/EdmByteSet(255)</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">
+  <id>http://localhost:${cargo.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/22eb2ed7/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 92550ca..2251768 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}/StaticService/V30/Static.svc/$metadata#EdmDecimalSet/@Element", "Id": "79228162514264337593543950335"}
\ No newline at end of file
+{"odata.metadata": "http://localhost:${cargo.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/22eb2ed7/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 e40f5b1..3da986b 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}/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/EdmDecimalSet(79228162514264337593543950335M)</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">
+  <id>http://localhost:${cargo.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/22eb2ed7/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 cb289fe..9ab801a 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}/StaticService/V30/Static.svc/$metadata#EdmDoubleSet/@Element", "Id": 1.7976931348623157E+308}
\ No newline at end of file
+{"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

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/22eb2ed7/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 ee937de..d3113ff 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}/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/EdmDoubleSet(1.7976931348623157E%2B308D)</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">
+  <id>http://localhost:${cargo.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/22eb2ed7/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 f26e405..5128dc9 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}/StaticService/V30/Static.svc/$metadata#EdmGuidSet/@Element", "Id": "00000000-0000-0000-0000-000000000000"}
\ No newline at end of file
+{"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

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/22eb2ed7/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 2db66f8..001f9d5 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}/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/EdmGuidSet(guid'00000000-0000-0000-0000-000000000000')</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">
+  <id>http://localhost:${cargo.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/22eb2ed7/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 302a581..74716b7 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}/StaticService/V30/Static.svc/$metadata#EdmInt16Set/@Element", "Id": 32767}
\ No newline at end of file
+{"odata.metadata": "http://localhost:${cargo.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/22eb2ed7/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 dc636f6..4260903 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}/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/EdmInt16Set(32767)</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">
+  <id>http://localhost:${cargo.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/22eb2ed7/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 f0b4b23..5eb6337 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}/StaticService/V30/Static.svc/$metadata#EdmInt32Set/@Element", "Id": -2147483648}
\ No newline at end of file
+{"odata.metadata": "http://localhost:${cargo.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/22eb2ed7/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 cddd401..3513e0f 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}/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/EdmInt32Set(-2147483648)</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">
+  <id>http://localhost:${cargo.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/22eb2ed7/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 93707bd..25350b8 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}/StaticService/V30/Static.svc/$metadata#EdmInt64Set/@Element", "Id": "9223372036854775807"}
\ No newline at end of file
+{"odata.metadata": "http://localhost:${cargo.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/22eb2ed7/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 868a793..cc9f351 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}/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/EdmInt64Set(9223372036854775807L)</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">
+  <id>http://localhost:${cargo.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/22eb2ed7/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 61537ff..78a75ff 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}/StaticService/V30/Static.svc/$metadata#EdmSingleSet/@Element","Id":3.4028235E+38}
+{"odata.metadata":"http://localhost:${cargo.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/22eb2ed7/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 0dc282f..88ea5ea 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}/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/EdmSingleSet(3.4028235E%2B38f)</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">
+  <id>http://localhost:${cargo.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/22eb2ed7/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 55a8ada..b4cf187 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}/StaticService/V30/Static.svc/$metadata#EdmStringSet/@Element", "Id": "$"}
\ No newline at end of file
+{"odata.metadata": "http://localhost:${cargo.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/22eb2ed7/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 b398d61..c9c8eb2 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}/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/EdmStringSet('%24')</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">
+  <id>http://localhost:${cargo.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/22eb2ed7/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 4db1fcd..fd1f9a0 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}/StaticService/V30/Static.svc/$metadata#EdmTimeSet/@Element", "Id": "-P10675199DT2H48M5.4775808S"}
\ No newline at end of file
+{"odata.metadata": "http://localhost:${cargo.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/22eb2ed7/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 ff60df6..3714510 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}/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/EdmTimeSet(time'-P10675199DT2H48M5.4775808S')</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">
+  <id>http://localhost:${cargo.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/22eb2ed7/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 2e50966..5dde3e4 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}/StaticService/V30/Static.svc/$metadata#Customer", "value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Customer", "odata.id":"http://localhost:${cargo.servlet.port}/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", "Emai
 lBag@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:${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

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/22eb2ed7/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 2f4a252..3076a49 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}/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom"
+<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}/StaticService/V30/Static.svc/InStreamErrorGetCustomer</id>
+  <id>http://localhost:${cargo.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}/StaticService/V30/Static.svc/Customer(-10)</id>
+    <id>http://localhost:${cargo.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/22eb2ed7/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 e76fdeb..4de8e2e 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}/StaticService/V30/Static.svc/$metadata#Login/@Element",
+  "odata.metadata": "http://localhost:${cargo.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}/StaticService/V30/Static.svc/Login('3')",
+  "odata.id": "http://localhost:${cargo.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/22eb2ed7/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 414e79b..be452d7 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}/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/Login('3')</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">
+  <id>http://localhost:${cargo.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" />

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/22eb2ed7/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 f8eb898..9ead13b 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}/StaticService/V30/Static.svc/$metadata#Message/@Element",
+  "odata.metadata": "http://localhost:${cargo.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}/StaticService/V30/Static.svc/Message(FromUsername='1',MessageId=-10)",
+  "odata.id": "http://localhost:${cargo.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/22eb2ed7/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 6e9baf8..4a5b927 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}/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/Message(FromUsername='1',MessageId=-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">
+  <id>http://localhost:${cargo.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/22eb2ed7/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 bdcf0a3..5db1fd9 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}/StaticService/V30/Static.svc/$metadata#Order/@Element",
+  "odata.metadata": "http://localhost:${cargo.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}/StaticService/V30/Static.svc/Order(-10)",
+  "odata.id": "http://localhost:${cargo.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/22eb2ed7/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 c6bb02a..3f38e46 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}/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/Order(-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">
+  <id>http://localhost:${cargo.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/22eb2ed7/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 c2be6b4..33331e7 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}/StaticService/V30/Static.svc/$metadata#Order/@Element",
+  "odata.metadata": "http://localhost:${cargo.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}/StaticService/V30/Static.svc/Order(-7)",
+  "odata.id": "http://localhost:${cargo.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/22eb2ed7/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 b6e44ba..d9ca2e3 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}/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/Order(-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">
+  <id>http://localhost:${cargo.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/22eb2ed7/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 e924732..56596cb 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}/StaticService/V30/Static.svc/$metadata#Order/@Element",
+  "odata.metadata": "http://localhost:${cargo.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}/StaticService/V30/Static.svc/Order(-8)",
+  "odata.id": "http://localhost:${cargo.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/22eb2ed7/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 9439a95..bd2afe7 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}/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/Order(-8)</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">
+  <id>http://localhost:${cargo.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/22eb2ed7/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 9124c80..1df38ce 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}/StaticService/V30/Static.svc/$metadata#Order/@Element",
+  "odata.metadata": "http://localhost:${cargo.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}/StaticService/V30/Static.svc/Order(-9)",
+  "odata.id": "http://localhost:${cargo.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/22eb2ed7/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 4b894ba..c8bb42c 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}/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/Order(-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">
+  <id>http://localhost:${cargo.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" />