Repository: olingo-odata4 Updated Branches: refs/heads/master 45a46f86e -> 36e6ed401
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Products/5/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Products/5/entity.full.json b/fit/src/main/resources/V40/Products/5/entity.full.json index abbec57..df0869f 100644 --- a/fit/src/main/resources/V40/Products/5/entity.full.json +++ b/fit/src/main/resources/V40/Products/5/entity.full.json @@ -1,8 +1,8 @@ { - "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Products/$entity";, + "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Products/$entity";, "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Product", - "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)", - "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)", + "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)", + "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)", "ProductID": 5, "Name": "Cheetos", "QuantityPerUnit": "100g Bag", @@ -16,14 +16,14 @@ "SkinColor": "Red", "[email protected]": "#Collection(Microsoft.Test.OData.Services.ODataWCFService.Color)", "CoverColors": ["Green", "Blue", "Blue"], - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Details/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Details", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Details/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Details", "#Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight": { "title": "Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight", - "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight" + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight" }, "#Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails": { "title": "Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails", - "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails" + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails" } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Products/5/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Products/5/entity.xml b/fit/src/main/resources/V40/Products/5/entity.xml index 42e0b4d..ce50372 100644 --- a/fit/src/main/resources/V40/Products/5/entity.xml +++ b/fit/src/main/resources/V40/Products/5/entity.xml @@ -19,22 +19,22 @@ under the License. --> -<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://docs.oasis-open.org/odata/ns/data"; xmlns:m="http://docs.oasis-open.org/odata/ns/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml"; m:context="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Products/$entity";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)</id> +<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#Products/$entity";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)</id> <category term="#Microsoft.Test.OData.Services.ODataWCFService.Product" scheme="http://docs.oasis-open.org/odata/ns/scheme"; /> - <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/Details"; type="application/atom+xml;type=feed" title="Details" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Details" /> + <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/Details"; type="application/atom+xml;type=feed" title="Details" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Details" /> <title /> <updated>2014-04-23T11:54:53Z</updated> <author> <name /> </author> - <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight"; + <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight"; title="Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight" - target="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight"/> - <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails"; + target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight"/> + <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails"; title="Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails" - target="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails"/> + target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails"/> <content type="application/xml"> <m:properties> <d:ProductID m:type="Int32">5</d:ProductID> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Products/6/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Products/6/entity.full.json b/fit/src/main/resources/V40/Products/6/entity.full.json index 466540d..1cd2d15 100644 --- a/fit/src/main/resources/V40/Products/6/entity.full.json +++ b/fit/src/main/resources/V40/Products/6/entity.full.json @@ -1,8 +1,8 @@ { - "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Products/$entity";, + "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Products/$entity";, "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Product", - "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)", - "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)", + "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)", + "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)", "ProductID": 6, "Name": "Mushrooms", "QuantityPerUnit": "Pound", @@ -16,14 +16,14 @@ "SkinColor": "Blue", "[email protected]": "#Collection(Microsoft.Test.OData.Services.ODataWCFService.Color)", "CoverColors": ["Red", "Blue"], - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)/Details/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)/Details", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)/Details/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)/Details", "#Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight": { "title": "Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight", - "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)/Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight" + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)/Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight" }, "#Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails": { "title": "Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails", - "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)/Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails" + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)/Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails" } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Products/6/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Products/6/entity.xml b/fit/src/main/resources/V40/Products/6/entity.xml index 887c0ec..3de8ac2 100644 --- a/fit/src/main/resources/V40/Products/6/entity.xml +++ b/fit/src/main/resources/V40/Products/6/entity.xml @@ -19,11 +19,11 @@ under the License. --> -<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://docs.oasis-open.org/odata/ns/data"; xmlns:m="http://docs.oasis-open.org/odata/ns/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml"; m:context="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Products/$entity";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)</id> +<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#Products/$entity";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)</id> <category term="#Microsoft.Test.OData.Services.ODataWCFService.Product" scheme="http://docs.oasis-open.org/odata/ns/scheme"; /> - <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/Details"; type="application/atom+xml;type=feed" title="Details" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)/Details" /> + <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/Details"; type="application/atom+xml;type=feed" title="Details" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)/Details" /> <title /> <updated>2014-04-23T11:58:19Z</updated> <author> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Products/feed.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Products/feed.full.json b/fit/src/main/resources/V40/Products/feed.full.json index c3f07cb..186d98e 100644 --- a/fit/src/main/resources/V40/Products/feed.full.json +++ b/fit/src/main/resources/V40/Products/feed.full.json @@ -1,9 +1,9 @@ { - "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Products";, + "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Products";, "value": [{ "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Product", - "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)", - "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)", + "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)", + "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)", "ProductID": 5, "Name": "Cheetos", "QuantityPerUnit": "100g Bag", @@ -17,20 +17,20 @@ "SkinColor": "Red", "[email protected]": "#Collection(Microsoft.Test.OData.Services.ODataWCFService.Color)", "CoverColors": ["Green", "Blue", "Blue"], - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Details/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Details", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Details/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Details", "#Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight": { "title": "Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight", - "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight" + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight" }, "#Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails": { "title": "Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails", - "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails" + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails" } }, { "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Product", - "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)", - "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)", + "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)", + "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)", "ProductID": 6, "Name": "Mushrooms", "QuantityPerUnit": "Pound", @@ -44,20 +44,20 @@ "SkinColor": "Blue", "[email protected]": "#Collection(Microsoft.Test.OData.Services.ODataWCFService.Color)", "CoverColors": ["Red", "Blue"], - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)/Details/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)/Details", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)/Details/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)/Details", "#Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight": { "title": "Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight", - "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)/Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight" + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)/Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight" }, "#Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails": { "title": "Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails", - "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)/Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails" + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)/Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails" } }, { "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Product", - "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(7)", - "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(7)", + "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(7)", + "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(7)", "ProductID": 7, "Name": "Apple", "QuantityPerUnit": "Pound", @@ -71,20 +71,20 @@ "SkinColor": "Red", "[email protected]": "#Collection(Microsoft.Test.OData.Services.ODataWCFService.Color)", "CoverColors": ["Blue"], - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(7)/Details/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(7)/Details", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(7)/Details/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(7)/Details", "#Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight": { "title": "Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight", - "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(7)/Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight" + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(7)/Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight" }, "#Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails": { "title": "Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails", - "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(7)/Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails" + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(7)/Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails" } }, { "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Product", - "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(8)", - "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(8)", + "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(8)", + "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(8)", "ProductID": 8, "Name": "Car", "QuantityPerUnit": "Pound", @@ -98,20 +98,20 @@ "SkinColor": "Red", "[email protected]": "#Collection(Microsoft.Test.OData.Services.ODataWCFService.Color)", "CoverColors": ["Red", "Red", "Blue"], - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(8)/Details/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(8)/Details", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(8)/Details/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(8)/Details", "#Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight": { "title": "Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight", - "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(8)/Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight" + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(8)/Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight" }, "#Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails": { "title": "Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails", - "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(8)/Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails" + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(8)/Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails" } }, { "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Product", - "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(9)", - "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(9)", + "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(9)", + "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(9)", "ProductID": 9, "Name": "Computer", "QuantityPerUnit": "Pound", @@ -125,15 +125,15 @@ "SkinColor": "Green", "[email protected]": "#Collection(Microsoft.Test.OData.Services.ODataWCFService.Color)", "CoverColors": ["Green"], - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(9)/Details/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(9)/Details", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(9)/Details/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(9)/Details", "#Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight": { "title": "Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight", - "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(9)/Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight" + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(9)/Microsoft.Test.OData.Services.ODataWCFService.AddAccessRight" }, "#Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails": { "title": "Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails", - "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(9)/Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails" + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(9)/Microsoft.Test.OData.Services.ODataWCFService.GetProductDetails" } }] } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Products/feed.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Products/feed.xml b/fit/src/main/resources/V40/Products/feed.xml index c2cac75..345f868 100644 --- a/fit/src/main/resources/V40/Products/feed.xml +++ b/fit/src/main/resources/V40/Products/feed.xml @@ -19,21 +19,21 @@ under the License. --> -<feed xml:base="http://localhost:${cargo.servlet.port}/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#Products";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products</id> + m:context="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Products";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products</id> <title /> <updated>2014-04-23T08:04:46Z</updated> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)</id> <category term="#Microsoft.Test.OData.Services.ODataWCFService.Product" scheme="http://docs.oasis-open.org/odata/ns/scheme"; /> - <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/Details"; type="application/atom+xml;type=feed" title="Details" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Details" /> + <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/Details"; type="application/atom+xml;type=feed" title="Details" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(5)/Details" /> <title /> <updated>2014-04-23T08:04:46Z</updated> <author> @@ -58,10 +58,10 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)</id> <category term="#Microsoft.Test.OData.Services.ODataWCFService.Product" scheme="http://docs.oasis-open.org/odata/ns/scheme"; /> - <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/Details"; type="application/atom+xml;type=feed" title="Details" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)/Details" /> + <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/Details"; type="application/atom+xml;type=feed" title="Details" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(6)/Details" /> <title /> <updated>2014-04-23T08:04:46Z</updated> <author> @@ -85,10 +85,10 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(7)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(7)</id> <category term="#Microsoft.Test.OData.Services.ODataWCFService.Product" scheme="http://docs.oasis-open.org/odata/ns/scheme"; /> - <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(7)" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/Details"; type="application/atom+xml;type=feed" title="Details" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(7)/Details" /> + <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(7)" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/Details"; type="application/atom+xml;type=feed" title="Details" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(7)/Details" /> <title /> <updated>2014-04-23T08:04:46Z</updated> <author> @@ -111,10 +111,10 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(8)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(8)</id> <category term="#Microsoft.Test.OData.Services.ODataWCFService.Product" scheme="http://docs.oasis-open.org/odata/ns/scheme"; /> - <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(8)" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/Details"; type="application/atom+xml;type=feed" title="Details" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(8)/Details" /> + <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(8)" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/Details"; type="application/atom+xml;type=feed" title="Details" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(8)/Details" /> <title /> <updated>2014-04-23T08:04:46Z</updated> <author> @@ -139,10 +139,10 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(9)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(9)</id> <category term="#Microsoft.Test.OData.Services.ODataWCFService.Product" scheme="http://docs.oasis-open.org/odata/ns/scheme"; /> - <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(9)" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/Details"; type="application/atom+xml;type=feed" title="Details" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Products(9)/Details" /> + <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(9)" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/Details"; type="application/atom+xml;type=feed" title="Details" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Products(9)/Details" /> <title /> <updated>2014-04-23T08:04:46Z</updated> <author> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.full.json b/fit/src/main/resources/V40/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.full.json index 71acfc7..9b621b9 100644 --- a/fit/src/main/resources/V40/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.full.json +++ b/fit/src/main/resources/V40/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.full.json @@ -1,7 +1,7 @@ { - "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/OpenType.svc/$metadata#Row/@Element";, + "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/OpenType.svc/$metadata#Row/@Element";, "odata.type": "Microsoft.Test.OData.Services.OpenTypesService.Row", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/OpenType.svc/Row(guid'672b8250-1e6e-4785-80cf-b94b572e42b3')", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/OpenType.svc/Row(guid'672b8250-1e6e-4785-80cf-b94b572e42b3')", "odata.editLink": "Row(guid'672b8250-1e6e-4785-80cf-b94b572e42b3')", "[email protected]": "Edm.Guid", "Id": "672b8250-1e6e-4785-80cf-b94b572e42b3", http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.xml b/fit/src/main/resources/V40/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.xml index 1e610be..5435e5c 100644 --- a/fit/src/main/resources/V40/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.xml +++ b/fit/src/main/resources/V40/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.xml @@ -19,14 +19,14 @@ under the License. --> -<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/OpenType.svc/"; +<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/OpenType.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://docs.oasis-open.org/odata/ns/data"; xmlns:m="http://docs.oasis-open.org/odata/ns/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml"; - m:context="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/OpenType.svc/$metadata#Row";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/OpenType.svc/Row(672b8250-1e6e-4785-80cf-b94b572e42b3)</id> + m:context="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/OpenType.svc/$metadata#Row";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/OpenType.svc/Row(672b8250-1e6e-4785-80cf-b94b572e42b3)</id> <category term="Microsoft.Test.OData.Services.OpenTypesService.Row" scheme="http://docs.oasis-open.org/odata/ns/scheme"/> <link rel="edit" title="Row" href="Row(672b8250-1e6e-4785-80cf-b94b572e42b3)"/> <title/> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Row/71f7d0dc-ede4-45eb-b421-555a2aa1e58f/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Row/71f7d0dc-ede4-45eb-b421-555a2aa1e58f/entity.full.json b/fit/src/main/resources/V40/Row/71f7d0dc-ede4-45eb-b421-555a2aa1e58f/entity.full.json index 9d8e83e..dae910d 100644 --- a/fit/src/main/resources/V40/Row/71f7d0dc-ede4-45eb-b421-555a2aa1e58f/entity.full.json +++ b/fit/src/main/resources/V40/Row/71f7d0dc-ede4-45eb-b421-555a2aa1e58f/entity.full.json @@ -1,7 +1,7 @@ { - "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/OpenType.svc/$metadata#Row/@Element";, + "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/OpenType.svc/$metadata#Row/@Element";, "odata.type": "Microsoft.Test.OData.Services.OpenTypesService.Row", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/OpenType.svc/Row(guid'71f7d0dc-ede4-45eb-b421-555a2aa1e58f')", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/OpenType.svc/Row(guid'71f7d0dc-ede4-45eb-b421-555a2aa1e58f')", "odata.editLink": "Row(guid'71f7d0dc-ede4-45eb-b421-555a2aa1e58f')", "[email protected]": "Edm.Guid", "Id": "71f7d0dc-ede4-45eb-b421-555a2aa1e58f", http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Row/71f7d0dc-ede4-45eb-b421-555a2aa1e58f/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Row/71f7d0dc-ede4-45eb-b421-555a2aa1e58f/entity.xml b/fit/src/main/resources/V40/Row/71f7d0dc-ede4-45eb-b421-555a2aa1e58f/entity.xml index 62e55d4..22f1351 100644 --- a/fit/src/main/resources/V40/Row/71f7d0dc-ede4-45eb-b421-555a2aa1e58f/entity.xml +++ b/fit/src/main/resources/V40/Row/71f7d0dc-ede4-45eb-b421-555a2aa1e58f/entity.xml @@ -19,14 +19,14 @@ under the License. --> -<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/OpenType.svc/"; +<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/OpenType.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://docs.oasis-open.org/odata/ns/data"; xmlns:m="http://docs.oasis-open.org/odata/ns/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml"; - m:context="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/OpenType.svc/$metadata#Row";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/OpenType.svc/Row(71f7d0dc-ede4-45eb-b421-555a2aa1e58f)</id> + m:context="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/OpenType.svc/$metadata#Row";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/OpenType.svc/Row(71f7d0dc-ede4-45eb-b421-555a2aa1e58f)</id> <category term="Microsoft.Test.OData.Services.OpenTypesService.Row" scheme="http://docs.oasis-open.org/odata/ns/scheme"/> <link rel="edit" title="Row" href="Row(71f7d0dc-ede4-45eb-b421-555a2aa1e58f)"/> <title/> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/VipCustomer/1/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/VipCustomer/1/entity.full.json b/fit/src/main/resources/V40/VipCustomer/1/entity.full.json index ee9e31a..9d97924 100644 --- a/fit/src/main/resources/V40/VipCustomer/1/entity.full.json +++ b/fit/src/main/resources/V40/VipCustomer/1/entity.full.json @@ -1,7 +1,7 @@ { - "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#VipCustomers/$entity";, + "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#VipCustomers/$entity";, "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Customer", - "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/VipCustomers(PersonID=1)", - "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/VipCustomers(PersonID=1)", + "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/VipCustomers(PersonID=1)", + "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/VipCustomers(PersonID=1)", "PersonID": 1 } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/VipCustomer/1/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/VipCustomer/1/entity.xml b/fit/src/main/resources/V40/VipCustomer/1/entity.xml index 21bbe93..91f6b48 100644 --- a/fit/src/main/resources/V40/VipCustomer/1/entity.xml +++ b/fit/src/main/resources/V40/VipCustomer/1/entity.xml @@ -19,18 +19,18 @@ 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#VipCustomers/$entity";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/VipCustomers(PersonID=1)</id> + m:context="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#VipCustomers/$entity";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/VipCustomers(PersonID=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/VipCustomers(PersonID=1)" /> - <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/Customers(PersonID=1)/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/Customers(PersonID=1)/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/Customers(PersonID=1)/Company" /> + <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/VipCustomers(PersonID=1)" /> + <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/Customers(PersonID=1)/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/Customers(PersonID=1)/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/Customers(PersonID=1)/Company" /> <title /> <updated>2014-03-24T17:03:20Z</updated> <author> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/crossjoin.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/crossjoin.full.json b/fit/src/main/resources/V40/crossjoin.full.json index 2ff948f..13a7c43 100644 --- a/fit/src/main/resources/V40/crossjoin.full.json +++ b/fit/src/main/resources/V40/crossjoin.full.json @@ -1,5 +1,5 @@ { - "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Customers";, + "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Customers";, "value": [ { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/delta.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/delta.full.json b/fit/src/main/resources/V40/delta.full.json index 77882bb..54b8ec0 100644 --- a/fit/src/main/resources/V40/delta.full.json +++ b/fit/src/main/resources/V40/delta.full.json @@ -1,5 +1,5 @@ { - "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Customers/$delta";, + "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Customers/$delta";, "@odata.count": 5, "value": [ http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/delta.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/delta.xml b/fit/src/main/resources/V40/delta.xml index bcba295..4b9c02a 100644 --- a/fit/src/main/resources/V40/delta.xml +++ b/fit/src/main/resources/V40/delta.xml @@ -19,18 +19,18 @@ under the License. --> -<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/"; +<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/"; xmlns:data="http://docs.oasis-open.org/odata/ns/data"; xmlns:metadata="http://docs.oasis-open.org/odata/ns/metadata"; xmlns="http://www.w3.org/2005/Atom"; xmlns:at="http://purl.org/atompub/tombstones/1.0"; metadata:context="$metadata#Customers/$delta"> <title type="text">Customers</title> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers</id> <updated>2012-11-27T15:38:25Z</updated> <metadata:count>5</metadata:count> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers('BOTTM')</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers('BOTTM')</id> <title type="text" /> <updated>2012-11-17T15:38:22Z</updated> <author> @@ -47,16 +47,16 @@ </entry> <metadata:deleted-link metadata:context="$metadata#Customers/$deleted-link" - source="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers('ALFKI')" + source="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers('ALFKI')" relationship="Orders" - target="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(10643)"/> + target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(10643)"/> <metadata:link metadata:context="$metadata#Customers/$link" - source="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers('BOTTM')" + source="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers('BOTTM')" relationship="Orders" - target="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(10645)"/> + target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(10645)"/> <entry metadata:context="$metadata#Orders/$entity"> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(10643)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(10643)</id> <title type="text" /> <updated>2012-11-27T15:38:24Z</updated> <author> @@ -78,10 +78,10 @@ </entry> <at:deleted-entry metadata:context="$metadata#Customers/$deleted-entry" - ref="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers('ANTON')" + ref="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers('ANTON')" when="2012-11-27T15:38:25Z" metadata:reason="deleted"/> <link rel="http://docs.oasis-open.org/odata/ns/delta"; - href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers?$expand=Orders&$deltatoken=8015"/> + href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers?$expand=Orders&$deltatoken=8015"/> </feed> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/northwind-metadata.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/northwind-metadata.xml b/fit/src/main/resources/V40/northwind-metadata.xml index 058ab7c..8cc833a 100644 --- a/fit/src/main/resources/V40/northwind-metadata.xml +++ b/fit/src/main/resources/V40/northwind-metadata.xml @@ -20,7 +20,7 @@ --> <edmx:Edmx Version="4.0" xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx";> - <edmx:Reference Uri="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/NorthWindExt.svc/$metadata";> + <edmx:Reference Uri="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/NorthWindExt.svc/$metadata";> <edmx:Include Namespace="NorthwindModel"/> </edmx:Reference> <edmx:DataServices> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/references/Q3VzdG9tZXJzKDEpL09yZGVycw==.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/references/Q3VzdG9tZXJzKDEpL09yZGVycw==.full.json b/fit/src/main/resources/V40/references/Q3VzdG9tZXJzKDEpL09yZGVycw==.full.json index 0ff0ae3..8003487 100644 --- a/fit/src/main/resources/V40/references/Q3VzdG9tZXJzKDEpL09yZGVycw==.full.json +++ b/fit/src/main/resources/V40/references/Q3VzdG9tZXJzKDEpL09yZGVycw==.full.json @@ -1,8 +1,8 @@ { - "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#$ref";, + "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#$ref";, "value": [ - {"@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)"}, - {"@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)"} + {"@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)"}, + {"@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)"} ] } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/references/T3JkZXJzKDgpL0N1c3RvbWVyRm9yT3JkZXI=.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/references/T3JkZXJzKDgpL0N1c3RvbWVyRm9yT3JkZXI=.full.json b/fit/src/main/resources/V40/references/T3JkZXJzKDgpL0N1c3RvbWVyRm9yT3JkZXI=.full.json index 1d08480..a2d4045 100644 --- a/fit/src/main/resources/V40/references/T3JkZXJzKDgpL0N1c3RvbWVyRm9yT3JkZXI=.full.json +++ b/fit/src/main/resources/V40/references/T3JkZXJzKDgpL0N1c3RvbWVyRm9yT3JkZXI=.full.json @@ -1,4 +1,4 @@ { - "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#$ref";, - "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)" + "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#$ref";, + "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)" } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/references/T3JkZXJzKDgpL0N1c3RvbWVyRm9yT3JkZXI=.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/references/T3JkZXJzKDgpL0N1c3RvbWVyRm9yT3JkZXI=.xml b/fit/src/main/resources/V40/references/T3JkZXJzKDgpL0N1c3RvbWVyRm9yT3JkZXI=.xml index 31ab5c8..4638895 100644 --- a/fit/src/main/resources/V40/references/T3JkZXJzKDgpL0N1c3RvbWVyRm9yT3JkZXI=.xml +++ b/fit/src/main/resources/V40/references/T3JkZXJzKDgpL0N1c3RvbWVyRm9yT3JkZXI=.xml @@ -19,4 +19,4 @@ under the License. --> -<m:ref m:context="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#$ref"; id="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)" xmlns:m="http://docs.oasis-open.org/odata/ns/metadata"; /> \ No newline at end of file +<m:ref m:context="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#$ref"; id="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)" xmlns:m="http://docs.oasis-open.org/odata/ns/metadata"; /> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/services.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/services.full.json b/fit/src/main/resources/V40/services.full.json index 81295e7..a3ca94d 100644 --- a/fit/src/main/resources/V40/services.full.json +++ b/fit/src/main/resources/V40/services.full.json @@ -1,5 +1,5 @@ { - "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata";, + "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata";, "value": [ { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/services.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/services.xml b/fit/src/main/resources/V40/services.xml index 90e0a6f..5c46f15 100644 --- a/fit/src/main/resources/V40/services.xml +++ b/fit/src/main/resources/V40/services.xml @@ -19,11 +19,11 @@ under the License. --> -<service xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/"; +<service xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/"; xmlns="http://www.w3.org/2007/app"; xmlns:atom="http://www.w3.org/2005/Atom"; xmlns:m="http://docs.oasis-open.org/odata/ns/metadata"; - m:context="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata";> + m:context="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata";> <workspace> <atom:title type="text">InMemoryEntities</atom:title> <collection href="People"> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/vocabularies-metadata.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/vocabularies-metadata.xml b/fit/src/main/resources/V40/vocabularies-metadata.xml index f076b22..5b4537d 100644 --- a/fit/src/main/resources/V40/vocabularies-metadata.xml +++ b/fit/src/main/resources/V40/vocabularies-metadata.xml @@ -20,13 +20,13 @@ --> <edmx:Edmx Version="4.0" xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx";> - <edmx:Reference Uri="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Vocabularies.svc/Org.OData.Core.V1.xml";> + <edmx:Reference Uri="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Vocabularies.svc/Org.OData.Core.V1.xml";> <edmx:Include Alias="Core" Namespace="Org.OData.Core.V1"/> </edmx:Reference> - <edmx:Reference Uri="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Vocabularies.svc/Org.OData.Measures.V1.xml";> + <edmx:Reference Uri="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Vocabularies.svc/Org.OData.Measures.V1.xml";> <edmx:Include Alias="UoM" Namespace="Org.OData.Measures.V1"/> </edmx:Reference> - <edmx:Reference Uri="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Vocabularies.svc/Org.OData.Capabilities.V1.xml";> + <edmx:Reference Uri="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Vocabularies.svc/Org.OData.Capabilities.V1.xml";> <edmx:Include Alias="Capabilities" Namespace="Org.OData.Capabilities.V1"/> </edmx:Reference> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/esigate.properties ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/esigate.properties b/fit/src/main/resources/esigate.properties index 0db861a..03134a6 100644 --- a/fit/src/main/resources/esigate.properties +++ b/fit/src/main/resources/esigate.properties @@ -17,8 +17,8 @@ # under the License. # -webapp.remoteUrlBase=http://localhost:${cargo.servlet.port}/stub/StaticService/ -visibleUrlBase=http://localhost:${cargo.servlet.port}/stub/DefaultService.svc/ +webapp.remoteUrlBase=http://localhost:${tomcat.servlet.port}/stub/StaticService/ +visibleUrlBase=http://localhost:${tomcat.servlet.port}/stub/DefaultService.svc/ useCache=true extensions=org.apache.olingo.fit.rproxy.LinkRewrite parsableContentTypes=application/xml,application/atom+xml,application/json http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 6c87d67..222dca5 100644 --- a/pom.xml +++ b/pom.xml @@ -91,14 +91,8 @@ <sl4j.version>1.7.7</sl4j.version> - <log.directory>${project.build.directory}/log</log.directory> - - <cargo.servlet.port>9080</cargo.servlet.port> - <cargo.tomcat.ajp.port>9889</cargo.tomcat.ajp.port> - <cargo.rmi.port>9805</cargo.rmi.port> - <cargo.log>${log.directory}/cargo.log</cargo.log> - <cargo.output>${log.directory}/cargo-output.log</cargo.output> - <tomcat.version>7.0.54</tomcat.version> + <tomcat.servlet.port>9080</tomcat.servlet.port> + <tomcat.version>7.0.55</tomcat.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties>
