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:41 UTC
[07/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/-6/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/-6/entity.xml b/fit/src/main/resources/V30/Product/-6/entity.xml
index e20cf79..f04464c 100644
--- a/fit/src/main/resources/V30/Product/-6/entity.xml
+++ b/fit/src/main/resources/V30/Product/-6/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" m:etag="W/"'uacssmuxummhtezdsno%C3%9Fssrlbs%C3%9Floxjsslnnayinxiksspjsssvumgduaapcfvnssee%C3%9Fgpaxuaabosem%C3%9Fiemtufplo'"">
- <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-6)</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" m:etag="W/"'uacssmuxummhtezdsno%C3%9Fssrlbs%C3%9Floxjsslnnayinxiksspjsssvumgduaapcfvnssee%C3%9Fgpaxuaabosem%C3%9Fiemtufplo'"">
+ <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-6)</id>
<category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Product" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
<link rel="edit" title="Product" href="Product(-6)" />
<link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/RelatedProducts" type="application/atom+xml;type=feed" title="RelatedProducts" href="Product(-6)/RelatedProducts" />
@@ -33,7 +33,7 @@
<name />
</author>
<link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Picture" title="Picture" href="Product(-6)/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(-6)/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(-6)/ChangeProductDimensions" />
<content type="application/xml">
<m:properties>
<d:ProductId m:type="Edm.Int32">-6</d:ProductId>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/-7/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/-7/entity.full.json b/fit/src/main/resources/V30/Product/-7/entity.full.json
index 4f394a1..4744638 100644
--- a/fit/src/main/resources/V30/Product/-7/entity.full.json
+++ b/fit/src/main/resources/V30/Product/-7/entity.full.json
@@ -1,7 +1,7 @@
{
- "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product/@Element",
+ "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product/@Element",
"odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
- "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-7)",
+ "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-7)",
"odata.etag": "W/\"'%E3%81%B3%E3%83%9E%E6%AD%B9%E3%82%BE%E3%83%9C%E3%81%BE%EF%BE%9D%E3%81%BA%E3%82%92%E3%82%BC%E3%82%A1%E3%82%BC%E3%81%9F%E3%83%90%E3%81%B9%E3%83%80%EF%BD%A6%E3%83%9F%E3%82%BD%E4%BA%9C%E3%82%A1%E3%83%9E%E3%82%BC%E3%83%81%E3%82%BC%E3%81%82%EF%BE%88%E3%81%BE%E3%81%B2%E3%83%9C%E3%81%81%D1%91%EF%BE%9D%E3%83%80%E3%82%BC%EF%BD%9A%E3%81%B2%D1%8F%E3%82%A1%E3%81%B4%E3%81%B9%E7%B8%B7%E3%81%9C%E3%82%92%E3%81%B2%E3%82%92%E4%BA%9C%E3%81%BE%E3%82%BD%E3%81%BD%E3%81%B9%E3%81%B2%E3%83%9F%E3%81%9E%E3%81%BE%E3%82%BE%E3%81%BE%E3%81%BE%E3%81%82%E3%83%81%E3%82%93'\"",
"odata.editLink": "Product(-7)",
"RelatedProducts@odata.navigationLinkUrl": "Product(-7)/RelatedProducts",
@@ -11,7 +11,7 @@
"#DefaultContainer.ChangeProductDimensions":
{
"title": "ChangeProductDimensions",
- "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-7)/ChangeProductDimensions"
+ "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-7)/ChangeProductDimensions"
},
"Picture@odata.mediaEditLink": "Product(-7)/Picture",
"ProductId": -7,
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/-7/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/-7/entity.xml b/fit/src/main/resources/V30/Product/-7/entity.xml
index 8675d0b..83d89d6 100644
--- a/fit/src/main/resources/V30/Product/-7/entity.xml
+++ b/fit/src/main/resources/V30/Product/-7/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" m:etag="W/"'%E3%81%B3%E3%83%9E%E6%AD%B9%E3%82%BE%E3%83%9C%E3%81%BE%EF%BE%9D%E3%81%BA%E3%82%92%E3%82%BC%E3%82%A1%E3%82%BC%E3%81%9F%E3%83%90%E3%81%B9%E3%83%80%EF%BD%A6%E3%83%9F%E3%82%BD%E4%BA%9C%E3%82%A1%E3%83%9E%E3%82%BC%E3%83%81%E3%82%BC%E3%81%82%EF%BE%88%E3%81%BE%E3%81%B2%E3%83%9C%E3%81%81%D1%91%EF%BE%9D%E3%83%80%E3%82%BC%EF%BD%9A%E3%81%B2%D1%8F%E3%82%A1%E3%81%B4%E3%81%B9%E7%B8%B7%E3%81%9C%E3%82%92%E3%81%B2%E3%82%92%E4%BA%9C%E3%81%BE%E3%82%BD%E3%81%BD%E3%81%B9%E3%81%B2%E3%83%9F%E3%81%9E%E3%81%BE%E3%82%BE%E3%81%BE%E3%81%BE%E3%81%82%E3%83%81%E3%82%93'"">
- <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-7)</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" m:etag="W/"'%E3%81%B3%E3%83%9E%E6%AD%B9%E3%82%BE%E3%83%9C%E3%81%BE%EF%BE%9D%E3%81%BA%E3%82%92%E3%82%BC%E3%82%A1%E3%82%BC%E3%81%9F%E3%83%90%E3%81%B9%E3%83%80%EF%BD%A6%E3%83%9F%E3%82%BD%E4%BA%9C%E3%82%A1%E3%83%9E%E3%82%BC%E3%83%81%E3%82%BC%E3%81%82%EF%BE%88%E3%81%BE%E3%81%B2%E3%83%9C%E3%81%81%D1%91%EF%BE%9D%E3%83%80%E3%82%BC%EF%BD%9A%E3%81%B2%D1%8F%E3%82%A1%E3%81%B4%E3%81%B9%E7%B8%B7%E3%81%9C%E3%82%92%E3%81%B2%E3%82%92%E4%BA%9C%E3%81%BE%E3%82%BD%E3%81%BD%E3%81%B9%E3%81%B2%E3%83%9F%E3%81%9E%E3%81%BE%E3%82%BE%E3%81%BE%E3%81%BE%E3%81%82%E3%83%81%E3%82%93'"">
+ <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-7)</id>
<category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Product" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
<link rel="edit" title="Product" href="Product(-7)" />
<link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/RelatedProducts" type="application/atom+xml;type=feed" title="RelatedProducts" href="Product(-7)/RelatedProducts" />
@@ -33,7 +33,7 @@
<name />
</author>
<link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Picture" title="Picture" href="Product(-7)/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(-7)/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(-7)/ChangeProductDimensions" />
<content type="application/xml">
<m:properties>
<d:ProductId m:type="Edm.Int32">-7</d:ProductId>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/-7/links/Photos.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/-7/links/Photos.full.json b/fit/src/main/resources/V30/Product/-7/links/Photos.full.json
index f55303f..f79710d 100644
--- a/fit/src/main/resources/V30/Product/-7/links/Photos.full.json
+++ b/fit/src/main/resources/V30/Product/-7/links/Photos.full.json
@@ -1,12 +1,12 @@
{
- "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product/$links/Photos",
+ "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product/$links/Photos",
"value":
[
{
- "url": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ProductPhoto(PhotoId=-3,ProductId=-3)"
+ "url": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ProductPhoto(PhotoId=-3,ProductId=-3)"
},
{
- "url": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/ProductPhoto(PhotoId=-2,ProductId=-2)"
+ "url": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/ProductPhoto(PhotoId=-2,ProductId=-2)"
}
]
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/-9/entity.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/-9/entity.full.json b/fit/src/main/resources/V30/Product/-9/entity.full.json
index db55f44..2dddd08 100644
--- a/fit/src/main/resources/V30/Product/-9/entity.full.json
+++ b/fit/src/main/resources/V30/Product/-9/entity.full.json
@@ -1,7 +1,7 @@
{
- "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product/@Element",
+ "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product/@Element",
"odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct",
- "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)",
+ "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%E
6%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.DiscontinuedProduct",
"RelatedProducts@odata.navigationLinkUrl": "Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts",
@@ -11,7 +11,7 @@
"#DefaultContainer.ChangeProductDimensions":
{
"title": "ChangeProductDimensions",
- "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/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,
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/-9/entity.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/-9/entity.xml b/fit/src/main/resources/V30/Product/-9/entity.xml
index 20e7323..59cce3e 100644
--- a/fit/src/main/resources/V30/Product/-9/entity.xml
+++ b/fit/src/main/resources/V30/Product/-9/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" 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%E
9%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'"">
- <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)</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" 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%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'"">
+ <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" />
@@ -33,7 +33,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/feed.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/feed.full.json b/fit/src/main/resources/V30/Product/feed.full.json
index 46d7ff5..03eba14 100644
--- a/fit/src/main/resources/V30/Product/feed.full.json
+++ b/fit/src/main/resources/V30/Product/feed.full.json
@@ -1,10 +1,10 @@
{
- "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product",
+ "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Product",
"value":
[
{
"odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
- "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-10)",
+ "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-10)",
"odata.etag": "W/\"'New%20BaseConcurrency(1391427673066)'\"",
"odata.editLink": "Product(-10)",
"RelatedProducts@odata.navigationLinkUrl": "Product(-10)/RelatedProducts",
@@ -14,7 +14,7 @@
"#DefaultContainer.ChangeProductDimensions":
{
"title": "ChangeProductDimensions",
- "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-10)/ChangeProductDimensions"
+ "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-10)/ChangeProductDimensions"
},
"Picture@odata.mediaEditLink": "Product(-10)/Picture",
"ProductId": -10,
@@ -26,7 +26,7 @@
},
{
"odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct",
- "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)",
+ "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%8
1%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.DiscontinuedProduct",
"RelatedProducts@odata.navigationLinkUrl": "Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts",
@@ -36,7 +36,7 @@
"#DefaultContainer.ChangeProductDimensions":
{
"title": "ChangeProductDimensions",
- "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-9)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/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,
@@ -85,7 +85,7 @@
},
{
"odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct",
- "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-8)",
+ "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-8)",
"odata.etag": "W/\"'asme', 'hhsbjscessmdunkssmvqmqyzuahm'\"",
"odata.editLink": "Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct",
"RelatedProducts@odata.navigationLinkUrl": "Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts",
@@ -95,7 +95,7 @@
"#DefaultContainer.ChangeProductDimensions":
{
"title": "ChangeProductDimensions",
- "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"
+ "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"
},
"Picture@odata.mediaEditLink": "Product(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture",
"ProductId": -8,
@@ -136,7 +136,7 @@
},
{
"odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
- "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-7)",
+ "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-7)",
"odata.etag": "W/\"'%E3%81%B3%E3%83%9E%E6%AD%B9%E3%82%BE%E3%83%9C%E3%81%BE%EF%BE%9D%E3%81%BA%E3%82%92%E3%82%BC%E3%82%A1%E3%82%BC%E3%81%9F%E3%83%90%E3%81%B9%E3%83%80%EF%BD%A6%E3%83%9F%E3%82%BD%E4%BA%9C%E3%82%A1%E3%83%9E%E3%82%BC%E3%83%81%E3%82%BC%E3%81%82%EF%BE%88%E3%81%BE%E3%81%B2%E3%83%9C%E3%81%81%D1%91%EF%BE%9D%E3%83%80%E3%82%BC%EF%BD%9A%E3%81%B2%D1%8F%E3%82%A1%E3%81%B4%E3%81%B9%E7%B8%B7%E3%81%9C%E3%82%92%E3%81%B2%E3%82%92%E4%BA%9C%E3%81%BE%E3%82%BD%E3%81%BD%E3%81%B9%E3%81%B2%E3%83%9F%E3%81%9E%E3%81%BE%E3%82%BE%E3%81%BE%E3%81%BE%E3%81%82%E3%83%81%E3%82%93'\"",
"odata.editLink": "Product(-7)",
"RelatedProducts@odata.navigationLinkUrl": "Product(-7)/RelatedProducts",
@@ -146,7 +146,7 @@
"#DefaultContainer.ChangeProductDimensions":
{
"title": "ChangeProductDimensions",
- "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-7)/ChangeProductDimensions"
+ "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-7)/ChangeProductDimensions"
},
"Picture@odata.mediaEditLink": "Product(-7)/Picture",
"ProductId": -7,
@@ -186,7 +186,7 @@
},
{
"odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
- "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-6)",
+ "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-6)",
"odata.etag": "W/\"'uacssmuxummhtezdsno%C3%9Fssrlbs%C3%9Floxjsslnnayinxiksspjsssvumgduaapcfvnssee%C3%9Fgpaxuaabosem%C3%9Fiemtufplo'\"",
"odata.editLink": "Product(-6)",
"RelatedProducts@odata.navigationLinkUrl": "Product(-6)/RelatedProducts",
@@ -196,7 +196,7 @@
"#DefaultContainer.ChangeProductDimensions":
{
"title": "ChangeProductDimensions",
- "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-6)/ChangeProductDimensions"
+ "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-6)/ChangeProductDimensions"
},
"Picture@odata.mediaEditLink": "Product(-6)/Picture",
"ProductId": -6,
@@ -236,7 +236,7 @@
},
{
"odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct",
- "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-5)",
+ "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-5)",
"odata.etag": "W/\"'inxlfdfruoalzluabvubrgahsg', 'ixxletiyfrigooaltaqikqcnkpepfufyffmuouknjzyelardpyudoachqdejrjnuhueunugyli'\"",
"odata.editLink": "Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct",
"RelatedProducts@odata.navigationLinkUrl": "Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts",
@@ -246,7 +246,7 @@
"#DefaultContainer.ChangeProductDimensions":
{
"title": "ChangeProductDimensions",
- "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"
+ "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"
},
"Picture@odata.mediaEditLink": "Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture",
"ProductId": -5,
@@ -284,7 +284,7 @@
},
{
"odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
- "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-4)",
+ "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-4)",
"odata.etag": "W/\"'%E3%81%BD%E3%83%9C%EF%BE%9D%E3%81%82%E3%81%B3'\"",
"odata.editLink": "Product(-4)",
"RelatedProducts@odata.navigationLinkUrl": "Product(-4)/RelatedProducts",
@@ -294,7 +294,7 @@
"#DefaultContainer.ChangeProductDimensions":
{
"title": "ChangeProductDimensions",
- "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-4)/ChangeProductDimensions"
+ "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-4)/ChangeProductDimensions"
},
"Picture@odata.mediaEditLink": "Product(-4)/Picture",
"ProductId": -4,
@@ -334,7 +334,7 @@
},
{
"odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct",
- "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-3)",
+ "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-3)",
"odata.etag": "W/\"'fvrnsbiu%C3%9Fevuqssnuidjbhtluhcydhhjihyasecdnumhdpfxtij%C3%9Flvfqngmulfvjqqtvussyix%C3%9Fykxhbnehob%C3%9Fjssfickhmevci', '%E3%81%9D%E6%AD%B9%E3%82%BD%E3%83%9C%E3%83%9C%E3%82%92%E3%82%B0%E8%A3%B9%E3%81%B4%E3%83%9D%EF%BD%A6%E3%83%81'\"",
"odata.editLink": "Product(-3)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct",
"RelatedProducts@odata.navigationLinkUrl": "Product(-3)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts",
@@ -344,7 +344,7 @@
"#DefaultContainer.ChangeProductDimensions":
{
"title": "ChangeProductDimensions",
- "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-3)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"
+ "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-3)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"
},
"Picture@odata.mediaEditLink": "Product(-3)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture",
"ProductId": -3,
@@ -366,7 +366,7 @@
},
{
"odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct",
- "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-2)",
+ "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-2)",
"odata.etag": "W/\"null, 'yljmhbcacfnothqirhaouhoraoruscpptgzmoch'\"",
"odata.editLink": "Product(-2)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct",
"RelatedProducts@odata.navigationLinkUrl": "Product(-2)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts",
@@ -376,7 +376,7 @@
"#DefaultContainer.ChangeProductDimensions":
{
"title": "ChangeProductDimensions",
- "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-2)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"
+ "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-2)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"
},
"Picture@odata.mediaEditLink": "Product(-2)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture",
"ProductId": -2,
@@ -413,7 +413,7 @@
},
{
"odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
- "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-1)",
+ "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-1)",
"odata.etag": "W/\"null\"",
"odata.editLink": "Product(-1)",
"RelatedProducts@odata.navigationLinkUrl": "Product(-1)/RelatedProducts",
@@ -423,7 +423,7 @@
"#DefaultContainer.ChangeProductDimensions":
{
"title": "ChangeProductDimensions",
- "target": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-1)/ChangeProductDimensions"
+ "target": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-1)/ChangeProductDimensions"
},
"Picture@odata.mediaEditLink": "Product(-1)/Picture",
"ProductId": -1,
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/feed.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/feed.xml b/fit/src/main/resources/V30/Product/feed.xml
index 7804f79..c697901 100644
--- a/fit/src/main/resources/V30/Product/feed.xml
+++ b/fit/src/main/resources/V30/Product/feed.xml
@@ -19,18 +19,18 @@
under the License.
-->
-<feed xml:base="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/"
+<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:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product</id>
+ <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product</id>
<title type="text">Product</title>
<updated>2014-02-06T16:44:25Z</updated>
<link rel="self" title="Product" href="Product" />
<entry m:etag="W/"'New%20BaseConcurrency(1391427673066)'"">
- <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-10)</id>
+ <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-10)</id>
<category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Product" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
<link rel="edit" title="Product" href="Product(-10)" />
<link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/RelatedProducts" type="application/atom+xml;type=feed" title="RelatedProducts" href="Product(-10)/RelatedProducts" />
@@ -43,7 +43,7 @@
<name />
</author>
<link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Picture" title="Picture" href="Product(-10)/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(-10)/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(-10)/ChangeProductDimensions" />
<content type="application/xml">
<m:properties>
<d:ProductId m:type="Edm.Int32">-10</d:ProductId>
@@ -56,7 +56,7 @@
</content>
</entry>
<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" />
@@ -69,7 +69,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>
@@ -103,7 +103,7 @@
</content>
</entry>
<entry m:etag="W/"'asme','hhsbjscessmdunkssmvqmqyzuahm'"">
- <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-8)</id>
+ <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-8)</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(-8)/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(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts" />
@@ -116,7 +116,7 @@
<name />
</author>
<link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Picture" title="Picture" href="Product(-8)/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(-8)/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(-8)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
<content type="application/xml">
<m:properties>
<d:ProductId m:type="Edm.Int32">-8</d:ProductId>
@@ -146,7 +146,7 @@
</content>
</entry>
<entry m:etag="W/"'%E3%81%B3%E3%83%9E%E6%AD%B9%E3%82%BE%E3%83%9C%E3%81%BE%EF%BE%9D%E3%81%BA%E3%82%92%E3%82%BC%E3%82%A1%E3%82%BC%E3%81%9F%E3%83%90%E3%81%B9%E3%83%80%EF%BD%A6%E3%83%9F%E3%82%BD%E4%BA%9C%E3%82%A1%E3%83%9E%E3%82%BC%E3%83%81%E3%82%BC%E3%81%82%EF%BE%88%E3%81%BE%E3%81%B2%E3%83%9C%E3%81%81%D1%91%EF%BE%9D%E3%83%80%E3%82%BC%EF%BD%9A%E3%81%B2%D1%8F%E3%82%A1%E3%81%B4%E3%81%B9%E7%B8%B7%E3%81%9C%E3%82%92%E3%81%B2%E3%82%92%E4%BA%9C%E3%81%BE%E3%82%BD%E3%81%BD%E3%81%B9%E3%81%B2%E3%83%9F%E3%81%9E%E3%81%BE%E3%82%BE%E3%81%BE%E3%81%BE%E3%81%82%E3%83%81%E3%82%93'"">
- <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-7)</id>
+ <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-7)</id>
<category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Product" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
<link rel="edit" title="Product" href="Product(-7)" />
<link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/RelatedProducts" type="application/atom+xml;type=feed" title="RelatedProducts" href="Product(-7)/RelatedProducts" />
@@ -159,7 +159,7 @@
<name />
</author>
<link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Picture" title="Picture" href="Product(-7)/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(-7)/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(-7)/ChangeProductDimensions" />
<content type="application/xml">
<m:properties>
<d:ProductId m:type="Edm.Int32">-7</d:ProductId>
@@ -186,7 +186,7 @@
</content>
</entry>
<entry m:etag="W/"'uacssmuxummhtezdsno%C3%9Fssrlbs%C3%9Floxjsslnnayinxiksspjsssvumgduaapcfvnssee%C3%9Fgpaxuaabosem%C3%9Fiemtufplo'"">
- <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-6)</id>
+ <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-6)</id>
<category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Product" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
<link rel="edit" title="Product" href="Product(-6)" />
<link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/RelatedProducts" type="application/atom+xml;type=feed" title="RelatedProducts" href="Product(-6)/RelatedProducts" />
@@ -199,7 +199,7 @@
<name />
</author>
<link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Picture" title="Picture" href="Product(-6)/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(-6)/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(-6)/ChangeProductDimensions" />
<content type="application/xml">
<m:properties>
<d:ProductId m:type="Edm.Int32">-6</d:ProductId>
@@ -226,7 +226,7 @@
</content>
</entry>
<entry m:etag="W/"'inxlfdfruoalzluabvubrgahsg','ixxletiyfrigooaltaqikqcnkpepfufyffmuouknjzyelardpyudoachqdejrjnuhueunugyli'"">
- <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-5)</id>
+ <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-5)</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(-5)/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(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts" />
@@ -239,7 +239,7 @@
<name />
</author>
<link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Picture" title="Picture" href="Product(-5)/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(-5)/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(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
<content type="application/xml">
<m:properties>
<d:ProductId m:type="Edm.Int32">-5</d:ProductId>
@@ -267,7 +267,7 @@
</content>
</entry>
<entry m:etag="W/"'%E3%81%BD%E3%83%9C%EF%BE%9D%E3%81%82%E3%81%B3'"">
- <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-4)</id>
+ <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-4)</id>
<category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Product" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
<link rel="edit" title="Product" href="Product(-4)" />
<link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/RelatedProducts" type="application/atom+xml;type=feed" title="RelatedProducts" href="Product(-4)/RelatedProducts" />
@@ -280,7 +280,7 @@
<name />
</author>
<link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Picture" title="Picture" href="Product(-4)/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(-4)/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(-4)/ChangeProductDimensions" />
<content type="application/xml">
<m:properties>
<d:ProductId m:type="Edm.Int32">-4</d:ProductId>
@@ -307,7 +307,7 @@
</content>
</entry>
<entry m:etag="W/"'fvrnsbiu%C3%9Fevuqssnuidjbhtluhcydhhjihyasecdnumhdpfxtij%C3%9Flvfqngmulfvjqqtvussyix%C3%9Fykxhbnehob%C3%9Fjssfickhmevci','%E3%81%9D%E6%AD%B9%E3%82%BD%E3%83%9C%E3%83%9C%E3%82%92%E3%82%B0%E8%A3%B9%E3%81%B4%E3%83%9D%EF%BD%A6%E3%83%81'"">
- <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-3)</id>
+ <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-3)</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(-3)/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(-3)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts" />
@@ -320,7 +320,7 @@
<name />
</author>
<link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Picture" title="Picture" href="Product(-3)/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(-3)/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(-3)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
<content type="application/xml">
<m:properties>
<d:ProductId m:type="Edm.Int32">-3</d:ProductId>
@@ -340,7 +340,7 @@
</content>
</entry>
<entry m:etag="W/"null,'yljmhbcacfnothqirhaouhoraoruscpptgzmoch'"">
- <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-2)</id>
+ <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-2)</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(-2)/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(-2)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts" />
@@ -353,7 +353,7 @@
<name />
</author>
<link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Picture" title="Picture" href="Product(-2)/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(-2)/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(-2)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
<content type="application/xml">
<m:properties>
<d:ProductId m:type="Edm.Int32">-2</d:ProductId>
@@ -380,7 +380,7 @@
</content>
</entry>
<entry m:etag="W/"null"">
- <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-1)</id>
+ <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-1)</id>
<category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Product" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
<link rel="edit" title="Product" href="Product(-1)" />
<link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/RelatedProducts" type="application/atom+xml;type=feed" title="RelatedProducts" href="Product(-1)/RelatedProducts" />
@@ -393,7 +393,7 @@
<name />
</author>
<link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Picture" title="Picture" href="Product(-1)/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(-1)/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(-1)/ChangeProductDimensions" />
<content type="application/xml">
<m:properties>
<d:ProductId m:type="Edm.Int32">-1</d:ProductId>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/filter/ceiling(Dimensions.Width) eq 7338.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/filter/ceiling(Dimensions.Width) eq 7338.full.json b/fit/src/main/resources/V30/Product/filter/ceiling(Dimensions.Width) eq 7338.full.json
index a6396a6..56ad12c 100644
--- a/fit/src/main/resources/V30/Product/filter/ceiling(Dimensions.Width) eq 7338.full.json
+++ b/fit/src/main/resources/V30/Product/filter/ceiling(Dimensions.Width) eq 7338.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(-5)","odata.etag":"W/\"'inxlfdfruoalzluabvubrgahsg','ixxletiyfrigooaltaqikqcnkpepfufyffmuouknjzyelardpyudoachqdejrjnuhueunugyli'\"","odata.editLink":"Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct","RelatedProducts@odata.navigationLinkUrl":"Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts","Detail@odata.navigationLinkUrl":"Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Detail","Reviews@odata.navigationLinkUrl":"Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Reviews","Photos@odata.navigationLinkUrl":"Product(-5)/Microsoft.Test.OD
ata.Services.AstoriaDefaultService.DiscontinuedProduct/Photos","#DefaultContainer.ChangeProductDimensions":{"title":"ChangeProductDimensions","target":"http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"},"Picture@odata.mediaEditLink":"Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture","ProductId":-5,"Description":"uuudqysoiozagpcpumnydpupopsvd","Dimensions":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"7337.75206762393","Height@odata.type":"Edm.Decimal","Height":"-4.63644378890358","Depth@odata.type":"Edm.Decimal","Depth":"-79228162514264337593543950335"},"BaseConcurrency":"inxlfdfruoalzluabvubrgahsg","ComplexConcurrency":null,"NestedComplexConcurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo","Modified
Date@odata.type":"Edm.DateTime","ModifiedDate":"9999-12-31T23:59:59.9999999","ModifiedBy":"mlsbmanrhvygvakricoomrnksyutxxdrbizpdzdunzzukgkeaibnuufvxcjputulmcutevhiyflnsjahjistqrlasor","Concurrency":null},"Discontinued@odata.type":"Edm.DateTime","Discontinued":"2012-06-17T07:49:33.4591089","ReplacementProductId":-2147483648,"DiscontinuedPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u3073\u30de","Extension":"\u4e5d\u305c\u30be\u3079\u3041\u3073\u30df\u0451\u0451\u6b79\u73f1\u4e5d\u305e\u3042\uff41\u305e\u30af\u30c0\u307e\u30a1\u30df\u30bd\u3093\u6b79\u6b32\u3079\u4e9c\u305c\u30c1\u305c\u30c1\u3041\u30dc\u30bc\uff9d\u044f\u307b\u73f1\u30be\u30be\u307c\u531a\u305c\u30cf\u30df\u30bd\u3041\u30dc\u305c\u3041\u30a1\u30c1\u30af\u30bf\u9ed1\u3092\u531a\u30dc\u30b0\u73f1\u30bc\u30dc\u30bd\uff5a"},"ChildConcurrencyToken":"ixxletiyfrigooaltaqikqcnkpepfufyffmuouknjzyelardpyudoachqdejrjnuhueunugyli"}]}
\ 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(-5)","odata.etag":"W/\"'inxlfdfruoalzluabvubrgahsg','ixxletiyfrigooaltaqikqcnkpepfufyffmuouknjzyelardpyudoachqdejrjnuhueunugyli'\"","odata.editLink":"Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct","RelatedProducts@odata.navigationLinkUrl":"Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/RelatedProducts","Detail@odata.navigationLinkUrl":"Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Detail","Reviews@odata.navigationLinkUrl":"Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Reviews","Photos@odata.navigationLinkUrl":"Product(-5)/Microsoft.Test.
OData.Services.AstoriaDefaultService.DiscontinuedProduct/Photos","#DefaultContainer.ChangeProductDimensions":{"title":"ChangeProductDimensions","target":"http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions"},"Picture@odata.mediaEditLink":"Product(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/Picture","ProductId":-5,"Description":"uuudqysoiozagpcpumnydpupopsvd","Dimensions":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"7337.75206762393","Height@odata.type":"Edm.Decimal","Height":"-4.63644378890358","Depth@odata.type":"Edm.Decimal","Depth":"-79228162514264337593543950335"},"BaseConcurrency":"inxlfdfruoalzluabvubrgahsg","ComplexConcurrency":null,"NestedComplexConcurrency":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo","Modif
iedDate@odata.type":"Edm.DateTime","ModifiedDate":"9999-12-31T23:59:59.9999999","ModifiedBy":"mlsbmanrhvygvakricoomrnksyutxxdrbizpdzdunzzukgkeaibnuufvxcjputulmcutevhiyflnsjahjistqrlasor","Concurrency":null},"Discontinued@odata.type":"Edm.DateTime","Discontinued":"2012-06-17T07:49:33.4591089","ReplacementProductId":-2147483648,"DiscontinuedPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u3073\u30de","Extension":"\u4e5d\u305c\u30be\u3079\u3041\u3073\u30df\u0451\u0451\u6b79\u73f1\u4e5d\u305e\u3042\uff41\u305e\u30af\u30c0\u307e\u30a1\u30df\u30bd\u3093\u6b79\u6b32\u3079\u4e9c\u305c\u30c1\u305c\u30c1\u3041\u30dc\u30bc\uff9d\u044f\u307b\u73f1\u30be\u30be\u307c\u531a\u305c\u30cf\u30df\u30bd\u3041\u30dc\u305c\u3041\u30a1\u30c1\u30af\u30bf\u9ed1\u3092\u531a\u30dc\u30b0\u73f1\u30bc\u30dc\u30bd\uff5a"},"ChildConcurrencyToken":"ixxletiyfrigooaltaqikqcnkpepfufyffmuouknjzyelardpyudoachqdejrjnuhueunugyli"}]}
\ 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/ceiling(Dimensions.Width) eq 7338.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/filter/ceiling(Dimensions.Width) eq 7338.xml b/fit/src/main/resources/V30/Product/filter/ceiling(Dimensions.Width) eq 7338.xml
index 841304d..4d99e7a 100644
--- a/fit/src/main/resources/V30/Product/filter/ceiling(Dimensions.Width) eq 7338.xml
+++ b/fit/src/main/resources/V30/Product/filter/ceiling(Dimensions.Width) eq 7338.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:05Z</updated>
<link rel="self" title="Product" href="Product" />
<entry m:etag="W/"'inxlfdfruoalzluabvubrgahsg','ixxletiyfrigooaltaqikqcnkpepfufyffmuouknjzyelardpyudoachqdejrjnuhueunugyli'"">
- <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Product(-5)</id>
+ <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Product(-5)</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(-5)/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(-5)/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(-5)/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(-5)/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(-5)/Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct/ChangeProductDimensions" />
<content type="application/xml">
<m:properties>
<d:ProductId m:type="Edm.Int32">-5</d:ProductId>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Product/filter/concat(Description, ', newname') eq 'kdcuklu, newname'.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/filter/concat(Description, ', newname') eq 'kdcuklu, newname'.full.json b/fit/src/main/resources/V30/Product/filter/concat(Description, ', newname') eq 'kdcuklu, newname'.full.json
index 3ce98e8..7953935 100644
--- a/fit/src/main/resources/V30/Product/filter/concat(Description, ', newname') eq 'kdcuklu, newname'.full.json
+++ b/fit/src/main/resources/V30/Product/filter/concat(Description, ', newname') eq 'kdcuklu, newname'.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/concat(Description, ', newname') eq 'kdcuklu, newname'.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Product/filter/concat(Description, ', newname') eq 'kdcuklu, newname'.xml b/fit/src/main/resources/V30/Product/filter/concat(Description, ', newname') eq 'kdcuklu, newname'.xml
index 8a3fb07..e094c69 100644
--- a/fit/src/main/resources/V30/Product/filter/concat(Description, ', newname') eq 'kdcuklu, newname'.xml
+++ b/fit/src/main/resources/V30/Product/filter/concat(Description, ', newname') eq 'kdcuklu, newname'.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>