You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by fm...@apache.org on 2014/03/14 18:33:40 UTC

[08/19] [OLINGO-175, OLINGO-205] imported all V3 test. Missing: invoke request (requires refactoring) + not yet supported functionalities by the static server (action overloading, media entity CRUD, property CUD)

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/Customer/filter/not endswith(Name,'Chandan').xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/Customer/filter/not endswith(Name,'Chandan').xml b/fit/src/main/resources/v3/Customer/filter/not endswith(Name,'Chandan').xml
index 8877c08..9a02d3b 100644
--- a/fit/src/main/resources/v3/Customer/filter/not endswith(Name,'Chandan').xml	
+++ b/fit/src/main/resources/v3/Customer/filter/not endswith(Name,'Chandan').xml	
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/StaticService/V3/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/V3/Static.svc/Customer</id>
+<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>
   <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/V3/Static.svc/Customer(-10)</id>
+    <id>http://localhost:${cargo.servlet.port}/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/V3/Static.svc/Customer(-9)</id>
+    <id>http://localhost:${cargo.servlet.port}/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/V3/Static.svc/Customer?$filter=not%20endswith(Name,'Chandan')&amp;$skiptoken=-9" />
+  <link rel="next" href="http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Customer?$filter=not%20endswith(Name,'Chandan')&amp;$skiptoken=-9" />
 </feed>

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/Customer/skiptoken/-1.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/Customer/skiptoken/-1.full.json b/fit/src/main/resources/v3/Customer/skiptoken/-1.full.json
index 324e6cf..38d0d55 100644
--- a/fit/src/main/resources/v3/Customer/skiptoken/-1.full.json
+++ b/fit/src/main/resources/v3/Customer/skiptoken/-1.full.json
@@ -1,5 +1,5 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V3/Static.svc/$metadata#Customer",
+  "odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/$metadata#Customer",
   "value":
           [
           ]

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/Customer/skiptoken/-1.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/Customer/skiptoken/-1.xml b/fit/src/main/resources/v3/Customer/skiptoken/-1.xml
index f738a41..6c57d5e 100644
--- a/fit/src/main/resources/v3/Customer/skiptoken/-1.xml
+++ b/fit/src/main/resources/v3/Customer/skiptoken/-1.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/StaticService/V3/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/V3/Static.svc/Customer</id>
+<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>
   <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/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/Customer/skiptoken/-10.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/Customer/skiptoken/-10.full.json b/fit/src/main/resources/v3/Customer/skiptoken/-10.full.json
index 85f1772..f782805 100644
--- a/fit/src/main/resources/v3/Customer/skiptoken/-10.full.json
+++ b/fit/src/main/resources/v3/Customer/skiptoken/-10.full.json
@@ -1,10 +1,10 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V3/Static.svc/$metadata#Customer",
+  "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/V3/Static.svc/Customer(-9)",
+              "odata.id": "http://localhost:${cargo.servlet.port}/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/V3/Static.svc/Customer(-8)",
+              "odata.id": "http://localhost:${cargo.servlet.port}/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/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/Customer/skiptoken/-10.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/Customer/skiptoken/-10.xml b/fit/src/main/resources/v3/Customer/skiptoken/-10.xml
index be448b0..75236ed 100644
--- a/fit/src/main/resources/v3/Customer/skiptoken/-10.xml
+++ b/fit/src/main/resources/v3/Customer/skiptoken/-10.xml
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/StaticService/V3/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/V3/Static.svc/Customer</id>
+<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>
   <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/V3/Static.svc/Customer(-9)</id>
+    <id>http://localhost:${cargo.servlet.port}/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/V3/Static.svc/Customer(-8)</id>
+    <id>http://localhost:${cargo.servlet.port}/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/V3/Static.svc/Customer?$skiptoken=-8" />
+  <link rel="next" href="http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Customer?$skiptoken=-8" />
 </feed>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/Customer/skiptoken/-3.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/Customer/skiptoken/-3.full.json b/fit/src/main/resources/v3/Customer/skiptoken/-3.full.json
