olingo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject [01/19] [OLINGO-271] Patch applied, without deploying ref
Date Mon, 05 May 2014 14:05:26 GMT
Repository: olingo-odata4
Updated Branches:
  refs/heads/olingo263 6e9cb60e4 -> dda7577fa


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

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

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

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

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

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

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

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

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/22eb2ed7/fit/src/main/resources/V40/Products/5/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Products/5/entity.xml b/fit/src/main/resources/V40/Products/5/entity.xml
index 3f9f1bc..42e0b4d 100644
--- a/fit/src/main/resources/V40/Products/5/entity.xml
+++ b/fit/src/main/resources/V40/Products/5/entity.xml
@@ -19,22 +19,22 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/StaticService/V40/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://docs.oasis-open.org/odata/ns/data" xmlns:m="http://docs.oasis-open.org/odata/ns/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml" m:context="http://localhost:${cargo.servlet.port}/StaticService/V40/Static.svc/$metadata#Products/$entity">
-  <id>http://localhost:${cargo.servlet.port}/StaticService/V40/Static.svc/Products(5)</id>
+<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://docs.oasis-open.org/odata/ns/data" xmlns:m="http://docs.oasis-open.org/odata/ns/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml" m:context="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Products/$entity">
+  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)</id>
   <category term="#Microsoft.Test.OData.Services.ODataWCFService.Product" scheme="http://docs.oasis-open.org/odata/ns/scheme" />
-  <link rel="edit" href="http://localhost:${cargo.servlet.port}/StaticService/V40/Static.svc/Products(5)" />
-  <link rel="http://docs.oasis-open.org/odata/ns/related/Details" type="application/atom+xml;type=feed" title="Details" href="http://localhost:${cargo.servlet.port}/StaticService/V40/Static.svc/Products(5)/Details" />
+  <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)" />
+  <link rel="http://docs.oasis-open.org/odata/ns/related/Details" type="application/atom+xml;type=feed" title="Details" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Details" />
   <title />
   <updated>2014-04-23T11:54:53Z</updated>
   <author>
     <name />
   </author>
-  <m:action metadata="http://localhost:${cargo.servlet.port}/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight" 
+  <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight" 
             title="Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight" 
-            target="http://localhost:${cargo.servlet.port}/StaticService/V40/Static.svc/Products(5)/Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight"/>
-  <m:action metadata="http://localhost:${cargo.servlet.port}/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails" 
+            target="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight"/>
+  <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails" 
             title="Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails" 
-            target="http://localhost:${cargo.servlet.port}/StaticService/V40/Static.svc/Products(5)/Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails"/>
+            target="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails"/>
   <content type="application/xml">
     <m:properties>
       <d:ProductID m:type="Int32">5</d:ProductID>

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

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/22eb2ed7/fit/src/main/resources/V40/Products/6/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Products/6/entity.xml b/fit/src/main/resources/V40/Products/6/entity.xml
index e7bdabb..887c0ec 100644
--- a/fit/src/main/resources/V40/Products/6/entity.xml
+++ b/fit/src/main/resources/V40/Products/6/entity.xml
@@ -19,11 +19,11 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/StaticService/V40/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://docs.oasis-open.org/odata/ns/data" xmlns:m="http://docs.oasis-open.org/odata/ns/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml" m:context="http://localhost:${cargo.servlet.port}/StaticService/V40/Static.svc/$metadata#Products/$entity">
-  <id>http://localhost:${cargo.servlet.port}/StaticService/V40/Static.svc/Products(6)</id>
+<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://docs.oasis-open.org/odata/ns/data" xmlns:m="http://docs.oasis-open.org/odata/ns/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml" m:context="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Products/$entity">
+  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)</id>
   <category term="#Microsoft.Test.OData.Services.ODataWCFService.Product" scheme="http://docs.oasis-open.org/odata/ns/scheme" />
-  <link rel="edit" href="http://localhost:${cargo.servlet.port}/StaticService/V40/Static.svc/Products(6)" />
-  <link rel="http://docs.oasis-open.org/odata/ns/related/Details" type="application/atom+xml;type=feed" title="Details" href="http://localhost:${cargo.servlet.port}/StaticService/V40/Static.svc/Products(6)/Details" />
+  <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)" />
+  <link rel="http://docs.oasis-open.org/odata/ns/related/Details" type="application/atom+xml;type=feed" title="Details" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)/Details" />
   <title />
   <updated>2014-04-23T11:58:19Z</updated>
   <author>

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

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

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

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/22eb2ed7/fit/src/main/resources/V40/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.xml b/fit/src/main/resources/V40/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.xml
index 349c937..1e610be 100644
--- a/fit/src/main/resources/V40/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.xml
+++ b/fit/src/main/resources/V40/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.xml
@@ -19,14 +19,14 @@
     under the License.
 
 -->
-<entry xml:base="http://localhost:${cargo.servlet.port}/StaticService/V40/OpenType.svc/" 
+<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/OpenType.svc/" 
        xmlns="http://www.w3.org/2005/Atom" 
        xmlns:d="http://docs.oasis-open.org/odata/ns/data" 
        xmlns:m="http://docs.oasis-open.org/odata/ns/metadata" 
        xmlns:georss="http://www.georss.org/georss" 
        xmlns:gml="http://www.opengis.net/gml" 
