http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/filter/not endswith(Name,'Chandan').xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Customer/filter/not endswith(Name,'Chandan').xml b/fit/src/main/resources/V30/Customer/filter/not endswith(Name,'Chandan').xml index 1d52691..63c1056 100644 --- a/fit/src/main/resources/V30/Customer/filter/not endswith(Name,'Chandan').xml +++ b/fit/src/main/resources/V30/Customer/filter/not endswith(Name,'Chandan').xml @@ -19,13 +19,13 @@ under the License. --> -<feed xml:base="http://localhost:${cargo.servlet.port}/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> +<feed xml:base="http://localhost:${tomcat.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:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer</id> <title type="text">Customer</title> <updated>2014-02-13T14:31:06Z</updated> <link rel="self" title="Customer" href="Customer" /> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Customer" href="Customer(-10)" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders"; type="application/atom+xml;type=feed" title="Orders" href="Customer(-10)/Orders" /> @@ -518,7 +518,7 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-9)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-9)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Customer" href="Customer(-9)" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders"; type="application/atom+xml;type=feed" title="Orders" href="Customer(-9)/Orders" /> @@ -1061,5 +1061,5 @@ </m:properties> </content> </entry> - <link rel="next" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer?$filter=not%20endswith(Name,'Chandan')&$skiptoken=-9" /> + <link rel="next" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer?$filter=not%20endswith(Name,'Chandan')&$skiptoken=-9" /> </feed>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/skiptoken/-1.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Customer/skiptoken/-1.full.json b/fit/src/main/resources/V30/Customer/skiptoken/-1.full.json index bb57782..ae99563 100644 --- a/fit/src/main/resources/V30/Customer/skiptoken/-1.full.json +++ b/fit/src/main/resources/V30/Customer/skiptoken/-1.full.json @@ -1,5 +1,5 @@ { - "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer";, + "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer";, "value": [ ] http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/skiptoken/-1.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Customer/skiptoken/-1.xml b/fit/src/main/resources/V30/Customer/skiptoken/-1.xml index 7d0d680..0de875a 100644 --- a/fit/src/main/resources/V30/Customer/skiptoken/-1.xml +++ b/fit/src/main/resources/V30/Customer/skiptoken/-1.xml @@ -19,8 +19,8 @@ under the License. --> -<feed xml:base="http://localhost:${cargo.servlet.port}/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> +<feed xml:base="http://localhost:${tomcat.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:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer</id> <title type="text">Customer</title> <updated>2014-02-11T10:22:13Z</updated> <link rel="self" title="Customer" href="Customer" /> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/skiptoken/-10.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Customer/skiptoken/-10.full.json b/fit/src/main/resources/V30/Customer/skiptoken/-10.full.json index d1eadeb..b5bfd2f 100644 --- a/fit/src/main/resources/V30/Customer/skiptoken/-10.full.json +++ b/fit/src/main/resources/V30/Customer/skiptoken/-10.full.json @@ -1,10 +1,10 @@ { - "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer";, + "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer";, "value": [ { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-9)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-9)", "odata.editLink": "Customer(-9)", "[email protected]": "Customer(-9)/Orders", "[email protected]": "Customer(-9)/Logins", @@ -753,7 +753,7 @@ }, { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-8)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-8)", "odata.editLink": "Customer(-8)", "[email protected]": "Customer(-8)/Orders", "[email protected]": "Customer(-8)/Logins", http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/skiptoken/-10.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Customer/skiptoken/-10.xml b/fit/src/main/resources/V30/Customer/skiptoken/-10.xml index ab51e5c..a20bca5 100644 --- a/fit/src/main/resources/V30/Customer/skiptoken/-10.xml +++ b/fit/src/main/resources/V30/Customer/skiptoken/-10.xml @@ -19,13 +19,13 @@ under the License. --> -<feed xml:base="http://localhost:${cargo.servlet.port}/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> +<feed xml:base="http://localhost:${tomcat.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:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer</id> <title type="text">Customer</title> <updated>2014-02-13T15:19:47Z</updated> <link rel="self" title="Customer" href="Customer" /> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-9)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-9)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Customer" href="Customer(-9)" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders"; type="application/atom+xml;type=feed" title="Orders" href="Customer(-9)/Orders" /> @@ -779,7 +779,7 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-8)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-8)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Customer" href="Customer(-8)" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders"; type="application/atom+xml;type=feed" title="Orders" href="Customer(-8)/Orders" /> @@ -949,5 +949,5 @@ </m:properties> </content> </entry> - <link rel="next" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer?$skiptoken=-8"; /> + <link rel="next" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer?$skiptoken=-8"; /> </feed> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/skiptoken/-3.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Customer/skiptoken/-3.full.json b/fit/src/main/resources/V30/Customer/skiptoken/-3.full.json index 1a7c4b9..e9bd58d 100644 --- a/fit/src/main/resources/V30/Customer/skiptoken/-3.full.json +++ b/fit/src/main/resources/V30/Customer/skiptoken/-3.full.json @@ -1,10 +1,10 @@ { - "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer";, + "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer";, "value": [ { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-2)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-2)", "odata.editLink": "Customer(-2)", "[email protected]": "Customer(-2)/Orders", "[email protected]": "Customer(-2)/Logins", @@ -196,7 +196,7 @@ }, { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-1)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-1)", "odata.editLink": "Customer(-1)", "[email protected]": "Customer(-1)/Orders", "[email protected]": "Customer(-1)/Logins", http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/skiptoken/-3.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Customer/skiptoken/-3.xml b/fit/src/main/resources/V30/Customer/skiptoken/-3.xml index 0133d45..bdabbbe 100644 --- a/fit/src/main/resources/V30/Customer/skiptoken/-3.xml +++ b/fit/src/main/resources/V30/Customer/skiptoken/-3.xml @@ -19,13 +19,13 @@ under the License. --> -<feed xml:base="http://localhost:${cargo.servlet.port}/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> +<feed xml:base="http://localhost:${tomcat.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:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer</id> <title type="text">Customer</title> <updated>2014-02-04T14:29:22Z</updated> <link rel="self" title="Customer" href="Customer" /> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-2)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-2)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Customer" href="Customer(-2)" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders"; type="application/atom+xml;type=feed" title="Orders" href="Customer(-2)/Orders" /> @@ -178,7 +178,7 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-1)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-1)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Customer" href="Customer(-1)" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders"; type="application/atom+xml;type=feed" title="Orders" href="Customer(-1)/Orders" /> @@ -609,5 +609,5 @@ </m:properties> </content> </entry> - <link rel="next" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer?$skiptoken=-1"; /> + <link rel="next" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer?$skiptoken=-1"; /> </feed> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/skiptoken/-5.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Customer/skiptoken/-5.full.json b/fit/src/main/resources/V30/Customer/skiptoken/-5.full.json index 9a9ff29..1266e15 100644 --- a/fit/src/main/resources/V30/Customer/skiptoken/-5.full.json +++ b/fit/src/main/resources/V30/Customer/skiptoken/-5.full.json @@ -1,10 +1,10 @@ { - "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer";, + "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer";, "value": [ { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-4)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-4)", "odata.editLink": "Customer(-4)", "[email protected]": "Customer(-4)/Orders", "[email protected]": "Customer(-4)/Logins", @@ -779,7 +779,7 @@ }, { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-3)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-3)", "odata.editLink": "Customer(-3)", "[email protected]": "Customer(-3)/Orders", "[email protected]": "Customer(-3)/Logins", http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/skiptoken/-5.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Customer/skiptoken/-5.xml b/fit/src/main/resources/V30/Customer/skiptoken/-5.xml index 4a2339b..c00eb40 100644 --- a/fit/src/main/resources/V30/Customer/skiptoken/-5.xml +++ b/fit/src/main/resources/V30/Customer/skiptoken/-5.xml @@ -19,13 +19,13 @@ under the License. --> -<feed xml:base="http://localhost:${cargo.servlet.port}/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> +<feed xml:base="http://localhost:${tomcat.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:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer</id> <title type="text">Customer</title> <updated>2014-02-04T14:28:17Z</updated> <link rel="self" title="Customer" href="Customer" /> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-4)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-4)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Customer" href="Customer(-4)" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders"; type="application/atom+xml;type=feed" title="Orders" href="Customer(-4)/Orders" /> @@ -604,7 +604,7 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-3)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-3)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Customer" href="Customer(-3)" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders"; type="application/atom+xml;type=feed" title="Orders" href="Customer(-3)/Orders" /> @@ -1100,5 +1100,5 @@ </m:properties> </content> </entry> - <link rel="next" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer?$skiptoken=-3"; /> + <link rel="next" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer?$skiptoken=-3"; /> </feed> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/skiptoken/-7.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Customer/skiptoken/-7.full.json b/fit/src/main/resources/V30/Customer/skiptoken/-7.full.json index e644006..14ac08b 100644 --- a/fit/src/main/resources/V30/Customer/skiptoken/-7.full.json +++ b/fit/src/main/resources/V30/Customer/skiptoken/-7.full.json @@ -1,10 +1,10 @@ { - "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer";, + "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer";, "value": [ { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-6)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-6)", "odata.editLink": "Customer(-6)", "[email protected]": "Customer(-6)/Orders", "[email protected]": "Customer(-6)/Logins", @@ -587,7 +587,7 @@ }, { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-5)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-5)", "odata.editLink": "Customer(-5)", "[email protected]": "Customer(-5)/Orders", "[email protected]": "Customer(-5)/Logins", http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/skiptoken/-7.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Customer/skiptoken/-7.xml b/fit/src/main/resources/V30/Customer/skiptoken/-7.xml index de57044..7fe417f 100644 --- a/fit/src/main/resources/V30/Customer/skiptoken/-7.xml +++ b/fit/src/main/resources/V30/Customer/skiptoken/-7.xml @@ -19,13 +19,13 @@ under the License. --> -<feed xml:base="http://localhost:${cargo.servlet.port}/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> +<feed xml:base="http://localhost:${tomcat.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:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer</id> <title type="text">Customer</title> <updated>2014-02-04T14:27:13Z</updated> <link rel="self" title="Customer" href="Customer" /> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-6)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-6)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Customer" href="Customer(-6)" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders"; type="application/atom+xml;type=feed" title="Orders" href="Customer(-6)/Orders" /> @@ -458,7 +458,7 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-5)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-5)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Customer" href="Customer(-5)" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders"; type="application/atom+xml;type=feed" title="Orders" href="Customer(-5)/Orders" /> @@ -985,6 +985,6 @@ </m:properties> </content> </entry> - <link rel="next" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer?$skiptoken=-5"; /> + <link rel="next" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer?$skiptoken=-5"; /> </feed> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/skiptoken/-9.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Customer/skiptoken/-9.full.json b/fit/src/main/resources/V30/Customer/skiptoken/-9.full.json index 4d2cd33..d51929a 100644 --- a/fit/src/main/resources/V30/Customer/skiptoken/-9.full.json +++ b/fit/src/main/resources/V30/Customer/skiptoken/-9.full.json @@ -1,10 +1,10 @@ { - "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer";, + "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer";, "value": [ { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-8)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-8)", "odata.editLink": "Customer(-8)", "[email protected]": "Customer(-8)/Orders", "[email protected]": "Customer(-8)/Logins", @@ -226,7 +226,7 @@ }, { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-7)", + "odata.id": "http://localhost:${tomcat.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/36e6ed40/fit/src/main/resources/V30/Customer/skiptoken/-9.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Customer/skiptoken/-9.xml b/fit/src/main/resources/V30/Customer/skiptoken/-9.xml index 9db7b77..afb43ac 100644 --- a/fit/src/main/resources/V30/Customer/skiptoken/-9.xml +++ b/fit/src/main/resources/V30/Customer/skiptoken/-9.xml @@ -19,13 +19,13 @@ under the License. --> -<feed xml:base="http://localhost:${cargo.servlet.port}/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> +<feed xml:base="http://localhost:${tomcat.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:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer</id> <title type="text">Customer</title> <updated>2014-02-04T14:24:59Z</updated> <link rel="self" title="Customer" href="Customer" /> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-8)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-8)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Customer" href="Customer(-8)" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders"; type="application/atom+xml;type=feed" title="Orders" href="Customer(-8)/Orders" /> @@ -196,7 +196,7 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-7)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-7)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Customer" href="Customer(-7)" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders"; type="application/atom+xml;type=feed" title="Orders" href="Customer(-7)/Orders" /> @@ -555,5 +555,5 @@ </m:properties> </content> </entry> - <link rel="next" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer?$skiptoken=-7"; /> + <link rel="next" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer?$skiptoken=-7"; /> </feed> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/CustomerInfo/11/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/CustomerInfo/11/entity.full.json b/fit/src/main/resources/V30/CustomerInfo/11/entity.full.json index 61c854f..4410847 100644 --- a/fit/src/main/resources/V30/CustomerInfo/11/entity.full.json +++ b/fit/src/main/resources/V30/CustomerInfo/11/entity.full.json @@ -1,7 +1,7 @@ { - "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#CustomerInfo/@Element";, + "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#CustomerInfo/@Element";, "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(11)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(11)", "odata.editLink": "CustomerInfo(11)", "odata.mediaEditLink": "CustomerInfo(11)/$value", "odata.mediaReadLink": "CustomerInfo(11)/$value", http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/CustomerInfo/11/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/CustomerInfo/11/entity.xml b/fit/src/main/resources/V30/CustomerInfo/11/entity.xml index b57de1b..dc41a0e 100644 --- a/fit/src/main/resources/V30/CustomerInfo/11/entity.xml +++ b/fit/src/main/resources/V30/CustomerInfo/11/entity.xml @@ -19,8 +19,8 @@ under the License. --> -<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(11)</id> +<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(11)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="CustomerInfo" href="CustomerInfo(11)" /> <title /> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/CustomerInfo/12/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/CustomerInfo/12/entity.full.json b/fit/src/main/resources/V30/CustomerInfo/12/entity.full.json index 401e897..3c3343e 100644 --- a/fit/src/main/resources/V30/CustomerInfo/12/entity.full.json +++ b/fit/src/main/resources/V30/CustomerInfo/12/entity.full.json @@ -1,7 +1,7 @@ { - "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#CustomerInfo/@Element";, + "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#CustomerInfo/@Element";, "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(12)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(12)", "odata.editLink": "CustomerInfo(12)", "odata.mediaEditLink": "CustomerInfo(12)/$value", "odata.mediaReadLink": "CustomerInfo(12)/$value", http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/CustomerInfo/12/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/CustomerInfo/12/entity.xml b/fit/src/main/resources/V30/CustomerInfo/12/entity.xml index 3ec3ab2..e3939ef 100644 --- a/fit/src/main/resources/V30/CustomerInfo/12/entity.xml +++ b/fit/src/main/resources/V30/CustomerInfo/12/entity.xml @@ -19,8 +19,8 @@ under the License. --> -<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(12)</id> +<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(12)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="CustomerInfo" href="CustomerInfo(12)" /> <title /> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/CustomerInfo/17/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/CustomerInfo/17/entity.full.json b/fit/src/main/resources/V30/CustomerInfo/17/entity.full.json index fd2f5ef..c4c332f 100644 --- a/fit/src/main/resources/V30/CustomerInfo/17/entity.full.json +++ b/fit/src/main/resources/V30/CustomerInfo/17/entity.full.json @@ -1,7 +1,7 @@ { - "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#CustomerInfo/@Element";, + "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#CustomerInfo/@Element";, "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(17)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(17)", "odata.editLink": "CustomerInfo(17)", "odata.mediaEditLink": "CustomerInfo(17)/$value", "odata.mediaReadLink": "CustomerInfo(17)/$value", http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/CustomerInfo/17/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/CustomerInfo/17/entity.xml b/fit/src/main/resources/V30/CustomerInfo/17/entity.xml index 55f71b5..f56e905 100644 --- a/fit/src/main/resources/V30/CustomerInfo/17/entity.xml +++ b/fit/src/main/resources/V30/CustomerInfo/17/entity.xml @@ -19,8 +19,8 @@ under the License. --> -<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(17)</id> +<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(17)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="CustomerInfo" href="CustomerInfo(17)" /> <title /> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/CustomerInfo/feed.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/CustomerInfo/feed.full.json b/fit/src/main/resources/V30/CustomerInfo/feed.full.json index 9bfa55e..78230ad 100644 --- a/fit/src/main/resources/V30/CustomerInfo/feed.full.json +++ b/fit/src/main/resources/V30/CustomerInfo/feed.full.json @@ -1,8 +1,8 @@ { - "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#CustomerInfo";, + "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#CustomerInfo";, "value": [{ "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(11)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(11)", "odata.editLink": "CustomerInfo(11)", "odata.mediaEditLink": "CustomerInfo(11)/$value", "odata.mediaReadLink": "CustomerInfo(11)/$value", @@ -11,7 +11,7 @@ "Information": "\u3073\u9ed1\u30dd\u755a\u305c\u30de\u30c1\uff9d\u30cf\u6b79\u9ed1\uff5a\u30af\uff66\uff88\u30dc\u30a1\u305f\u30b0\uff66\u9ed1\u30bd\u042f\u6b79\u3074\u305b\u30dd\uff5a\u30bc\u5f0c\u305e\u305b\u305c\u30bc\u4e9c\u042f\u30af\u3042\u30bd\u4e9c\u30bc\u305d\u305b\u73f1\u30a1\u30bf\u3072\u30b0\u30bc\u7e37\u044f\u3041\u30be\u9ed1\u30de\u30df\u88f9\u66a6\u30dd\u044f" }, { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(12)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(12)", "odata.editLink": "CustomerInfo(12)", "odata.mediaEditLink": "CustomerInfo(12)/$value", "odata.mediaReadLink": "CustomerInfo(12)/$value", @@ -20,7 +20,7 @@ "Information": "frubhbngipuuveyneosslslbtr\u00dfqjujnssgcxuuzdbeu\u00dfeaductgqbvhpussktbzzfuqvkxajzckmkzluthcjsku" }, { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(13)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(13)", "odata.editLink": "CustomerInfo(13)", "odata.mediaEditLink": "CustomerInfo(13)/$value", "odata.mediaReadLink": "CustomerInfo(13)/$value", @@ -29,7 +29,7 @@ "Information": null }, { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(14)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(14)", "odata.editLink": "CustomerInfo(14)", "odata.mediaEditLink": "CustomerInfo(14)/$value", "odata.mediaReadLink": "CustomerInfo(14)/$value", @@ -38,7 +38,7 @@ "Information": "\u7e37\u30a1\u30be\u6b79\uff9d\u88f9\u30df\u30df\u4e5d\u3092\u30bd\u30bf\u30dc\u0451\uff88\u307b\u3072\u30df\u30d0\u30bc\u755a\u042f\u30bd\u30dd\u4e9c\u307b\u30df\u307a\u307e\uff41\u30bf\u755a\u5f0c\u531a\u305e\u30b0\u307c\u305d\u755a\u30bd\uff9d\u30bc\u30bc\u3079\u30c1\u30c1\u305e\u30df\u30df\u30bc\u30de\u30bf\u9ed1\u30c0\u044f\u7e37\u7e37\u73f1\u305b\u4e9c\u3074\u30be\u30bd\u6b32\u531a\u30cf\u4e5d\u755a\u88f9\u30cf\uff88\u0451\u6b79\u305f\u30bc\u30bd\u30c1\u307b\u305b\u3073\u305c\uff9d\u30be\u73f1\u307c\uff88\uff66\u307c\u4e5d\u307c" }, { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(15)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(15)", "odata.editLink": "CustomerInfo(15)", "odata.mediaEditLink": "CustomerInfo(15)/$value", "odata.mediaReadLink": "CustomerInfo(15)/$value", @@ -47,7 +47,7 @@ "Information": "" }, { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(16)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(16)", "odata.editLink": "CustomerInfo(16)", "odata.mediaEditLink": "CustomerInfo(16)/$value", "odata.mediaReadLink": "CustomerInfo(16)/$value", @@ -56,7 +56,7 @@ "Information": "uuvoqobtxfgtnzugqjsocbhjkynsjafonxuxmcrnyldkxvpnuezalvpyhjpsmkgxacuruxtjruusxylndzxgefpscvk" }, { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(17)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(17)", "odata.editLink": "CustomerInfo(17)", "odata.mediaEditLink": "CustomerInfo(17)/$value", "odata.mediaReadLink": "CustomerInfo(17)/$value", @@ -65,7 +65,7 @@ "Information": null }, { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(18)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(18)", "odata.editLink": "CustomerInfo(18)", "odata.mediaEditLink": "CustomerInfo(18)/$value", "odata.mediaReadLink": "CustomerInfo(18)/$value", @@ -74,7 +74,7 @@ "Information": null }, { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(19)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(19)", "odata.editLink": "CustomerInfo(19)", "odata.mediaEditLink": "CustomerInfo(19)/$value", "odata.mediaReadLink": "CustomerInfo(19)/$value", @@ -83,7 +83,7 @@ "Information": "ebmfxjikutjvmudp" }, { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(20)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(20)", "odata.editLink": "CustomerInfo(20)", "odata.mediaEditLink": "CustomerInfo(20)/$value", "odata.mediaReadLink": "CustomerInfo(20)/$value", http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/CustomerInfo/feed.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/CustomerInfo/feed.xml b/fit/src/main/resources/V30/CustomerInfo/feed.xml index fce61db..177a650 100644 --- a/fit/src/main/resources/V30/CustomerInfo/feed.xml +++ b/fit/src/main/resources/V30/CustomerInfo/feed.xml @@ -19,13 +19,13 @@ under the License. --> -<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo</id> +<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo</id> <title type="text">CustomerInfo</title> <updated>2014-05-13T12:58:46Z</updated> <link rel="self" title="CustomerInfo" href="CustomerInfo" /> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(11)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(11)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="CustomerInfo" href="CustomerInfo(11)" /> <title /> @@ -41,7 +41,7 @@ </m:properties> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(12)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(12)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="CustomerInfo" href="CustomerInfo(12)" /> <title /> @@ -57,7 +57,7 @@ </m:properties> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(13)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(13)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="CustomerInfo" href="CustomerInfo(13)" /> <title /> @@ -73,7 +73,7 @@ </m:properties> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(14)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(14)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="CustomerInfo" href="CustomerInfo(14)" /> <title /> @@ -89,7 +89,7 @@ </m:properties> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(15)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(15)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="CustomerInfo" href="CustomerInfo(15)" /> <title /> @@ -105,7 +105,7 @@ </m:properties> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(16)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(16)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="CustomerInfo" href="CustomerInfo(16)" /> <title /> @@ -121,7 +121,7 @@ </m:properties> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(17)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(17)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="CustomerInfo" href="CustomerInfo(17)" /> <title /> @@ -137,7 +137,7 @@ </m:properties> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(18)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(18)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="CustomerInfo" href="CustomerInfo(18)" /> <title /> @@ -153,7 +153,7 @@ </m:properties> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(19)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(19)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="CustomerInfo" href="CustomerInfo(19)" /> <title /> @@ -169,7 +169,7 @@ </m:properties> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(20)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(20)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="CustomerInfo" href="CustomerInfo(20)" /> <title /> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmBooleanSet/true/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/EdmBooleanSet/true/entity.full.json b/fit/src/main/resources/V30/EdmBooleanSet/true/entity.full.json index e7109a4..f748ee6 100644 --- a/fit/src/main/resources/V30/EdmBooleanSet/true/entity.full.json +++ b/fit/src/main/resources/V30/EdmBooleanSet/true/entity.full.json @@ -1 +1 @@ -{"odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmBooleanSet/@Element";, "Id": true} \ No newline at end of file +{"odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmBooleanSet/@Element";, "Id": true} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmBooleanSet/true/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/EdmBooleanSet/true/entity.xml b/fit/src/main/resources/V30/EdmBooleanSet/true/entity.xml index 73ec1e7..42da009 100644 --- a/fit/src/main/resources/V30/EdmBooleanSet/true/entity.xml +++ b/fit/src/main/resources/V30/EdmBooleanSet/true/entity.xml @@ -19,8 +19,8 @@ under the License. --> -<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/EdmBooleanSet(true)</id> +<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/EdmBooleanSet(true)</id> <category term="Microsoft.Test.OData.Services.PrimitiveKeysService.EdmBoolean" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="EdmBoolean" href="EdmBooleanSet(true)" /> <title /> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmByteSet/255/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/EdmByteSet/255/entity.full.json b/fit/src/main/resources/V30/EdmByteSet/255/entity.full.json index 95fbc30..df8e75b 100644 --- a/fit/src/main/resources/V30/EdmByteSet/255/entity.full.json +++ b/fit/src/main/resources/V30/EdmByteSet/255/entity.full.json @@ -1 +1 @@ -{"odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmByteSet/@Element";, "Id": 255} \ No newline at end of file +{"odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmByteSet/@Element";, "Id": 255} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmByteSet/255/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/EdmByteSet/255/entity.xml b/fit/src/main/resources/V30/EdmByteSet/255/entity.xml index 043a1ef..22f1c4a 100644 --- a/fit/src/main/resources/V30/EdmByteSet/255/entity.xml +++ b/fit/src/main/resources/V30/EdmByteSet/255/entity.xml @@ -19,8 +19,8 @@ under the License. --> -<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/EdmByteSet(255)</id> +<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/EdmByteSet(255)</id> <category term="Microsoft.Test.OData.Services.PrimitiveKeysService.EdmByte" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="EdmByte" href="EdmByteSet(255)" /> <title /> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmDecimalSet/79228162514264337593543950335M/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/EdmDecimalSet/79228162514264337593543950335M/entity.full.json b/fit/src/main/resources/V30/EdmDecimalSet/79228162514264337593543950335M/entity.full.json index 2251768..fd6ecb5 100644 --- a/fit/src/main/resources/V30/EdmDecimalSet/79228162514264337593543950335M/entity.full.json +++ b/fit/src/main/resources/V30/EdmDecimalSet/79228162514264337593543950335M/entity.full.json @@ -1 +1 @@ -{"odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmDecimalSet/@Element";, "Id": "79228162514264337593543950335"} \ No newline at end of file +{"odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmDecimalSet/@Element";, "Id": "79228162514264337593543950335"} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmDecimalSet/79228162514264337593543950335M/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/EdmDecimalSet/79228162514264337593543950335M/entity.xml b/fit/src/main/resources/V30/EdmDecimalSet/79228162514264337593543950335M/entity.xml index 3da986b..1a57b00 100644 --- a/fit/src/main/resources/V30/EdmDecimalSet/79228162514264337593543950335M/entity.xml +++ b/fit/src/main/resources/V30/EdmDecimalSet/79228162514264337593543950335M/entity.xml @@ -19,8 +19,8 @@ under the License. --> -<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/EdmDecimalSet(79228162514264337593543950335M)</id> +<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/EdmDecimalSet(79228162514264337593543950335M)</id> <category term="Microsoft.Test.OData.Services.PrimitiveKeysService.EdmDecimal" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="EdmDecimal" href="EdmDecimalSet(79228162514264337593543950335M)" /> <title /> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmDoubleSet/1.7976931348623157E308D/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/EdmDoubleSet/1.7976931348623157E308D/entity.full.json b/fit/src/main/resources/V30/EdmDoubleSet/1.7976931348623157E308D/entity.full.json index 9ab801a..16c0960 100644 --- a/fit/src/main/resources/V30/EdmDoubleSet/1.7976931348623157E308D/entity.full.json +++ b/fit/src/main/resources/V30/EdmDoubleSet/1.7976931348623157E308D/entity.full.json @@ -1 +1 @@ -{"odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmDoubleSet/@Element";, "Id": 1.7976931348623157E+308} \ No newline at end of file +{"odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmDoubleSet/@Element";, "Id": 1.7976931348623157E+308} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmDoubleSet/1.7976931348623157E308D/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/EdmDoubleSet/1.7976931348623157E308D/entity.xml b/fit/src/main/resources/V30/EdmDoubleSet/1.7976931348623157E308D/entity.xml index d3113ff..d7b70be 100644 --- a/fit/src/main/resources/V30/EdmDoubleSet/1.7976931348623157E308D/entity.xml +++ b/fit/src/main/resources/V30/EdmDoubleSet/1.7976931348623157E308D/entity.xml @@ -19,8 +19,8 @@ under the License. --> -<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/EdmDoubleSet(1.7976931348623157E%2B308D)</id> +<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/EdmDoubleSet(1.7976931348623157E%2B308D)</id> <category term="Microsoft.Test.OData.Services.PrimitiveKeysService.EdmDouble" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="EdmDouble" href="EdmDoubleSet(1.7976931348623157E%2B308D)" /> <title /> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmGuidSet/guid'00000000-0000-0000-0000-000000000000'/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/EdmGuidSet/guid'00000000-0000-0000-0000-000000000000'/entity.full.json b/fit/src/main/resources/V30/EdmGuidSet/guid'00000000-0000-0000-0000-000000000000'/entity.full.json index 5128dc9..7809c4d 100644 --- a/fit/src/main/resources/V30/EdmGuidSet/guid'00000000-0000-0000-0000-000000000000'/entity.full.json +++ b/fit/src/main/resources/V30/EdmGuidSet/guid'00000000-0000-0000-0000-000000000000'/entity.full.json @@ -1 +1 @@ -{"odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmGuidSet/@Element";, "Id": "00000000-0000-0000-0000-000000000000"} \ No newline at end of file +{"odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmGuidSet/@Element";, "Id": "00000000-0000-0000-0000-000000000000"} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmGuidSet/guid'00000000-0000-0000-0000-000000000000'/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/EdmGuidSet/guid'00000000-0000-0000-0000-000000000000'/entity.xml b/fit/src/main/resources/V30/EdmGuidSet/guid'00000000-0000-0000-0000-000000000000'/entity.xml index 001f9d5..23a6a3c 100644 --- a/fit/src/main/resources/V30/EdmGuidSet/guid'00000000-0000-0000-0000-000000000000'/entity.xml +++ b/fit/src/main/resources/V30/EdmGuidSet/guid'00000000-0000-0000-0000-000000000000'/entity.xml @@ -19,8 +19,8 @@ under the License. --> -<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/EdmGuidSet(guid'00000000-0000-0000-0000-000000000000')</id> +<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/EdmGuidSet(guid'00000000-0000-0000-0000-000000000000')</id> <category term="Microsoft.Test.OData.Services.PrimitiveKeysService.EdmGuid" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="EdmGuid" href="EdmGuidSet(guid'00000000-0000-0000-0000-000000000000')" /> <title /> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmInt16Set/32767/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/EdmInt16Set/32767/entity.full.json b/fit/src/main/resources/V30/EdmInt16Set/32767/entity.full.json index 74716b7..b949a82 100644 --- a/fit/src/main/resources/V30/EdmInt16Set/32767/entity.full.json +++ b/fit/src/main/resources/V30/EdmInt16Set/32767/entity.full.json @@ -1 +1 @@ -{"odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmInt16Set/@Element";, "Id": 32767} \ No newline at end of file +{"odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmInt16Set/@Element";, "Id": 32767} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmInt16Set/32767/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/EdmInt16Set/32767/entity.xml b/fit/src/main/resources/V30/EdmInt16Set/32767/entity.xml index 4260903..3b07b3f 100644 --- a/fit/src/main/resources/V30/EdmInt16Set/32767/entity.xml +++ b/fit/src/main/resources/V30/EdmInt16Set/32767/entity.xml @@ -19,8 +19,8 @@ under the License. --> -<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/EdmInt16Set(32767)</id> +<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/EdmInt16Set(32767)</id> <category term="Microsoft.Test.OData.Services.PrimitiveKeysService.EdmInt16" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="EdmInt16" href="EdmInt16Set(32767)" /> <title /> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmInt32Set/-2147483648/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/EdmInt32Set/-2147483648/entity.full.json b/fit/src/main/resources/V30/EdmInt32Set/-2147483648/entity.full.json index 5eb6337..e5d74d6 100644 --- a/fit/src/main/resources/V30/EdmInt32Set/-2147483648/entity.full.json +++ b/fit/src/main/resources/V30/EdmInt32Set/-2147483648/entity.full.json @@ -1 +1 @@ -{"odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmInt32Set/@Element";, "Id": -2147483648} \ No newline at end of file +{"odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmInt32Set/@Element";, "Id": -2147483648} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmInt32Set/-2147483648/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/EdmInt32Set/-2147483648/entity.xml b/fit/src/main/resources/V30/EdmInt32Set/-2147483648/entity.xml index 3513e0f..adb1f80 100644 --- a/fit/src/main/resources/V30/EdmInt32Set/-2147483648/entity.xml +++ b/fit/src/main/resources/V30/EdmInt32Set/-2147483648/entity.xml @@ -19,8 +19,8 @@ under the License. --> -<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/EdmInt32Set(-2147483648)</id> +<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/EdmInt32Set(-2147483648)</id> <category term="Microsoft.Test.OData.Services.PrimitiveKeysService.EdmInt32" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="EdmInt32" href="EdmInt32Set(-2147483648)" /> <title /> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmInt64Set/9223372036854775807L/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/EdmInt64Set/9223372036854775807L/entity.full.json b/fit/src/main/resources/V30/EdmInt64Set/9223372036854775807L/entity.full.json index 25350b8..16ecc59 100644 --- a/fit/src/main/resources/V30/EdmInt64Set/9223372036854775807L/entity.full.json +++ b/fit/src/main/resources/V30/EdmInt64Set/9223372036854775807L/entity.full.json @@ -1 +1 @@ -{"odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmInt64Set/@Element";, "Id": "9223372036854775807"} \ No newline at end of file +{"odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmInt64Set/@Element";, "Id": "9223372036854775807"} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmInt64Set/9223372036854775807L/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/EdmInt64Set/9223372036854775807L/entity.xml b/fit/src/main/resources/V30/EdmInt64Set/9223372036854775807L/entity.xml index cc9f351..cc70dbd 100644 --- a/fit/src/main/resources/V30/EdmInt64Set/9223372036854775807L/entity.xml +++ b/fit/src/main/resources/V30/EdmInt64Set/9223372036854775807L/entity.xml @@ -19,8 +19,8 @@ under the License. --> -<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/EdmInt64Set(9223372036854775807L)</id> +<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/EdmInt64Set(9223372036854775807L)</id> <category term="Microsoft.Test.OData.Services.PrimitiveKeysService.EdmInt64" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="EdmInt64" href="EdmInt64Set(9223372036854775807L)" /> <title /> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmSingleSet/3.4028235E38f/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/EdmSingleSet/3.4028235E38f/entity.full.json b/fit/src/main/resources/V30/EdmSingleSet/3.4028235E38f/entity.full.json index 78a75ff..ea8a962 100644 --- a/fit/src/main/resources/V30/EdmSingleSet/3.4028235E38f/entity.full.json +++ b/fit/src/main/resources/V30/EdmSingleSet/3.4028235E38f/entity.full.json @@ -1 +1 @@ -{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmSingleSet/@Element","Id":3.4028235E+38} +{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmSingleSet/@Element","Id":3.4028235E+38} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmSingleSet/3.4028235E38f/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/EdmSingleSet/3.4028235E38f/entity.xml b/fit/src/main/resources/V30/EdmSingleSet/3.4028235E38f/entity.xml index 88ea5ea..b7711fd 100644 --- a/fit/src/main/resources/V30/EdmSingleSet/3.4028235E38f/entity.xml +++ b/fit/src/main/resources/V30/EdmSingleSet/3.4028235E38f/entity.xml @@ -19,8 +19,8 @@ under the License. --> -<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/EdmSingleSet(3.4028235E%2B38f)</id> +<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/EdmSingleSet(3.4028235E%2B38f)</id> <category term="Microsoft.Test.OData.Services.PrimitiveKeysService.EdmSingle" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="EdmSingle" href="EdmSingleSet(3.4028235E%2B38f)" /> <title /> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmStringSet/'$'/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/EdmStringSet/'$'/entity.full.json b/fit/src/main/resources/V30/EdmStringSet/'$'/entity.full.json index b4cf187..4827377 100644 --- a/fit/src/main/resources/V30/EdmStringSet/'$'/entity.full.json +++ b/fit/src/main/resources/V30/EdmStringSet/'$'/entity.full.json @@ -1 +1 @@ -{"odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmStringSet/@Element";, "Id": "$"} \ No newline at end of file +{"odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmStringSet/@Element";, "Id": "$"} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmStringSet/'$'/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/EdmStringSet/'$'/entity.xml b/fit/src/main/resources/V30/EdmStringSet/'$'/entity.xml index c9c8eb2..158a84c 100644 --- a/fit/src/main/resources/V30/EdmStringSet/'$'/entity.xml +++ b/fit/src/main/resources/V30/EdmStringSet/'$'/entity.xml @@ -19,8 +19,8 @@ under the License. --> -<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/EdmStringSet('%24')</id> +<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/EdmStringSet('%24')</id> <category term="Microsoft.Test.OData.Services.PrimitiveKeysService.EdmString" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="EdmString" href="EdmStringSet('%24')" /> <title /> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmTimeSet/time'-P10675199DT2H48M5.4775808S'/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/EdmTimeSet/time'-P10675199DT2H48M5.4775808S'/entity.full.json b/fit/src/main/resources/V30/EdmTimeSet/time'-P10675199DT2H48M5.4775808S'/entity.full.json index fd1f9a0..7ffb2d0 100644 --- a/fit/src/main/resources/V30/EdmTimeSet/time'-P10675199DT2H48M5.4775808S'/entity.full.json +++ b/fit/src/main/resources/V30/EdmTimeSet/time'-P10675199DT2H48M5.4775808S'/entity.full.json @@ -1 +1 @@ -{"odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmTimeSet/@Element";, "Id": "-P10675199DT2H48M5.4775808S"} \ No newline at end of file +{"odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#EdmTimeSet/@Element";, "Id": "-P10675199DT2H48M5.4775808S"} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/EdmTimeSet/time'-P10675199DT2H48M5.4775808S'/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/EdmTimeSet/time'-P10675199DT2H48M5.4775808S'/entity.xml b/fit/src/main/resources/V30/EdmTimeSet/time'-P10675199DT2H48M5.4775808S'/entity.xml index 3714510..18ff458 100644 --- a/fit/src/main/resources/V30/EdmTimeSet/time'-P10675199DT2H48M5.4775808S'/entity.xml +++ b/fit/src/main/resources/V30/EdmTimeSet/time'-P10675199DT2H48M5.4775808S'/entity.xml @@ -19,8 +19,8 @@ under the License. --> -<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/EdmTimeSet(time'-P10675199DT2H48M5.4775808S')</id> +<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/EdmTimeSet(time'-P10675199DT2H48M5.4775808S')</id> <category term="Microsoft.Test.OData.Services.PrimitiveKeysService.EdmTime" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="EdmTime" href="EdmTimeSet(time'-P10675199DT2H48M5.4775808S')" /> <title /> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/InStreamErrorGetCustomer.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/InStreamErrorGetCustomer.full.json b/fit/src/main/resources/V30/InStreamErrorGetCustomer.full.json index 5dde3e4..cbe24c9 100644 --- a/fit/src/main/resources/V30/InStreamErrorGetCustomer.full.json +++ b/fit/src/main/resources/V30/InStreamErrorGetCustomer.full.json @@ -1 +1 @@ -{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer";, "value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Customer", "odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)", "odata.editLink":"Customer(-10)", "[email protected]":"Customer(-10)/Orders", "[email protected]":"Customer(-10)/Logins", "[email protected]":"Customer(-10)/Husband", "[email protected]":"Customer(-10)/Wife", "[email protected]":"Customer(-10)/Info", "[email protected]":"Customer(-10)/Thumbnail", "[email protected]":"Customer(-10)/Video", "CustomerId": - 10, "Name":null, "PrimaryContactInfo":null, "[email protected]":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails)", "BackupContactInfo":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetai ls", "[email protected]":"Collection(Edm.String)", "EmailBag":["[email protected]"], "[email protected]":"Collection(Edm.String)", "AlternativeNames":["My Alternative name"], "ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases", "[email protected]":"Collection(Edm.String)", "AlternativeNames":["myAlternativeName"]}, "HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", "PhoneNumber":"8437568356834568", "Extension":"1243654265346267651534423ttrf"}, "WorkPhone":null, "[email protected]":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)", "MobilePhoneBag":[]}], "Auditing":null}, {"odata.error":{"code":"", "message":{"lang":"en-US", "value":"InStreamErrorGetCustomer ThrowForSpecificCustomer error"}}} \ No newline at end of file +{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer";, "value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Customer", "odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)", "odata.editLink":"Customer(-10)", "[email protected]":"Customer(-10)/Orders", "[email protected]":"Customer(-10)/Logins", "[email protected]":"Customer(-10)/Husband", "[email protected]":"Customer(-10)/Wife", "[email protected]":"Customer(-10)/Info", "[email protected]":"Customer(-10)/Thumbnail", "[email protected]":"Customer(-10)/Video", "CustomerId": - 10, "Name":null, "PrimaryContactInfo":null, "[email protected]":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails)", "BackupContactInfo":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDet ails", "[email protected]":"Collection(Edm.String)", "EmailBag":["[email protected]"], "[email protected]":"Collection(Edm.String)", "AlternativeNames":["My Alternative name"], "ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases", "[email protected]":"Collection(Edm.String)", "AlternativeNames":["myAlternativeName"]}, "HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", "PhoneNumber":"8437568356834568", "Extension":"1243654265346267651534423ttrf"}, "WorkPhone":null, "[email protected]":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)", "MobilePhoneBag":[]}], "Auditing":null}, {"odata.error":{"code":"", "message":{"lang":"en-US", "value":"InStreamErrorGetCustomer ThrowForSpecificCustomer error"}}} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/InStreamErrorGetCustomer.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/InStreamErrorGetCustomer.xml b/fit/src/main/resources/V30/InStreamErrorGetCustomer.xml index 3076a49..ee8b406 100644 --- a/fit/src/main/resources/V30/InStreamErrorGetCustomer.xml +++ b/fit/src/main/resources/V30/InStreamErrorGetCustomer.xml @@ -19,15 +19,15 @@ under the License. --> -<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; +<feed xml:base="http://localhost:${tomcat.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/InStreamErrorGetCustomer</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/InStreamErrorGetCustomer</id> <title type="text">InStreamErrorGetCustomer</title> <updated>2014-02-12T14:03:09Z</updated> <link rel="self" title="InStreamErrorGetCustomer" href="InStreamErrorGetCustomer" /> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Customer" href="Customer(-10)" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders"; type="application/atom+xml;type=feed" http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Login/'3'/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Login/'3'/entity.full.json b/fit/src/main/resources/V30/Login/'3'/entity.full.json index 4de8e2e..c16bd10 100644 --- a/fit/src/main/resources/V30/Login/'3'/entity.full.json +++ b/fit/src/main/resources/V30/Login/'3'/entity.full.json @@ -1,7 +1,7 @@ { - "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Login/@Element";, + "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Login/@Element";, "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Login", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Login('3')", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Login('3')", "odata.editLink": "Login('3')", "[email protected]": "Login('3')/Customer", "[email protected]": "Login('3')/LastLogin", http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Login/'3'/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Login/'3'/entity.xml b/fit/src/main/resources/V30/Login/'3'/entity.xml index be452d7..4abdc72 100644 --- a/fit/src/main/resources/V30/Login/'3'/entity.xml +++ b/fit/src/main/resources/V30/Login/'3'/entity.xml @@ -19,8 +19,8 @@ under the License. --> -<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Login('3')</id> +<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Login('3')</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Login" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Login" href="Login('3')" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Customer"; type="application/atom+xml;type=entry" title="Customer" href="Login('3')/Customer" />