index 7b40494..59ad069 100644
--- a/fit/src/main/resources/v3/Customer/skiptoken/-3.full.json
+++ b/fit/src/main/resources/v3/Customer/skiptoken/-3.full.json
@@ -1,10 +1,10 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V3/Static.svc/$metadata#Customer",
+  "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/V3/Static.svc/Customer(-2)",
+              "odata.id": "http://localhost:${cargo.servlet.port}/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/V3/Static.svc/Customer(-1)",
+              "odata.id": "http://localhost:${cargo.servlet.port}/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/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/Customer/skiptoken/-3.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/Customer/skiptoken/-3.xml b/fit/src/main/resources/v3/Customer/skiptoken/-3.xml
index 5ab2d70..d965506 100644
--- a/fit/src/main/resources/v3/Customer/skiptoken/-3.xml
+++ b/fit/src/main/resources/v3/Customer/skiptoken/-3.xml
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/StaticService/V3/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/V3/Static.svc/Customer</id>
+<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>
   <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/V3/Static.svc/Customer(-2)</id>
+    <id>http://localhost:${cargo.servlet.port}/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/V3/Static.svc/Customer(-1)</id>
+    <id>http://localhost:${cargo.servlet.port}/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/V3/Static.svc/Customer?$skiptoken=-1" />
+  <link rel="next" href="http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Customer?$skiptoken=-1" />
 </feed>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/Customer/skiptoken/-5.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/Customer/skiptoken/-5.full.json b/fit/src/main/resources/v3/Customer/skiptoken/-5.full.json
index a80faf1..c849e9c 100644
--- a/fit/src/main/resources/v3/Customer/skiptoken/-5.full.json
+++ b/fit/src/main/resources/v3/Customer/skiptoken/-5.full.json
@@ -1,10 +1,10 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V3/Static.svc/$metadata#Customer",
+  "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/V3/Static.svc/Customer(-4)",
+              "odata.id": "http://localhost:${cargo.servlet.port}/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/V3/Static.svc/Customer(-3)",
+              "odata.id": "http://localhost:${cargo.servlet.port}/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/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/Customer/skiptoken/-5.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/Customer/skiptoken/-5.xml b/fit/src/main/resources/v3/Customer/skiptoken/-5.xml
index 69c36b3..583b138 100644
--- a/fit/src/main/resources/v3/Customer/skiptoken/-5.xml
+++ b/fit/src/main/resources/v3/Customer/skiptoken/-5.xml
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/StaticService/V3/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/V3/Static.svc/Customer</id>
+<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>
   <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/V3/Static.svc/Customer(-4)</id>
+    <id>http://localhost:${cargo.servlet.port}/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/V3/Static.svc/Customer(-3)</id>
+    <id>http://localhost:${cargo.servlet.port}/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/V3/Static.svc/Customer?$skiptoken=-3" />
+  <link rel="next" href="http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Customer?$skiptoken=-3" />
 </feed>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/Customer/skiptoken/-7.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/Customer/skiptoken/-7.full.json b/fit/src/main/resources/v3/Customer/skiptoken/-7.full.json
index 72e7ba0..08aee62 100644
--- a/fit/src/main/resources/v3/Customer/skiptoken/-7.full.json
+++ b/fit/src/main/resources/v3/Customer/skiptoken/-7.full.json
@@ -1,10 +1,10 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V3/Static.svc/$metadata#Customer",
+  "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/V3/Static.svc/Customer(-6)",
+              "odata.id": "http://localhost:${cargo.servlet.port}/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/V3/Static.svc/Customer(-5)",
+              "odata.id": "http://localhost:${cargo.servlet.port}/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/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/Customer/skiptoken/-7.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/Customer/skiptoken/-7.xml b/fit/src/main/resources/v3/Customer/skiptoken/-7.xml
index 01f6363..e0be915 100644
--- a/fit/src/main/resources/v3/Customer/skiptoken/-7.xml
+++ b/fit/src/main/resources/v3/Customer/skiptoken/-7.xml
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/StaticService/V3/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/V3/Static.svc/Customer</id>
+<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>
   <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/V3/Static.svc/Customer(-6)</id>