-       m:context="http://localhost:${cargo.servlet.port}/StaticService/V40/OpenType.svc/$metadata#Row">
-  <id>http://localhost:${cargo.servlet.port}/StaticService/V40/OpenType.svc/Row(672b8250-1e6e-4785-80cf-b94b572e42b3)</id>
+       m:context="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/OpenType.svc/$metadata#Row">
+  <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/OpenType.svc/Row(672b8250-1e6e-4785-80cf-b94b572e42b3)</id>
   <category term="Microsoft.Test.OData.Services.OpenTypesService.Row" scheme="http://docs.oasis-open.org/odata/ns/scheme"/>
   <link rel="edit" title="Row" href="Row(672b8250-1e6e-4785-80cf-b94b572e42b3)"/>
   <title/>

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

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

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

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

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

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

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

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

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

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

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

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/22eb2ed7/fit/src/test/java/org/apache/olingo/fit/AbstractMetadataTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/AbstractMetadataTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/AbstractMetadataTestITCase.java
index f9eda5f..de8304a 100644
--- a/fit/src/test/java/org/apache/olingo/fit/AbstractMetadataTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/AbstractMetadataTestITCase.java
@@ -26,10 +26,10 @@ public abstract class AbstractMetadataTestITCase {
   protected abstract CommonODataClient getClient();
 
   protected String getTestServiceRoot() {
-    return "http://localhost:9080/StaticService/" + getClient().getServiceVersion().name() + "/Static.svc";
+    return "http://localhost:9080/stub/StaticService/" + getClient().getServiceVersion().name() + "/Static.svc";
   }
 
   protected String getNorthwindServiceRoot() {
-    return "http://localhost:9080/StaticService/" + getClient().getServiceVersion().name() + "/NorthWind.svc";
+    return "http://localhost:9080/stub/StaticService/" + getClient().getServiceVersion().name() + "/NorthWind.svc";
   }
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/22eb2ed7/fit/src/test/java/org/apache/olingo/fit/v3/AbstractTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/AbstractTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/AbstractTestITCase.java
index d799358..ab81e7c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/AbstractTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/AbstractTestITCase.java
@@ -87,12 +87,12 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
 
   @BeforeClass
   public static void setUpODataServiceRoot() throws IOException {
-    testStaticServiceRootURL = "http://localhost:9080/StaticService/V30/Static.svc";
-    testKeyAsSegmentServiceRootURL = "http://localhost:9080/StaticService/V30/KeyAsSegment.svc";
-    testActionOverloadingServiceRootURL = "http://localhost:9080/StaticService/V30/ActionOverloading.svc";
-    testOpenTypeServiceRootURL = "http://localhost:9080/StaticService/V30/OpenType.svc";
-    testLargeModelServiceRootURL = "http://localhost:9080/StaticService/V30/Static.svc/large";
-    testAuthServiceRootURL = "http://localhost:9080/DefaultService.svc";
+    testStaticServiceRootURL = "http://localhost:9080/stub/StaticService/V30/Static.svc";
+    testKeyAsSegmentServiceRootURL = "http://localhost:9080/stub/StaticService/V30/KeyAsSegment.svc";
+    testActionOverloadingServiceRootURL = "http://localhost:9080/stub/StaticService/V30/ActionOverloading.svc";
+    testOpenTypeServiceRootURL = "http://localhost:9080/stub/StaticService/V30/OpenType.svc";
+    testLargeModelServiceRootURL = "http://localhost:9080/stub/StaticService/V30/Static.svc/large";
+    testAuthServiceRootURL = "http://localhost:9080/stub/DefaultService.svc";
   }
 
   @BeforeClass

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/22eb2ed7/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java
index 7e2ef22..0082868 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java
@@ -59,11 +59,11 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
 
   @BeforeClass
   public static void setUpODataServiceRoot() throws IOException {
-    testStaticServiceRootURL = "http://localhost:9080/StaticService/V40/Static.svc";
-    testKeyAsSegmentServiceRootURL = "http://localhost:9080/StaticService/V40/KeyAsSegment.svc";
-    testOpenTypeServiceRootURL = "http://localhost:9080/StaticService/V40/OpenType.svc";
-    testLargeModelServiceRootURL = "http://localhost:9080/StaticService/V40/Static.svc/large";
-    testAuthServiceRootURL = "http://localhost:9080/DefaultService.svc";
+    testStaticServiceRootURL = "http://localhost:9080/stub/StaticService/V40/Static.svc";
+    testKeyAsSegmentServiceRootURL = "http://localhost:9080/stub/StaticService/V40/KeyAsSegment.svc";
+    testOpenTypeServiceRootURL = "http://localhost:9080/stub/StaticService/V40/OpenType.svc";
+    testLargeModelServiceRootURL = "http://localhost:9080/stub/StaticService/V40/Static.svc/large";
+    testAuthServiceRootURL = "http://localhost:9080/stub/DefaultService.svc";
 
     edmClient = ODataClientFactory.getEdmEnabledV4(testStaticServiceRootURL);  
   }


Mime
View raw message