[OLINGO-377] Removing unused cargo properties, upgrading Tomcat, renaming cargo.servlet.port to tomcat.servlet.port
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/36e6ed40 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/36e6ed40 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/36e6ed40 Branch: refs/heads/master Commit: 36e6ed401767cd83dbc1cd0bd368c09615089b80 Parents: 45a46f8 Author: Francesco Chicchiriccò <--global> Authored: Wed Jul 30 08:24:22 2014 +0200 Committer: Francesco Chicchiriccò <--global> Committed: Wed Jul 30 08:24:22 2014 +0200 ---------------------------------------------------------------------- fit/pom.xml | 1 - .../resources/V30/AllGeoTypesSet/-10/entity.xml | 4 +- .../main/resources/V30/AllGeoTypesSet/feed.xml | 24 +++--- .../main/resources/V30/Car/12/entity.full.json | 4 +- fit/src/main/resources/V30/Car/12/entity.xml | 4 +- .../main/resources/V30/Car/14/entity.full.json | 4 +- fit/src/main/resources/V30/Car/14/entity.xml | 4 +- .../main/resources/V30/Car/15/entity.full.json | 4 +- fit/src/main/resources/V30/Car/15/entity.xml | 4 +- .../main/resources/V30/Car/16/entity.full.json | 4 +- fit/src/main/resources/V30/Car/16/entity.xml | 4 +- fit/src/main/resources/V30/Car/feed.full.json | 50 ++++++------ fit/src/main/resources/V30/Car/feed.xml | 52 ++++++------ .../Car/filter/((1 add VIN) eq 16).full.json | 2 +- .../V30/Car/filter/((1 add VIN) eq 16).xml | 6 +- .../Car/filter/((VIN add 1) eq 16).full.json | 2 +- .../V30/Car/filter/((VIN add 1) eq 16).xml | 6 +- .../((VIN lt 16) and (VIN gt 12)).full.json | 2 +- .../filter/((VIN lt 16) and (VIN gt 12)).xml | 10 +-- .../Car/filter/(16 eq (1 add VIN)).full.json | 2 +- .../V30/Car/filter/(16 eq (1 add VIN)).xml | 6 +- .../V30/Car/filter/(VIN eq 16).full.json | 4 +- .../resources/V30/Car/filter/(VIN eq 16).xml | 6 +- .../V30/Car/filter/(VIN lt 16).full.json | 2 +- .../resources/V30/Car/filter/(VIN lt 16).xml | 14 ++-- ...ngth(Description) gt (VIN add 10)).full.json | 2 +- .../(length(Description) gt (VIN add 10)).xml | 14 ++-- .../V30/Car/filter/VIN add 5 lt 11.full.json | 2 +- .../V30/Car/filter/VIN add 5 lt 11.xml | 4 +- .../V30/Car/filter/VIN div 2 le 8.full.json | 2 +- .../resources/V30/Car/filter/VIN div 2 le 8.xml | 2 +- .../filter/VIN le 18 and VIN gt 12.full.json | 2 +- .../V30/Car/filter/VIN le 18 and VIN gt 12.xml | 2 +- .../V30/Car/filter/VIN mul 2 le 30.full.json | 2 +- .../V30/Car/filter/VIN mul 2 le 30.xml | 2 +- ...not (((VIN ge 16) or (VIN le 12))).full.json | 2 +- .../not (((VIN ge 16) or (VIN le 12))).xml | 10 +-- .../startswith(Description,'cen').full.json | 2 +- .../filter/startswith(Description,'cen').xml | 6 +- .../VIN desc/filter/(VIN lt 16).full.json | 12 +-- .../Car/orderby/VIN desc/filter/(VIN lt 16).xml | 14 ++-- fit/src/main/resources/V30/Computer/feed.xml | 44 +++++----- .../V30/ComputerDetail/-10/entity.full.json | 6 +- .../resources/V30/ComputerDetail/-10/entity.xml | 6 +- .../(month(PurchaseDate) eq 12).full.json | 2 +- .../filter/(month(PurchaseDate) eq 12).xml | 8 +- .../filter/day(PurchaseDate) eq 15.full.json | 2 +- .../filter/day(PurchaseDate) eq 15.xml | 2 +- .../filter/hour(PurchaseDate) eq 1.full.json | 2 +- .../filter/hour(PurchaseDate) eq 1.xml | 2 +- .../filter/minute(PurchaseDate) eq 33.full.json | 2 +- .../filter/minute(PurchaseDate) eq 33.xml | 2 +- .../filter/month(PurchaseDate) eq 12.full.json | 2 +- .../filter/month(PurchaseDate) eq 12.xml | 2 +- .../filter/second(PurchaseDate) eq 35.full.json | 2 +- .../filter/second(PurchaseDate) eq 35.xml | 2 +- .../filter/year(PurchaseDate) eq 2020.full.json | 2 +- .../filter/year(PurchaseDate) eq 2020.xml | 2 +- .../resources/V30/Customer/-10/entity.full.json | 4 +- .../main/resources/V30/Customer/-10/entity.xml | 4 +- .../V30/Customer/-10/links/Info.full.json | 4 +- .../resources/V30/Customer/-10/links/Info.xml | 2 +- .../Customer/-10/links/Logins('3').full.json | 4 +- .../V30/Customer/-10/links/Logins.full.json | 6 +- .../resources/V30/Customer/-10/links/Logins.xml | 4 +- .../Customer/-10/links/Orders(-10).full.json | 4 +- .../V30/Customer/-10/links/Orders.full.json | 8 +- .../resources/V30/Customer/-10/links/Orders.xml | 6 +- .../resources/V30/Customer/-7/entity.full.json | 4 +- .../main/resources/V30/Customer/-7/entity.xml | 4 +- .../resources/V30/Customer/-9/entity.full.json | 4 +- .../main/resources/V30/Customer/-9/entity.xml | 4 +- .../main/resources/V30/Customer/feed.full.json | 6 +- fit/src/main/resources/V30/Customer/feed.xml | 10 +-- ....PhoneNumber,'ODataJClient') eq 1).full.json | 2 +- ...ePhone.PhoneNumber,'ODataJClient') eq 1).xml | 4 +- ...ne.PhoneNumber,'lccvussrv') ne -1).full.json | 2 +- ...omePhone.PhoneNumber,'lccvussrv') ne -1).xml | 10 +-- .../Customer/filter/CustomerId eq -10.full.json | 4 +- .../V30/Customer/filter/CustomerId eq -10.xml | 6 +- .../Customer/filter/CustomerId gt -10.full.json | 2 +- .../V30/Customer/filter/CustomerId gt -10.xml | 10 +-- .../Customer/filter/CustomerId lt -10.full.json | 2 +- .../V30/Customer/filter/CustomerId lt -10.xml | 4 +- .../isof(Name,'Edm.String') eq true.full.json | 2 +- .../filter/isof(Name,'Edm.String') eq true.xml | 10 +-- .../not endswith(Name,'Chandan').full.json | 2 +- .../filter/not endswith(Name,'Chandan').xml | 10 +-- .../V30/Customer/skiptoken/-1.full.json | 2 +- .../resources/V30/Customer/skiptoken/-1.xml | 4 +- .../V30/Customer/skiptoken/-10.full.json | 6 +- .../resources/V30/Customer/skiptoken/-10.xml | 10 +-- .../V30/Customer/skiptoken/-3.full.json | 6 +- .../resources/V30/Customer/skiptoken/-3.xml | 10 +-- .../V30/Customer/skiptoken/-5.full.json | 6 +- .../resources/V30/Customer/skiptoken/-5.xml | 10 +-- .../V30/Customer/skiptoken/-7.full.json | 6 +- .../resources/V30/Customer/skiptoken/-7.xml | 10 +-- .../V30/Customer/skiptoken/-9.full.json | 6 +- .../resources/V30/Customer/skiptoken/-9.xml | 10 +-- .../V30/CustomerInfo/11/entity.full.json | 4 +- .../resources/V30/CustomerInfo/11/entity.xml | 4 +- .../V30/CustomerInfo/12/entity.full.json | 4 +- .../resources/V30/CustomerInfo/12/entity.xml | 4 +- .../V30/CustomerInfo/17/entity.full.json | 4 +- .../resources/V30/CustomerInfo/17/entity.xml | 4 +- .../resources/V30/CustomerInfo/feed.full.json | 22 ++--- .../main/resources/V30/CustomerInfo/feed.xml | 24 +++--- .../V30/EdmBooleanSet/true/entity.full.json | 2 +- .../resources/V30/EdmBooleanSet/true/entity.xml | 4 +- .../V30/EdmByteSet/255/entity.full.json | 2 +- .../resources/V30/EdmByteSet/255/entity.xml | 4 +- .../entity.full.json | 2 +- .../79228162514264337593543950335M/entity.xml | 4 +- .../1.7976931348623157E308D/entity.full.json | 2 +- .../1.7976931348623157E308D/entity.xml | 4 +- .../entity.full.json | 2 +- .../entity.xml | 4 +- .../V30/EdmInt16Set/32767/entity.full.json | 2 +- .../resources/V30/EdmInt16Set/32767/entity.xml | 4 +- .../EdmInt32Set/-2147483648/entity.full.json | 2 +- .../V30/EdmInt32Set/-2147483648/entity.xml | 4 +- .../9223372036854775807L/entity.full.json | 2 +- .../EdmInt64Set/9223372036854775807L/entity.xml | 4 +- .../EdmSingleSet/3.4028235E38f/entity.full.json | 2 +- .../V30/EdmSingleSet/3.4028235E38f/entity.xml | 4 +- .../V30/EdmStringSet/'$'/entity.full.json | 2 +- .../resources/V30/EdmStringSet/'$'/entity.xml | 4 +- .../entity.full.json | 2 +- .../entity.xml | 4 +- .../V30/InStreamErrorGetCustomer.full.json | 2 +- .../resources/V30/InStreamErrorGetCustomer.xml | 6 +- .../resources/V30/Login/'3'/entity.full.json | 4 +- fit/src/main/resources/V30/Login/'3'/entity.xml | 4 +- .../V30/Message/1 -10/entity.full.json | 4 +- .../main/resources/V30/Message/1 -10/entity.xml | 4 +- fit/src/main/resources/V30/Message/feed.xml | 24 +++--- .../resources/V30/Order/-10/entity.full.json | 4 +- fit/src/main/resources/V30/Order/-10/entity.xml | 4 +- .../resources/V30/Order/-7/entity.full.json | 4 +- fit/src/main/resources/V30/Order/-7/entity.xml | 4 +- .../resources/V30/Order/-8/entity.full.json | 4 +- fit/src/main/resources/V30/Order/-8/entity.xml | 4 +- .../resources/V30/Order/-9/entity.full.json | 4 +- fit/src/main/resources/V30/Order/-9/entity.xml | 4 +- .../V30/OrderLine/-10 -10/entity.full.json | 4 +- .../resources/V30/OrderLine/-10 -10/entity.xml | 4 +- .../feed.full.json | 6 +- .../feed.xml | 8 +- fit/src/main/resources/V30/Person/feed.xml | 44 +++++----- .../filter/PersonId sub 2 lt -10.full.json | 2 +- .../V30/Person/filter/PersonId sub 2 lt -10.xml | 12 +-- ...iaDefaultService.SpecialEmployee').full.json | 2 +- ....AstoriaDefaultService.SpecialEmployee').xml | 20 ++--- .../resources/V30/Product/-10/entity.full.json | 6 +- .../main/resources/V30/Product/-10/entity.xml | 6 +- .../resources/V30/Product/-6/entity.full.json | 6 +- .../main/resources/V30/Product/-6/entity.xml | 6 +- .../resources/V30/Product/-7/entity.full.json | 6 +- .../main/resources/V30/Product/-7/entity.xml | 6 +- .../V30/Product/-7/links/Photos.full.json | 6 +- .../resources/V30/Product/-9/entity.full.json | 6 +- .../main/resources/V30/Product/-9/entity.xml | 6 +- .../main/resources/V30/Product/feed.full.json | 42 +++++----- fit/src/main/resources/V30/Product/feed.xml | 44 +++++----- .../ceiling(Dimensions.Width) eq 7338.full.json | 2 +- .../ceiling(Dimensions.Width) eq 7338.xml | 8 +- ...', newname') eq 'kdcuklu, newname'.full.json | 2 +- ...tion, ', newname') eq 'kdcuklu, newname'.xml | 8 +- .../floor(Dimensions.Width) eq 7337.full.json | 2 +- .../filter/floor(Dimensions.Width) eq 7337.xml | 8 +- .../indexof(Description, 'k') eq 0.full.json | 2 +- .../filter/indexof(Description, 'k') eq 0.xml | 12 +-- .../filter/length(Description) eq 7.full.json | 2 +- .../Product/filter/length(Description) eq 7.xml | 8 +- .../round(Dimensions.Width) eq 7338.full.json | 2 +- .../filter/round(Dimensions.Width) eq 7338.xml | 8 +- ...artswith(Description, 'k') eq true.full.json | 2 +- .../startswith(Description, 'k') eq true.xml | 12 +-- ...of('kdcuklu', Description) eq true.full.json | 2 +- ...stringof('kdcuklu', Description) eq true.xml | 8 +- .../toupper(Description) eq 'KDCUKLU'.full.json | 2 +- .../toupper(Description) eq 'KDCUKLU'.xml | 8 +- .../V30/ProductPhoto/-2 -2/entity.full.json | 4 +- .../resources/V30/ProductPhoto/-2 -2/entity.xml | 4 +- .../V30/ProductPhoto/-3 -3/entity.full.json | 4 +- .../resources/V30/ProductPhoto/-3 -3/entity.xml | 4 +- .../entity.full.json | 4 +- .../entity.xml | 4 +- .../entity.full.json | 4 +- .../entity.xml | 4 +- fit/src/main/resources/V30/services.full.json | 2 +- fit/src/main/resources/V30/services.xml | 2 +- .../resources/V40/Accounts/101/entity.full.json | 28 +++---- .../main/resources/V40/Accounts/101/entity.xml | 26 +++--- .../V40/Accounts/101/links/MyGiftCard.full.json | 4 +- .../V40/Accounts/101/links/MyGiftCard.xml | 6 +- .../MyPaymentInstruments(101901).full.json | 14 ++-- .../101/links/MyPaymentInstruments(101901).xml | 10 +-- .../MyPaymentInstruments(101902).full.json | 14 ++-- .../101/links/MyPaymentInstruments(101902).xml | 10 +-- .../101/links/MyPaymentInstruments.full.json | 46 +++++------ .../Accounts/101/links/MyPaymentInstruments.xml | 26 +++--- .../resources/V40/Accounts/102/entity.full.json | 28 +++---- .../main/resources/V40/Accounts/102/entity.xml | 26 +++--- .../V40/Accounts/102/links/MyGiftCard.full.json | 4 +- .../V40/Accounts/102/links/MyGiftCard.xml | 6 +- .../MyPaymentInstruments(102901).full.json | 14 ++-- .../102/links/MyPaymentInstruments(102901).xml | 8 +- .../MyPaymentInstruments(102902).full.json | 14 ++-- .../102/links/MyPaymentInstruments(102902).xml | 8 +- .../102/links/MyPaymentInstruments.full.json | 46 +++++------ .../Accounts/102/links/MyPaymentInstruments.xml | 26 +++--- .../entity.full.json | 4 +- .../entity.xml | 4 +- .../resources/V40/Advertisements/feed.full.json | 6 +- .../main/resources/V40/Advertisements/feed.xml | 8 +- .../main/resources/V40/Boss/entity.full.json | 22 ++--- .../main/resources/V40/Company/entity.full.json | 26 +++--- fit/src/main/resources/V40/Company/entity.xml | 22 ++--- .../resources/V40/Customers/1/entity.full.json | 22 ++--- .../main/resources/V40/Customers/1/entity.xml | 14 ++-- .../V40/Customers/1/links/Company.full.json | 4 +- .../resources/V40/Customers/1/links/Company.xml | 2 +- .../V40/Customers/1/links/Orders.full.json | 6 +- .../resources/V40/Customers/1/links/Orders.xml | 4 +- .../resources/V40/Customers/2/entity.full.json | 22 ++--- .../main/resources/V40/Customers/2/entity.xml | 20 ++--- .../main/resources/V40/Customers/feed.full.json | 10 +-- fit/src/main/resources/V40/Customers/feed.xml | 24 +++--- .../V40/OrderDetails/7 5/entity.full.json | 14 ++-- .../resources/V40/OrderDetails/7 5/entity.xml | 10 +-- .../resources/V40/Orders/8/entity.full.json | 18 ++-- fit/src/main/resources/V40/Orders/8/entity.xml | 14 ++-- .../resources/V40/Orders/8/links/.full.json | 4 +- .../Orders/8/links/CustomerForOrder.full.json | 4 +- .../V40/Orders/8/links/CustomerForOrder.xml | 2 +- .../main/resources/V40/Orders/feed.full.json | 34 ++++---- fit/src/main/resources/V40/Orders/feed.xml | 24 +++--- .../resources/V40/Org.OData.Capabilities.V1.xml | 2 +- .../resources/V40/Org.OData.Measures.V1.xml | 2 +- .../resources/V40/People/1/entity.full.json | 22 ++--- fit/src/main/resources/V40/People/1/entity.xml | 14 ++-- .../resources/V40/People/5/entity.full.json | 14 ++-- fit/src/main/resources/V40/People/5/entity.xml | 10 +-- .../feed.full.json | 42 +++++----- .../feed.xml | 24 +++--- .../main/resources/V40/People/feed.full.json | 86 ++++++++++---------- fit/src/main/resources/V40/People/feed.xml | 50 ++++++------ .../V40/People/filter/(PersonID eq 5).full.json | 6 +- .../V40/People/filter/(PersonID eq 5).xml | 14 ++-- .../V40/People/filter/(PersonID lt 3).full.json | 10 +-- .../V40/People/filter/(PersonID lt 3).xml | 24 +++--- .../filter/(PersonID lt 3).full.json | 10 +-- .../PersonID desc/filter/(PersonID lt 3).xml | 24 +++--- .../resources/V40/People/skiptoken/5.full.json | 14 ++-- .../main/resources/V40/People/skiptoken/5.xml | 12 +-- .../V40/PersonDetails/1/entity.full.json | 4 +- .../resources/V40/PersonDetails/1/entity.xml | 6 +- .../V40/ProductDetails/6 1/entity.full.json | 16 ++-- .../resources/V40/ProductDetails/6 1/entity.xml | 14 ++-- .../resources/V40/Products/5/entity.full.json | 14 ++-- .../main/resources/V40/Products/5/entity.xml | 16 ++-- .../resources/V40/Products/6/entity.full.json | 14 ++-- .../main/resources/V40/Products/6/entity.xml | 8 +- .../main/resources/V40/Products/feed.full.json | 62 +++++++------- fit/src/main/resources/V40/Products/feed.xml | 36 ++++---- .../entity.full.json | 4 +- .../entity.xml | 6 +- .../entity.full.json | 4 +- .../entity.xml | 6 +- .../V40/VipCustomer/1/entity.full.json | 6 +- .../main/resources/V40/VipCustomer/1/entity.xml | 14 ++-- fit/src/main/resources/V40/crossjoin.full.json | 2 +- fit/src/main/resources/V40/delta.full.json | 2 +- fit/src/main/resources/V40/delta.xml | 20 ++--- .../main/resources/V40/northwind-metadata.xml | 2 +- .../Q3VzdG9tZXJzKDEpL09yZGVycw==.full.json | 6 +- ...JkZXJzKDgpL0N1c3RvbWVyRm9yT3JkZXI=.full.json | 4 +- .../T3JkZXJzKDgpL0N1c3RvbWVyRm9yT3JkZXI=.xml | 2 +- fit/src/main/resources/V40/services.full.json | 2 +- fit/src/main/resources/V40/services.xml | 4 +- .../resources/V40/vocabularies-metadata.xml | 6 +- fit/src/main/resources/esigate.properties | 4 +- pom.xml | 10 +-- 285 files changed, 1298 insertions(+), 1305 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/pom.xml ---------------------------------------------------------------------- diff --git a/fit/pom.xml b/fit/pom.xml index de4f3e0..30dade1 100644 --- a/fit/pom.xml +++ b/fit/pom.xml @@ -147,7 +147,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.17</version> <configuration> <includes> <include>**/*ITCase.java</include> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/AllGeoTypesSet/-10/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/AllGeoTypesSet/-10/entity.xml b/fit/src/main/resources/V30/AllGeoTypesSet/-10/entity.xml index 42dc8c2..b6d4244 100644 --- a/fit/src/main/resources/V30/AllGeoTypesSet/-10/entity.xml +++ b/fit/src/main/resources/V30/AllGeoTypesSet/-10/entity.xml @@ -19,8 +19,8 @@ under the License. --> -<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-10)</id> +<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-10)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialTypes" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="AllSpatialTypes" href="AllGeoTypesSet(-10)" /> <title /> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/AllGeoTypesSet/feed.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/AllGeoTypesSet/feed.xml b/fit/src/main/resources/V30/AllGeoTypesSet/feed.xml index 7d689e7..8fa4ef3 100644 --- a/fit/src/main/resources/V30/AllGeoTypesSet/feed.xml +++ b/fit/src/main/resources/V30/AllGeoTypesSet/feed.xml @@ -19,13 +19,13 @@ under the License. --> -<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet</id> +<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet</id> <title type="text">AllGeoTypesSet</title> <updated>2014-05-08T12:26:29Z</updated> <link rel="self" title="AllGeoTypesSet" href="AllGeoTypesSet" /> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-10)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-10)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialTypes" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="AllSpatialTypes" href="AllGeoTypesSet(-10)" /> <title /> @@ -165,7 +165,7 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-9)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-9)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialTypes" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="AllSpatialTypes" href="AllGeoTypesSet(-9)" /> <title /> @@ -272,7 +272,7 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-8)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-8)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialTypes" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="AllSpatialTypes" href="AllGeoTypesSet(-8)" /> <title /> @@ -422,7 +422,7 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-7)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-7)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialTypes" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="AllSpatialTypes" href="AllGeoTypesSet(-7)" /> <title /> @@ -524,7 +524,7 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-6)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-6)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialTypes" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="AllSpatialTypes" href="AllGeoTypesSet(-6)" /> <title /> @@ -652,7 +652,7 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-5)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-5)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialTypes" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="AllSpatialTypes" href="AllGeoTypesSet(-5)" /> <title /> @@ -807,7 +807,7 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-4)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-4)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialTypes" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="AllSpatialTypes" href="AllGeoTypesSet(-4)" /> <title /> @@ -967,7 +967,7 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-3)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-3)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialTypes" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="AllSpatialTypes" href="AllGeoTypesSet(-3)" /> <title /> @@ -1095,7 +1095,7 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-2)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-2)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialTypes" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="AllSpatialTypes" href="AllGeoTypesSet(-2)" /> <title /> @@ -1222,7 +1222,7 @@ </content> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-1)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/AllGeoTypesSet(-1)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialTypes" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="AllSpatialTypes" href="AllGeoTypesSet(-1)" /> <title /> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/12/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Car/12/entity.full.json b/fit/src/main/resources/V30/Car/12/entity.full.json index 26ddb5d..422bff8 100644 --- a/fit/src/main/resources/V30/Car/12/entity.full.json +++ b/fit/src/main/resources/V30/Car/12/entity.full.json @@ -1,7 +1,7 @@ { - "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car/@Element";, + "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car/@Element";, "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)", "odata.editLink": "Car(12)", "odata.mediaEditLink": "Car(12)/$value", "odata.mediaReadLink": "Car(12)/$value", http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/12/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Car/12/entity.xml b/fit/src/main/resources/V30/Car/12/entity.xml index 263b21b..694dbbe 100644 --- a/fit/src/main/resources/V30/Car/12/entity.xml +++ b/fit/src/main/resources/V30/Car/12/entity.xml @@ -19,8 +19,8 @@ under the License. --> -<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)</id> +<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Car" href="Car(12)" /> <title /> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/14/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Car/14/entity.full.json b/fit/src/main/resources/V30/Car/14/entity.full.json index 4830ea0..6767a12 100644 --- a/fit/src/main/resources/V30/Car/14/entity.full.json +++ b/fit/src/main/resources/V30/Car/14/entity.full.json @@ -1,7 +1,7 @@ { - "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car/@Element";, + "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car/@Element";, "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)", "odata.editLink": "Car(14)", "odata.mediaEditLink": "Car(14)/$value", "odata.mediaReadLink": "Car(14)/$value", http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/14/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Car/14/entity.xml b/fit/src/main/resources/V30/Car/14/entity.xml index eae3b50..777c11e 100644 --- a/fit/src/main/resources/V30/Car/14/entity.xml +++ b/fit/src/main/resources/V30/Car/14/entity.xml @@ -19,8 +19,8 @@ under the License. --> -<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)</id> +<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Car" href="Car(14)" /> <title /> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/15/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Car/15/entity.full.json b/fit/src/main/resources/V30/Car/15/entity.full.json index 3ac6ec3..73763cb 100644 --- a/fit/src/main/resources/V30/Car/15/entity.full.json +++ b/fit/src/main/resources/V30/Car/15/entity.full.json @@ -1,7 +1,7 @@ { - "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car/@Element";, + "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car/@Element";, "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)", "odata.editLink": "Car(15)", "odata.mediaEditLink": "Car(15)/$value", "odata.mediaReadLink": "Car(15)/$value", http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/15/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Car/15/entity.xml b/fit/src/main/resources/V30/Car/15/entity.xml index 2af0d96..2fcfe44 100644 --- a/fit/src/main/resources/V30/Car/15/entity.xml +++ b/fit/src/main/resources/V30/Car/15/entity.xml @@ -19,8 +19,8 @@ under the License. --> -<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id> +<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Car" href="Car(15)" /> <title /> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/16/entity.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Car/16/entity.full.json b/fit/src/main/resources/V30/Car/16/entity.full.json index 3ded37b..d0977cf 100644 --- a/fit/src/main/resources/V30/Car/16/entity.full.json +++ b/fit/src/main/resources/V30/Car/16/entity.full.json @@ -1,7 +1,7 @@ { - "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car/@Element";, + "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car/@Element";, "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(16)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(16)", "odata.editLink": "Car(16)", "odata.mediaEditLink": "Car(16)/$value", "odata.mediaReadLink": "Car(16)/$value", http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/16/entity.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Car/16/entity.xml b/fit/src/main/resources/V30/Car/16/entity.xml index f2c136b..07507c2 100644 --- a/fit/src/main/resources/V30/Car/16/entity.xml +++ b/fit/src/main/resources/V30/Car/16/entity.xml @@ -19,13 +19,13 @@ under the License. --> -<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/"; +<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(16)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(16)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Car" href="Car(16)" /> <title /> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/feed.full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Car/feed.full.json b/fit/src/main/resources/V30/Car/feed.full.json index 150bd7d..c89a00d 100644 --- a/fit/src/main/resources/V30/Car/feed.full.json +++ b/fit/src/main/resources/V30/Car/feed.full.json @@ -1,10 +1,10 @@ { - "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car";, + "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car";, "value": [ { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)", "odata.editLink": "Car(11)", "odata.mediaEditLink": "Car(11)/$value", "odata.mediaReadLink": "Car(11)/$value", @@ -16,7 +16,7 @@ }, { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)", "odata.editLink": "Car(12)", "odata.mediaEditLink": "Car(12)/$value", "odata.mediaReadLink": "Car(12)/$value", @@ -28,7 +28,7 @@ }, { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)", "odata.editLink": "Car(13)", "odata.mediaEditLink": "Car(13)/$value", "odata.mediaReadLink": "Car(13)/$value", @@ -40,7 +40,7 @@ }, { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)", "odata.editLink": "Car(14)", "odata.mediaEditLink": "Car(14)/$value", "odata.mediaReadLink": "Car(14)/$value", @@ -52,7 +52,7 @@ }, { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)", "odata.editLink": "Car(15)", "odata.mediaEditLink": "Car(15)/$value", "odata.mediaReadLink": "Car(15)/$value", @@ -64,7 +64,7 @@ }, { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(16)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(16)", "odata.editLink": "Car(16)", "odata.mediaEditLink": "Car(16)/$value", "odata.mediaReadLink": "Car(16)/$value", @@ -77,7 +77,7 @@ }, { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(17)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(17)", "odata.editLink": "Car(17)", "odata.mediaEditLink": "Car(17)/$value", "odata.mediaReadLink": "Car(17)/$value", @@ -89,7 +89,7 @@ }, { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(18)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(18)", "odata.editLink": "Car(18)", "odata.mediaEditLink": "Car(18)/$value", "odata.mediaReadLink": "Car(18)/$value", @@ -101,7 +101,7 @@ }, { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(19)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(19)", "odata.editLink": "Car(19)", "odata.mediaEditLink": "Car(19)/$value", "odata.mediaReadLink": "Car(19)/$value", @@ -113,7 +113,7 @@ }, { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(20)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(20)", "odata.editLink": "Car(20)", "odata.mediaEditLink": "Car(20)/$value", "odata.mediaReadLink": "Car(20)/$value", @@ -125,7 +125,7 @@ }, { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(21)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(21)", "odata.editLink": "Car(21)", "odata.mediaEditLink": "Car(21)/$value", "odata.mediaReadLink": "Car(21)/$value", @@ -137,7 +137,7 @@ }, { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(22)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(22)", "odata.editLink": "Car(22)", "odata.mediaEditLink": "Car(22)/$value", "odata.mediaReadLink": "Car(22)/$value", @@ -149,7 +149,7 @@ }, { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(27)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(27)", "odata.editLink": "Car(27)", "odata.mediaEditLink": "Car(27)/$value", "odata.mediaReadLink": "Car(27)/$value", @@ -161,7 +161,7 @@ }, { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(30)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(30)", "odata.editLink": "Car(30)", "odata.mediaEditLink": "Car(30)/$value", "odata.mediaReadLink": "Car(30)/$value", @@ -173,7 +173,7 @@ }, { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(31)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(31)", "odata.editLink": "Car(31)", "odata.mediaEditLink": "Car(31)/$value", "odata.mediaReadLink": "Car(31)/$value", @@ -185,7 +185,7 @@ }, { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(32)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(32)", "odata.editLink": "Car(32)", "odata.mediaEditLink": "Car(32)/$value", "odata.mediaReadLink": "Car(32)/$value", @@ -197,7 +197,7 @@ }, { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(33)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(33)", "odata.editLink": "Car(33)", "odata.mediaEditLink": "Car(33)/$value", "odata.mediaReadLink": "Car(33)/$value", @@ -210,7 +210,7 @@ }, { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(34)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(34)", "odata.editLink": "Car(34)", "odata.mediaEditLink": "Car(34)/$value", "odata.mediaReadLink": "Car(34)/$value", @@ -222,7 +222,7 @@ }, { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(35)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(35)", "odata.editLink": "Car(35)", "odata.mediaEditLink": "Car(35)/$value", "odata.mediaReadLink": "Car(35)/$value", @@ -234,7 +234,7 @@ }, { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(40)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(40)", "odata.editLink": "Car(40)", "odata.mediaEditLink": "Car(40)/$value", "odata.mediaReadLink": "Car(40)/$value", @@ -246,7 +246,7 @@ }, { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(43)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(43)", "odata.editLink": "Car(43)", "odata.mediaEditLink": "Car(43)/$value", "odata.mediaReadLink": "Car(43)/$value", @@ -258,7 +258,7 @@ }, { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(44)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(44)", "odata.editLink": "Car(44)", "odata.mediaEditLink": "Car(44)/$value", "odata.mediaReadLink": "Car(44)/$value", @@ -270,7 +270,7 @@ }, { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(45)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(45)", "odata.editLink": "Car(45)", "odata.mediaEditLink": "Car(45)/$value", "odata.mediaReadLink": "Car(45)/$value", @@ -282,7 +282,7 @@ }, { "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(46)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(46)", "odata.editLink": "Car(46)", "odata.mediaEditLink": "Car(46)/$value", "odata.mediaReadLink": "Car(46)/$value", http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/feed.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Car/feed.xml b/fit/src/main/resources/V30/Car/feed.xml index aad52f3..195ae6d 100644 --- a/fit/src/main/resources/V30/Car/feed.xml +++ b/fit/src/main/resources/V30/Car/feed.xml @@ -19,13 +19,13 @@ under the License. --> -<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car</id> +<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car</id> <title type="text">Car</title> <updated>2014-02-06T14:09:08Z</updated> <link rel="self" title="Car" href="Car" /> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Car" href="Car(11)" /> <title /> @@ -43,7 +43,7 @@ </m:properties> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Car" href="Car(12)" /> <title /> @@ -61,7 +61,7 @@ </m:properties> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Car" href="Car(13)" /> <title /> @@ -79,7 +79,7 @@ </m:properties> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Car" href="Car(14)" /> <title /> @@ -97,7 +97,7 @@ </m:properties> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Car" href="Car(15)" /> <title /> @@ -115,7 +115,7 @@ </m:properties> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(16)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(16)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Car" href="Car(16)" /> <title /> @@ -133,7 +133,7 @@ </m:properties> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(17)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(17)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Car" href="Car(17)" /> <title /> @@ -151,7 +151,7 @@ </m:properties> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(18)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(18)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Car" href="Car(18)" /> <title /> @@ -169,7 +169,7 @@ </m:properties> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(19)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(19)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Car" href="Car(19)" /> <title /> @@ -187,7 +187,7 @@ </m:properties> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(20)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(20)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Car" href="Car(20)" /> <title /> @@ -205,7 +205,7 @@ </m:properties> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(21)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(21)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Car" href="Car(21)" /> <title /> @@ -223,7 +223,7 @@ </m:properties> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(22)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(22)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Car" href="Car(22)" /> <title /> @@ -241,7 +241,7 @@ </m:properties> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(27)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(27)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Car" href="Car(27)" /> <title /> @@ -259,7 +259,7 @@ </m:properties> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(30)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(30)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Car" href="Car(30)" /> <title /> @@ -277,7 +277,7 @@ </m:properties> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(31)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(31)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Car" href="Car(31)" /> <title /> @@ -295,7 +295,7 @@ </m:properties> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(32)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(32)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Car" href="Car(32)" /> <title /> @@ -313,7 +313,7 @@ </m:properties> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(33)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(33)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Car" href="Car(33)" /> <title /> @@ -331,7 +331,7 @@ </m:properties> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(34)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(34)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Car" href="Car(34)" /> <title /> @@ -349,7 +349,7 @@ </m:properties> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(35)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(35)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Car" href="Car(35)" /> <title /> @@ -367,7 +367,7 @@ </m:properties> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(40)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(40)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Car" href="Car(40)" /> <title /> @@ -385,7 +385,7 @@ </m:properties> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(43)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(43)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Car" href="Car(43)" /> <title /> @@ -403,7 +403,7 @@ </m:properties> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(44)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(44)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Car" href="Car(44)" /> <title /> @@ -421,7 +421,7 @@ </m:properties> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(45)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(45)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Car" href="Car(45)" /> <title /> @@ -439,7 +439,7 @@ </m:properties> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(46)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(46)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Car" href="Car(46)" /> <title /> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/((1 add VIN) eq 16).full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Car/filter/((1 add VIN) eq 16).full.json b/fit/src/main/resources/V30/Car/filter/((1 add VIN) eq 16).full.json index 7ab1c21..4cef43b 100644 --- a/fit/src/main/resources/V30/Car/filter/((1 add VIN) eq 16).full.json +++ b/fit/src/main/resources/V30/Car/filter/((1 add VIN) eq 16).full.json @@ -1 +1 @@ -{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)","odata.editLink":"Car(15)","odata.mediaEditLink":"Car(15)/$value","odata.mediaReadLink":"Car(15)/$value","odata.mediaContentType":"application/octet-stream","[email protected]":"Car(15)/Photo","[email protected]":"Car(15)/Video","VIN":15,"Description":"kphszztczthjacvjnttrarxru"}]} \ No newline at end of file +{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)","odata.editLink":"Car(15)","odata.mediaEditLink":"Car(15)/$value","odata.mediaReadLink":"Car(15)/$value","odata.mediaContentType":"application/octet-stream","[email protected]":"Car(15)/Photo","[email protected]":"Car(15)/Video","VIN":15,"Description":"kphszztczthjacvjnttrarxru"}]} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/((1 add VIN) eq 16).xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Car/filter/((1 add VIN) eq 16).xml b/fit/src/main/resources/V30/Car/filter/((1 add VIN) eq 16).xml index ac39c3a..bd74712 100644 --- a/fit/src/main/resources/V30/Car/filter/((1 add VIN) eq 16).xml +++ b/fit/src/main/resources/V30/Car/filter/((1 add VIN) eq 16).xml @@ -19,13 +19,13 @@ under the License. --> -<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car</id> +<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car</id> <title type="text">Car</title> <updated>2014-02-13T12:09:31Z</updated> <link rel="self" title="Car" href="Car" /> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Car" href="Car(15)" /> <title /> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/((VIN add 1) eq 16).full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Car/filter/((VIN add 1) eq 16).full.json b/fit/src/main/resources/V30/Car/filter/((VIN add 1) eq 16).full.json index 7ab1c21..4cef43b 100644 --- a/fit/src/main/resources/V30/Car/filter/((VIN add 1) eq 16).full.json +++ b/fit/src/main/resources/V30/Car/filter/((VIN add 1) eq 16).full.json @@ -1 +1 @@ -{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)","odata.editLink":"Car(15)","odata.mediaEditLink":"Car(15)/$value","odata.mediaReadLink":"Car(15)/$value","odata.mediaContentType":"application/octet-stream","[email protected]":"Car(15)/Photo","[email protected]":"Car(15)/Video","VIN":15,"Description":"kphszztczthjacvjnttrarxru"}]} \ No newline at end of file +{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)","odata.editLink":"Car(15)","odata.mediaEditLink":"Car(15)/$value","odata.mediaReadLink":"Car(15)/$value","odata.mediaContentType":"application/octet-stream","[email protected]":"Car(15)/Photo","[email protected]":"Car(15)/Video","VIN":15,"Description":"kphszztczthjacvjnttrarxru"}]} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/((VIN add 1) eq 16).xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Car/filter/((VIN add 1) eq 16).xml b/fit/src/main/resources/V30/Car/filter/((VIN add 1) eq 16).xml index ac39c3a..bd74712 100644 --- a/fit/src/main/resources/V30/Car/filter/((VIN add 1) eq 16).xml +++ b/fit/src/main/resources/V30/Car/filter/((VIN add 1) eq 16).xml @@ -19,13 +19,13 @@ under the License. --> -<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car</id> +<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car</id> <title type="text">Car</title> <updated>2014-02-13T12:09:31Z</updated> <link rel="self" title="Car" href="Car" /> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Car" href="Car(15)" /> <title /> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/((VIN lt 16) and (VIN gt 12)).full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Car/filter/((VIN lt 16) and (VIN gt 12)).full.json b/fit/src/main/resources/V30/Car/filter/((VIN lt 16) and (VIN gt 12)).full.json index 3106505..683836c 100644 --- a/fit/src/main/resources/V30/Car/filter/((VIN lt 16) and (VIN gt 12)).full.json +++ b/fit/src/main/resources/V30/Car/filter/((VIN lt 16) and (VIN gt 12)).full.json @@ -1 +1 @@ -{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)","odata.editLink":"Car(13)","odata.mediaEditLink":"Car(13)/$value","odata.mediaReadLink":"Car(13)/$value","odata.mediaContentType":"application/octet-stream","[email protected]":"Car(13)/Photo","[email protected]":"Car(13)/Video","VIN":13,"Description":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)","odata.editLink":"Car(14)","odata.mediaEditLink":"Car(14)/$value","odata.mediaReadLink":"Car(14)/$value","odata.mediaContentType":"application/octet-stream","[email protected]":"Car(14)/Photo","[email protected]":"Car(14)/Video","VIN":14,"Description":"New De scription(1392222565917)"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)","odata.editLink":"Car(15)","odata.mediaEditLink":"Car(15)/$value","odata.mediaReadLink":"Car(15)/$value","odata.mediaContentType":"application/octet-stream","[email protected]":"Car(15)/Photo","[email protected]":"Car(15)/Video","VIN":15,"Description":"kphszztczthjacvjnttrarxru"}]} \ No newline at end of file +{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)","odata.editLink":"Car(13)","odata.mediaEditLink":"Car(13)/$value","odata.mediaReadLink":"Car(13)/$value","odata.mediaContentType":"application/octet-stream","[email protected]":"Car(13)/Photo","[email protected]":"Car(13)/Video","VIN":13,"Description":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)","odata.editLink":"Car(14)","odata.mediaEditLink":"Car(14)/$value","odata.mediaReadLink":"Car(14)/$value","odata.mediaContentType":"application/octet-stream","[email protected]":"Car(14)/Photo","[email protected]":"Car(14)/Video","VIN":14,"Description":"New Description(1392222565917)"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)","odata.editLink":"Car(15)","odata.mediaEditLink":"Car(15)/$value","odata.mediaReadLink":"Car(15)/$value","odata.mediaContentType":"application/octet-stream","[email protected]":"Car(15)/Photo","[email protected]":"Car(15)/Video","VIN":15,"Description":"kphszztczthjacvjnttrarxru"}]} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/((VIN lt 16) and (VIN gt 12)).xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Car/filter/((VIN lt 16) and (VIN gt 12)).xml b/fit/src/main/resources/V30/Car/filter/((VIN lt 16) and (VIN gt 12)).xml index 9baac4d..83dd66e 100644 --- a/fit/src/main/resources/V30/Car/filter/((VIN lt 16) and (VIN gt 12)).xml +++ b/fit/src/main/resources/V30/Car/filter/((VIN lt 16) and (VIN gt 12)).xml @@ -19,13 +19,13 @@ under the License. --> -<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car</id> +<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car</id> <title type="text">Car</title> <updated>2014-02-13T12:09:31Z</updated> <link rel="self" title="Car" href="Car" /> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Car" href="Car(13)" /> <title /> @@ -43,7 +43,7 @@ </m:properties> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Car" href="Car(14)" /> <title /> @@ -61,7 +61,7 @@ </m:properties> </entry> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Car" href="Car(15)" /> <title /> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/(16 eq (1 add VIN)).full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Car/filter/(16 eq (1 add VIN)).full.json b/fit/src/main/resources/V30/Car/filter/(16 eq (1 add VIN)).full.json index 7ab1c21..4cef43b 100644 --- a/fit/src/main/resources/V30/Car/filter/(16 eq (1 add VIN)).full.json +++ b/fit/src/main/resources/V30/Car/filter/(16 eq (1 add VIN)).full.json @@ -1 +1 @@ -{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)","odata.editLink":"Car(15)","odata.mediaEditLink":"Car(15)/$value","odata.mediaReadLink":"Car(15)/$value","odata.mediaContentType":"application/octet-stream","[email protected]":"Car(15)/Photo","[email protected]":"Car(15)/Video","VIN":15,"Description":"kphszztczthjacvjnttrarxru"}]} \ No newline at end of file +{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)","odata.editLink":"Car(15)","odata.mediaEditLink":"Car(15)/$value","odata.mediaReadLink":"Car(15)/$value","odata.mediaContentType":"application/octet-stream","[email protected]":"Car(15)/Photo","[email protected]":"Car(15)/Video","VIN":15,"Description":"kphszztczthjacvjnttrarxru"}]} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/(16 eq (1 add VIN)).xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Car/filter/(16 eq (1 add VIN)).xml b/fit/src/main/resources/V30/Car/filter/(16 eq (1 add VIN)).xml index ac39c3a..bd74712 100644 --- a/fit/src/main/resources/V30/Car/filter/(16 eq (1 add VIN)).xml +++ b/fit/src/main/resources/V30/Car/filter/(16 eq (1 add VIN)).xml @@ -19,13 +19,13 @@ under the License. --> -<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car</id> +<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car</id> <title type="text">Car</title> <updated>2014-02-13T12:09:31Z</updated> <link rel="self" title="Car" href="Car" /> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Car" href="Car(15)" /> <title /> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/(VIN eq 16).full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Car/filter/(VIN eq 16).full.json b/fit/src/main/resources/V30/Car/filter/(VIN eq 16).full.json index 6c1637c..d1d0b02 100644 --- a/fit/src/main/resources/V30/Car/filter/(VIN eq 16).full.json +++ b/fit/src/main/resources/V30/Car/filter/(VIN eq 16).full.json @@ -1,8 +1,8 @@ { - "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car";, + "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car";, "value": [{ "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Car", - "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(16)", + "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(16)", "odata.editLink": "Car(16)", "odata.mediaEditLink": "Car(16)/$value", "odata.mediaReadLink": "Car(16)/$value", http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/(VIN eq 16).xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Car/filter/(VIN eq 16).xml b/fit/src/main/resources/V30/Car/filter/(VIN eq 16).xml index 83f6e67..c770fe6 100644 --- a/fit/src/main/resources/V30/Car/filter/(VIN eq 16).xml +++ b/fit/src/main/resources/V30/Car/filter/(VIN eq 16).xml @@ -19,13 +19,13 @@ under the License. --> -<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml";> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car</id> +<feed xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/"; xmlns="http://www.w3.org/2005/Atom"; xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"; xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"; xmlns:georss="http://www.georss.org/georss"; xmlns:gml="http://www.opengis.net/gml";> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car</id> <title type="text">Car</title> <updated>2014-02-13T12:09:31Z</updated> <link rel="self" title="Car" href="Car" /> <entry> - <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(16)</id> + <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(16)</id> <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"; /> <link rel="edit" title="Car" href="Car(16)" /> <title /> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Car/filter/(VIN lt 16).full.json ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/V30/Car/filter/(VIN lt 16).full.json b/fit/src/main/resources/V30/Car/filter/(VIN lt 16).full.json index e14ea11..29ff01f 100644 --- a/fit/src/main/resources/V30/Car/filter/(VIN lt 16).full.json +++ b/fit/src/main/resources/V30/Car/filter/(VIN lt 16).full.json @@ -1 +1 @@ -{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)","odata.editLink":"Car(11)","odata.mediaEditLink":"Car(11)/$value","odata.mediaReadLink":"Car(11)/$value","odata.mediaContentType":"application/octet-stream","[email protected]":"Car(11)/Photo","[email protected]":"Car(11)/Video","VIN":11,"Description":"cenbviijieljtrtdslbuiqubcvhxhzenidqdnaopplvlqc"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)","odata.editLink":"Car(12)","odata.mediaEditLink":"Car(12)/$value","odata.mediaReadLink":"Car(12)/$value","odata.mediaContentType":"application/octet-stream","[email protected]":"Car(12)/Photo","[email protected]":"C ar(12)/Video","VIN":12,"Description":"lx"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)","odata.editLink":"Car(13)","odata.mediaEditLink":"Car(13)/$value","odata.mediaReadLink":"Car(13)/$value","odata.mediaContentType":"application/octet-stream","[email protected]":"Car(13)/Photo","[email protected]":"Car(13)/Video","VIN":13,"Description":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)","odata.editLink":"Car(14)","odata.mediaEditLink":"Car(14)/$value","odata.mediaReadLink":"Car(14)/$value","odata.mediaContentType":"application/octet-stream","[email protected]":"Car(14)/Photo","[email protected]":"Car(14)/Video","VIN":14,"Description":"New Description(1392222565917)"},{"odata.type":"Microsoft.Test.OData.Services.A storiaDefaultService.Car","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)","odata.editLink":"Car(15)","odata.mediaEditLink":"Car(15)/$value","odata.mediaReadLink":"Car(15)/$value","odata.mediaContentType":"application/octet-stream","[email protected]":"Car(15)/Photo","[email protected]":"Car(15)/Video","VIN":15,"Description":"kphszztczthjacvjnttrarxru"}]} \ No newline at end of file +{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Car","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(11)","odata.editLink":"Car(11)","odata.mediaEditLink":"Car(11)/$value","odata.mediaReadLink":"Car(11)/$value","odata.mediaContentType":"application/octet-stream","[email protected]":"Car(11)/Photo","[email protected]":"Car(11)/Video","VIN":11,"Description":"cenbviijieljtrtdslbuiqubcvhxhzenidqdnaopplvlqc"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(12)","odata.editLink":"Car(12)","odata.mediaEditLink":"Car(12)/$value","odata.mediaReadLink":"Car(12)/$value","odata.mediaContentType":"application/octet-stream","[email protected]":"Car(12)/Photo","[email protected]" :"Car(12)/Video","VIN":12,"Description":"lx"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(13)","odata.editLink":"Car(13)","odata.mediaEditLink":"Car(13)/$value","odata.mediaReadLink":"Car(13)/$value","odata.mediaContentType":"application/octet-stream","[email protected]":"Car(13)/Photo","[email protected]":"Car(13)/Video","VIN":13,"Description":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(14)","odata.editLink":"Car(14)","odata.mediaEditLink":"Car(14)/$value","odata.mediaReadLink":"Car(14)/$value","odata.mediaContentType":"application/octet-stream","[email protected]":"Car(14)/Photo","[email protected]":"Car(14)/Video","VIN":14,"Description":"New Description(1392222565917)"},{"odata.type":"Microsoft.Test.OData.Servi ces.AstoriaDefaultService.Car","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Car(15)","odata.editLink":"Car(15)","odata.mediaEditLink":"Car(15)/$value","odata.mediaReadLink":"Car(15)/$value","odata.mediaContentType":"application/octet-stream","[email protected]":"Car(15)/Photo","[email protected]":"Car(15)/Video","VIN":15,"Description":"kphszztczthjacvjnttrarxru"}]} \ No newline at end of file