+    <id>http://localhost:${cargo.servlet.port}/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/V3/Static.svc/Customer(-5)</id>
+    <id>http://localhost:${cargo.servlet.port}/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/V3/Static.svc/Customer?$skiptoken=-5" />
+  <link rel="next" href="http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Customer?$skiptoken=-5" />
 </feed>
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/Customer/skiptoken/-9.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/Customer/skiptoken/-9.full.json b/fit/src/main/resources/v3/Customer/skiptoken/-9.full.json
index ea55a12..5d45ef8 100644
--- a/fit/src/main/resources/v3/Customer/skiptoken/-9.full.json
+++ b/fit/src/main/resources/v3/Customer/skiptoken/-9.full.json
@@ -1,10 +1,10 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V3/Static.svc/$metadata#Customer",
+  "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/V3/Static.svc/Customer(-8)",
+              "odata.id": "http://localhost:${cargo.servlet.port}/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/V3/Static.svc/Customer(-7)",
+              "odata.id": "http://localhost:${cargo.servlet.port}/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/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/Customer/skiptoken/-9.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/Customer/skiptoken/-9.xml b/fit/src/main/resources/v3/Customer/skiptoken/-9.xml
index 28a9b10..c78f3f4 100644
--- a/fit/src/main/resources/v3/Customer/skiptoken/-9.xml
+++ b/fit/src/main/resources/v3/Customer/skiptoken/-9.xml
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/StaticService/V3/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/V3/Static.svc/Customer</id>
+<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>
   <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/V3/Static.svc/Customer(-8)</id>
+    <id>http://localhost:${cargo.servlet.port}/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/V3/Static.svc/Customer(-7)</id>
+    <id>http://localhost:${cargo.servlet.port}/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/V3/Static.svc/Customer?$skiptoken=-7" />
+  <link rel="next" href="http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Customer?$skiptoken=-7" />
 </feed>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/CustomerInfo/11/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/CustomerInfo/11/entity.full.json b/fit/src/main/resources/v3/CustomerInfo/11/entity.full.json
index 48a4cc4..78dd8d0 100644
--- a/fit/src/main/resources/v3/CustomerInfo/11/entity.full.json
+++ b/fit/src/main/resources/v3/CustomerInfo/11/entity.full.json
@@ -1,7 +1,7 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V3/Static.svc/$metadata#CustomerInfo/@Element",
+  "odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/$metadata#CustomerInfo/@Element",
   "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo",
-  "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V3/Static.svc/CustomerInfo(11)",
+  "odata.id": "http://localhost:${cargo.servlet.port}/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/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/CustomerInfo/11/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/CustomerInfo/11/entity.xml b/fit/src/main/resources/v3/CustomerInfo/11/entity.xml
index 107b594..0d7f949 100644
--- a/fit/src/main/resources/v3/CustomerInfo/11/entity.xml
+++ b/fit/src/main/resources/v3/CustomerInfo/11/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/StaticService/V3/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/V3/Static.svc/CustomerInfo(11)</id>
+<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>
   <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/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/CustomerInfo/12/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/CustomerInfo/12/entity.full.json b/fit/src/main/resources/v3/CustomerInfo/12/entity.full.json
index 0639406..bcab099 100644
--- a/fit/src/main/resources/v3/CustomerInfo/12/entity.full.json
+++ b/fit/src/main/resources/v3/CustomerInfo/12/entity.full.json
@@ -1,7 +1,7 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V3/Static.svc/$metadata#CustomerInfo/@Element",
+  "odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/$metadata#CustomerInfo/@Element",
   "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo",
-  "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V3/Static.svc/CustomerInfo(12)",
+  "odata.id": "http://localhost:${cargo.servlet.port}/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/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/CustomerInfo/12/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/CustomerInfo/12/entity.xml b/fit/src/main/resources/v3/CustomerInfo/12/entity.xml
index ebb0d17..b613905 100644
--- a/fit/src/main/resources/v3/CustomerInfo/12/entity.xml
+++ b/fit/src/main/resources/v3/CustomerInfo/12/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/StaticService/V3/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/V3/Static.svc/CustomerInfo(12)</id>
+<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>
   <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/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/EdmBooleanSet/true/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/EdmBooleanSet/true/entity.full.json b/fit/src/main/resources/v3/EdmBooleanSet/true/entity.full.json
