http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Company/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Company/entity.full.json b/fit/src/main/resources/V40/Company/entity.full.json index a8c5307..f1d5e5d 100644 --- a/fit/src/main/resources/V40/Company/entity.full.json +++ b/fit/src/main/resources/V40/Company/entity.full.json @@ -1,8 +1,8 @@ { - "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Company";, + "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Company";, "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Company", - "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company";, - "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company";, + "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company";, + "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company";, "CompanyID": 0, "[email protected]": "#Microsoft.Test.OData.Services.ODataWCFService.CompanyCategory", "CompanyCategory": "IT", @@ -17,22 +17,22 @@ "PostalCode": "98052", "CompanyName": "Microsoft" }, - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company/Employees/$ref";, - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company/Employees";, - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company/VipCustomer/$ref";, - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company/VipCustomer";, - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company/Departments/$ref";, - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company/Departments";, - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company/CoreDepartment/$ref";, - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company/CoreDepartment";, + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company/Employees/$ref";, + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company/Employees";, + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company/VipCustomer/$ref";, + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company/VipCustomer";, + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company/Departments/$ref";, + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company/Departments";, + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company/CoreDepartment/$ref";, + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company/CoreDepartment";, "#Microsoft.Test.OData.Services.ODataWCFService.IncreaseRevenue": { "title": "Microsoft.Test.OData.Services.ODataWCFService.IncreaseRevenue", - "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company/Microsoft.Test.OData.Services.ODataWCFService.IncreaseRevenue"; + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company/Microsoft.Test.OData.Services.ODataWCFService.IncreaseRevenue"; }, "#Microsoft.Test.OData.Services.ODataWCFService.GetEmployeesCount": { "title": "Microsoft.Test.OData.Services.ODataWCFService.GetEmployeesCount", - "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company/Microsoft.Test.OData.Services.ODataWCFService.GetEmployeesCount"; + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company/Microsoft.Test.OData.Services.ODataWCFService.GetEmployeesCount"; } } \ No newline at end of file
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Company/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Company/entity.xml b/fit/src/main/resources/V40/Company/entity.xml index 8c6e920..1665e75 100644 --- a/fit/src/main/resources/V40/Company/entity.xml +++ b/fit/src/main/resources/V40/Company/entity.xml @@ -19,25 +19,25 @@ 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#Company";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company</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#Company";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company</id> <category term="#Microsoft.Test.OData.Services.ODataWCFService.Company" scheme="http://docs.oasis-open.org/odata/ns/scheme"; /> - <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company"; /> - <link rel="http://docs.oasis-open.org/odata/ns/related/Employees"; type="application/atom+xml;type=feed" title="Employees" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company/Employees"; /> - <link rel="http://docs.oasis-open.org/odata/ns/related/VipCustomer"; type="application/atom+xml;type=entry" title="VipCustomer" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company/VipCustomer"; /> - <link rel="http://docs.oasis-open.org/odata/ns/related/Departments"; type="application/atom+xml;type=feed" title="Departments" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company/Departments"; /> - <link rel="http://docs.oasis-open.org/odata/ns/related/CoreDepartment"; type="application/atom+xml;type=entry" title="CoreDepartment" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company/CoreDepartment"; /> + <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company"; /> + <link rel="http://docs.oasis-open.org/odata/ns/related/Employees"; type="application/atom+xml;type=feed" title="Employees" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company/Employees"; /> + <link rel="http://docs.oasis-open.org/odata/ns/related/VipCustomer"; type="application/atom+xml;type=entry" title="VipCustomer" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company/VipCustomer"; /> + <link rel="http://docs.oasis-open.org/odata/ns/related/Departments"; type="application/atom+xml;type=feed" title="Departments" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company/Departments"; /> + <link rel="http://docs.oasis-open.org/odata/ns/related/CoreDepartment"; type="application/atom+xml;type=entry" title="CoreDepartment" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company/CoreDepartment"; /> <title /> <updated>2014-03-24T17:09:31Z</updated> <author> <name /> </author> - <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.IncreaseRevenue"; + <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.IncreaseRevenue"; title="Microsoft.Test.OData.Services.ODataWCFService.IncreaseRevenue" - target="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company/Microsoft.Test.OData.Services.ODataWCFService.IncreaseRevenue"/> - <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.GetEmployeesCount"; + target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company/Microsoft.Test.OData.Services.ODataWCFService.IncreaseRevenue"/> + <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.GetEmployeesCount"; title="Microsoft.Test.OData.Services.ODataWCFService.GetEmployeesCount" - target="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company/Microsoft.Test.OData.Services.ODataWCFService.GetEmployeesCount"/> + target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company/Microsoft.Test.OData.Services.ODataWCFService.GetEmployeesCount"/> <content type="application/xml"> <m:properties> <d:CompanyID m:type="Int32">0</d:CompanyID> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Customers/1/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Customers/1/entity.full.json b/fit/src/main/resources/V40/Customers/1/entity.full.json index 1bb3e5e..dd9f243 100644 --- a/fit/src/main/resources/V40/Customers/1/entity.full.json +++ b/fit/src/main/resources/V40/Customers/1/entity.full.json @@ -1,8 +1,8 @@ { - "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Customers/$entity";, + "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Customers/$entity";, "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Customer", - "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)", - "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)", + "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)", + "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)", "PersonID": 1, "FirstName": "Bob", "LastName": "Cat", @@ -48,20 +48,20 @@ "Birthday": "1957-04-03T00:00:00Z", "[email protected]": "#Duration", "TimeBetweenLastTwoOrders": "PT0.0000001S", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Parent/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Parent", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Orders/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Orders", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Company/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Company", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Parent/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Parent", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Orders/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Orders", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Company/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/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/Customers(PersonID=1)/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress" + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/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/Customers(PersonID=1)/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress" + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress" } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Customers/1/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Customers/1/entity.xml b/fit/src/main/resources/V40/Customers/1/entity.xml index a55448e..d852661 100644 --- a/fit/src/main/resources/V40/Customers/1/entity.xml +++ b/fit/src/main/resources/V40/Customers/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#Customers/$entity";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)</id> + m:context="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Customers/$entity";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(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/Customers(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/Customers(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/Customers/1/links/Company.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Customers/1/links/Company.full.json b/fit/src/main/resources/V40/Customers/1/links/Company.full.json index 851d9ac..97d2461 100644 --- a/fit/src/main/resources/V40/Customers/1/links/Company.full.json +++ b/fit/src/main/resources/V40/Customers/1/links/Company.full.json @@ -1,4 +1,4 @@ { - "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Customer/$links/Info";, - "url": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company"; + "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Customer/$links/Info";, + "url": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company"; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Customers/1/links/Company.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Customers/1/links/Company.xml b/fit/src/main/resources/V40/Customers/1/links/Company.xml index d30435d..b2dce1c 100644 --- a/fit/src/main/resources/V40/Customers/1/links/Company.xml +++ b/fit/src/main/resources/V40/Customers/1/links/Company.xml @@ -19,4 +19,4 @@ under the License. --> -<uri xmlns="http://schemas.microsoft.com/ado/2007/08/dataservices";>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Company</uri> \ No newline at end of file +<uri xmlns="http://schemas.microsoft.com/ado/2007/08/dataservices";>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Company</uri> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Customers/1/links/Orders.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Customers/1/links/Orders.full.json b/fit/src/main/resources/V40/Customers/1/links/Orders.full.json index 0d1372e..afa7d2a 100644 --- a/fit/src/main/resources/V40/Customers/1/links/Orders.full.json +++ b/fit/src/main/resources/V40/Customers/1/links/Orders.full.json @@ -1,10 +1,10 @@ { - "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer/$links/Orders";, + "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer/$links/Orders";, "value": [ { - "url": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Orders(8)" + "url": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Orders(8)" } ], - "odata.nextLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customers(1)/$links/Orders?$skiptoken=2" + "odata.nextLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customers(1)/$links/Orders?$skiptoken=2" } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Customers/1/links/Orders.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Customers/1/links/Orders.xml b/fit/src/main/resources/V40/Customers/1/links/Orders.xml index 5484831..74a6a1a 100644 --- a/fit/src/main/resources/V40/Customers/1/links/Orders.xml +++ b/fit/src/main/resources/V40/Customers/1/links/Orders.xml @@ -20,6 +20,6 @@ --> <links xmlns="http://schemas.microsoft.com/ado/2007/08/dataservices";> - <uri>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Orders(8)</uri> - <next>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customers(1)/$links/Orders?$skiptoken=2</next> + <uri>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Orders(8)</uri> + <next>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customers(1)/$links/Orders?$skiptoken=2</next> </links> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Customers/2/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Customers/2/entity.full.json b/fit/src/main/resources/V40/Customers/2/entity.full.json index 7bdd4e6..f020a18 100644 --- a/fit/src/main/resources/V40/Customers/2/entity.full.json +++ b/fit/src/main/resources/V40/Customers/2/entity.full.json @@ -1,8 +1,8 @@ { - "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Customers/$entity";, + "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Customers/$entity";, "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Customer", - "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)", - "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)", + "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)", + "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)", "PersonID": 2, "FirstName": "Jill", "LastName": "Jones", @@ -33,18 +33,18 @@ "Birthday": "1983-01-15T00:00:00Z", "[email protected]": "#Duration", "TimeBetweenLastTwoOrders": "PT0.0000002S", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Parent/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Parent", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Orders/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Orders", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Company/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Company", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Parent/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Parent", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Orders/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Orders", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Company/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/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/Customers(PersonID=2)/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress" + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/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/Customers(PersonID=2)/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress" + "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress" } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Customers/2/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Customers/2/entity.xml b/fit/src/main/resources/V40/Customers/2/entity.xml index 8db4cc2..46629b4 100644 --- a/fit/src/main/resources/V40/Customers/2/entity.xml +++ b/fit/src/main/resources/V40/Customers/2/entity.xml @@ -19,24 +19,24 @@ 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#Customers/$entity";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)</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#Customers/$entity";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=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/Customers(PersonID=2)" /> - <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=2)/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=2)/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=2)/Company" /> + <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)" /> + <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=2)/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=2)/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=2)/Company" /> <title /> <updated>2014-04-23T15:27:13Z</updated> <author> <name /> </author> - <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.ResetAddress"; + <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.ResetAddress"; title="Microsoft.Test.OData.Services.ODataWCFService.ResetAddress" - target="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress"/> - <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress"; + target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Microsoft.Test.OData.Services.ODataWCFService.ResetAddress"/> + <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress"; title="Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress" - target="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress"/> + target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)/Microsoft.Test.OData.Services.ODataWCFService.GetHomeAddress"/> <content type="application/xml"> <m:properties> <d:PersonID m:type="Int32">2</d:PersonID> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Customers/feed.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Customers/feed.full.json b/fit/src/main/resources/V40/Customers/feed.full.json index 3125b28..3b8ef30 100644 --- a/fit/src/main/resources/V40/Customers/feed.full.json +++ b/fit/src/main/resources/V40/Customers/feed.full.json @@ -1,10 +1,10 @@ { - "@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": [ { - "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)", - "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)", + "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)", + "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)", "PersonID": 1, "FirstName": "Bob", "LastName": "Cat", @@ -51,8 +51,8 @@ "TimeBetweenLastTwoOrders": "PT0.0000001S" }, { - "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)", - "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)", + "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)", + "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)", "PersonID": 2, "FirstName": "Jill", "LastName": "Jones", http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Customers/feed.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Customers/feed.xml b/fit/src/main/resources/V40/Customers/feed.xml index 65696de..dab977b 100644 --- a/fit/src/main/resources/V40/Customers/feed.xml +++ b/fit/src/main/resources/V40/Customers/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#Customers";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers</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#Customers";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers</id> <title /> <updated>2014-04-23T10:01:18Z</updated> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=1)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(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/Customers(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/Customers(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-04-23T10:01:18Z</updated> <author> @@ -69,12 +69,12 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=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/Customers(PersonID=2)" /> - <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=2)/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=2)/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=2)/Company" /> + <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(PersonID=2)" /> + <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=2)/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=2)/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=2)/Company" /> <title /> <updated>2014-04-23T10:01:18Z</updated> <author> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/OrderDetails/7 5/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/OrderDetails/7 5/entity.full.json b/fit/src/main/resources/V40/OrderDetails/7 5/entity.full.json index 2021969..db15130 100644 --- a/fit/src/main/resources/V40/OrderDetails/7 5/entity.full.json +++ b/fit/src/main/resources/V40/OrderDetails/7 5/entity.full.json @@ -1,8 +1,8 @@ { - "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#OrderDetails/$entity";, + "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#OrderDetails/$entity";, "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.OrderDetail", - "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/OrderDetails(OrderID=7,ProductID=5)", - "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/OrderDetails(OrderID=7,ProductID=5)", + "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/OrderDetails(OrderID=7,ProductID=5)", + "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/OrderDetails(OrderID=7,ProductID=5)", "OrderID": 7, "ProductID": 5, "[email protected]": "#DateTimeOffset", @@ -10,8 +10,8 @@ "Quantity": 50, "[email protected]": "#Single", "UnitPrice": 3.24, - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/OrderDetails(OrderID=7,ProductID=5)/ProductOrdered/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/OrderDetails(OrderID=7,ProductID=5)/ProductOrdered", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/OrderDetails(OrderID=7,ProductID=5)/AssociatedOrder/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/OrderDetails(OrderID=7,ProductID=5)/AssociatedOrder" + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/OrderDetails(OrderID=7,ProductID=5)/ProductOrdered/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/OrderDetails(OrderID=7,ProductID=5)/ProductOrdered", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/OrderDetails(OrderID=7,ProductID=5)/AssociatedOrder/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/OrderDetails(OrderID=7,ProductID=5)/AssociatedOrder" } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/OrderDetails/7 5/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/OrderDetails/7 5/entity.xml b/fit/src/main/resources/V40/OrderDetails/7 5/entity.xml index 044fd87..ddf8ed3 100644 --- a/fit/src/main/resources/V40/OrderDetails/7 5/entity.xml +++ b/fit/src/main/resources/V40/OrderDetails/7 5/entity.xml @@ -19,12 +19,12 @@ 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#OrderDetails/$entity";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/OrderDetails(OrderID=7,ProductID=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#OrderDetails/$entity";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/OrderDetails(OrderID=7,ProductID=5)</id> <category term="#Microsoft.Test.OData.Services.ODataWCFService.OrderDetail" scheme="http://docs.oasis-open.org/odata/ns/scheme"; /> - <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/OrderDetails(OrderID=7,ProductID=5)" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/ProductOrdered"; type="application/atom+xml;type=feed" title="ProductOrdered" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/OrderDetails(OrderID=7,ProductID=5)/ProductOrdered" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/AssociatedOrder"; type="application/atom+xml;type=entry" title="AssociatedOrder" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/OrderDetails(OrderID=7,ProductID=5)/AssociatedOrder" /> + <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/OrderDetails(OrderID=7,ProductID=5)" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/ProductOrdered"; type="application/atom+xml;type=feed" title="ProductOrdered" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/OrderDetails(OrderID=7,ProductID=5)/ProductOrdered" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/AssociatedOrder"; type="application/atom+xml;type=entry" title="AssociatedOrder" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/OrderDetails(OrderID=7,ProductID=5)/AssociatedOrder" /> <title /> <updated>2014-04-16T12:38:34Z</updated> <author> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Orders/8/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Orders/8/entity.full.json b/fit/src/main/resources/V40/Orders/8/entity.full.json index 1c3d806..e2ea119 100644 --- a/fit/src/main/resources/V40/Orders/8/entity.full.json +++ b/fit/src/main/resources/V40/Orders/8/entity.full.json @@ -1,8 +1,8 @@ { - "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Orders/$entity";, + "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Orders/$entity";, "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Order", - "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)", - "@odata.editLink": "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(8)", + "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)", "@odata.etag": "W/\"123456789001\"", "OrderID": 8, "[email protected]": "#DateTimeOffset", @@ -14,10 +14,10 @@ [ "PT0.0000001S" ], - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/LoggedInEmployee/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/LoggedInEmployee", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/CustomerForOrder/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/CustomerForOrder", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/OrderDetails/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/OrderDetails" + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/LoggedInEmployee/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/LoggedInEmployee", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/CustomerForOrder/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/CustomerForOrder", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/OrderDetails/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/OrderDetails" } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Orders/8/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Orders/8/entity.xml b/fit/src/main/resources/V40/Orders/8/entity.xml index 6fe6591..b4309c7 100644 --- a/fit/src/main/resources/V40/Orders/8/entity.xml +++ b/fit/src/main/resources/V40/Orders/8/entity.xml @@ -19,19 +19,19 @@ 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#Orders/$entity"; + m:context="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Orders/$entity"; m:etag="W/"123456789001""> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)</id> <category term="#Microsoft.Test.OData.Services.ODataWCFService.Order" scheme="http://docs.oasis-open.org/odata/ns/scheme"; /> - <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/LoggedInEmployee"; type="application/atom+xml;type=entry" title="LoggedInEmployee" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/LoggedInEmployee" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/CustomerForOrder"; type="application/atom+xml;type=entry" title="CustomerForOrder" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/CustomerForOrder" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/OrderDetails"; type="application/atom+xml;type=feed" title="OrderDetails" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/OrderDetails" /> + <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/LoggedInEmployee"; type="application/atom+xml;type=entry" title="LoggedInEmployee" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/LoggedInEmployee" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/CustomerForOrder"; type="application/atom+xml;type=entry" title="CustomerForOrder" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/CustomerForOrder" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/OrderDetails"; type="application/atom+xml;type=feed" title="OrderDetails" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/OrderDetails" /> <title /> <updated>2014-03-24T17:36:01Z</updated> <author> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Orders/8/links/.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Orders/8/links/.full.json b/fit/src/main/resources/V40/Orders/8/links/.full.json index 4fbfe93..8e9aa31 100644 --- a/fit/src/main/resources/V40/Orders/8/links/.full.json +++ b/fit/src/main/resources/V40/Orders/8/links/.full.json @@ -1,4 +1,4 @@ { - "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer/$links/Info";, - "url": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(11)" + "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer/$links/Info";, + "url": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/CustomerInfo(11)" } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Orders/8/links/CustomerForOrder.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Orders/8/links/CustomerForOrder.full.json b/fit/src/main/resources/V40/Orders/8/links/CustomerForOrder.full.json index 4d7b11a..f84a895 100644 --- a/fit/src/main/resources/V40/Orders/8/links/CustomerForOrder.full.json +++ b/fit/src/main/resources/V40/Orders/8/links/CustomerForOrder.full.json @@ -1,4 +1,4 @@ { - "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Orders/$links/CustomerForOrder";, - "url": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(1)" + "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Orders/$links/CustomerForOrder";, + "url": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(1)" } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Orders/8/links/CustomerForOrder.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Orders/8/links/CustomerForOrder.xml b/fit/src/main/resources/V40/Orders/8/links/CustomerForOrder.xml index 5c82374..1ea06ce 100644 --- a/fit/src/main/resources/V40/Orders/8/links/CustomerForOrder.xml +++ b/fit/src/main/resources/V40/Orders/8/links/CustomerForOrder.xml @@ -19,4 +19,4 @@ under the License. --> -<uri xmlns="http://schemas.microsoft.com/ado/2007/08/dataservices";>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Customers(1)</uri> \ No newline at end of file +<uri xmlns="http://schemas.microsoft.com/ado/2007/08/dataservices";>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Customers(1)</uri> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Orders/feed.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Orders/feed.full.json b/fit/src/main/resources/V40/Orders/feed.full.json index 8d30795..0ecd9ec 100644 --- a/fit/src/main/resources/V40/Orders/feed.full.json +++ b/fit/src/main/resources/V40/Orders/feed.full.json @@ -1,11 +1,11 @@ { - "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Orders";, + "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Orders";, "value": [ { "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Order", - "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)", - "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)", + "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)", + "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)", "OrderID": 7, "[email protected]": "#DateTimeOffset", "OrderDate": "2011-05-29T14:21:12Z", @@ -16,17 +16,17 @@ [ "PT0.0000001S" ], - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)/LoggedInEmployee/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)/LoggedInEmployee", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)/CustomerForOrder/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)/CustomerForOrder", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)/OrderDetails/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)/OrderDetails" + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)/LoggedInEmployee/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)/LoggedInEmployee", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)/CustomerForOrder/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)/CustomerForOrder", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)/OrderDetails/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)/OrderDetails" }, { "@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Order", - "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)", - "@odata.editLink": "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(8)", + "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)", "OrderID": 8, "[email protected]": "#DateTimeOffset", "OrderDate": "2011-03-04T16:03:57Z", @@ -37,12 +37,12 @@ [ "PT0.0000001S" ], - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/LoggedInEmployee/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/LoggedInEmployee", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/CustomerForOrder/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/CustomerForOrder", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/OrderDetails/$ref", - "[email protected]": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/OrderDetails" + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/LoggedInEmployee/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/LoggedInEmployee", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/CustomerForOrder/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/CustomerForOrder", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/OrderDetails/$ref", + "[email protected]": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/OrderDetails" } ] } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Orders/feed.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Orders/feed.xml b/fit/src/main/resources/V40/Orders/feed.xml index 9cd8cc1..48603ce 100644 --- a/fit/src/main/resources/V40/Orders/feed.xml +++ b/fit/src/main/resources/V40/Orders/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#Orders";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders</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#Orders";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders</id> <title /> <updated>2014-03-24T17:17:25Z</updated> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)</id> <category term="#Microsoft.Test.OData.Services.ODataWCFService.Order" scheme="http://docs.oasis-open.org/odata/ns/scheme"; /> - <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/LoggedInEmployee"; type="application/atom+xml;type=entry" title="LoggedInEmployee" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)/LoggedInEmployee" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/CustomerForOrder"; type="application/atom+xml;type=entry" title="CustomerForOrder" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)/CustomerForOrder" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/OrderDetails"; type="application/atom+xml;type=feed" title="OrderDetails" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)/OrderDetails" /> + <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/LoggedInEmployee"; type="application/atom+xml;type=entry" title="LoggedInEmployee" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)/LoggedInEmployee" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/CustomerForOrder"; type="application/atom+xml;type=entry" title="CustomerForOrder" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)/CustomerForOrder" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/OrderDetails"; type="application/atom+xml;type=feed" title="OrderDetails" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(7)/OrderDetails" /> <title /> <updated>2014-03-24T17:17:25Z</updated> <author> @@ -47,12 +47,12 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)</id> <category term="#Microsoft.Test.OData.Services.ODataWCFService.Order" scheme="http://docs.oasis-open.org/odata/ns/scheme"; /> - <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/LoggedInEmployee"; type="application/atom+xml;type=entry" title="LoggedInEmployee" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/LoggedInEmployee" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/CustomerForOrder"; type="application/atom+xml;type=entry" title="CustomerForOrder" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/CustomerForOrder" /> - <link rel="http://docs.oasis-open.org/odata/ns/related/OrderDetails"; type="application/atom+xml;type=feed" title="OrderDetails" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/OrderDetails" /> + <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/LoggedInEmployee"; type="application/atom+xml;type=entry" title="LoggedInEmployee" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/LoggedInEmployee" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/CustomerForOrder"; type="application/atom+xml;type=entry" title="CustomerForOrder" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/CustomerForOrder" /> + <link rel="http://docs.oasis-open.org/odata/ns/related/OrderDetails"; type="application/atom+xml;type=feed" title="OrderDetails" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Orders(8)/OrderDetails" /> <title /> <updated>2014-03-24T17:17:25Z</updated> <author> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Org.OData.Capabilities.V1.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Org.OData.Capabilities.V1.xml b/fit/src/main/resources/V40/Org.OData.Capabilities.V1.xml index 6e67527..923147f 100644 --- a/fit/src/main/resources/V40/Org.OData.Capabilities.V1.xml +++ b/fit/src/main/resources/V40/Org.OData.Capabilities.V1.xml @@ -20,7 +20,7 @@ --> <edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx"; Version="4.0"> - <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:DataServices> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Org.OData.Measures.V1.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/Org.OData.Measures.V1.xml b/fit/src/main/resources/V40/Org.OData.Measures.V1.xml index 914e1df..b41e98d 100644 --- a/fit/src/main/resources/V40/Org.OData.Measures.V1.xml +++ b/fit/src/main/resources/V40/Org.OData.Measures.V1.xml @@ -20,7 +20,7 @@ --> <edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx"; Version="4.0"> - <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:DataServices> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/People/1/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/People/1/entity.full.json b/fit/src/main/resources/V40/People/1/entity.full.json index 2ade02b..35c697b 100644 --- a/fit/src/main/resources/V40/People/1/entity.full.json +++ b/fit/src/main/resources/V40/People/1/entity.full.json @@ -1,8 +1,8 @@ { - "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People/$entity";, + "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People/$entity";, "@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", @@ -34,18 +34,18 @@ "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" } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/People/1/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/People/1/entity.xml b/fit/src/main/resources/V40/People/1/entity.xml index c400794..1646c54 100644 --- a/fit/src/main/resources/V40/People/1/entity.xml +++ b/fit/src/main/resources/V40/People/1/entity.xml @@ -19,19 +19,19 @@ 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#People/$entity";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(1)</id> + m:context="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People/$entity";> + <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)"/> - <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)"/> + <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-17T12:35:59Z</updated> <author> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/People/5/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/People/5/entity.full.json b/fit/src/main/resources/V40/People/5/entity.full.json index 5c9ab71..45e7e6f 100644 --- a/fit/src/main/resources/V40/People/5/entity.full.json +++ b/fit/src/main/resources/V40/People/5/entity.full.json @@ -1,8 +1,8 @@ { - "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People/$entity";, + "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People/$entity";, "@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", @@ -36,16 +36,16 @@ [ "[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" } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/People/5/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V40/People/5/entity.xml b/fit/src/main/resources/V40/People/5/entity.xml index c64d1a7..6a7b361 100644 --- a/fit/src/main/resources/V40/People/5/entity.xml +++ b/fit/src/main/resources/V40/People/5/entity.xml @@ -19,17 +19,17 @@ 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#People/$entity";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/People(5)</id> + m:context="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#People/$entity";> + <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-24T17:20:17Z</updated> <author>
