[11/20] [OLINGO-377] Removing unused cargo properties, upgrading Tomcat, renaming cargo.servlet.port to tomcat.servlet.port

[ilgrosso]

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/36e6ed40/fit/src/main/resources/V30/Customer/filter/isof(Name,'Edm.String')
 eq true.xml
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/V30/Customer/filter/isof(Name,'Edm.String') 
eq true.xml 
b/fit/src/main/resources/V30/Customer/filter/isof(Name,'Edm.String') eq true.xml
index f8375de..a060cff 100644
--- a/fit/src/main/resources/V30/Customer/filter/isof(Name,'Edm.String') eq 
true.xml    
+++ b/fit/src/main/resources/V30/Customer/filter/isof(Name,'Edm.String') 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/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-13T14:31:04Z</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" />
@@ -518,7 +518,7 @@
     </content>
   </entry>
   <entry>
-    
<id>http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-9)</id>
+    
<id>http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer(-9)</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(-9)" />
     <link 
rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders"; 
type="application/atom+xml;type=feed" title="Orders" href="Customer(-9)/Orders" 
/>
@@ -1061,5 +1061,5 @@
       </m:properties>
     </content>
   </entry>
-  <link rel="next" 
href="http://localhost:${cargo.servlet.port}/stub/StaticService/V30/Static.svc/Customer?$filter=isof(Name,'Edm.String')%20eq%20true&amp;$skiptoken=-9"
 />
+  <link rel="next" 
href="http://localhost:${tomcat.servlet.port}/stub/StaticService/V30/Static.svc/Customer?$filter=isof(Name,'Edm.String')%20eq%20true&amp;$skiptoken=-9"
 />
 </feed>