http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Message/1 -10/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Message/1 -10/entity.full.json b/fit/src/main/resources/V30/Message/1 -10/entity.full.json index 9ead13b..ab31cdb 100644 --- a/fit/src/main/resources/V30/Message/1 -10/entity.full.json +++ b/fit/src/main/resources/V30/Message/1 -10/entity.full.json @@ -1,7 +1,7 @@ { - "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Message/@Element";, + "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Message/@Element";, "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Message", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='1',MessageId=-10)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='1',MessageId=-10)", "odata.editLink": "Message(FromUsername='1',MessageId=-10)", "[email protected]": "Message(FromUsername='1',MessageId=-10)/Sender", "[email protected]": "Message(FromUsername='1',MessageId=-10)/Recipient",
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Message/1 -10/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Message/1 -10/entity.xml b/fit/src/main/resources/V30/Message/1 -10/entity.xml index 4a5b927..4496671 100644 --- a/fit/src/main/resources/V30/Message/1 -10/entity.xml +++ b/fit/src/main/resources/V30/Message/1 -10/entity.xml @@ -19,8 +19,8 @@ under the License. --> -<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='1',MessageId=-10)</id> +<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/Message(FromUsername='1',MessageId=-10)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Message" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Message" href="Message(FromUsername='1',MessageId=-10)" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Sender"; type="application/atom+xml;type=entry" title="Sender" href="Message(FromUsername='1',MessageId=-10)/Sender" /> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Message/feed.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Message/feed.xml b/fit/src/main/resources/V30/Message/feed.xml index abed8fd..8084f9f 100644 --- a/fit/src/main/resources/V30/Message/feed.xml +++ b/fit/src/main/resources/V30/Message/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/Message</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/Message</id> <title type="text">Message</title> <updated>2014-05-08T09:55:45Z</updated> <link rel="self" title="Message" href="Message" /> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='1',MessageId=-10)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='1',MessageId=-10)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Message" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Message" href="Message(FromUsername='1',MessageId=-10)" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Sender"; type="application/atom+xml;type=entry" title="Sender" href="Message(FromUsername='1',MessageId=-10)/Sender" /> @@ -50,7 +50,7 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='2',MessageId=-9)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='2',MessageId=-9)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Message" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Message" href="Message(FromUsername='2',MessageId=-9)" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Sender"; type="application/atom+xml;type=entry" title="Sender" href="Message(FromUsername='2',MessageId=-9)/Sender" /> @@ -75,7 +75,7 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='3',MessageId=-8)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='3',MessageId=-8)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Message" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Message" href="Message(FromUsername='3',MessageId=-8)" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Sender"; type="application/atom+xml;type=entry" title="Sender" href="Message(FromUsername='3',MessageId=-8)/Sender" /> @@ -100,7 +100,7 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='4',MessageId=-7)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='4',MessageId=-7)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Message" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Message" href="Message(FromUsername='4',MessageId=-7)" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Sender"; type="application/atom+xml;type=entry" title="Sender" href="Message(FromUsername='4',MessageId=-7)/Sender" /> @@ -125,7 +125,7 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='5',MessageId=-6)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='5',MessageId=-6)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Message" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Message" href="Message(FromUsername='5',MessageId=-6)" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Sender"; type="application/atom+xml;type=entry" title="Sender" href="Message(FromUsername='5',MessageId=-6)/Sender" /> @@ -150,7 +150,7 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='6',MessageId=-5)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='6',MessageId=-5)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Message" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Message" href="Message(FromUsername='6',MessageId=-5)" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Sender"; type="application/atom+xml;type=entry" title="Sender" href="Message(FromUsername='6',MessageId=-5)/Sender" /> @@ -175,7 +175,7 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='7',MessageId=-4)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='7',MessageId=-4)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Message" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Message" href="Message(FromUsername='7',MessageId=-4)" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Sender"; type="application/atom+xml;type=entry" title="Sender" href="Message(FromUsername='7',MessageId=-4)/Sender" /> @@ -200,7 +200,7 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='8',MessageId=-3)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='8',MessageId=-3)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Message" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Message" href="Message(FromUsername='8',MessageId=-3)" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Sender"; type="application/atom+xml;type=entry" title="Sender" href="Message(FromUsername='8',MessageId=-3)/Sender" /> @@ -225,7 +225,7 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='9',MessageId=-2)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='9',MessageId=-2)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Message" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Message" href="Message(FromUsername='9',MessageId=-2)" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Sender"; type="application/atom+xml;type=entry" title="Sender" href="Message(FromUsername='9',MessageId=-2)/Sender" /> @@ -250,7 +250,7 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='10',MessageId=-1)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Message(FromUsername='10',MessageId=-1)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Message" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Message" href="Message(FromUsername='10',MessageId=-1)" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Sender"; type="application/atom+xml;type=entry" title="Sender" href="Message(FromUsername='10',MessageId=-1)/Sender" /> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Order/-10/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Order/-10/entity.full.json b/fit/src/main/resources/V30/Order/-10/entity.full.json index 5db1fd9..57cfdea 100644 --- a/fit/src/main/resources/V30/Order/-10/entity.full.json +++ b/fit/src/main/resources/V30/Order/-10/entity.full.json @@ -1,7 +1,7 @@ { - "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Order/@Element";, + "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Order/@Element";, "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Order", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Order(-10)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Order(-10)", "odata.editLink": "Order(-10)", "[email protected]": "Order(-10)/Login", "[email protected]": "Order(-10)/Customer", http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Order/-10/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Order/-10/entity.xml b/fit/src/main/resources/V30/Order/-10/entity.xml index 3f38e46..f3b64c6 100644 --- a/fit/src/main/resources/V30/Order/-10/entity.xml +++ b/fit/src/main/resources/V30/Order/-10/entity.xml @@ -19,8 +19,8 @@ under the License. --> -<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Order(-10)</id> +<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/Order(-10)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Order" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Order" href="Order(-10)" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Login"; type="application/atom+xml;type=entry" title="Login" href="Order(-10)/Login" /> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Order/-7/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Order/-7/entity.full.json b/fit/src/main/resources/V30/Order/-7/entity.full.json index 33331e7..58d6991 100644 --- a/fit/src/main/resources/V30/Order/-7/entity.full.json +++ b/fit/src/main/resources/V30/Order/-7/entity.full.json @@ -1,7 +1,7 @@ { - "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Order/@Element";, + "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Order/@Element";, "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Order", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Order(-7)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Order(-7)", "odata.editLink": "Order(-7)", "[email protected]": "Order(-7)/Login", "[email protected]": "Order(-7)/Customer", http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Order/-7/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Order/-7/entity.xml b/fit/src/main/resources/V30/Order/-7/entity.xml index d9ca2e3..480e79c 100644 --- a/fit/src/main/resources/V30/Order/-7/entity.xml +++ b/fit/src/main/resources/V30/Order/-7/entity.xml @@ -19,8 +19,8 @@ under the License. --> -<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Order(-7)</id> +<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/Order(-7)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Order" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Order" href="Order(-7)" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Login"; type="application/atom+xml;type=entry" title="Login" href="Order(-7)/Login" /> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Order/-8/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Order/-8/entity.full.json b/fit/src/main/resources/V30/Order/-8/entity.full.json index 56596cb..6ffd5f6 100644 --- a/fit/src/main/resources/V30/Order/-8/entity.full.json +++ b/fit/src/main/resources/V30/Order/-8/entity.full.json @@ -1,7 +1,7 @@ { - "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Order/@Element";, + "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Order/@Element";, "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Order", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Order(-8)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Order(-8)", "odata.editLink": "Order(-8)", "[email protected]": "Order(-8)/Login", "[email protected]": "Order(-8)/Customer", http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Order/-8/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Order/-8/entity.xml b/fit/src/main/resources/V30/Order/-8/entity.xml index bd2afe7..fb751fb 100644 --- a/fit/src/main/resources/V30/Order/-8/entity.xml +++ b/fit/src/main/resources/V30/Order/-8/entity.xml @@ -19,8 +19,8 @@ under the License. --> -<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Order(-8)</id> +<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/Order(-8)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Order" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Order" href="Order(-8)" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Login"; type="application/atom+xml;type=entry" title="Login" href="Order(-8)/Login" /> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Order/-9/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Order/-9/entity.full.json b/fit/src/main/resources/V30/Order/-9/entity.full.json index 1df38ce..3356d87 100644 --- a/fit/src/main/resources/V30/Order/-9/entity.full.json +++ b/fit/src/main/resources/V30/Order/-9/entity.full.json @@ -1,7 +1,7 @@ { - "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Order/@Element";, + "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Order/@Element";, "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Order", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Order(-9)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Order(-9)", "odata.editLink": "Order(-9)", "[email protected]": "Order(-9)/Login", "[email protected]": "Order(-9)/Customer", http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Order/-9/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Order/-9/entity.xml b/fit/src/main/resources/V30/Order/-9/entity.xml index c8bb42c..996042c 100644 --- a/fit/src/main/resources/V30/Order/-9/entity.xml +++ b/fit/src/main/resources/V30/Order/-9/entity.xml @@ -19,8 +19,8 @@ under the License. --> -<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Order(-9)</id> +<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/Order(-9)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Order" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Order" href="Order(-9)" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Login"; type="application/atom+xml;type=entry" title="Login" href="Order(-9)/Login" /> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/OrderLine/-10 -10/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/OrderLine/-10 -10/entity.full.json b/fit/src/main/resources/V30/OrderLine/-10 -10/entity.full.json index 40f3b67..fe91a53 100644 --- a/fit/src/main/resources/V30/OrderLine/-10 -10/entity.full.json +++ b/fit/src/main/resources/V30/OrderLine/-10 -10/entity.full.json @@ -1,7 +1,7 @@ { - "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#OrderLine/@Element";, + "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#OrderLine/@Element";, "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.OrderLine", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/OrderLine(OrderId=-10,ProductId=-10)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/OrderLine(OrderId=-10,ProductId=-10)", "odata.etag": "W/\"'lhvyagabhicdpqiqoxpztssvacdkxvoxdzksdsbykdrvnyg'\"", "odata.editLink": "OrderLine(OrderId=-10,ProductId=-10)", "[email protected]": "OrderLine(OrderId=-10,ProductId=-10)/Order", http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/OrderLine/-10 -10/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/OrderLine/-10 -10/entity.xml b/fit/src/main/resources/V30/OrderLine/-10 -10/entity.xml index e24f731..7a54080 100644 --- a/fit/src/main/resources/V30/OrderLine/-10 -10/entity.xml +++ b/fit/src/main/resources/V30/OrderLine/-10 -10/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"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml"; m:etag="W/"'lhvyagabhicdpqiqoxpztssvacdkxvoxdzksdsbykdrvnyg'""> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/OrderLine(OrderId=-10,ProductId=-10)</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"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml"; m:etag="W/"'lhvyagabhicdpqiqoxpztssvacdkxvoxdzksdsbykdrvnyg'""> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/OrderLine(OrderId=-10,ProductId=-10)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.OrderLine" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="OrderLine" href="OrderLine(OrderId=-10,ProductId=-10)" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Order"; type="application/atom+xml;type=entry" title="Order" href="OrderLine(OrderId=-10,ProductId=-10)/Order" /> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Person/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor/feed.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Person/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor/feed.full.json b/fit/src/main/resources/V30/Person/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor/feed.full.json index f514933..88a9805 100644 --- a/fit/src/main/resources/V30/Person/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor/feed.full.json +++ b/fit/src/main/resources/V30/Person/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor/feed.full.json @@ -1,10 +1,10 @@ { - "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Person/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor";, + "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Person/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor";, "value": [ { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(1)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(1)", "odata.editLink": "Person(1)/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor", "[email protected]": "Person(1)/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor/PersonMetadata", "PersonId": 1, @@ -16,7 +16,7 @@ }, { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(2)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(2)", "odata.editLink": "Person(2)/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor", "[email protected]": "Person(2)/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor/PersonMetadata", "PersonId": 2, http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Person/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor/feed.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Person/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor/feed.xml b/fit/src/main/resources/V30/Person/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor/feed.xml index 458cb0d..a94f1bc 100644 --- a/fit/src/main/resources/V30/Person/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor/feed.xml +++ b/fit/src/main/resources/V30/Person/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor/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/Person/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor</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/Person/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor</id> <title type="text">Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor</title> <updated>2014-05-08T12:20:11Z</updated> <link rel="self" title="Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor" href="Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor" /> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(1)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(1)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Contractor" href="Person(1)/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/PersonMetadata"; type="application/atom+xml;type=feed" title="PersonMetadata" href="Person(1)/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor/PersonMetadata" /> @@ -46,7 +46,7 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(2)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(2)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Contractor" href="Person(2)/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/PersonMetadata"; type="application/atom+xml;type=feed" title="PersonMetadata" href="Person(2)/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor/PersonMetadata" /> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Person/feed.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Person/feed.xml b/fit/src/main/resources/V30/Person/feed.xml index db7d834..a79f766 100644 --- a/fit/src/main/resources/V30/Person/feed.xml +++ b/fit/src/main/resources/V30/Person/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/Person</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/Person</id> <title type="text">Person</title> <updated>2014-05-08T12:17:04Z</updated> <link rel="self" title="Person" href="Person" /> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-10)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-10)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Person" href="Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/PersonMetadata"; type="application/atom+xml;type=feed" title="PersonMetadata" href="Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata" /> @@ -36,7 +36,7 @@ <author> <name /> </author> - <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack"; title="Sack" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" /> + <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack"; title="Sack" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" /> <content type="application/xml"> <m:properties> <d:PersonId m:type="Edm.Int32">-10</d:PersonId> @@ -51,7 +51,7 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-9)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-9)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Person" href="Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/PersonMetadata"; type="application/atom+xml;type=feed" title="PersonMetadata" href="Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata" /> @@ -62,7 +62,7 @@ <author> <name /> </author> - <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack"; title="Sack" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" /> + <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack"; title="Sack" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" /> <content type="application/xml"> <m:properties> <d:PersonId m:type="Edm.Int32">-9</d:PersonId> @@ -77,7 +77,7 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-8)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-8)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Person" href="Person(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/PersonMetadata"; type="application/atom+xml;type=feed" title="PersonMetadata" href="Person(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata" /> @@ -88,7 +88,7 @@ <author> <name /> </author> - <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack"; title="Sack" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" /> + <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack"; title="Sack" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" /> <content type="application/xml"> <m:properties> <d:PersonId m:type="Edm.Int32">-8</d:PersonId> @@ -103,7 +103,7 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-7)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-7)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Person" href="Person(-7)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/PersonMetadata"; type="application/atom+xml;type=feed" title="PersonMetadata" href="Person(-7)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata" /> @@ -114,7 +114,7 @@ <author> <name /> </author> - <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack"; title="Sack" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-7)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" /> + <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack"; title="Sack" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-7)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" /> <content type="application/xml"> <m:properties> <d:PersonId m:type="Edm.Int32">-7</d:PersonId> @@ -129,7 +129,7 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-6)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-6)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Employee" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Person" href="Person(-6)/Microsoft.Test.OData.Services.AstoriaDefaultService.Employee" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/PersonMetadata"; type="application/atom+xml;type=feed" title="PersonMetadata" href="Person(-6)/Microsoft.Test.OData.Services.AstoriaDefaultService.Employee/PersonMetadata" /> @@ -139,7 +139,7 @@ <author> <name /> </author> - <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack"; title="Sack" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-6)/Microsoft.Test.OData.Services.AstoriaDefaultService.Employee/Sack" /> + <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack"; title="Sack" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-6)/Microsoft.Test.OData.Services.AstoriaDefaultService.Employee/Sack" /> <content type="application/xml"> <m:properties> <d:PersonId m:type="Edm.Int32">-6</d:PersonId> @@ -151,7 +151,7 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-5)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-5)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Person" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Person" href="Person(-5)" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/PersonMetadata"; type="application/atom+xml;type=feed" title="PersonMetadata" href="Person(-5)/PersonMetadata" /> @@ -168,7 +168,7 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-4)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-4)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Person" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Person" href="Person(-4)" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/PersonMetadata"; type="application/atom+xml;type=feed" title="PersonMetadata" href="Person(-4)/PersonMetadata" /> @@ -185,7 +185,7 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-3)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-3)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Employee" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Person" href="Person(-3)/Microsoft.Test.OData.Services.AstoriaDefaultService.Employee" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/PersonMetadata"; type="application/atom+xml;type=feed" title="PersonMetadata" href="Person(-3)/Microsoft.Test.OData.Services.AstoriaDefaultService.Employee/PersonMetadata" /> @@ -195,7 +195,7 @@ <author> <name /> </author> - <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack"; title="Sack" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-3)/Microsoft.Test.OData.Services.AstoriaDefaultService.Employee/Sack" /> + <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack"; title="Sack" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-3)/Microsoft.Test.OData.Services.AstoriaDefaultService.Employee/Sack" /> <content type="application/xml"> <m:properties> <d:PersonId m:type="Edm.Int32">-3</d:PersonId> @@ -207,7 +207,7 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-2)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-2)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Person" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Person" href="Person(-2)" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/PersonMetadata"; type="application/atom+xml;type=feed" title="PersonMetadata" href="Person(-2)/PersonMetadata" /> @@ -224,7 +224,7 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-1)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-1)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Person" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Person" href="Person(-1)" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/PersonMetadata"; type="application/atom+xml;type=feed" title="PersonMetadata" href="Person(-1)/PersonMetadata" /> @@ -241,7 +241,7 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(0)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(0)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Employee" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Person" href="Person(0)/Microsoft.Test.OData.Services.AstoriaDefaultService.Employee" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/PersonMetadata"; type="application/atom+xml;type=feed" title="PersonMetadata" href="Person(0)/Microsoft.Test.OData.Services.AstoriaDefaultService.Employee/PersonMetadata" /> @@ -251,7 +251,7 @@ <author> <name /> </author> - <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack"; title="Sack" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(0)/Microsoft.Test.OData.Services.AstoriaDefaultService.Employee/Sack" /> + <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack"; title="Sack" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(0)/Microsoft.Test.OData.Services.AstoriaDefaultService.Employee/Sack" /> <content type="application/xml"> <m:properties> <d:PersonId m:type="Edm.Int32">0</d:PersonId> @@ -263,7 +263,7 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(1)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(1)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Person" href="Person(1)/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/PersonMetadata"; type="application/atom+xml;type=feed" title="PersonMetadata" href="Person(1)/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor/PersonMetadata" /> @@ -284,7 +284,7 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(2)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(2)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Person" href="Person(2)/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/PersonMetadata"; type="application/atom+xml;type=feed" title="PersonMetadata" href="Person(2)/Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor/PersonMetadata" /> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Person/filter/PersonId sub 2 lt -10.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Person/filter/PersonId sub 2 lt -10.full.json b/fit/src/main/resources/V30/Person/filter/PersonId sub 2 lt -10.full.json index 28a62a1..38f2871 100644 --- a/fit/src/main/resources/V30/Person/filter/PersonId sub 2 lt -10.full.json +++ b/fit/src/main/resources/V30/Person/filter/PersonId sub 2 lt -10.full.json @@ -1 +1 @@ -{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Person","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-10)","odata.editLink":"Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","[email protected]":"Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata","[email protected]":"Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Manager","[email protected]":"Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Car","#DefaultContainer.Sack":{"title":"Sack","target":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack"},"PersonI d":-10,"Name":"\u307a\u30bd\u305e\u5f0c\u30bf\u30a1\u531a\u30bf\u307d\u3072\u30cf\u6b32\u3074\u307b\u531a\u305b\u307e\u305f\u30d0\u30dc\u30c1\u30de\u531a\u3041\u30be\u30bd\u30c1\u3041\u042f\u305d\u3041\u30df\u044f\u66a6\u755a\u30dc\u6b79\u3072\u042f\u307b\u30c0\u30c1\u305d\u042f\u305b\u307d\u30bc\u30dd\u042f\u30c1\uff41\u305f\u6b79\u305f\u3092\u30bf\u30de\u305b\u3092\u305b\u531a\u30df\u30bf\u3072\u305c\u755a\u66a6\u30b0\u30af\u3072\u307b\u305d\u305f\u30b0\u305b\u044f\u30c1\u531a\uff66\u307a\u3041\u88f9\u3041\u30bd\u3073\u9ed1\u88f9\u7e37","ManagersPersonId":47,"Salary":4091,"Title":"\u307a\u30bd\u042f\u3092\u6b79\u30a1\u6b32\u042f\u30bd\u3042\u307d\uff66\uff41\u305d\u305b\u044f\u7e37\u30dd\u305b\uff88\u3074\uff66\u9ed1\u755a\u044f\u307b\u30be\u307b\u3079\uff41\u307b\uff88\u30d0\u755a\u4e5d\u4e9c\u0451\u30cf\u3079\u305c\u30a1\u88f9\u30bd\u6b32\u307b\u30b0\uff9d\u30dd\u5f0c\u9ed1\u30c1\u3073\uff66\uff88\u30df\u307c\u30bf\u305f\u307e\u30d0\u6b79\u30c1\u66a6\u30bf\u6b32\u3092\u30af\u304 1\u30af\u3093\uff9d\u307e\u30bd\uff88\u30dc\u307e\u30bf\u305c\u30dc\u30dd\u307b\u6b79\u30bd\u3092\u30a1\u3042\u044f\u30dc\u305f\u30be\u307b","CarsVIN":-1911530027,"Bonus":-37730565,"IsFullyVested":false},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-9)","odata.editLink":"Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","[email protected]":"Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata","[email protected]":"Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Manager","[email protected]":"Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Car","#DefaultContainer.Sack":{"title":"Sack","target":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-9)/Micr osoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack"},"PersonId":-9,"Name":"stiuictvznkcvledkjnnluuvkmyumyfduxmjqpfnbjqgmvhuiytjbjinzbfmf","ManagersPersonId":-8429952,"Salary":-2147483648,"Title":"\u30d0\u30dc\u6b79\u305d\u042f\u30bc\u3041\u30be\u30bd\u3093\u30dc\u305f\u305d\u4e5d\u30dc\u3072\u73f1\u3042\u30de\u66a6\uff9d\u30bd\u30bd\u30a1\u531a\u307c\u307b\u305f\u30dc\u305c\u30af\u531a\u30bd\u755a\u30be\u3093\uff41\u30a1\u3079\u3042\u044f\u305b\u30bf\u7e37\u30de\u30bc\u3079\u307a\u30de\u7e37\u30bc\u305e\u30bc\u305f\uff5a\u305f\u305f\u30bf\u30a1\u4e5d\u3072\u9ed1\u7e37\u30af\uff66\u6b79\u30de\u307b\u307c\u3092\u307a\u30bf\u755a\u30dc\u5f0c\u9ed1\uff5a\u30cf\u30dc\u30af\u0451\u044f\u30bd\u30df\u30de\u307b\u30bc\u307e\uff41\u30a1\u3072\u30bc\uff9d\u30bd\u9ed1","CarsVIN":-2147483648,"Bonus":-2147483648,"IsFullyVested":false}]} \ No newline at end of file +{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Person","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-10)","odata.editLink":"Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","[email protected]":"Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata","[email protected]":"Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Manager","[email protected]":"Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Car","#DefaultContainer.Sack":{"title":"Sack","target":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack"},"Pers onId":-10,"Name":"\u307a\u30bd\u305e\u5f0c\u30bf\u30a1\u531a\u30bf\u307d\u3072\u30cf\u6b32\u3074\u307b\u531a\u305b\u307e\u305f\u30d0\u30dc\u30c1\u30de\u531a\u3041\u30be\u30bd\u30c1\u3041\u042f\u305d\u3041\u30df\u044f\u66a6\u755a\u30dc\u6b79\u3072\u042f\u307b\u30c0\u30c1\u305d\u042f\u305b\u307d\u30bc\u30dd\u042f\u30c1\uff41\u305f\u6b79\u305f\u3092\u30bf\u30de\u305b\u3092\u305b\u531a\u30df\u30bf\u3072\u305c\u755a\u66a6\u30b0\u30af\u3072\u307b\u305d\u305f\u30b0\u305b\u044f\u30c1\u531a\uff66\u307a\u3041\u88f9\u3041\u30bd\u3073\u9ed1\u88f9\u7e37","ManagersPersonId":47,"Salary":4091,"Title":"\u307a\u30bd\u042f\u3092\u6b79\u30a1\u6b32\u042f\u30bd\u3042\u307d\uff66\uff41\u305d\u305b\u044f\u7e37\u30dd\u305b\uff88\u3074\uff66\u9ed1\u755a\u044f\u307b\u30be\u307b\u3079\uff41\u307b\uff88\u30d0\u755a\u4e5d\u4e9c\u0451\u30cf\u3079\u305c\u30a1\u88f9\u30bd\u6b32\u307b\u30b0\uff9d\u30dd\u5f0c\u9ed1\u30c1\u3073\uff66\uff88\u30df\u307c\u30bf\u305f\u307e\u30d0\u6b79\u30c1\u66a6\u30bf\u6b32\u3092\u30af\u 3041\u30af\u3093\uff9d\u307e\u30bd\uff88\u30dc\u307e\u30bf\u305c\u30dc\u30dd\u307b\u6b79\u30bd\u3092\u30a1\u3042\u044f\u30dc\u305f\u30be\u307b","CarsVIN":-1911530027,"Bonus":-37730565,"IsFullyVested":false},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-9)","odata.editLink":"Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","[email protected]":"Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata","[email protected]":"Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Manager","[email protected]":"Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Car","#DefaultContainer.Sack":{"title":"Sack","target":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-9) /Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack"},"PersonId":-9,"Name":"stiuictvznkcvledkjnnluuvkmyumyfduxmjqpfnbjqgmvhuiytjbjinzbfmf","ManagersPersonId":-8429952,"Salary":-2147483648,"Title":"\u30d0\u30dc\u6b79\u305d\u042f\u30bc\u3041\u30be\u30bd\u3093\u30dc\u305f\u305d\u4e5d\u30dc\u3072\u73f1\u3042\u30de\u66a6\uff9d\u30bd\u30bd\u30a1\u531a\u307c\u307b\u305f\u30dc\u305c\u30af\u531a\u30bd\u755a\u30be\u3093\uff41\u30a1\u3079\u3042\u044f\u305b\u30bf\u7e37\u30de\u30bc\u3079\u307a\u30de\u7e37\u30bc\u305e\u30bc\u305f\uff5a\u305f\u305f\u30bf\u30a1\u4e5d\u3072\u9ed1\u7e37\u30af\uff66\u6b79\u30de\u307b\u307c\u3092\u307a\u30bf\u755a\u30dc\u5f0c\u9ed1\uff5a\u30cf\u30dc\u30af\u0451\u044f\u30bd\u30df\u30de\u307b\u30bc\u307e\uff41\u30a1\u3072\u30bc\uff9d\u30bd\u9ed1","CarsVIN":-2147483648,"Bonus":-2147483648,"IsFullyVested":false}]} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Person/filter/PersonId sub 2 lt -10.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Person/filter/PersonId sub 2 lt -10.xml b/fit/src/main/resources/V30/Person/filter/PersonId sub 2 lt -10.xml index 061afe7..41a1393 100644 --- a/fit/src/main/resources/V30/Person/filter/PersonId sub 2 lt -10.xml +++ b/fit/src/main/resources/V30/Person/filter/PersonId sub 2 lt -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";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person</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/Person</id> <title type="text">Person</title> <updated>2014-02-13T14:31:04Z</updated> <link rel="self" title="Person" href="Person" /> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-10)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-10)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Person" href="Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/PersonMetadata"; type="application/atom+xml;type=feed" title="PersonMetadata" href="Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata" /> @@ -36,7 +36,7 @@ <author> <name /> </author> - <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack"; title="Sack" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" /> + <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack"; title="Sack" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" /> <content type="application/xml"> <m:properties> <d:PersonId m:type="Edm.Int32">-10</d:PersonId> @@ -51,7 +51,7 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-9)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-9)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Person" href="Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/PersonMetadata"; type="application/atom+xml;type=feed" title="PersonMetadata" href="Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata" /> @@ -62,7 +62,7 @@ <author> <name /> </author> - <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack"; title="Sack" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" /> + <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack"; title="Sack" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" /> <content type="application/xml"> <m:properties> <d:PersonId m:type="Edm.Int32">-9</d:PersonId> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Person/filter/isof('Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee').full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Person/filter/isof('Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee').full.json b/fit/src/main/resources/V30/Person/filter/isof('Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee').full.json index 0a72a2c..59eb224 100644 --- a/fit/src/main/resources/V30/Person/filter/isof('Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee').full.json +++ b/fit/src/main/resources/V30/Person/filter/isof('Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee').full.json @@ -1 +1 @@ -{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Person","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-10)","odata.editLink":"Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","[email protected]":"Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata","[email protected]":"Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Manager","[email protected]":"Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Car","#DefaultContainer.Sack":{"title":"Sack","target":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack"},"PersonI d":-10,"Name":"\u307a\u30bd\u305e\u5f0c\u30bf\u30a1\u531a\u30bf\u307d\u3072\u30cf\u6b32\u3074\u307b\u531a\u305b\u307e\u305f\u30d0\u30dc\u30c1\u30de\u531a\u3041\u30be\u30bd\u30c1\u3041\u042f\u305d\u3041\u30df\u044f\u66a6\u755a\u30dc\u6b79\u3072\u042f\u307b\u30c0\u30c1\u305d\u042f\u305b\u307d\u30bc\u30dd\u042f\u30c1\uff41\u305f\u6b79\u305f\u3092\u30bf\u30de\u305b\u3092\u305b\u531a\u30df\u30bf\u3072\u305c\u755a\u66a6\u30b0\u30af\u3072\u307b\u305d\u305f\u30b0\u305b\u044f\u30c1\u531a\uff66\u307a\u3041\u88f9\u3041\u30bd\u3073\u9ed1\u88f9\u7e37","ManagersPersonId":47,"Salary":4124,"Title":"\u307a\u30bd\u042f\u3092\u6b79\u30a1\u6b32\u042f\u30bd\u3042\u307d\uff66\uff41\u305d\u305b\u044f\u7e37\u30dd\u305b\uff88\u3074\uff66\u9ed1\u755a\u044f\u307b\u30be\u307b\u3079\uff41\u307b\uff88\u30d0\u755a\u4e5d\u4e9c\u0451\u30cf\u3079\u305c\u30a1\u88f9\u30bd\u6b32\u307b\u30b0\uff9d\u30dd\u5f0c\u9ed1\u30c1\u3073\uff66\uff88\u30df\u307c\u30bf\u305f\u307e\u30d0\u6b79\u30c1\u66a6\u30bf\u6b32\u3092\u30af\u304 1\u30af\u3093\uff9d\u307e\u30bd\uff88\u30dc\u307e\u30bf\u305c\u30dc\u30dd\u307b\u6b79\u30bd\u3092\u30a1\u3042\u044f\u30dc\u305f\u30be\u307b","CarsVIN":-1911530027,"Bonus":-37730565,"IsFullyVested":false},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-9)","odata.editLink":"Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","[email protected]":"Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata","[email protected]":"Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Manager","[email protected]":"Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Car","#DefaultContainer.Sack":{"title":"Sack","target":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-9)/Micr osoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack"},"PersonId":-9,"Name":"stiuictvznkcvledkjnnluuvkmyumyfduxmjqpfnbjqgmvhuiytjbjinzbfmf","ManagersPersonId":-8429952,"Salary":-2147483615,"Title":"\u30d0\u30dc\u6b79\u305d\u042f\u30bc\u3041\u30be\u30bd\u3093\u30dc\u305f\u305d\u4e5d\u30dc\u3072\u73f1\u3042\u30de\u66a6\uff9d\u30bd\u30bd\u30a1\u531a\u307c\u307b\u305f\u30dc\u305c\u30af\u531a\u30bd\u755a\u30be\u3093\uff41\u30a1\u3079\u3042\u044f\u305b\u30bf\u7e37\u30de\u30bc\u3079\u307a\u30de\u7e37\u30bc\u305e\u30bc\u305f\uff5a\u305f\u305f\u30bf\u30a1\u4e5d\u3072\u9ed1\u7e37\u30af\uff66\u6b79\u30de\u307b\u307c\u3092\u307a\u30bf\u755a\u30dc\u5f0c\u9ed1\uff5a\u30cf\u30dc\u30af\u0451\u044f\u30bd\u30df\u30de\u307b\u30bc\u307e\uff41\u30a1\u3072\u30bc\uff9d\u30bd\u9ed1","CarsVIN":-2147483648,"Bonus":-2147483648,"IsFullyVested":false},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","odata.id":"http://localhost:${cargo.servlet.port}/stub/Static Service/V30/Static.svc/Person(-8)","odata.editLink":"Person(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","[email protected]":"Person(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata","[email protected]":"Person(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Manager","[email protected]":"Person(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Car","#DefaultContainer.Sack":{"title":"Sack","target":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack"},"PersonId":-8,"Name":"vypuyxjjxlzfldvppqxkmzdnnapmugyumusqfrnaotviyfbudutxksfvpabxdxdmnosflbfxevfsouqdutczmaguuxaf","ManagersPersonId":3777,"Salary":334131173,"Title":"\u305b\u755a\u73f1\u6b32\u30d0\u30bc\u30c1\u30df\u30be\u30a1\u9ed1\u305c\u30be\u30dc\u3093\uff9d\u30c1\u5f0c\uf f5a\u30bf\u30dc\u3073\u042f\u30bc\u30b0\u305e\u305b\u307c\u73f1\u30dd\u88f9","CarsVIN":-4784,"Bonus":2147483647,"IsFullyVested":true},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-7)","odata.editLink":"Person(-7)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","[email protected]":"Person(-7)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata","[email protected]":"Person(-7)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Manager","[email protected]":"Person(-7)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Car","#DefaultContainer.Sack":{"title":"Sack","target":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-7)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack"} ,"PersonId":-7,"Name":"\u3073\u305e\u042f\u30bd\u307a\u307d\u30a1\u3041\u30c0\u3092\u30bd\u30dc\u0451\u66a6\u5f0c\u88f9\u30be\u3042\u30c0\u30de\u88f9\u305e\u30dc\u6b79\u307e\u307b\u307c\u4e9c\u307d\u305b\u9ed1\u3092\u30df\u30bf\u30bc\u30bd\u307a\u305e\uff88\u044f\u30d0\uff41\u3041\u0451\u3074\u307d","ManagersPersonId":-56,"Salary":2016141289,"Title":"uuzantjguxlhfqgilizenqahpiqcqznzgyeyzaaonqagfcfxkuu","CarsVIN":2147483647,"Bonus":-9620,"IsFullyVested":false}]} \ No newline at end of file +{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Person","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-10)","odata.editLink":"Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","[email protected]":"Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata","[email protected]":"Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Manager","[email protected]":"Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Car","#DefaultContainer.Sack":{"title":"Sack","target":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack"},"Pers onId":-10,"Name":"\u307a\u30bd\u305e\u5f0c\u30bf\u30a1\u531a\u30bf\u307d\u3072\u30cf\u6b32\u3074\u307b\u531a\u305b\u307e\u305f\u30d0\u30dc\u30c1\u30de\u531a\u3041\u30be\u30bd\u30c1\u3041\u042f\u305d\u3041\u30df\u044f\u66a6\u755a\u30dc\u6b79\u3072\u042f\u307b\u30c0\u30c1\u305d\u042f\u305b\u307d\u30bc\u30dd\u042f\u30c1\uff41\u305f\u6b79\u305f\u3092\u30bf\u30de\u305b\u3092\u305b\u531a\u30df\u30bf\u3072\u305c\u755a\u66a6\u30b0\u30af\u3072\u307b\u305d\u305f\u30b0\u305b\u044f\u30c1\u531a\uff66\u307a\u3041\u88f9\u3041\u30bd\u3073\u9ed1\u88f9\u7e37","ManagersPersonId":47,"Salary":4124,"Title":"\u307a\u30bd\u042f\u3092\u6b79\u30a1\u6b32\u042f\u30bd\u3042\u307d\uff66\uff41\u305d\u305b\u044f\u7e37\u30dd\u305b\uff88\u3074\uff66\u9ed1\u755a\u044f\u307b\u30be\u307b\u3079\uff41\u307b\uff88\u30d0\u755a\u4e5d\u4e9c\u0451\u30cf\u3079\u305c\u30a1\u88f9\u30bd\u6b32\u307b\u30b0\uff9d\u30dd\u5f0c\u9ed1\u30c1\u3073\uff66\uff88\u30df\u307c\u30bf\u305f\u307e\u30d0\u6b79\u30c1\u66a6\u30bf\u6b32\u3092\u30af\u 3041\u30af\u3093\uff9d\u307e\u30bd\uff88\u30dc\u307e\u30bf\u305c\u30dc\u30dd\u307b\u6b79\u30bd\u3092\u30a1\u3042\u044f\u30dc\u305f\u30be\u307b","CarsVIN":-1911530027,"Bonus":-37730565,"IsFullyVested":false},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-9)","odata.editLink":"Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","[email protected]":"Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata","[email protected]":"Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Manager","[email protected]":"Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Car","#DefaultContainer.Sack":{"title":"Sack","target":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-9) /Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack"},"PersonId":-9,"Name":"stiuictvznkcvledkjnnluuvkmyumyfduxmjqpfnbjqgmvhuiytjbjinzbfmf","ManagersPersonId":-8429952,"Salary":-2147483615,"Title":"\u30d0\u30dc\u6b79\u305d\u042f\u30bc\u3041\u30be\u30bd\u3093\u30dc\u305f\u305d\u4e5d\u30dc\u3072\u73f1\u3042\u30de\u66a6\uff9d\u30bd\u30bd\u30a1\u531a\u307c\u307b\u305f\u30dc\u305c\u30af\u531a\u30bd\u755a\u30be\u3093\uff41\u30a1\u3079\u3042\u044f\u305b\u30bf\u7e37\u30de\u30bc\u3079\u307a\u30de\u7e37\u30bc\u305e\u30bc\u305f\uff5a\u305f\u305f\u30bf\u30a1\u4e5d\u3072\u9ed1\u7e37\u30af\uff66\u6b79\u30de\u307b\u307c\u3092\u307a\u30bf\u755a\u30dc\u5f0c\u9ed1\uff5a\u30cf\u30dc\u30af\u0451\u044f\u30bd\u30df\u30de\u307b\u30bc\u307e\uff41\u30a1\u3072\u30bc\uff9d\u30bd\u9ed1","CarsVIN":-2147483648,"Bonus":-2147483648,"IsFullyVested":false},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","odata.id":"http://localhost:${tomcat.servlet.port}/stub/ StaticService/V30/Static.svc/Person(-8)","odata.editLink":"Person(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","[email protected]":"Person(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata","[email protected]":"Person(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Manager","[email protected]":"Person(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Car","#DefaultContainer.Sack":{"title":"Sack","target":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack"},"PersonId":-8,"Name":"vypuyxjjxlzfldvppqxkmzdnnapmugyumusqfrnaotviyfbudutxksfvpabxdxdmnosflbfxevfsouqdutczmaguuxaf","ManagersPersonId":3777,"Salary":334131173,"Title":"\u305b\u755a\u73f1\u6b32\u30d0\u30bc\u30c1\u30df\u30be\u30a1\u9ed1\u305c\u30be\u30dc\u3093\uff9d\u30c1\u 5f0c\uff5a\u30bf\u30dc\u3073\u042f\u30bc\u30b0\u305e\u305b\u307c\u73f1\u30dd\u88f9","CarsVIN":-4784,"Bonus":2147483647,"IsFullyVested":true},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-7)","odata.editLink":"Person(-7)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee","[email protected]":"Person(-7)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata","[email protected]":"Person(-7)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Manager","[email protected]":"Person(-7)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Car","#DefaultContainer.Sack":{"title":"Sack","target":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-7)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmploy ee/Sack"},"PersonId":-7,"Name":"\u3073\u305e\u042f\u30bd\u307a\u307d\u30a1\u3041\u30c0\u3092\u30bd\u30dc\u0451\u66a6\u5f0c\u88f9\u30be\u3042\u30c0\u30de\u88f9\u305e\u30dc\u6b79\u307e\u307b\u307c\u4e9c\u307d\u305b\u9ed1\u3092\u30df\u30bf\u30bc\u30bd\u307a\u305e\uff88\u044f\u30d0\uff41\u3041\u0451\u3074\u307d","ManagersPersonId":-56,"Salary":2016141289,"Title":"uuzantjguxlhfqgilizenqahpiqcqznzgyeyzaaonqagfcfxkuu","CarsVIN":2147483647,"Bonus":-9620,"IsFullyVested":false}]} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Person/filter/isof('Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee').xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Person/filter/isof('Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee').xml b/fit/src/main/resources/V30/Person/filter/isof('Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee').xml index afcfdea..5ab6cc8 100644 --- a/fit/src/main/resources/V30/Person/filter/isof('Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee').xml +++ b/fit/src/main/resources/V30/Person/filter/isof('Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee').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/Person</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/Person</id> <title type="text">Person</title> <updated>2014-02-13T12:09:32Z</updated> <link rel="self" title="Person" href="Person" /> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-10)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-10)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Person" href="Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/PersonMetadata"; type="application/atom+xml;type=feed" title="PersonMetadata" href="Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata" /> @@ -36,7 +36,7 @@ <author> <name /> </author> - <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack"; title="Sack" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" /> + <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack"; title="Sack" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-10)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" /> <content type="application/xml"> <m:properties> <d:PersonId m:type="Edm.Int32">-10</d:PersonId> @@ -51,7 +51,7 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-9)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-9)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Person" href="Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/PersonMetadata"; type="application/atom+xml;type=feed" title="PersonMetadata" href="Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata" /> @@ -62,7 +62,7 @@ <author> <name /> </author> - <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack"; title="Sack" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" /> + <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack"; title="Sack" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" /> <content type="application/xml"> <m:properties> <d:PersonId m:type="Edm.Int32">-9</d:PersonId> @@ -77,7 +77,7 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-8)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-8)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Person" href="Person(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/PersonMetadata"; type="application/atom+xml;type=feed" title="PersonMetadata" href="Person(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata" /> @@ -88,7 +88,7 @@ <author> <name /> </author> - <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack"; title="Sack" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" /> + <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack"; title="Sack" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" /> <content type="application/xml"> <m:properties> <d:PersonId m:type="Edm.Int32">-8</d:PersonId> @@ -103,7 +103,7 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-7)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-7)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Person" href="Person(-7)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/PersonMetadata"; type="application/atom+xml;type=feed" title="PersonMetadata" href="Person(-7)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/PersonMetadata" /> @@ -114,7 +114,7 @@ <author> <name /> </author> - <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack"; title="Sack" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Person(-7)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" /> + <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.Sack"; title="Sack" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Person(-7)/Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee/Sack" /> <content type="application/xml"> <m:properties> <d:PersonId m:type="Edm.Int32">-7</d:PersonId> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/-10/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Product/-10/entity.full.json b/fit/src/main/resources/V30/Product/-10/entity.full.json index 529e20e..17d5b9c 100644 --- a/fit/src/main/resources/V30/Product/-10/entity.full.json +++ b/fit/src/main/resources/V30/Product/-10/entity.full.json @@ -1,7 +1,7 @@ { - "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product/@Element";, + "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product/@Element";, "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Product", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-10)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-10)", "odata.etag": "W/\"'assrfsssfdtrmdajadchvrqehsszybuiyiu%C3%9Flhmazsuemptziruotkqcy%C3%9F%C3%9Fp'\"", "odata.editLink": "Product(-10)", "[email protected]": "Product(-10)/RelatedProducts", @@ -11,7 +11,7 @@ "#DefaultContainer.ChangeProductDimensions": { "title": "ChangeProductDimensions", - "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-10)/ChangeProductDimensions" + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-10)/ChangeProductDimensions" }, "[email protected]": "Product(-10)/Picture", "ProductId": -10, http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/-10/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Product/-10/entity.xml b/fit/src/main/resources/V30/Product/-10/entity.xml index 8e3d5b8..c754ed4 100644 --- a/fit/src/main/resources/V30/Product/-10/entity.xml +++ b/fit/src/main/resources/V30/Product/-10/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"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml"; m:etag="W/"'assrfsssfdtrmdajadchvrqehsszybuiyiu%C3%9Flhmazsuemptziruotkqcy%C3%9F%C3%9Fp'""> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-10)</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"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml"; m:etag="W/"'assrfsssfdtrmdajadchvrqehsszybuiyiu%C3%9Flhmazsuemptziruotkqcy%C3%9F%C3%9Fp'""> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-10)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Product" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Product" href="Product(-10)" /> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/RelatedProducts"; type="application/atom+xml;type=feed" title="RelatedProducts" href="Product(-10)/RelatedProducts" /> @@ -33,7 +33,7 @@ <name /> </author> <link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Picture"; title="Picture" href="Product(-10)/Picture" /> - <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions"; title="ChangeProductDimensions" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-10)/ChangeProductDimensions" /> + <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions"; title="ChangeProductDimensions" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-10)/ChangeProductDimensions" /> <content type="application/xml"> <m:properties> <d:ProductId m:type="Edm.Int32">-10</d:ProductId> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/-6/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Product/-6/entity.full.json b/fit/src/main/resources/V30/Product/-6/entity.full.json index d53cb60..574be4b 100644 --- a/fit/src/main/resources/V30/Product/-6/entity.full.json +++ b/fit/src/main/resources/V30/Product/-6/entity.full.json @@ -1,7 +1,7 @@ { - "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product/@Element";, + "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product/@Element";, "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Product", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-6)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-6)", "odata.etag": "W/\"'uacssmuxummhtezdsno%C3%9Fssrlbs%C3%9Floxjsslnnayinxiksspjsssvumgduaapcfvnssee%C3%9Fgpaxuaabosem%C3%9Fiemtufplo'\"", "odata.editLink": "Product(-6)", "[email protected]": "Product(-6)/RelatedProducts", @@ -11,7 +11,7 @@ "#DefaultContainer.ChangeProductDimensions": { "title": "ChangeProductDimensions", - "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-6)/ChangeProductDimensions" + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-6)/ChangeProductDimensions" }, "[email protected]": "Product(-6)/Picture", "ProductId": -6,
