http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/People/Microsoft.Test.OData.Services.ODataWCFService.Customer/feed.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/People/Microsoft.Test.OData.Services.ODataWCFService.Customer/feed.full.json b/fit/src/main/resources/V40/People/Microsoft.Test.OData.Services.ODataWCFService.Customer/feed.full.json index 6bd8c02..7aa9a7c 100644 --- a/fit/src/main/resources/V40/People/Microsoft.Test.OData.Services.ODataWCFService.Customer/feed.full.json +++ b/fit/src/main/resources/V40/People/Microsoft.Test.OData.Services.ODataWCFService.Customer/feed.full.json @@ -1,9 +1,9 @@ { - "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People";, + "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People";, "value": [{ "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Customer", - "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)", - "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer", + "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)", + "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer", "PersonID": 1, "FirstName": "Bob", "LastName": "Cat", @@ -35,24 +35,24 @@ "Birthday": "1957-04-03T00:00:00Z", "[email protected]": "#Duration", "TimeBetweenLastTwoOrders": "PT0.0000001S", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company", "#Microsoft.Test.OData.Services.ODataWCFService.ResetAddress": { "title": "Microsoft.Test.OData.Services.ODataWCFService.ResetAddress", - "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress" + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress" }, "#Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress": { "title": "Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress", - "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress" + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress" } }, { "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Customer", - "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)", - "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer", + "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)", + "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer", "PersonID": 2, "FirstName": "Jill", "LastName": "Jones", @@ -78,19 +78,19 @@ "Birthday": "1983-01-15T00:00:00Z", "[email protected]": "#Duration", "TimeBetweenLastTwoOrders": "PT0.0000002S", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company", "#Microsoft.Test.OData.Services.ODataWCFService.ResetAddress": { "title": "Microsoft.Test.OData.Services.ODataWCFService.ResetAddress", - "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress" + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress" }, "#Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress": { "title": "Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress", - "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress" + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress" } }] }
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/People/Microsoft.Test.OData.Services.ODataWCFService.Customer/feed.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/People/Microsoft.Test.OData.Services.ODataWCFService.Customer/feed.xml b/fit/src/main/resources/V40/People/Microsoft.Test.OData.Services.ODataWCFService.Customer/feed.xml index 51e36d5..f67f879 100644 --- a/fit/src/main/resources/V40/People/Microsoft.Test.OData.Services.ODataWCFService.Customer/feed.xml +++ b/fit/src/main/resources/V40/People/Microsoft.Test.OData.Services.ODataWCFService.Customer/feed.xml @@ -19,17 +19,17 @@ under the License. --> -<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://docs.oasis-open.org/odata/ns/data"; xmlns:m="http://docs.oasis-open.org/odata/ns/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml"; m:context="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People</id> +<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://docs.oasis-open.org/odata/ns/data"; xmlns:m="http://docs.oasis-open.org/odata/ns/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml"; m:context="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People</id> <title/> <updated>2014-05-08T16:06:24Z</updated> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)</id> <category term="#Microsoft.Test.OData.Services.ODataWCFService.Customer" scheme="http://docs.oasis-open.org/odata/ns/scheme"/> - <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer"/> - <link rel="http://docs.oasis-open.org/odata/ns/related/Parent"; type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent"/> - <link rel="http://docs.oasis-open.org/odata/ns/related/Orders"; type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders"/> - <link rel="http://docs.oasis-open.org/odata/ns/related/Company"; type="application/atom+xml;type=entry" title="Company" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company"/> + <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer"/> + <link rel="http://docs.oasis-open.org/odata/ns/related/Parent"; type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent"/> + <link rel="http://docs.oasis-open.org/odata/ns/related/Orders"; type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders"/> + <link rel="http://docs.oasis-open.org/odata/ns/related/Company"; type="application/atom+xml;type=entry" title="Company" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company"/> <title/> <updated>2014-05-08T16:06:24Z</updated> <author> @@ -69,12 +69,12 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)</id> <category term="#Microsoft.Test.OData.Services.ODataWCFService.Customer" scheme="http://docs.oasis-open.org/odata/ns/scheme"/> - <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer"/> - <link rel="http://docs.oasis-open.org/odata/ns/related/Parent"; type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent"/> - <link rel="http://docs.oasis-open.org/odata/ns/related/Orders"; type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders"/> - <link rel="http://docs.oasis-open.org/odata/ns/related/Company"; type="application/atom+xml;type=entry" title="Company" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company"/> + <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer"/> + <link rel="http://docs.oasis-open.org/odata/ns/related/Parent"; type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent"/> + <link rel="http://docs.oasis-open.org/odata/ns/related/Orders"; type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders"/> + <link rel="http://docs.oasis-open.org/odata/ns/related/Company"; type="application/atom+xml;type=entry" title="Company" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company"/> <title/> <updated>2014-05-08T16:06:24Z</updated> <author> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/People/feed.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/People/feed.full.json b/fit/src/main/resources/V40/People/feed.full.json index bc40c75..3e0dda8 100644 --- a/fit/src/main/resources/V40/People/feed.full.json +++ b/fit/src/main/resources/V40/People/feed.full.json @@ -1,11 +1,11 @@ { - "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People";, + "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People";, "value": [ { "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Customer", - "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)", - "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer", + "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)", + "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer", "PersonID": 1, "FirstName": "Bob", "LastName": "Cat", @@ -51,27 +51,27 @@ "Birthday": "1957-04-03T00:00:00Z", "[email protected]": "#Duration", "TimeBetweenLastTwoOrders": "PT0.0000001S", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company", "#Microsoft.Test.OData.Services.ODataWCFService.ResetAddress": { "title": "Microsoft.Test.OData.Services.ODataWCFService.ResetAddress", - "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress" + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress" }, "#Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress": { "title": "Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress", - "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress" + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress" } }, { "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Customer", - "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)", - "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer", + "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)", + "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer", "PersonID": 2, "FirstName": "Jill", "LastName": "Jones", @@ -108,27 +108,27 @@ "Birthday": "1983-01-15T00:00:00Z", "[email protected]": "#Duration", "TimeBetweenLastTwoOrders": "PT0.0000002S", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company", "#Microsoft.Test.OData.Services.ODataWCFService.ResetAddress": { "title": "Microsoft.Test.OData.Services.ODataWCFService.ResetAddress", - "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress" + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress" }, "#Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress": { "title": "Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress", - "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress" + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress" } }, { "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Employee", - "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(3)", - "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(3)/Microsoft.Test.OData.Services.ODataWCFService.Employee", + "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(3)", + "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(3)/Microsoft.Test.OData.Services.ODataWCFService.Employee", "PersonID": 3, "FirstName": "Jacob", "LastName": "Zip", @@ -188,25 +188,25 @@ } } }, - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(3)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Parent/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(3)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Parent", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(3)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Company/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(3)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Company", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(3)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Parent/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(3)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Parent", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(3)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Company/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(3)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Company", "#Microsoft.Test.OData.Services.ODataWCFService.ResetAddress": { "title": "Microsoft.Test.OData.Services.ODataWCFService.ResetAddress", - "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(3)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress" + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(3)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress" }, "#Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress": { "title": "Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress", - "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(3)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress" + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(3)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress" } }, { "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Employee", - "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(4)", - "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(4)/Microsoft.Test.OData.Services.ODataWCFService.Employee", + "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(4)", + "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(4)/Microsoft.Test.OData.Services.ODataWCFService.Employee", "PersonID": 4, "FirstName": "Elmo", "LastName": "Rogers", @@ -263,25 +263,25 @@ } } }, - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(4)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Parent/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(4)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Parent", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(4)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Company/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(4)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Company", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(4)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Parent/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(4)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Parent", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(4)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Company/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(4)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Company", "#Microsoft.Test.OData.Services.ODataWCFService.ResetAddress": { "title": "Microsoft.Test.OData.Services.ODataWCFService.ResetAddress", - "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(4)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress" + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(4)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress" }, "#Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress": { "title": "Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress", - "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(4)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress" + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(4)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress" } }, { "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Person", - "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)", - "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)", + "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)", + "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)", "PersonID": 5, "FirstName": "Peter", "LastName": "Bee", @@ -315,17 +315,17 @@ [ "[email protected]" ], - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Parent/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Parent", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Parent/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Parent", "#Microsoft.Test.OData.Services.ODataWCFService.ResetAddress": { "title": "Microsoft.Test.OData.Services.ODataWCFService.ResetAddress", - "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress" + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress" }, "#Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress": { "title": "Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress", - "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress" + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress" } } ], http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/People/feed.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/People/feed.xml b/fit/src/main/resources/V40/People/feed.xml index 397bd2d..ee58f0a 100644 --- a/fit/src/main/resources/V40/People/feed.xml +++ b/fit/src/main/resources/V40/People/feed.xml @@ -19,22 +19,22 @@ under the License. --> -<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/"; +<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://docs.oasis-open.org/odata/ns/data"; xmlns:m="http://docs.oasis-open.org/odata/ns/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml"; - m:context="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People</id> + m:context="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People</id> <title /> <updated>2014-03-20T14:31:00Z</updated> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)</id> <category term="#Microsoft.Test.OData.Services.ODataWCFService.Customer" scheme="http://docs.oasis-open.org/odata/ns/scheme"; /> - <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/Parent"; type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/Orders"; type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/Company"; type="application/atom+xml;type=entry" title="Company" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company" /> + <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/Parent"; type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/Orders"; type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/Company"; type="application/atom+xml;type=entry" title="Company" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company" /> <title /> <updated>2014-03-20T14:31:00Z</updated> <author> @@ -70,12 +70,12 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)</id> <category term="#Microsoft.Test.OData.Services.ODataWCFService.Customer" scheme="http://docs.oasis-open.org/odata/ns/scheme"; /> - <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/Parent"; type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/Orders"; type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/Company"; type="application/atom+xml;type=entry" title="Company" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company" /> + <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/Parent"; type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/Orders"; type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/Company"; type="application/atom+xml;type=entry" title="Company" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company" /> <title /> <updated>2014-03-20T14:31:00Z</updated> <author> @@ -102,11 +102,11 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(3)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(3)</id> <category term="#Microsoft.Test.OData.Services.ODataWCFService.Employee" scheme="http://docs.oasis-open.org/odata/ns/scheme"; /> - <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(3)/Microsoft.Test.OData.Services.ODataWCFService.Employee" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/Parent"; type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(3)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Parent" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/Company"; type="application/atom+xml;type=entry" title="Company" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(3)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Company" /> + <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(3)/Microsoft.Test.OData.Services.ODataWCFService.Employee" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/Parent"; type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(3)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Parent" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/Company"; type="application/atom+xml;type=entry" title="Company" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(3)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Company" /> <title /> <updated>2014-03-20T14:31:00Z</updated> <author> @@ -144,11 +144,11 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(4)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(4)</id> <category term="#Microsoft.Test.OData.Services.ODataWCFService.Employee" scheme="http://docs.oasis-open.org/odata/ns/scheme"; /> - <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(4)/Microsoft.Test.OData.Services.ODataWCFService.Employee" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/Parent"; type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(4)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Parent" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/Company"; type="application/atom+xml;type=entry" title="Company" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(4)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Company" /> + <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(4)/Microsoft.Test.OData.Services.ODataWCFService.Employee" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/Parent"; type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(4)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Parent" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/Company"; type="application/atom+xml;type=entry" title="Company" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(4)/Microsoft.Test.OData.Services.ODataWCFService.Employee/Company" /> <title /> <updated>2014-03-20T14:31:00Z</updated> <author> @@ -185,10 +185,10 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)</id> <category term="#Microsoft.Test.OData.Services.ODataWCFService.Person" scheme="http://docs.oasis-open.org/odata/ns/scheme"; /> - <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/Parent"; type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Parent" /> + <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/Parent"; type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Parent" /> <title /> <updated>2014-03-20T14:31:00Z</updated> <author> @@ -215,5 +215,5 @@ </m:properties> </content> </entry> - <link rel="next" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People?$skiptoken=5"/> + <link rel="next" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People?$skiptoken=5"/> </feed> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/People/filter/(PersonID eq 5).full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/People/filter/(PersonID eq 5).full.json b/fit/src/main/resources/V40/People/filter/(PersonID eq 5).full.json index 485fd66..d01cd41 100644 --- a/fit/src/main/resources/V40/People/filter/(PersonID eq 5).full.json +++ b/fit/src/main/resources/V40/People/filter/(PersonID eq 5).full.json @@ -1,11 +1,11 @@ { - "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People";, + "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People";, "value": [ { "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Customer", - "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)", - "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Microsoft.Test.OData.Services.ODataWCFService.Customer", + "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)", + "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Microsoft.Test.OData.Services.ODataWCFService.Customer", "PersonID": 5, "FirstName": "Bob", "LastName": "Cat", http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/People/filter/(PersonID eq 5).xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/People/filter/(PersonID eq 5).xml b/fit/src/main/resources/V40/People/filter/(PersonID eq 5).xml index 2415280..3666a16 100644 --- a/fit/src/main/resources/V40/People/filter/(PersonID eq 5).xml +++ b/fit/src/main/resources/V40/People/filter/(PersonID eq 5).xml @@ -19,17 +19,17 @@ under the License. --> -<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://docs.oasis-open.org/odata/ns/data"; xmlns:m="http://docs.oasis-open.org/odata/ns/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml"; m:context="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People</id> +<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://docs.oasis-open.org/odata/ns/data"; xmlns:m="http://docs.oasis-open.org/odata/ns/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml"; m:context="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People</id> <title /> <updated>2014-04-24T11:35:03Z</updated> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)</id> <category term="#Microsoft.Test.OData.Services.ODataWCFService.Customer" scheme="http://docs.oasis-open.org/odata/ns/scheme"; /> - <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Microsoft.Test.OData.Services.ODataWCFService.Customer" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/Parent"; type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/Orders"; type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/Company"; type="application/atom+xml;type=entry" title="Company" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company" /> + <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Microsoft.Test.OData.Services.ODataWCFService.Customer" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/Parent"; type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/Orders"; type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/Company"; type="application/atom+xml;type=entry" title="Company" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company" /> <title /> <updated>2014-04-24T11:35:03Z</updated> <author> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/People/filter/(PersonID lt 3).full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/People/filter/(PersonID lt 3).full.json b/fit/src/main/resources/V40/People/filter/(PersonID lt 3).full.json index 5133aa4..f99e62f 100644 --- a/fit/src/main/resources/V40/People/filter/(PersonID lt 3).full.json +++ b/fit/src/main/resources/V40/People/filter/(PersonID lt 3).full.json @@ -1,11 +1,11 @@ { - "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People";, + "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People";, "value": [ { "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Customer", - "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)", - "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer", + "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)", + "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer", "PersonID": 1, "FirstName": "Bob", "LastName": "Cat", @@ -53,8 +53,8 @@ }, { "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Customer", - "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)", - "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer", + "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)", + "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer", "PersonID": 2, "FirstName": "Jill", "LastName": "Jones", http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/People/filter/(PersonID lt 3).xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/People/filter/(PersonID lt 3).xml b/fit/src/main/resources/V40/People/filter/(PersonID lt 3).xml index 90018f2..4ad33a3 100644 --- a/fit/src/main/resources/V40/People/filter/(PersonID lt 3).xml +++ b/fit/src/main/resources/V40/People/filter/(PersonID lt 3).xml @@ -19,17 +19,17 @@ under the License. --> -<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://docs.oasis-open.org/odata/ns/data"; xmlns:m="http://docs.oasis-open.org/odata/ns/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml"; m:context="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People</id> +<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://docs.oasis-open.org/odata/ns/data"; xmlns:m="http://docs.oasis-open.org/odata/ns/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml"; m:context="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People</id> <title /> <updated>2014-04-24T11:33:37Z</updated> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)</id> <category term="#Microsoft.Test.OData.Services.ODataWCFService.Customer" scheme="http://docs.oasis-open.org/odata/ns/scheme"; /> - <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/Parent"; type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/Orders"; type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/Company"; type="application/atom+xml;type=entry" title="Company" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company" /> + <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/Parent"; type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/Orders"; type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/Company"; type="application/atom+xml;type=entry" title="Company" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company" /> <title /> <updated>2014-04-24T11:33:37Z</updated> <author> @@ -69,12 +69,12 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)</id> <category term="#Microsoft.Test.OData.Services.ODataWCFService.Customer" scheme="http://docs.oasis-open.org/odata/ns/scheme"; /> - <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/Parent"; type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/Orders"; type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/Company"; type="application/atom+xml;type=entry" title="Company" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company" /> + <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/Parent"; type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/Orders"; type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/Company"; type="application/atom+xml;type=entry" title="Company" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company" /> <title /> <updated>2014-04-24T11:33:37Z</updated> <author> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/People/orderby/PersonID desc/filter/(PersonID lt 3).full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/People/orderby/PersonID desc/filter/(PersonID lt 3).full.json b/fit/src/main/resources/V40/People/orderby/PersonID desc/filter/(PersonID lt 3).full.json index e062a68..dddd06c 100644 --- a/fit/src/main/resources/V40/People/orderby/PersonID desc/filter/(PersonID lt 3).full.json +++ b/fit/src/main/resources/V40/People/orderby/PersonID desc/filter/(PersonID lt 3).full.json @@ -1,11 +1,11 @@ { - "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People";, + "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People";, "value": [ { "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Customer", - "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)", - "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer", + "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)", + "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer", "PersonID": 2, "FirstName": "Jill", "LastName": "Jones", @@ -40,8 +40,8 @@ }, { "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Customer", - "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)", - "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer", + "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)", + "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer", "PersonID": 1, "FirstName": "Bob", "LastName": "Cat", http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/People/orderby/PersonID desc/filter/(PersonID lt 3).xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/People/orderby/PersonID desc/filter/(PersonID lt 3).xml b/fit/src/main/resources/V40/People/orderby/PersonID desc/filter/(PersonID lt 3).xml index 261fbb0..ed632ef 100644 --- a/fit/src/main/resources/V40/People/orderby/PersonID desc/filter/(PersonID lt 3).xml +++ b/fit/src/main/resources/V40/People/orderby/PersonID desc/filter/(PersonID lt 3).xml @@ -19,17 +19,17 @@ under the License. --> -<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://docs.oasis-open.org/odata/ns/data"; xmlns:m="http://docs.oasis-open.org/odata/ns/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml"; m:context="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People</id> +<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://docs.oasis-open.org/odata/ns/data"; xmlns:m="http://docs.oasis-open.org/odata/ns/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml"; m:context="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People</id> <title /> <updated>2014-04-24T11:35:03Z</updated> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)</id> <category term="#Microsoft.Test.OData.Services.ODataWCFService.Customer" scheme="http://docs.oasis-open.org/odata/ns/scheme"; /> - <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/Parent"; type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/Orders"; type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/Company"; type="application/atom+xml;type=entry" title="Company" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company" /> + <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/Parent"; type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/Orders"; type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/Company"; type="application/atom+xml;type=entry" title="Company" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(2)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company" /> <title /> <updated>2014-04-24T11:35:03Z</updated> <author> @@ -56,12 +56,12 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)</id> <category term="#Microsoft.Test.OData.Services.ODataWCFService.Customer" scheme="http://docs.oasis-open.org/odata/ns/scheme"; /> - <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/Parent"; type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/Orders"; type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/Company"; type="application/atom+xml;type=entry" title="Company" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company" /> + <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/Parent"; type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Parent" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/Orders"; type="application/atom+xml;type=feed" title="Orders" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Orders" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/Company"; type="application/atom+xml;type=entry" title="Company" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(1)/Microsoft.Test.OData.Services.ODataWCFService.Customer/Company" /> <title /> <updated>2014-04-24T11:35:03Z</updated> <author> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/People/skiptoken/5.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/People/skiptoken/5.full.json b/fit/src/main/resources/V40/People/skiptoken/5.full.json index a7d768e..13e6195 100644 --- a/fit/src/main/resources/V40/People/skiptoken/5.full.json +++ b/fit/src/main/resources/V40/People/skiptoken/5.full.json @@ -1,11 +1,11 @@ { - "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People";, + "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People";, "value": [ { "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Person", - "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(6)", - "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(6)", + "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(6)", + "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(6)", "PersonID": 6, "FirstName": "Peter", "LastName": "Bee", @@ -39,17 +39,17 @@ [ "[email protected]" ], - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Parent/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Parent", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Parent/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Parent", "#Microsoft.Test.OData.Services.ODataWCFService.ResetAddress": { "title": "Microsoft.Test.OData.Services.ODataWCFService.ResetAddress", - "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress" + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress" }, "#Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress": { "title": "Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress", - "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress" + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress" } } ] http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/People/skiptoken/5.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/People/skiptoken/5.xml b/fit/src/main/resources/V40/People/skiptoken/5.xml index 909ac69..13e290a 100644 --- a/fit/src/main/resources/V40/People/skiptoken/5.xml +++ b/fit/src/main/resources/V40/People/skiptoken/5.xml @@ -19,20 +19,20 @@ under the License. --> -<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/"; +<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://docs.oasis-open.org/odata/ns/data"; xmlns:m="http://docs.oasis-open.org/odata/ns/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml"; - m:context="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People</id> + m:context="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People</id> <title /> <updated>2014-03-20T14:31:00Z</updated> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(5)</id> <category term="#Microsoft.Test.OData.Services.ODataWCFService.Person" scheme="http://docs.oasis-open.org/odata/ns/scheme"; /> - <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(6)" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/Parent"; type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(6)/Parent" /> + <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(6)" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/Parent"; type="application/atom+xml;type=entry" title="Parent" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/People(6)/Parent" /> <title /> <updated>2014-03-20T14:31:00Z</updated> <author> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/PersonDetails/1/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/PersonDetails/1/entity.full.json b/fit/src/main/resources/V40/PersonDetails/1/entity.full.json index aa3ee30..32f7baa 100644 --- a/fit/src/main/resources/V40/PersonDetails/1/entity.full.json +++ b/fit/src/main/resources/V40/PersonDetails/1/entity.full.json @@ -1,7 +1,7 @@ { - "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#ProductDetail/$entity";, + "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#ProductDetail/$entity";, "@odata.type": "ODataDemo.ProductDetail", - "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ProductDetails(1)", + "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ProductDetails(1)", "@odata.editLink": "ProductDetails(1)", "[email protected]": "ProductDetails(1)/Photo", "PersonID": 12 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/PersonDetails/1/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/PersonDetails/1/entity.xml b/fit/src/main/resources/V40/PersonDetails/1/entity.xml index 3c2d219..58fb597 100644 --- a/fit/src/main/resources/V40/PersonDetails/1/entity.xml +++ b/fit/src/main/resources/V40/PersonDetails/1/entity.xml @@ -19,14 +19,14 @@ under the License. --> -<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/"; +<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://docs.oasis-open.org/odata/ns/data"; xmlns:m="http://docs.oasis-open.org/odata/ns/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml"; - m:context="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#ProductDetail/$entity";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ProductDetails(1)</id> + m:context="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#ProductDetail/$entity";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ProductDetails(1)</id> <category term="#ODataDemo.ProductDetail" scheme="http://docs.oasis-open.org/odata/ns/scheme"; /> <link rel="edit" title="ProductDetails" href="ProductDetails(1)" /> <link rel="http://docs.oasis-open.org/odata/ns/edit-media/Photo"; title="Photo" href="ProductDetails(1)/Photo" /> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/ProductDetails/6 1/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/ProductDetails/6 1/entity.full.json b/fit/src/main/resources/V40/ProductDetails/6 1/entity.full.json index c72d79e..7c34470 100644 --- a/fit/src/main/resources/V40/ProductDetails/6 1/entity.full.json +++ b/fit/src/main/resources/V40/ProductDetails/6 1/entity.full.json @@ -1,19 +1,19 @@ { - "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#ProductDetails/$entity";, + "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#ProductDetails/$entity";, "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.ProductDetail", - "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)", - "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)", + "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)", + "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)", "ProductID": 6, "ProductDetailID": 1, "ProductName": "Candy", "Description": "sweet snack", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)/RelatedProduct/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)/RelatedProduct", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)/Reviews/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)/Reviews", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)/RelatedProduct/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)/RelatedProduct", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)/Reviews/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)/Reviews", "#Microsoft.Test.OData.Services.ODataWCFService.GetRelatedProduct": { "title": "Microsoft.Test.OData.Services.ODataWCFService.GetRelatedProduct", - "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)/Microsoft.Test.OData.Services.ODataWCFService.GetRelatedProduct" + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)/Microsoft.Test.OData.Services.ODataWCFService.GetRelatedProduct" } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/ProductDetails/6 1/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/ProductDetails/6 1/entity.xml b/fit/src/main/resources/V40/ProductDetails/6 1/entity.xml index fe694ec..7466fa0 100644 --- a/fit/src/main/resources/V40/ProductDetails/6 1/entity.xml +++ b/fit/src/main/resources/V40/ProductDetails/6 1/entity.xml @@ -19,20 +19,20 @@ under the License. --> -<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://docs.oasis-open.org/odata/ns/data"; xmlns:m="http://docs.oasis-open.org/odata/ns/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml"; m:context="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#ProductDetails/$entity";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)</id> +<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://docs.oasis-open.org/odata/ns/data"; xmlns:m="http://docs.oasis-open.org/odata/ns/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml"; m:context="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#ProductDetails/$entity";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)</id> <category term="#Microsoft.Test.OData.Services.ODataWCFService.ProductDetail" scheme="http://docs.oasis-open.org/odata/ns/scheme"; /> - <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/RelatedProduct"; type="application/atom+xml;type=entry" title="RelatedProduct" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)/RelatedProduct" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/Reviews"; type="application/atom+xml;type=feed" title="Reviews" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)/Reviews" /> + <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/RelatedProduct"; type="application/atom+xml;type=entry" title="RelatedProduct" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)/RelatedProduct" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/Reviews"; type="application/atom+xml;type=feed" title="Reviews" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)/Reviews" /> <title /> <updated>2014-03-24T17:23:51Z</updated> <author> <name /> </author> - <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.GetRelatedProduct"; + <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.GetRelatedProduct"; title="Microsoft.Test.OData.Services.ODataWCFService.GetRelatedProduct" - target="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)/Microsoft.Test.OData.Services.ODataWCFService.GetRelatedProduct"/> + target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/ProductDetails(ProductID=6,ProductDetailID=1)/Microsoft.Test.OData.Services.ODataWCFService.GetRelatedProduct"/> <content type="application/xml"> <m:properties> <d:ProductID m:type="Int32">6</d:ProductID>
