http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/22eb2ed7/fit/src/main/resources/V30/ComputerDetail/filter/year(PurchaseDate) eq 2020.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/ComputerDetail/filter/year(PurchaseDate) eq 2020.full.json b/fit/src/main/resources/V30/ComputerDetail/filter/year(PurchaseDate) eq 2020.full.json index 6502198..6da7c6e 100644 --- a/fit/src/main/resources/V30/ComputerDetail/filter/year(PurchaseDate) eq 2020.full.json +++ b/fit/src/main/resources/V30/ComputerDetail/filter/year(PurchaseDate) eq 2020.full.json @@ -1 +1 @@ -{"odata.metadata":"http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/$metadata#ComputerDetail","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail","odata.id":"http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/ComputerDetail(-10)","odata.editLink":"ComputerDetail(-10)","[email protected]":"ComputerDetail(-10)/Computer","#DefaultContainer.ResetComputerDetailsSpecifications":{"title":"ResetComputerDetailsSpecifications","target":"http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/ComputerDetail(-10)/ResetComputerDetailsSpecifications"},"ComputerDetailId":-10,"Manufacturer":"sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk","Model":"usfvbkyxssojjebyzgvtnzkuik\u00dfuxrmllzyglnsssluyxf\u00dfssioyroouxafzbhbsabkrsslbyhghicjaplolzqss\u00dfhhfix","Serial":null,"[email protected]":"Collection(Edm.String)","SpecificationsBag":["vorjqalydmfuazkatkiydeicefrjhyuaupkfgbxia ehjrqhhqv","rbsejgfgelhsdahkoqlnzvbq","ssfvnnquahsczxlu\u00dfnssrhpsszluundy\u00dfehyzjedssxom","xsqocvqrzbvzhdhtilugpvayirrnomupxinhihazfghqehqymeeaupuesseluinjgbedrarqluedjfx","eekuucympfgkucszfuggbmfglpnxnjvhkhalymhtfuggfafulkzedqlksoduqeyukzzhbbasjmee","\u30be\u3092\u4e5d\u30af\u305d"],"[email protected]":"Edm.DateTime","PurchaseDate":"2020-12-15T01:33:35.8014568","Dimensions":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions","[email protected]":"Edm.Decimal","Width":"-8917.92836319839","[email protected]":"Edm.Decimal","Height":"-79228162514264337593543950335","[email protected]":"Edm.Decimal","Depth":"-79228162514264337593543950335"}}]} \ No newline at end of file +{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#ComputerDetail","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)","odata.editLink":"ComputerDetail(-10)","[email protected]":"ComputerDetail(-10)/Computer","#DefaultContainer.ResetComputerDetailsSpecifications":{"title":"ResetComputerDetailsSpecifications","target":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)/ResetComputerDetailsSpecifications"},"ComputerDetailId":-10,"Manufacturer":"sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk","Model":"usfvbkyxssojjebyzgvtnzkuik\u00dfuxrmllzyglnsssluyxf\u00dfssioyroouxafzbhbsabkrsslbyhghicjaplolzqss\u00dfhhfix","Serial":null,"[email protected]":"Collection(Edm.String)","SpecificationsBag":["vorjqalydmfuazkatkiydeicef rjhyuaupkfgbxiaehjrqhhqv","rbsejgfgelhsdahkoqlnzvbq","ssfvnnquahsczxlu\u00dfnssrhpsszluundy\u00dfehyzjedssxom","xsqocvqrzbvzhdhtilugpvayirrnomupxinhihazfghqehqymeeaupuesseluinjgbedrarqluedjfx","eekuucympfgkucszfuggbmfglpnxnjvhkhalymhtfuggfafulkzedqlksoduqeyukzzhbbasjmee","\u30be\u3092\u4e5d\u30af\u305d"],"[email protected]":"Edm.DateTime","PurchaseDate":"2020-12-15T01:33:35.8014568","Dimensions":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions","[email protected]":"Edm.Decimal","Width":"-8917.92836319839","[email protected]":"Edm.Decimal","Height":"-79228162514264337593543950335","[email protected]":"Edm.Decimal","Depth":"-79228162514264337593543950335"}}]} \ No newline at end of file
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/22eb2ed7/fit/src/main/resources/V30/ComputerDetail/filter/year(PurchaseDate) eq 2020.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/ComputerDetail/filter/year(PurchaseDate) eq 2020.xml b/fit/src/main/resources/V30/ComputerDetail/filter/year(PurchaseDate) eq 2020.xml index 79b934b..f7116dc 100644 --- a/fit/src/main/resources/V30/ComputerDetail/filter/year(PurchaseDate) eq 2020.xml +++ b/fit/src/main/resources/V30/ComputerDetail/filter/year(PurchaseDate) eq 2020.xml @@ -19,4 +19,4 @@ under the License. --> -<feed xml:base="http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/"; xmlns="http://www.w3.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/ComputerDetail</id><title type="text">ComputerDetail</title><updated>2014-02-13T14:31:05Z</updated><link rel="self" title="ComputerDetail" href="ComputerDetail" /><entry><id>http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/ComputerDetail(-10)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /><link rel="edit" title="ComputerDetail" href="ComputerDetail(-10)" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Computer"; type="app lication/atom+xml;type=entry" title="Computer" href="ComputerDetail(-10)/Computer" /><title /><updated>2014-02-13T14:31:05Z</updated><author><name /><uri>usfvbkyxssojjebyzgvtnzkuikÃuxrmllzyglnsssluyxfÃssioyroouxafzbhbsabkrsslbyhghicjaplolzqssÃhhfix</uri><email>sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk</email></author><m:action metadata="http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/$metadata#DefaultContainer.ResetComputerDetailsSpecifications"; title="ResetComputerDetailsSpecifications" target="http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/ComputerDetail(-10)/ResetComputerDetailsSpecifications" /><content type="application/xml"><m:properties><d:ComputerDetailId m:type="Edm.Int32">-10</d:ComputerDetailId><d:Manufacturer>sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk</d:Manufacturer><d:Model>usfvbkyxssojjebyzgvtnzkuikÃuxrmllzyglnsssluyxfÃssioyroouxafzbhbsabkrsslbyhghicjaplolzqssÃhhfix</d:Model><d:Serial m:null=" true" /><d:SpecificationsBag m:type="Collection(Edm.String)"><d:element>vorjqalydmfuazkatkiydeicefrjhyuaupkfgbxiaehjrqhhqv</d:element><d:element>rbsejgfgelhsdahkoqlnzvbq</d:element><d:element>ssfvnnquahsczxluÃnssrhpsszluundyÃehyzjedssxom</d:element><d:element>xsqocvqrzbvzhdhtilugpvayirrnomupxinhihazfghqehqymeeaupuesseluinjgbedrarqluedjfx</d:element><d:element>eekuucympfgkucszfuggbmfglpnxnjvhkhalymhtfuggfafulkzedqlksoduqeyukzzhbbasjmee</d:element><d:element>ã¾ãä¹ã¯ã</d:element></d:SpecificationsBag><d:PurchaseDate m:type="Edm.DateTime">2020-12-15T01:33:35.8014568</d:PurchaseDate><d:Dimensions m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions"><d:Width m:type="Edm.Decimal">-8917.92836319839</d:Width><d:Height m:type="Edm.Decimal">-79228162514264337593543950335</d:Height><d:Depth m:type="Edm.Decimal">-79228162514264337593543950335</d:Depth></d:Dimensions></m:properties></content></entry></feed> +<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml";><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail</id><title type="text">ComputerDetail</title><updated>2014-02-13T14:31:05Z</updated><link rel="self" title="ComputerDetail" href="ComputerDetail" /><entry><id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /><link rel="edit" title="ComputerDetail" href="ComputerDetail(-10)" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Comp uter" type="application/atom+xml;type=entry" title="Computer" href="ComputerDetail(-10)/Computer" /><title /><updated>2014-02-13T14:31:05Z</updated><author><name /><uri>usfvbkyxssojjebyzgvtnzkuikÃuxrmllzyglnsssluyxfÃssioyroouxafzbhbsabkrsslbyhghicjaplolzqssÃhhfix</uri><email>sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk</email></author><m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ResetComputerDetailsSpecifications"; title="ResetComputerDetailsSpecifications" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ComputerDetail(-10)/ResetComputerDetailsSpecifications" /><content type="application/xml"><m:properties><d:ComputerDetailId m:type="Edm.Int32">-10</d:ComputerDetailId><d:Manufacturer>sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk</d:Manufacturer><d:Model>usfvbkyxssojjebyzgvtnzkuikÃuxrmllzyglnsssluyxfÃssioyroouxafzbhbsabkrsslbyhghicjaplolzqssÃhhfix</d :Model><d:Serial m:null="true" /><d:SpecificationsBag m:type="Collection(Edm.String)"><d:element>vorjqalydmfuazkatkiydeicefrjhyuaupkfgbxiaehjrqhhqv</d:element><d:element>rbsejgfgelhsdahkoqlnzvbq</d:element><d:element>ssfvnnquahsczxluÃnssrhpsszluundyÃehyzjedssxom</d:element><d:element>xsqocvqrzbvzhdhtilugpvayirrnomupxinhihazfghqehqymeeaupuesseluinjgbedrarqluedjfx</d:element><d:element>eekuucympfgkucszfuggbmfglpnxnjvhkhalymhtfuggfafulkzedqlksoduqeyukzzhbbasjmee</d:element><d:element>ã¾ãä¹ã¯ã</d:element></d:SpecificationsBag><d:PurchaseDate m:type="Edm.DateTime">2020-12-15T01:33:35.8014568</d:PurchaseDate><d:Dimensions m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions"><d:Width m:type="Edm.Decimal">-8917.92836319839</d:Width><d:Height m:type="Edm.Decimal">-79228162514264337593543950335</d:Height><d:Depth m:type="Edm.Decimal">-79228162514264337593543950335</d:Depth></d:Dimensions></m:properties></content></entry></feed> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/22eb2ed7/fit/src/main/resources/V30/Customer/-10/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Customer/-10/entity.full.json b/fit/src/main/resources/V30/Customer/-10/entity.full.json index e657913..39c88db 100644 --- a/fit/src/main/resources/V30/Customer/-10/entity.full.json +++ b/fit/src/main/resources/V30/Customer/-10/entity.full.json @@ -1,7 +1,7 @@ { - "odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/$metadata#Customer/@Element";, + "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer/@Element";, "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer", - "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Customer(-10)", + "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)", "odata.editLink": "Customer(-10)", "[email protected]": "Customer(-10)/Orders", "[email protected]": "Customer(-10)/Logins", http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/22eb2ed7/fit/src/main/resources/V30/Customer/-10/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Customer/-10/entity.xml b/fit/src/main/resources/V30/Customer/-10/entity.xml index de7e3b3..290daf9 100644 --- a/fit/src/main/resources/V30/Customer/-10/entity.xml +++ b/fit/src/main/resources/V30/Customer/-10/entity.xml @@ -19,8 +19,8 @@ under the License. --> -<entry xml:base="http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/"; xmlns="http://www.w3.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(-10)</id> +<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml";> + <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Customer" href="Customer(-10)" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders"; type="application/atom+xml;type=feed" title="Orders" href="Customer(-10)/Orders" /> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/22eb2ed7/fit/src/main/resources/V30/Customer/-10/links/Info.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Customer/-10/links/Info.full.json b/fit/src/main/resources/V30/Customer/-10/links/Info.full.json index ae6a7fd..4fbfe93 100644 --- a/fit/src/main/resources/V30/Customer/-10/links/Info.full.json +++ b/fit/src/main/resources/V30/Customer/-10/links/Info.full.json @@ -1,4 +1,4 @@ { - "odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/$metadata#Customer/$links/Info";, - "url": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/CustomerInfo(11)" + "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer/$links/Info";, + "url": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(11)" } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/22eb2ed7/fit/src/main/resources/V30/Customer/-10/links/Info.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Customer/-10/links/Info.xml b/fit/src/main/resources/V30/Customer/-10/links/Info.xml index cd385ab..13a198c 100644 --- a/fit/src/main/resources/V30/Customer/-10/links/Info.xml +++ b/fit/src/main/resources/V30/Customer/-10/links/Info.xml @@ -19,4 +19,4 @@ under the License. --> -<uri xmlns="http://schemas.microsoft.com/ado/2007/08/dataservices";>http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/CustomerInfo(11)</uri> \ No newline at end of file +<uri xmlns="http://schemas.microsoft.com/ado/2007/08/dataservices";>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(11)</uri> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/22eb2ed7/fit/src/main/resources/V30/Customer/-10/links/Logins('3').full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Customer/-10/links/Logins('3').full.json b/fit/src/main/resources/V30/Customer/-10/links/Logins('3').full.json index e6a080e..3359b8f 100644 --- a/fit/src/main/resources/V30/Customer/-10/links/Logins('3').full.json +++ b/fit/src/main/resources/V30/Customer/-10/links/Logins('3').full.json @@ -1,4 +1,4 @@ { - "odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/$metadata#Customer/$links/Logins/@Element";, - "url": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Login('3')" + "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer/$links/Logins/@Element";, + "url": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Login('3')" } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/22eb2ed7/fit/src/main/resources/V30/Customer/-10/links/Logins.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Customer/-10/links/Logins.full.json b/fit/src/main/resources/V30/Customer/-10/links/Logins.full.json index 6c2e8e0..c375868 100644 --- a/fit/src/main/resources/V30/Customer/-10/links/Logins.full.json +++ b/fit/src/main/resources/V30/Customer/-10/links/Logins.full.json @@ -1,12 +1,12 @@ { - "odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/$metadata#Customer/$links/Logins";, + "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer/$links/Logins";, "value": [ { - "url": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Login('1')" + "url": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Login('1')" }, { - "url": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Login('4')" + "url": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Login('4')" } ] } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/22eb2ed7/fit/src/main/resources/V30/Customer/-10/links/Logins.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Customer/-10/links/Logins.xml b/fit/src/main/resources/V30/Customer/-10/links/Logins.xml index e08847c..6d87ddf 100644 --- a/fit/src/main/resources/V30/Customer/-10/links/Logins.xml +++ b/fit/src/main/resources/V30/Customer/-10/links/Logins.xml @@ -20,6 +20,6 @@ --> <links xmlns="http://schemas.microsoft.com/ado/2007/08/dataservices";> - <uri>http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Login('1')</uri> - <uri>http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Login('4')</uri> + <uri>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Login('1')</uri> + <uri>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Login('4')</uri> </links> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/22eb2ed7/fit/src/main/resources/V30/Customer/-10/links/Orders(-10).full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Customer/-10/links/Orders(-10).full.json b/fit/src/main/resources/V30/Customer/-10/links/Orders(-10).full.json index 1fea22c..2062513 100644 --- a/fit/src/main/resources/V30/Customer/-10/links/Orders(-10).full.json +++ b/fit/src/main/resources/V30/Customer/-10/links/Orders(-10).full.json @@ -1,4 +1,4 @@ { - "odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/$metadata#Customer/$links/Orders/@Element";, - "url": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Order(-10)" + "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer/$links/Orders/@Element";, + "url": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Order(-10)" } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/22eb2ed7/fit/src/main/resources/V30/Customer/-10/links/Orders.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Customer/-10/links/Orders.full.json b/fit/src/main/resources/V30/Customer/-10/links/Orders.full.json index 666e7a5..8bd2f73 100644 --- a/fit/src/main/resources/V30/Customer/-10/links/Orders.full.json +++ b/fit/src/main/resources/V30/Customer/-10/links/Orders.full.json @@ -1,13 +1,13 @@ { - "odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/$metadata#Customer/$links/Orders";, + "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer/$links/Orders";, "value": [ { - "url": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Order(-10)" + "url": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Order(-10)" }, { - "url": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Order(-7)" + "url": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Order(-7)" } ], - "odata.nextLink": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Customer(-10)/$links/Orders?$skiptoken=-7" + "odata.nextLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)/$links/Orders?$skiptoken=-7" } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/22eb2ed7/fit/src/main/resources/V30/Customer/-10/links/Orders.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Customer/-10/links/Orders.xml b/fit/src/main/resources/V30/Customer/-10/links/Orders.xml index 6dee7e0..f53d049 100644 --- a/fit/src/main/resources/V30/Customer/-10/links/Orders.xml +++ b/fit/src/main/resources/V30/Customer/-10/links/Orders.xml @@ -20,7 +20,7 @@ --> <links xmlns="http://schemas.microsoft.com/ado/2007/08/dataservices";> - <uri>http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Order(-10)</uri> - <uri>http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Order(-7)</uri> - <next>http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Customer(-10)/$links/Orders?$skiptoken=-7</next> + <uri>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Order(-10)</uri> + <uri>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Order(-7)</uri> + <next>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)/$links/Orders?$skiptoken=-7</next> </links> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/22eb2ed7/fit/src/main/resources/V30/Customer/-7/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Customer/-7/entity.full.json b/fit/src/main/resources/V30/Customer/-7/entity.full.json index ce583a5..2bc2efc 100644 --- a/fit/src/main/resources/V30/Customer/-7/entity.full.json +++ b/fit/src/main/resources/V30/Customer/-7/entity.full.json @@ -1,7 +1,7 @@ { - "odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/$metadata#Customer/@Element";, + "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer/@Element";, "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer", - "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Customer(-7)", + "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-7)", "odata.editLink": "Customer(-7)", "[email protected]": "Customer(-7)/Orders", "[email protected]": "Customer(-7)/Logins", http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/22eb2ed7/fit/src/main/resources/V30/Customer/-7/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Customer/-7/entity.xml b/fit/src/main/resources/V30/Customer/-7/entity.xml index 8251d76..0d486ce 100644 --- a/fit/src/main/resources/V30/Customer/-7/entity.xml +++ b/fit/src/main/resources/V30/Customer/-7/entity.xml @@ -19,8 +19,8 @@ under the License. --> -<entry xml:base="http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/"; xmlns="http://www.w3.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(-7)</id> +<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml";> + <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-7)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Customer" href="Customer(-7)" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders"; type="application/atom+xml;type=feed" title="Orders" href="Customer(-7)/Orders" /> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/22eb2ed7/fit/src/main/resources/V30/Customer/-9/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Customer/-9/entity.full.json b/fit/src/main/resources/V30/Customer/-9/entity.full.json index d69bf97..d4eed3f 100644 --- a/fit/src/main/resources/V30/Customer/-9/entity.full.json +++ b/fit/src/main/resources/V30/Customer/-9/entity.full.json @@ -1,7 +1,7 @@ { - "odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/$metadata#Customer/@Element";, + "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer/@Element";, "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer", - "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Customer(-9)", + "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-9)", "odata.editLink": "Customer(-9)", "[email protected]": "Customer(-9)/Orders", "[email protected]": "Customer(-9)/Logins", http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/22eb2ed7/fit/src/main/resources/V30/Customer/-9/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Customer/-9/entity.xml b/fit/src/main/resources/V30/Customer/-9/entity.xml index c2e25a2..fc16707 100644 --- a/fit/src/main/resources/V30/Customer/-9/entity.xml +++ b/fit/src/main/resources/V30/Customer/-9/entity.xml @@ -19,8 +19,8 @@ under the License. --> -<entry xml:base="http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/"; xmlns="http://www.w3.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(-9)</id> +<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml";> + <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-9)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Customer" href="Customer(-9)" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders"; type="application/atom+xml;type=feed" title="Orders" href="Customer(-9)/Orders" /> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/22eb2ed7/fit/src/main/resources/V30/Customer/feed.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Customer/feed.full.json b/fit/src/main/resources/V30/Customer/feed.full.json index a394d70..ea67b72 100644 --- a/fit/src/main/resources/V30/Customer/feed.full.json +++ b/fit/src/main/resources/V30/Customer/feed.full.json @@ -1,10 +1,10 @@ { - "odata.metadata": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/$metadata#Customer";, + "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer";, "value": [ { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer", - "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Customer(-10)", + "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)", "odata.editLink": "Customer(-10)", "[email protected]": "Customer(-10)/Orders", "[email protected]": "Customer(-10)/Logins", @@ -57,7 +57,7 @@ }, { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer", - "odata.id": "http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Customer(-9)", + "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-9)", "odata.editLink": "Customer(-9)", "[email protected]": "Customer(-9)/Orders", "[email protected]": "Customer(-9)/Logins", http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/22eb2ed7/fit/src/main/resources/V30/Customer/feed.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Customer/feed.xml b/fit/src/main/resources/V30/Customer/feed.xml index ea06387..9899f3b 100644 --- a/fit/src/main/resources/V30/Customer/feed.xml +++ b/fit/src/main/resources/V30/Customer/feed.xml @@ -19,13 +19,13 @@ under the License. --> -<feed xml:base="http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml";> - <id>http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Customer</id> +<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml";> + <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer</id> <title type="text">Customer</title> <updated>2014-02-04T14:21:06Z</updated> <link rel="self" title="Customer" href="Customer" /> <entry> - <id>http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Customer(-10)</id> + <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Customer" href="Customer(-10)" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders"; type="application/atom+xml;type=feed" title="Orders" href="Customer(-10)/Orders" /> @@ -73,7 +73,7 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Customer(-9)</id> + <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-9)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Customer" href="Customer(-9)" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders"; type="application/atom+xml;type=feed" title="Orders" href="Customer(-9)/Orders" /> @@ -700,5 +700,5 @@ </m:properties> </content> </entry> - <link rel="next" href="http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Customer?$skiptoken=-9"; /> + <link rel="next" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer?$skiptoken=-9"; /> </feed> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/22eb2ed7/fit/src/main/resources/V30/Customer/filter/(indexof(PrimaryContactInfo.HomePhone.PhoneNumber,'ODataJClient') eq 1).full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Customer/filter/(indexof(PrimaryContactInfo.HomePhone.PhoneNumber,'ODataJClient') eq 1).full.json b/fit/src/main/resources/V30/Customer/filter/(indexof(PrimaryContactInfo.HomePhone.PhoneNumber,'ODataJClient') eq 1).full.json index fb2f57e..1741004 100644 --- a/fit/src/main/resources/V30/Customer/filter/(indexof(PrimaryContactInfo.HomePhone.PhoneNumber,'ODataJClient') eq 1).full.json +++ b/fit/src/main/resources/V30/Customer/filter/(indexof(PrimaryContactInfo.HomePhone.PhoneNumber,'ODataJClient') eq 1).full.json @@ -1 +1 @@ -{"odata.metadata":"http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/$metadata#Customer","value":[]} \ No newline at end of file +{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer","value":[]} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/22eb2ed7/fit/src/main/resources/V30/Customer/filter/(indexof(PrimaryContactInfo.HomePhone.PhoneNumber,'ODataJClient') eq 1).xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Customer/filter/(indexof(PrimaryContactInfo.HomePhone.PhoneNumber,'ODataJClient') eq 1).xml b/fit/src/main/resources/V30/Customer/filter/(indexof(PrimaryContactInfo.HomePhone.PhoneNumber,'ODataJClient') eq 1).xml index 5d66f3f..0d459fe 100644 --- a/fit/src/main/resources/V30/Customer/filter/(indexof(PrimaryContactInfo.HomePhone.PhoneNumber,'ODataJClient') eq 1).xml +++ b/fit/src/main/resources/V30/Customer/filter/(indexof(PrimaryContactInfo.HomePhone.PhoneNumber,'ODataJClient') eq 1).xml @@ -19,8 +19,8 @@ under the License. --> -<feed xml:base="http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml";> - <id>http://localhost:${cargo.servlet.port}/StaticService/V30/Static.svc/Customer</id> +<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml";> + <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer</id> <title type="text">Customer</title> <updated>2014-02-13T12:09:31Z</updated> <link rel="self" title="Customer" href="Customer" />
