You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by il...@apache.org on 2014/07/30 08:24:39 UTC
[05/20] [OLINGO-377] Removing unused cargo properties,
upgrading Tomcat, renaming cargo.servlet.port to tomcat.servlet.port
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/filter/substringof('kdcuklu', Description) eq true.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/filter/substringof('kdcuklu', Description) eq true.full.json b/fit/src/main/resources/V30/Product/filter/substringof('kdcuklu', Description) eq true.full.json
index 3ce98e8..7953935 100644
--- a/fit/src/main/resources/V30/Product/filter/substringof('kdcuklu', Description) eq true.full.json
+++ b/fit/src/main/resources/V30/Product/filter/substringof('kdcuklu', Description) eq true.full.json
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)","odata.etag":"W/\"'%D1%8F%E3%82%A1%E3%81%9D%E7%8F%B1%EF%BD%9A%E3%81%9D%E7%B8%B7%E3%83%9F%D1%91%E3%83%9C%E3%81%9C%D0%AF%E6%AD%B9%E3%83%9F%E3%83%90%E3%81%BB%E3%83%9D%E3%81%BB%E3%82%BC%EF%BD%A6%E7%95%9A%E3%82%AF%E3%81%BB%EF%BE%88%E3%82%BC%E3%81%BE%E8%A3%B9%E3%81%B3%E3%81%B4%E3%81%B9%E6%AD%B9%E3%81%82%E3%83%80%E3%82%B0%E3%82%BD%E3%81%B3%D1%91%D1%91%E3%82%93%E3%83%9D%E3%81%9D%E3%83%9F%E3%83%9E%E3%81%BB%E3%82%BD%EF%BD%9A%E8%A3%B9%E3%81%BC%E3%82%93%E7%8F%B1%E3%81%B9%E3%82%BC%E6%AD%B9%E3%83%9F%EF%BD%9A%E3%83%9D%E3%81%9C%E3%81%9E%E3%82%BD%E3%83%9D%E3%81%BA%E3%83%9F%E3%83%80%E6%AC%B2%E5%BC%8C%D1%8F%E3%82%BD%E3%82%BD%E3%81%BD%E3%82%BD%E3%81%B9%E3%83%90%E9%BB%91%E4%B9%9D%E7%8F%B1%E3%81%9E%E3%83
%9D%D0%AF%E3%83%80%E3%82%BD%E3%82%BC','%E8%A3%B9%E3%81%BA%E3%82%BE%E7%B8%B7%E3%82%BC%E3%81%BB%E3%82%BC%E3%82%BD%EF%BD%9A%E3%82%BC%EF%BD%9A%E3%81%9C%E3%82%BD%EF%BE%9D%E3%82%BC%E3%82%92%E3%81%BE%E3%81%81%E3%83%80%E3%81%B3%E3%82%BF%E7%8F%B1%E3%82%BF%E3%83%90%E3%82%BE%E3%82%BE%E3%83%9F%E3%83%81%E3%83%9C%E6%9A%A6%E3%82%BD%E3%82%A1%E3%81%B9%E8%A3%B9%E3%83%9D%E3%81%9C%E3%82%92%EF%BD%A6%E3%81%B3%E3%82%BC%E3%83%9E%E3%82%92%E3%82%BC%E3%83%9F%E3%81%BD%E3%83%9C%E3%82%BD%EF%BE%88%E3%81%BD%E3%83%9D%E3%83%9F%E3%82%BE%EF%BD%81%E3%82%BF%E3%82%BD%E3%81%81%E3%83%9E%E8%A3%B9%E3%82%B0%EF%BD%81%E3%82%BF%E6%AD%B9%E6%AD%B9%E3%81%9F%EF%BD%9A%E3%83%90%E7%B8%B7%E3%83%81%E3%82%93%E3%82%92%D0%AF%E3%82%93%E7%95%9A%E3%81%9F%E3%82%BE%E3%81%B9%E3%82%BD%E6%AC%B2%E3%82%A1%E7%B8%B7%D1%8F%E3%83%9F%E3%82%92%EF%BD%A6%E3%81%9B%EF%BD%A6%E3%82%BC%E3%83%9E%E3%82%BD%E3%83%9C%E3%82%BC%E3%82%BC%E3%83%81%E3%81%BC%E7%95%9A%E7%8F%B1'\"","odata.editLink":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedP
roduct","RelatedProducts@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts","Detail@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Detail","Reviews@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Reviews","Photos@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Photos","#DefaultContainer.ChangeProductDimensions":{"title":"ChangeProductDimensions","target":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"},"Picture@odata.mediaEditLink":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture","ProductId":-9,"Description":"kdcuklu","Dimensions":{"odata.type":"Mi
crosoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"-25802798699776200000000000000","Height@odata.type":"Edm.Decimal","Height":"38.543408267225","Depth@odata.type":"Edm.Decimal","Depth":"-8459.21552673786"},"BaseConcurrency":"\u044f\u30a1\u305d\u73f1\uff5a\u305d\u7e37\u30df\u0451\u30dc\u305c\u042f\u6b79\u30df\u30d0\u307b\u30dd\u307b\u30bc\uff66\u755a\u30af\u307b\uff88\u30bc\u307e\u88f9\u3073\u3074\u3079\u6b79\u3042\u30c0\u30b0\u30bd\u3073\u0451\u0451\u3093\u30dd\u305d\u30df\u30de\u307b\u30bd\uff5a\u88f9\u307c\u3093\u73f1\u3079\u30bc\u6b79\u30df\uff5a\u30dd\u305c\u305e\u30bd\u30dd\u307a\u30df\u30c0\u6b32\u5f0c\u044f\u30bd\u30bd\u307d\u30bd\u3079\u30d0\u9ed1\u4e5d\u73f1\u305e\u30dd\u042f\u30c0\u30bd\u30bc","ComplexConcurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo","Token":"vkvezqrkjuykjmk\u00dfyqpliyv\u00df","QueriedDateTime":null},"NestedComplexConcurrency":{"odata.type":"Microsoft.Test.
OData.Services.AstoriaDefaultService.AuditInfo","ModifiedDate@odata.type":"Edm.DateTime","ModifiedDate":"2012-11-20T10:27:48.8528105","ModifiedBy":"gtpakgdzcfjyumozyqzrhxuypuzfqhvmzeepvjllfncsjuumjzdxvlhjprgphzfvjxzsklilojgtqhktpj","Concurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo","Token":"\u30dc\u30dc\uff9d\u3072\u0451\u7e37\u305d\u30a1\u307d\u30bc\u3093\u30c0\u73f1\u30bc\u3041\uff5a\u755a\u4e9c\u4e9c\u30bc\u3072\u30d0\u4e9c\u307b\u3079\u30cf\uff9d\uff88\u305f\u30dd\u4e5d\u30be\u3079\u30c0\u305e\u755a\u30bf\uff5a\u30be\u307c\u30a1\u042f\u30c0\u3092\u3042","QueriedDateTime@odata.type":"Edm.DateTime","QueriedDateTime":"2005-10-12T22:26:24.9396883"}},"Discontinued@odata.type":"Edm.DateTime","Discontinued":"2005-07-28T13:09:56.9997833","ReplacementProductId":null,"DiscontinuedPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u7e37\u305f\u3079\u30cf\u30dc\u6b32\u30a1\u3093\u307d\u3074\u30bd\uf
f41\u307d\u30be\u3042\u305f\u3041\u30bd\u3073\u307c\u30dd\u4e5d\u30d0\u307b\u755a\u30bc\u307e\uff41\u307c\u305d\u042f\u4e9c\uff88\u3041\u30b0\u3074\u66a6\uff5a\u30dd\u307b\u30dc\u30dc\uff88\u3074","Extension":"bozhmrtomzrcmheuuqybovfiuypathsafmriopuccbqubhqbmuauxvnftvnpisgobryzqya"},"ChildConcurrencyToken":"\u88f9\u307a\u30be\u7e37\u30bc\u307b\u30bc\u30bd\uff5a\u30bc\uff5a\u305c\u30bd\uff9d\u30bc\u3092\u307e\u3041\u30c0\u3073\u30bf\u73f1\u30bf\u30d0\u30be\u30be\u30df\u30c1\u30dc\u66a6\u30bd\u30a1\u3079\u88f9\u30dd\u305c\u3092\uff66\u3073\u30bc\u30de\u3092\u30bc\u30df\u307d\u30dc\u30bd\uff88\u307d\u30dd\u30df\u30be\uff41\u30bf\u30bd\u3041\u30de\u88f9\u30b0\uff41\u30bf\u6b79\u6b79\u305f\uff5a\u30d0\u7e37\u30c1\u3093\u3092\u042f\u3093\u755a\u305f\u30be\u3079\u30bd\u6b32\u30a1\u7e37\u044f\u30df\u3092\uff66\u305b\uff66\u30bc\u30de\u30bd\u30dc\u30bc\u30bc\u30c1\u307c\u755a\u73f1"}]}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)","odata.etag":"W/\"'%D1%8F%E3%82%A1%E3%81%9D%E7%8F%B1%EF%BD%9A%E3%81%9D%E7%B8%B7%E3%83%9F%D1%91%E3%83%9C%E3%81%9C%D0%AF%E6%AD%B9%E3%83%9F%E3%83%90%E3%81%BB%E3%83%9D%E3%81%BB%E3%82%BC%EF%BD%A6%E7%95%9A%E3%82%AF%E3%81%BB%EF%BE%88%E3%82%BC%E3%81%BE%E8%A3%B9%E3%81%B3%E3%81%B4%E3%81%B9%E6%AD%B9%E3%81%82%E3%83%80%E3%82%B0%E3%82%BD%E3%81%B3%D1%91%D1%91%E3%82%93%E3%83%9D%E3%81%9D%E3%83%9F%E3%83%9E%E3%81%BB%E3%82%BD%EF%BD%9A%E8%A3%B9%E3%81%BC%E3%82%93%E7%8F%B1%E3%81%B9%E3%82%BC%E6%AD%B9%E3%83%9F%EF%BD%9A%E3%83%9D%E3%81%9C%E3%81%9E%E3%82%BD%E3%83%9D%E3%81%BA%E3%83%9F%E3%83%80%E6%AC%B2%E5%BC%8C%D1%8F%E3%82%BD%E3%82%BD%E3%81%BD%E3%82%BD%E3%81%B9%E3%83%90%E9%BB%91%E4%B9%9D%E7%8F%B1%E3%81%9E%E3%
83%9D%D0%AF%E3%83%80%E3%82%BD%E3%82%BC','%E8%A3%B9%E3%81%BA%E3%82%BE%E7%B8%B7%E3%82%BC%E3%81%BB%E3%82%BC%E3%82%BD%EF%BD%9A%E3%82%BC%EF%BD%9A%E3%81%9C%E3%82%BD%EF%BE%9D%E3%82%BC%E3%82%92%E3%81%BE%E3%81%81%E3%83%80%E3%81%B3%E3%82%BF%E7%8F%B1%E3%82%BF%E3%83%90%E3%82%BE%E3%82%BE%E3%83%9F%E3%83%81%E3%83%9C%E6%9A%A6%E3%82%BD%E3%82%A1%E3%81%B9%E8%A3%B9%E3%83%9D%E3%81%9C%E3%82%92%EF%BD%A6%E3%81%B3%E3%82%BC%E3%83%9E%E3%82%92%E3%82%BC%E3%83%9F%E3%81%BD%E3%83%9C%E3%82%BD%EF%BE%88%E3%81%BD%E3%83%9D%E3%83%9F%E3%82%BE%EF%BD%81%E3%82%BF%E3%82%BD%E3%81%81%E3%83%9E%E8%A3%B9%E3%82%B0%EF%BD%81%E3%82%BF%E6%AD%B9%E6%AD%B9%E3%81%9F%EF%BD%9A%E3%83%90%E7%B8%B7%E3%83%81%E3%82%93%E3%82%92%D0%AF%E3%82%93%E7%95%9A%E3%81%9F%E3%82%BE%E3%81%B9%E3%82%BD%E6%AC%B2%E3%82%A1%E7%B8%B7%D1%8F%E3%83%9F%E3%82%92%EF%BD%A6%E3%81%9B%EF%BD%A6%E3%82%BC%E3%83%9E%E3%82%BD%E3%83%9C%E3%82%BC%E3%82%BC%E3%83%81%E3%81%BC%E7%95%9A%E7%8F%B1'\"","odata.editLink":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.Discontinue
dProduct","RelatedProducts@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts","Detail@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Detail","Reviews@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Reviews","Photos@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Photos","#DefaultContainer.ChangeProductDimensions":{"title":"ChangeProductDimensions","target":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"},"Picture@odata.mediaEditLink":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture","ProductId":-9,"Description":"kdcuklu","Dimensions":{"odata.type":
"Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"-25802798699776200000000000000","Height@odata.type":"Edm.Decimal","Height":"38.543408267225","Depth@odata.type":"Edm.Decimal","Depth":"-8459.21552673786"},"BaseConcurrency":"\u044f\u30a1\u305d\u73f1\uff5a\u305d\u7e37\u30df\u0451\u30dc\u305c\u042f\u6b79\u30df\u30d0\u307b\u30dd\u307b\u30bc\uff66\u755a\u30af\u307b\uff88\u30bc\u307e\u88f9\u3073\u3074\u3079\u6b79\u3042\u30c0\u30b0\u30bd\u3073\u0451\u0451\u3093\u30dd\u305d\u30df\u30de\u307b\u30bd\uff5a\u88f9\u307c\u3093\u73f1\u3079\u30bc\u6b79\u30df\uff5a\u30dd\u305c\u305e\u30bd\u30dd\u307a\u30df\u30c0\u6b32\u5f0c\u044f\u30bd\u30bd\u307d\u30bd\u3079\u30d0\u9ed1\u4e5d\u73f1\u305e\u30dd\u042f\u30c0\u30bd\u30bc","ComplexConcurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo","Token":"vkvezqrkjuykjmk\u00dfyqpliyv\u00df","QueriedDateTime":null},"NestedComplexConcurrency":{"odata.type":"Microsoft.Te
st.OData.Services.AstoriaDefaultService.AuditInfo","ModifiedDate@odata.type":"Edm.DateTime","ModifiedDate":"2012-11-20T10:27:48.8528105","ModifiedBy":"gtpakgdzcfjyumozyqzrhxuypuzfqhvmzeepvjllfncsjuumjzdxvlhjprgphzfvjxzsklilojgtqhktpj","Concurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo","Token":"\u30dc\u30dc\uff9d\u3072\u0451\u7e37\u305d\u30a1\u307d\u30bc\u3093\u30c0\u73f1\u30bc\u3041\uff5a\u755a\u4e9c\u4e9c\u30bc\u3072\u30d0\u4e9c\u307b\u3079\u30cf\uff9d\uff88\u305f\u30dd\u4e5d\u30be\u3079\u30c0\u305e\u755a\u30bf\uff5a\u30be\u307c\u30a1\u042f\u30c0\u3092\u3042","QueriedDateTime@odata.type":"Edm.DateTime","QueriedDateTime":"2005-10-12T22:26:24.9396883"}},"Discontinued@odata.type":"Edm.DateTime","Discontinued":"2005-07-28T13:09:56.9997833","ReplacementProductId":null,"DiscontinuedPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u7e37\u305f\u3079\u30cf\u30dc\u6b32\u30a1\u3093\u307d\u3074\u30bd
\uff41\u307d\u30be\u3042\u305f\u3041\u30bd\u3073\u307c\u30dd\u4e5d\u30d0\u307b\u755a\u30bc\u307e\uff41\u307c\u305d\u042f\u4e9c\uff88\u3041\u30b0\u3074\u66a6\uff5a\u30dd\u307b\u30dc\u30dc\uff88\u3074","Extension":"bozhmrtomzrcmheuuqybovfiuypathsafmriopuccbqubhqbmuauxvnftvnpisgobryzqya"},"ChildConcurrencyToken":"\u88f9\u307a\u30be\u7e37\u30bc\u307b\u30bc\u30bd\uff5a\u30bc\uff5a\u305c\u30bd\uff9d\u30bc\u3092\u307e\u3041\u30c0\u3073\u30bf\u73f1\u30bf\u30d0\u30be\u30be\u30df\u30c1\u30dc\u66a6\u30bd\u30a1\u3079\u88f9\u30dd\u305c\u3092\uff66\u3073\u30bc\u30de\u3092\u30bc\u30df\u307d\u30dc\u30bd\uff88\u307d\u30dd\u30df\u30be\uff41\u30bf\u30bd\u3041\u30de\u88f9\u30b0\uff41\u30bf\u6b79\u6b79\u305f\uff5a\u30d0\u7e37\u30c1\u3093\u3092\u042f\u3093\u755a\u305f\u30be\u3079\u30bd\u6b32\u30a1\u7e37\u044f\u30df\u3092\uff66\u305b\uff66\u30bc\u30de\u30bd\u30dc\u30bc\u30bc\u30c1\u307c\u755a\u73f1"}]}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/filter/substringof('kdcuklu', Description) eq true.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/filter/substringof('kdcuklu', Description) eq true.xml b/fit/src/main/resources/V30/Product/filter/substringof('kdcuklu', Description) eq true.xml
index ed9c932..e7e7d1c 100644
--- a/fit/src/main/resources/V30/Product/filter/substringof('kdcuklu', Description) eq true.xml
+++ b/fit/src/main/resources/V30/Product/filter/substringof('kdcuklu', Description) eq true.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/Product</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/Product</id>
<title type="text">Product</title>
<updated>2014-02-13T14:31:06Z</updated>
<link rel="self" title="Product" href="Product" />
<entry m:etag="W/"'%D1%8F%E3%82%A1%E3%81%9D%E7%8F%B1%EF%BD%9A%E3%81%9D%E7%B8%B7%E3%83%9F%D1%91%E3%83%9C%E3%81%9C%D0%AF%E6%AD%B9%E3%83%9F%E3%83%90%E3%81%BB%E3%83%9D%E3%81%BB%E3%82%BC%EF%BD%A6%E7%95%9A%E3%82%AF%E3%81%BB%EF%BE%88%E3%82%BC%E3%81%BE%E8%A3%B9%E3%81%B3%E3%81%B4%E3%81%B9%E6%AD%B9%E3%81%82%E3%83%80%E3%82%B0%E3%82%BD%E3%81%B3%D1%91%D1%91%E3%82%93%E3%83%9D%E3%81%9D%E3%83%9F%E3%83%9E%E3%81%BB%E3%82%BD%EF%BD%9A%E8%A3%B9%E3%81%BC%E3%82%93%E7%8F%B1%E3%81%B9%E3%82%BC%E6%AD%B9%E3%83%9F%EF%BD%9A%E3%83%9D%E3%81%9C%E3%81%9E%E3%82%BD%E3%83%9D%E3%81%BA%E3%83%9F%E3%83%80%E6%AC%B2%E5%BC%8C%D1%8F%E3%82%BD%E3%82%BD%E3%81%BD%E3%82%BD%E3%81%B9%E3%83%90%E9%BB%91%E4%B9%9D%E7%8F%B1%E3%81%9E%E3%83%9D%D0%AF%E3%83%80%E3%82%BD%E3%82%BC','%E8%A3%B9%E3%81%BA%E3%82%BE%E7%B8%B7%E3%82%BC%E3%81%BB%E3%82%BC%E3%82%BD%EF%BD%9A%E3%82%BC%EF%BD%9A%E3%81%9C%E3%82%BD%EF%BE%9D%E3%82%BC%E3%82%92%E3%81%BE%E3%81%81%E3%83%80%E3%81%B3%E3%82%BF%E7%8F%B1%E3%82%BF%E3%83%90%E3%82%BE%E3%82%BE%E3%83%9F%E3%83%81%E3%83%9
C%E6%9A%A6%E3%82%BD%E3%82%A1%E3%81%B9%E8%A3%B9%E3%83%9D%E3%81%9C%E3%82%92%EF%BD%A6%E3%81%B3%E3%82%BC%E3%83%9E%E3%82%92%E3%82%BC%E3%83%9F%E3%81%BD%E3%83%9C%E3%82%BD%EF%BE%88%E3%81%BD%E3%83%9D%E3%83%9F%E3%82%BE%EF%BD%81%E3%82%BF%E3%82%BD%E3%81%81%E3%83%9E%E8%A3%B9%E3%82%B0%EF%BD%81%E3%82%BF%E6%AD%B9%E6%AD%B9%E3%81%9F%EF%BD%9A%E3%83%90%E7%B8%B7%E3%83%81%E3%82%93%E3%82%92%D0%AF%E3%82%93%E7%95%9A%E3%81%9F%E3%82%BE%E3%81%B9%E3%82%BD%E6%AC%B2%E3%82%A1%E7%B8%B7%D1%8F%E3%83%9F%E3%82%92%EF%BD%A6%E3%81%9B%EF%BD%A6%E3%82%BC%E3%83%9E%E3%82%BD%E3%83%9C%E3%82%BC%E3%82%BC%E3%83%81%E3%81%BC%E7%95%9A%E7%8F%B1'"">
- <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)</id>
+ <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)</id>
<category term="Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
<link rel="edit" title="Product" href="Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct" />
<link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/RelatedProducts" type="application/atom+xml;type=feed" title="RelatedProducts" href="Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts" />
@@ -38,7 +38,7 @@
<name />
</author>
<link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Picture" title="Picture" href="Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture" />
- <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
+ <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
<content type="application/xml">
<m:properties>
<d:ProductId m:type="Edm.Int32">-9</d:ProductId>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/filter/toupper(Description) eq 'KDCUKLU'.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/filter/toupper(Description) eq 'KDCUKLU'.full.json b/fit/src/main/resources/V30/Product/filter/toupper(Description) eq 'KDCUKLU'.full.json
index 3ce98e8..7953935 100644
--- a/fit/src/main/resources/V30/Product/filter/toupper(Description) eq 'KDCUKLU'.full.json
+++ b/fit/src/main/resources/V30/Product/filter/toupper(Description) eq 'KDCUKLU'.full.json
@@ -1 +1 @@
-{"odata.metadata":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct","odata.id":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)","odata.etag":"W/\"'%D1%8F%E3%82%A1%E3%81%9D%E7%8F%B1%EF%BD%9A%E3%81%9D%E7%B8%B7%E3%83%9F%D1%91%E3%83%9C%E3%81%9C%D0%AF%E6%AD%B9%E3%83%9F%E3%83%90%E3%81%BB%E3%83%9D%E3%81%BB%E3%82%BC%EF%BD%A6%E7%95%9A%E3%82%AF%E3%81%BB%EF%BE%88%E3%82%BC%E3%81%BE%E8%A3%B9%E3%81%B3%E3%81%B4%E3%81%B9%E6%AD%B9%E3%81%82%E3%83%80%E3%82%B0%E3%82%BD%E3%81%B3%D1%91%D1%91%E3%82%93%E3%83%9D%E3%81%9D%E3%83%9F%E3%83%9E%E3%81%BB%E3%82%BD%EF%BD%9A%E8%A3%B9%E3%81%BC%E3%82%93%E7%8F%B1%E3%81%B9%E3%82%BC%E6%AD%B9%E3%83%9F%EF%BD%9A%E3%83%9D%E3%81%9C%E3%81%9E%E3%82%BD%E3%83%9D%E3%81%BA%E3%83%9F%E3%83%80%E6%AC%B2%E5%BC%8C%D1%8F%E3%82%BD%E3%82%BD%E3%81%BD%E3%82%BD%E3%81%B9%E3%83%90%E9%BB%91%E4%B9%9D%E7%8F%B1%E3%81%9E%E3%83
%9D%D0%AF%E3%83%80%E3%82%BD%E3%82%BC','%E8%A3%B9%E3%81%BA%E3%82%BE%E7%B8%B7%E3%82%BC%E3%81%BB%E3%82%BC%E3%82%BD%EF%BD%9A%E3%82%BC%EF%BD%9A%E3%81%9C%E3%82%BD%EF%BE%9D%E3%82%BC%E3%82%92%E3%81%BE%E3%81%81%E3%83%80%E3%81%B3%E3%82%BF%E7%8F%B1%E3%82%BF%E3%83%90%E3%82%BE%E3%82%BE%E3%83%9F%E3%83%81%E3%83%9C%E6%9A%A6%E3%82%BD%E3%82%A1%E3%81%B9%E8%A3%B9%E3%83%9D%E3%81%9C%E3%82%92%EF%BD%A6%E3%81%B3%E3%82%BC%E3%83%9E%E3%82%92%E3%82%BC%E3%83%9F%E3%81%BD%E3%83%9C%E3%82%BD%EF%BE%88%E3%81%BD%E3%83%9D%E3%83%9F%E3%82%BE%EF%BD%81%E3%82%BF%E3%82%BD%E3%81%81%E3%83%9E%E8%A3%B9%E3%82%B0%EF%BD%81%E3%82%BF%E6%AD%B9%E6%AD%B9%E3%81%9F%EF%BD%9A%E3%83%90%E7%B8%B7%E3%83%81%E3%82%93%E3%82%92%D0%AF%E3%82%93%E7%95%9A%E3%81%9F%E3%82%BE%E3%81%B9%E3%82%BD%E6%AC%B2%E3%82%A1%E7%B8%B7%D1%8F%E3%83%9F%E3%82%92%EF%BD%A6%E3%81%9B%EF%BD%A6%E3%82%BC%E3%83%9E%E3%82%BD%E3%83%9C%E3%82%BC%E3%82%BC%E3%83%81%E3%81%BC%E7%95%9A%E7%8F%B1'\"","odata.editLink":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedP
roduct","RelatedProducts@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts","Detail@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Detail","Reviews@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Reviews","Photos@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Photos","#DefaultContainer.ChangeProductDimensions":{"title":"ChangeProductDimensions","target":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"},"Picture@odata.mediaEditLink":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture","ProductId":-9,"Description":"kdcuklu","Dimensions":{"odata.type":"Mi
crosoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"-25802798699776200000000000000","Height@odata.type":"Edm.Decimal","Height":"38.543408267225","Depth@odata.type":"Edm.Decimal","Depth":"-8459.21552673786"},"BaseConcurrency":"\u044f\u30a1\u305d\u73f1\uff5a\u305d\u7e37\u30df\u0451\u30dc\u305c\u042f\u6b79\u30df\u30d0\u307b\u30dd\u307b\u30bc\uff66\u755a\u30af\u307b\uff88\u30bc\u307e\u88f9\u3073\u3074\u3079\u6b79\u3042\u30c0\u30b0\u30bd\u3073\u0451\u0451\u3093\u30dd\u305d\u30df\u30de\u307b\u30bd\uff5a\u88f9\u307c\u3093\u73f1\u3079\u30bc\u6b79\u30df\uff5a\u30dd\u305c\u305e\u30bd\u30dd\u307a\u30df\u30c0\u6b32\u5f0c\u044f\u30bd\u30bd\u307d\u30bd\u3079\u30d0\u9ed1\u4e5d\u73f1\u305e\u30dd\u042f\u30c0\u30bd\u30bc","ComplexConcurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo","Token":"vkvezqrkjuykjmk\u00dfyqpliyv\u00df","QueriedDateTime":null},"NestedComplexConcurrency":{"odata.type":"Microsoft.Test.
OData.Services.AstoriaDefaultService.AuditInfo","ModifiedDate@odata.type":"Edm.DateTime","ModifiedDate":"2012-11-20T10:27:48.8528105","ModifiedBy":"gtpakgdzcfjyumozyqzrhxuypuzfqhvmzeepvjllfncsjuumjzdxvlhjprgphzfvjxzsklilojgtqhktpj","Concurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo","Token":"\u30dc\u30dc\uff9d\u3072\u0451\u7e37\u305d\u30a1\u307d\u30bc\u3093\u30c0\u73f1\u30bc\u3041\uff5a\u755a\u4e9c\u4e9c\u30bc\u3072\u30d0\u4e9c\u307b\u3079\u30cf\uff9d\uff88\u305f\u30dd\u4e5d\u30be\u3079\u30c0\u305e\u755a\u30bf\uff5a\u30be\u307c\u30a1\u042f\u30c0\u3092\u3042","QueriedDateTime@odata.type":"Edm.DateTime","QueriedDateTime":"2005-10-12T22:26:24.9396883"}},"Discontinued@odata.type":"Edm.DateTime","Discontinued":"2005-07-28T13:09:56.9997833","ReplacementProductId":null,"DiscontinuedPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u7e37\u305f\u3079\u30cf\u30dc\u6b32\u30a1\u3093\u307d\u3074\u30bd\uf
f41\u307d\u30be\u3042\u305f\u3041\u30bd\u3073\u307c\u30dd\u4e5d\u30d0\u307b\u755a\u30bc\u307e\uff41\u307c\u305d\u042f\u4e9c\uff88\u3041\u30b0\u3074\u66a6\uff5a\u30dd\u307b\u30dc\u30dc\uff88\u3074","Extension":"bozhmrtomzrcmheuuqybovfiuypathsafmriopuccbqubhqbmuauxvnftvnpisgobryzqya"},"ChildConcurrencyToken":"\u88f9\u307a\u30be\u7e37\u30bc\u307b\u30bc\u30bd\uff5a\u30bc\uff5a\u305c\u30bd\uff9d\u30bc\u3092\u307e\u3041\u30c0\u3073\u30bf\u73f1\u30bf\u30d0\u30be\u30be\u30df\u30c1\u30dc\u66a6\u30bd\u30a1\u3079\u88f9\u30dd\u305c\u3092\uff66\u3073\u30bc\u30de\u3092\u30bc\u30df\u307d\u30dc\u30bd\uff88\u307d\u30dd\u30df\u30be\uff41\u30bf\u30bd\u3041\u30de\u88f9\u30b0\uff41\u30bf\u6b79\u6b79\u305f\uff5a\u30d0\u7e37\u30c1\u3093\u3092\u042f\u3093\u755a\u305f\u30be\u3079\u30bd\u6b32\u30a1\u7e37\u044f\u30df\u3092\uff66\u305b\uff66\u30bc\u30de\u30bd\u30dc\u30bc\u30bc\u30c1\u307c\u755a\u73f1"}]}
\ No newline at end of file
+{"odata.metadata":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct","odata.id":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)","odata.etag":"W/\"'%D1%8F%E3%82%A1%E3%81%9D%E7%8F%B1%EF%BD%9A%E3%81%9D%E7%B8%B7%E3%83%9F%D1%91%E3%83%9C%E3%81%9C%D0%AF%E6%AD%B9%E3%83%9F%E3%83%90%E3%81%BB%E3%83%9D%E3%81%BB%E3%82%BC%EF%BD%A6%E7%95%9A%E3%82%AF%E3%81%BB%EF%BE%88%E3%82%BC%E3%81%BE%E8%A3%B9%E3%81%B3%E3%81%B4%E3%81%B9%E6%AD%B9%E3%81%82%E3%83%80%E3%82%B0%E3%82%BD%E3%81%B3%D1%91%D1%91%E3%82%93%E3%83%9D%E3%81%9D%E3%83%9F%E3%83%9E%E3%81%BB%E3%82%BD%EF%BD%9A%E8%A3%B9%E3%81%BC%E3%82%93%E7%8F%B1%E3%81%B9%E3%82%BC%E6%AD%B9%E3%83%9F%EF%BD%9A%E3%83%9D%E3%81%9C%E3%81%9E%E3%82%BD%E3%83%9D%E3%81%BA%E3%83%9F%E3%83%80%E6%AC%B2%E5%BC%8C%D1%8F%E3%82%BD%E3%82%BD%E3%81%BD%E3%82%BD%E3%81%B9%E3%83%90%E9%BB%91%E4%B9%9D%E7%8F%B1%E3%81%9E%E3%
83%9D%D0%AF%E3%83%80%E3%82%BD%E3%82%BC','%E8%A3%B9%E3%81%BA%E3%82%BE%E7%B8%B7%E3%82%BC%E3%81%BB%E3%82%BC%E3%82%BD%EF%BD%9A%E3%82%BC%EF%BD%9A%E3%81%9C%E3%82%BD%EF%BE%9D%E3%82%BC%E3%82%92%E3%81%BE%E3%81%81%E3%83%80%E3%81%B3%E3%82%BF%E7%8F%B1%E3%82%BF%E3%83%90%E3%82%BE%E3%82%BE%E3%83%9F%E3%83%81%E3%83%9C%E6%9A%A6%E3%82%BD%E3%82%A1%E3%81%B9%E8%A3%B9%E3%83%9D%E3%81%9C%E3%82%92%EF%BD%A6%E3%81%B3%E3%82%BC%E3%83%9E%E3%82%92%E3%82%BC%E3%83%9F%E3%81%BD%E3%83%9C%E3%82%BD%EF%BE%88%E3%81%BD%E3%83%9D%E3%83%9F%E3%82%BE%EF%BD%81%E3%82%BF%E3%82%BD%E3%81%81%E3%83%9E%E8%A3%B9%E3%82%B0%EF%BD%81%E3%82%BF%E6%AD%B9%E6%AD%B9%E3%81%9F%EF%BD%9A%E3%83%90%E7%B8%B7%E3%83%81%E3%82%93%E3%82%92%D0%AF%E3%82%93%E7%95%9A%E3%81%9F%E3%82%BE%E3%81%B9%E3%82%BD%E6%AC%B2%E3%82%A1%E7%B8%B7%D1%8F%E3%83%9F%E3%82%92%EF%BD%A6%E3%81%9B%EF%BD%A6%E3%82%BC%E3%83%9E%E3%82%BD%E3%83%9C%E3%82%BC%E3%82%BC%E3%83%81%E3%81%BC%E7%95%9A%E7%8F%B1'\"","odata.editLink":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.Discontinue
dProduct","RelatedProducts@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts","Detail@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Detail","Reviews@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Reviews","Photos@odata.navigationLinkUrl":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Photos","#DefaultContainer.ChangeProductDimensions":{"title":"ChangeProductDimensions","target":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"},"Picture@odata.mediaEditLink":"Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture","ProductId":-9,"Description":"kdcuklu","Dimensions":{"odata.type":
"Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"-25802798699776200000000000000","Height@odata.type":"Edm.Decimal","Height":"38.543408267225","Depth@odata.type":"Edm.Decimal","Depth":"-8459.21552673786"},"BaseConcurrency":"\u044f\u30a1\u305d\u73f1\uff5a\u305d\u7e37\u30df\u0451\u30dc\u305c\u042f\u6b79\u30df\u30d0\u307b\u30dd\u307b\u30bc\uff66\u755a\u30af\u307b\uff88\u30bc\u307e\u88f9\u3073\u3074\u3079\u6b79\u3042\u30c0\u30b0\u30bd\u3073\u0451\u0451\u3093\u30dd\u305d\u30df\u30de\u307b\u30bd\uff5a\u88f9\u307c\u3093\u73f1\u3079\u30bc\u6b79\u30df\uff5a\u30dd\u305c\u305e\u30bd\u30dd\u307a\u30df\u30c0\u6b32\u5f0c\u044f\u30bd\u30bd\u307d\u30bd\u3079\u30d0\u9ed1\u4e5d\u73f1\u305e\u30dd\u042f\u30c0\u30bd\u30bc","ComplexConcurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo","Token":"vkvezqrkjuykjmk\u00dfyqpliyv\u00df","QueriedDateTime":null},"NestedComplexConcurrency":{"odata.type":"Microsoft.Te
st.OData.Services.AstoriaDefaultService.AuditInfo","ModifiedDate@odata.type":"Edm.DateTime","ModifiedDate":"2012-11-20T10:27:48.8528105","ModifiedBy":"gtpakgdzcfjyumozyqzrhxuypuzfqhvmzeepvjllfncsjuumjzdxvlhjprgphzfvjxzsklilojgtqhktpj","Concurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo","Token":"\u30dc\u30dc\uff9d\u3072\u0451\u7e37\u305d\u30a1\u307d\u30bc\u3093\u30c0\u73f1\u30bc\u3041\uff5a\u755a\u4e9c\u4e9c\u30bc\u3072\u30d0\u4e9c\u307b\u3079\u30cf\uff9d\uff88\u305f\u30dd\u4e5d\u30be\u3079\u30c0\u305e\u755a\u30bf\uff5a\u30be\u307c\u30a1\u042f\u30c0\u3092\u3042","QueriedDateTime@odata.type":"Edm.DateTime","QueriedDateTime":"2005-10-12T22:26:24.9396883"}},"Discontinued@odata.type":"Edm.DateTime","Discontinued":"2005-07-28T13:09:56.9997833","ReplacementProductId":null,"DiscontinuedPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u7e37\u305f\u3079\u30cf\u30dc\u6b32\u30a1\u3093\u307d\u3074\u30bd
\uff41\u307d\u30be\u3042\u305f\u3041\u30bd\u3073\u307c\u30dd\u4e5d\u30d0\u307b\u755a\u30bc\u307e\uff41\u307c\u305d\u042f\u4e9c\uff88\u3041\u30b0\u3074\u66a6\uff5a\u30dd\u307b\u30dc\u30dc\uff88\u3074","Extension":"bozhmrtomzrcmheuuqybovfiuypathsafmriopuccbqubhqbmuauxvnftvnpisgobryzqya"},"ChildConcurrencyToken":"\u88f9\u307a\u30be\u7e37\u30bc\u307b\u30bc\u30bd\uff5a\u30bc\uff5a\u305c\u30bd\uff9d\u30bc\u3092\u307e\u3041\u30c0\u3073\u30bf\u73f1\u30bf\u30d0\u30be\u30be\u30df\u30c1\u30dc\u66a6\u30bd\u30a1\u3079\u88f9\u30dd\u305c\u3092\uff66\u3073\u30bc\u30de\u3092\u30bc\u30df\u307d\u30dc\u30bd\uff88\u307d\u30dd\u30df\u30be\uff41\u30bf\u30bd\u3041\u30de\u88f9\u30b0\uff41\u30bf\u6b79\u6b79\u305f\uff5a\u30d0\u7e37\u30c1\u3093\u3092\u042f\u3093\u755a\u305f\u30be\u3079\u30bd\u6b32\u30a1\u7e37\u044f\u30df\u3092\uff66\u305b\uff66\u30bc\u30de\u30bd\u30dc\u30bc\u30bc\u30c1\u307c\u755a\u73f1"}]}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/filter/toupper(Description) eq 'KDCUKLU'.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/filter/toupper(Description) eq 'KDCUKLU'.xml b/fit/src/main/resources/V30/Product/filter/toupper(Description) eq 'KDCUKLU'.xml
index 8a3fb07..e094c69 100644
--- a/fit/src/main/resources/V30/Product/filter/toupper(Description) eq 'KDCUKLU'.xml
+++ b/fit/src/main/resources/V30/Product/filter/toupper(Description) eq 'KDCUKLU'.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/Product</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/Product</id>
<title type="text">Product</title>
<updated>2014-02-13T14:31:07Z</updated>
<link rel="self" title="Product" href="Product" />
<entry m:etag="W/"'%D1%8F%E3%82%A1%E3%81%9D%E7%8F%B1%EF%BD%9A%E3%81%9D%E7%B8%B7%E3%83%9F%D1%91%E3%83%9C%E3%81%9C%D0%AF%E6%AD%B9%E3%83%9F%E3%83%90%E3%81%BB%E3%83%9D%E3%81%BB%E3%82%BC%EF%BD%A6%E7%95%9A%E3%82%AF%E3%81%BB%EF%BE%88%E3%82%BC%E3%81%BE%E8%A3%B9%E3%81%B3%E3%81%B4%E3%81%B9%E6%AD%B9%E3%81%82%E3%83%80%E3%82%B0%E3%82%BD%E3%81%B3%D1%91%D1%91%E3%82%93%E3%83%9D%E3%81%9D%E3%83%9F%E3%83%9E%E3%81%BB%E3%82%BD%EF%BD%9A%E8%A3%B9%E3%81%BC%E3%82%93%E7%8F%B1%E3%81%B9%E3%82%BC%E6%AD%B9%E3%83%9F%EF%BD%9A%E3%83%9D%E3%81%9C%E3%81%9E%E3%82%BD%E3%83%9D%E3%81%BA%E3%83%9F%E3%83%80%E6%AC%B2%E5%BC%8C%D1%8F%E3%82%BD%E3%82%BD%E3%81%BD%E3%82%BD%E3%81%B9%E3%83%90%E9%BB%91%E4%B9%9D%E7%8F%B1%E3%81%9E%E3%83%9D%D0%AF%E3%83%80%E3%82%BD%E3%82%BC','%E8%A3%B9%E3%81%BA%E3%82%BE%E7%B8%B7%E3%82%BC%E3%81%BB%E3%82%BC%E3%82%BD%EF%BD%9A%E3%82%BC%EF%BD%9A%E3%81%9C%E3%82%BD%EF%BE%9D%E3%82%BC%E3%82%92%E3%81%BE%E3%81%81%E3%83%80%E3%81%B3%E3%82%BF%E7%8F%B1%E3%82%BF%E3%83%90%E3%82%BE%E3%82%BE%E3%83%9F%E3%83%81%E3%83%9
C%E6%9A%A6%E3%82%BD%E3%82%A1%E3%81%B9%E8%A3%B9%E3%83%9D%E3%81%9C%E3%82%92%EF%BD%A6%E3%81%B3%E3%82%BC%E3%83%9E%E3%82%92%E3%82%BC%E3%83%9F%E3%81%BD%E3%83%9C%E3%82%BD%EF%BE%88%E3%81%BD%E3%83%9D%E3%83%9F%E3%82%BE%EF%BD%81%E3%82%BF%E3%82%BD%E3%81%81%E3%83%9E%E8%A3%B9%E3%82%B0%EF%BD%81%E3%82%BF%E6%AD%B9%E6%AD%B9%E3%81%9F%EF%BD%9A%E3%83%90%E7%B8%B7%E3%83%81%E3%82%93%E3%82%92%D0%AF%E3%82%93%E7%95%9A%E3%81%9F%E3%82%BE%E3%81%B9%E3%82%BD%E6%AC%B2%E3%82%A1%E7%B8%B7%D1%8F%E3%83%9F%E3%82%92%EF%BD%A6%E3%81%9B%EF%BD%A6%E3%82%BC%E3%83%9E%E3%82%BD%E3%83%9C%E3%82%BC%E3%82%BC%E3%83%81%E3%81%BC%E7%95%9A%E7%8F%B1'"">
- <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)</id>
+ <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)</id>
<category term="Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
<link rel="edit" title="Product" href="Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct" />
<link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/RelatedProducts" type="application/atom+xml;type=feed" title="RelatedProducts" href="Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts" />
@@ -38,7 +38,7 @@
<name />
</author>
<link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Picture" title="Picture" href="Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture" />
- <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
+ <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#DefaultContainer.ChangeProductDimensions" title="ChangeProductDimensions" target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
<content type="application/xml">
<m:properties>
<d:ProductId m:type="Edm.Int32">-9</d:ProductId>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/ProductPhoto/-2 -2/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/ProductPhoto/-2 -2/entity.full.json b/fit/src/main/resources/V30/ProductPhoto/-2 -2/entity.full.json
index 846c144..f37c6d0 100644
--- a/fit/src/main/resources/V30/ProductPhoto/-2 -2/entity.full.json
+++ b/fit/src/main/resources/V30/ProductPhoto/-2 -2/entity.full.json
@@ -1,7 +1,7 @@
{
- "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#ProductPhoto/@Element",
+ "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#ProductPhoto/@Element",
"odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductPhoto",
- "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ProductPhoto(PhotoId=-2,ProductId=-2)",
+ "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ProductPhoto(PhotoId=-2,ProductId=-2)",
"odata.editLink": "ProductPhoto(PhotoId=-2,ProductId=-2)",
"ProductId": -2,
"PhotoId": -2,
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/ProductPhoto/-2 -2/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/ProductPhoto/-2 -2/entity.xml b/fit/src/main/resources/V30/ProductPhoto/-2 -2/entity.xml
index 80e168b..b19988b 100644
--- a/fit/src/main/resources/V30/ProductPhoto/-2 -2/entity.xml
+++ b/fit/src/main/resources/V30/ProductPhoto/-2 -2/entity.xml
@@ -19,8 +19,8 @@
under the License.
-->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
- <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ProductPhoto(PhotoId=-2,ProductId=-2)</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
+ <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ProductPhoto(PhotoId=-2,ProductId=-2)</id>
<category term="Microsoft.Test.OData.Services.AstoriaDefaultService.ProductPhoto" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
<link rel="edit" title="ProductPhoto" href="ProductPhoto(PhotoId=-2,ProductId=-2)" />
<title />
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/ProductPhoto/-3 -3/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/ProductPhoto/-3 -3/entity.full.json b/fit/src/main/resources/V30/ProductPhoto/-3 -3/entity.full.json
index 3dc238b..f6e5939 100644
--- a/fit/src/main/resources/V30/ProductPhoto/-3 -3/entity.full.json
+++ b/fit/src/main/resources/V30/ProductPhoto/-3 -3/entity.full.json
@@ -1,7 +1,7 @@
{
- "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#ProductPhoto/@Element",
+ "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#ProductPhoto/@Element",
"odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductPhoto",
- "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ProductPhoto(PhotoId=-3,ProductId=-3)",
+ "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ProductPhoto(PhotoId=-3,ProductId=-3)",
"odata.editLink": "ProductPhoto(PhotoId=-3,ProductId=-3)",
"ProductId": -3,
"PhotoId": -3,
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/ProductPhoto/-3 -3/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/ProductPhoto/-3 -3/entity.xml b/fit/src/main/resources/V30/ProductPhoto/-3 -3/entity.xml
index 0d4f712..5f86244 100644
--- a/fit/src/main/resources/V30/ProductPhoto/-3 -3/entity.xml
+++ b/fit/src/main/resources/V30/ProductPhoto/-3 -3/entity.xml
@@ -19,8 +19,8 @@
under the License.
-->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
- <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ProductPhoto(PhotoId=-3,ProductId=-3)</id>
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">
+ <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ProductPhoto(PhotoId=-3,ProductId=-3)</id>
<category term="Microsoft.Test.OData.Services.AstoriaDefaultService.ProductPhoto" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
<link rel="edit" title="ProductPhoto" href="ProductPhoto(PhotoId=-3,ProductId=-3)" />
<title />
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.full.json b/fit/src/main/resources/V30/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.full.json
index 71acfc7..9b621b9 100644
--- a/fit/src/main/resources/V30/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.full.json
+++ b/fit/src/main/resources/V30/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.full.json
@@ -1,7 +1,7 @@
{
- "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/OpenType.svc/$metadata#Row/@Element",
+ "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/OpenType.svc/$metadata#Row/@Element",
"odata.type": "Microsoft.Test.OData.Services.OpenTypesService.Row",
- "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/OpenType.svc/Row(guid'672b8250-1e6e-4785-80cf-b94b572e42b3')",
+ "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/OpenType.svc/Row(guid'672b8250-1e6e-4785-80cf-b94b572e42b3')",
"odata.editLink": "Row(guid'672b8250-1e6e-4785-80cf-b94b572e42b3')",
"Id@odata.type": "Edm.Guid",
"Id": "672b8250-1e6e-4785-80cf-b94b572e42b3",
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.xml b/fit/src/main/resources/V30/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.xml
index d91c016..109f8cf 100644
--- a/fit/src/main/resources/V30/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.xml
+++ b/fit/src/main/resources/V30/Row/672b8250-1e6e-4785-80cf-b94b572e42b3/entity.xml
@@ -19,13 +19,13 @@
under the License.
-->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/OpenType.svc/"
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/OpenType.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/OpenType.svc/Row(guid'672b8250-1e6e-4785-80cf-b94b572e42b3')</id>
+ <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/OpenType.svc/Row(guid'672b8250-1e6e-4785-80cf-b94b572e42b3')</id>
<category term="Microsoft.Test.OData.Services.OpenTypesService.Row" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"/>
<link rel="edit" title="Row" href="Row(guid'672b8250-1e6e-4785-80cf-b94b572e42b3')"/>
<title/>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Row/71f7d0dc-ede4-45eb-b421-555a2aa1e58f/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Row/71f7d0dc-ede4-45eb-b421-555a2aa1e58f/entity.full.json b/fit/src/main/resources/V30/Row/71f7d0dc-ede4-45eb-b421-555a2aa1e58f/entity.full.json
index 9d8e83e..dae910d 100644
--- a/fit/src/main/resources/V30/Row/71f7d0dc-ede4-45eb-b421-555a2aa1e58f/entity.full.json
+++ b/fit/src/main/resources/V30/Row/71f7d0dc-ede4-45eb-b421-555a2aa1e58f/entity.full.json
@@ -1,7 +1,7 @@
{
- "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/OpenType.svc/$metadata#Row/@Element",
+ "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/OpenType.svc/$metadata#Row/@Element",
"odata.type": "Microsoft.Test.OData.Services.OpenTypesService.Row",
- "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/OpenType.svc/Row(guid'71f7d0dc-ede4-45eb-b421-555a2aa1e58f')",
+ "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/OpenType.svc/Row(guid'71f7d0dc-ede4-45eb-b421-555a2aa1e58f')",
"odata.editLink": "Row(guid'71f7d0dc-ede4-45eb-b421-555a2aa1e58f')",
"Id@odata.type": "Edm.Guid",
"Id": "71f7d0dc-ede4-45eb-b421-555a2aa1e58f",
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Row/71f7d0dc-ede4-45eb-b421-555a2aa1e58f/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Row/71f7d0dc-ede4-45eb-b421-555a2aa1e58f/entity.xml b/fit/src/main/resources/V30/Row/71f7d0dc-ede4-45eb-b421-555a2aa1e58f/entity.xml
index c8544c0..da708ea 100644
--- a/fit/src/main/resources/V30/Row/71f7d0dc-ede4-45eb-b421-555a2aa1e58f/entity.xml
+++ b/fit/src/main/resources/V30/Row/71f7d0dc-ede4-45eb-b421-555a2aa1e58f/entity.xml
@@ -19,11 +19,11 @@
under the License.
-->
-<entry xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/OpenType.svc/"
+<entry xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/OpenType.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/OpenType.svc/Row(guid'71f7d0dc-ede4-45eb-b421-555a2aa1e58f')</id>
+ <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/OpenType.svc/Row(guid'71f7d0dc-ede4-45eb-b421-555a2aa1e58f')</id>
<category term="Microsoft.Test.OData.Services.OpenTypesService.Row" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"/>
<link rel="edit" title="Row" href="Row(guid'71f7d0dc-ede4-45eb-b421-555a2aa1e58f')"/>
<title/>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/services.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/services.full.json b/fit/src/main/resources/V30/services.full.json
index 87e63c9..2345038 100644
--- a/fit/src/main/resources/V30/services.full.json
+++ b/fit/src/main/resources/V30/services.full.json
@@ -1,5 +1,5 @@
{
- "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata",
+ "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata",
"value":
[
{
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/services.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/services.xml b/fit/src/main/resources/V30/services.xml
index da05e3c..a4214a4 100644
--- a/fit/src/main/resources/V30/services.xml
+++ b/fit/src/main/resources/V30/services.xml
@@ -19,7 +19,7 @@
under the License.
-->
-<service xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2007/app" xmlns:atom="http://www.w3.org/2005/Atom">
+<service xml:base="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/" xmlns="http://www.w3.org/2007/app" xmlns:atom="http://www.w3.org/2005/Atom">
<workspace>
<atom:title>Default</atom:title>
<collection href="AllGeoTypesSet">
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Accounts/101/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Accounts/101/entity.full.json b/fit/src/main/resources/V40/Accounts/101/entity.full.json
index 8b63553..d1e74fb 100644
--- a/fit/src/main/resources/V40/Accounts/101/entity.full.json
+++ b/fit/src/main/resources/V40/Accounts/101/entity.full.json
@@ -1,8 +1,8 @@
{
- "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts/$entity",
+ "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts/$entity",
"@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.Account",
- "@odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)",
- "@odata.editLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)",
+ "@odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)",
+ "@odata.editLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)",
"AccountID": 101,
"Country": "US",
"AccountInfo": {
@@ -11,24 +11,24 @@
"LastName": "Green",
"MiddleName": "Hood"
},
- "MyGiftCard@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyGiftCard/$ref",
- "MyGiftCard@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyGiftCard",
- "MyPaymentInstruments@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments/$ref",
- "MyPaymentInstruments@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments",
- "ActiveSubscriptions@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/ActiveSubscriptions/$ref",
- "ActiveSubscriptions@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/ActiveSubscriptions",
- "AvailableSubscriptionTemplatess@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/AvailableSubscriptionTemplatess/$ref",
- "AvailableSubscriptionTemplatess@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/AvailableSubscriptionTemplatess",
+ "MyGiftCard@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyGiftCard/$ref",
+ "MyGiftCard@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyGiftCard",
+ "MyPaymentInstruments@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments/$ref",
+ "MyPaymentInstruments@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments",
+ "ActiveSubscriptions@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/ActiveSubscriptions/$ref",
+ "ActiveSubscriptions@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/ActiveSubscriptions",
+ "AvailableSubscriptionTemplatess@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/AvailableSubscriptionTemplatess/$ref",
+ "AvailableSubscriptionTemplatess@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/AvailableSubscriptionTemplatess",
"#Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI": {
"title": "Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI",
- "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI"
+ "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI"
},
"#Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI": {
"title": "Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI",
- "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI"
+ "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI"
},
"#Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo": {
"title": "Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo",
- "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo"
+ "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo"
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Accounts/101/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Accounts/101/entity.xml b/fit/src/main/resources/V40/Accounts/101/entity.xml
index 8313de3..3eab750 100644
--- a/fit/src/main/resources/V40/Accounts/101/entity.xml
+++ b/fit/src/main/resources/V40/Accounts/101/entity.xml
@@ -19,28 +19,28 @@
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#Accounts/$entity">
- <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)</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#Accounts/$entity">
+ <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)</id>
<category term="#Microsoft.Test.OData.Services.ODataWCFService.Account" scheme="http://docs.oasis-open.org/odata/ns/scheme"/>
- <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)"/>
- <link rel="http://docs.oasis-open.org/odata/ns/related/MyGiftCard" type="application/atom+xml;type=entry" title="MyGiftCard" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyGiftCard"/>
- <link rel="http://docs.oasis-open.org/odata/ns/related/MyPaymentInstruments" type="application/atom+xml;type=feed" title="MyPaymentInstruments" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments"/>
- <link rel="http://docs.oasis-open.org/odata/ns/related/ActiveSubscriptions" type="application/atom+xml;type=feed" title="ActiveSubscriptions" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/ActiveSubscriptions"/>
- <link rel="http://docs.oasis-open.org/odata/ns/related/AvailableSubscriptionTemplatess" type="application/atom+xml;type=feed" title="AvailableSubscriptionTemplatess" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/AvailableSubscriptionTemplatess"/>
+ <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)"/>
+ <link rel="http://docs.oasis-open.org/odata/ns/related/MyGiftCard" type="application/atom+xml;type=entry" title="MyGiftCard" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyGiftCard"/>
+ <link rel="http://docs.oasis-open.org/odata/ns/related/MyPaymentInstruments" type="application/atom+xml;type=feed" title="MyPaymentInstruments" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments"/>
+ <link rel="http://docs.oasis-open.org/odata/ns/related/ActiveSubscriptions" type="application/atom+xml;type=feed" title="ActiveSubscriptions" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/ActiveSubscriptions"/>
+ <link rel="http://docs.oasis-open.org/odata/ns/related/AvailableSubscriptionTemplatess" type="application/atom+xml;type=feed" title="AvailableSubscriptionTemplatess" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/AvailableSubscriptionTemplatess"/>
<title/>
<updated>2014-04-14T12:45:00Z</updated>
<author>
<name/>
</author>
- <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI"
+ <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI"
title="Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI"
- target="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI"/>
- <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI"
+ target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/Microsoft.Test.OData.Services.ODataWCFService.RefreshDefaultPI"/>
+ <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI"
title="Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI"
- target="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI"/>
- <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo"
+ target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/Microsoft.Test.OData.Services.ODataWCFService.GetDefaultPI"/>
+ <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo"
title="Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo"
- target="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo"/>
+ target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/Microsoft.Test.OData.Services.ODataWCFService.GetAccountInfo"/>
<content type="application/xml">
<m:properties>
<d:AccountID m:type="Int32">101</d:AccountID>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Accounts/101/links/MyGiftCard.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Accounts/101/links/MyGiftCard.full.json b/fit/src/main/resources/V40/Accounts/101/links/MyGiftCard.full.json
index a1e0295..b17f40c 100644
--- a/fit/src/main/resources/V40/Accounts/101/links/MyGiftCard.full.json
+++ b/fit/src/main/resources/V40/Accounts/101/links/MyGiftCard.full.json
@@ -1,5 +1,5 @@
{
- "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(101)/MyGiftCard/$entity",
+ "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(101)/MyGiftCard/$entity",
"@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.GiftCard",
"@odata.id": "Accounts(101)/MyGiftCard",
"@odata.editLink": "Accounts(101)/MyGiftCard",
@@ -10,6 +10,6 @@
"ExperationDate": "2013-12-30T00:00:00Z",
"#Microsoft.Test.OData.Services.ODataWCFService.GetActualAmount": {
"title": "Microsoft.Test.OData.Services.ODataWCFService.GetActualAmount",
- "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyGiftCard/Microsoft.Test.OData.Services.ODataWCFService.GetActualAmount"
+ "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyGiftCard/Microsoft.Test.OData.Services.ODataWCFService.GetActualAmount"
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Accounts/101/links/MyGiftCard.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Accounts/101/links/MyGiftCard.xml b/fit/src/main/resources/V40/Accounts/101/links/MyGiftCard.xml
index 279e77b..bb8900c 100644
--- a/fit/src/main/resources/V40/Accounts/101/links/MyGiftCard.xml
+++ b/fit/src/main/resources/V40/Accounts/101/links/MyGiftCard.xml
@@ -19,7 +19,7 @@
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#Accounts(101)/MyGiftCard/$entity">
+<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#Accounts(101)/MyGiftCard/$entity">
<category term="#Microsoft.Test.OData.Services.ODataWCFService.GiftCard" scheme="http://docs.oasis-open.org/odata/ns/scheme" />
<id />
<title />
@@ -27,9 +27,9 @@
<author>
<name />
</author>
- <m:action metadata="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.GetActualAmount"
+ <m:action metadata="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Microsoft.Test.OData.Services.ODataWCFService.GetActualAmount"
title="Microsoft.Test.OData.Services.ODataWCFService.GetActualAmount"
- target="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyGiftCard/Microsoft.Test.OData.Services.ODataWCFService.GetActualAmount"/>
+ target="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyGiftCard/Microsoft.Test.OData.Services.ODataWCFService.GetActualAmount"/>
<content type="application/xml">
<m:properties>
<d:GiftCardID m:type="Int32">301</d:GiftCardID>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments(101901).full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments(101901).full.json b/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments(101901).full.json
index 28c5e07..0ba1351 100644
--- a/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments(101901).full.json
+++ b/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments(101901).full.json
@@ -1,5 +1,5 @@
{
- "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(101)/MyPaymentInstruments/$entity",
+ "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(101)/MyPaymentInstruments/$entity",
"@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument",
"@odata.id": "Accounts(101)/MyPaymentInstruments(101901)",
"@odata.editLink": "Accounts(101)/MyPaymentInstruments(101901)",
@@ -7,10 +7,10 @@
"FriendlyName": "101 first PI",
"CreatedDate@odata.type": "#DateTimeOffset",
"CreatedDate": "2014-04-09T00:00:00Z",
- "TheStoredPI@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/TheStoredPI/$ref",
- "TheStoredPI@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/TheStoredPI",
- "BillingStatements@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BillingStatements/$ref",
- "BillingStatements@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BillingStatements",
- "BackupStoredPI@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BackupStoredPI/$ref",
- "BackupStoredPI@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BackupStoredPI"
+ "TheStoredPI@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/TheStoredPI/$ref",
+ "TheStoredPI@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/TheStoredPI",
+ "BillingStatements@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BillingStatements/$ref",
+ "BillingStatements@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BillingStatements",
+ "BackupStoredPI@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BackupStoredPI/$ref",
+ "BackupStoredPI@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BackupStoredPI"
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments(101901).xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments(101901).xml b/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments(101901).xml
index 7bae727..977c507 100644
--- a/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments(101901).xml
+++ b/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments(101901).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#Accounts(101)/MyPaymentInstruments/$entity">
+<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#Accounts(101)/MyPaymentInstruments/$entity">
<category term="#Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument" scheme="http://docs.oasis-open.org/odata/ns/scheme"/>
- <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)"/>
- <link rel="http://docs.oasis-open.org/odata/ns/related/TheStoredPI" type="application/atom+xml;type=entry" title="TheStoredPI" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/TheStoredPI"/>
- <link rel="http://docs.oasis-open.org/odata/ns/related/BillingStatements" type="application/atom+xml;type=feed" title="BillingStatements" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BillingStatements"/>
- <link rel="http://docs.oasis-open.org/odata/ns/related/BackupStoredPI" type="application/atom+xml;type=entry" title="BackupStoredPI" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BackupStoredPI"/>
+ <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)"/>
+ <link rel="http://docs.oasis-open.org/odata/ns/related/TheStoredPI" type="application/atom+xml;type=entry" title="TheStoredPI" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/TheStoredPI"/>
+ <link rel="http://docs.oasis-open.org/odata/ns/related/BillingStatements" type="application/atom+xml;type=feed" title="BillingStatements" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BillingStatements"/>
+ <link rel="http://docs.oasis-open.org/odata/ns/related/BackupStoredPI" type="application/atom+xml;type=entry" title="BackupStoredPI" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101901)/BackupStoredPI"/>
<id/>
<title/>
<updated>2014-04-14T12:47:37Z</updated>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments(101902).full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments(101902).full.json b/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments(101902).full.json
index ba7e1d8..1bf3d10 100644
--- a/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments(101902).full.json
+++ b/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments(101902).full.json
@@ -1,5 +1,5 @@
{
- "@odata.context": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(101)/MyPaymentInstruments/$entity",
+ "@odata.context": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/$metadata#Accounts(101)/MyPaymentInstruments/$entity",
"@odata.type": "#Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument",
"@odata.id": "Accounts(101)/MyPaymentInstruments(101902)",
"@odata.editLink": "Accounts(101)/MyPaymentInstruments(101902)",
@@ -7,10 +7,10 @@
"FriendlyName": "101 first PI",
"CreatedDate@odata.type": "#DateTimeOffset",
"CreatedDate": "2014-04-09T00:00:00Z",
- "TheStoredPI@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/TheStoredPI/$ref",
- "TheStoredPI@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/TheStoredPI",
- "BillingStatements@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/BillingStatements/$ref",
- "BillingStatements@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/BillingStatements",
- "BackupStoredPI@odata.associationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/BackupStoredPI/$ref",
- "BackupStoredPI@odata.navigationLink": "http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/BackupStoredPI"
+ "TheStoredPI@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/TheStoredPI/$ref",
+ "TheStoredPI@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/TheStoredPI",
+ "BillingStatements@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/BillingStatements/$ref",
+ "BillingStatements@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/BillingStatements",
+ "BackupStoredPI@odata.associationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/BackupStoredPI/$ref",
+ "BackupStoredPI@odata.navigationLink": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/BackupStoredPI"
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments(101902).xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments(101902).xml b/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments(101902).xml
index 1d967ed..57efe81 100644
--- a/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments(101902).xml
+++ b/fit/src/main/resources/V40/Accounts/101/links/MyPaymentInstruments(101902).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#Accounts(101)/MyPaymentInstruments/$entity">
+<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#Accounts(101)/MyPaymentInstruments/$entity">
<category term="#Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument" scheme="http://docs.oasis-open.org/odata/ns/scheme"/>
- <link rel="edit" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)"/>
- <link rel="http://docs.oasis-open.org/odata/ns/related/TheStoredPI" type="application/atom+xml;type=entry" title="TheStoredPI" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/TheStoredPI"/>
- <link rel="http://docs.oasis-open.org/odata/ns/related/BillingStatements" type="application/atom+xml;type=feed" title="BillingStatements" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/BillingStatements"/>
- <link rel="http://docs.oasis-open.org/odata/ns/related/BackupStoredPI" type="application/atom+xml;type=entry" title="BackupStoredPI" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/BackupStoredPI"/>
+ <link rel="edit" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)"/>
+ <link rel="http://docs.oasis-open.org/odata/ns/related/TheStoredPI" type="application/atom+xml;type=entry" title="TheStoredPI" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/TheStoredPI"/>
+ <link rel="http://docs.oasis-open.org/odata/ns/related/BillingStatements" type="application/atom+xml;type=feed" title="BillingStatements" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/BillingStatements"/>
+ <link rel="http://docs.oasis-open.org/odata/ns/related/BackupStoredPI" type="application/atom+xml;type=entry" title="BackupStoredPI" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V40/Static.svc/Accounts(101)/MyPaymentInstruments(101902)/BackupStoredPI"/>
<id/>
<title/>
<updated>2014-04-14T12:47:37Z</updated>