index e755587..e9250a0 100644
--- a/fit/src/main/resources/v3/EdmBooleanSet/true/entity.full.json
+++ b/fit/src/main/resources/v3/EdmBooleanSet/true/entity.full.json
@@ -1 +1 @@
-{"odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V3/Static.svc/$metadata#EdmBooleanSet/@Element", "Id": true}
\ No newline at end of file
+{"odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/$metadata#EdmBooleanSet/@Element", "Id": true}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/EdmBooleanSet/true/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/EdmBooleanSet/true/entity.xml b/fit/src/main/resources/v3/EdmBooleanSet/true/entity.xml
index 570f5a0..1502244 100644
--- a/fit/src/main/resources/v3/EdmBooleanSet/true/entity.xml
+++ b/fit/src/main/resources/v3/EdmBooleanSet/true/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/StaticService/V3/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/V3/Static.svc/EdmBooleanSet(true)</id>
+<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>
   <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/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/EdmByteSet/255/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/EdmByteSet/255/entity.full.json b/fit/src/main/resources/v3/EdmByteSet/255/entity.full.json
index 2a5034e..474b058 100644
--- a/fit/src/main/resources/v3/EdmByteSet/255/entity.full.json
+++ b/fit/src/main/resources/v3/EdmByteSet/255/entity.full.json
@@ -1 +1 @@
-{"odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V3/Static.svc/$metadata#EdmByteSet/@Element", "Id": 255}
\ No newline at end of file
+{"odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/$metadata#EdmByteSet/@Element", "Id": 255}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/EdmByteSet/255/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/EdmByteSet/255/entity.xml b/fit/src/main/resources/v3/EdmByteSet/255/entity.xml
index fb5bc7e..8eb63e3 100644
--- a/fit/src/main/resources/v3/EdmByteSet/255/entity.xml
+++ b/fit/src/main/resources/v3/EdmByteSet/255/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/StaticService/V3/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/V3/Static.svc/EdmByteSet(255)</id>
+<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>
   <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/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/EdmDecimalSet/79228162514264337593543950335M/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/EdmDecimalSet/79228162514264337593543950335M/entity.full.json b/fit/src/main/resources/v3/EdmDecimalSet/79228162514264337593543950335M/entity.full.json
index 9f517cd..92550ca 100644
--- a/fit/src/main/resources/v3/EdmDecimalSet/79228162514264337593543950335M/entity.full.json
+++ b/fit/src/main/resources/v3/EdmDecimalSet/79228162514264337593543950335M/entity.full.json
@@ -1 +1 @@
-{"odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V3/Static.svc/$metadata#EdmDecimalSet/@Element", "Id": "79228162514264337593543950335"}
\ No newline at end of file
+{"odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/$metadata#EdmDecimalSet/@Element", "Id": "79228162514264337593543950335"}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/EdmDecimalSet/79228162514264337593543950335M/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/EdmDecimalSet/79228162514264337593543950335M/entity.xml b/fit/src/main/resources/v3/EdmDecimalSet/79228162514264337593543950335M/entity.xml
index a2eff25..e40f5b1 100644
--- a/fit/src/main/resources/v3/EdmDecimalSet/79228162514264337593543950335M/entity.xml
+++ b/fit/src/main/resources/v3/EdmDecimalSet/79228162514264337593543950335M/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/StaticService/V3/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/V3/Static.svc/EdmDecimalSet(79228162514264337593543950335M)</id>
+<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>
   <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/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/EdmDoubleSet/1.7976931348623157E308D/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/EdmDoubleSet/1.7976931348623157E308D/entity.full.json b/fit/src/main/resources/v3/EdmDoubleSet/1.7976931348623157E308D/entity.full.json
