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:49 UTC
[15/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/Customer/filter/(indexof(PrimaryContactInfo.HomePhone.PhoneNumber,'lccvussrv') ne -1).xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/filter/(indexof(PrimaryContactInfo.HomePhone.PhoneNumber,'lccvussrv') ne -1).xml b/fit/src/main/resources/V30/Customer/filter/(indexof(PrimaryContactInfo.HomePhone.PhoneNumber,'lccvussrv') ne -1).xml
index abce058..1a6be80 100644
--- a/fit/src/main/resources/V30/Customer/filter/(indexof(PrimaryContactInfo.HomePhone.PhoneNumber,'lccvussrv') ne -1).xml
+++ b/fit/src/main/resources/V30/Customer/filter/(indexof(PrimaryContactInfo.HomePhone.PhoneNumber,'lccvussrv') ne -1).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/Customer</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/Customer</id>
<title type="text">Customer</title>
<updated>2014-02-13T12:09:31Z</updated>
<link rel="self" title="Customer" href="Customer" />
<entry>
- <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)</id>
+ <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)</id>
<category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
<link rel="edit" title="Customer" href="Customer(-10)" />
<link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="Customer(-10)/Orders" />
@@ -72,7 +72,7 @@
</content>
</entry>
<entry>
- <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-5)</id>
+ <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-5)</id>
<category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
<link rel="edit" title="Customer" href="Customer(-5)" />
<link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="Customer(-5)/Orders" />
@@ -596,5 +596,5 @@
</m:properties>
</content>
</entry>
- <link rel="next" href="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer?$filter=(indexof(PrimaryContactInfo/HomePhone/PhoneNumber,'lccvussrv')%20ne%20-1)&$skiptoken=-5" />
+ <link rel="next" href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer?$filter=(indexof(PrimaryContactInfo/HomePhone/PhoneNumber,'lccvussrv')%20ne%20-1)&$skiptoken=-5" />
</feed>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/filter/CustomerId eq -10.full.json
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/filter/CustomerId eq -10.full.json b/fit/src/main/resources/V30/Customer/filter/CustomerId eq -10.full.json
index a8c33d6..e8a078d 100644
--- a/fit/src/main/resources/V30/Customer/filter/CustomerId eq -10.full.json
+++ b/fit/src/main/resources/V30/Customer/filter/CustomerId eq -10.full.json
@@ -1,10 +1,10 @@
{
- "odata.metadata": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer",
+ "odata.metadata": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/$metadata#Customer",
"value":
[
{
"odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
- "odata.id": "http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)",
+ "odata.id": "http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)",
"odata.editLink": "Customer(-10)",
"Orders@odata.navigationLinkUrl": "Customer(-10)/Orders",
"Logins@odata.navigationLinkUrl": "Customer(-10)/Logins",
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/filter/CustomerId eq -10.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/filter/CustomerId eq -10.xml b/fit/src/main/resources/V30/Customer/filter/CustomerId eq -10.xml
index 821f749..e96602c 100644
--- a/fit/src/main/resources/V30/Customer/filter/CustomerId eq -10.xml
+++ b/fit/src/main/resources/V30/Customer/filter/CustomerId eq -10.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/Customer</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/Customer</id>
<title type="text">Customer</title>
<updated>2014-02-13T13:56:43Z</updated>
<link rel="self" title="Customer" href="Customer" />
<entry>
- <id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)</id>
+ <id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-10)</id>
<category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
<link rel="edit" title="Customer" href="Customer(-10)" />
<link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="Customer(-10)/Orders" />