index 340e32d..cb289fe 100644
--- a/fit/src/main/resources/v3/EdmDoubleSet/1.7976931348623157E308D/entity.full.json
+++ b/fit/src/main/resources/v3/EdmDoubleSet/1.7976931348623157E308D/entity.full.json
@@ -1 +1 @@
-{"odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V3/Static.svc/$metadata#EdmDoubleSet/@Element", "Id": 1.7976931348623157E+308}
\ No newline at end of file
+{"odata.metadata": "http://localhost:${cargo.servlet.port}/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/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/EdmDoubleSet/1.7976931348623157E308D/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/EdmDoubleSet/1.7976931348623157E308D/entity.xml b/fit/src/main/resources/v3/EdmDoubleSet/1.7976931348623157E308D/entity.xml
index fb54a74..ee937de 100644
--- a/fit/src/main/resources/v3/EdmDoubleSet/1.7976931348623157E308D/entity.xml
+++ b/fit/src/main/resources/v3/EdmDoubleSet/1.7976931348623157E308D/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/StaticService/V3/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/V3/Static.svc/EdmDoubleSet(1.7976931348623157E%2B308D)</id>
+<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>
   <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/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/EdmGuidSet/guid'00000000-0000-0000-0000-000000000000'/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/EdmGuidSet/guid'00000000-0000-0000-0000-000000000000'/entity.full.json b/fit/src/main/resources/v3/EdmGuidSet/guid'00000000-0000-0000-0000-000000000000'/entity.full.json
index 764e6b0..f26e405 100644
--- a/fit/src/main/resources/v3/EdmGuidSet/guid'00000000-0000-0000-0000-000000000000'/entity.full.json
+++ b/fit/src/main/resources/v3/EdmGuidSet/guid'00000000-0000-0000-0000-000000000000'/entity.full.json
@@ -1 +1 @@
-{"odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V3/Static.svc/$metadata#EdmGuidSet/@Element", "Id": "00000000-0000-0000-0000-000000000000"}
\ No newline at end of file
+{"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

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/EdmGuidSet/guid'00000000-0000-0000-0000-000000000000'/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/EdmGuidSet/guid'00000000-0000-0000-0000-000000000000'/entity.xml b/fit/src/main/resources/v3/EdmGuidSet/guid'00000000-0000-0000-0000-000000000000'/entity.xml
index 7bd2e81..2db66f8 100644
--- a/fit/src/main/resources/v3/EdmGuidSet/guid'00000000-0000-0000-0000-000000000000'/entity.xml
+++ b/fit/src/main/resources/v3/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/V3/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/V3/Static.svc/EdmGuidSet(guid'00000000-0000-0000-0000-000000000000')</id>
+<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>
   <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/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/EdmInt16Set/32767/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/EdmInt16Set/32767/entity.full.json b/fit/src/main/resources/v3/EdmInt16Set/32767/entity.full.json
index d7767d3..302a581 100644
--- a/fit/src/main/resources/v3/EdmInt16Set/32767/entity.full.json
+++ b/fit/src/main/resources/v3/EdmInt16Set/32767/entity.full.json
@@ -1 +1 @@
-{"odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V3/Static.svc/$metadata#EdmInt16Set/@Element", "Id": 32767}
\ No newline at end of file
+{"odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/$metadata#EdmInt16Set/@Element", "Id": 32767}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/EdmInt16Set/32767/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/EdmInt16Set/32767/entity.xml b/fit/src/main/resources/v3/EdmInt16Set/32767/entity.xml
index 5aa041d..dc636f6 100644
--- a/fit/src/main/resources/v3/EdmInt16Set/32767/entity.xml
+++ b/fit/src/main/resources/v3/EdmInt16Set/32767/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/StaticService/V3/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/V3/Static.svc/EdmInt16Set(32767)</id>
+<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>
   <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/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/EdmInt32Set/-2147483648/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/EdmInt32Set/-2147483648/entity.full.json b/fit/src/main/resources/v3/EdmInt32Set/-2147483648/entity.full.json
index 4cf9a7f..f0b4b23 100644
--- a/fit/src/main/resources/v3/EdmInt32Set/-2147483648/entity.full.json
+++ b/fit/src/main/resources/v3/EdmInt32Set/-2147483648/entity.full.json
@@ -1 +1 @@
-{"odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V3/Static.svc/$metadata#EdmInt32Set/@Element", "Id": -2147483648}
\ No newline at end of file
+{"odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/$metadata#EdmInt32Set/@Element", "Id": -2147483648}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/EdmInt32Set/-2147483648/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/EdmInt32Set/-2147483648/entity.xml b/fit/src/main/resources/v3/EdmInt32Set/-2147483648/entity.xml
index aba1fa4..cddd401 100644
--- a/fit/src/main/resources/v3/EdmInt32Set/-2147483648/entity.xml
+++ b/fit/src/main/resources/v3/EdmInt32Set/-2147483648/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/StaticService/V3/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/V3/Static.svc/EdmInt32Set(-2147483648)</id>
+<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>
   <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/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/EdmInt64Set/9223372036854775807L/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/EdmInt64Set/9223372036854775807L/entity.full.json b/fit/src/main/resources/v3/EdmInt64Set/9223372036854775807L/entity.full.json
index 330a201..93707bd 100644
--- a/fit/src/main/resources/v3/EdmInt64Set/9223372036854775807L/entity.full.json
+++ b/fit/src/main/resources/v3/EdmInt64Set/9223372036854775807L/entity.full.json
@@ -1 +1 @@
-{"odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V3/Static.svc/$metadata#EdmInt64Set/@Element", "Id": "9223372036854775807"}
\ No newline at end of file
+{"odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/$metadata#EdmInt64Set/@Element", "Id": "9223372036854775807"}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/EdmInt64Set/9223372036854775807L/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/EdmInt64Set/9223372036854775807L/entity.xml b/fit/src/main/resources/v3/EdmInt64Set/9223372036854775807L/entity.xml
index fbdd560..868a793 100644
--- a/fit/src/main/resources/v3/EdmInt64Set/9223372036854775807L/entity.xml
+++ b/fit/src/main/resources/v3/EdmInt64Set/9223372036854775807L/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/StaticService/V3/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/V3/Static.svc/EdmInt64Set(9223372036854775807L)</id>
+<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>
   <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/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/EdmSingleSet/3.4028235E38f/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/EdmSingleSet/3.4028235E38f/entity.full.json b/fit/src/main/resources/v3/EdmSingleSet/3.4028235E38f/entity.full.json
index 6434285..468dd3b 100644
--- a/fit/src/main/resources/v3/EdmSingleSet/3.4028235E38f/entity.full.json
+++ b/fit/src/main/resources/v3/EdmSingleSet/3.4028235E38f/entity.full.json
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/StaticService/V3/Static.svc/$metadata#EdmSingleSet/@Element","Id":3.40282347E+38}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/$metadata#EdmSingleSet/@Element","Id":3.40282347E+38}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/EdmSingleSet/3.4028235E38f/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/EdmSingleSet/3.4028235E38f/entity.xml b/fit/src/main/resources/v3/EdmSingleSet/3.4028235E38f/entity.xml
index 6efb060..420d5cd 100644
--- a/fit/src/main/resources/v3/EdmSingleSet/3.4028235E38f/entity.xml
+++ b/fit/src/main/resources/v3/EdmSingleSet/3.4028235E38f/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/StaticService/V3/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/V3/Static.svc/EdmSingleSet(3.40282347E%2B38f)</id>
+<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.40282347E%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.40282347E%2B38f)" />
   <title />

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

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/EdmStringSet/'$'/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/EdmStringSet/'$'/entity.xml b/fit/src/main/resources/v3/EdmStringSet/'$'/entity.xml
index df09c512..b398d61 100644
--- a/fit/src/main/resources/v3/EdmStringSet/'$'/entity.xml
+++ b/fit/src/main/resources/v3/EdmStringSet/'$'/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/StaticService/V3/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/V3/Static.svc/EdmStringSet('%24')</id>
+<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>
   <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/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/EdmTimeSet/time'-P10675199DT2H48M5.4775808S'/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/EdmTimeSet/time'-P10675199DT2H48M5.4775808S'/entity.full.json b/fit/src/main/resources/v3/EdmTimeSet/time'-P10675199DT2H48M5.4775808S'/entity.full.json
index e92f9ac..4db1fcd 100644
--- a/fit/src/main/resources/v3/EdmTimeSet/time'-P10675199DT2H48M5.4775808S'/entity.full.json
+++ b/fit/src/main/resources/v3/EdmTimeSet/time'-P10675199DT2H48M5.4775808S'/entity.full.json
@@ -1 +1 @@
-{"odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V3/Static.svc/$metadata#EdmTimeSet/@Element", "Id": "-P10675199DT2H48M5.4775808S"}
\ No newline at end of file
+{"odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/$metadata#EdmTimeSet/@Element", "Id": "-P10675199DT2H48M5.4775808S"}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/EdmTimeSet/time'-P10675199DT2H48M5.4775808S'/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/EdmTimeSet/time'-P10675199DT2H48M5.4775808S'/entity.xml b/fit/src/main/resources/v3/EdmTimeSet/time'-P10675199DT2H48M5.4775808S'/entity.xml
index 6a4a001..ff60df6 100644
--- a/fit/src/main/resources/v3/EdmTimeSet/time'-P10675199DT2H48M5.4775808S'/entity.xml
+++ b/fit/src/main/resources/v3/EdmTimeSet/time'-P10675199DT2H48M5.4775808S'/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/StaticService/V3/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/V3/Static.svc/EdmTimeSet(time'-P10675199DT2H48M5.4775808S')</id>
+<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>
   <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/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/InStreamErrorGetCustomer.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/InStreamErrorGetCustomer.full.json b/fit/src/main/resources/v3/InStreamErrorGetCustomer.full.json
index 093802f..2e50966 100644
--- a/fit/src/main/resources/v3/InStreamErrorGetCustomer.full.json
+++ b/fit/src/main/resources/v3/InStreamErrorGetCustomer.full.json
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/StaticService/V3/Static.svc/$metadata#Customer", "value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Customer", "odata.id":"http://localhost:${cargo.servlet.port}/StaticService/V3/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", "EmailB
 ag@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}/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

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/InStreamErrorGetCustomer.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/InStreamErrorGetCustomer.xml b/fit/src/main/resources/v3/InStreamErrorGetCustomer.xml
index 74032d8..6653876 100644
--- a/fit/src/main/resources/v3/InStreamErrorGetCustomer.xml
+++ b/fit/src/main/resources/v3/InStreamErrorGetCustomer.xml
@@ -19,13 +19,13 @@
     under the License.
 
 -->
-<feed xml:base="http://localhost:${cargo.servlet.port}/StaticService/V3/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/V3/Static.svc/InStreamErrorGetCustomer</id>
+<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/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/V3/Static.svc/Customer(-10)</id>
+    <id>http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Customer(-10)</id>
     <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
     <link rel="edit" title="Customer" href="Customer(-10)" />
     <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="Customer(-10)/Orders" />

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/Login/'3'/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/Login/'3'/entity.full.json b/fit/src/main/resources/v3/Login/'3'/entity.full.json
index a524d46..e76fdeb 100644
--- a/fit/src/main/resources/v3/Login/'3'/entity.full.json
+++ b/fit/src/main/resources/v3/Login/'3'/entity.full.json
@@ -1,7 +1,7 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V3/Static.svc/$metadata#Login/@Element",
+  "odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/$metadata#Login/@Element",
   "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Login",
-  "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V3/Static.svc/Login('3')",
+  "odata.id": "http://localhost:${cargo.servlet.port}/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/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/Login/'3'/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/Login/'3'/entity.xml b/fit/src/main/resources/v3/Login/'3'/entity.xml
index d72637e..414e79b 100644
--- a/fit/src/main/resources/v3/Login/'3'/entity.xml
+++ b/fit/src/main/resources/v3/Login/'3'/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/StaticService/V3/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/V3/Static.svc/Login('3')</id>
+<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>
   <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/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/Message/1 -10/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/Message/1 -10/entity.full.json b/fit/src/main/resources/v3/Message/1 -10/entity.full.json
index c316e39..f8eb898 100644
--- a/fit/src/main/resources/v3/Message/1 -10/entity.full.json	
+++ b/fit/src/main/resources/v3/Message/1 -10/entity.full.json	
@@ -1,7 +1,7 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V3/Static.svc/$metadata#Message/@Element",
+  "odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/$metadata#Message/@Element",
   "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Message",
-  "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V3/Static.svc/Message(FromUsername='1',MessageId=-10)",
+  "odata.id": "http://localhost:${cargo.servlet.port}/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/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/Message/1 -10/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/Message/1 -10/entity.xml b/fit/src/main/resources/v3/Message/1 -10/entity.xml
index c0b1b25..6e9baf8 100644
--- a/fit/src/main/resources/v3/Message/1 -10/entity.xml	
+++ b/fit/src/main/resources/v3/Message/1 -10/entity.xml	
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/StaticService/V3/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/V3/Static.svc/Message(FromUsername='1',MessageId=-10)</id>
+<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>
   <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/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/Order/-10/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/Order/-10/entity.full.json b/fit/src/main/resources/v3/Order/-10/entity.full.json
index 5179c09..bdcf0a3 100644
--- a/fit/src/main/resources/v3/Order/-10/entity.full.json
+++ b/fit/src/main/resources/v3/Order/-10/entity.full.json
@@ -1,7 +1,7 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V3/Static.svc/$metadata#Order/@Element",
+  "odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/$metadata#Order/@Element",
   "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Order",
-  "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V3/Static.svc/Order(-10)",
+  "odata.id": "http://localhost:${cargo.servlet.port}/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/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/Order/-10/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/Order/-10/entity.xml b/fit/src/main/resources/v3/Order/-10/entity.xml
index 301908e..c6bb02a 100644
--- a/fit/src/main/resources/v3/Order/-10/entity.xml
+++ b/fit/src/main/resources/v3/Order/-10/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/StaticService/V3/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/V3/Static.svc/Order(-10)</id>
+<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>
   <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/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/Order/-7/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/Order/-7/entity.full.json b/fit/src/main/resources/v3/Order/-7/entity.full.json
index c57983a..c2be6b4 100644
--- a/fit/src/main/resources/v3/Order/-7/entity.full.json
+++ b/fit/src/main/resources/v3/Order/-7/entity.full.json
@@ -1,7 +1,7 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V3/Static.svc/$metadata#Order/@Element",
+  "odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/$metadata#Order/@Element",
   "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Order",
-  "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V3/Static.svc/Order(-7)",
+  "odata.id": "http://localhost:${cargo.servlet.port}/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/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/Order/-7/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/Order/-7/entity.xml b/fit/src/main/resources/v3/Order/-7/entity.xml
index a48a870..b6e44ba 100644
--- a/fit/src/main/resources/v3/Order/-7/entity.xml
+++ b/fit/src/main/resources/v3/Order/-7/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/StaticService/V3/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/V3/Static.svc/Order(-7)</id>
+<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>
   <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/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/Order/-9/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/Order/-9/entity.full.json b/fit/src/main/resources/v3/Order/-9/entity.full.json
index ee1ca8c..9124c80 100644
--- a/fit/src/main/resources/v3/Order/-9/entity.full.json
+++ b/fit/src/main/resources/v3/Order/-9/entity.full.json
@@ -1,7 +1,7 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V3/Static.svc/$metadata#Order/@Element",
+  "odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/$metadata#Order/@Element",
   "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Order",
-  "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V3/Static.svc/Order(-9)",
+  "odata.id": "http://localhost:${cargo.servlet.port}/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/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/Order/-9/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/Order/-9/entity.xml b/fit/src/main/resources/v3/Order/-9/entity.xml
index 0ba8b75..4b894ba 100644
--- a/fit/src/main/resources/v3/Order/-9/entity.xml
+++ b/fit/src/main/resources/v3/Order/-9/entity.xml
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/StaticService/V3/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/V3/Static.svc/Order(-9)</id>
+<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>
   <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Order" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
   <link rel="edit" title="Order" href="Order(-9)" />
   <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Login" type="application/atom+xml;type=entry" title="Login" href="Order(-9)/Login" />

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/OrderLine/-10 -10/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/OrderLine/-10 -10/entity.full.json b/fit/src/main/resources/v3/OrderLine/-10 -10/entity.full.json
index 55e6ff9..b2a4ce2 100644
--- a/fit/src/main/resources/v3/OrderLine/-10 -10/entity.full.json	
+++ b/fit/src/main/resources/v3/OrderLine/-10 -10/entity.full.json	
@@ -1,7 +1,7 @@
 {
-  "odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V3/Static.svc/$metadata#OrderLine/@Element",
+  "odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/$metadata#OrderLine/@Element",
   "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.OrderLine",
-  "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V3/Static.svc/OrderLine(OrderId=-10,ProductId=-10)",
+  "odata.id": "http://localhost:${cargo.servlet.port}/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/incubator-olingo-odata4/blob/a835edd1/fit/src/main/resources/v3/OrderLine/-10 -10/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/v3/OrderLine/-10 -10/entity.xml b/fit/src/main/resources/v3/OrderLine/-10 -10/entity.xml
index 57228f2..1494864 100644
--- a/fit/src/main/resources/v3/OrderLine/-10 -10/entity.xml	
+++ b/fit/src/main/resources/v3/OrderLine/-10 -10/entity.xml	
@@ -19,8 +19,8 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/StaticService/V3/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/V3/Static.svc/OrderLine(OrderId=-10,ProductId=-10)</id>
+<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>
   <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" />